@deserialize/multi-vm-wallet 1.5.35 → 1.6.0

package/utils/constant.ts

@@ -15,7 +15,21 @@ export const DefaultChains: ChainWalletConfig[] = [{
     logoUrl: "https://solana.com/src/img/branding/solanaLogoMark.svg",
     vmType: "SVM",
     savings: {
-        tokens: []
+        supported: true,
+        tokens: [
+            {
+                name: "USDC",
+                symbol: "USDC",
+                decimals: 6,
+                address: "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
+            },
+            {
+                name: "USDT",
+                symbol: "USDT",
+                decimals: 6,
+                address: "Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB"
+            }
+        ]
     }
 }
 
@@ -34,6 +48,7 @@ export const DefaultChains: ChainWalletConfig[] = [{
     logoUrl: "https://push.org/assets/website/favicons/favicon.svg",
     vmType: "EVM",
     savings: {
+        supported: false,
         tokens: []
     }
 }
@@ -53,7 +68,24 @@ export const DefaultChains: ChainWalletConfig[] = [{
     },
     testnet: false,
     logoUrl: "https://etherscan.io/images/svg/brands/ethereum-original-light.svg",
-    vmType: "EVM"
+    vmType: "EVM",
+    savings: {
+        supported: true,
+        tokens: [{
+            name: "USDC",
+            symbol: "USDC",
+            decimals: 6,
+            address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"
+        },
+        {
+            name: "USDT",
+            symbol: "USDT",
+            decimals: 6,
+            address: "0xdac17f958d2ee523a2206206994597c13d831ec7"
+        }
+
+        ]
+    }
 }, {
     chainId: 56,
     name: "BSC",
@@ -68,7 +100,18 @@ export const DefaultChains: ChainWalletConfig[] = [{
     logoUrl: "https://bscscan.com/assets/bsc/images/svg/logos/token-light.svg?v=25.10.5.0",
     vmType: "EVM",
     savings: {
-        tokens: []
+        supported: true,
+        tokens: [
+
+            {
+                name: "BUSD",
+                symbol: "BUSD",
+                decimals: 6,
+                address: "0x55d398326f99059fF775485246999027B3197955"
+            }
+
+
+        ]
     }
 },
 
@@ -101,7 +144,15 @@ export const DefaultChains: ChainWalletConfig[] = [{
     logoUrl: "https://avatars.githubusercontent.com/u/108554348?s=200&v=4",
     vmType: "EVM",
     savings: {
-        tokens: []
+        supported: true,
+        tokens: [
+            {
+                name: "USDC",
+                symbol: "USDC",
+                decimals: 6,
+                address: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913"
+            }
+        ]
     }
 },
 
@@ -119,6 +170,7 @@ export const DefaultChains: ChainWalletConfig[] = [{
     logoUrl: "https://avatars.githubusercontent.com/u/119917794?s=280&v=4",
     vmType: "EVM",
     savings: {
+        supported: false,
         tokens: []
     }
 },
@@ -136,6 +188,7 @@ export const DefaultChains: ChainWalletConfig[] = [{
     logoUrl: "https://avatars.githubusercontent.com/u/58791460?s=280&v=4",
     vmType: "EVM",
     savings: {
+        supported: false,
         tokens: []
     }
 },
@@ -155,6 +208,7 @@ export const DefaultChains: ChainWalletConfig[] = [{
     logoUrl: "https://polygonscan.com/images/svg/brands/polygon-light.svg?v=0.0.36",
     vmType: "EVM",
     savings: {
+        supported: false,
         tokens: []
     }
 }

package/utils/evm/evm.ts

@@ -806,7 +806,7 @@ export class EVMVM extends VM<string, string, PublicClient> {
             try {
                 // Pocket derivation: m/44'/60'/{accountIndex+1}'/0/{walletIndex}
                 const pocketIndex = accountIndex + 1;
-                const derivationPath = `m/44'/60'/${pocketIndex}'/0/${walletIndex}'`;
+                const derivationPath = `m/44'/60'/${pocketIndex}'/0/${walletIndex}`;
 
                 // Derive pocket
                 const { privateKey } = EVMDeriveChildPrivateKey(this.seed, walletIndex, `m/44'/60'/${pocketIndex}'/0/`);

package/utils/savings/evm-savings.ts

@@ -119,9 +119,10 @@ export class EVMSavingsManager extends SavingsManager<Hex, PublicClient, WalletC
 
         // Add 1 to preserve index 0 for main wallet
         const pocketIndex = accountIndex + 1;
-        const derivationPath = `${this.derivationPathBase}${pocketIndex}'/0/${this.walletIndex}`;
+        const derivationPathBase = `${this.derivationPathBase}${pocketIndex}'/0/`;
+        const derivationPath = `${derivationPathBase}${this.walletIndex}'`;
         const seed = mnemonicToSeed(this.mnemonic);
-        const { privateKey } = EVMDeriveChildPrivateKey(seed, this.walletIndex, derivationPath);
+        const { privateKey } = EVMDeriveChildPrivateKey(seed, this.walletIndex, derivationPathBase);
         const wallet = new ethers.Wallet(privateKey);
 
         const pocket: Pocket<Hex> = {
@@ -142,9 +143,10 @@ export class EVMSavingsManager extends SavingsManager<Hex, PublicClient, WalletC
      */
     getMainWallet() {
         this.checkNotDisposed();
-        const derivationPath = `${this.derivationPathBase}0'/0/${this.walletIndex}`;
+        const derivationPathBase = `${this.derivationPathBase}0'/0/`;
+        const derivationPath = `${derivationPathBase}${this.walletIndex}'`;
         const seed = mnemonicToSeed(this.mnemonic);
-        const { privateKey } = EVMDeriveChildPrivateKey(seed, this.walletIndex, derivationPath);
+        const { privateKey } = EVMDeriveChildPrivateKey(seed, this.walletIndex, derivationPathBase);
         const wallet = new ethers.Wallet(privateKey);
 
         return {

package/utils/savings/multi-chain-savings.ts

@@ -132,14 +132,13 @@ export class MultiChainSavingsManager {
             throw new Error(`Chain with id '${chain.id}' already exists`);
         }
 
-        this.chainConfigs.set(chain.id, chain);
-
         if (chain.type === 'EVM') {
             const manager = new EVMSavingsManager(
                 this.mnemonic,
                 chain.config as ChainWalletConfig,
                 this.walletIndex
             );
+            this.chainConfigs.set(chain.id, chain);
             this.evmManagers.set(chain.id, manager);
         } else if (chain.type === 'SVM') {
             const config = chain.config as { rpcUrl: string };
@@ -151,6 +150,7 @@ export class MultiChainSavingsManager {
                 config.rpcUrl,
                 this.walletIndex
             );
+            this.chainConfigs.set(chain.id, chain);
             this.svmManagers.set(chain.id, manager);
         } else {
             throw new Error(`Unknown chain type: ${chain.type}`);

package/utils/savings/saving-manager.ts

@@ -1,4 +1,4 @@
-import { EVMDeriveChildPrivateKey, GenerateSeed, mnemonicToSeed } from "../walletBip32";
+import { EVMDeriveChildPrivateKey, mnemonicToSeed } from "../walletBip32";
 import { ethers } from "ethers";
 import { WalletClient, PublicClient, Hex, Chain, createWalletClient, createPublicClient, http } from "viem";
 import { } from "../utils";
@@ -141,11 +141,12 @@ export class BaseSavingsManager {
 
         //? for the sake of derivation we will add one to the index of the pocket that was passed so as to preserve the index 0 as the main wallet index
         const pocketIndex = accountIndex + 1
-        const derivationPath = `m/44'/60'/${pocketIndex}'/0/${this.walletIndex}`;
-        const { privateKey } = EVMDeriveChildPrivateKey(mnemonicToSeed(this.mnemonic), this.walletIndex, derivationPath);
+        const derivationPathBase = `m/44'/60'/${pocketIndex}'/0/`;
+        const derivationPath = `${derivationPathBase}${this.walletIndex}'`;
+        const { privateKey } = EVMDeriveChildPrivateKey(mnemonicToSeed(this.mnemonic), this.walletIndex, derivationPathBase);
         const wallet = new ethers.Wallet(privateKey);
         const pocket = { privateKey, address: wallet.address, derivationPath, index: pocketIndex };
-        this.pockets.set(pocketIndex, pocket);
+        this.pockets.set(accountIndex, pocket);
         return pocket;
     }
 
@@ -164,8 +165,13 @@ export class BaseSavingsManager {
      * ```
      */
     getMainWallet() {
-        const mainWalletDerivationPath = `m/44'/60'/0'/0/${this.walletIndex}`;
-        const { privateKey } = EVMDeriveChildPrivateKey(this.mnemonic, this.walletIndex, mainWalletDerivationPath);
+        const mainWalletDerivationPathBase = `m/44'/60'/0'/0/`;
+        const mainWalletDerivationPath = `${mainWalletDerivationPathBase}${this.walletIndex}'`;
+        const { privateKey } = EVMDeriveChildPrivateKey(
+            mnemonicToSeed(this.mnemonic),
+            this.walletIndex,
+            mainWalletDerivationPathBase
+        );
         const wallet = new ethers.Wallet(privateKey);
         return { privateKey, address: wallet.address, derivationPath: mainWalletDerivationPath };
     }
@@ -185,8 +191,7 @@ export class BaseSavingsManager {
      */
     getMainWalletAddress(): Hex {
         if (this.masterAddress) return this.masterAddress;
-        const { privateKey } = this.getMainWallet()
-        return new ethers.Wallet(privateKey).address as Hex
+        return this.getMainWallet().address as Hex
     }
 
     /**
@@ -342,8 +347,8 @@ export class BaseSavingsManager {
      * ```
      */
     accountFromPocketId(p: number): Account {
-        // Validation is done in derivePocket
-        return privateKeyToAccount(`0x${this.derivePocket(p).privateKey}`)
+        // Validation is done in getPocket
+        return privateKeyToAccount(`0x${this.getPocket(p).privateKey}`)
     }
 
     /**
@@ -599,16 +604,13 @@ export class SavingsManager extends BaseSavingsManager {
      * Withdraws either native tokens or ERC-20 tokens from a pocket to the main wallet.
      *
      * @param pocketIndex - Index of the pocket to withdraw from
-     * @param amountInEther - Amount to send (interpreted as bigint, not actual ether units)
+     * @param amount - Amount to send in base units
      * @param token - Token address or "native" for native blockchain token
      * @returns Transaction result containing hash and success status
      *
      * @throws Error if validation fails
      *
      * @remarks
-     * Despite the parameter name, amountInEther is actually interpreted as a raw bigint value,
-     * not converted from ether units. Consider renaming to `amount` for clarity.
-     *
      * @example
      * ```typescript
      * // Send native token from pocket to main wallet
@@ -626,13 +628,11 @@ export class SavingsManager extends BaseSavingsManager {
      * );
      * ```
      */
-    async sendToMainWallet(pocketIndex: number, amountInEther: number, token: Hex | "native"): Promise<TransactionResult> {
+    async sendToMainWallet(pocketIndex: number, amount: bigint, token: Hex | "native"): Promise<TransactionResult> {
         // Validate inputs
         SavingsValidation.validateAccountIndex(pocketIndex);
 
-        if (typeof amountInEther !== 'number' || amountInEther <= 0) {
-            throw new Error(`Amount must be a positive number, got: ${amountInEther}`);
-        }
+        SavingsValidation.validateAmount(amount, 'Transfer amount');
 
         if (token !== 'native') {
             SavingsValidation.validateAddress(token, 'Token address');
@@ -648,9 +648,9 @@ export class SavingsManager extends BaseSavingsManager {
             }
         )
         if (token === "native") {
-            return await sendNativeToken(walletClient, this.client, mainWalletAddress, BigInt(amountInEther))
+            return await sendNativeToken(walletClient, this.client, mainWalletAddress, amount)
         }
-        const res = await sendERC20Token(walletClient, this.client, token, mainWalletAddress as Hex, BigInt(amountInEther))
+        const res = await sendERC20Token(walletClient, this.client, token, mainWalletAddress as Hex, amount)
         return res
     }
 }

package/utils/savings/savings-operations.ts

@@ -44,7 +44,7 @@ import { EVMDeriveChildPrivateKey, mnemonicToSeed } from "../walletBip32";
 export interface TransferFromPocketOptions {
     /** Wallet index in derivation path (default: 0) */
     walletIndex?: number;
-    /** Account/pocket index to transfer from (1-based, 0 is main wallet) */
+    /** Pocket index to transfer from (0-based) */
     accountIndex: number;
     /** Destination address */
     to: string;
@@ -76,7 +76,7 @@ export interface TransferTokenFromPocketOptions extends Omit<TransferFromPocketO
 export interface GetPocketBalanceOptions {
     /** Wallet index in derivation path (default: 0) */
     walletIndex?: number;
-    /** Account/pocket index (1-based, 0 is main wallet) */
+    /** Pocket index (0-based) */
     accountIndex: number;
 }
 
@@ -129,7 +129,7 @@ export class SavingsOperations {
      * Derives a savings pocket wallet from mnemonic
      *
      * @param mnemonic - BIP-39 mnemonic phrase
-     * @param accountIndex - Account/pocket index (1-based, 0 is main wallet)
+     * @param accountIndex - Pocket index (0-based)
      * @param walletIndex - Wallet index (default: 0)
      * @param provider - RPC provider to connect wallet to
      * @returns Derived wallet, address, and cleanup function
@@ -137,7 +137,7 @@ export class SavingsOperations {
      * @remarks
      * IMPORTANT: Always call cleanup() when done with the wallet to zero out private key
      *
-     * Derivation path: m/44'/60'/{accountIndex}'/0/{walletIndex}'
+     * Derivation path: m/44'/60'/{accountIndex + 1}'/0/{walletIndex}'
      *
      * @throws Error if validation fails
      *
@@ -154,9 +154,10 @@ export class SavingsOperations {
         SavingsValidation.validateAccountIndex(accountIndex);
         SavingsValidation.validateWalletIndex(walletIndex);
 
-        // Derive pocket private key
+        // Derive pocket private key (account 0 is main wallet, so pockets start at +1)
+        const pocketIndex = accountIndex + 1;
         const seed = mnemonicToSeed(mnemonic);
-        const { privateKey } = EVMDeriveChildPrivateKey(seed, walletIndex, `m/44'/60'/${accountIndex}'/`);
+        const { privateKey } = EVMDeriveChildPrivateKey(seed, walletIndex, `m/44'/60'/${pocketIndex}'/0/`);
 
         // Create wallet
         const wallet = new Wallet(privateKey, provider);
@@ -473,7 +474,7 @@ export class SavingsOperations {
      * Get the address of a savings pocket without storing credentials
      *
      * @param mnemonic - BIP-39 mnemonic phrase
-     * @param accountIndex - Account/pocket index
+     * @param accountIndex - Pocket index (0-based)
      * @param walletIndex - Wallet index (default: 0)
      * @returns Pocket address
      *
@@ -495,9 +496,10 @@ export class SavingsOperations {
         SavingsValidation.validateAccountIndex(accountIndex);
         SavingsValidation.validateWalletIndex(walletIndex);
 
-        // Derive address
+        // Derive address (account 0 is main wallet, so pockets start at +1)
+        const pocketIndex = accountIndex + 1;
         const seed = mnemonicToSeed(mnemonic);
-        const { privateKey } = EVMDeriveChildPrivateKey(seed, walletIndex, `m/44'/60'/${accountIndex}'/`);
+        const { privateKey } = EVMDeriveChildPrivateKey(seed, walletIndex, `m/44'/60'/${pocketIndex}'/0/`);
         const wallet = new Wallet(privateKey);
         const address = wallet.address;
 

package/utils/savings/svm-savings.ts

@@ -98,6 +98,13 @@ export class SVMSavingsManager extends SavingsManager<PublicKey, Connection, Key
         this._client = undefined;
     }
 
+    private toSafeNumberAmount(amount: bigint, label: string): number {
+        if (amount > BigInt(Number.MAX_SAFE_INTEGER)) {
+            throw new Error(`${label} exceeds Number.MAX_SAFE_INTEGER and cannot be represented safely: ${amount}`);
+        }
+        return Number(amount);
+    }
+
     /**
      * Derive a savings pocket at the specified account index
      *
@@ -110,9 +117,10 @@ export class SVMSavingsManager extends SavingsManager<PublicKey, Connection, Key
 
         // Add 1 to preserve index 0 for main wallet
         const pocketIndex = accountIndex + 1;
-        const derivationPath = `${this.derivationPathBase}${pocketIndex}'/0/${this.walletIndex}`;
+        const derivationPathBase = `${this.derivationPathBase}${pocketIndex}'/0/`;
+        const derivationPath = `${derivationPathBase}${this.walletIndex}'`;
         const seed = mnemonicToSeed(this.mnemonic);
-        const keypair = SVMDeriveChildPrivateKey(seed, this.walletIndex, derivationPath);
+        const keypair = SVMDeriveChildPrivateKey(seed, this.walletIndex, derivationPathBase);
 
         const pocket: Pocket<PublicKey> = {
             privateKey: keypair,
@@ -132,9 +140,10 @@ export class SVMSavingsManager extends SavingsManager<PublicKey, Connection, Key
      */
     getMainWallet() {
         this.checkNotDisposed();
-        const derivationPath = `${this.derivationPathBase}0'/0/${this.walletIndex}`;
+        const derivationPathBase = `${this.derivationPathBase}0'/0/`;
+        const derivationPath = `${derivationPathBase}${this.walletIndex}'`;
         const seed = mnemonicToSeed(this.mnemonic);
-        const keypair = SVMDeriveChildPrivateKey(seed, this.walletIndex, derivationPath);
+        const keypair = SVMDeriveChildPrivateKey(seed, this.walletIndex, derivationPathBase);
 
         return {
             privateKey: keypair,
@@ -262,7 +271,7 @@ export class SVMSavingsManager extends SavingsManager<PublicKey, Connection, Key
         const tx = await getTransferNativeTransaction(
             mainWallet,
             pocket.address,
-            Number(amount),
+            this.toSafeNumberAmount(amount, 'Native transfer amount'),
             this.client
         );
 
@@ -297,7 +306,7 @@ export class SVMSavingsManager extends SavingsManager<PublicKey, Connection, Key
             mainWallet,
             pocket.address,
             tokenInfo as any,  // TokenInfo type
-            Number(amount),
+            this.toSafeNumberAmount(amount, 'Token transfer amount'),
             this.client
         );
 
@@ -365,7 +374,7 @@ export class SVMSavingsManager extends SavingsManager<PublicKey, Connection, Key
             const tx = await getTransferNativeTransaction(
                 pocket.privateKey,
                 mainWalletAddress,
-                Number(amount),
+                this.toSafeNumberAmount(amount, 'Native withdrawal amount'),
                 this.client
             );
             const hash = await signAndSendTransaction(tx, this.client, pocket.privateKey);
@@ -376,7 +385,7 @@ export class SVMSavingsManager extends SavingsManager<PublicKey, Connection, Key
             pocket.privateKey,
             mainWalletAddress,
             token as any,  // TokenInfo type
-            Number(amount),
+            this.toSafeNumberAmount(amount, 'Token withdrawal amount'),
             this.client
         );
 

package/utils/test.ts

@@ -399,7 +399,7 @@ const testAddressClass = async () => {
     const evmAddressClass = new EVMChainAddress(evmChainConfig, "0xC9C1D854b82BA9b4FB6f6D58E9EF3d1fAEd601AA", 0)
     const res = await evmAddressClass.getNativeBalance()
     console.log('res: ', res);
-
+SVMVM.generateMnemonicFromPrivateKey
     // const svmAddressClass = new SVMChainAddress( )
 }
 testAddressClass()

package/utils/types.ts

@@ -25,7 +25,8 @@ export interface ChainWalletConfig {
 }
 
 export interface ChainSavingConfig {
-    tokens: string[]; // List of token addresses to track for savings
+    supported: boolean; // Whether savings tracking is supported on this chain
+    tokens: TokenInfo[]; // List of token addresses to track for savings
 
 }