@deserialize/multi-vm-wallet 1.5.21 → 1.5.31

package/dist/svm/svm.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.SVMChainWallet = exports.SVMVM = void 0;
+exports.SVMChainWallet = exports.SVMChainAddress = exports.SVMVM = exports.getSvmPricesForTokens = exports.getSvmTransactionHistoryForAddress = exports.discoverSvmNFTs = exports.discoverSvmTokens = exports.getSvmTokenBalanceForAddress = exports.getSvmNativeBalanceForAddress = exports.createSvmConnection = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const walletBip32_1 = require("../walletBip32");
 const vm_1 = require("../vm");
@@ -15,6 +15,40 @@ const tweetnacl_1 = __importDefault(require("tweetnacl"));
 const bs58_1 = __importDefault(require("bs58"));
 const price_1 = require("../price");
 const transactionParsing_1 = require("./transactionParsing");
+const createSvmConnection = (config) => new web3_js_1.Connection(config.rpcUrl);
+exports.createSvmConnection = createSvmConnection;
+const getSvmNativeBalanceForAddress = async (address, connection) => {
+    return await SVMVM.getNativeBalance(address, connection);
+};
+exports.getSvmNativeBalanceForAddress = getSvmNativeBalanceForAddress;
+const getSvmTokenBalanceForAddress = async (address, tokenAddress, connection) => {
+    return await SVMVM.getTokenBalance(address, tokenAddress, connection);
+};
+exports.getSvmTokenBalanceForAddress = getSvmTokenBalanceForAddress;
+const discoverSvmTokens = async (address, connection) => {
+    return await (0, utils_1.discoverTokens)(address, connection);
+};
+exports.discoverSvmTokens = discoverSvmTokens;
+const discoverSvmNFTs = async (address, connection) => {
+    return await (0, utils_1.fetchWalletNfts)(address, connection);
+};
+exports.discoverSvmNFTs = discoverSvmNFTs;
+const getSvmTransactionHistoryForAddress = async (connection, address) => {
+    return await (0, transactionParsing_1.getSVMTransactionHistory)(connection, address);
+};
+exports.getSvmTransactionHistoryForAddress = getSvmTransactionHistoryForAddress;
+const getSvmPricesForTokens = async (config, tokenAddresses) => {
+    const result = await (0, price_1.fetchPrices)({
+        vm: 'SVM',
+        chainId: config.chainId,
+        tokenAddresses,
+    });
+    if (result.error) {
+        throw new Error(result.error.message);
+    }
+    return result.data;
+};
+exports.getSvmPricesForTokens = getSvmPricesForTokens;
 class SVMVM extends vm_1.VM {
     getTokenInfo = utils_1.getTokenInfo;
     static getTokenInfo = utils_1.getTokenInfo;
@@ -27,7 +61,7 @@ class SVMVM extends vm_1.VM {
             return false;
         }
     }
-    derivationPath = "m/44'/501'/";
+    derivationPath = "m/44'/501'/0'/";
     constructor(seed) {
         super(seed, "SVM");
     }
@@ -330,12 +364,39 @@ class SVMVM extends vm_1.VM {
     }
 }
 exports.SVMVM = SVMVM;
+class SVMChainAddress extends IChainWallet_1.ChainAddress {
+    constructor(config, address, index) {
+        const connection = (0, exports.createSvmConnection)(config);
+        super(config, address, index);
+        this.connection = connection;
+    }
+    async getNativeBalance() {
+        return await (0, exports.getSvmNativeBalanceForAddress)(this.address, this.connection);
+    }
+    async getTokenBalance(tokenAddress) {
+        return await (0, exports.getSvmTokenBalanceForAddress)(this.address, tokenAddress, this.connection);
+    }
+    async discoverToken() {
+        return await (0, exports.discoverSvmTokens)(this.address, this.connection);
+    }
+    async discoverNFT() {
+        return await (0, exports.discoverSvmNFTs)(this.address, this.connection);
+    }
+    async getTransactionHistory() {
+        return await (0, exports.getSvmTransactionHistoryForAddress)(this.connection, this.address);
+    }
+    async getPrices(tokenAddresses) {
+        return await (0, exports.getSvmPricesForTokens)(this.config, tokenAddresses);
+    }
+}
+exports.SVMChainAddress = SVMChainAddress;
 class SVMChainWallet extends IChainWallet_1.ChainWallet {
     constructor(config, privateKey, index) {
-        super(config, privateKey, index);
+        const address = privateKey.publicKey;
+        super(config, address, privateKey, index);
         this.address = privateKey.publicKey;
         this.privateKey = privateKey;
-        this.connection = new web3_js_1.Connection(config.rpcUrl);
+        this.connection = (0, exports.createSvmConnection)(config);
     }
     generateAddress() {
         return this.address;
@@ -344,18 +405,16 @@ class SVMChainWallet extends IChainWallet_1.ChainWallet {
         return web3_js_1.Keypair.fromSeed(Buffer.from(entropy));
     };
     async getNativeBalance() {
-        return await SVMVM.getNativeBalance(this.address, this.connection);
+        return await (0, exports.getSvmNativeBalanceForAddress)(this.address, this.connection);
     }
     async getTokenBalance(tokenAddress) {
-        return await SVMVM.getTokenBalance(this.address, (tokenAddress), this.connection);
+        return await (0, exports.getSvmTokenBalanceForAddress)(this.address, tokenAddress, this.connection);
     }
     async discoverToken() {
-        const tokens = await (0, utils_1.discoverTokens)(this.address, this.connection);
-        return tokens;
+        return await (0, exports.discoverSvmTokens)(this.address, this.connection);
     }
     async discoverNFT() {
-        const nfts = await (0, utils_1.fetchWalletNfts)(this.address, this.connection);
-        return nfts;
+        return await (0, exports.discoverSvmNFTs)(this.address, this.connection);
     }
     async transferNative(to, amount) {
         const transaction = await (0, utils_1.getTransferNativeTransaction)(this.privateKey, to, amount, this.connection);
@@ -377,22 +436,13 @@ class SVMChainWallet extends IChainWallet_1.ChainWallet {
         return await SVMVM.signAndSendTransaction(transaction, this.connection, this.privateKey);
     }
     async getTransactionHistory() {
-        const history = await (0, transactionParsing_1.getSVMTransactionHistory)(this.connection, this.address);
-        return history;
+        return await (0, exports.getSvmTransactionHistoryForAddress)(this.connection, this.address);
     }
     async getTokenInfo(tokenAddress) {
         return await SVMVM.getTokenInfo(tokenAddress, this.connection);
     }
     async getPrices(tokenAddresses) {
-        const result = await (0, price_1.fetchPrices)({
-            vm: 'SVM',
-            chainId: this.config.chainId,
-            tokenAddresses,
-        });
-        if (result.error) {
-            throw new Error(result.error.message);
-        }
-        return result.data;
+        return await (0, exports.getSvmPricesForTokens)(this.config, tokenAddresses);
     }
     async swap(fromToken, toToken, amount, slippage = 50) {
         try {

package/dist/test.js

@@ -233,5 +233,17 @@ const testSavingsPocketMultiChain = async () => {
     multiChainManager.dispose();
     console.log('\n✅ Multi-Chain Savings Test Complete\n');
 };
+const testEntropy = () => {
+    const p = evm_1.EVMVM.convertFromEntropyToPrivateKey("thishgbmytesentropystringis32bytes!hjkjkhknkjtdyftgkh,jryctdrfygh");
+    console.log('p: ', p);
+    const res = new evm_1.EVMChainWallet(evmChainConfig, p, 0);
+    console.log('res: ', res);
+};
+const testAddressClass = async () => {
+    const evmAddressClass = new evm_1.EVMChainAddress(evmChainConfig, "0xC9C1D854b82BA9b4FB6f6D58E9EF3d1fAEd601AA", 0);
+    const res = await evmAddressClass.getNativeBalance();
+    console.log('res: ', res);
+};
+testAddressClass();
 const RPC_URL = chainConfig.rpcUrl;
 const connection = new web3_js_1.Connection(RPC_URL);

package/dist/types.d.ts

@@ -16,8 +16,12 @@ export interface ChainWalletConfig {
     confirmationNo?: number;
     testnet?: boolean;
     vmType: vmTypes;
+    savings?: ChainSavingConfig;
     aaSupport?: AA_SupportConfig;
 }
+export interface ChainSavingConfig {
+    tokens: string[];
+}
 export interface AA_SupportConfig {
     enabled: boolean;
     entryPoints: {

package/package.json

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

package/utils/IChainWallet.ts

@@ -3,36 +3,26 @@ import { PriceResponse } from "./price.types";
 import { SVMTransactionHistoryItem } from "./svm/transactionParsing";
 import { Balance, ChainWalletConfig, NFTInfo, TokenInfo, TransactionResult, UserTokenBalance, NFT } from "./types";
 
-export abstract class ChainWallet<AddressType, PrivateKeyType, ConnectionType> {
-    protected privateKey: PrivateKeyType;
+export abstract class ChainAddress<AddressType, ConnectionType> {
+
     config: ChainWalletConfig;
     address: AddressType;
     index: number | undefined
     connection: ConnectionType | undefined
 
-    constructor(config: ChainWalletConfig, privateKey: PrivateKeyType, index?: number) {
+    constructor(config: ChainWalletConfig, address: AddressType, index?: number) {
         this.config = config;
-        this.privateKey = privateKey;
-        this.address = this.generateAddress(privateKey);
+        this.address = address;
         this.index = index;
 
     }
 
-    abstract generateAddress(privateKey: PrivateKeyType): AddressType;
     abstract getNativeBalance(): Promise<Balance>;
     abstract getTokenBalance(tokenAddress: AddressType): Promise<Balance>;
-    abstract transferNative(to: AddressType, amount: number): Promise<TransactionResult>;
-    abstract transferToken(tokenAddress: TokenInfo, to: AddressType, amount: number): Promise<TransactionResult>;
-    abstract swap(tokenAddress: TokenInfo, to: AddressType, amount: number, slippage?: number): Promise<TransactionResult>;
     abstract discoverToken(): Promise<UserTokenBalance<AddressType>[]>;
     abstract discoverNFT(): Promise<NFT[]>;
     abstract getTransactionHistory(): Promise<(SVMTransactionHistoryItem | EVMTransactionHistoryItem)[]>;
     abstract getPrices(tokenAddresses: string[]): Promise<PriceResponse>
-    // abstract transferNFT(contractAddress: AddressType, tokenId: string, to: string): Promise<TransactionResult>;
-    // abstract getTokenInfo(tokenAddress: string): Promise<TokenInfo>;
-    // abstract getNFTInfo(contractAddress: string, tokenId: string): Promise<NFTInfo>;
-    // abstract getTransactionHistory(): Promise<any[]>;
-
     getAddress(): AddressType {
         return this.address;
     }
@@ -42,6 +32,77 @@ export abstract class ChainWallet<AddressType, PrivateKeyType, ConnectionType> {
 
 
 
-    abstract convertFromEntropyToPrivateKey(entropy: string): PrivateKeyType
 
+
+}
+
+export abstract class ChainWallet<
+    AddressType,
+    PrivateKeyType,
+    ConnectionType
+> extends ChainAddress<AddressType, ConnectionType> {
+
+    protected privateKey: PrivateKeyType;
+
+    /**
+     * Protected constructor so wallets are created through factories
+     */
+    constructor(
+        config: ChainWalletConfig,
+        address: AddressType,
+        privateKey: PrivateKeyType,
+        index?: number
+    ) {
+        super(config, address, index);
+
+        this.privateKey = privateKey;
+    }
+
+    /**
+     * Each chain must implement how an address is derived
+     */
+    protected abstract generateAddress(
+        privateKey: PrivateKeyType
+    ): AddressType;
+
+    /**
+     * Transfer native coin (ETH, SOL, etc.)
+     */
+    abstract transferNative(
+        to: AddressType,
+        amount: number
+    ): Promise<TransactionResult>;
+
+    /**
+     * Transfer ERC20 / SPL token
+     */
+    abstract transferToken(
+        tokenAddress: TokenInfo,
+        to: AddressType,
+        amount: number
+    ): Promise<TransactionResult>;
+
+    /**
+     * Swap tokens
+     */
+    abstract swap(
+        tokenAddress: TokenInfo,
+        to: AddressType,
+        amount: number,
+        slippage?: number
+    ): Promise<TransactionResult>;
+
+    /**
+     * Convert entropy/mnemonic → private key
+     */
+    abstract convertFromEntropyToPrivateKey(
+        entropy: string
+    ): PrivateKeyType;
+
+    /**
+     * Expose private key only internally if needed
+     */
+    protected getPrivateKey(): PrivateKeyType {
+        return this.privateKey;
+    }
 }

package/utils/constant.ts

@@ -1,35 +1,7 @@
-import { base } from "viem/chains";
+import { arbitrum, base, optimism } from "viem/chains";
 import { ChainWalletConfig } from "./types";
 
 export const DefaultChains: ChainWalletConfig[] = [{
-
-    chainId: 24101,
-    name: "Incentiv",
-    rpcUrl: "https://rpc.incentiv.io",
-    explorerUrl: "https://explorer.incentiv.io",
-    nativeToken: {
-        name: "Incentiv",
-        symbol: "CENT",
-        decimals: 18,
-    },
-    testnet: false,
-    logoUrl: "https://incentiv.io/wp-content/uploads/2024/09/cropped-Favicon-1-32x32.png",
-    vmType: "EVM"
-}, {
-
-    chainId: 16661,
-    name: "0G",
-    rpcUrl: "https://evmrpc.0g.ai",
-    explorerUrl: "https://chainscan.0g.ai/",
-    nativeToken: {
-        name: "OG Mainnet",
-        symbol: "0G",
-        decimals: 18,
-    },
-    testnet: false,
-    logoUrl: "https://chainscan.0g.ai/static/media/zg-logo-new.b22d59dabf457524325ca81c29a4e055.svg",
-    vmType: "EVM"
-}, {
     chainId: 123456789,
     name: "Solana",
     rpcUrl: "https://solana-mainnet.g.alchemy.com/v2/TFdA4BilCnKIwaqtypk0d",
@@ -41,7 +13,10 @@ export const DefaultChains: ChainWalletConfig[] = [{
     },
     testnet: false,
     logoUrl: "https://solana.com/src/img/branding/solanaLogoMark.svg",
-    vmType: "SVM"
+    vmType: "SVM",
+    savings: {
+        tokens: []
+    }
 }
     , {
     chainId: 1,
@@ -68,7 +43,10 @@ export const DefaultChains: ChainWalletConfig[] = [{
     },
     testnet: false,
     logoUrl: "https://bscscan.com/assets/bsc/images/svg/logos/token-light.svg?v=25.10.5.0",
-    vmType: "EVM"
+    vmType: "EVM",
+    savings: {
+        tokens: []
+    }
 },
 
 // {
@@ -98,36 +76,45 @@ export const DefaultChains: ChainWalletConfig[] = [{
     },
     testnet: base.testnet,
     logoUrl: "https://avatars.githubusercontent.com/u/108554348?s=200&v=4",
-    vmType: "EVM"
+    vmType: "EVM",
+    savings: {
+        tokens: []
+    }
 },
 
 {
-    chainId: 42161,
-    name: "Arbitrum One",
-    rpcUrl: "https://arbitrum-mainnet.g.alchemy.com/v2/TFdA4BilCnKIwaqtypk0d",
-    explorerUrl: "https://arbiscan.io",
+    chainId: arbitrum.id,
+    name: arbitrum.name,
+    rpcUrl: arbitrum.rpcUrls.default.http[0],
+    explorerUrl: arbitrum.blockExplorers?.default.url,
     nativeToken: {
-        name: "Ether",
-        symbol: "ETH",
-        decimals: 18,
+        name: arbitrum.nativeCurrency.name,
+        symbol: arbitrum.nativeCurrency.symbol,
+        decimals: arbitrum.nativeCurrency.decimals,
     },
     testnet: false,
-    logoUrl: "https://arbiscan.io/images/svg/brands/arbitrum-light.svg?v=0.0.36",
-    vmType: "EVM"
+    logoUrl: "https://avatars.githubusercontent.com/u/119917794?s=280&v=4",
+    vmType: "EVM",
+    savings: {
+        tokens: []
+    }
 },
 {
-    chainId: 10,
-    name: "Optimism",
-    rpcUrl: "https://optimism-mainnet.g.alchemy.com/v2/TFdA4BilCnKIwaqtypk0d",
-    explorerUrl: "https://optimistic.etherscan.io",
+    chainId: optimism.id,
+    name: optimism.name,
+    rpcUrl: optimism.rpcUrls.default.http[0],
+    explorerUrl: optimism.blockExplorers?.default.url,
     nativeToken: {
-        name: "Ether",
-        symbol: "ETH",
-        decimals: 18,
+        name: optimism.nativeCurrency.name,
+        symbol: optimism.nativeCurrency.symbol,
+        decimals: optimism.nativeCurrency.decimals,
     },
     testnet: false,
-    logoUrl: "https://optimism.io/images/optimism-logo-light.svg",
-    vmType: "EVM"
+    logoUrl: "https://avatars.githubusercontent.com/u/58791460?s=280&v=4",
+    vmType: "EVM",
+    savings: {
+        tokens: []
+    }
 },
 
 //add for polygon
@@ -143,7 +130,10 @@ export const DefaultChains: ChainWalletConfig[] = [{
     },
     testnet: false,
     logoUrl: "https://polygonscan.com/images/svg/brands/polygon-light.svg?v=0.0.36",
-    vmType: "EVM"
+    vmType: "EVM",
+    savings: {
+        tokens: []
+    }
 }