@dynamic-labs-wallet/svm 0.0.71 → 0.0.73

package/index.cjs.js

@@ -15,6 +15,11 @@ function _extends() {
     return _extends.apply(this, arguments);
 }
 
+const addSignatureToTransaction = ({ transaction, signature, signerPublicKey })=>{
+    transaction.addSignature(signerPublicKey, Buffer.from(signature));
+    return transaction;
+};
+
 const ERROR_CREATE_WALLET_ACCOUNT = 'Error creating svm wallet account';
 
 class DynamicSvmWalletClient extends browser.DynamicWalletClient {
@@ -47,6 +52,8 @@ class DynamicSvmWalletClient extends browser.DynamicWalletClient {
             }
             const { accountAddress } = await this.deriveAccountAddress(rawPublicKey);
             // Update client key shares in wallet map
+            // warning: this might result in race condition if `onCeremonyComplete` executes at the same time
+            // TODO: remove this once iframe handling for secret shares is implemented
             await this.setClientKeySharesToLocalStorage({
                 accountAddress,
                 clientKeyShares,
@@ -60,7 +67,8 @@ class DynamicSvmWalletClient extends browser.DynamicWalletClient {
             });
             return {
                 accountAddress,
-                rawPublicKey
+                rawPublicKey: rawPublicKey,
+                clientKeyShares
             };
         } catch (error) {
             this.logger.error(ERROR_CREATE_WALLET_ACCOUNT, error);
@@ -110,8 +118,18 @@ class DynamicSvmWalletClient extends browser.DynamicWalletClient {
             walletOperation: browser.WalletOperation.SIGN_TRANSACTION
         });
         try {
+            let messageToSign;
+            if (transaction instanceof web3_js.VersionedTransaction) {
+                // For versioned transactions, we need to sign the message directly
+                const messageBytes = transaction.message.serialize();
+                messageToSign = Buffer.from(messageBytes).toString('hex');
+            } else {
+                // For legacy transactions, serialize the message
+                const messageBytes = transaction.serializeMessage();
+                messageToSign = Buffer.from(messageBytes).toString('hex');
+            }
             const signatureEd25519 = await this.sign({
-                message: transaction,
+                message: messageToSign,
                 accountAddress: senderAddress,
                 chainName: this.chainName,
                 password
@@ -119,7 +137,13 @@ class DynamicSvmWalletClient extends browser.DynamicWalletClient {
             if (!signatureEd25519) {
                 throw new Error('Signature is undefined');
             }
-            return Buffer.from(signatureEd25519).toString('hex');
+            const senderPublicKey = new web3_js.PublicKey(senderAddress);
+            const signedTransaction = addSignatureToTransaction({
+                transaction,
+                signature: signatureEd25519,
+                signerPublicKey: senderPublicKey
+            });
+            return signedTransaction;
         } catch (error) {
             this.logger.error('Error in signTransaction:', error);
             if (error instanceof Error) {
@@ -134,7 +158,8 @@ class DynamicSvmWalletClient extends browser.DynamicWalletClient {
    * @param accountAddress The account address to export the private key for
    * @param password The password for encrypted backup shares
    * @returns The private key
-   */ async exportPrivateKey({ accountAddress, password = undefined }) {
+   */ async exportPrivateKey({ accountAddress, displayContainer, password = undefined }) {
+        var _derivedPrivateKey_match;
         await this.verifyPassword({
             accountAddress,
             password,
@@ -148,7 +173,13 @@ class DynamicSvmWalletClient extends browser.DynamicWalletClient {
         if (!derivedPrivateKey) {
             throw new Error('Derived private key is undefined');
         }
-        return derivedPrivateKey;
+        // Convert hex string to Uint8Array
+        const privateKeyBytes = new Uint8Array(((_derivedPrivateKey_match = derivedPrivateKey.match(/.{1,2}/g)) == null ? void 0 : _derivedPrivateKey_match.map((byte)=>parseInt(byte, 16))) || []);
+        // Display the private key in the container via iframe
+        const { iframeDisplay } = await this.initializeIframeDisplayForContainer({
+            container: displayContainer
+        });
+        iframeDisplay.displayPrivateKey(JSON.stringify(Array.from(privateKeyBytes)));
     }
     /**
    * Exports the private key for a given account address
@@ -195,7 +226,7 @@ class DynamicSvmWalletClient extends browser.DynamicWalletClient {
    */ async importPrivateKey({ privateKey, chainName, thresholdSignatureScheme, password = undefined, onError }) {
         //get public key from private key
         const publicKey = this.getPublicKeyFromPrivateKey(privateKey);
-        const formattedPrivateKey = this.decodePrivateKeyForSolana(privateKey);
+        const formattedPrivateKey = await this.decodePrivateKeyForSolana(privateKey);
         const { rawPublicKey, clientKeyShares } = await this.importRawPrivateKey({
             chainName,
             privateKey: formattedPrivateKey,
@@ -220,6 +251,8 @@ class DynamicSvmWalletClient extends browser.DynamicWalletClient {
             throw new Error(`Public key mismatch: derived address ${accountAddress} !== public key ${publicKey}`);
         }
         // Update client key shares in wallet map
+        // warning: this might result in race condition if `onCeremonyComplete` executes at the same time
+        // TODO: remove this once iframe handling for secret shares is implemented
         await this.setClientKeySharesToLocalStorage({
             accountAddress,
             clientKeyShares,
@@ -233,7 +266,8 @@ class DynamicSvmWalletClient extends browser.DynamicWalletClient {
         });
         return {
             accountAddress,
-            rawPublicKey: rawPublicKey
+            rawPublicKey: rawPublicKey,
+            clientKeyShares
         };
     }
     async getSvmWallets() {

package/index.esm.js

@@ -1,6 +1,6 @@
 import { DynamicWalletClient, getClientKeyShareBackupInfo, WalletOperation } from '@dynamic-labs-wallet/browser';
 import bs58 from 'bs58';
-import { Keypair } from '@solana/web3.js';
+import { VersionedTransaction, PublicKey, Keypair } from '@solana/web3.js';
 
 function _extends() {
     _extends = Object.assign || function assign(target) {
@@ -13,6 +13,11 @@ function _extends() {
     return _extends.apply(this, arguments);
 }
 
+const addSignatureToTransaction = ({ transaction, signature, signerPublicKey })=>{
+    transaction.addSignature(signerPublicKey, Buffer.from(signature));
+    return transaction;
+};
+
 const ERROR_CREATE_WALLET_ACCOUNT = 'Error creating svm wallet account';
 
 class DynamicSvmWalletClient extends DynamicWalletClient {
@@ -45,6 +50,8 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
             }
             const { accountAddress } = await this.deriveAccountAddress(rawPublicKey);
             // Update client key shares in wallet map
+            // warning: this might result in race condition if `onCeremonyComplete` executes at the same time
+            // TODO: remove this once iframe handling for secret shares is implemented
             await this.setClientKeySharesToLocalStorage({
                 accountAddress,
                 clientKeyShares,
@@ -58,7 +65,8 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
             });
             return {
                 accountAddress,
-                rawPublicKey
+                rawPublicKey: rawPublicKey,
+                clientKeyShares
             };
         } catch (error) {
             this.logger.error(ERROR_CREATE_WALLET_ACCOUNT, error);
@@ -108,8 +116,18 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
             walletOperation: WalletOperation.SIGN_TRANSACTION
         });
         try {
+            let messageToSign;
+            if (transaction instanceof VersionedTransaction) {
+                // For versioned transactions, we need to sign the message directly
+                const messageBytes = transaction.message.serialize();
+                messageToSign = Buffer.from(messageBytes).toString('hex');
+            } else {
+                // For legacy transactions, serialize the message
+                const messageBytes = transaction.serializeMessage();
+                messageToSign = Buffer.from(messageBytes).toString('hex');
+            }
             const signatureEd25519 = await this.sign({
-                message: transaction,
+                message: messageToSign,
                 accountAddress: senderAddress,
                 chainName: this.chainName,
                 password
@@ -117,7 +135,13 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
             if (!signatureEd25519) {
                 throw new Error('Signature is undefined');
             }
-            return Buffer.from(signatureEd25519).toString('hex');
+            const senderPublicKey = new PublicKey(senderAddress);
+            const signedTransaction = addSignatureToTransaction({
+                transaction,
+                signature: signatureEd25519,
+                signerPublicKey: senderPublicKey
+            });
+            return signedTransaction;
         } catch (error) {
             this.logger.error('Error in signTransaction:', error);
             if (error instanceof Error) {
@@ -132,7 +156,8 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
    * @param accountAddress The account address to export the private key for
    * @param password The password for encrypted backup shares
    * @returns The private key
-   */ async exportPrivateKey({ accountAddress, password = undefined }) {
+   */ async exportPrivateKey({ accountAddress, displayContainer, password = undefined }) {
+        var _derivedPrivateKey_match;
         await this.verifyPassword({
             accountAddress,
             password,
@@ -146,7 +171,13 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
         if (!derivedPrivateKey) {
             throw new Error('Derived private key is undefined');
         }
-        return derivedPrivateKey;
+        // Convert hex string to Uint8Array
+        const privateKeyBytes = new Uint8Array(((_derivedPrivateKey_match = derivedPrivateKey.match(/.{1,2}/g)) == null ? void 0 : _derivedPrivateKey_match.map((byte)=>parseInt(byte, 16))) || []);
+        // Display the private key in the container via iframe
+        const { iframeDisplay } = await this.initializeIframeDisplayForContainer({
+            container: displayContainer
+        });
+        iframeDisplay.displayPrivateKey(JSON.stringify(Array.from(privateKeyBytes)));
     }
     /**
    * Exports the private key for a given account address
@@ -193,7 +224,7 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
    */ async importPrivateKey({ privateKey, chainName, thresholdSignatureScheme, password = undefined, onError }) {
         //get public key from private key
         const publicKey = this.getPublicKeyFromPrivateKey(privateKey);
-        const formattedPrivateKey = this.decodePrivateKeyForSolana(privateKey);
+        const formattedPrivateKey = await this.decodePrivateKeyForSolana(privateKey);
         const { rawPublicKey, clientKeyShares } = await this.importRawPrivateKey({
             chainName,
             privateKey: formattedPrivateKey,
@@ -218,6 +249,8 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
             throw new Error(`Public key mismatch: derived address ${accountAddress} !== public key ${publicKey}`);
         }
         // Update client key shares in wallet map
+        // warning: this might result in race condition if `onCeremonyComplete` executes at the same time
+        // TODO: remove this once iframe handling for secret shares is implemented
         await this.setClientKeySharesToLocalStorage({
             accountAddress,
             clientKeyShares,
@@ -231,7 +264,8 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
         });
         return {
             accountAddress,
-            rawPublicKey: rawPublicKey
+            rawPublicKey: rawPublicKey,
+            clientKeyShares
         };
     }
     async getSvmWallets() {

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@dynamic-labs-wallet/svm",
-  "version": "0.0.71",
+  "version": "0.0.73",
   "license": "MIT",
   "dependencies": {
-    "@dynamic-labs-wallet/browser": "0.0.71",
+    "@dynamic-labs-wallet/browser": "0.0.73",
     "@solana/web3.js": "^1.98.2",
     "bs58": "^6.0.0"
   },

package/src/svm/index.d.ts

@@ -1,2 +1,2 @@
-export * from './client';
+export * from './svm';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/svm/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/svm/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAC"}

package/src/svm/{client.d.ts → svm.d.ts}

@@ -1,4 +1,5 @@
-import { DynamicWalletClient, Ed25519KeygenResult, ThresholdSignatureScheme } from '@dynamic-labs-wallet/browser';
+import { ClientKeyShare, DynamicWalletClient, Ed25519KeygenResult, ThresholdSignatureScheme } from '@dynamic-labs-wallet/browser';
+import { Transaction, VersionedTransaction } from '@solana/web3.js';
 export declare class DynamicSvmWalletClient extends DynamicWalletClient {
     readonly chainName = "SOL";
     accountAddress?: string;
@@ -19,7 +20,8 @@ export declare class DynamicSvmWalletClient extends DynamicWalletClient {
         password?: string;
     }): Promise<{
         accountAddress: string;
-        rawPublicKey: Uint8Array | string;
+        rawPublicKey: Uint8Array;
+        clientKeyShares: ClientKeyShare[];
     }>;
     deriveAccountAddress(rawPublicKey: string | Uint8Array): Promise<{
         accountAddress: string;
@@ -38,9 +40,9 @@ export declare class DynamicSvmWalletClient extends DynamicWalletClient {
     }): Promise<string>;
     signTransaction({ senderAddress, transaction, password, }: {
         senderAddress: string;
-        transaction: string;
+        transaction: VersionedTransaction | Transaction;
         password?: string;
-    }): Promise<string>;
+    }): Promise<VersionedTransaction | Transaction>;
     /**
      * Exports the private key for a given account address
      *
@@ -48,10 +50,11 @@ export declare class DynamicSvmWalletClient extends DynamicWalletClient {
      * @param password The password for encrypted backup shares
      * @returns The private key
      */
-    exportPrivateKey({ accountAddress, password, }: {
+    exportPrivateKey({ accountAddress, displayContainer, password, }: {
         accountAddress: string;
+        displayContainer: HTMLElement;
         password?: string;
-    }): Promise<string>;
+    }): Promise<void>;
     /**
      * Exports the private key for a given account address
      *
@@ -91,7 +94,8 @@ export declare class DynamicSvmWalletClient extends DynamicWalletClient {
     }): Promise<{
         accountAddress: string;
         rawPublicKey: Uint8Array | undefined;
+        clientKeyShares: ClientKeyShare[];
     }>;
     getSvmWallets(): Promise<any>;
 }
-//# sourceMappingURL=client.d.ts.map
+//# sourceMappingURL=svm.d.ts.map

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

@@ -0,0 +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,EAEL,WAAW,EACX,oBAAoB,EAErB,MAAM,iBAAiB,CAAC;AAIzB,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;IAgEI,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,UAAU;;;IAY5D;;;;;;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;IA2BK,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;IAgD/C;;;;;;OAMG;IACG,gBAAgB,CAAC,EACrB,cAAc,EACd,gBAAgB,EAChB,QAAoB,GACrB,EAAE;QACD,cAAc,EAAE,MAAM,CAAC;QACvB,gBAAgB,EAAE,WAAW,CAAC;QAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB;IA8BD;;;;;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;IA6DI,aAAa;CAOpB"}

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

@@ -1 +0,0 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/svm/client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,EAGzB,MAAM,8BAA8B,CAAC;AAKtC,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,GAAG,MAAM,CAAC;KACnC,CAAC;IA2DI,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,UAAU;;;IAY5D;;;;;;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;IA2BK,eAAe,CAAC,EACpB,aAAa,EACb,WAAW,EACX,QAAoB,GACrB,EAAE;QACD,aAAa,EAAE,MAAM,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,GAAG,OAAO,CAAC,MAAM,CAAC;IA6BnB;;;;;;OAMG;IACG,gBAAgB,CAAC,EACrB,cAAc,EACd,QAAoB,GACrB,EAAE;QACD,cAAc,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,GAAG,OAAO,CAAC,MAAM,CAAC;IAmBnB;;;;;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;KACtC,CAAC;IAwDI,aAAa;CAOpB"}