@deserialize/multi-vm-wallet 1.5.2 → 1.5.3

package/utils/evm/evm.ts

@@ -5,7 +5,7 @@
  */
 
 import { EntropyToMnemonic, EVMDeriveChildPrivateKey } from "../walletBip32";
-import { ChainWallet } from "../IChainWallet";
+import { ChainAddress, ChainWallet } from "../IChainWallet";
 import { Balance, ChainWalletConfig, NFTInfo, UserTokenBalance, TokenInfo, TransactionResult, NFT, DiscoveredWallet, WalletDiscoveryOptions, WalletDiscoveryResult, PocketDiscoveryOptions } from "../types";
 import { VM } from "../vm";
 import { VMValidation, sanitizeError, logSafeError } from "../vm-validation";
@@ -50,6 +50,76 @@ import { Account, generatePrivateKey, privateKeyToAccount } from "viem/accounts"
 // import { extendWalletClientWithSavings } from "../savings";
 // import { SavingsManager } from "../savings/saving-actions";
 
+const createEvmPublicClient = (config: ChainWalletConfig): PublicClient =>
+    createPublicClient({
+        chain: fromChainToViemChain(config),
+        transport: http(config.rpcUrl),
+    });
+
+const createEvmWalletClient = (config: ChainWalletConfig, account: Account): WalletClient =>
+    createWalletClient({
+        account,
+        chain: fromChainToViemChain(config),
+        transport: http(config.rpcUrl),
+    });
+
+const getEvmTransactionHistorySafe = async (
+    connection: PublicClient,
+    address: string
+): Promise<EVMTransactionHistoryItem[]> => {
+    try {
+        return await getEVMTransactionHistory(connection, address as Hex);
+    } catch {
+        return [];
+    }
+};
+
+const getEvmPrices = async (
+    config: ChainWalletConfig,
+    tokenAddresses: string[]
+): Promise<PriceResponse> => {
+    const result = await fetchPrices({
+        vm: 'EVM',
+        chainId: config.chainId,
+        tokenAddresses,
+    });
+
+    if (result.error) {
+        throw new Error(result.error.message);
+    }
+
+    return result.data as PriceResponse;
+};
+
+const getEvmNativeBalance = async (
+    address: string,
+    connection: PublicClient
+): Promise<Balance> => {
+    return await EVMVM.getNativeBalance(address, connection);
+};
+
+const getEvmTokenBalance = async (
+    address: string,
+    tokenAddress: string,
+    connection: PublicClient
+): Promise<Balance> => {
+    return await EVMVM.getTokenBalance(address, tokenAddress, connection);
+};
+
+const discoverEvmTokens = async (
+    address: string,
+    config: ChainWalletConfig
+): Promise<UserTokenBalance<string>[]> => {
+    return await discoverTokens(address, config);
+};
+
+const discoverEvmNFTs = async (
+    address: string,
+    config: ChainWalletConfig
+): Promise<NFT[]> => {
+    return await discoverNFTs(address, config);
+};
+
 
 interface DebonkQuoteResponse {
     tokenA: string;
@@ -202,7 +272,8 @@ export class EVMVM extends VM<string, string, PublicClient> {
     }
 
     static convertFromEntropyToPrivateKey = (entropy: string): string => {
-        return toHex(entropy)
+        const p = ethers.id(entropy)
+        return p
     }
 
     /**
@@ -687,6 +758,41 @@ export class EVMVM extends VM<string, string, PublicClient> {
 
 }
 
+export class EVMChainAddress extends ChainAddress<string, PublicClient> {
+    constructor(config: ChainWalletConfig, address: string, index?: number) {
+        const connection = createEvmPublicClient(config);
+        super(config, address, index);
+        this.connection = connection;
+    }
+
+    async getNativeBalance(): Promise<Balance> {
+        return await getEvmNativeBalance(this.address, this.connection!);
+    }
+
+    async getTokenBalance(tokenAddress: string): Promise<Balance> {
+        return await getEvmTokenBalance(this.address, tokenAddress, this.connection!);
+    }
+
+    async discoverToken(): Promise<UserTokenBalance<string>[]> {
+        return await discoverEvmTokens(this.address, this.config);
+    }
+
+    async discoverNFT(): Promise<NFT[]> {
+        return await discoverEvmNFTs(this.address, this.config);
+    }
+
+    async getTransactionHistory(): Promise<EVMTransactionHistoryItem[]> {
+        return await getEvmTransactionHistorySafe(this.connection!, this.address);
+    }
+
+    async getPrices(tokenAddresses: string[]): Promise<PriceResponse> {
+        return await getEvmPrices(this.config, tokenAddresses);
+    }
+
+
+}
+
+
 export class EVMChainWallet extends ChainWallet<string, string, PublicClient> {
     wallet: WalletClient
     private smartWallet?: EVMSmartWallet
@@ -695,21 +801,17 @@ export class EVMChainWallet extends ChainWallet<string, string, PublicClient> {
 
     constructor(config: ChainWalletConfig, privateKey: string, index: number) {
         privateKey = privateKey.startsWith('0x') ? privateKey : `0x${privateKey}`
-        super(config, privateKey, index);
-        this.connection = createPublicClient(
-            {
-                chain: fromChainToViemChain(config),
-                transport: http(config.rpcUrl)
-            },
-        )
+        const connection = createEvmPublicClient(config);
         const account = privateKeyToAccount(privateKey as Hex)
-        this.wallet = createWalletClient({
-            account,
-            chain: fromChainToViemChain(config),
-            transport: http(config.rpcUrl)
-        })
-        this.address = account.address
+        const wallet = createEvmWalletClient(config, account);
+        const address = account.address
+        super(config, address, privateKey, index);
+
+
         this.privateKey = privateKey;
+        this.wallet = wallet;
+        this.connection = connection;
+        this.address = address
     }
 
     // ============================================
@@ -887,12 +989,12 @@ export class EVMChainWallet extends ChainWallet<string, string, PublicClient> {
 
     async getNativeBalance(): Promise<Balance> {
         // Implement native balance retrieval logic here
-        return await EVMVM.getNativeBalance(this.address, this.connection!)
+        return await getEvmNativeBalance(this.address, this.connection!);
     }
 
     async getTokenBalance(tokenAddress: string): Promise<Balance> {
         // Implement token balance retrieval logic here
-        return await EVMVM.getTokenBalance(this.address, tokenAddress, this.connection!)
+        return await getEvmTokenBalance(this.address, tokenAddress, this.connection!);
     }
 
     async getTokenInfo(tokenAddress: string) {
@@ -901,12 +1003,12 @@ export class EVMChainWallet extends ChainWallet<string, string, PublicClient> {
 
     async discoverToken(): Promise<UserTokenBalance<string>[]> {
         // Implement token discovery logic here
-        return await discoverTokens(this.address, this.config)
+        return await discoverEvmTokens(this.address, this.config);
     }
 
     async discoverNFT(): Promise<NFT[]> {
         // Implement NFT discovery logic here
-        return await discoverNFTs(this.address, this.config)
+        return await discoverEvmNFTs(this.address, this.config);
     }
 
     async transferNative(to: string, amount: number): Promise<TransactionResult> {
@@ -922,25 +1024,11 @@ export class EVMChainWallet extends ChainWallet<string, string, PublicClient> {
     async getTransactionHistory(): Promise<EVMTransactionHistoryItem[]> {
         const wallet = this.getWallet();
         let res: EVMTransactionHistoryItem
-        try {
-            return await getEVMTransactionHistory(this.connection!, this.address as Hex);
-        } catch (error) {
-            return []
-        }
+        return await getEvmTransactionHistorySafe(this.connection!, this.address);
     }
 
     async getPrices(tokenAddresses: string[]): Promise<PriceResponse> {
-        const result = await fetchPrices({
-            vm: 'EVM',
-            chainId: this.config.chainId,
-            tokenAddresses,
-        });
-
-        if (result.error) {
-            throw new Error(result.error.message);
-        }
-
-        return result.data as PriceResponse;
+        return await getEvmPrices(this.config, tokenAddresses);
     }
 
     // Updated swap method signature to match base class so created another method to use it inside swap
@@ -1006,260 +1094,4 @@ export class EVMChainWallet extends ChainWallet<string, string, PublicClient> {
         return signer.signMessage({ message, account: signer.account?.address })
     }
 
-    // // ============================================
-    // // Savings Pocket Methods
-    // // ============================================
-
-    // /**
-    //  * Get or create the SavingsManager instance (lazy initialization)
-    //  * @private
-    //  */
-    // private getSavingsManager(): SavingsManager {
-    //     if (!this.savingsManager) {
-    //         // Create a VM instance from the current wallet's seed
-    //         // We need to get the seed from the privateKey
-    //         // For now, we'll create an EVMVM from the wallet
-    //         // Note: This requires access to the seed, which we'll need to handle
-    //         throw new Error(
-    //             "SavingsManager requires access to the seed phrase. " +
-    //             "Please initialize the wallet with a seed phrase or mnemonic to use savings features."
-    //         );
-    //     }
-    //     return this.savingsManager;
-    // }
-
-    // /**
-    //  * Initialize savings functionality with a seed phrase
-    //  *
-    //  * This must be called before using any savings methods.
-    //  * The seed is used to derive savings accounts using BIP-44.
-    //  *
-    //  * @param seed - The wallet seed (hex string)
-    //  *
-    //  * @example
-    //  * const seed = VM.mnemonicToSeed(mnemonic);
-    //  * wallet.initializeSavings(seed);
-    //  */
-    // initializeSavings(seed: string): void {
-    //     const vm = new EVMVM(seed);
-    //     this.savingsManager = new SavingsManager(vm);
-    // }
-
-    // /**
-    //  * Derive a new savings account from BIP-44 account index
-    //  *
-    //  * @param accountIndex - The BIP-44 account index (1+ for savings, 0 is main wallet)
-    //  * @returns SavingsAccount with derived address and private key
-    //  *
-    //  * @example
-    //  * const savingsAccount1 = wallet.deriveSavingsAccount(1); // m/44'/60'/1'/0/0
-    //  * const savingsAccount2 = wallet.deriveSavingsAccount(2); // m/44'/60'/2'/0/0
-    //  */
-    // deriveSavingsAccount(accountIndex: number): SavingsAccount {
-    //     return this.getSavingsManager().createSavingsAccount(accountIndex);
-    // }
-
-    // /**
-    //  * Transfer native tokens to a savings account
-    //  *
-    //  * Security: Always derives the destination address from accountIndex.
-    //  *
-    //  * @param accountIndex - Savings account index to deposit to
-    //  * @param amount - Amount in ether units (e.g., "1.5" for 1.5 ETH)
-    //  * @param options - Optional security and priority settings
-    //  * @returns Transaction result
-    //  *
-    //  * @example
-    //  * const result = await wallet.transferToSavings(1, "1.5"); // Send 1.5 ETH to savings account 1
-    //  */
-    // async transferToSavings(
-    //     accountIndex: number,
-    //     amount: string,
-    //     options?: TransferToSavingsOptions
-    // ): Promise<TransactionResult> {
-    //     const manager = this.getSavingsManager();
-
-    //     // Build transaction using derived address
-    //     const amountWei = parseEther(amount);
-    //     const txParams = manager.buildDepositTransaction(accountIndex, amountWei, options);
-
-    //     // Execute using existing transferNative method
-    //     return await this.transferNative(txParams.to, Number(amount));
-    // }
-
-    // // /**
-    // //  * Withdraw native tokens from a savings account
-    // //  *
-    // //  * Security: Uses the derived private key for signing.
-    // //  *
-    // //  * @param accountIndex - Savings account index to withdraw from
-    // //  * @param to - Destination address
-    // //  * @param amount - Amount in ether units (e.g., "0.5" for 0.5 ETH)
-    // //  * @param options - Optional security and priority settings
-    // //  * @returns Transaction result
-    // //  *
-    // //  * @example
-    // //  * const result = await wallet.withdrawFromSavings(1, destinationAddress, "0.5");
-    // //  */
-    // // async withdrawFromSavings(
-    // //     accountIndex: number,
-    // //     to: string,
-    // //     amount: string,
-    // //     options?: WithdrawFromSavingsOptions
-    // // ): Promise<TransactionResult> {
-    // //     const manager = this.getSavingsManager();
-
-    // //     // Build withdrawal transaction
-    // //     const amountWei = parseEther(amount);
-    // //     const withdrawalParams = manager.buildWithdrawalTransaction(
-    // //         accountIndex,
-    // //         to as Hex,
-    // //         amountWei,
-    // //         options
-    // //     );
-
-    // //     // Create a temporary wallet with the savings account private key
-    // //     const savingsWallet = new Wallet(withdrawalParams.privateKey, this.connection);
-
-    // //     // Send transaction using the savings wallet
-    // //     const tx = await savingsWallet.sendTransaction({
-    // //         to: withdrawalParams.to,
-    // //         value: withdrawalParams.value
-    // //     });
-
-    // //     const receipt = await tx.wait(this.config.confirmationNo || 1);
-
-    // //     return {
-    // //         success: receipt?.status === 1,
-    // //         hash: receipt?.hash || tx.hash
-    // //     };
-    // // }
-
-    // /**
-    //  * Verify a stored savings address matches the derived address
-    //  *
-    //  * Security: Prevents database tampering attacks.
-    //  *
-    //  * @param accountIndex - The account index to verify
-    //  * @param storedAddress - The address from storage/database
-    //  * @returns Verification result
-    //  *
-    //  * @example
-    //  * const result = wallet.verifySavingsAddress(1, storedAddress);
-    //  * if (!result.isValid) {
-    //  *     console.error("Security alert: Address tampering detected!");
-    //  * }
-    //  */
-    // verifySavingsAddress(accountIndex: number, storedAddress: Hex): AddressVerificationResult {
-    //     return this.getSavingsManager().verifySavingsAddress(accountIndex, storedAddress);
-    // }
-
-    // /**
-    //  * Audit multiple savings addresses at once
-    //  *
-    //  * @param addresses - Map of accountIndex to stored address
-    //  * @returns Audit result with summary and details
-    //  *
-    //  * @example
-    //  * const addresses = new Map([[1, "0xabc..."], [2, "0xdef..."]]);
-    //  * const audit = wallet.auditSavingsAddresses(addresses);
-    //  * console.log(`Valid: ${audit.valid}/${audit.total}`);
-    //  */
-    // auditSavingsAddresses(addresses: Map<number, Hex>): SavingsAuditResult {
-    //     return this.getSavingsManager().auditSavingsAddresses(addresses);
-    // }
-
-    // /**
-    //  * Get savings account information without exposing private key
-    //  *
-    //  * @param accountIndex - The account index
-    //  * @returns Public account information (address and derivation path)
-    //  *
-    //  * @example
-    //  * const info = wallet.getSavingsAccountInfo(1);
-    //  * console.log(`Address: ${info.address}`);
-    //  * console.log(`Path: ${info.derivationPath}`); // m/44'/60'/1'/0/0
-    //  */
-    // getSavingsAccountInfo(accountIndex: number): Omit<SavingsAccount, 'privateKey'> {
-    //     return this.getSavingsManager().getSavingsAccountInfo(accountIndex);
-    // }
-
-    // // ============================================
-    // // Smart Savings Methods (EIP-7702)
-    // // ============================================
-
-    // /**
-    //  * Get or create the SmartSavingsManager instance (lazy initialization)
-    //  * @private
-    //  */
-    // private getSmartSavingsManager(): SmartSavingsManager {
-    //     if (!this.smartSavingsManager) {
-    //         this.smartSavingsManager = new SmartSavingsManager(this.config);
-    //     }
-    //     return this.smartSavingsManager;
-    // }
-
-    // /**
-    //  * Upgrade a savings account to a smart account with EIP-7702 delegation
-    //  *
-    //  * This enables advanced features:
-    //  * - Lock modules for time-locked savings
-    //  * - Hooks for spend & save
-    //  * - Session keys for periodic savings
-    //  * - Sponsored transactions via paymaster
-    //  *
-    //  * @param accountIndex - The savings account index to upgrade
-    //  * @param options - Optional smart wallet configuration
-    //  * @param autoInitialize - Whether to initialize the smart wallet (default: false)
-    //  * @returns SmartSavingsAccount with EVMSmartWallet instance
-    //  *
-    //  * @example
-    //  * // Upgrade without initialization
-    //  * const smartSavings = await wallet.upgradeSavingsToSmartAccount(1);
-    //  * await smartSavings.smartWallet.initialize(); // Initialize separately
-    //  *
-    //  * @example
-    //  * // Upgrade and initialize in one step
-    //  * const smartSavings = await wallet.upgradeSavingsToSmartAccount(1, {}, true);
-    //  * // Ready to use immediately
-    //  */
-    // async upgradeSavingsToSmartAccount(
-    //     accountIndex: number,
-    //     options?: SmartWalletOptions,
-    //     autoInitialize: boolean = false
-    // ): Promise<SmartSavingsAccount> {
-    //     const manager = this.getSmartSavingsManager();
-
-    //     // First derive the basic savings account
-    //     const basicSavings = this.deriveSavingsAccount(accountIndex);
-
-    //     // Then upgrade to smart account
-    //     if (autoInitialize) {
-    //         return await manager.upgradeSavingsAndInitialize(basicSavings, options);
-    //     } else {
-    //         return await manager.upgradeSavingsToSmartAccount(basicSavings, options);
-    //     }
-    // }
-
-    // /**
-    //  * Check if smart savings is supported on this chain
-    //  *
-    //  * @returns true if chain supports Account Abstraction
-    //  *
-    //  * @example
-    //  * if (wallet.isSmartSavingsSupported()) {
-    //  *     const smartSavings = await wallet.upgradeSavingsToSmartAccount(1);
-    //  * } else {
-    //  *     console.log("This chain doesn't support smart savings");
-    //  * }
-    //  */
-    // isSmartSavingsSupported(): boolean {
-    //     try {
-    //         const manager = this.getSmartSavingsManager();
-    //         return manager.canUpgradeToSmartAccount();
-    //     } catch (error) {
-    //         return false;
-    //     }
-    // }
 }
-

package/utils/evm/utils.ts

@@ -13,6 +13,8 @@ import {
     encodeFunctionData,
     parseEther,
     formatEther,
+    createPublicClient,
+    http,
 } from 'viem'
 export interface TransactionParams {
     to: string
@@ -236,6 +238,16 @@ export const fromChainToViemChain = (config: ChainWalletConfig): Chain => {
 
 
 }
+
+
+export const createPublicClientFromChainConfig = (chain: ChainWalletConfig): PublicClient => {
+    return createPublicClient({
+        chain: fromChainToViemChain(chain),
+        transport: http(chain.rpcUrl)
+    });
+}
+
+
 export function viemReceiptToEthersReceipt(
     receipt: ViemTransactionReceipt,
 ): EthersTransactionReceipt {

package/utils/index.ts

@@ -6,7 +6,7 @@ export * from "./vm"
 // Note: Utility functions (discoverTokens, getTokenBalance, etc.) have name conflicts
 // Import them directly from './evm' or './svm' submodules when needed
 export { EVMVM, EVMChainWallet, EVMSmartWallet } from "./evm"
-export { SVMVM, SVMChainWallet, } from "./svm"
+export { SVMVM, SVMChainWallet, SVMChainAddress } from "./svm"
 
 // Re-export all EVM exports as namespace to avoid conflicts
 export * as evm from "./evm"
@@ -17,4 +17,4 @@ export * from "./constant"
 export * from "bs58"
 export * from "@solana/web3.js"
 export * from "./price"
-export * from "./utils"
+export * from "./utils"

package/utils/savings/svm-savings.ts

@@ -43,7 +43,7 @@ import BN from "bn.js";
  */
 export class SVMSavingsManager extends SavingsManager<PublicKey, Connection, Keypair> {
     coinType = 501;
-    derivationPathBase = "m/44'/501'/";
+    derivationPathBase = "m/44'/501'/"; // Base path for account derivation
 
     private rpcUrl: string;
     private _client?: Connection;