@etherplay/connect 0.0.3 → 0.0.5

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import type { AlchemyMechanism, OriginAccount } from '@etherplay/alchemy';
 import type { EIP1193WindowWalletProvider } from 'eip-1193';
-import { fromEntropyKeyToMnemonic } from '@etherplay/alchemy';
-export { fromEntropyKeyToMnemonic };
+import { fromEntropyKeyToMnemonic, originKeyMessage, originPublicKeyPublicationMessage } from '@etherplay/alchemy';
+export { fromEntropyKeyToMnemonic, originPublicKeyPublicationMessage, originKeyMessage };
 export type { OriginAccount };
 export type PopupSettings = {
     walletHost: string;
@@ -81,4 +81,5 @@ export declare function createConnection(settings: {
     requestSignature: () => Promise<void>;
     connectOnCurrentWalletAccount: (address: `0x${string}`) => void;
     disconnect: () => void;
+    getSignatureForPublicKeyPublication: () => Promise<`0x${string}`>;
 };

package/dist/index.js

@@ -1,9 +1,8 @@
 import { writable } from 'svelte/store';
 import { createPopupLauncher } from './popup.js';
-import { fromEntropyKeyToMnemonic, fromMnemonicToFirstAccount, fromSignatureToKey, originKeyMessage } from '@etherplay/alchemy';
-import { bytesToHex } from '@noble/hashes/utils';
-export { fromEntropyKeyToMnemonic };
-const encoder = new TextEncoder();
+import { fromEntropyKeyToMnemonic, fromMnemonicToFirstAccount, fromSignatureToKey, originKeyMessage, originPublicKeyPublicationMessage } from '@etherplay/alchemy';
+import { hashMessage } from './utils.js';
+export { fromEntropyKeyToMnemonic, originPublicKeyPublicationMessage, originKeyMessage };
 const storageAccountKey = '__origin_account';
 export function createConnection(settings) {
     let autoConnect = true;
@@ -146,16 +145,32 @@ export function createConnection(settings) {
             throw new Error(`no wallet provided initialised`);
         }
         const message = originKeyMessage(origin);
-        const messageAsBytes = encoder.encode(message);
-        const msg = `0x${bytesToHex(messageAsBytes)}`;
+        const msg = hashMessage(message);
         set({
             ...$connection,
             step: 'WaitingForSignature'
         });
-        const signature = await provider.request({
-            method: 'personal_sign',
-            params: [msg, $connection.mechanism.address]
-        });
+        let signature;
+        try {
+            signature = await provider.request({
+                method: 'personal_sign',
+                params: [msg, $connection.mechanism.address]
+            });
+        }
+        catch (err) {
+            // TODO handle rejection (code: 4001 ?)
+            set({
+                ...$connection,
+                step: 'NeedWalletSignature',
+                mechanism: {
+                    type: 'wallet',
+                    name: $connection.mechanism.name,
+                    address: $connection.mechanism.address
+                },
+                error: { message: 'failed to sign message', cause: err }
+            });
+            return;
+        }
         const originKey = fromSignatureToKey(signature);
         const originMnemonic = fromEntropyKeyToMnemonic(originKey);
         const originAccount = fromMnemonicToFirstAccount(originMnemonic);
@@ -164,11 +179,13 @@ export function createConnection(settings) {
             signer: {
                 origin,
                 address: originAccount.address,
+                publicKey: originAccount.publicKey,
                 privateKey: originAccount.privateKey,
                 mnemonicKey: originKey
             },
             metadata: {},
-            mechanismUsed: $connection.mechanism
+            mechanismUsed: $connection.mechanism,
+            savedPublicKeyPublicationSignature: undefined
         };
         set({
             ...$connection,
@@ -459,6 +476,29 @@ export function createConnection(settings) {
         popup?.cancel();
         set({ step: 'Idle', loading: false, wallets: $connection.wallets });
     }
+    function getSignatureForPublicKeyPublication() {
+        if ($connection.step !== 'SignedIn') {
+            throw new Error('Not signed in');
+        }
+        const account = $connection.account;
+        if ($connection.mechanism.type === 'wallet') {
+            if (!walletProvider) {
+                throw new Error(`no provider`);
+            }
+            const message = originPublicKeyPublicationMessage(origin, account.signer.publicKey);
+            const msg = hashMessage(message);
+            return walletProvider.request({
+                method: 'personal_sign',
+                params: [msg, account.address]
+            });
+        }
+        if (account.savedPublicKeyPublicationSignature) {
+            return Promise.resolve(account.savedPublicKeyPublicationSignature);
+        }
+        // TODO offer a way to use iframe + popup to sign the message
+        // this would require saving mnemonic or privatekey on etherplay localstorage though
+        throw new Error(`no saved public key publication signature for ${account.address}`);
+    }
     return {
         subscribe: _store.subscribe,
         connect,
@@ -466,6 +506,7 @@ export function createConnection(settings) {
         back,
         requestSignature,
         connectOnCurrentWalletAccount,
-        disconnect
+        disconnect,
+        getSignatureForPublicKeyPublication
     };
 }

package/dist/utils.d.ts

@@ -1,2 +1,3 @@
 import type { Readable } from 'svelte/store';
 export declare function createStorePromise<U, T, V extends Readable<T>>(store: V, executor: (resolve: (value: U | PromiseLike<U>) => void, reject: (reason?: any) => void) => void): Promise<U> & V;
+export declare function hashMessage(message: string): `0x${string}`;

package/dist/utils.js

@@ -1,3 +1,4 @@
+import { bytesToHex } from '@noble/hashes/utils';
 export function createStorePromise(store, executor) {
     const storePromise = new Promise(executor);
     for (const key of Object.keys(store)) {
@@ -11,3 +12,9 @@ export function createStorePromise(store, executor) {
     }
     return storePromise;
 }
+const encoder = new TextEncoder();
+export function hashMessage(message) {
+    const messageAsBytes = encoder.encode(message);
+    const msg = `0x${bytesToHex(messageAsBytes)}`;
+    return msg;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etherplay/connect",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -52,7 +52,7 @@
     "@scure/bip32": "^1.6.2",
     "@scure/bip39": "^1.5.4",
     "zustand": "^5.0.3",
-    "@etherplay/alchemy": "0.0.2"
+    "@etherplay/alchemy": "0.0.4"
   },
   "scripts": {
     "dev": "vite dev --host --port 60002",