@deserialize/multi-vm-wallet 1.5.35 → 1.6.0

package/dist/constant.js

@@ -16,7 +16,21 @@ exports.DefaultChains = [{
         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"
+                }
+            ]
         }
     },
     {
@@ -33,6 +47,7 @@ exports.DefaultChains = [{
         logoUrl: "https://push.org/assets/website/favicons/favicon.svg",
         vmType: "EVM",
         savings: {
+            supported: false,
             tokens: []
         }
     },
@@ -48,7 +63,23 @@ exports.DefaultChains = [{
         },
         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",
@@ -63,7 +94,15 @@ exports.DefaultChains = [{
         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"
+                }
+            ]
         }
     },
     {
@@ -80,7 +119,15 @@ exports.DefaultChains = [{
         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"
+                }
+            ]
         }
     },
     {
@@ -97,6 +144,7 @@ exports.DefaultChains = [{
         logoUrl: "https://avatars.githubusercontent.com/u/119917794?s=280&v=4",
         vmType: "EVM",
         savings: {
+            supported: false,
             tokens: []
         }
     },
@@ -114,6 +162,7 @@ exports.DefaultChains = [{
         logoUrl: "https://avatars.githubusercontent.com/u/58791460?s=280&v=4",
         vmType: "EVM",
         savings: {
+            supported: false,
             tokens: []
         }
     },
@@ -131,6 +180,7 @@ exports.DefaultChains = [{
         logoUrl: "https://polygonscan.com/images/svg/brands/polygon-light.svg?v=0.0.36",
         vmType: "EVM",
         savings: {
+            supported: false,
             tokens: []
         }
     }

package/dist/evm/evm.js

@@ -397,7 +397,7 @@ class EVMVM extends vm_1.VM {
         for (let attempt = 0; attempt < maxRetries; attempt++) {
             try {
                 const pocketIndex = accountIndex + 1;
-                const derivationPath = `m/44'/60'/${pocketIndex}'/0/${walletIndex}'`;
+                const derivationPath = `m/44'/60'/${pocketIndex}'/0/${walletIndex}`;
                 const { privateKey } = (0, walletBip32_1.EVMDeriveChildPrivateKey)(this.seed, walletIndex, `m/44'/60'/${pocketIndex}'/0/`);
                 const wallet = new ethers_1.ethers.Wallet(privateKey);
                 const address = wallet.address;

package/dist/savings/evm-savings.js

@@ -42,9 +42,10 @@ class EVMSavingsManager extends savings_manager_1.SavingsManager {
         this.checkNotDisposed();
         validation_1.SavingsValidation.validateAccountIndex(accountIndex);
         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 = (0, walletBip32_1.mnemonicToSeed)(this.mnemonic);
-        const { privateKey } = (0, walletBip32_1.EVMDeriveChildPrivateKey)(seed, this.walletIndex, derivationPath);
+        const { privateKey } = (0, walletBip32_1.EVMDeriveChildPrivateKey)(seed, this.walletIndex, derivationPathBase);
         const wallet = new ethers_1.ethers.Wallet(privateKey);
         const pocket = {
             privateKey,
@@ -57,9 +58,10 @@ class EVMSavingsManager extends savings_manager_1.SavingsManager {
     }
     getMainWallet() {
         this.checkNotDisposed();
-        const derivationPath = `${this.derivationPathBase}0'/0/${this.walletIndex}`;
+        const derivationPathBase = `${this.derivationPathBase}0'/0/`;
+        const derivationPath = `${derivationPathBase}${this.walletIndex}'`;
         const seed = (0, walletBip32_1.mnemonicToSeed)(this.mnemonic);
-        const { privateKey } = (0, walletBip32_1.EVMDeriveChildPrivateKey)(seed, this.walletIndex, derivationPath);
+        const { privateKey } = (0, walletBip32_1.EVMDeriveChildPrivateKey)(seed, this.walletIndex, derivationPathBase);
         const wallet = new ethers_1.ethers.Wallet(privateKey);
         return {
             privateKey,

package/dist/savings/multi-chain-savings.js

@@ -29,9 +29,9 @@ class MultiChainSavingsManager {
         if (this.chainConfigs.has(chain.id)) {
             throw new Error(`Chain with id '${chain.id}' already exists`);
         }
-        this.chainConfigs.set(chain.id, chain);
         if (chain.type === 'EVM') {
             const manager = new evm_savings_1.EVMSavingsManager(this.mnemonic, chain.config, this.walletIndex);
+            this.chainConfigs.set(chain.id, chain);
             this.evmManagers.set(chain.id, manager);
         }
         else if (chain.type === 'SVM') {
@@ -40,6 +40,7 @@ class MultiChainSavingsManager {
                 throw new Error(`SVM chain '${chain.id}' must have rpcUrl in config`);
             }
             const manager = new svm_savings_1.SVMSavingsManager(this.mnemonic, config.rpcUrl, this.walletIndex);
+            this.chainConfigs.set(chain.id, chain);
             this.svmManagers.set(chain.id, manager);
         }
         else {

package/dist/savings/saving-manager.d.ts

@@ -42,5 +42,5 @@ export declare class SavingsManager extends BaseSavingsManager {
         address: Hex | 'native';
         balance: Balance;
     }[]>;
-    sendToMainWallet(pocketIndex: number, amountInEther: number, token: Hex | "native"): Promise<TransactionResult>;
+    sendToMainWallet(pocketIndex: number, amount: bigint, token: Hex | "native"): Promise<TransactionResult>;
 }

package/dist/savings/saving-manager.js

@@ -43,24 +43,25 @@ class BaseSavingsManager {
     derivePocket(accountIndex) {
         validation_1.SavingsValidation.validateAccountIndex(accountIndex);
         const pocketIndex = accountIndex + 1;
-        const derivationPath = `m/44'/60'/${pocketIndex}'/0/${this.walletIndex}`;
-        const { privateKey } = (0, walletBip32_1.EVMDeriveChildPrivateKey)((0, walletBip32_1.mnemonicToSeed)(this.mnemonic), this.walletIndex, derivationPath);
+        const derivationPathBase = `m/44'/60'/${pocketIndex}'/0/`;
+        const derivationPath = `${derivationPathBase}${this.walletIndex}'`;
+        const { privateKey } = (0, walletBip32_1.EVMDeriveChildPrivateKey)((0, walletBip32_1.mnemonicToSeed)(this.mnemonic), this.walletIndex, derivationPathBase);
         const wallet = new ethers_1.ethers.Wallet(privateKey);
         const pocket = { privateKey, address: wallet.address, derivationPath, index: pocketIndex };
-        this.pockets.set(pocketIndex, pocket);
+        this.pockets.set(accountIndex, pocket);
         return pocket;
     }
     getMainWallet() {
-        const mainWalletDerivationPath = `m/44'/60'/0'/0/${this.walletIndex}`;
-        const { privateKey } = (0, walletBip32_1.EVMDeriveChildPrivateKey)(this.mnemonic, this.walletIndex, mainWalletDerivationPath);
+        const mainWalletDerivationPathBase = `m/44'/60'/0'/0/`;
+        const mainWalletDerivationPath = `${mainWalletDerivationPathBase}${this.walletIndex}'`;
+        const { privateKey } = (0, walletBip32_1.EVMDeriveChildPrivateKey)((0, walletBip32_1.mnemonicToSeed)(this.mnemonic), this.walletIndex, mainWalletDerivationPathBase);
         const wallet = new ethers_1.ethers.Wallet(privateKey);
         return { privateKey, address: wallet.address, derivationPath: mainWalletDerivationPath };
     }
     getMainWalletAddress() {
         if (this.masterAddress)
             return this.masterAddress;
-        const { privateKey } = this.getMainWallet();
-        return new ethers_1.ethers.Wallet(privateKey).address;
+        return this.getMainWallet().address;
     }
     getPocket(accountIndex) {
         if (!this.pockets.has(accountIndex)) {
@@ -88,7 +89,7 @@ class BaseSavingsManager {
         return pocket.address.toLowerCase() === storedAddress.toLowerCase();
     }
     accountFromPocketId(p) {
-        return (0, accounts_1.privateKeyToAccount)(`0x${this.derivePocket(p).privateKey}`);
+        return (0, accounts_1.privateKeyToAccount)(`0x${this.getPocket(p).privateKey}`);
     }
     clearPocket(accountIndex) {
         validation_1.SavingsValidation.validateAccountIndex(accountIndex);
@@ -151,11 +152,9 @@ class SavingsManager extends BaseSavingsManager {
         }));
         return balancesList;
     }
-    async sendToMainWallet(pocketIndex, amountInEther, token) {
+    async sendToMainWallet(pocketIndex, amount, token) {
         validation_1.SavingsValidation.validateAccountIndex(pocketIndex);
-        if (typeof amountInEther !== 'number' || amountInEther <= 0) {
-            throw new Error(`Amount must be a positive number, got: ${amountInEther}`);
-        }
+        validation_1.SavingsValidation.validateAmount(amount, 'Transfer amount');
         if (token !== 'native') {
             validation_1.SavingsValidation.validateAddress(token, 'Token address');
         }
@@ -167,9 +166,9 @@ class SavingsManager extends BaseSavingsManager {
             chain: this.client.chain
         });
         if (token === "native") {
-            return await (0, evm_1.sendNativeToken)(walletClient, this.client, mainWalletAddress, BigInt(amountInEther));
+            return await (0, evm_1.sendNativeToken)(walletClient, this.client, mainWalletAddress, amount);
         }
-        const res = await (0, evm_1.sendERC20Token)(walletClient, this.client, token, mainWalletAddress, BigInt(amountInEther));
+        const res = await (0, evm_1.sendERC20Token)(walletClient, this.client, token, mainWalletAddress, amount);
         return res;
     }
 }

package/dist/savings/savings-operations.js

@@ -9,8 +9,9 @@ class SavingsOperations {
         validation_1.SavingsValidation.validateMnemonic(mnemonic);
         validation_1.SavingsValidation.validateAccountIndex(accountIndex);
         validation_1.SavingsValidation.validateWalletIndex(walletIndex);
+        const pocketIndex = accountIndex + 1;
         const seed = (0, walletBip32_1.mnemonicToSeed)(mnemonic);
-        const { privateKey } = (0, walletBip32_1.EVMDeriveChildPrivateKey)(seed, walletIndex, `m/44'/60'/${accountIndex}'/`);
+        const { privateKey } = (0, walletBip32_1.EVMDeriveChildPrivateKey)(seed, walletIndex, `m/44'/60'/${pocketIndex}'/0/`);
         const wallet = new ethers_1.Wallet(privateKey, provider);
         const address = wallet.address;
         const cleanup = () => {
@@ -131,8 +132,9 @@ class SavingsOperations {
         validation_1.SavingsValidation.validateMnemonic(mnemonic);
         validation_1.SavingsValidation.validateAccountIndex(accountIndex);
         validation_1.SavingsValidation.validateWalletIndex(walletIndex);
+        const pocketIndex = accountIndex + 1;
         const seed = (0, walletBip32_1.mnemonicToSeed)(mnemonic);
-        const { privateKey } = (0, walletBip32_1.EVMDeriveChildPrivateKey)(seed, walletIndex, `m/44'/60'/${accountIndex}'/`);
+        const { privateKey } = (0, walletBip32_1.EVMDeriveChildPrivateKey)(seed, walletIndex, `m/44'/60'/${pocketIndex}'/0/`);
         const wallet = new ethers_1.Wallet(privateKey);
         const address = wallet.address;
         return address;

package/dist/savings/svm-savings.d.ts

@@ -10,6 +10,7 @@ export declare class SVMSavingsManager extends SavingsManager<PublicKey, Connect
     get client(): Connection;
     createClient(rpcUrl: string): Connection;
     clearClient(): void;
+    private toSafeNumberAmount;
     derivePocket(accountIndex: number): Pocket<PublicKey>;
     getMainWallet(): {
         privateKey: Keypair;

package/dist/savings/svm-savings.js

@@ -34,13 +34,20 @@ class SVMSavingsManager extends savings_manager_1.SavingsManager {
     clearClient() {
         this._client = undefined;
     }
+    toSafeNumberAmount(amount, label) {
+        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);
+    }
     derivePocket(accountIndex) {
         this.checkNotDisposed();
         validation_1.SavingsValidation.validateAccountIndex(accountIndex);
         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 = (0, walletBip32_1.mnemonicToSeed)(this.mnemonic);
-        const keypair = (0, walletBip32_1.SVMDeriveChildPrivateKey)(seed, this.walletIndex, derivationPath);
+        const keypair = (0, walletBip32_1.SVMDeriveChildPrivateKey)(seed, this.walletIndex, derivationPathBase);
         const pocket = {
             privateKey: keypair,
             address: keypair.publicKey,
@@ -52,9 +59,10 @@ class SVMSavingsManager extends savings_manager_1.SavingsManager {
     }
     getMainWallet() {
         this.checkNotDisposed();
-        const derivationPath = `${this.derivationPathBase}0'/0/${this.walletIndex}`;
+        const derivationPathBase = `${this.derivationPathBase}0'/0/`;
+        const derivationPath = `${derivationPathBase}${this.walletIndex}'`;
         const seed = (0, walletBip32_1.mnemonicToSeed)(this.mnemonic);
-        const keypair = (0, walletBip32_1.SVMDeriveChildPrivateKey)(seed, this.walletIndex, derivationPath);
+        const keypair = (0, walletBip32_1.SVMDeriveChildPrivateKey)(seed, this.walletIndex, derivationPathBase);
         return {
             privateKey: keypair,
             address: keypair.publicKey,
@@ -120,7 +128,7 @@ class SVMSavingsManager extends savings_manager_1.SavingsManager {
             throw new Error(`Amount must be a positive bigint, got: ${amount}`);
         }
         const pocket = this.getPocket(pocketIndex);
-        const tx = await (0, svm_1.getTransferNativeTransaction)(mainWallet, pocket.address, Number(amount), this.client);
+        const tx = await (0, svm_1.getTransferNativeTransaction)(mainWallet, pocket.address, this.toSafeNumberAmount(amount, 'Native transfer amount'), this.client);
         const hash = await (0, svm_1.signAndSendTransaction)(tx, this.client, mainWallet);
         return { success: true, hash };
     }
@@ -130,7 +138,7 @@ class SVMSavingsManager extends savings_manager_1.SavingsManager {
             throw new Error(`Amount must be a positive bigint, got: ${amount}`);
         }
         const pocket = this.getPocket(pocketIndex);
-        const tx = await (0, svm_1.getTransferTokenTransaction)(mainWallet, pocket.address, tokenInfo, Number(amount), this.client);
+        const tx = await (0, svm_1.getTransferTokenTransaction)(mainWallet, pocket.address, tokenInfo, this.toSafeNumberAmount(amount, 'Token transfer amount'), this.client);
         const hash = await (0, svm_1.signAndSendTransaction)(tx, this.client, mainWallet);
         return { success: true, hash };
     }
@@ -160,11 +168,11 @@ class SVMSavingsManager extends savings_manager_1.SavingsManager {
         const pocket = this.getPocket(pocketIndex);
         const mainWalletAddress = this.getMainWalletAddress();
         if (token === "native") {
-            const tx = await (0, svm_1.getTransferNativeTransaction)(pocket.privateKey, mainWalletAddress, Number(amount), this.client);
+            const tx = await (0, svm_1.getTransferNativeTransaction)(pocket.privateKey, mainWalletAddress, this.toSafeNumberAmount(amount, 'Native withdrawal amount'), this.client);
             const hash = await (0, svm_1.signAndSendTransaction)(tx, this.client, pocket.privateKey);
             return { success: true, hash };
         }
-        const tx = await (0, svm_1.getTransferTokenTransaction)(pocket.privateKey, mainWalletAddress, token, Number(amount), this.client);
+        const tx = await (0, svm_1.getTransferTokenTransaction)(pocket.privateKey, mainWalletAddress, token, this.toSafeNumberAmount(amount, 'Token withdrawal amount'), this.client);
         const hash = await (0, svm_1.signAndSendTransaction)(tx, this.client, pocket.privateKey);
         return { success: true, hash };
     }

package/dist/test.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const web3_js_1 = require("@solana/web3.js");
+const svm_1 = require("./svm");
 const evm_1 = require("./evm");
 const viem_1 = require("viem");
 const chains_1 = require("viem/chains");
@@ -243,6 +244,7 @@ const testAddressClass = async () => {
     const evmAddressClass = new evm_1.EVMChainAddress(evmChainConfig, "0xC9C1D854b82BA9b4FB6f6D58E9EF3d1fAEd601AA", 0);
     const res = await evmAddressClass.getNativeBalance();
     console.log('res: ', res);
+    svm_1.SVMVM.generateMnemonicFromPrivateKey;
 };
 testAddressClass();
 const RPC_URL = chainConfig.rpcUrl;

package/dist/types.d.ts

@@ -20,7 +20,8 @@ export interface ChainWalletConfig {
     aaSupport?: AA_SupportConfig;
 }
 export interface ChainSavingConfig {
-    tokens: string[];
+    supported: boolean;
+    tokens: TokenInfo[];
 }
 export interface AA_SupportConfig {
     enabled: boolean;

package/dist/utils.d.ts

@@ -1,2 +1,31 @@
-import { vmTypes } from "./types";
+import { ChainWalletConfig, vmTypes } from "./types";
 export declare const getPrivateKeyFromAnother: (privateKey: any, fromVm: vmTypes, toVm: vmTypes) => string | import("@solana/web3.js").Keypair | undefined;
+export interface AddressPortfolioItem {
+    tokenAddress: string | "native";
+    symbol: string;
+    decimals: number;
+    balanceRaw: string;
+    balanceFormatted: number;
+    priceUsd: number | null;
+    valueUsd: number | null;
+}
+export interface AddressPortfolioResult {
+    address: string;
+    vmType: vmTypes;
+    chainId: number;
+    items: AddressPortfolioItem[];
+    totals: {
+        valueUsd: number;
+        pricedItems: number;
+        unpricedItems: number;
+    };
+}
+export interface AddressPortfolioParams {
+    chain: ChainWalletConfig;
+    address: string;
+    vmType?: vmTypes;
+    includeNative?: boolean;
+    tokenAddresses?: string[];
+}
+export declare const detectVmTypeFromAddress: (address: string) => vmTypes;
+export declare const getAddressPortfolioValue: (params: AddressPortfolioParams) => Promise<AddressPortfolioResult>;

package/dist/utils.js

@@ -1,9 +1,17 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPrivateKeyFromAnother = void 0;
+exports.getAddressPortfolioValue = exports.detectVmTypeFromAddress = exports.getPrivateKeyFromAnother = void 0;
 const evm_1 = require("./evm");
 const svm_1 = require("./svm");
 const sha2_1 = require("@noble/hashes/sha2");
+const web3_js_1 = require("@solana/web3.js");
+const utils_1 = require("./evm/utils");
+const utils_2 = require("./svm/utils");
+const bn_js_1 = __importDefault(require("bn.js"));
+const price_1 = require("./price");
 const getPrivateKeyFromAnother = (privateKey, fromVm, toVm) => {
     if (fromVm === "EVM") {
         if (toVm === "SVM") {
@@ -20,3 +28,193 @@ const getPrivateKeyFromAnother = (privateKey, fromVm, toVm) => {
     }
 };
 exports.getPrivateKeyFromAnother = getPrivateKeyFromAnother;
+const EVM_ADDRESS_REGEX = /^0x[a-fA-F0-9]{40}$/;
+const detectVmTypeFromAddress = (address) => {
+    if (EVM_ADDRESS_REGEX.test(address)) {
+        return "EVM";
+    }
+    try {
+        new web3_js_1.PublicKey(address);
+        return "SVM";
+    }
+    catch {
+        throw new Error(`Could not infer VM type from address: ${address}`);
+    }
+};
+exports.detectVmTypeFromAddress = detectVmTypeFromAddress;
+const normalizePriceMap = (prices) => {
+    const priceMap = new Map();
+    for (const item of prices) {
+        if (!item?.tokenAddress || typeof item.price !== "number")
+            continue;
+        priceMap.set(item.tokenAddress.toLowerCase(), item.price);
+    }
+    return priceMap;
+};
+const enrichWithUsdValues = (items, priceMap) => {
+    return items.map((item) => {
+        const key = String(item.tokenAddress).toLowerCase();
+        const priceUsd = priceMap.get(key) ?? null;
+        const valueUsd = priceUsd === null ? null : item.balanceFormatted * priceUsd;
+        return {
+            ...item,
+            priceUsd,
+            valueUsd,
+        };
+    });
+};
+const buildTotals = (items) => {
+    let valueUsd = 0;
+    let pricedItems = 0;
+    let unpricedItems = 0;
+    for (const item of items) {
+        if (item.valueUsd === null) {
+            unpricedItems += 1;
+            continue;
+        }
+        pricedItems += 1;
+        valueUsd += item.valueUsd;
+    }
+    return { valueUsd, pricedItems, unpricedItems };
+};
+const getAddressPortfolioValue = async (params) => {
+    const { chain, address, includeNative = true, tokenAddresses } = params;
+    const vmType = params.vmType ?? (0, exports.detectVmTypeFromAddress)(address);
+    if (vmType === "EVM" && !EVM_ADDRESS_REGEX.test(address)) {
+        throw new Error(`Invalid EVM address: ${address}`);
+    }
+    if (vmType === "SVM") {
+        new web3_js_1.PublicKey(address);
+    }
+    if (vmType === "EVM") {
+        const client = (0, utils_1.createPublicClientFromChainConfig)(chain);
+        const items = [];
+        const priceTargets = new Set();
+        if (includeNative) {
+            const nativeBalance = await (0, utils_1.getNativeBalance)(address, client);
+            const nativeRaw = nativeBalance.balance.toString();
+            items.push({
+                tokenAddress: "native",
+                symbol: chain.nativeToken.symbol,
+                decimals: chain.nativeToken.decimals,
+                balanceRaw: nativeRaw,
+                balanceFormatted: nativeBalance.formatted,
+            });
+            priceTargets.add("native");
+        }
+        if (tokenAddresses && tokenAddresses.length > 0) {
+            const tokenResults = await Promise.all(tokenAddresses.map(async (tokenAddress) => {
+                const balance = await (0, utils_1.getTokenBalance)(tokenAddress, address, client);
+                const raw = balance.balance.toString();
+                return {
+                    tokenAddress,
+                    symbol: tokenAddress,
+                    decimals: balance.decimal,
+                    balanceRaw: raw,
+                    balanceFormatted: balance.formatted,
+                };
+            }));
+            for (const token of tokenResults) {
+                items.push(token);
+                priceTargets.add(token.tokenAddress);
+            }
+        }
+        else {
+            const discovered = await (0, utils_1.discoverTokens)(address, chain);
+            for (const token of discovered) {
+                const raw = String(token.balance);
+                const decimals = token.decimals ?? 0;
+                const rawBn = new bn_js_1.default(raw);
+                const divisor = Math.pow(10, decimals);
+                const formatted = divisor === 0 ? 0 : Number(rawBn.toString()) / divisor;
+                items.push({
+                    tokenAddress: token.address,
+                    symbol: token.symbol,
+                    decimals,
+                    balanceRaw: raw,
+                    balanceFormatted: formatted,
+                });
+                priceTargets.add(token.address);
+            }
+        }
+        const priceResult = await (0, price_1.fetchPrices)({
+            vm: "EVM",
+            chainId: chain.chainId,
+            tokenAddresses: Array.from(priceTargets),
+        });
+        const priceMap = normalizePriceMap(priceResult.data?.prices ?? []);
+        const enrichedItems = enrichWithUsdValues(items, priceMap);
+        return {
+            address,
+            vmType,
+            chainId: chain.chainId,
+            items: enrichedItems,
+            totals: buildTotals(enrichedItems),
+        };
+    }
+    const svmAddress = new web3_js_1.PublicKey(address);
+    const connection = new web3_js_1.Connection(chain.rpcUrl);
+    const items = [];
+    const priceTargets = new Set();
+    if (includeNative) {
+        const nativeBalance = await (0, utils_2.getSvmNativeBalance)(svmAddress, connection);
+        items.push({
+            tokenAddress: "native",
+            symbol: chain.nativeToken.symbol,
+            decimals: chain.nativeToken.decimals,
+            balanceRaw: nativeBalance.balance.toString(),
+            balanceFormatted: nativeBalance.formatted,
+        });
+        priceTargets.add("native");
+    }
+    if (tokenAddresses && tokenAddresses.length > 0) {
+        const tokenResults = await Promise.all(tokenAddresses.map(async (tokenAddress) => {
+            const pubkey = new web3_js_1.PublicKey(tokenAddress);
+            const tokenBalance = await svm_1.SVMVM.getTokenBalance(svmAddress, pubkey, connection);
+            return {
+                tokenAddress,
+                symbol: tokenAddress,
+                decimals: tokenBalance.decimal,
+                balanceRaw: tokenBalance.balance.toString(),
+                balanceFormatted: tokenBalance.formatted,
+            };
+        }));
+        for (const token of tokenResults) {
+            items.push(token);
+            priceTargets.add(token.tokenAddress);
+        }
+    }
+    else {
+        const discovered = await (0, utils_2.discoverTokens)(svmAddress, connection);
+        for (const token of discovered) {
+            const raw = String(token.balance);
+            const decimals = token.decimals ?? 0;
+            const rawBn = new bn_js_1.default(raw);
+            const divisor = Math.pow(10, decimals);
+            const formatted = divisor === 0 ? 0 : Number(rawBn.toString()) / divisor;
+            items.push({
+                tokenAddress: token.address,
+                symbol: token.symbol,
+                decimals,
+                balanceRaw: raw,
+                balanceFormatted: formatted,
+            });
+            priceTargets.add(token.address);
+        }
+    }
+    const priceResult = await (0, price_1.fetchPrices)({
+        vm: "SVM",
+        chainId: chain.chainId,
+        tokenAddresses: Array.from(priceTargets),
+    });
+    const priceMap = normalizePriceMap(priceResult.data?.prices ?? []);
+    const enrichedItems = enrichWithUsdValues(items, priceMap);
+    return {
+        address,
+        vmType,
+        chainId: chain.chainId,
+        items: enrichedItems,
+        totals: buildTotals(enrichedItems),
+    };
+};
+exports.getAddressPortfolioValue = getAddressPortfolioValue;

package/dist/walletBip32.js

@@ -87,7 +87,7 @@ function GenerateSeed(_mnemonic) {
 function EVMDeriveChildPrivateKey(seed, index, derivationPath) {
     vm_validation_1.VMValidation.validateSeed(seed);
     vm_validation_1.VMValidation.validateIndex(index, 'Wallet index');
-    const path = `${derivationPath}${index}'`;
+    const path = derivationPath.endsWith("/") ? `${derivationPath}${index}` : derivationPath;
     const scureNode = bip32_1.HDKey.fromMasterSeed(buffer_1.Buffer.from(seed, "hex"));
     const child = scureNode.derive(path);
     if (!child.privateKey) {

package/package.json

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