@deserialize/multi-vm-wallet 1.2.2 → 1.2.3

package/dist/test.js

@@ -7,9 +7,6 @@ exports.testUserKeyPair = void 0;
 const bs58_1 = __importDefault(require("bs58"));
 const web3_js_1 = require("@solana/web3.js");
 const evm_1 = require("./evm");
-const transactionParsing_1 = require("./evm/transactionParsing");
-const viem_1 = require("viem");
-const chains_1 = require("viem/chains");
 // const mnemonic = GenerateNewMnemonic()
 // console.log('mnemonic: ', mnemonic);
 // const seed = VM.mnemonicToSeed(mnemonic)
@@ -18,6 +15,7 @@ exports.testUserKeyPair = web3_js_1.Keypair.fromSecretKey(bs58_1.default.decode(
 const x = exports.testUserKeyPair instanceof web3_js_1.Keypair;
 const evePrivateKey = "0x4c0883a69102937d6231471b5dbb6204fe5129617082792ae468d01a3f362318";
 const evmPrivateKey2 = "0x0123456789012345678901234567890123456789012345678901234567890123";
+const ogPrivKey = "d2d3f7117aa9a4c6e5d4affedd8a5ea624ffd82b2a1de81509e5913709b1ea72";
 // const vm = new SVMVM(seed)
 // const vmFromMnemonic = SVMVM.fromMnemonic(mnemonic)
 // const keyFromMnemonic = vmFromMnemonic.generatePrivateKey(0)
@@ -40,9 +38,18 @@ const evmChainConfig = {
     nativeToken: { name: "Ethereum", symbol: "ETH", decimals: 18 },
     confirmationNo: 1,
 };
+const OgChainConfig = {
+    chainId: 16661,
+    name: "",
+    rpcUrl: "https://evmrpc.0g.ai",
+    explorerUrl: "",
+    nativeToken: { name: "Ethereum", symbol: "ETH", decimals: 18 },
+};
 // const wallet = new SVMChainWallet(chainConfig, testUserKeyPair, 0)
-const wallet = new evm_1.EVMChainWallet(evmChainConfig, evmPrivateKey2, 0);
+const wallet = new evm_1.EVMChainWallet(OgChainConfig, ogPrivKey, 0);
+wallet.getNativeBalance().then(console.log);
 // console.log('wallet: ', wallet);
+// getTokenInfo(new PublicKey("9BB6NFEcjBCtnNLFko2FqVQBq8HHM13kCyYcdQbgpump"), wallet.connection!).then(e => console.log('token info: ', e))
 // wallet.discoverToken().then(e => console.log('discovered tokens: ', e))
 // wallet.getNativeBalance().then(e => console.log('native balance: ', e))
 console.log('address: ', wallet.address);
@@ -74,16 +81,16 @@ const connection = new web3_js_1.Connection(RPC_URL);
 // }).catch((error: any) => {
 //     console.error("Error fetching transaction history:", error);
 // });
-const client = (0, viem_1.createPublicClient)({
-    chain: chains_1.base,
-    transport: (0, viem_1.http)(chains_1.base.rpcUrls.default.http[0]),
-});
-(0, transactionParsing_1.getEVMTransactionHistory)(client, "0x9C82CE0e125F61AdE50BC0c19638F6Ba93d71D5e", {
-    startBlock: BigInt(37427020)
-    // before: "0xabc..."
-}).then((history) => {
-    console.log("EVM Transaction History:", history);
-}).catch((error) => {
-    console.error("Error fetching EVM transaction history:", error);
-});
+// const client = createPublicClient({
+//     chain: base,
+//     transport: http(base.rpcUrls.default.http[0]),
+// })
+// getEVMTransactionHistory(client as PublicClient, "0x9C82CE0e125F61AdE50BC0c19638F6Ba93d71D5e", {
+//     startBlock: BigInt(37427020)
+//     // before: "0xabc..."
+// }).then((history: any) => {
+//     console.log("EVM Transaction History:", history);
+// }).catch((error: any) => {
+//     console.error("Error fetching EVM transaction history:", error);
+// });
 //# sourceMappingURL=test.js.map

package/dist/test.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../utils/test.ts"],"names":[],"mappings":";;;;;;AAGA,gDAA0B;AAE1B,6CAAiE;AAKjE,+BAAuC;AAEvC,iEAAoE;AACpE,+BAA8D;AAC9D,wCAA+C;AAC/C,yCAAyC;AAGzC,uCAAuC;AAEvC,2CAA2C;AAC3C,MAAM,IAAI,GAAG,0FAA0F,CAAA;AAE1F,QAAA,eAAe,GAAG,iBAAO,CAAC,aAAa,CAAC,cAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;AAC1E,MAAM,CAAC,GAAG,uBAAe,YAAY,iBAAO,CAAC;AAC7C,MAAM,aAAa,GAAG,oEAAoE,CAAA;AAC1F,MAAM,cAAc,GAAG,oEAAoE,CAAA;AAE3F,6BAA6B;AAG7B,sDAAsD;AACtD,+DAA+D;AAC/D,0EAA0E;AAC1E,uCAAuC;AACvC,kDAAkD;AAClD,MAAM,WAAW,GAAsB;IACnC,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,QAAQ;IACd,MAAM,EAAE,+DAA+D;IACvE,WAAW,EAAE,6BAA6B;IAC1C,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE;IAC3D,cAAc,EAAE,CAAC;CAEpB,CAAA;AAED,MAAM,cAAc,GAAsB;IACtC,OAAO,EAAE,IAAI;IACb,IAAI,EAAE,UAAU;IAChB,MAAM,EAAE,4DAA4D;IACpE,WAAW,EAAE,+BAA+B;IAC5C,WAAW,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC9D,cAAc,EAAE,CAAC;CACpB,CAAA;AAGD,qEAAqE;AACrE,MAAM,MAAM,GAAG,IAAI,oBAAc,CAAC,cAAc,EAAE,cAAc,EAAE,CAAC,CAAC,CAAA;AACpE,mCAAmC;AAEnC,0EAA0E;AAC1E,0EAA0E;AAC1E,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;AACzC,8EAA8E;AAC9E,gBAAgB;AAChB,oCAAoC;AACpC,uCAAuC;AACvC,sCAAsC;AACtC,kBAAkB;AAClB,kDAAkD;AAGlD,qCAAqC;AACrC,mDAAmD;AAOnD,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC;AACnC,MAAM,UAAU,GAAG,IAAI,oBAAU,CAAC,OAAO,CAAC,CAAC;AAE3C;;;GAGG;AAEH,0BAA0B;AAC1B,yBAAyB;AACzB,kBAAkB;AAClB,sBAAsB;AACtB,QAAQ;AACR,oBAAoB;AACpB,6GAA6G;AAC7G,QAAQ;AACR,6BAA6B;AAC7B,oDAAoD;AACpD,6BAA6B;AAC7B,mEAAmE;AACnE,MAAM;AACN,MAAM,MAAM,GAAG,IAAA,yBAAkB,EAAC;IAC9B,KAAK,EAAE,aAAI;IACX,SAAS,EAAE,IAAA,WAAI,EAAC,aAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;CAChD,CAAC,CAAA;AAEF,IAAA,6CAAwB,EAAC,MAAsB,EAAE,4CAA4C,EAAE;IAC3F,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC5B,qBAAqB;CACxB,CAAC,CAAC,IAAI,CAAC,CAAC,OAAY,EAAE,EAAE;IACrB,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,OAAO,CAAC,CAAC;AACrD,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAU,EAAE,EAAE;IACpB,OAAO,CAAC,KAAK,CAAC,yCAAyC,EAAE,KAAK,CAAC,CAAC;AACpE,CAAC,CAAC,CAAC"}
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../utils/test.ts"],"names":[],"mappings":";;;;;;AAGA,gDAA0B;AAE1B,6CAAiE;AAKjE,+BAAuC;AAMvC,yCAAyC;AAGzC,uCAAuC;AAEvC,2CAA2C;AAC3C,MAAM,IAAI,GAAG,0FAA0F,CAAA;AAE1F,QAAA,eAAe,GAAG,iBAAO,CAAC,aAAa,CAAC,cAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;AAC1E,MAAM,CAAC,GAAG,uBAAe,YAAY,iBAAO,CAAC;AAC7C,MAAM,aAAa,GAAG,oEAAoE,CAAA;AAC1F,MAAM,cAAc,GAAG,oEAAoE,CAAA;AAC3F,MAAM,SAAS,GAAG,kEAAkE,CAAA;AAEpF,6BAA6B;AAG7B,sDAAsD;AACtD,+DAA+D;AAC/D,0EAA0E;AAC1E,uCAAuC;AACvC,kDAAkD;AAClD,MAAM,WAAW,GAAsB;IACnC,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,QAAQ;IACd,MAAM,EAAE,+DAA+D;IACvE,WAAW,EAAE,6BAA6B;IAC1C,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE;IAC3D,cAAc,EAAE,CAAC;CAEpB,CAAA;AAED,MAAM,cAAc,GAAsB;IACtC,OAAO,EAAE,IAAI;IACb,IAAI,EAAE,UAAU;IAChB,MAAM,EAAE,4DAA4D;IACpE,WAAW,EAAE,+BAA+B;IAC5C,WAAW,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC9D,cAAc,EAAE,CAAC;CACpB,CAAA;AAED,MAAM,aAAa,GAAsB;IACrC,OAAO,EAAE,KAAK;IACd,IAAI,EAAE,EAAE;IACR,MAAM,EAAE,sBAAsB;IAC9B,WAAW,EAAE,EAAE;IACf,WAAW,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;CAEjE,CAAA;AAGD,qEAAqE;AACrE,MAAM,MAAM,GAAG,IAAI,oBAAc,CAAC,aAAa,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;AAC9D,MAAM,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;AAC3C,mCAAmC;AACnC,4IAA4I;AAC5I,0EAA0E;AAC1E,0EAA0E;AAC1E,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;AACzC,8EAA8E;AAC9E,gBAAgB;AAChB,oCAAoC;AACpC,uCAAuC;AACvC,sCAAsC;AACtC,kBAAkB;AAClB,kDAAkD;AAGlD,qCAAqC;AACrC,mDAAmD;AAOnD,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC;AACnC,MAAM,UAAU,GAAG,IAAI,oBAAU,CAAC,OAAO,CAAC,CAAC;AAE3C;;;GAGG;AAEH,0BAA0B;AAC1B,yBAAyB;AACzB,kBAAkB;AAClB,sBAAsB;AACtB,QAAQ;AACR,oBAAoB;AACpB,6GAA6G;AAC7G,QAAQ;AACR,6BAA6B;AAC7B,oDAAoD;AACpD,6BAA6B;AAC7B,mEAAmE;AACnE,MAAM;AACN,sCAAsC;AACtC,mBAAmB;AACnB,qDAAqD;AACrD,KAAK;AAEL,mGAAmG;AACnG,mCAAmC;AACnC,4BAA4B;AAC5B,8BAA8B;AAC9B,wDAAwD;AACxD,6BAA6B;AAC7B,uEAAuE;AACvE,MAAM"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deserialize/multi-vm-wallet",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "devDependencies": {
     "@types/bn.js": "^5.2.0",
     "@types/crypto-js": "^4.2.2",
@@ -10,12 +10,15 @@
     "typescript": "^5.9.2"
   },
   "dependencies": {
-    "@metaplex-foundation/js": "^0.20.1",
+    "@metaplex-foundation/mpl-token-metadata": "^3.4.0",
+    "@metaplex-foundation/umi": "^1.4.1",
+    "@metaplex-foundation/umi-bundle-defaults": "^1.4.1",
     "@noble/hashes": "^1.3.3",
     "@scure/bip32": "^2.0.1",
     "@scure/bip39": "^2.0.1",
     "@solana/spl-token": "^0.4.13",
     "@solana/web3.js": "^1.98.4",
+    "bignumber.js": "^9.3.1",
     "bn.js": "^5.2.2",
     "bs58": "^6.0.0",
     "crypto-js": "^4.2.0",

package/utils/IChainWallet.ts

@@ -1,4 +1,6 @@
-import { Balance, ChainWalletConfig, NFTInfo, TokenInfo, TransactionResult } from "./types";
+import { EVMTransactionHistoryItem } from "./evm/transactionParsing";
+import { SVMTransactionHistoryItem } from "./svm/transactionParsing";
+import { Balance, ChainWalletConfig, NFTInfo, TokenInfo, TransactionResult, UserTokenBalance } from "./types";
 
 export abstract class ChainWallet<AddressType, PrivateKeyType, ConnectionType> {
     protected privateKey: PrivateKeyType;
@@ -21,7 +23,8 @@ export abstract class ChainWallet<AddressType, PrivateKeyType, ConnectionType> {
     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 getTransactionHistory(): Promise<(SVMTransactionHistoryItem | EVMTransactionHistoryItem)[]>;
     // abstract transferNFT(contractAddress: AddressType, tokenId: string, to: string): Promise<TransactionResult>;
     // abstract getTokenInfo(tokenAddress: string): Promise<TokenInfo>;
     // abstract getNFTInfo(contractAddress: string, tokenId: string): Promise<NFTInfo>;
@@ -30,7 +33,6 @@ export abstract class ChainWallet<AddressType, PrivateKeyType, ConnectionType> {
     getAddress(): AddressType {
         return this.address;
     }
-
     getChainWalletConfig(): ChainWalletConfig {
         return this.config;
     }

package/utils/constant.ts

@@ -1,8 +1,23 @@
+import { base } from "viem/chains";
 import { ChainWalletConfig } from "./types";
 
 export const DefaultChains: ChainWalletConfig[] = [{
+
+    chainId: 16661,
+    name: "0G",
+    rpcUrl: "https://evmrpc.0g.ai",
+    explorerUrl: "https://chainscan.0g.ai/", // e.g. Solana Explorer
+    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 Mainnet",
+    name: "Solana",
     rpcUrl: "https://solana-mainnet.g.alchemy.com/v2/vB5mKztdJeFdz9RkW99Qf",
     explorerUrl: "https://explorer.solana.com", // e.g. Solana Explorer
     nativeToken: {
@@ -11,13 +26,13 @@ export const DefaultChains: ChainWalletConfig[] = [{
         decimals: 9,
     },
     testnet: false,
-    logoUrl: "https://cryptologos.cc/logos/solana-sol-logo.png?v=040",
+    logoUrl: "https://solana.com/src/img/branding/solanaLogoMark.svg",
     vmType: "SVM"
 }
     , {
     chainId: 1,
-    name: "Ethereum Mainnet",
-    rpcUrl: "https://eth-mainnet.g.alchemy.com/v2/pwvhaDUZ4qZ8Oy2QcyWfCQa_avpkVPnL",
+    name: "Ethereum",
+    rpcUrl: "https://eth-mainnet.g.alchemy.com/v2/BJ3c0bm5npmsKZ6oAdHPU",
     explorerUrl: "https://etherscan.io",
     nativeToken: {
         name: "Ether",
@@ -25,11 +40,11 @@ export const DefaultChains: ChainWalletConfig[] = [{
         decimals: 18,
     },
     testnet: false,
-    logoUrl: "https://cryptologos.cc/logos/ethereum-eth-logo.png?v=040",
+    logoUrl: "https://etherscan.io/images/svg/brands/ethereum-original-light.svg",
     vmType: "EVM"
 }, {
     chainId: 56,
-    name: "BNB Smart Chain Mainnet",
+    name: "BSC",
     rpcUrl: "https://bsc-dataseed.binance.org/",
     explorerUrl: "https://bscscan.com",
     nativeToken: {
@@ -38,11 +53,11 @@ export const DefaultChains: ChainWalletConfig[] = [{
         decimals: 18,
     },
     testnet: false,
-    logoUrl: "https://cryptologos.cc/logos/bnb-bnb-logo.png?v=040",
+    logoUrl: "https://bscscan.com/assets/bsc/images/svg/logos/token-light.svg?v=25.10.5.0",
     vmType: "EVM"
 }, {
     chainId: 123456791,
-    name: "Eclipse Mainnet",
+    name: "Eclipse",
     rpcUrl: "https://mainnetbeta-rpc.eclipse.xyz",
     explorerUrl: "https://explorer.eclipse.xyz/", // e.g. Solana Explorer
     nativeToken: {
@@ -54,18 +69,19 @@ export const DefaultChains: ChainWalletConfig[] = [{
     logoUrl: "https://raw.githubusercontent.com/hyperlane-xyz/hyperlane-registry/a86c3b432b6f9ad7272ae09859f20eb3ade3bd6e/deployments/warp_routes/ES/logo.svg",
     vmType: "SVM"
 },
+
 {
-    chainId: 16661,
-    name: "0G Mainnet",
-    rpcUrl: "https://evmrpc.0g.ai",
-    explorerUrl: "https://chainscan.0g.ai/", // e.g. Solana Explorer
+    chainId: base.id,
+    name: base.name,
+    rpcUrl: base.rpcUrls.default.http[0],
+    explorerUrl: base.blockExplorers?.default.url || "",
     nativeToken: {
-        name: "OG Mainnet",
-        symbol: "0G",
-        decimals: 18,
+        name: base.nativeCurrency.name,
+        symbol: base.nativeCurrency.symbol,
+        decimals: base.nativeCurrency.decimals,
     },
-    testnet: false,
-    logoUrl: "https://chainscan.0g.ai/static/media/zg-logo-new.b22d59dabf457524325ca81c29a4e055.svg",
+    testnet: base.testnet,
+    logoUrl: "https://avatars.githubusercontent.com/u/108554348?s=200&v=4",
     vmType: "EVM"
 }
 

package/utils/evm/evm.ts

@@ -79,6 +79,7 @@ export class EVMVM extends VM<string, string, JsonRpcProvider> {
     }
 
     getTokenInfo = getTokenInfo
+    static getTokenInfo = getTokenInfo
     generatePrivateKey(index: number, seed?: string, mnemonic?: string, derivationPath = this.derivationPath) {
         let _seed: string
 
@@ -114,12 +115,14 @@ export class EVMVM extends VM<string, string, JsonRpcProvider> {
 
 export class EVMChainWallet extends ChainWallet<string, string, JsonRpcProvider> {
     client: PublicClient
+    wallet: Wallet
     constructor(config: ChainWalletConfig, privateKey: string, index: number) {
         super(config, privateKey, index);
-        const wallet = new Wallet(privateKey);
+        this.connection = new JsonRpcProvider(config.rpcUrl)
+        const wallet = new Wallet(privateKey, this.connection);
+        this.wallet = wallet
         this.address = wallet.address;
         this.privateKey = privateKey;
-        this.connection = new JsonRpcProvider(config.rpcUrl)
 
         //client for viem
         this.client = createPublicClient(
@@ -172,6 +175,10 @@ export class EVMChainWallet extends ChainWallet<string, string, JsonRpcProvider>
         return await EVMVM.getTokenBalance(this.address, tokenAddress, this.connection!)
     }
 
+    async getTokenInfo(tokenAddress: string) {
+        return await EVMVM.getTokenInfo(tokenAddress, this.connection!)
+    }
+
     async discoverToken(): Promise<UserTokenBalance<string>[]> {
         // Implement token discovery logic here
         return await discoverTokens(this.address, this.config)