@dynamic-labs-wallet/node-btc 0.0.353 → 1.0.0-beta

package/index.cjs

@@ -66,24 +66,33 @@ class DynamicBtcWalletClient extends node.DynamicWalletClient {
         };
     }
     /**
-   * Gets wallet properties and derivation info for a given account address
-   * @param accountAddress - The account address
-   * @returns The wallet properties, derivation path, and address type
-   */ getWalletDerivationInfo(accountAddress) {
-        const walletProperties = this.walletMap[accountAddress];
-        if (!walletProperties) {
-            throw new Error('Wallet not found in walletMap');
-        }
-        const derivationPath = walletProperties.derivationPath;
+   * Extracts derivation path and address type from walletMetadata.
+   * @param walletMetadata - The wallet metadata
+   * @returns The derivation path and derived address type
+   */ getDerivationInfoFromMetadata(walletMetadata) {
+        const derivationPath = walletMetadata.derivationPath;
         if (!derivationPath) {
-            throw new Error('Derivation path missing in walletMap');
+            throw new Error('Derivation path missing in walletMetadata');
         }
         return {
-            walletProperties,
             derivationPath,
             addressType: btcUtils.getAddressTypeFromDerivationPath(derivationPath)
         };
     }
+    buildWalletMetadata({ walletId, accountAddress, thresholdSignatureScheme, addressType, bitcoinConfig }) {
+        const chainConfig = node.getMPCChainConfig(this.chainName, bitcoinConfig);
+        return {
+            walletId,
+            accountAddress,
+            chainName: this.chainName,
+            thresholdSignatureScheme,
+            derivationPath: JSON.stringify(Object.fromEntries(chainConfig.derivationPath.map((value, index)=>[
+                    index,
+                    value
+                ]))),
+            addressType
+        };
+    }
     /**
    * Verifies that the derived address matches the expected address
    * @param rawPublicKey - The raw public key
@@ -102,10 +111,10 @@ class DynamicBtcWalletClient extends node.DynamicWalletClient {
    * @param thresholdSignatureScheme - The threshold signature scheme to use for the wallet.
    * @param password - The password to use for the wallet.
    * @param onError - The function to call if an error occurs.
-   * @param backUpToClientShareService - Whether to back up the external server key shares to the client share service. By default, it is false.
+   * @param backUpToDynamic - Whether to back up the external server key shares to the client share service. By default, it is false.
    * @param bitcoinConfig - Bitcoin configuration (addressType, network)
    * @returns The account address, public key, raw public key, external server key shares, and wallet id.
-   */ async createWalletAccount({ thresholdSignatureScheme, password = undefined, onError, backUpToClientShareService = false, bitcoinConfig }) {
+   */ async createWalletAccount({ thresholdSignatureScheme, password, onError, backUpToDynamic = false, bitcoinConfig }) {
         try {
             if (!(bitcoinConfig == null ? void 0 : bitcoinConfig.addressType)) {
                 this.logger.warn('[BTC Node Client] addressType not provided for createWalletAccount, defaulting to native_segwit');
@@ -118,6 +127,7 @@ class DynamicBtcWalletClient extends node.DynamicWalletClient {
                 addressType,
                 network
             };
+            let resolvedWalletId;
             let ceremonyCeremonyCompleteResolver;
             let ceremonyAccountAddress;
             const ceremonyCompletePromise = new Promise((resolve)=>{
@@ -129,35 +139,17 @@ class DynamicBtcWalletClient extends node.DynamicWalletClient {
                 thresholdSignatureScheme,
                 skipLock: true,
                 bitcoinConfig: resolvedBitcoinConfig,
+                password,
+                backUpToDynamic,
                 onError,
                 onCeremonyComplete: (accountAddress, walletId)=>{
-                    // Store the ceremony account address to ensure consistency
                     ceremonyAccountAddress = accountAddress;
-                    // update wallet map
-                    const chainConfig = node.getMPCChainConfig(this.chainName, resolvedBitcoinConfig);
-                    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
-                        }
-                    });
+                    resolvedWalletId = walletId;
                     ceremonyCeremonyCompleteResolver(undefined);
                 }
             });
             await ceremonyCompletePromise;
-            if (!rawPublicKey || !externalServerKeyShares) {
+            if (!rawPublicKey || !externalServerKeyShares || !resolvedWalletId) {
                 throw new Error(ERROR_KEYGEN_FAILED);
             }
             const accountAddress = ceremonyAccountAddress || this.deriveAccountAddress({
@@ -165,19 +157,28 @@ class DynamicBtcWalletClient extends node.DynamicWalletClient {
                 addressType,
                 network
             }).accountAddress;
-            const externalKeySharesWithBackupStatus = await this.storeEncryptedBackupByWalletWithRetry({
+            const walletMetadata = this.buildWalletMetadata({
+                walletId: resolvedWalletId,
+                accountAddress,
+                thresholdSignatureScheme,
+                addressType,
+                bitcoinConfig: resolvedBitcoinConfig
+            });
+            const { keySharesWithBackupStatus, backupInfo } = await this.storeEncryptedBackupByWalletWithRetry({
                 accountAddress,
                 externalServerKeyShares,
                 password,
-                backUpToClientShareService
+                backUpToDynamic,
+                walletMetadata
             });
+            walletMetadata.externalServerKeySharesBackupInfo = backupInfo;
             const publicKeyHex = btcUtils.extractPublicKeyHex(rawPublicKey);
             return {
-                accountAddress,
+                walletMetadata,
                 rawPublicKey,
                 publicKeyHex,
                 externalServerKeyShares,
-                externalKeySharesWithBackupStatus
+                externalKeySharesWithBackupStatus: keySharesWithBackupStatus
             };
         } catch (error) {
             logError({
@@ -203,32 +204,29 @@ class DynamicBtcWalletClient extends node.DynamicWalletClient {
    * @param onError - Optional. Error callback function
    * @returns Promise resolving to the BIP-322 signature as a base64 string
    * @throws Error if required parameters are missing, derivation path is invalid, or signing fails
-   */ async signMessage({ message, accountAddress, network, password = undefined, externalServerKeyShares, context, onError }) {
+   */ async signMessage({ message, walletMetadata, network, password = undefined, externalServerKeyShares, context, onError }) {
+        const { accountAddress } = walletMetadata;
         try {
-            var _this_walletMap_accountAddress;
             if (!accountAddress) {
                 throw new Error(ERROR_ACCOUNT_ADDRESS_REQUIRED);
             }
-            const { derivationPath, addressType } = this.getWalletDerivationInfo(accountAddress);
-            // Attempt to recover key shares from backup if not provided
-            await this.ensureKeySharesRecovered({
+            const { derivationPath, addressType } = this.getDerivationInfoFromMetadata(walletMetadata);
+            // Resolve key shares from param or backup
+            const resolvedKeyShares = await this.resolveKeyShares({
                 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.'
+                errorMessage: 'External server key shares are required to sign a message. No backup shares available for recovery.',
+                walletMetadata
             });
-            const resolvedExternalServerKeyShares = externalServerKeyShares != null ? externalServerKeyShares : (_this_walletMap_accountAddress = this.walletMap[accountAddress]) == null ? void 0 : _this_walletMap_accountAddress.externalServerKeyShares;
-            if (!resolvedExternalServerKeyShares || resolvedExternalServerKeyShares.length === 0) {
-                throw new Error('External server key shares are required to sign a message');
-            }
             const bitcoinConfig = {
                 addressType,
                 network
             };
             const derivedPublicKey = await this.derivePublicKey({
                 chainName: this.chainName,
-                keyShare: resolvedExternalServerKeyShares[0],
+                keyShare: resolvedKeyShares[0],
                 derivationPath: new Uint32Array(Object.values(JSON.parse(derivationPath))),
                 bitcoinConfig
             });
@@ -255,13 +253,15 @@ class DynamicBtcWalletClient extends node.DynamicWalletClient {
                 accountAddress,
                 chainName: this.chainName,
                 password,
-                externalServerKeyShares: resolvedExternalServerKeyShares,
+                externalServerKeyShares: resolvedKeyShares,
                 isFormatted: true,
                 context: context != null ? context : {
                     btcMessage: message
                 },
                 bitcoinConfig: completeBitcoinConfig,
-                onError
+                onError,
+                walletMetadata,
+                passwordPreVerified: !(externalServerKeyShares == null ? void 0 : externalServerKeyShares.length) && !!password
             });
             const bip322Signature = btcUtils.encodeBip322Signature(toSignPsbt, pubKey, signature, addressType);
             return bip322Signature;
@@ -276,51 +276,43 @@ class DynamicBtcWalletClient extends node.DynamicWalletClient {
             if (onError) {
                 onError(error);
             }
-            throw new Error(ERROR_SIGN_MESSAGE);
+            throw new Error(ERROR_SIGN_MESSAGE, {
+                cause: error
+            });
         }
     }
     /**
    * Signs a Bitcoin transaction (PSBT)
    *
    * The address type is automatically derived from the wallet's derivation path.
-   * Only inputs belonging to the sender address are signed. Supports both TAPROOT
+   * Only inputs belonging to the account address are signed. Supports both TAPROOT
    * (BIP-341) and Native SegWit (BIP-143) signing methods.
    *
    * @param transaction - The PSBT to sign as a base64 string
-   * @param senderAddress - The sender address (must match inputs to be signed)
+   * @param accountAddress - The account address (must match inputs to be signed)
    * @param network - The Bitcoin network (MAINNET or TESTNET)
    * @param password - Optional password for encrypted backup shares
    * @param externalServerKeyShares - Optional external server key shares
    * @param context - Optional. Sign message context for API tracking
    * @param onError - Optional. Error callback function
    * @returns Promise resolving to the signed PSBT as a base64 string
-   * @throws Error if required parameters are missing, no inputs belong to sender address, or signing fails
-   */ async signTransaction({ transaction, senderAddress, network, password = undefined, externalServerKeyShares, context, onError }) {
+   * @throws Error if required parameters are missing, no inputs belong to account address, or signing fails
+   */ async signTransaction({ transaction, walletMetadata, network, password = undefined, externalServerKeyShares, context, onError }) {
+        const { accountAddress } = walletMetadata;
         try {
-            await this.verifyPassword({
-                accountAddress: senderAddress,
-                password
-            });
-            if (!senderAddress) {
+            if (!accountAddress) {
                 throw new Error(ERROR_ACCOUNT_ADDRESS_REQUIRED);
             }
-            const { derivationPath, addressType } = this.getWalletDerivationInfo(senderAddress);
-            // Attempt to recover key shares from backup if not provided
-            await this.ensureKeySharesRecovered({
-                accountAddress: senderAddress,
+            const { derivationPath, addressType } = this.getDerivationInfoFromMetadata(walletMetadata);
+            // Resolve key shares from param or backup
+            const resolvedKeyShares = await this.resolveKeyShares({
+                accountAddress,
                 password,
                 walletOperation: node.WalletOperation.SIGN_TRANSACTION,
                 externalServerKeyShares,
-                errorMessage: 'External server key shares are required to sign transaction. No backup shares available for recovery.'
+                errorMessage: 'External server key shares are required to sign transaction. No backup shares available for recovery.',
+                walletMetadata
             });
-            const updatedWalletProperties = this.walletMap[senderAddress];
-            if (!updatedWalletProperties) {
-                throw new Error('Wallet not found in walletMap after key share recovery');
-            }
-            const resolvedExternalServerKeyShares = externalServerKeyShares || updatedWalletProperties.externalServerKeyShares;
-            if (!resolvedExternalServerKeyShares || resolvedExternalServerKeyShares.length === 0) {
-                throw new Error('External server key shares are required to sign transaction. No backup shares available for recovery.');
-            }
             const bitcoinConfig = {
                 addressType,
                 network
@@ -328,7 +320,7 @@ class DynamicBtcWalletClient extends node.DynamicWalletClient {
             const psbt = bitcoin__namespace.Psbt.fromBase64(transaction);
             const derivedPublicKey = await this.derivePublicKey({
                 chainName: this.chainName,
-                keyShare: resolvedExternalServerKeyShares[0],
+                keyShare: resolvedKeyShares[0],
                 derivationPath: new Uint32Array(Object.values(JSON.parse(derivationPath))),
                 bitcoinConfig
             });
@@ -341,9 +333,9 @@ class DynamicBtcWalletClient extends node.DynamicWalletClient {
             const inputsToSign = psbt.data.inputs.map((input, i)=>({
                     input,
                     index: i
-                })).filter(({ input })=>btcUtils.doesInputBelongToAddress(input, senderAddress, network));
+                })).filter(({ input })=>btcUtils.doesInputBelongToAddress(input, accountAddress, network));
             if (inputsToSign.length === 0) {
-                throw new Error('No inputs found that belong to the sender address');
+                throw new Error('No inputs found that belong to the account address');
             }
             if (addressType === core.BitcoinAddressType.TAPROOT) {
                 const tweak = btcUtils.calculateTaprootTweak(pubKey);
@@ -359,14 +351,16 @@ class DynamicBtcWalletClient extends node.DynamicWalletClient {
                     const hash = Buffer.from(tx.hashForWitnessV1(i, prevOutScripts, values, bitcoin__namespace.Transaction.SIGHASH_DEFAULT));
                     const signature = await this.sign({
                         message: new Uint8Array(hash),
-                        accountAddress: senderAddress,
+                        accountAddress,
                         chainName: this.chainName,
                         password,
-                        externalServerKeyShares: resolvedExternalServerKeyShares,
+                        externalServerKeyShares: resolvedKeyShares,
                         isFormatted: true,
                         context,
                         bitcoinConfig: completeBitcoinConfig,
-                        onError
+                        onError,
+                        walletMetadata,
+                        passwordPreVerified: !(externalServerKeyShares == null ? void 0 : externalServerKeyShares.length) && !!password
                     });
                     const sigBuffer = btcUtils.convertSignatureToTaprootBuffer(signature);
                     psbt.updateInput(i, {
@@ -394,14 +388,16 @@ class DynamicBtcWalletClient extends node.DynamicWalletClient {
                     const hash = tx.hashForWitnessV0(i, scriptCode, value, bitcoin__namespace.Transaction.SIGHASH_ALL);
                     const signature = await this.sign({
                         message: new Uint8Array(hash),
-                        accountAddress: senderAddress,
+                        accountAddress,
                         chainName: this.chainName,
                         password,
-                        externalServerKeyShares: resolvedExternalServerKeyShares,
+                        externalServerKeyShares: resolvedKeyShares,
                         isFormatted: true,
                         context,
                         bitcoinConfig: completeBitcoinConfig,
-                        onError
+                        onError,
+                        walletMetadata,
+                        passwordPreVerified: !(externalServerKeyShares == null ? void 0 : externalServerKeyShares.length) && !!password
                     });
                     const derSignature = btcUtils.convertSignatureToDER(signature);
                     psbt.updateInput(i, {
@@ -421,7 +417,7 @@ class DynamicBtcWalletClient extends node.DynamicWalletClient {
                 message: ERROR_SIGN_TRANSACTION,
                 error: error,
                 context: {
-                    senderAddress
+                    accountAddress
                 }
             });
             if (onError) {
@@ -436,43 +432,21 @@ class DynamicBtcWalletClient extends node.DynamicWalletClient {
    * @param password - The password for encrypted backup shares
    * @param externalServerKeyShares - Optional external server key shares
    * @returns The private key in WIF format
-   */ async exportPrivateKey({ accountAddress, password = undefined, externalServerKeyShares }) {
-        await this.verifyPassword({
-            accountAddress,
-            password
-        });
-        // Attempt to recover key shares from backup if not provided
-        await this.ensureKeySharesRecovered({
-            accountAddress,
-            password,
-            walletOperation: node.WalletOperation.EXPORT_PRIVATE_KEY,
-            externalServerKeyShares,
-            errorMessage: 'External server key shares are required to export private key. No backup shares available for recovery.'
-        });
-        // Re-read wallet from map after recovery (it may have been updated with recovered shares)
-        const updatedWalletProperties = this.walletMap[accountAddress];
-        if (!updatedWalletProperties) {
-            throw new Error('Wallet not found in walletMap after recovery');
-        }
-        const derivationPath = updatedWalletProperties.derivationPath;
-        if (!derivationPath) {
-            throw new Error('Derivation path missing in walletMap');
-        }
-        // Derive address type from derivation path for bitcoinConfig
-        const addressType = btcUtils.getAddressTypeFromDerivationPath(derivationPath);
+   */ async exportPrivateKey({ walletMetadata, password = undefined, externalServerKeyShares }) {
+        const { accountAddress } = walletMetadata;
+        const { addressType } = this.getDerivationInfoFromMetadata(walletMetadata);
         const network = core.BitcoinNetwork.MAINNET; // Default to mainnet, could be derived from wallet
         const bitcoinConfig = {
             addressType,
             network
         };
-        // Get key shares from wallet map if not provided (recovered from backup)
-        const resolvedExternalServerKeyShares = externalServerKeyShares != null ? externalServerKeyShares : updatedWalletProperties.externalServerKeyShares;
         const { derivedPrivateKey } = await this.exportKey({
             accountAddress,
             chainName: this.chainName,
             password,
-            externalServerKeyShares: resolvedExternalServerKeyShares,
-            bitcoinConfig
+            externalServerKeyShares,
+            bitcoinConfig,
+            walletMetadata
         });
         if (!derivedPrivateKey) {
             throw new Error('Derived private key is undefined');
@@ -508,10 +482,10 @@ class DynamicBtcWalletClient extends node.DynamicWalletClient {
    * @param thresholdSignatureScheme - The threshold signature scheme to use for the wallet
    * @param password - The password to use for the wallet
    * @param onError - The function to call if an error occurs
-   * @param backUpToClientShareService - Whether to back up the external server key shares to the client share service. By default, it is false.
+   * @param backUpToDynamic - Whether to back up the external server key shares to the client share service. By default, it is false.
    * @param bitcoinConfig - Bitcoin configuration (addressType, network)
    * @returns The account address, public key, raw public key, external server key shares
-   */ async importPrivateKey({ privateKey, chainName, thresholdSignatureScheme, password = undefined, backUpToClientShareService = false, onError, bitcoinConfig }) {
+   */ async importPrivateKey({ privateKey, chainName, thresholdSignatureScheme, password, backUpToDynamic = false, onError, bitcoinConfig }) {
         try {
             const { addressType, network = core.BitcoinNetwork.MAINNET } = bitcoinConfig;
             if (!addressType) {
@@ -520,6 +494,7 @@ class DynamicBtcWalletClient extends node.DynamicWalletClient {
             if (addressType !== core.BitcoinAddressType.NATIVE_SEGWIT && addressType !== core.BitcoinAddressType.TAPROOT) {
                 throw new Error(`Invalid addressType: ${addressType}. Must be one of: ${core.BitcoinAddressType.NATIVE_SEGWIT}, ${core.BitcoinAddressType.TAPROOT}`);
             }
+            let resolvedWalletId;
             let ceremonyCeremonyCompleteResolver;
             let ceremonyAccountAddress;
             const ceremonyCompletePromise = new Promise((resolve)=>{
@@ -539,33 +514,22 @@ class DynamicBtcWalletClient extends node.DynamicWalletClient {
                 privateKey: formattedPrivateKey,
                 thresholdSignatureScheme,
                 bitcoinConfig,
+                password,
+                backUpToDynamic,
                 onError,
                 onCeremonyComplete: (accountAddress, walletId)=>{
-                    // Store the ceremony account address to ensure consistency
                     ceremonyAccountAddress = accountAddress;
+                    resolvedWalletId = walletId;
                     // Verify address matches
                     if (accountAddress !== expectedAddress) {
                         throw new Error(`Public address mismatch: derived address ${accountAddress} !== expected address ${expectedAddress}`);
                     }
-                    // update wallet map
-                    const chainConfig = node.getMPCChainConfig(this.chainName, bitcoinConfig);
-                    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()
-                    });
                     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');
             }
             // Use the ceremony account address if available, otherwise derive it from raw public key
@@ -577,19 +541,28 @@ class DynamicBtcWalletClient extends node.DynamicWalletClient {
             if (accountAddress !== expectedAddress) {
                 throw new Error(`Public address mismatch: derived address ${accountAddress} !== expected address ${expectedAddress}`);
             }
-            const externalKeySharesWithBackupStatus = await this.storeEncryptedBackupByWalletWithRetry({
+            const walletMetadata = this.buildWalletMetadata({
+                walletId: resolvedWalletId,
+                accountAddress,
+                thresholdSignatureScheme,
+                addressType,
+                bitcoinConfig
+            });
+            const { keySharesWithBackupStatus, backupInfo } = await this.storeEncryptedBackupByWalletWithRetry({
                 accountAddress,
                 externalServerKeyShares,
                 password,
-                backUpToClientShareService
+                backUpToDynamic,
+                walletMetadata
             });
+            walletMetadata.externalServerKeySharesBackupInfo = backupInfo;
             const publicKeyHex = btcUtils.extractPublicKeyHex(rawPublicKey);
             return {
-                accountAddress,
+                walletMetadata,
                 rawPublicKey,
                 publicKeyHex,
                 externalServerKeyShares,
-                externalKeySharesWithBackupStatus
+                externalKeySharesWithBackupStatus: keySharesWithBackupStatus
             };
         } catch (error) {
             logError({

package/index.esm.js

@@ -1,4 +1,4 @@
-import { createLogError, DynamicWalletClient, getMPCChainConfig, getExternalServerKeyShareBackupInfo, WalletOperation } from '@dynamic-labs-wallet/node';
+import { createLogError, DynamicWalletClient, getMPCChainConfig, WalletOperation } from '@dynamic-labs-wallet/node';
 import { BitcoinAddressType, BitcoinNetwork } from '@dynamic-labs-wallet/core';
 import { initEccLib, normalizePublicKey, publicKeyToBitcoinAddress, getAddressTypeFromDerivationPath, extractPublicKeyHex, calculateBip322Hash, calculateTaprootTweak, encodeBip322Signature, doesInputBelongToAddress, collectPSBTInputData, convertSignatureToTaprootBuffer, getBitcoinNetwork, convertSignatureToDER, privateKeyToWIF, wifToPrivateKey, getPublicKeyFromPrivateKey } from '@dynamic-labs-wallet/btc-utils';
 import * as bitcoin from 'bitcoinjs-lib';
@@ -44,24 +44,33 @@ class DynamicBtcWalletClient extends DynamicWalletClient {
         };
     }
     /**
-   * Gets wallet properties and derivation info for a given account address
-   * @param accountAddress - The account address
-   * @returns The wallet properties, derivation path, and address type
-   */ getWalletDerivationInfo(accountAddress) {
-        const walletProperties = this.walletMap[accountAddress];
-        if (!walletProperties) {
-            throw new Error('Wallet not found in walletMap');
-        }
-        const derivationPath = walletProperties.derivationPath;
+   * Extracts derivation path and address type from walletMetadata.
+   * @param walletMetadata - The wallet metadata
+   * @returns The derivation path and derived address type
+   */ getDerivationInfoFromMetadata(walletMetadata) {
+        const derivationPath = walletMetadata.derivationPath;
         if (!derivationPath) {
-            throw new Error('Derivation path missing in walletMap');
+            throw new Error('Derivation path missing in walletMetadata');
         }
         return {
-            walletProperties,
             derivationPath,
             addressType: getAddressTypeFromDerivationPath(derivationPath)
         };
     }
+    buildWalletMetadata({ walletId, accountAddress, thresholdSignatureScheme, addressType, bitcoinConfig }) {
+        const chainConfig = getMPCChainConfig(this.chainName, bitcoinConfig);
+        return {
+            walletId,
+            accountAddress,
+            chainName: this.chainName,
+            thresholdSignatureScheme,
+            derivationPath: JSON.stringify(Object.fromEntries(chainConfig.derivationPath.map((value, index)=>[
+                    index,
+                    value
+                ]))),
+            addressType
+        };
+    }
     /**
    * Verifies that the derived address matches the expected address
    * @param rawPublicKey - The raw public key
@@ -80,10 +89,10 @@ class DynamicBtcWalletClient extends DynamicWalletClient {
    * @param thresholdSignatureScheme - The threshold signature scheme to use for the wallet.
    * @param password - The password to use for the wallet.
    * @param onError - The function to call if an error occurs.
-   * @param backUpToClientShareService - Whether to back up the external server key shares to the client share service. By default, it is false.
+   * @param backUpToDynamic - Whether to back up the external server key shares to the client share service. By default, it is false.
    * @param bitcoinConfig - Bitcoin configuration (addressType, network)
    * @returns The account address, public key, raw public key, external server key shares, and wallet id.
-   */ async createWalletAccount({ thresholdSignatureScheme, password = undefined, onError, backUpToClientShareService = false, bitcoinConfig }) {
+   */ async createWalletAccount({ thresholdSignatureScheme, password, onError, backUpToDynamic = false, bitcoinConfig }) {
         try {
             if (!(bitcoinConfig == null ? void 0 : bitcoinConfig.addressType)) {
                 this.logger.warn('[BTC Node Client] addressType not provided for createWalletAccount, defaulting to native_segwit');
@@ -96,6 +105,7 @@ class DynamicBtcWalletClient extends DynamicWalletClient {
                 addressType,
                 network
             };
+            let resolvedWalletId;
             let ceremonyCeremonyCompleteResolver;
             let ceremonyAccountAddress;
             const ceremonyCompletePromise = new Promise((resolve)=>{
@@ -107,35 +117,17 @@ class DynamicBtcWalletClient extends DynamicWalletClient {
                 thresholdSignatureScheme,
                 skipLock: true,
                 bitcoinConfig: resolvedBitcoinConfig,
+                password,
+                backUpToDynamic,
                 onError,
                 onCeremonyComplete: (accountAddress, walletId)=>{
-                    // Store the ceremony account address to ensure consistency
                     ceremonyAccountAddress = accountAddress;
-                    // update wallet map
-                    const chainConfig = getMPCChainConfig(this.chainName, resolvedBitcoinConfig);
-                    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
-                        }
-                    });
+                    resolvedWalletId = walletId;
                     ceremonyCeremonyCompleteResolver(undefined);
                 }
             });
             await ceremonyCompletePromise;
-            if (!rawPublicKey || !externalServerKeyShares) {
+            if (!rawPublicKey || !externalServerKeyShares || !resolvedWalletId) {
                 throw new Error(ERROR_KEYGEN_FAILED);
             }
             const accountAddress = ceremonyAccountAddress || this.deriveAccountAddress({
@@ -143,19 +135,28 @@ class DynamicBtcWalletClient extends DynamicWalletClient {
                 addressType,
                 network
             }).accountAddress;
-            const externalKeySharesWithBackupStatus = await this.storeEncryptedBackupByWalletWithRetry({
+            const walletMetadata = this.buildWalletMetadata({
+                walletId: resolvedWalletId,
+                accountAddress,
+                thresholdSignatureScheme,
+                addressType,
+                bitcoinConfig: resolvedBitcoinConfig
+            });
+            const { keySharesWithBackupStatus, backupInfo } = await this.storeEncryptedBackupByWalletWithRetry({
                 accountAddress,
                 externalServerKeyShares,
                 password,
-                backUpToClientShareService
+                backUpToDynamic,
+                walletMetadata
             });
+            walletMetadata.externalServerKeySharesBackupInfo = backupInfo;
             const publicKeyHex = extractPublicKeyHex(rawPublicKey);
             return {
-                accountAddress,
+                walletMetadata,
                 rawPublicKey,
                 publicKeyHex,
                 externalServerKeyShares,
-                externalKeySharesWithBackupStatus
+                externalKeySharesWithBackupStatus: keySharesWithBackupStatus
             };
         } catch (error) {
             logError({
@@ -181,32 +182,29 @@ class DynamicBtcWalletClient extends DynamicWalletClient {
    * @param onError - Optional. Error callback function
    * @returns Promise resolving to the BIP-322 signature as a base64 string
    * @throws Error if required parameters are missing, derivation path is invalid, or signing fails
-   */ async signMessage({ message, accountAddress, network, password = undefined, externalServerKeyShares, context, onError }) {
+   */ async signMessage({ message, walletMetadata, network, password = undefined, externalServerKeyShares, context, onError }) {
+        const { accountAddress } = walletMetadata;
         try {
-            var _this_walletMap_accountAddress;
             if (!accountAddress) {
                 throw new Error(ERROR_ACCOUNT_ADDRESS_REQUIRED);
             }
-            const { derivationPath, addressType } = this.getWalletDerivationInfo(accountAddress);
-            // Attempt to recover key shares from backup if not provided
-            await this.ensureKeySharesRecovered({
+            const { derivationPath, addressType } = this.getDerivationInfoFromMetadata(walletMetadata);
+            // Resolve key shares from param or backup
+            const resolvedKeyShares = await this.resolveKeyShares({
                 accountAddress,
                 password,
                 walletOperation: WalletOperation.SIGN_MESSAGE,
                 externalServerKeyShares,
-                errorMessage: 'External server key shares are required to sign a message. No backup shares available for recovery.'
+                errorMessage: 'External server key shares are required to sign a message. No backup shares available for recovery.',
+                walletMetadata
             });
-            const resolvedExternalServerKeyShares = externalServerKeyShares != null ? externalServerKeyShares : (_this_walletMap_accountAddress = this.walletMap[accountAddress]) == null ? void 0 : _this_walletMap_accountAddress.externalServerKeyShares;
-            if (!resolvedExternalServerKeyShares || resolvedExternalServerKeyShares.length === 0) {
-                throw new Error('External server key shares are required to sign a message');
-            }
             const bitcoinConfig = {
                 addressType,
                 network
             };
             const derivedPublicKey = await this.derivePublicKey({
                 chainName: this.chainName,
-                keyShare: resolvedExternalServerKeyShares[0],
+                keyShare: resolvedKeyShares[0],
                 derivationPath: new Uint32Array(Object.values(JSON.parse(derivationPath))),
                 bitcoinConfig
             });
@@ -233,13 +231,15 @@ class DynamicBtcWalletClient extends DynamicWalletClient {
                 accountAddress,
                 chainName: this.chainName,
                 password,
-                externalServerKeyShares: resolvedExternalServerKeyShares,
+                externalServerKeyShares: resolvedKeyShares,
                 isFormatted: true,
                 context: context != null ? context : {
                     btcMessage: message
                 },
                 bitcoinConfig: completeBitcoinConfig,
-                onError
+                onError,
+                walletMetadata,
+                passwordPreVerified: !(externalServerKeyShares == null ? void 0 : externalServerKeyShares.length) && !!password
             });
             const bip322Signature = encodeBip322Signature(toSignPsbt, pubKey, signature, addressType);
             return bip322Signature;
@@ -254,51 +254,43 @@ class DynamicBtcWalletClient extends DynamicWalletClient {
             if (onError) {
                 onError(error);
             }
-            throw new Error(ERROR_SIGN_MESSAGE);
+            throw new Error(ERROR_SIGN_MESSAGE, {
+                cause: error
+            });
         }
     }
     /**
    * Signs a Bitcoin transaction (PSBT)
    *
    * The address type is automatically derived from the wallet's derivation path.
-   * Only inputs belonging to the sender address are signed. Supports both TAPROOT
+   * Only inputs belonging to the account address are signed. Supports both TAPROOT
    * (BIP-341) and Native SegWit (BIP-143) signing methods.
    *
    * @param transaction - The PSBT to sign as a base64 string
-   * @param senderAddress - The sender address (must match inputs to be signed)
+   * @param accountAddress - The account address (must match inputs to be signed)
    * @param network - The Bitcoin network (MAINNET or TESTNET)
    * @param password - Optional password for encrypted backup shares
    * @param externalServerKeyShares - Optional external server key shares
    * @param context - Optional. Sign message context for API tracking
    * @param onError - Optional. Error callback function
    * @returns Promise resolving to the signed PSBT as a base64 string
-   * @throws Error if required parameters are missing, no inputs belong to sender address, or signing fails
-   */ async signTransaction({ transaction, senderAddress, network, password = undefined, externalServerKeyShares, context, onError }) {
+   * @throws Error if required parameters are missing, no inputs belong to account address, or signing fails
+   */ async signTransaction({ transaction, walletMetadata, network, password = undefined, externalServerKeyShares, context, onError }) {
+        const { accountAddress } = walletMetadata;
         try {
-            await this.verifyPassword({
-                accountAddress: senderAddress,
-                password
-            });
-            if (!senderAddress) {
+            if (!accountAddress) {
                 throw new Error(ERROR_ACCOUNT_ADDRESS_REQUIRED);
             }
-            const { derivationPath, addressType } = this.getWalletDerivationInfo(senderAddress);
-            // Attempt to recover key shares from backup if not provided
-            await this.ensureKeySharesRecovered({
-                accountAddress: senderAddress,
+            const { derivationPath, addressType } = this.getDerivationInfoFromMetadata(walletMetadata);
+            // Resolve key shares from param or backup
+            const resolvedKeyShares = await this.resolveKeyShares({
+                accountAddress,
                 password,
                 walletOperation: WalletOperation.SIGN_TRANSACTION,
                 externalServerKeyShares,
-                errorMessage: 'External server key shares are required to sign transaction. No backup shares available for recovery.'
+                errorMessage: 'External server key shares are required to sign transaction. No backup shares available for recovery.',
+                walletMetadata
             });
-            const updatedWalletProperties = this.walletMap[senderAddress];
-            if (!updatedWalletProperties) {
-                throw new Error('Wallet not found in walletMap after key share recovery');
-            }
-            const resolvedExternalServerKeyShares = externalServerKeyShares || updatedWalletProperties.externalServerKeyShares;
-            if (!resolvedExternalServerKeyShares || resolvedExternalServerKeyShares.length === 0) {
-                throw new Error('External server key shares are required to sign transaction. No backup shares available for recovery.');
-            }
             const bitcoinConfig = {
                 addressType,
                 network
@@ -306,7 +298,7 @@ class DynamicBtcWalletClient extends DynamicWalletClient {
             const psbt = bitcoin.Psbt.fromBase64(transaction);
             const derivedPublicKey = await this.derivePublicKey({
                 chainName: this.chainName,
-                keyShare: resolvedExternalServerKeyShares[0],
+                keyShare: resolvedKeyShares[0],
                 derivationPath: new Uint32Array(Object.values(JSON.parse(derivationPath))),
                 bitcoinConfig
             });
@@ -319,9 +311,9 @@ class DynamicBtcWalletClient extends DynamicWalletClient {
             const inputsToSign = psbt.data.inputs.map((input, i)=>({
                     input,
                     index: i
-                })).filter(({ input })=>doesInputBelongToAddress(input, senderAddress, network));
+                })).filter(({ input })=>doesInputBelongToAddress(input, accountAddress, network));
             if (inputsToSign.length === 0) {
-                throw new Error('No inputs found that belong to the sender address');
+                throw new Error('No inputs found that belong to the account address');
             }
             if (addressType === BitcoinAddressType.TAPROOT) {
                 const tweak = calculateTaprootTweak(pubKey);
@@ -337,14 +329,16 @@ class DynamicBtcWalletClient extends DynamicWalletClient {
                     const hash = Buffer.from(tx.hashForWitnessV1(i, prevOutScripts, values, bitcoin.Transaction.SIGHASH_DEFAULT));
                     const signature = await this.sign({
                         message: new Uint8Array(hash),
-                        accountAddress: senderAddress,
+                        accountAddress,
                         chainName: this.chainName,
                         password,
-                        externalServerKeyShares: resolvedExternalServerKeyShares,
+                        externalServerKeyShares: resolvedKeyShares,
                         isFormatted: true,
                         context,
                         bitcoinConfig: completeBitcoinConfig,
-                        onError
+                        onError,
+                        walletMetadata,
+                        passwordPreVerified: !(externalServerKeyShares == null ? void 0 : externalServerKeyShares.length) && !!password
                     });
                     const sigBuffer = convertSignatureToTaprootBuffer(signature);
                     psbt.updateInput(i, {
@@ -372,14 +366,16 @@ class DynamicBtcWalletClient extends DynamicWalletClient {
                     const hash = tx.hashForWitnessV0(i, scriptCode, value, bitcoin.Transaction.SIGHASH_ALL);
                     const signature = await this.sign({
                         message: new Uint8Array(hash),
-                        accountAddress: senderAddress,
+                        accountAddress,
                         chainName: this.chainName,
                         password,
-                        externalServerKeyShares: resolvedExternalServerKeyShares,
+                        externalServerKeyShares: resolvedKeyShares,
                         isFormatted: true,
                         context,
                         bitcoinConfig: completeBitcoinConfig,
-                        onError
+                        onError,
+                        walletMetadata,
+                        passwordPreVerified: !(externalServerKeyShares == null ? void 0 : externalServerKeyShares.length) && !!password
                     });
                     const derSignature = convertSignatureToDER(signature);
                     psbt.updateInput(i, {
@@ -399,7 +395,7 @@ class DynamicBtcWalletClient extends DynamicWalletClient {
                 message: ERROR_SIGN_TRANSACTION,
                 error: error,
                 context: {
-                    senderAddress
+                    accountAddress
                 }
             });
             if (onError) {
@@ -414,43 +410,21 @@ class DynamicBtcWalletClient extends DynamicWalletClient {
    * @param password - The password for encrypted backup shares
    * @param externalServerKeyShares - Optional external server key shares
    * @returns The private key in WIF format
-   */ async exportPrivateKey({ accountAddress, password = undefined, externalServerKeyShares }) {
-        await this.verifyPassword({
-            accountAddress,
-            password
-        });
-        // Attempt to recover key shares from backup if not provided
-        await this.ensureKeySharesRecovered({
-            accountAddress,
-            password,
-            walletOperation: WalletOperation.EXPORT_PRIVATE_KEY,
-            externalServerKeyShares,
-            errorMessage: 'External server key shares are required to export private key. No backup shares available for recovery.'
-        });
-        // Re-read wallet from map after recovery (it may have been updated with recovered shares)
-        const updatedWalletProperties = this.walletMap[accountAddress];
-        if (!updatedWalletProperties) {
-            throw new Error('Wallet not found in walletMap after recovery');
-        }
-        const derivationPath = updatedWalletProperties.derivationPath;
-        if (!derivationPath) {
-            throw new Error('Derivation path missing in walletMap');
-        }
-        // Derive address type from derivation path for bitcoinConfig
-        const addressType = getAddressTypeFromDerivationPath(derivationPath);
+   */ async exportPrivateKey({ walletMetadata, password = undefined, externalServerKeyShares }) {
+        const { accountAddress } = walletMetadata;
+        const { addressType } = this.getDerivationInfoFromMetadata(walletMetadata);
         const network = BitcoinNetwork.MAINNET; // Default to mainnet, could be derived from wallet
         const bitcoinConfig = {
             addressType,
             network
         };
-        // Get key shares from wallet map if not provided (recovered from backup)
-        const resolvedExternalServerKeyShares = externalServerKeyShares != null ? externalServerKeyShares : updatedWalletProperties.externalServerKeyShares;
         const { derivedPrivateKey } = await this.exportKey({
             accountAddress,
             chainName: this.chainName,
             password,
-            externalServerKeyShares: resolvedExternalServerKeyShares,
-            bitcoinConfig
+            externalServerKeyShares,
+            bitcoinConfig,
+            walletMetadata
         });
         if (!derivedPrivateKey) {
             throw new Error('Derived private key is undefined');
@@ -486,10 +460,10 @@ class DynamicBtcWalletClient extends DynamicWalletClient {
    * @param thresholdSignatureScheme - The threshold signature scheme to use for the wallet
    * @param password - The password to use for the wallet
    * @param onError - The function to call if an error occurs
-   * @param backUpToClientShareService - Whether to back up the external server key shares to the client share service. By default, it is false.
+   * @param backUpToDynamic - Whether to back up the external server key shares to the client share service. By default, it is false.
    * @param bitcoinConfig - Bitcoin configuration (addressType, network)
    * @returns The account address, public key, raw public key, external server key shares
-   */ async importPrivateKey({ privateKey, chainName, thresholdSignatureScheme, password = undefined, backUpToClientShareService = false, onError, bitcoinConfig }) {
+   */ async importPrivateKey({ privateKey, chainName, thresholdSignatureScheme, password, backUpToDynamic = false, onError, bitcoinConfig }) {
         try {
             const { addressType, network = BitcoinNetwork.MAINNET } = bitcoinConfig;
             if (!addressType) {
@@ -498,6 +472,7 @@ class DynamicBtcWalletClient extends DynamicWalletClient {
             if (addressType !== BitcoinAddressType.NATIVE_SEGWIT && addressType !== BitcoinAddressType.TAPROOT) {
                 throw new Error(`Invalid addressType: ${addressType}. Must be one of: ${BitcoinAddressType.NATIVE_SEGWIT}, ${BitcoinAddressType.TAPROOT}`);
             }
+            let resolvedWalletId;
             let ceremonyCeremonyCompleteResolver;
             let ceremonyAccountAddress;
             const ceremonyCompletePromise = new Promise((resolve)=>{
@@ -517,33 +492,22 @@ class DynamicBtcWalletClient extends DynamicWalletClient {
                 privateKey: formattedPrivateKey,
                 thresholdSignatureScheme,
                 bitcoinConfig,
+                password,
+                backUpToDynamic,
                 onError,
                 onCeremonyComplete: (accountAddress, walletId)=>{
-                    // Store the ceremony account address to ensure consistency
                     ceremonyAccountAddress = accountAddress;
+                    resolvedWalletId = walletId;
                     // Verify address matches
                     if (accountAddress !== expectedAddress) {
                         throw new Error(`Public address mismatch: derived address ${accountAddress} !== expected address ${expectedAddress}`);
                     }
-                    // update wallet map
-                    const chainConfig = getMPCChainConfig(this.chainName, bitcoinConfig);
-                    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()
-                    });
                     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');
             }
             // Use the ceremony account address if available, otherwise derive it from raw public key
@@ -555,19 +519,28 @@ class DynamicBtcWalletClient extends DynamicWalletClient {
             if (accountAddress !== expectedAddress) {
                 throw new Error(`Public address mismatch: derived address ${accountAddress} !== expected address ${expectedAddress}`);
             }
-            const externalKeySharesWithBackupStatus = await this.storeEncryptedBackupByWalletWithRetry({
+            const walletMetadata = this.buildWalletMetadata({
+                walletId: resolvedWalletId,
+                accountAddress,
+                thresholdSignatureScheme,
+                addressType,
+                bitcoinConfig
+            });
+            const { keySharesWithBackupStatus, backupInfo } = await this.storeEncryptedBackupByWalletWithRetry({
                 accountAddress,
                 externalServerKeyShares,
                 password,
-                backUpToClientShareService
+                backUpToDynamic,
+                walletMetadata
             });
+            walletMetadata.externalServerKeySharesBackupInfo = backupInfo;
             const publicKeyHex = extractPublicKeyHex(rawPublicKey);
             return {
-                accountAddress,
+                walletMetadata,
                 rawPublicKey,
                 publicKeyHex,
                 externalServerKeyShares,
-                externalKeySharesWithBackupStatus
+                externalKeySharesWithBackupStatus: keySharesWithBackupStatus
             };
         } catch (error) {
             logError({

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@dynamic-labs-wallet/node-btc",
-  "version": "0.0.353",
+  "version": "1.0.0-beta",
   "license": "MIT",
   "type": "module",
   "dependencies": {
-    "@dynamic-labs-wallet/core": "0.0.353",
-    "@dynamic-labs-wallet/node": "0.0.353",
-    "@dynamic-labs-wallet/btc-utils": "0.0.353",
+    "@dynamic-labs-wallet/core": "1.0.0-beta",
+    "@dynamic-labs-wallet/node": "1.0.0-beta",
+    "@dynamic-labs-wallet/btc-utils": "1.0.0-beta",
     "@dynamic-labs/sdk-api-core": "^0.0.984",
     "bitcoinjs-lib": "^7.0.0",
     "tiny-secp256k1": "^2.2.3"

package/src/client/client.d.ts

@@ -1,4 +1,4 @@
-import { DynamicWalletClient, type DynamicWalletClientProps, type ServerKeyShare, type ThresholdSignatureScheme, type EcdsaPublicKey, type BIP340KeygenResult, type EcdsaKeygenResult, type WalletProperties } from '@dynamic-labs-wallet/node';
+import { DynamicWalletClient, type DynamicWalletClientProps, type ServerKeyShare, type ThresholdSignatureScheme, type EcdsaPublicKey, type BIP340KeygenResult, type EcdsaKeygenResult, type WalletMetadata, type WalletProperties } from '@dynamic-labs-wallet/node';
 import type { SignMessageContext } from '@dynamic-labs/sdk-api-core';
 import { BitcoinAddressType, BitcoinNetwork, type BitcoinConfig } from '@dynamic-labs-wallet/core';
 export declare class DynamicBtcWalletClient extends DynamicWalletClient {
@@ -22,11 +22,12 @@ export declare class DynamicBtcWalletClient extends DynamicWalletClient {
         accountAddress: string;
     };
     /**
-     * Gets wallet properties and derivation info for a given account address
-     * @param accountAddress - The account address
-     * @returns The wallet properties, derivation path, and address type
+     * Extracts derivation path and address type from walletMetadata.
+     * @param walletMetadata - The wallet metadata
+     * @returns The derivation path and derived address type
      */
-    private getWalletDerivationInfo;
+    private getDerivationInfoFromMetadata;
+    private buildWalletMetadata;
     /**
      * Verifies that the derived address matches the expected address
      * @param rawPublicKey - The raw public key
@@ -40,21 +41,20 @@ export declare class DynamicBtcWalletClient extends DynamicWalletClient {
      * @param thresholdSignatureScheme - The threshold signature scheme to use for the wallet.
      * @param password - The password to use for the wallet.
      * @param onError - The function to call if an error occurs.
-     * @param backUpToClientShareService - Whether to back up the external server key shares to the client share service. By default, it is false.
+     * @param backUpToDynamic - Whether to back up the external server key shares to the client share service. By default, it is false.
      * @param bitcoinConfig - Bitcoin configuration (addressType, network)
      * @returns The account address, public key, raw public key, external server key shares, and wallet id.
      */
-    createWalletAccount({ thresholdSignatureScheme, password, onError, backUpToClientShareService, bitcoinConfig, }: {
+    createWalletAccount({ thresholdSignatureScheme, password, onError, backUpToDynamic, bitcoinConfig, }: {
         thresholdSignatureScheme: ThresholdSignatureScheme;
         password?: string;
         onError?: (error: Error) => void;
-        backUpToClientShareService?: boolean;
+        backUpToDynamic?: boolean;
         bitcoinConfig?: BitcoinConfig;
     }): Promise<{
-        accountAddress: string;
+        walletMetadata: WalletMetadata;
         publicKeyHex: string;
         rawPublicKey: EcdsaPublicKey | Uint8Array | string | undefined;
-        /** @deprecated Use externalKeySharesWithBackupStatus instead */
         externalServerKeyShares: ServerKeyShare[];
         externalKeySharesWithBackupStatus: Array<{
             share: ServerKeyShare;
@@ -77,9 +77,9 @@ export declare class DynamicBtcWalletClient extends DynamicWalletClient {
      * @returns Promise resolving to the BIP-322 signature as a base64 string
      * @throws Error if required parameters are missing, derivation path is invalid, or signing fails
      */
-    signMessage({ message, accountAddress, network, password, externalServerKeyShares, context, onError, }: {
+    signMessage({ message, walletMetadata, network, password, externalServerKeyShares, context, onError, }: {
         message: string;
-        accountAddress: string;
+        walletMetadata: WalletMetadata;
         network: BitcoinNetwork;
         password?: string;
         externalServerKeyShares?: ServerKeyShare[];
@@ -90,22 +90,22 @@ export declare class DynamicBtcWalletClient extends DynamicWalletClient {
      * Signs a Bitcoin transaction (PSBT)
      *
      * The address type is automatically derived from the wallet's derivation path.
-     * Only inputs belonging to the sender address are signed. Supports both TAPROOT
+     * Only inputs belonging to the account address are signed. Supports both TAPROOT
      * (BIP-341) and Native SegWit (BIP-143) signing methods.
      *
      * @param transaction - The PSBT to sign as a base64 string
-     * @param senderAddress - The sender address (must match inputs to be signed)
+     * @param accountAddress - The account address (must match inputs to be signed)
      * @param network - The Bitcoin network (MAINNET or TESTNET)
      * @param password - Optional password for encrypted backup shares
      * @param externalServerKeyShares - Optional external server key shares
      * @param context - Optional. Sign message context for API tracking
      * @param onError - Optional. Error callback function
      * @returns Promise resolving to the signed PSBT as a base64 string
-     * @throws Error if required parameters are missing, no inputs belong to sender address, or signing fails
+     * @throws Error if required parameters are missing, no inputs belong to account address, or signing fails
      */
-    signTransaction({ transaction, senderAddress, network, password, externalServerKeyShares, context, onError, }: {
+    signTransaction({ transaction, walletMetadata, network, password, externalServerKeyShares, context, onError, }: {
         transaction: string;
-        senderAddress: string;
+        walletMetadata: WalletMetadata;
         network: BitcoinNetwork;
         password?: string;
         externalServerKeyShares?: ServerKeyShare[];
@@ -119,8 +119,8 @@ export declare class DynamicBtcWalletClient extends DynamicWalletClient {
      * @param externalServerKeyShares - Optional external server key shares
      * @returns The private key in WIF format
      */
-    exportPrivateKey({ accountAddress, password, externalServerKeyShares, }: {
-        accountAddress: string;
+    exportPrivateKey({ walletMetadata, password, externalServerKeyShares, }: {
+        walletMetadata: WalletMetadata;
         password?: string;
         externalServerKeyShares?: ServerKeyShare[];
     }): Promise<string>;
@@ -143,23 +143,22 @@ export declare class DynamicBtcWalletClient extends DynamicWalletClient {
      * @param thresholdSignatureScheme - The threshold signature scheme to use for the wallet
      * @param password - The password to use for the wallet
      * @param onError - The function to call if an error occurs
-     * @param backUpToClientShareService - Whether to back up the external server key shares to the client share service. By default, it is false.
+     * @param backUpToDynamic - Whether to back up the external server key shares to the client share service. By default, it is false.
      * @param bitcoinConfig - Bitcoin configuration (addressType, network)
      * @returns The account address, public key, raw public key, external server key shares
      */
-    importPrivateKey({ privateKey, chainName, thresholdSignatureScheme, password, backUpToClientShareService, onError, bitcoinConfig, }: {
+    importPrivateKey({ privateKey, chainName, thresholdSignatureScheme, password, backUpToDynamic, onError, bitcoinConfig, }: {
         privateKey: string;
         chainName: string;
         thresholdSignatureScheme: ThresholdSignatureScheme;
         password?: string;
-        backUpToClientShareService?: boolean;
+        backUpToDynamic?: boolean;
         onError?: (error: Error) => void;
         bitcoinConfig: BitcoinConfig;
     }): Promise<{
-        accountAddress: string;
+        walletMetadata: WalletMetadata;
         publicKeyHex: string;
         rawPublicKey: EcdsaPublicKey | Uint8Array | string | undefined;
-        /** @deprecated Use externalKeySharesWithBackupStatus instead */
         externalServerKeyShares: ServerKeyShare[];
         externalKeySharesWithBackupStatus: Array<{
             share: ServerKeyShare;

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":"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"}