@deserialize/multi-vm-wallet 1.5.2 → 1.5.3

package/dist/IChainWallet.d.ts

@@ -2,24 +2,28 @@ import { EVMTransactionHistoryItem } from "./evm/transactionParsing";
 import { PriceResponse } from "./price.types";
 import { SVMTransactionHistoryItem } from "./svm/transactionParsing";
 import { Balance, ChainWalletConfig, TokenInfo, TransactionResult, UserTokenBalance, NFT } from "./types";
-export declare abstract class ChainWallet<AddressType, PrivateKeyType, ConnectionType> {
-    protected privateKey: PrivateKeyType;
+export declare abstract class ChainAddress<AddressType, ConnectionType> {
     config: ChainWalletConfig;
     address: AddressType;
     index: number | undefined;
     connection: ConnectionType | undefined;
-    constructor(config: ChainWalletConfig, privateKey: PrivateKeyType, index?: number);
-    abstract generateAddress(privateKey: PrivateKeyType): AddressType;
+    constructor(config: ChainWalletConfig, address: AddressType, index?: number);
     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>;
     getAddress(): AddressType;
     getChainWalletConfig(): ChainWalletConfig;
+}
+export declare abstract class ChainWallet<AddressType, PrivateKeyType, ConnectionType> extends ChainAddress<AddressType, ConnectionType> {
+    protected privateKey: PrivateKeyType;
+    constructor(config: ChainWalletConfig, address: AddressType, privateKey: PrivateKeyType, index?: number);
+    protected abstract generateAddress(privateKey: PrivateKeyType): AddressType;
+    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 convertFromEntropyToPrivateKey(entropy: string): PrivateKeyType;
+    protected getPrivateKey(): PrivateKeyType;
 }

package/dist/IChainWallet.js

@@ -1,16 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChainWallet = void 0;
-class ChainWallet {
-    privateKey;
+exports.ChainWallet = exports.ChainAddress = void 0;
+class ChainAddress {
     config;
     address;
     index;
     connection;
-    constructor(config, privateKey, index) {
+    constructor(config, address, index) {
         this.config = config;
-        this.privateKey = privateKey;
-        this.address = this.generateAddress(privateKey);
+        this.address = address;
         this.index = index;
     }
     getAddress() {
@@ -20,4 +18,15 @@ class ChainWallet {
         return this.config;
     }
 }
+exports.ChainAddress = ChainAddress;
+class ChainWallet extends ChainAddress {
+    privateKey;
+    constructor(config, address, privateKey, index) {
+        super(config, address, index);
+        this.privateKey = privateKey;
+    }
+    getPrivateKey() {
+        return this.privateKey;
+    }
+}
 exports.ChainWallet = ChainWallet;

package/dist/evm/evm.d.ts

@@ -1,4 +1,4 @@
-import { ChainWallet } from "../IChainWallet";
+import { ChainAddress, ChainWallet } from "../IChainWallet";
 import { Balance, ChainWalletConfig, UserTokenBalance, TokenInfo, TransactionResult, NFT, WalletDiscoveryOptions, WalletDiscoveryResult, PocketDiscoveryOptions } from "../types";
 import { VM } from "../vm";
 import { JsonRpcProvider } from "ethers";
@@ -29,6 +29,15 @@ export declare class EVMVM extends VM<string, string, PublicClient> {
     discoverPockets(connection: JsonRpcProvider | PublicClient, options?: PocketDiscoveryOptions): Promise<WalletDiscoveryResult>;
     private checkPocketBalance;
 }
+export declare class EVMChainAddress extends ChainAddress<string, PublicClient> {
+    constructor(config: ChainWalletConfig, address: string, index?: number);
+    getNativeBalance(): Promise<Balance>;
+    getTokenBalance(tokenAddress: string): Promise<Balance>;
+    discoverToken(): Promise<UserTokenBalance<string>[]>;
+    discoverNFT(): Promise<NFT[]>;
+    getTransactionHistory(): Promise<EVMTransactionHistoryItem[]>;
+    getPrices(tokenAddresses: string[]): Promise<PriceResponse>;
+}
 export declare class EVMChainWallet extends ChainWallet<string, string, PublicClient> {
     wallet: WalletClient;
     private smartWallet?;

package/dist/evm/evm.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EVMChainWallet = exports.EVMVM = void 0;
+exports.EVMChainWallet = exports.EVMChainAddress = exports.EVMVM = void 0;
 const walletBip32_1 = require("../walletBip32");
 const IChainWallet_1 = require("../IChainWallet");
 const vm_1 = require("../vm");
@@ -12,6 +12,46 @@ const viem_1 = require("viem");
 const smartWallet_1 = require("./smartWallet");
 const price_1 = require("../price");
 const accounts_1 = require("viem/accounts");
+const createEvmPublicClient = (config) => (0, viem_1.createPublicClient)({
+    chain: (0, utils_1.fromChainToViemChain)(config),
+    transport: (0, viem_1.http)(config.rpcUrl),
+});
+const createEvmWalletClient = (config, account) => (0, viem_1.createWalletClient)({
+    account,
+    chain: (0, utils_1.fromChainToViemChain)(config),
+    transport: (0, viem_1.http)(config.rpcUrl),
+});
+const getEvmTransactionHistorySafe = async (connection, address) => {
+    try {
+        return await (0, transactionParsing_1.getEVMTransactionHistory)(connection, address);
+    }
+    catch {
+        return [];
+    }
+};
+const getEvmPrices = async (config, tokenAddresses) => {
+    const result = await (0, price_1.fetchPrices)({
+        vm: 'EVM',
+        chainId: config.chainId,
+        tokenAddresses,
+    });
+    if (result.error) {
+        throw new Error(result.error.message);
+    }
+    return result.data;
+};
+const getEvmNativeBalance = async (address, connection) => {
+    return await EVMVM.getNativeBalance(address, connection);
+};
+const getEvmTokenBalance = async (address, tokenAddress, connection) => {
+    return await EVMVM.getTokenBalance(address, tokenAddress, connection);
+};
+const discoverEvmTokens = async (address, config) => {
+    return await (0, utils_1.discoverTokens)(address, config);
+};
+const discoverEvmNFTs = async (address, config) => {
+    return await (0, utils_1.discoverNFTs)(address, config);
+};
 class EVMVM extends vm_1.VM {
     derivationPath = "m/44'/60'/0'/0/";
     constructor(seed) {
@@ -72,7 +112,8 @@ class EVMVM extends vm_1.VM {
         return await (0, utils_1.getTokenBalance)(tokenAddress, address, connection);
     }
     static convertFromEntropyToPrivateKey = (entropy) => {
-        return (0, viem_1.toHex)(entropy);
+        const p = ethers_1.ethers.id(entropy);
+        return p;
     };
     async discoverWallets(connection, options) {
         const startTime = Date.now();
@@ -387,24 +428,46 @@ class EVMVM extends vm_1.VM {
     }
 }
 exports.EVMVM = EVMVM;
+class EVMChainAddress extends IChainWallet_1.ChainAddress {
+    constructor(config, address, index) {
+        const connection = createEvmPublicClient(config);
+        super(config, address, index);
+        this.connection = connection;
+    }
+    async getNativeBalance() {
+        return await getEvmNativeBalance(this.address, this.connection);
+    }
+    async getTokenBalance(tokenAddress) {
+        return await getEvmTokenBalance(this.address, tokenAddress, this.connection);
+    }
+    async discoverToken() {
+        return await discoverEvmTokens(this.address, this.config);
+    }
+    async discoverNFT() {
+        return await discoverEvmNFTs(this.address, this.config);
+    }
+    async getTransactionHistory() {
+        return await getEvmTransactionHistorySafe(this.connection, this.address);
+    }
+    async getPrices(tokenAddresses) {
+        return await getEvmPrices(this.config, tokenAddresses);
+    }
+}
+exports.EVMChainAddress = EVMChainAddress;
 class EVMChainWallet extends IChainWallet_1.ChainWallet {
     wallet;
     smartWallet;
     constructor(config, privateKey, index) {
         privateKey = privateKey.startsWith('0x') ? privateKey : `0x${privateKey}`;
-        super(config, privateKey, index);
-        this.connection = (0, viem_1.createPublicClient)({
-            chain: (0, utils_1.fromChainToViemChain)(config),
-            transport: (0, viem_1.http)(config.rpcUrl)
-        });
+        const connection = createEvmPublicClient(config);
         const account = (0, accounts_1.privateKeyToAccount)(privateKey);
-        this.wallet = (0, viem_1.createWalletClient)({
-            account,
-            chain: (0, utils_1.fromChainToViemChain)(config),
-            transport: (0, viem_1.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;
     }
     isAASupportedByChain() {
         return this.config.aaSupport?.enabled === true;
@@ -497,19 +560,19 @@ class EVMChainWallet extends IChainWallet_1.ChainWallet {
         return this.address;
     }
     async getNativeBalance() {
-        return await EVMVM.getNativeBalance(this.address, this.connection);
+        return await getEvmNativeBalance(this.address, this.connection);
     }
     async getTokenBalance(tokenAddress) {
-        return await EVMVM.getTokenBalance(this.address, tokenAddress, this.connection);
+        return await getEvmTokenBalance(this.address, tokenAddress, this.connection);
     }
     async getTokenInfo(tokenAddress) {
         return await EVMVM.getTokenInfo(tokenAddress, this.connection);
     }
     async discoverToken() {
-        return await (0, utils_1.discoverTokens)(this.address, this.config);
+        return await discoverEvmTokens(this.address, this.config);
     }
     async discoverNFT() {
-        return await (0, utils_1.discoverNFTs)(this.address, this.config);
+        return await discoverEvmNFTs(this.address, this.config);
     }
     async transferNative(to, amount) {
         const wallet = this.getWallet();
@@ -522,23 +585,10 @@ class EVMChainWallet extends IChainWallet_1.ChainWallet {
     async getTransactionHistory() {
         const wallet = this.getWallet();
         let res;
-        try {
-            return await (0, transactionParsing_1.getEVMTransactionHistory)(this.connection, this.address);
-        }
-        catch (error) {
-            return [];
-        }
+        return await getEvmTransactionHistorySafe(this.connection, this.address);
     }
     async getPrices(tokenAddresses) {
-        const result = await (0, price_1.fetchPrices)({
-            vm: 'EVM',
-            chainId: this.config.chainId,
-            tokenAddresses,
-        });
-        if (result.error) {
-            throw new Error(result.error.message);
-        }
-        return result.data;
+        return await getEvmPrices(this.config, tokenAddresses);
     }
     async swap(tokenAddress, to, amount, slippage = 50) {
         throw new Error("Not Implemented");

package/dist/evm/utils.d.ts

@@ -176,6 +176,7 @@ export declare const ERC20_ABI: readonly [{
     }];
 }];
 export declare const fromChainToViemChain: (config: ChainWalletConfig) => Chain;
+export declare const createPublicClientFromChainConfig: (chain: ChainWalletConfig) => PublicClient;
 export declare function viemReceiptToEthersReceipt(receipt: ViemTransactionReceipt): EthersTransactionReceipt;
 export declare const getNativeBalance: (address: Hex, client: PublicClient) => Promise<Balance>;
 export declare const getTokenInfo: (tokenAddress: Hex, client: PublicClient) => Promise<TokenInfo>;

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.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.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;
@@ -112,6 +112,13 @@ const fromChainToViemChain = (config) => {
     };
 };
 exports.fromChainToViemChain = fromChainToViemChain;
+const createPublicClientFromChainConfig = (chain) => {
+    return (0, viem_1.createPublicClient)({
+        chain: (0, exports.fromChainToViemChain)(chain),
+        transport: (0, viem_1.http)(chain.rpcUrl)
+    });
+};
+exports.createPublicClientFromChainConfig = createPublicClientFromChainConfig;
 function viemReceiptToEthersReceipt(receipt) {
     return {
         to: receipt.to ?? null,

package/dist/index.d.ts

@@ -2,7 +2,7 @@ export * from "./walletBip32";
 export * from "./types";
 export * from "./vm";
 export { EVMVM, EVMChainWallet, EVMSmartWallet } from "./evm";
-export { SVMVM, SVMChainWallet, } from "./svm";
+export { SVMVM, SVMChainWallet, SVMChainAddress } from "./svm";
 export * as evm from "./evm";
 export * as svm from "./svm";
 export * from "./constant";

package/dist/index.js

@@ -36,7 +36,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.svm = exports.evm = exports.SVMChainWallet = exports.SVMVM = exports.EVMSmartWallet = exports.EVMChainWallet = exports.EVMVM = void 0;
+exports.svm = exports.evm = exports.SVMChainAddress = exports.SVMChainWallet = exports.SVMVM = exports.EVMSmartWallet = exports.EVMChainWallet = exports.EVMVM = void 0;
 __exportStar(require("./walletBip32"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./vm"), exports);
@@ -47,6 +47,7 @@ Object.defineProperty(exports, "EVMSmartWallet", { enumerable: true, get: functi
 var svm_1 = require("./svm");
 Object.defineProperty(exports, "SVMVM", { enumerable: true, get: function () { return svm_1.SVMVM; } });
 Object.defineProperty(exports, "SVMChainWallet", { enumerable: true, get: function () { return svm_1.SVMChainWallet; } });
+Object.defineProperty(exports, "SVMChainAddress", { enumerable: true, get: function () { return svm_1.SVMChainAddress; } });
 exports.evm = __importStar(require("./evm"));
 exports.svm = __importStar(require("./svm"));
 __exportStar(require("./constant"), exports);

package/dist/svm/svm.d.ts

@@ -1,6 +1,6 @@
 import { Connection, Keypair, PublicKey, Transaction, VersionedTransaction } from "@solana/web3.js";
 import { VM } from "../vm";
-import { ChainWallet } from "../IChainWallet";
+import { ChainAddress, ChainWallet } from "../IChainWallet";
 import { Balance, ChainWalletConfig, UserTokenBalance, TokenInfo, TransactionResult, NFT, WalletDiscoveryOptions, WalletDiscoveryResult, PocketDiscoveryOptions } from "../types";
 import { JupiterQuoteResponse } from "./utils";
 import { PriceResponse } from "../price.types";
@@ -36,6 +36,15 @@ export declare class SVMVM extends VM<PublicKey, Keypair, Connection> {
     discoverPockets(connection: Connection, options?: PocketDiscoveryOptions): Promise<WalletDiscoveryResult>;
     private checkPocketBalance;
 }
+export declare class SVMChainAddress extends ChainAddress<PublicKey, Connection> {
+    constructor(config: ChainWalletConfig, address: PublicKey, index?: number);
+    getNativeBalance(): Promise<Balance>;
+    getTokenBalance(tokenAddress: PublicKey): Promise<Balance>;
+    discoverToken(): Promise<UserTokenBalance<PublicKey>[]>;
+    discoverNFT(): Promise<NFT[]>;
+    getTransactionHistory(): Promise<SVMTransactionHistoryItem[]>;
+    getPrices(tokenAddresses: string[]): Promise<PriceResponse>;
+}
 export declare class SVMChainWallet extends ChainWallet<PublicKey, Keypair, Connection> {
     constructor(config: ChainWalletConfig, privateKey: Keypair, index: number);
     generateAddress(): PublicKey;

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 = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const walletBip32_1 = require("../walletBip32");
 const vm_1 = require("../vm");
@@ -15,6 +15,33 @@ 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);
+const getSvmNativeBalanceForAddress = async (address, connection) => {
+    return await SVMVM.getNativeBalance(address, connection);
+};
+const getSvmTokenBalanceForAddress = async (address, tokenAddress, connection) => {
+    return await SVMVM.getTokenBalance(address, tokenAddress, connection);
+};
+const discoverSvmTokens = async (address, connection) => {
+    return await (0, utils_1.discoverTokens)(address, connection);
+};
+const discoverSvmNFTs = async (address, connection) => {
+    return await (0, utils_1.fetchWalletNfts)(address, connection);
+};
+const getSvmTransactionHistoryForAddress = async (connection, address) => {
+    return await (0, transactionParsing_1.getSVMTransactionHistory)(connection, address);
+};
+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;
+};
 class SVMVM extends vm_1.VM {
     getTokenInfo = utils_1.getTokenInfo;
     static getTokenInfo = utils_1.getTokenInfo;
@@ -27,7 +54,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 +357,39 @@ class SVMVM extends vm_1.VM {
     }
 }
 exports.SVMVM = SVMVM;
+class SVMChainAddress extends IChainWallet_1.ChainAddress {
+    constructor(config, address, index) {
+        const connection = createSvmConnection(config);
+        super(config, address, index);
+        this.connection = connection;
+    }
+    async getNativeBalance() {
+        return await getSvmNativeBalanceForAddress(this.address, this.connection);
+    }
+    async getTokenBalance(tokenAddress) {
+        return await getSvmTokenBalanceForAddress(this.address, tokenAddress, this.connection);
+    }
+    async discoverToken() {
+        return await discoverSvmTokens(this.address, this.connection);
+    }
+    async discoverNFT() {
+        return await discoverSvmNFTs(this.address, this.connection);
+    }
+    async getTransactionHistory() {
+        return await getSvmTransactionHistoryForAddress(this.connection, this.address);
+    }
+    async getPrices(tokenAddresses) {
+        return await 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 = createSvmConnection(config);
     }
     generateAddress() {
         return this.address;
@@ -344,18 +398,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 getSvmNativeBalanceForAddress(this.address, this.connection);
     }
     async getTokenBalance(tokenAddress) {
-        return await SVMVM.getTokenBalance(this.address, (tokenAddress), this.connection);
+        return await getSvmTokenBalanceForAddress(this.address, tokenAddress, this.connection);
     }
     async discoverToken() {
-        const tokens = await (0, utils_1.discoverTokens)(this.address, this.connection);
-        return tokens;
+        return await discoverSvmTokens(this.address, this.connection);
     }
     async discoverNFT() {
-        const nfts = await (0, utils_1.fetchWalletNfts)(this.address, this.connection);
-        return nfts;
+        return await discoverSvmNFTs(this.address, this.connection);
     }
     async transferNative(to, amount) {
         const transaction = await (0, utils_1.getTransferNativeTransaction)(this.privateKey, to, amount, this.connection);
@@ -377,22 +429,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 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 getSvmPricesForTokens(this.config, tokenAddresses);
     }
     async swap(fromToken, toToken, amount, slippage = 50) {
         try {

package/dist/test.js

@@ -233,5 +233,12 @@ 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);
+};
+testEntropy();
 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.5.2",
+  "version": "1.5.3",
   "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;
+    }
 }