From 370ff822d0cb5244ab03d0ed9c126f49d8e62e15 Mon Sep 17 00:00:00 2001
From: Samuel Andert <samuel@ora.earth>
Date: Mon, 28 Aug 2023 12:18:57 +0200
Subject: [PATCH] Refactoring and cleanup of Signer

---
 src/lib/GoogleAuth.svelte      | 102 ++-------------------------------
 src/lib/IProvider.ts           |   6 ++
 src/lib/Signer.svelte          |  60 +++++++++++--------
 src/routes/+page.svelte        |   4 ++
 src/routes/api/auth/+server.ts |   1 -
 5 files changed, 51 insertions(+), 122 deletions(-)
 create mode 100644 src/lib/IProvider.ts

diff --git a/src/lib/GoogleAuth.svelte b/src/lib/GoogleAuth.svelte
index 5963462..8976add 100644
--- a/src/lib/GoogleAuth.svelte
+++ b/src/lib/GoogleAuth.svelte
@@ -8,23 +8,19 @@
   import Icon from "@iconify/svelte";
   import { createLitSession } from "./createLitSession";
   import { connectProvider } from "./setupLit";
-  import { ethers } from "ethers";
-  import Signer from "./Signer.svelte";
 
   const redirectUri = "http://localhost:3000/";
 
   let sessionSigs = null;
   let litNodeClient, error, currentPKP, authMethod, provider;
-  let messageToSign = { user: "Sam", loggedIn: true };
   let status = "Initializing...";
-  let jsonObjectToVerify = null;
   let pkps: IRelayPKP[] = [];
   let view = "SIGN_IN";
   let sessionSigsObject;
 
   onMount(async () => {
-    litNodeClient = new LitNodeClient({ litNetwork: "serrano" });
-    await litNodeClient.connect();
+    // litNodeClient = new LitNodeClient({ litNetwork: "serrano" });
+    // await litNodeClient.connect();
     const sessionSigsLocalStorage = localStorage.getItem("google-signature");
     const currentPKPLocalStorage = localStorage.getItem("current-pkp");
     if (sessionSigsLocalStorage && currentPKPLocalStorage) {
@@ -33,7 +29,6 @@
     } else {
       initialize();
     }
-
     if (sessionSigsLocalStorage) {
       sessionSigsObject = JSON.parse(sessionSigsLocalStorage);
     }
@@ -118,66 +113,6 @@
     view = "ERROR";
     status = `Error: ${err.message}`;
   }
-
-  async function signMessageWithPKP() {
-    try {
-      // Create a specific JSON object
-      const jsonString = JSON.stringify(messageToSign);
-
-      // Convert the JSON string to an array of character codes
-      const toSign = ethers.getBytes(ethers.hashMessage(jsonString));
-
-      const litActionCode = `
-					const go = async () => {
-						const sigShare = await LitActions.signEcdsa({ toSign, publicKey, sigName });
-					};
-					go();
-					`;
-
-      // Sign message
-      const results = await litNodeClient.executeJs({
-        code: litActionCode,
-        sessionSigs: sessionSigs,
-        jsParams: {
-          toSign: toSign,
-          publicKey: currentPKP.publicKey,
-          sigName: "sig1",
-        },
-      });
-
-      // Get signature
-      const result = results.signatures["sig1"];
-      const signature = ethers.Signature.from({
-        r: "0x" + result.r,
-        s: "0x" + result.s,
-        v: result.recid,
-      });
-
-      // Add the signature to the JSON object
-      messageToSign.signature = signature;
-
-      jsonObjectToVerify = { ...messageToSign };
-
-      // Display the signed JSON
-      status = JSON.stringify(messageToSign, null, 2);
-
-      // Verify the signature
-      const recoveredAddr = ethers.verifyMessage(jsonString, signature);
-
-      // Check if the address associated with the signature is the same as the current PKP
-      const verified =
-        currentPKP.ethAddress.toLowerCase() === recoveredAddr.toLowerCase();
-
-      if (verified) {
-        status = "The signature is valid.";
-      } else {
-        status = "The signature is invalid.";
-      }
-    } catch (err) {
-      console.error(err);
-      setError(err);
-    }
-  }
 </script>
 
 <div class="flex items-center justify-center h-screen">
@@ -197,21 +132,13 @@
       <div>
         <h3>Your PKP Address:</h3>
         <p>{currentPKP.ethAddress}</p>
-        <h1>Ready to sign</h1>
-        <Signer
-          {litNodeClient}
-          {currentPKP}
-          {sessionSigs}
-          on:status={(e) => (status = e.detail)}
-          on:error={(e) => setError(e.detail)}
-        />
       </div>
     {/if}
     <div class="mt-4 text-center">
       <h1>Status</h1>
       <p>{status}</p>
     </div>
-    <div class="mt-4 text-center">
+    <!-- <div class="mt-4 text-center">
       Session Signature
       {#if sessionSigsObject}
         <div class="mt-4 text-center">
@@ -229,27 +156,6 @@
           {/each}
         </div>
       {/if}
-    </div>
+    </div> -->
   </div>
 </div>
-
-<style>
-  .container {
-    /* ...existing styles... */
-  }
-
-  .session-sig {
-    border: 1px solid #ddd;
-    padding: 1em;
-    margin-bottom: 1em;
-  }
-
-  .session-sig h2 {
-    color: #333;
-  }
-
-  .session-sig p,
-  .session-sig pre {
-    color: #666;
-  }
-</style>
diff --git a/src/lib/IProvider.ts b/src/lib/IProvider.ts
new file mode 100644
index 0000000..76f35ec
--- /dev/null
+++ b/src/lib/IProvider.ts
@@ -0,0 +1,6 @@
+export interface IProvider {
+    mintPKPThroughRelayer(authMethod: any): Promise<string>;
+    relay: {
+        pollRequestUntilTerminalState(txHash: string): Promise<any>;
+    };
+}
\ No newline at end of file
diff --git a/src/lib/Signer.svelte b/src/lib/Signer.svelte
index 8114909..0a4f22b 100644
--- a/src/lib/Signer.svelte
+++ b/src/lib/Signer.svelte
@@ -1,19 +1,29 @@
 <!-- SignVerifyMessage.svelte -->
 <script lang="ts">
   import { ethers } from "ethers";
-  import { createEventDispatcher } from "svelte";
+  import { onMount } from "svelte";
 
-  export let litNodeClient;
-  export let currentPKP;
-  export let sessionSigs;
-  export let messageToSign = { user: "Sam", loggedIn: true };
+  export let messageToSign = {};
 
+  let currentPKP;
+  let sessionSigs;
   let status = "";
-  let jsonObjectToVerify = null;
+  let litNodeClient;
+  let messageSignature;
 
-  const dispatch = createEventDispatcher();
+  onMount(async () => {
+    litNodeClient = new LitNodeClient({ litNetwork: "serrano" });
+    await litNodeClient.connect();
 
-  async function signMessageWithPKP() {
+    const sessionSigsLocalStorage = localStorage.getItem("google-signature");
+    const currentPKPLocalStorage = localStorage.getItem("current-pkp");
+    if (sessionSigsLocalStorage && currentPKPLocalStorage) {
+      sessionSigs = JSON.parse(sessionSigsLocalStorage);
+      currentPKP = JSON.parse(currentPKPLocalStorage);
+    }
+  });
+
+  export async function signMessageWithPKP() {
     const userConfirmed = window.confirm(
       "Do you want to sign the following message?\n\n" +
         JSON.stringify(messageToSign, null, 2)
@@ -32,11 +42,11 @@
       const toSign = ethers.getBytes(ethers.hashMessage(jsonString));
 
       const litActionCode = `
-          const go = async () => {
-            const sigShare = await LitActions.signEcdsa({ toSign, publicKey, sigName });
-          };
-          go();
-        `;
+        const go = async () => {
+          const sigShare = await LitActions.signEcdsa({ toSign, publicKey, sigName });
+        };
+        go();
+      `;
 
       // Sign message
       const results = await litNodeClient.executeJs({
@@ -51,22 +61,17 @@
 
       // Get signature
       const result = results.signatures["sig1"];
-      const signature = ethers.Signature.from({
+      messageSignature = ethers.Signature.from({
         r: "0x" + result.r,
         s: "0x" + result.s,
         v: result.recid,
       });
 
-      // Add the signature to the JSON object
-      messageToSign.signature = signature;
-
-      jsonObjectToVerify = { ...messageToSign };
-
       // Display the signed JSON
       status = JSON.stringify(messageToSign, null, 2);
 
       // Verify the signature
-      const recoveredAddr = ethers.verifyMessage(jsonString, signature);
+      const recoveredAddr = ethers.verifyMessage(jsonString, messageSignature);
 
       // Check if the address associated with the signature is the same as the current PKP
       const verified =
@@ -77,11 +82,8 @@
       } else {
         status = "The signature is invalid.";
       }
-
-      dispatch("status", status);
     } catch (err) {
       console.error(err);
-      dispatch("error", err);
     }
   }
 </script>
@@ -90,3 +92,15 @@
 {#if messageToSign}
   <pre>{JSON.stringify(messageToSign)}</pre>
 {/if}
+
+{#if status}
+  <div class="mt-4 text-center">
+    <p>Status: {status}</p>
+  </div>
+{/if}
+{#if messageSignature}
+  <div class="mt-4 text-center">
+    <h3>Signature</h3>
+    <pre>{JSON.stringify(messageSignature)}</pre>
+  </div>
+{/if}
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index b80f101..49a5b78 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,5 +1,9 @@
 <script>
   import GoogleAuth from "$lib/GoogleAuth.svelte";
+  import Signer from "$lib/Signer.svelte";
+
+  let messageToSign = { user: "Sam", loggedIn: true };
 </script>
 
 <GoogleAuth />
+<Signer {messageToSign} />
diff --git a/src/routes/api/auth/+server.ts b/src/routes/api/auth/+server.ts
index 2bdde67..1977532 100644
--- a/src/routes/api/auth/+server.ts
+++ b/src/routes/api/auth/+server.ts
@@ -1,4 +1,3 @@
-// src/routes/api/auth/+server.ts
 import jwt from 'jsonwebtoken';
 import { error } from '@sveltejs/kit';