@deserialize/multi-vm-wallet 1.6.2 → 1.6.3

package/dist/constant.js

@@ -33,24 +33,6 @@ exports.DefaultChains = [{
             ]
         }
     },
-    {
-        chainId: 42101,
-        name: "Push Chain Donut Testnet",
-        rpcUrl: "https://evm.donut.rpc.push.org",
-        explorerUrl: "https://donut.push.network",
-        nativeToken: {
-            name: "PC",
-            symbol: "PC",
-            decimals: 18,
-        },
-        testnet: true,
-        logoUrl: "https://push.org/assets/website/favicons/favicon.svg",
-        vmType: "EVM",
-        savings: {
-            supported: false,
-            tokens: []
-        }
-    },
     {
         chainId: 1,
         name: "Ethereum",
@@ -166,24 +148,6 @@ exports.DefaultChains = [{
             tokens: []
         }
     },
-    {
-        chainId: 137,
-        name: "Polygon",
-        rpcUrl: "https://polygon-mainnet.g.alchemy.com/v2/TFdA4BilCnKIwaqtypk0d",
-        explorerUrl: "https://polygonscan.com",
-        nativeToken: {
-            name: "MATIC",
-            symbol: "MATIC",
-            decimals: 18,
-        },
-        testnet: false,
-        logoUrl: "https://polygonscan.com/images/svg/brands/polygon-light.svg?v=0.0.36",
-        vmType: "EVM",
-        savings: {
-            supported: false,
-            tokens: []
-        }
-    }
 ];
 exports.TRANSACTION_TYPE = {
     NATIVE_TRANSFER: 'NATIVE_TRANSFER',

package/dist/evm/utils.d.ts

@@ -181,6 +181,18 @@ export declare function viemReceiptToEthersReceipt(receipt: ViemTransactionRecei
 export declare const getNativeBalance: (address: Hex, client: PublicClient) => Promise<Balance>;
 export declare const getTokenInfo: (tokenAddress: Hex, client: PublicClient) => Promise<TokenInfo>;
 export declare const getTokenBalance: (tokenAddress: Hex, walletAddress: Hex, client: PublicClient) => Promise<Balance>;
+export declare const signAndSend: (walletClient: WalletClient, publicClient: PublicClient, params: {
+    to: Hex;
+    data?: Hex;
+    value?: bigint;
+    gas?: bigint;
+    nonce?: number;
+    maxFeePerGas?: bigint;
+    maxPriorityFeePerGas?: bigint;
+}, confirmations?: number) => Promise<{
+    hash: Hex;
+    success: boolean;
+}>;
 export declare const signSendAndConfirm: (walletClient: WalletClient, publicClient: PublicClient, params: {
     to: Hex;
     data?: Hex;
@@ -190,8 +202,14 @@ export declare const signSendAndConfirm: (walletClient: WalletClient, publicClie
     maxFeePerGas?: bigint;
     maxPriorityFeePerGas?: bigint;
 }, confirmations?: number) => Promise<TransactionResult>;
-export declare const sendNativeToken: (walletClient: WalletClient, publicClient: PublicClient, to: Hex, amount: string | bigint, confirmations?: number) => Promise<TransactionResult>;
-export declare const sendERC20Token: (walletClient: WalletClient, publicClient: PublicClient, tokenAddress: Hex, to: Hex, amount: bigint, confirmations?: number) => Promise<TransactionResult>;
+export declare const sendNativeToken: (walletClient: WalletClient, publicClient: PublicClient, to: Hex, amount: string | bigint, confirmations?: number) => Promise<{
+    hash: Hex;
+    success: boolean;
+}>;
+export declare const sendERC20Token: (walletClient: WalletClient, publicClient: PublicClient, tokenAddress: Hex, to: Hex, amount: bigint, confirmations?: number) => Promise<{
+    hash: Hex;
+    success: boolean;
+}>;
 export declare const getGasPrices: (client: PublicClient) => Promise<{
     gasPrice: undefined;
     maxFeePerGas: bigint;

package/dist/evm/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNFTCollection = exports.discoverAllNFTs = exports.discoverNFTs = exports.transformEVMNFTToUnified = exports.discoverTokens = exports.safeApprove = exports.resetAllowance = exports.checkAndApprove = exports.approveTokenUnlimited = exports.approveToken = exports.isAllowanceSufficient = exports.checkAllowance = exports.estimateGas = exports.getGasPrices = exports.sendERC20Token = exports.sendNativeToken = exports.signSendAndConfirm = exports.getTokenBalance = exports.getTokenInfo = exports.getNativeBalance = exports.createPublicClientFromChainConfig = exports.fromChainToViemChain = exports.ERC20_ABI = exports.DESERIALIZED_SUPPORTED_CHAINS = void 0;
+exports.getNFTCollection = exports.discoverAllNFTs = exports.discoverNFTs = exports.transformEVMNFTToUnified = exports.discoverTokens = exports.safeApprove = exports.resetAllowance = exports.checkAndApprove = exports.approveTokenUnlimited = exports.approveToken = exports.isAllowanceSufficient = exports.checkAllowance = exports.estimateGas = exports.getGasPrices = exports.sendERC20Token = exports.sendNativeToken = exports.signSendAndConfirm = exports.signAndSend = exports.getTokenBalance = exports.getTokenInfo = exports.getNativeBalance = exports.createPublicClientFromChainConfig = exports.fromChainToViemChain = exports.ERC20_ABI = exports.DESERIALIZED_SUPPORTED_CHAINS = void 0;
 exports.viemReceiptToEthersReceipt = viemReceiptToEthersReceipt;
 exports.calcGasTotal = calcGasTotal;
 exports.toPrecisionWithoutTrailingZeros = toPrecisionWithoutTrailingZeros;
@@ -205,6 +205,27 @@ const getTokenBalance = async (tokenAddress, walletAddress, client) => {
     };
 };
 exports.getTokenBalance = getTokenBalance;
+const signAndSend = async (walletClient, publicClient, params, confirmations = 1) => {
+    if (walletClient.account === undefined) {
+        throw new Error("wallet Client is not Initialized with an Account");
+    }
+    const hash = await walletClient.sendTransaction({
+        to: params.to,
+        data: params.data,
+        value: params.value,
+        gas: params.gas,
+        nonce: params.nonce,
+        maxFeePerGas: params.maxFeePerGas,
+        maxPriorityFeePerGas: params.maxPriorityFeePerGas,
+        account: walletClient.account,
+        chain: publicClient.chain,
+    });
+    return {
+        hash,
+        success: !!hash,
+    };
+};
+exports.signAndSend = signAndSend;
 const signSendAndConfirm = async (walletClient, publicClient, params, confirmations = 1) => {
     if (walletClient.account === undefined) {
         throw new Error("wallet Client is not Initialized with an Account");
@@ -218,7 +239,7 @@ const signSendAndConfirm = async (walletClient, publicClient, params, confirmati
         maxFeePerGas: params.maxFeePerGas,
         maxPriorityFeePerGas: params.maxPriorityFeePerGas,
         account: walletClient.account,
-        chain: publicClient.chain
+        chain: publicClient.chain,
     });
     const receipt = await publicClient.waitForTransactionReceipt({
         hash,
@@ -238,7 +259,7 @@ const signSendAndConfirm = async (walletClient, publicClient, params, confirmati
 exports.signSendAndConfirm = signSendAndConfirm;
 const sendNativeToken = async (walletClient, publicClient, to, amount, confirmations = 1) => {
     const value = typeof amount === 'string' ? (0, viem_1.parseEther)(amount) : amount;
-    return (0, exports.signSendAndConfirm)(walletClient, publicClient, { to, value }, confirmations);
+    return (0, exports.signAndSend)(walletClient, publicClient, { to, value }, confirmations);
 };
 exports.sendNativeToken = sendNativeToken;
 const sendERC20Token = async (walletClient, publicClient, tokenAddress, to, amount, confirmations = 1) => {
@@ -247,7 +268,7 @@ const sendERC20Token = async (walletClient, publicClient, tokenAddress, to, amou
         functionName: 'transfer',
         args: [to, amount],
     });
-    return (0, exports.signSendAndConfirm)(walletClient, publicClient, { to: tokenAddress, data }, confirmations);
+    return (0, exports.signAndSend)(walletClient, publicClient, { to: tokenAddress, data }, confirmations);
 };
 exports.sendERC20Token = sendERC20Token;
 const getGasPrices = async (client) => {

package/dist/test.js

@@ -59,6 +59,16 @@ const OgChainConfig = {
     vmType: "EVM",
     logoUrl: ""
 };
+const ethereumChainConfig = {
+    chainId: chains_1.mainnet.id,
+    name: chains_1.mainnet.name,
+    rpcUrl: chains_1.mainnet.rpcUrls.default.http[0],
+    explorerUrl: "",
+    nativeToken: chains_1.mainnet.nativeCurrency,
+    confirmationNo: 1,
+    vmType: "EVM",
+    logoUrl: ""
+};
 const wallet = new evm_1.EVMChainWallet(evmChainConfig, evmPrivateKeyExposed, 0);
 const walletA = new evm_1.EVMChainWallet(evmChainConfig, evmPrivateKeyExposed, 0);
 const walletB = new evm_1.EVMChainWallet(evmChainConfig, evmPrivKey, 0);
@@ -164,8 +174,11 @@ const testSavingsPocketSVM = async () => {
 };
 const testSavingsPocketMultiChain = async () => {
     console.log('\n========== Multi-Chain Savings Test ==========');
-    const mnemonic = evm_1.EVMVM.generateMnemonicFromPrivateKey(evmPrivateKeyExposed);
-    console.log('Mnemonic:', mnemonic);
+    const mnemonic = "exit alert stove save pair brass toss scheme shuffle loan gadget lunch";
+    const vm = new evm_1.EVMVM(evm_1.EVMVM.mnemonicToSeed(mnemonic));
+    const index = 1;
+    const wallet = new evm_1.EVMChainWallet(ethereumChainConfig, vm.generatePrivateKey(index).privateKey, index);
+    return;
     const multiChainManager = new savings_1.MultiChainSavingsManager(mnemonic, [
         {
             id: 'base',
@@ -173,7 +186,7 @@ const testSavingsPocketMultiChain = async () => {
             config: evmChainConfig
         },
         {
-            id: 'ethereum',
+            id: '1',
             type: 'EVM',
             config: {
                 chainId: 1,
@@ -193,6 +206,8 @@ const testSavingsPocketMultiChain = async () => {
             }
         }
     ], 0);
+    console.log('main wallet address', multiChainManager.getMainWalletAddress("1"));
+    return;
     console.log('\nAvailable chains:', multiChainManager.getChains());
     console.log('EVM chains:', multiChainManager.getEVMChains());
     console.log('SVM chains:', multiChainManager.getSVMChains());
@@ -207,32 +222,11 @@ const testSavingsPocketMultiChain = async () => {
     console.log('  Base === Ethereum?', baseAddress === ethAddress, '✅');
     console.log('  Base === Solana?', baseAddress === solAddress, '❌ (different chain type)');
     console.log('\n📊 Getting balances across all chains...');
-    try {
-        const balances = await multiChainManager.getPocketBalanceAcrossChains(0, new Map([
-            ['base', []],
-            ['ethereum', []],
-            ['solana', []]
-        ]));
-        console.log('\nBalances for Pocket 0:');
-        balances.forEach(chainBalance => {
-            console.log(`\n  ${chainBalance.chainId.toUpperCase()} (${chainBalance.chainType}):`);
-            console.log(`    Address: ${chainBalance.address}`);
-            chainBalance.balances.forEach(bal => {
-                const tokenName = bal.token === 'native' ? 'Native' : bal.token;
-                console.log(`    ${tokenName}: ${bal.balance.formatted}`);
-            });
-        });
-    }
-    catch (error) {
-        console.log('  ⚠️ Balance fetch error (expected for demo RPCs):', error.message);
-    }
     console.log('\n🔧 Advanced: Direct chain manager access');
     const baseManager = multiChainManager.getEVMManager('base');
     const solanaManager = multiChainManager.getSVMManager('solana');
     console.log('  Base manager type:', baseManager.constructor.name);
     console.log('  Solana manager type:', solanaManager.constructor.name);
-    multiChainManager.dispose();
-    console.log('\n✅ Multi-Chain Savings Test Complete\n');
 };
 const testEntropy = () => {
     const p = evm_1.EVMVM.convertFromEntropyToPrivateKey("thishgbmytesentropystringis32bytes!hjkjkhknkjtdyftgkh,jryctdrfygh");
@@ -246,6 +240,6 @@ const testAddressClass = async () => {
     console.log('res: ', res);
     svm_1.SVMVM.generateMnemonicFromPrivateKey;
 };
-testAddressClass();
+testSavingsPocketMultiChain();
 const RPC_URL = chainConfig.rpcUrl;
 const connection = new web3_js_1.Connection(RPC_URL);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deserialize/multi-vm-wallet",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "devDependencies": {
     "@types/bn.js": "^5.2.0",
     "@types/crypto-js": "^4.2.2",

package/utils/constant.ts

@@ -33,25 +33,25 @@ export const DefaultChains: ChainWalletConfig[] = [{
     }
 }
 
-    ,
-{
-    chainId: 42101,
-    name: "Push Chain Donut Testnet",
-    rpcUrl: "https://evm.donut.rpc.push.org",
-    explorerUrl: "https://donut.push.network",
-    nativeToken: {
-        name: "PC",
-        symbol: "PC",
-        decimals: 18,
-    },
-    testnet: true,
-    logoUrl: "https://push.org/assets/website/favicons/favicon.svg",
-    vmType: "EVM",
-    savings: {
-        supported: false,
-        tokens: []
-    }
-}
+    //     ,
+    // {
+    //     chainId: 42101,
+    //     name: "Push Chain Donut Testnet",
+    //     rpcUrl: "https://evm.donut.rpc.push.org",
+    //     explorerUrl: "https://donut.push.network",
+    //     nativeToken: {
+    //         name: "PC",
+    //         symbol: "PC",
+    //         decimals: 18,
+    //     },
+    //     testnet: true,
+    //     logoUrl: "https://push.org/assets/website/favicons/favicon.svg",
+    //     vmType: "EVM",
+    //     savings: {
+    //         supported: false,
+    //         tokens: []
+    //     }
+    // }
 
 
 
@@ -193,25 +193,8 @@ export const DefaultChains: ChainWalletConfig[] = [{
     }
 },
 
-//add for polygon
-{
-    chainId: 137,
-    name: "Polygon",
-    rpcUrl: "https://polygon-mainnet.g.alchemy.com/v2/TFdA4BilCnKIwaqtypk0d",
-    explorerUrl: "https://polygonscan.com",
-    nativeToken: {
-        name: "MATIC",
-        symbol: "MATIC",
-        decimals: 18,
-    },
-    testnet: false,
-    logoUrl: "https://polygonscan.com/images/svg/brands/polygon-light.svg?v=0.0.36",
-    vmType: "EVM",
-    savings: {
-        supported: false,
-        tokens: []
-    }
-}
+    //add for polygon
+
 
 
 ]

package/utils/evm/utils.ts

@@ -357,6 +357,47 @@ export const getTokenBalance = async (
     }
 }
 
+/**
+ * Sign, send, and confirm any EVM transaction
+ */
+export const signAndSend = async (
+    walletClient: WalletClient,
+    publicClient: PublicClient,
+    params: {
+        to: Hex
+        data?: Hex
+        value?: bigint
+        gas?: bigint
+        nonce?: number
+        maxFeePerGas?: bigint
+        maxPriorityFeePerGas?: bigint
+    },
+    confirmations = 1
+): Promise<{ hash: Hex, success: boolean }> => {
+
+    if (walletClient.account === undefined) {
+        throw new Error("wallet Client is not Initialized with an Account")
+    }
+    const hash = await walletClient.sendTransaction({
+        to: params.to,
+        data: params.data,
+        value: params.value,
+        gas: params.gas,
+        nonce: params.nonce,
+        maxFeePerGas: params.maxFeePerGas,
+        maxPriorityFeePerGas: params.maxPriorityFeePerGas,
+        account: walletClient.account,
+        chain: publicClient.chain,
+    })
+
+
+
+    return {
+        hash,
+        success: !!hash,
+    }
+}
+
 
 /**
  * Sign, send, and confirm any EVM transaction
@@ -388,7 +429,8 @@ export const signSendAndConfirm = async (
         maxFeePerGas: params.maxFeePerGas,
         maxPriorityFeePerGas: params.maxPriorityFeePerGas,
         account: walletClient.account,
-        chain: publicClient.chain
+        chain: publicClient.chain,
+
 
     })
 
@@ -423,7 +465,7 @@ export const sendNativeToken = async (
     const value =
         typeof amount === 'string' ? parseEther(amount) : amount
 
-    return signSendAndConfirm(
+    return signAndSend(
         walletClient,
         publicClient,
         { to, value },
@@ -449,7 +491,7 @@ export const sendERC20Token = async (
         args: [to, amount],
     })
 
-    return signSendAndConfirm(
+    return signAndSend(
         walletClient,
         publicClient,
         { to: tokenAddress, data },

package/utils/test.ts

@@ -12,7 +12,7 @@ import { discoverNFTs, EVMChainAddress, EVMChainWallet, EVMVM } from "./evm";
 import { } from "./svm/transactionParsing";
 import { getEVMTransactionHistory } from "./evm/transactionParsing";
 import { createPublicClient, encodeFunctionData, Hex, http, parseAbi, parseUnits, PublicClient, zeroAddress } from "viem";
-import { base, baseGoerli } from "viem/chains";
+import { base, baseGoerli, mainnet } from "viem/chains";
 import { discoverTokens, fetchWalletNfts, getTokenInfo } from "./svm/utils";
 import { JsonRpcProvider, N } from "ethers";
 
@@ -96,7 +96,17 @@ const OgChainConfig: ChainWalletConfig = {
     logoUrl: ""
 
 }
+const ethereumChainConfig: ChainWalletConfig = {
+    chainId: mainnet.id,
+    name: mainnet.name,
+    rpcUrl: mainnet.rpcUrls.default.http[0],
+    explorerUrl: "",
+    nativeToken: mainnet.nativeCurrency,
+    confirmationNo: 1,
+    vmType: "EVM",
+    logoUrl: ""
 
+}
 
 // const wallet = new SVMChainWallet(chainConfig, testUserKeyPair, 0)
 const wallet = new EVMChainWallet(evmChainConfig, evmPrivateKeyExposed, 0)
@@ -295,8 +305,16 @@ const testSavingsPocketSVM = async () => {
 // ============================================
 const testSavingsPocketMultiChain = async () => {
     console.log('\n========== Multi-Chain Savings Test ==========');
-    const mnemonic = EVMVM.generateMnemonicFromPrivateKey(evmPrivateKeyExposed)
-    console.log('Mnemonic:', mnemonic);
+    const mnemonic = "exit alert stove save pair brass toss scheme shuffle loan gadget lunch"
+    const vm = new EVMVM(EVMVM.mnemonicToSeed(mnemonic))
+    const index = 1
+    const wallet = new EVMChainWallet(
+        ethereumChainConfig
+        , vm.generatePrivateKey(index).privateKey, index)
+
+    // const result = wallet.transferToken()
+
+    return
 
     // Create multi-chain manager with EVM and Solana
     const multiChainManager = new MultiChainSavingsManager(
@@ -308,7 +326,7 @@ const testSavingsPocketMultiChain = async () => {
                 config: evmChainConfig
             },
             {
-                id: 'ethereum',
+                id: '1',
                 type: 'EVM',
                 config: {
                     chainId: 1,
@@ -331,6 +349,8 @@ const testSavingsPocketMultiChain = async () => {
         0  // wallet index
     );
 
+    console.log('main wallet address', multiChainManager.getMainWalletAddress("1"));
+    return
     console.log('\nAvailable chains:', multiChainManager.getChains());
     console.log('EVM chains:', multiChainManager.getEVMChains());
     console.log('SVM chains:', multiChainManager.getSVMChains());
@@ -352,28 +372,28 @@ const testSavingsPocketMultiChain = async () => {
 
     // Get balances across chains
     console.log('\n📊 Getting balances across all chains...');
-    try {
-        const balances = await multiChainManager.getPocketBalanceAcrossChains(
-            0,  // pocket index
-            new Map([
-                ['base', []],     // No tokens, just native
-                ['ethereum', []],
-                ['solana', []]
-            ])
-        );
-
-        console.log('\nBalances for Pocket 0:');
-        balances.forEach(chainBalance => {
-            console.log(`\n  ${chainBalance.chainId.toUpperCase()} (${chainBalance.chainType}):`);
-            console.log(`    Address: ${chainBalance.address}`);
-            chainBalance.balances.forEach(bal => {
-                const tokenName = bal.token === 'native' ? 'Native' : bal.token;
-                console.log(`    ${tokenName}: ${bal.balance.formatted}`);
-            });
-        });
-    } catch (error) {
-        console.log('  ⚠️ Balance fetch error (expected for demo RPCs):', (error as Error).message);
-    }
+    // try {
+    //     const balances = await multiChainManager.getPocketBalanceAcrossChains(
+    //         0,  // pocket index
+    //         new Map([
+    //             ['base', []],     // No tokens, just native
+    //             ['ethereum', []],
+    //             ['solana', []]
+    //         ])
+    //     );
+
+    //     console.log('\nBalances for Pocket 0:');
+    //     balances.forEach(chainBalance => {
+    //         console.log(`\n  ${chainBalance.chainId.toUpperCase()} (${chainBalance.chainType}):`);
+    //         console.log(`    Address: ${chainBalance.address}`);
+    //         chainBalance.balances.forEach(bal => {
+    //             const tokenName = bal.token === 'native' ? 'Native' : bal.token;
+    //             console.log(`    ${tokenName}: ${bal.balance.formatted}`);
+    //         });
+    //     });
+    // } catch (error) {
+    //     console.log('  ⚠️ Balance fetch error (expected for demo RPCs):', (error as Error).message);
+    // }
 
     // Get specific chain managers for advanced operations
     console.log('\n🔧 Advanced: Direct chain manager access');
@@ -382,9 +402,7 @@ const testSavingsPocketMultiChain = async () => {
     console.log('  Base manager type:', baseManager.constructor.name);
     console.log('  Solana manager type:', solanaManager.constructor.name);
 
-    // Cleanup
-    multiChainManager.dispose();
-    console.log('\n✅ Multi-Chain Savings Test Complete\n');
+
 }
 
 const testEntropy = () => {
@@ -399,10 +417,10 @@ const testAddressClass = async () => {
     const evmAddressClass = new EVMChainAddress(evmChainConfig, "0xC9C1D854b82BA9b4FB6f6D58E9EF3d1fAEd601AA", 0)
     const res = await evmAddressClass.getNativeBalance()
     console.log('res: ', res);
-SVMVM.generateMnemonicFromPrivateKey
+    SVMVM.generateMnemonicFromPrivateKey
     // const svmAddressClass = new SVMChainAddress( )
 }
-testAddressClass()
+testSavingsPocketMultiChain()
 // Uncomment to run tests
 // testSavingsPocket()
 // testSavingsPocketSVM()