@dynamic-labs-wallet/svm 0.0.44 → 0.0.46

package/index.cjs.js

@@ -5,17 +5,9 @@ var bs58 = require('bs58');
 var web3_js = require('@solana/web3.js');
 require('@dynamic-labs-wallet/core');
 
-const addSignatureToTransaction = ({ transaction, signature })=>{
+const addSignatureToTransaction = ({ transaction, signature, signerPublicKey })=>{
     try {
-        if (transaction instanceof web3_js.Transaction) {
-            transaction.addSignature(transaction.feePayer, Buffer.from(signature));
-        } else {
-            // For versioned transactions, we should add the signature to the fee payer
-            // which is always the first account in the static account keys
-            // TODO: see if this works for sponsored transactions
-            const feePayer = transaction.message.staticAccountKeys[0];
-            transaction.addSignature(feePayer, Buffer.from(signature));
-        }
+        transaction.addSignature(signerPublicKey, Buffer.from(signature));
         return transaction;
     } catch (error) {
         console.error('Error in finalizing transaction:', error);
@@ -30,11 +22,27 @@ class DynamicSvmWalletClient extends browser.DynamicWalletClient {
    * @param thresholdSignatureScheme The threshold signature scheme to use
    * @returns The account address, public key hex, raw public key, and client key shares
    */ async createWalletAccount({ thresholdSignatureScheme, password = undefined }) {
+        let ceremonyCompleted = false;
         try {
             const { rawPublicKey, clientKeyShares } = await this.keyGen({
                 chainName: this.chainName,
-                thresholdSignatureScheme
+                thresholdSignatureScheme,
+                onCeremonyComplete: ()=>{
+                    ceremonyCompleted = true;
+                }
             });
+            // Wait for the ceremony to complete, timeout after 5 seconds
+            await Promise.race([
+                (async ()=>{
+                    while(!ceremonyCompleted){
+                        await new Promise((resolve)=>setTimeout(resolve, 100));
+                    }
+                })(),
+                browser.timeoutPromise({
+                    timeInMs: 5000,
+                    activity: 'Ceremony'
+                })
+            ]);
             if (!rawPublicKey || !(rawPublicKey instanceof Uint8Array)) {
                 throw new Error('Raw public key is not a Uint8Array');
             }
@@ -151,9 +159,11 @@ class DynamicSvmWalletClient extends browser.DynamicWalletClient {
             if (!signatureEd25519) {
                 throw new Error('Signature is undefined');
             }
+            const senderPublicKey = new web3_js.PublicKey(senderAddress);
             const signedTransaction = addSignatureToTransaction({
                 transaction,
-                signature: signatureEd25519
+                signature: signatureEd25519,
+                signerPublicKey: senderPublicKey
             });
             return signedTransaction;
         } catch (error) {
@@ -227,6 +237,7 @@ class DynamicSvmWalletClient extends browser.DynamicWalletClient {
    * @param password The password for encrypted backup shares
    * @returns The account address, raw public key, and client key shares
    */ async importPrivateKey({ privateKey, chainName, thresholdSignatureScheme, password = undefined, onError }) {
+        let ceremonyCompleted = false;
         //get public key from private key
         const publicKey = this.getPublicKeyFromPrivateKey(privateKey);
         const formattedPrivateKey = await this.decodePrivateKeyForSolana(privateKey);
@@ -234,8 +245,23 @@ class DynamicSvmWalletClient extends browser.DynamicWalletClient {
             chainName,
             privateKey: formattedPrivateKey,
             thresholdSignatureScheme,
-            onError
+            onError,
+            onCeremonyComplete: ()=>{
+                ceremonyCompleted = true;
+            }
         });
+        // Wait for the ceremony to complete, timeout after 5 seconds
+        await Promise.race([
+            (async ()=>{
+                while(!ceremonyCompleted){
+                    await new Promise((resolve)=>setTimeout(resolve, 100));
+                }
+            })(),
+            browser.timeoutPromise({
+                timeInMs: 5000,
+                activity: 'Ceremony'
+            })
+        ]);
         if (!rawPublicKey || !clientKeyShares) {
             throw new Error('Error creating wallet account');
         }

package/index.esm.js

@@ -1,19 +1,11 @@
-import { DynamicWalletClient, getClientKeyShareBackupInfo, WalletOperation } from '@dynamic-labs-wallet/browser';
+import { DynamicWalletClient, timeoutPromise, getClientKeyShareBackupInfo, WalletOperation } from '@dynamic-labs-wallet/browser';
 import bs58 from 'bs58';
-import { Transaction, VersionedTransaction, Keypair } from '@solana/web3.js';
+import { VersionedTransaction, PublicKey, Keypair } from '@solana/web3.js';
 import '@dynamic-labs-wallet/core';
 
-const addSignatureToTransaction = ({ transaction, signature })=>{
+const addSignatureToTransaction = ({ transaction, signature, signerPublicKey })=>{
     try {
-        if (transaction instanceof Transaction) {
-            transaction.addSignature(transaction.feePayer, Buffer.from(signature));
-        } else {
-            // For versioned transactions, we should add the signature to the fee payer
-            // which is always the first account in the static account keys
-            // TODO: see if this works for sponsored transactions
-            const feePayer = transaction.message.staticAccountKeys[0];
-            transaction.addSignature(feePayer, Buffer.from(signature));
-        }
+        transaction.addSignature(signerPublicKey, Buffer.from(signature));
         return transaction;
     } catch (error) {
         console.error('Error in finalizing transaction:', error);
@@ -28,11 +20,27 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
    * @param thresholdSignatureScheme The threshold signature scheme to use
    * @returns The account address, public key hex, raw public key, and client key shares
    */ async createWalletAccount({ thresholdSignatureScheme, password = undefined }) {
+        let ceremonyCompleted = false;
         try {
             const { rawPublicKey, clientKeyShares } = await this.keyGen({
                 chainName: this.chainName,
-                thresholdSignatureScheme
+                thresholdSignatureScheme,
+                onCeremonyComplete: ()=>{
+                    ceremonyCompleted = true;
+                }
             });
+            // Wait for the ceremony to complete, timeout after 5 seconds
+            await Promise.race([
+                (async ()=>{
+                    while(!ceremonyCompleted){
+                        await new Promise((resolve)=>setTimeout(resolve, 100));
+                    }
+                })(),
+                timeoutPromise({
+                    timeInMs: 5000,
+                    activity: 'Ceremony'
+                })
+            ]);
             if (!rawPublicKey || !(rawPublicKey instanceof Uint8Array)) {
                 throw new Error('Raw public key is not a Uint8Array');
             }
@@ -149,9 +157,11 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
             if (!signatureEd25519) {
                 throw new Error('Signature is undefined');
             }
+            const senderPublicKey = new PublicKey(senderAddress);
             const signedTransaction = addSignatureToTransaction({
                 transaction,
-                signature: signatureEd25519
+                signature: signatureEd25519,
+                signerPublicKey: senderPublicKey
             });
             return signedTransaction;
         } catch (error) {
@@ -225,6 +235,7 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
    * @param password The password for encrypted backup shares
    * @returns The account address, raw public key, and client key shares
    */ async importPrivateKey({ privateKey, chainName, thresholdSignatureScheme, password = undefined, onError }) {
+        let ceremonyCompleted = false;
         //get public key from private key
         const publicKey = this.getPublicKeyFromPrivateKey(privateKey);
         const formattedPrivateKey = await this.decodePrivateKeyForSolana(privateKey);
@@ -232,8 +243,23 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
             chainName,
             privateKey: formattedPrivateKey,
             thresholdSignatureScheme,
-            onError
+            onError,
+            onCeremonyComplete: ()=>{
+                ceremonyCompleted = true;
+            }
         });
+        // Wait for the ceremony to complete, timeout after 5 seconds
+        await Promise.race([
+            (async ()=>{
+                while(!ceremonyCompleted){
+                    await new Promise((resolve)=>setTimeout(resolve, 100));
+                }
+            })(),
+            timeoutPromise({
+                timeInMs: 5000,
+                activity: 'Ceremony'
+            })
+        ]);
         if (!rawPublicKey || !clientKeyShares) {
             throw new Error('Error creating wallet account');
         }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@dynamic-labs-wallet/svm",
-  "version": "0.0.44",
+  "version": "0.0.46",
   "license": "MIT",
   "dependencies": {
-    "@dynamic-labs-wallet/browser": "0.0.44",
-    "@dynamic-labs-wallet/core": "0.0.44",
+    "@dynamic-labs-wallet/browser": "0.0.46",
+    "@dynamic-labs-wallet/core": "0.0.46",
     "@solana/web3.js": "^1.98.0",
     "bs58": "^6.0.0"
   },

package/src/svm/svm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"svm.d.ts","sourceRoot":"","sources":["../../src/svm/svm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,EAGzB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAW,WAAW,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAG7E,qBAAa,sBAAuB,SAAQ,mBAAmB;IAC7D,QAAQ,CAAC,SAAS,SAAS;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;gBAEZ,EACV,aAAa,EACb,SAAS,EACT,UAAU,EACV,kBAAkB,GACnB,EAAE;QACD,aAAa,EAAE,MAAM,CAAC;QACtB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,kBAAkB,CAAC,EAAE,MAAM,CAAC;KAC7B;IASD;;;;;OAKG;IACG,mBAAmB,CAAC,EACxB,wBAAwB,EACxB,QAAoB,GACrB,EAAE;QACD,wBAAwB,EAAE,wBAAwB,CAAC;QACnD,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,GAAG,OAAO,CAAC;QACV,cAAc,EAAE,MAAM,CAAC;QACvB,YAAY,EAAE,UAAU,CAAC;QACzB,eAAe,EAAE,cAAc,EAAE,CAAC;KACnC,CAAC;IAoDI,oBAAoB,CAAC,YAAY,EAAE,UAAU;;;IAOnD;;;;;;OAMG;IACG,WAAW,CAAC,EAChB,OAAO,EACP,cAAc,EACd,QAAoB,GACrB,EAAE;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,cAAc,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB;IA6CK,eAAe,CAAC,EACpB,aAAa,EACb,WAAW,EACX,QAAoB,GACrB,EAAE;QACD,aAAa,EAAE,MAAM,CAAC;QACtB,WAAW,EAAE,oBAAoB,GAAG,WAAW,CAAC;QAChD,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,GAAG,OAAO,CAAC,oBAAoB,GAAG,WAAW,CAAC;IA0C/C;;;;;;OAMG;IACG,gBAAgB,CAAC,EACrB,cAAc,EACd,QAAoB,GACrB,EAAE;QACD,cAAc,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB;;;IAaD;;;;;OAKG;IACG,uBAAuB,CAAC,EAC5B,SAAS,EACT,cAAc,GACf,EAAE;QACD,SAAS,EAAE,mBAAmB,EAAE,CAAC;QACjC,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB;;;IASD;;;;;OAKG;IACH,yBAAyB,CAAC,UAAU,EAAE,MAAM;IAM5C,0BAA0B,CAAC,UAAU,EAAE,MAAM;IAQ7C,eAAe,CAAC,SAAS,EAAE,UAAU,GAAG,MAAM;IAI9C;;;;;;;;OAQG;IACG,gBAAgB,CAAC,EACrB,UAAU,EACV,SAAS,EACT,wBAAwB,EACxB,QAAoB,EACpB,OAAO,GACR,EAAE;QACD,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,wBAAwB,EAAE,wBAAwB,CAAC;QACnD,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;KAClC,GAAG,OAAO,CAAC;QACV,cAAc,EAAE,MAAM,CAAC;QACvB,YAAY,EAAE,UAAU,GAAG,SAAS,CAAC;QACrC,eAAe,EAAE,cAAc,EAAE,CAAC;KACnC,CAAC;IAqDI,aAAa;CAOpB"}
+{"version":3,"file":"svm.d.ts","sourceRoot":"","sources":["../../src/svm/svm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,EAIzB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAEL,WAAW,EACX,oBAAoB,EAErB,MAAM,iBAAiB,CAAC;AAGzB,qBAAa,sBAAuB,SAAQ,mBAAmB;IAC7D,QAAQ,CAAC,SAAS,SAAS;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;gBAEZ,EACV,aAAa,EACb,SAAS,EACT,UAAU,EACV,kBAAkB,GACnB,EAAE;QACD,aAAa,EAAE,MAAM,CAAC;QACtB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,kBAAkB,CAAC,EAAE,MAAM,CAAC;KAC7B;IASD;;;;;OAKG;IACG,mBAAmB,CAAC,EACxB,wBAAwB,EACxB,QAAoB,GACrB,EAAE;QACD,wBAAwB,EAAE,wBAAwB,CAAC;QACnD,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,GAAG,OAAO,CAAC;QACV,cAAc,EAAE,MAAM,CAAC;QACvB,YAAY,EAAE,UAAU,CAAC;QACzB,eAAe,EAAE,cAAc,EAAE,CAAC;KACnC,CAAC;IAmEI,oBAAoB,CAAC,YAAY,EAAE,UAAU;;;IAOnD;;;;;;OAMG;IACG,WAAW,CAAC,EAChB,OAAO,EACP,cAAc,EACd,QAAoB,GACrB,EAAE;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,cAAc,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB;IA6CK,eAAe,CAAC,EACpB,aAAa,EACb,WAAW,EACX,QAAoB,GACrB,EAAE;QACD,aAAa,EAAE,MAAM,CAAC;QACtB,WAAW,EAAE,oBAAoB,GAAG,WAAW,CAAC;QAChD,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,GAAG,OAAO,CAAC,oBAAoB,GAAG,WAAW,CAAC;IA4C/C;;;;;;OAMG;IACG,gBAAgB,CAAC,EACrB,cAAc,EACd,QAAoB,GACrB,EAAE;QACD,cAAc,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB;;;IAaD;;;;;OAKG;IACG,uBAAuB,CAAC,EAC5B,SAAS,EACT,cAAc,GACf,EAAE;QACD,SAAS,EAAE,mBAAmB,EAAE,CAAC;QACjC,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB;;;IASD;;;;;OAKG;IACH,yBAAyB,CAAC,UAAU,EAAE,MAAM;IAM5C,0BAA0B,CAAC,UAAU,EAAE,MAAM;IAQ7C,eAAe,CAAC,SAAS,EAAE,UAAU,GAAG,MAAM;IAI9C;;;;;;;;OAQG;IACG,gBAAgB,CAAC,EACrB,UAAU,EACV,SAAS,EACT,wBAAwB,EACxB,QAAoB,EACpB,OAAO,GACR,EAAE;QACD,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,wBAAwB,EAAE,wBAAwB,CAAC;QACnD,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;KAClC,GAAG,OAAO,CAAC;QACV,cAAc,EAAE,MAAM,CAAC;QACvB,YAAY,EAAE,UAAU,GAAG,SAAS,CAAC;QACrC,eAAe,EAAE,cAAc,EAAE,CAAC;KACnC,CAAC;IAoEI,aAAa;CAOpB"}

package/src/svm/utils.d.ts

@@ -1,4 +1,4 @@
-import { Transaction, VersionedTransaction } from '@solana/web3.js';
+import { PublicKey, Transaction, VersionedTransaction } from '@solana/web3.js';
 export declare function getBalance({ address, rpcUrl, }: {
     address: string;
     rpcUrl?: string;
@@ -12,9 +12,10 @@ export declare function createSolanaTransaction({ senderSolanaAddress, amount, t
     transaction: Transaction;
     serializedTransaction: Buffer;
 }>;
-export declare const addSignatureToTransaction: ({ transaction, signature, }: {
+export declare const addSignatureToTransaction: ({ transaction, signature, signerPublicKey, }: {
     transaction: Transaction | VersionedTransaction;
     signature: Uint8Array;
+    signerPublicKey: PublicKey;
 }) => VersionedTransaction | Transaction;
 export declare function sendTransaction({ signedTransaction, rpcUrl, }: {
     signedTransaction: Uint8Array;

package/src/svm/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/svm/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,WAAW,EACX,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AAEzB,wBAAsB,UAAU,CAAC,EAC/B,OAAO,EACP,MAAuB,GACxB,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,mBAWA;AAED,wBAAsB,uBAAuB,CAAC,EAC5C,mBAAmB,EACnB,MAAM,EACN,EAAE,EACF,MAAwC,GACzC,EAAE;IACD,mBAAmB,EAAE,MAAM,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;;;GA+BA;AAED,eAAO,MAAM,yBAAyB,gCAGnC;IACD,WAAW,EAAE,WAAW,GAAG,oBAAoB,CAAC;IAChD,SAAS,EAAE,UAAU,CAAC;CACvB,KAAG,oBAAoB,GAAG,WAmB1B,CAAC;AAEF,wBAAsB,eAAe,CAAC,EACpC,iBAAiB,EACjB,MAAwC,GACzC,EAAE;IACD,iBAAiB,EAAE,UAAU,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,mBAaA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/svm/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,SAAS,EAET,WAAW,EACX,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AAEzB,wBAAsB,UAAU,CAAC,EAC/B,OAAO,EACP,MAAuB,GACxB,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,mBAWA;AAED,wBAAsB,uBAAuB,CAAC,EAC5C,mBAAmB,EACnB,MAAM,EACN,EAAE,EACF,MAAwC,GACzC,EAAE;IACD,mBAAmB,EAAE,MAAM,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;;;GA+BA;AAED,eAAO,MAAM,yBAAyB,iDAInC;IACD,WAAW,EAAE,WAAW,GAAG,oBAAoB,CAAC;IAChD,SAAS,EAAE,UAAU,CAAC;IACtB,eAAe,EAAE,SAAS,CAAC;CAC5B,KAAG,oBAAoB,GAAG,WAQ1B,CAAC;AAEF,wBAAsB,eAAe,CAAC,EACpC,iBAAiB,EACjB,MAAwC,GACzC,EAAE;IACD,iBAAiB,EAAE,UAAU,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,mBAaA"}