@dynamic-labs-wallet/node-svm 0.0.354 → 1.0.0-beta

package/index.cjs

@@ -3,17 +3,6 @@
 var node = require('@dynamic-labs-wallet/node');
 var web3_js = require('@solana/web3.js');
 
-function _extends() {
-    _extends = Object.assign || function assign(target) {
-        for(var i = 1; i < arguments.length; i++){
-            var source = arguments[i];
-            for(var key in source)if (Object.prototype.hasOwnProperty.call(source, key)) target[key] = source[key];
-        }
-        return target;
-    };
-    return _extends.apply(this, arguments);
-}
-
 const ERROR_CREATE_WALLET_ACCOUNT = 'Error creating svm wallet account';
 const ERROR_SIGN_RAW_MESSAGE = 'Error signing raw message';
 
@@ -92,9 +81,10 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
    * Creates a wallet account on the Solana chain
    *
    * @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, onError, backUpToClientShareService = false }) {
+   * @returns The walletMetadata, raw public key, and client key shares
+   */ async createWalletAccount({ thresholdSignatureScheme, password, onError, backUpToDynamic = false }) {
         try {
+            let resolvedWalletId;
             let ceremonyCeremonyCompleteResolver;
             const ceremonyCompletePromise = new Promise((resolve)=>{
                 ceremonyCeremonyCompleteResolver = resolve;
@@ -102,28 +92,11 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
             const { rawPublicKey, externalServerKeyShares } = await this.keyGen({
                 chainName: this.chainName,
                 thresholdSignatureScheme,
+                password,
+                backUpToDynamic,
                 onError,
-                onCeremonyComplete: (accountAddress, walletId)=>{
-                    // update wallet map
-                    const chainConfig = node.getMPCChainConfig(this.chainName);
-                    this.walletMap[accountAddress] = _extends({}, this.walletMap[accountAddress] || {}, {
-                        accountAddress,
-                        walletId,
-                        chainName: this.chainName,
-                        thresholdSignatureScheme,
-                        derivationPath: JSON.stringify(Object.fromEntries(chainConfig.derivationPath.map((value, index)=>[
-                                index,
-                                value
-                            ]))),
-                        externalServerKeySharesBackupInfo: node.getExternalServerKeyShareBackupInfo()
-                    });
-                    this.logger.debug('walletMap updated for wallet', {
-                        context: {
-                            accountAddress,
-                            walletId,
-                            walletMap: this.walletMap
-                        }
-                    });
+                onCeremonyComplete: (_accountAddress, walletId)=>{
+                    resolvedWalletId = walletId;
                     ceremonyCeremonyCompleteResolver(undefined);
                 }
             });
@@ -132,21 +105,34 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
             if (!rawPublicKey || !(rawPublicKey instanceof Uint8Array || typeof rawPublicKey === 'string')) {
                 throw new Error('Raw public key is not a Uint8Array or string' + typeof rawPublicKey);
             }
-            if (!externalServerKeyShares) {
+            if (!externalServerKeyShares || !resolvedWalletId) {
                 throw new Error('Error creating wallet account');
             }
             const { accountAddress } = await this.deriveAccountAddress(rawPublicKey);
-            const externalKeySharesWithBackupStatus = await this.storeEncryptedBackupByWalletWithRetry({
+            const chainConfig = node.getMPCChainConfig(this.chainName);
+            const walletMetadata = {
+                walletId: resolvedWalletId,
+                accountAddress,
+                chainName: this.chainName,
+                thresholdSignatureScheme,
+                derivationPath: JSON.stringify(Object.fromEntries(chainConfig.derivationPath.map((value, index)=>[
+                        index,
+                        value
+                    ])))
+            };
+            const { keySharesWithBackupStatus, backupInfo } = await this.storeEncryptedBackupByWalletWithRetry({
                 accountAddress,
                 externalServerKeyShares,
                 password,
-                backUpToClientShareService
+                backUpToDynamic,
+                walletMetadata
             });
+            walletMetadata.externalServerKeySharesBackupInfo = backupInfo;
             return {
-                accountAddress,
+                walletMetadata,
                 rawPublicKey,
                 externalServerKeyShares,
-                externalKeySharesWithBackupStatus
+                externalKeySharesWithBackupStatus: keySharesWithBackupStatus
             };
         } catch (error) {
             logError$1({
@@ -173,22 +159,14 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
    * This function takes a message and returns it after being signed with MPC
    *
    * @param message The message to sign (Uint8Array)
-   * @param accountAddress Solana address (base58 encoded)
+   * @param walletMetadata Wallet metadata (the full object returned by createWalletAccount/importPrivateKey, with backupInfo merged from any subsequent updatePassword/refresh/reshare)
    * @param password The password for encrypted backup shares
-   */ async signMessage({ message, accountAddress, password = undefined, externalServerKeyShares }) {
-        // Validate inputs early
+   */ async signMessage({ message, walletMetadata, password = undefined, externalServerKeyShares }) {
+        const { accountAddress } = walletMetadata;
         if (!accountAddress) {
             throw new Error('Account address is required');
         }
         try {
-            // Attempt to recover key shares from backup if not provided
-            await this.ensureKeySharesRecovered({
-                accountAddress,
-                password,
-                walletOperation: node.WalletOperation.SIGN_MESSAGE,
-                externalServerKeyShares,
-                errorMessage: 'External server key shares are required to sign a message. No backup shares available for recovery.'
-            });
             const messageBytes = typeof message === 'string' ? new TextEncoder().encode(message) : message;
             const messageHex = toHex(messageBytes);
             const signatureEd25519 = await this.sign({
@@ -196,7 +174,8 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
                 accountAddress,
                 chainName: this.chainName,
                 password,
-                externalServerKeyShares
+                externalServerKeyShares,
+                walletMetadata
             });
             return encodeBase58(signatureEd25519);
         } catch (error) {
@@ -215,21 +194,14 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
    * The message must be a hex string representing already-hashed data.
    *
    * @param message The pre-formatted hex message to sign
-   * @param accountAddress Solana address (base58 encoded)
+   * @param walletMetadata Wallet metadata (the full object returned by createWalletAccount/importPrivateKey, with backupInfo merged from any subsequent updatePassword/refresh/reshare)
    * @param password The password for encrypted backup shares
-   */ async signRawMessage({ message, accountAddress, password = undefined, externalServerKeyShares }) {
+   */ async signRawMessage({ message, walletMetadata, password = undefined, externalServerKeyShares }) {
+        const { accountAddress } = walletMetadata;
         if (!accountAddress) {
             throw new Error('Account address is required');
         }
         try {
-            // Attempt to recover key shares from backup if not provided
-            await this.ensureKeySharesRecovered({
-                accountAddress,
-                password,
-                walletOperation: node.WalletOperation.SIGN_MESSAGE,
-                externalServerKeyShares,
-                errorMessage: 'External server key shares are required to sign a raw message. No backup shares available for recovery.'
-            });
             const messageHex = node.stripHexPrefix(message);
             const signatureEd25519 = await this.sign({
                 message: messageHex,
@@ -237,7 +209,8 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
                 chainName: this.chainName,
                 password,
                 externalServerKeyShares,
-                isFormatted: true
+                isFormatted: true,
+                walletMetadata
             });
             return encodeBase58(signatureEd25519);
         } catch (error) {
@@ -248,14 +221,16 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
                     accountAddress
                 }
             });
-            throw new Error(ERROR_SIGN_RAW_MESSAGE);
+            throw new Error(ERROR_SIGN_RAW_MESSAGE, {
+                cause: error
+            });
         }
     }
     //todo:should txn just be a string?
-    async signTransaction({ senderAddress, transaction, password = undefined, externalServerKeyShares, sponsor = false }) {
-        // Validate inputs early
-        if (!senderAddress) {
-            throw new Error('Sender address is required');
+    async signTransaction({ walletMetadata, transaction, password = undefined, externalServerKeyShares, sponsor = false }) {
+        const { accountAddress } = walletMetadata;
+        if (!accountAddress) {
+            throw new Error('Account address is required');
         }
         if (sponsor) {
             if (typeof transaction === 'string') {
@@ -265,19 +240,7 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
                 transaction
             });
         }
-        await this.verifyPassword({
-            accountAddress: senderAddress,
-            password
-        });
         try {
-            // Attempt to recover key shares from backup if not provided
-            await this.ensureKeySharesRecovered({
-                accountAddress: senderAddress,
-                password,
-                walletOperation: node.WalletOperation.SIGN_TRANSACTION,
-                externalServerKeyShares,
-                errorMessage: 'External server key shares are required to sign transaction. No backup shares available for recovery.'
-            });
             let messageToSign;
             if (typeof transaction === 'string') {
                 messageToSign = transaction.startsWith('0x') ? transaction.slice(2) : transaction;
@@ -290,10 +253,12 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
             }
             const signatureEd25519 = await this.sign({
                 message: messageToSign,
-                accountAddress: senderAddress,
+                accountAddress,
                 chainName: this.chainName,
                 password,
-                externalServerKeyShares
+                externalServerKeyShares,
+                walletMetadata,
+                walletOperation: node.WalletOperation.SIGN_TRANSACTION
             });
             if (!signatureEd25519) {
                 throw new Error('Signature is undefined');
@@ -304,24 +269,26 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
                 message: 'Error in signTransaction:',
                 error: error,
                 context: {
-                    senderAddress
+                    accountAddress
                 }
             });
             throw error;
         }
     }
     /**
-   * Exports the private key for a given account address
+   * Exports the private key for a given wallet
    *
-   * @param accountAddress The account address to export the private key for
+   * @param walletMetadata Wallet metadata (the full object returned by createWalletAccount/importPrivateKey, with backupInfo merged from any subsequent updatePassword/refresh/reshare)
    * @param password The password for encrypted backup shares
    * @returns The private key
-   */ async exportPrivateKey({ accountAddress, password = undefined, externalServerKeyShares }) {
+   */ async exportPrivateKey({ walletMetadata, password = undefined, externalServerKeyShares }) {
+        const { accountAddress } = walletMetadata;
         const { derivedPrivateKey } = await this.exportKey({
             accountAddress,
             chainName: this.chainName,
             password,
-            externalServerKeyShares
+            externalServerKeyShares,
+            walletMetadata
         });
         if (!derivedPrivateKey) {
             throw new Error('Derived private key is undefined');
@@ -378,8 +345,9 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
    * @param chainName The chain name to import the private key for
    * @param thresholdSignatureScheme The threshold signature scheme to use
    * @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, backUpToClientShareService = false }) {
+   * @returns The walletMetadata, raw public key, and client key shares
+   */ async importPrivateKey({ privateKey, chainName, thresholdSignatureScheme, password, onError, backUpToDynamic = false }) {
+        let resolvedWalletId;
         let ceremonyCeremonyCompleteResolver;
         const ceremonyCompletePromise = new Promise((resolve)=>{
             ceremonyCeremonyCompleteResolver = resolve;
@@ -391,44 +359,47 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
             chainName,
             privateKey: formattedPrivateKey,
             thresholdSignatureScheme,
+            password,
+            backUpToDynamic,
             onError,
-            onCeremonyComplete: (accountAddress, walletId)=>{
-                // update wallet map
-                const chainConfig = node.getMPCChainConfig(this.chainName);
-                this.walletMap[accountAddress] = _extends({}, this.walletMap[accountAddress] || {}, {
-                    accountAddress,
-                    walletId,
-                    chainName: this.chainName,
-                    thresholdSignatureScheme,
-                    derivationPath: JSON.stringify(Object.fromEntries(chainConfig.derivationPath.map((value, index)=>[
-                            index,
-                            value
-                        ]))),
-                    externalServerKeySharesBackupInfo: node.getExternalServerKeyShareBackupInfo()
-                });
+            onCeremonyComplete: (_accountAddress, walletId)=>{
+                resolvedWalletId = walletId;
                 ceremonyCeremonyCompleteResolver(undefined);
             }
         });
         // Wait for the ceremony to complete before proceeding
         await ceremonyCompletePromise;
-        if (!rawPublicKey || !externalServerKeyShares) {
+        if (!rawPublicKey || !externalServerKeyShares || !resolvedWalletId) {
             throw new Error('Error creating wallet account');
         }
         const { accountAddress } = await this.deriveAccountAddress(rawPublicKey);
         if (accountAddress !== publicKey) {
             throw new Error(`Public key mismatch: derived address ${accountAddress} !== public key ${publicKey}`);
         }
-        const externalKeySharesWithBackupStatus = await this.storeEncryptedBackupByWalletWithRetry({
+        const chainConfig = node.getMPCChainConfig(this.chainName);
+        const walletMetadata = {
+            walletId: resolvedWalletId,
+            accountAddress,
+            chainName: this.chainName,
+            thresholdSignatureScheme,
+            derivationPath: JSON.stringify(Object.fromEntries(chainConfig.derivationPath.map((value, index)=>[
+                    index,
+                    value
+                ])))
+        };
+        const { keySharesWithBackupStatus, backupInfo } = await this.storeEncryptedBackupByWalletWithRetry({
             accountAddress,
             externalServerKeyShares,
             password,
-            backUpToClientShareService
+            backUpToDynamic,
+            walletMetadata
         });
+        walletMetadata.externalServerKeySharesBackupInfo = backupInfo;
         return {
-            accountAddress,
+            walletMetadata,
             rawPublicKey: rawPublicKey,
             externalServerKeyShares,
-            externalKeySharesWithBackupStatus
+            externalKeySharesWithBackupStatus: keySharesWithBackupStatus
         };
     }
     /**
@@ -527,6 +498,17 @@ async function sendTransaction({ signedTransaction, rpcUrl = 'https://api.devnet
     return txid;
 }
 
+function _extends() {
+    _extends = Object.assign || function assign(target) {
+        for(var i = 1; i < arguments.length; i++){
+            var source = arguments[i];
+            for(var key in source)if (Object.prototype.hasOwnProperty.call(source, key)) target[key] = source[key];
+        }
+        return target;
+    };
+    return _extends.apply(this, arguments);
+}
+
 const logError = node.createLogError('node-svm');
 /**
  * Creates a delegated SVM wallet client for functional operations

package/index.esm.js

@@ -1,17 +1,6 @@
-import { createLogError, DynamicWalletClient, getMPCChainConfig, getExternalServerKeyShareBackupInfo, WalletOperation, stripHexPrefix, SOLANA_RPC_URL, createDelegatedWalletClient, delegatedSignMessage as delegatedSignMessage$1, revokeDelegation as revokeDelegation$1 } from '@dynamic-labs-wallet/node';
+import { createLogError, DynamicWalletClient, getMPCChainConfig, stripHexPrefix, WalletOperation, SOLANA_RPC_URL, createDelegatedWalletClient, delegatedSignMessage as delegatedSignMessage$1, revokeDelegation as revokeDelegation$1 } from '@dynamic-labs-wallet/node';
 import { PublicKey, VersionedTransaction, Keypair, Transaction, Connection, SystemProgram } from '@solana/web3.js';
 
-function _extends() {
-    _extends = Object.assign || function assign(target) {
-        for(var i = 1; i < arguments.length; i++){
-            var source = arguments[i];
-            for(var key in source)if (Object.prototype.hasOwnProperty.call(source, key)) target[key] = source[key];
-        }
-        return target;
-    };
-    return _extends.apply(this, arguments);
-}
-
 const ERROR_CREATE_WALLET_ACCOUNT = 'Error creating svm wallet account';
 const ERROR_SIGN_RAW_MESSAGE = 'Error signing raw message';
 
@@ -90,9 +79,10 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
    * Creates a wallet account on the Solana chain
    *
    * @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, onError, backUpToClientShareService = false }) {
+   * @returns The walletMetadata, raw public key, and client key shares
+   */ async createWalletAccount({ thresholdSignatureScheme, password, onError, backUpToDynamic = false }) {
         try {
+            let resolvedWalletId;
             let ceremonyCeremonyCompleteResolver;
             const ceremonyCompletePromise = new Promise((resolve)=>{
                 ceremonyCeremonyCompleteResolver = resolve;
@@ -100,28 +90,11 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
             const { rawPublicKey, externalServerKeyShares } = await this.keyGen({
                 chainName: this.chainName,
                 thresholdSignatureScheme,
+                password,
+                backUpToDynamic,
                 onError,
-                onCeremonyComplete: (accountAddress, walletId)=>{
-                    // update wallet map
-                    const chainConfig = getMPCChainConfig(this.chainName);
-                    this.walletMap[accountAddress] = _extends({}, this.walletMap[accountAddress] || {}, {
-                        accountAddress,
-                        walletId,
-                        chainName: this.chainName,
-                        thresholdSignatureScheme,
-                        derivationPath: JSON.stringify(Object.fromEntries(chainConfig.derivationPath.map((value, index)=>[
-                                index,
-                                value
-                            ]))),
-                        externalServerKeySharesBackupInfo: getExternalServerKeyShareBackupInfo()
-                    });
-                    this.logger.debug('walletMap updated for wallet', {
-                        context: {
-                            accountAddress,
-                            walletId,
-                            walletMap: this.walletMap
-                        }
-                    });
+                onCeremonyComplete: (_accountAddress, walletId)=>{
+                    resolvedWalletId = walletId;
                     ceremonyCeremonyCompleteResolver(undefined);
                 }
             });
@@ -130,21 +103,34 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
             if (!rawPublicKey || !(rawPublicKey instanceof Uint8Array || typeof rawPublicKey === 'string')) {
                 throw new Error('Raw public key is not a Uint8Array or string' + typeof rawPublicKey);
             }
-            if (!externalServerKeyShares) {
+            if (!externalServerKeyShares || !resolvedWalletId) {
                 throw new Error('Error creating wallet account');
             }
             const { accountAddress } = await this.deriveAccountAddress(rawPublicKey);
-            const externalKeySharesWithBackupStatus = await this.storeEncryptedBackupByWalletWithRetry({
+            const chainConfig = getMPCChainConfig(this.chainName);
+            const walletMetadata = {
+                walletId: resolvedWalletId,
+                accountAddress,
+                chainName: this.chainName,
+                thresholdSignatureScheme,
+                derivationPath: JSON.stringify(Object.fromEntries(chainConfig.derivationPath.map((value, index)=>[
+                        index,
+                        value
+                    ])))
+            };
+            const { keySharesWithBackupStatus, backupInfo } = await this.storeEncryptedBackupByWalletWithRetry({
                 accountAddress,
                 externalServerKeyShares,
                 password,
-                backUpToClientShareService
+                backUpToDynamic,
+                walletMetadata
             });
+            walletMetadata.externalServerKeySharesBackupInfo = backupInfo;
             return {
-                accountAddress,
+                walletMetadata,
                 rawPublicKey,
                 externalServerKeyShares,
-                externalKeySharesWithBackupStatus
+                externalKeySharesWithBackupStatus: keySharesWithBackupStatus
             };
         } catch (error) {
             logError$1({
@@ -171,22 +157,14 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
    * This function takes a message and returns it after being signed with MPC
    *
    * @param message The message to sign (Uint8Array)
-   * @param accountAddress Solana address (base58 encoded)
+   * @param walletMetadata Wallet metadata (the full object returned by createWalletAccount/importPrivateKey, with backupInfo merged from any subsequent updatePassword/refresh/reshare)
    * @param password The password for encrypted backup shares
-   */ async signMessage({ message, accountAddress, password = undefined, externalServerKeyShares }) {
-        // Validate inputs early
+   */ async signMessage({ message, walletMetadata, password = undefined, externalServerKeyShares }) {
+        const { accountAddress } = walletMetadata;
         if (!accountAddress) {
             throw new Error('Account address is required');
         }
         try {
-            // Attempt to recover key shares from backup if not provided
-            await this.ensureKeySharesRecovered({
-                accountAddress,
-                password,
-                walletOperation: WalletOperation.SIGN_MESSAGE,
-                externalServerKeyShares,
-                errorMessage: 'External server key shares are required to sign a message. No backup shares available for recovery.'
-            });
             const messageBytes = typeof message === 'string' ? new TextEncoder().encode(message) : message;
             const messageHex = toHex(messageBytes);
             const signatureEd25519 = await this.sign({
@@ -194,7 +172,8 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
                 accountAddress,
                 chainName: this.chainName,
                 password,
-                externalServerKeyShares
+                externalServerKeyShares,
+                walletMetadata
             });
             return encodeBase58(signatureEd25519);
         } catch (error) {
@@ -213,21 +192,14 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
    * The message must be a hex string representing already-hashed data.
    *
    * @param message The pre-formatted hex message to sign
-   * @param accountAddress Solana address (base58 encoded)
+   * @param walletMetadata Wallet metadata (the full object returned by createWalletAccount/importPrivateKey, with backupInfo merged from any subsequent updatePassword/refresh/reshare)
    * @param password The password for encrypted backup shares
-   */ async signRawMessage({ message, accountAddress, password = undefined, externalServerKeyShares }) {
+   */ async signRawMessage({ message, walletMetadata, password = undefined, externalServerKeyShares }) {
+        const { accountAddress } = walletMetadata;
         if (!accountAddress) {
             throw new Error('Account address is required');
         }
         try {
-            // Attempt to recover key shares from backup if not provided
-            await this.ensureKeySharesRecovered({
-                accountAddress,
-                password,
-                walletOperation: WalletOperation.SIGN_MESSAGE,
-                externalServerKeyShares,
-                errorMessage: 'External server key shares are required to sign a raw message. No backup shares available for recovery.'
-            });
             const messageHex = stripHexPrefix(message);
             const signatureEd25519 = await this.sign({
                 message: messageHex,
@@ -235,7 +207,8 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
                 chainName: this.chainName,
                 password,
                 externalServerKeyShares,
-                isFormatted: true
+                isFormatted: true,
+                walletMetadata
             });
             return encodeBase58(signatureEd25519);
         } catch (error) {
@@ -246,14 +219,16 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
                     accountAddress
                 }
             });
-            throw new Error(ERROR_SIGN_RAW_MESSAGE);
+            throw new Error(ERROR_SIGN_RAW_MESSAGE, {
+                cause: error
+            });
         }
     }
     //todo:should txn just be a string?
-    async signTransaction({ senderAddress, transaction, password = undefined, externalServerKeyShares, sponsor = false }) {
-        // Validate inputs early
-        if (!senderAddress) {
-            throw new Error('Sender address is required');
+    async signTransaction({ walletMetadata, transaction, password = undefined, externalServerKeyShares, sponsor = false }) {
+        const { accountAddress } = walletMetadata;
+        if (!accountAddress) {
+            throw new Error('Account address is required');
         }
         if (sponsor) {
             if (typeof transaction === 'string') {
@@ -263,19 +238,7 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
                 transaction
             });
         }
-        await this.verifyPassword({
-            accountAddress: senderAddress,
-            password
-        });
         try {
-            // Attempt to recover key shares from backup if not provided
-            await this.ensureKeySharesRecovered({
-                accountAddress: senderAddress,
-                password,
-                walletOperation: WalletOperation.SIGN_TRANSACTION,
-                externalServerKeyShares,
-                errorMessage: 'External server key shares are required to sign transaction. No backup shares available for recovery.'
-            });
             let messageToSign;
             if (typeof transaction === 'string') {
                 messageToSign = transaction.startsWith('0x') ? transaction.slice(2) : transaction;
@@ -288,10 +251,12 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
             }
             const signatureEd25519 = await this.sign({
                 message: messageToSign,
-                accountAddress: senderAddress,
+                accountAddress,
                 chainName: this.chainName,
                 password,
-                externalServerKeyShares
+                externalServerKeyShares,
+                walletMetadata,
+                walletOperation: WalletOperation.SIGN_TRANSACTION
             });
             if (!signatureEd25519) {
                 throw new Error('Signature is undefined');
@@ -302,24 +267,26 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
                 message: 'Error in signTransaction:',
                 error: error,
                 context: {
-                    senderAddress
+                    accountAddress
                 }
             });
             throw error;
         }
     }
     /**
-   * Exports the private key for a given account address
+   * Exports the private key for a given wallet
    *
-   * @param accountAddress The account address to export the private key for
+   * @param walletMetadata Wallet metadata (the full object returned by createWalletAccount/importPrivateKey, with backupInfo merged from any subsequent updatePassword/refresh/reshare)
    * @param password The password for encrypted backup shares
    * @returns The private key
-   */ async exportPrivateKey({ accountAddress, password = undefined, externalServerKeyShares }) {
+   */ async exportPrivateKey({ walletMetadata, password = undefined, externalServerKeyShares }) {
+        const { accountAddress } = walletMetadata;
         const { derivedPrivateKey } = await this.exportKey({
             accountAddress,
             chainName: this.chainName,
             password,
-            externalServerKeyShares
+            externalServerKeyShares,
+            walletMetadata
         });
         if (!derivedPrivateKey) {
             throw new Error('Derived private key is undefined');
@@ -376,8 +343,9 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
    * @param chainName The chain name to import the private key for
    * @param thresholdSignatureScheme The threshold signature scheme to use
    * @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, backUpToClientShareService = false }) {
+   * @returns The walletMetadata, raw public key, and client key shares
+   */ async importPrivateKey({ privateKey, chainName, thresholdSignatureScheme, password, onError, backUpToDynamic = false }) {
+        let resolvedWalletId;
         let ceremonyCeremonyCompleteResolver;
         const ceremonyCompletePromise = new Promise((resolve)=>{
             ceremonyCeremonyCompleteResolver = resolve;
@@ -389,44 +357,47 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
             chainName,
             privateKey: formattedPrivateKey,
             thresholdSignatureScheme,
+            password,
+            backUpToDynamic,
             onError,
-            onCeremonyComplete: (accountAddress, walletId)=>{
-                // update wallet map
-                const chainConfig = getMPCChainConfig(this.chainName);
-                this.walletMap[accountAddress] = _extends({}, this.walletMap[accountAddress] || {}, {
-                    accountAddress,
-                    walletId,
-                    chainName: this.chainName,
-                    thresholdSignatureScheme,
-                    derivationPath: JSON.stringify(Object.fromEntries(chainConfig.derivationPath.map((value, index)=>[
-                            index,
-                            value
-                        ]))),
-                    externalServerKeySharesBackupInfo: getExternalServerKeyShareBackupInfo()
-                });
+            onCeremonyComplete: (_accountAddress, walletId)=>{
+                resolvedWalletId = walletId;
                 ceremonyCeremonyCompleteResolver(undefined);
             }
         });
         // Wait for the ceremony to complete before proceeding
         await ceremonyCompletePromise;
-        if (!rawPublicKey || !externalServerKeyShares) {
+        if (!rawPublicKey || !externalServerKeyShares || !resolvedWalletId) {
             throw new Error('Error creating wallet account');
         }
         const { accountAddress } = await this.deriveAccountAddress(rawPublicKey);
         if (accountAddress !== publicKey) {
             throw new Error(`Public key mismatch: derived address ${accountAddress} !== public key ${publicKey}`);
         }
-        const externalKeySharesWithBackupStatus = await this.storeEncryptedBackupByWalletWithRetry({
+        const chainConfig = getMPCChainConfig(this.chainName);
+        const walletMetadata = {
+            walletId: resolvedWalletId,
+            accountAddress,
+            chainName: this.chainName,
+            thresholdSignatureScheme,
+            derivationPath: JSON.stringify(Object.fromEntries(chainConfig.derivationPath.map((value, index)=>[
+                    index,
+                    value
+                ])))
+        };
+        const { keySharesWithBackupStatus, backupInfo } = await this.storeEncryptedBackupByWalletWithRetry({
             accountAddress,
             externalServerKeyShares,
             password,
-            backUpToClientShareService
+            backUpToDynamic,
+            walletMetadata
         });
+        walletMetadata.externalServerKeySharesBackupInfo = backupInfo;
         return {
-            accountAddress,
+            walletMetadata,
             rawPublicKey: rawPublicKey,
             externalServerKeyShares,
-            externalKeySharesWithBackupStatus
+            externalKeySharesWithBackupStatus: keySharesWithBackupStatus
         };
     }
     /**
@@ -525,6 +496,17 @@ async function sendTransaction({ signedTransaction, rpcUrl = 'https://api.devnet
     return txid;
 }
 
+function _extends() {
+    _extends = Object.assign || function assign(target) {
+        for(var i = 1; i < arguments.length; i++){
+            var source = arguments[i];
+            for(var key in source)if (Object.prototype.hasOwnProperty.call(source, key)) target[key] = source[key];
+        }
+        return target;
+    };
+    return _extends.apply(this, arguments);
+}
+
 const logError = createLogError('node-svm');
 /**
  * Creates a delegated SVM wallet client for functional operations

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@dynamic-labs-wallet/node-svm",
-  "version": "0.0.354",
+  "version": "1.0.0-beta",
   "license": "MIT",
   "type": "module",
   "dependencies": {
-    "@dynamic-labs-wallet/node": "0.0.354",
+    "@dynamic-labs-wallet/node": "1.0.0-beta",
     "@solana/web3.js": "^1.98.2"
   },
   "publishConfig": {

package/src/client/client.d.ts

@@ -1,4 +1,4 @@
-import { type ServerKeyShare, DynamicWalletClient, type Ed25519KeygenResult, type ThresholdSignatureScheme, type TraceContext, type DynamicWalletClientProps } from '@dynamic-labs-wallet/node';
+import { type ServerKeyShare, DynamicWalletClient, type Ed25519KeygenResult, type ThresholdSignatureScheme, type TraceContext, type DynamicWalletClientProps, type WalletMetadata } from '@dynamic-labs-wallet/node';
 import { Transaction, VersionedTransaction } from '@solana/web3.js';
 export declare class DynamicSvmWalletClient extends DynamicWalletClient {
     readonly chainName = "SVM";
@@ -8,17 +8,16 @@ export declare class DynamicSvmWalletClient extends DynamicWalletClient {
      * Creates a wallet account on the Solana chain
      *
      * @param thresholdSignatureScheme The threshold signature scheme to use
-     * @returns The account address, public key hex, raw public key, and client key shares
+     * @returns The walletMetadata, raw public key, and client key shares
      */
-    createWalletAccount({ thresholdSignatureScheme, password, onError, backUpToClientShareService, }: {
+    createWalletAccount({ thresholdSignatureScheme, password, onError, backUpToDynamic, }: {
         thresholdSignatureScheme: ThresholdSignatureScheme;
         password?: string;
         onError?: (error: Error) => void;
-        backUpToClientShareService?: boolean;
+        backUpToDynamic?: boolean;
     }): Promise<{
-        accountAddress: string;
+        walletMetadata: WalletMetadata;
         rawPublicKey: Uint8Array | string;
-        /** @deprecated Use externalKeySharesWithBackupStatus instead */
         externalServerKeyShares: ServerKeyShare[];
         externalKeySharesWithBackupStatus: Array<{
             share: ServerKeyShare;
@@ -32,12 +31,12 @@ export declare class DynamicSvmWalletClient extends DynamicWalletClient {
      * This function takes a message and returns it after being signed with MPC
      *
      * @param message The message to sign (Uint8Array)
-     * @param accountAddress Solana address (base58 encoded)
+     * @param walletMetadata Wallet metadata (the full object returned by createWalletAccount/importPrivateKey, with backupInfo merged from any subsequent updatePassword/refresh/reshare)
      * @param password The password for encrypted backup shares
      */
-    signMessage({ message, accountAddress, password, externalServerKeyShares, }: {
+    signMessage({ message, walletMetadata, password, externalServerKeyShares, }: {
         message: string | Uint8Array;
-        accountAddress: string;
+        walletMetadata: WalletMetadata;
         password?: string;
         externalServerKeyShares?: ServerKeyShare[];
     }): Promise<string>;
@@ -46,17 +45,17 @@ export declare class DynamicSvmWalletClient extends DynamicWalletClient {
      * The message must be a hex string representing already-hashed data.
      *
      * @param message The pre-formatted hex message to sign
-     * @param accountAddress Solana address (base58 encoded)
+     * @param walletMetadata Wallet metadata (the full object returned by createWalletAccount/importPrivateKey, with backupInfo merged from any subsequent updatePassword/refresh/reshare)
      * @param password The password for encrypted backup shares
      */
-    signRawMessage({ message, accountAddress, password, externalServerKeyShares, }: {
+    signRawMessage({ message, walletMetadata, password, externalServerKeyShares, }: {
         message: string;
-        accountAddress: string;
+        walletMetadata: WalletMetadata;
         password?: string;
         externalServerKeyShares?: ServerKeyShare[];
     }): Promise<string>;
-    signTransaction({ senderAddress, transaction, password, externalServerKeyShares, sponsor, }: {
-        senderAddress: string;
+    signTransaction({ walletMetadata, transaction, password, externalServerKeyShares, sponsor, }: {
+        walletMetadata: WalletMetadata;
         transaction: VersionedTransaction | Transaction | string;
         password?: string;
         externalServerKeyShares?: ServerKeyShare[];
@@ -64,14 +63,14 @@ export declare class DynamicSvmWalletClient extends DynamicWalletClient {
         sponsor?: boolean;
     }): Promise<string>;
     /**
-     * Exports the private key for a given account address
+     * Exports the private key for a given wallet
      *
-     * @param accountAddress The account address to export the private key for
+     * @param walletMetadata Wallet metadata (the full object returned by createWalletAccount/importPrivateKey, with backupInfo merged from any subsequent updatePassword/refresh/reshare)
      * @param password The password for encrypted backup shares
      * @returns The private key
      */
-    exportPrivateKey({ accountAddress, password, externalServerKeyShares, }: {
-        accountAddress: string;
+    exportPrivateKey({ walletMetadata, password, externalServerKeyShares, }: {
+        walletMetadata: WalletMetadata;
         password?: string;
         externalServerKeyShares?: ServerKeyShare[];
     }): Promise<string>;
@@ -103,19 +102,18 @@ export declare class DynamicSvmWalletClient extends DynamicWalletClient {
      * @param chainName The chain name to import the private key for
      * @param thresholdSignatureScheme The threshold signature scheme to use
      * @param password The password for encrypted backup shares
-     * @returns The account address, raw public key, and client key shares
+     * @returns The walletMetadata, raw public key, and client key shares
      */
-    importPrivateKey({ privateKey, chainName, thresholdSignatureScheme, password, onError, backUpToClientShareService, }: {
+    importPrivateKey({ privateKey, chainName, thresholdSignatureScheme, password, onError, backUpToDynamic, }: {
         privateKey: string;
         chainName: string;
         thresholdSignatureScheme: ThresholdSignatureScheme;
         password?: string;
         onError?: (error: Error) => void;
-        backUpToClientShareService?: boolean;
+        backUpToDynamic?: boolean;
     }): Promise<{
-        accountAddress: string;
+        walletMetadata: WalletMetadata;
         rawPublicKey: Uint8Array | string | undefined;
-        /** @deprecated Use externalKeySharesWithBackupStatus instead */
         externalServerKeyShares: ServerKeyShare[];
         externalKeySharesWithBackupStatus: Array<{
             share: ServerKeyShare;
@@ -140,6 +138,14 @@ export declare class DynamicSvmWalletClient extends DynamicWalletClient {
         transaction: VersionedTransaction | Transaction;
         traceContext?: TraceContext;
     }): Promise<VersionedTransaction | Transaction>;
-    getSvmWallets(): Promise<import("@dynamic-labs-wallet/node").WalletProperties[]>;
+    getSvmWallets(): Promise<{
+        walletId: string;
+        chainName: string;
+        accountAddress: string;
+        externalServerKeySharesBackupInfo: import("@dynamic-labs-wallet/core").KeyShareBackupInfo;
+        externalServerKeyShares: never[];
+        derivationPath: string | undefined;
+        thresholdSignatureScheme: ThresholdSignatureScheme;
+    }[]>;
 }
 //# sourceMappingURL=client.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,cAAc,EACnB,mBAAmB,EACnB,KAAK,mBAAmB,EACxB,KAAK,wBAAwB,EAC7B,KAAK,YAAY,EAGjB,KAAK,wBAAwB,EAC7B,KAAK,cAAc,EAGpB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAW,WAAW,EAAE,oBAAoB,EAAa,MAAM,iBAAiB,CAAC;AAUxF,qBAAa,sBAAuB,SAAQ,mBAAmB;IAC7D,QAAQ,CAAC,SAAS,SAAS;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;gBAEZ,EACV,aAAa,EACb,UAAU,EACV,kBAAkB,EAClB,oBAAoB,EACpB,MAAM,EACN,KAAK,GACN,EAAE,wBAAwB;IAW3B;;;;;OAKG;IACG,mBAAmB,CAAC,EACxB,wBAAwB,EACxB,QAAQ,EACR,OAAO,EACP,eAAuB,GACxB,EAAE;QACD,wBAAwB,EAAE,wBAAwB,CAAC;QACnD,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;QACjC,eAAe,CAAC,EAAE,OAAO,CAAC;KAC3B,GAAG,OAAO,CAAC;QACV,cAAc,EAAE,cAAc,CAAC;QAC/B,YAAY,EAAE,UAAU,GAAG,MAAM,CAAC;QAClC,uBAAuB,EAAE,cAAc,EAAE,CAAC;QAC1C,iCAAiC,EAAE,KAAK,CAAC;YACvC,KAAK,EAAE,cAAc,CAAC;YACtB,+BAA+B,EAAE,OAAO,CAAC;SAC1C,CAAC,CAAC;KACJ,CAAC;IAoEI,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,UAAU;;;IAW5D;;;;;;OAMG;IACG,WAAW,CAAC,EAChB,OAAO,EACP,cAAc,EACd,QAAoB,EACpB,uBAAuB,GACxB,EAAE;QACD,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC;QAC7B,cAAc,EAAE,cAAc,CAAC;QAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,uBAAuB,CAAC,EAAE,cAAc,EAAE,CAAC;KAC5C;IA8BD;;;;;;;OAOG;IACG,cAAc,CAAC,EACnB,OAAO,EACP,cAAc,EACd,QAAoB,EACpB,uBAAuB,GACxB,EAAE;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,cAAc,EAAE,cAAc,CAAC;QAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,uBAAuB,CAAC,EAAE,cAAc,EAAE,CAAC;KAC5C;IA+BK,eAAe,CAAC,EACpB,cAAc,EACd,WAAW,EACX,QAAoB,EACpB,uBAAuB,EACvB,OAAe,GAChB,EAAE;QACD,cAAc,EAAE,cAAc,CAAC;QAC/B,WAAW,EAAE,oBAAoB,GAAG,WAAW,GAAG,MAAM,CAAC;QACzD,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,uBAAuB,CAAC,EAAE,cAAc,EAAE,CAAC;QAC3C,qEAAqE;QACrE,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,GAAG,OAAO,CAAC,MAAM,CAAC;IAmDnB;;;;;;OAMG;IACG,gBAAgB,CAAC,EACrB,cAAc,EACd,QAAoB,EACpB,uBAAuB,GACxB,EAAE;QACD,cAAc,EAAE,cAAc,CAAC;QAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,uBAAuB,CAAC,EAAE,cAAc,EAAE,CAAC;KAC5C;IAmBD;;;;;OAKG;IACG,uBAAuB,CAAC,EAC5B,SAAS,EACT,cAAc,GACf,EAAE;QACD,SAAS,EAAE,mBAAmB,EAAE,CAAC;QACjC,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB;;;IAgBD;;;;;OAKG;IACH,yBAAyB,CAAC,UAAU,EAAE,MAAM;IAM5C,0BAA0B,CAAC,UAAU,EAAE,MAAM;IAM7C,eAAe,CAAC,SAAS,EAAE,UAAU,GAAG,MAAM;IAM9C;;;;;;;;OAQG;IACG,gBAAgB,CAAC,EACrB,UAAU,EACV,SAAS,EACT,wBAAwB,EACxB,QAAQ,EACR,OAAO,EACP,eAAuB,GACxB,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;QACjC,eAAe,CAAC,EAAE,OAAO,CAAC;KAC3B,GAAG,OAAO,CAAC;QACV,cAAc,EAAE,cAAc,CAAC;QAC/B,YAAY,EAAE,UAAU,GAAG,MAAM,GAAG,SAAS,CAAC;QAC9C,uBAAuB,EAAE,cAAc,EAAE,CAAC;QAC1C,iCAAiC,EAAE,KAAK,CAAC;YACvC,KAAK,EAAE,cAAc,CAAC;YACtB,+BAA+B,EAAE,OAAO,CAAC;SAC1C,CAAC,CAAC;KACJ,CAAC;IAgEF;;;;;;;;;;;;;OAaG;IACG,kBAAkB,CAAC,EACvB,WAAW,EACX,YAAY,GACb,EAAE;QACD,WAAW,EAAE,oBAAoB,GAAG,WAAW,CAAC;QAChD,YAAY,CAAC,EAAE,YAAY,CAAC;KAC7B,GAAG,OAAO,CAAC,oBAAoB,GAAG,WAAW,CAAC;IAuBzC,aAAa;;;;;;;;;CAKpB"}