@deserialize/multi-vm-wallet 1.1.47 → 1.2.1

package/utils/evm/evm.ts

@@ -4,7 +4,7 @@
  * this is a class that will be responsible for creating several evm wallets code
  */
 
-import { EVMDeriveChildPrivateKey } from "../bip32";
+import { EVMDeriveChildPrivateKey } from "../walletBip32";
 import { ChainWallet } from "../IChainWallet";
 import { Balance, ChainWalletConfig, NFTInfo, TokenInfo, TransactionResult } from "../types";
 import { VM } from "../vm";
@@ -514,7 +514,7 @@ export class EVMChainWallet extends ChainWallet<string, string, JsonRpcProvider>
         gasEstimate: string;
         route: string[];
     }> {
-        
+
         try {
             const chainId = (await this.connection!.getNetwork()).chainId.toString();
 

package/utils/evm/utils.ts

@@ -23,7 +23,7 @@ interface TransactionResult {
     effectiveGasPrice?: bigint
     blockNumber?: number
     confirmations: number
-
+    
 }
 
 export interface SwapParams {
@@ -147,18 +147,13 @@ const ERC20_ABI = [
 ]
 
 export const getNativeBalance = async (address: string, provider: JsonRpcProvider): Promise<Balance> => {
-    const balance = await provider.getBalance(address); // returns BigInt in ethers v6
-
-    const dem = 10n ** 18n;
-
-    // ⚠️ BigInt division truncates, so avoid dividing BigInt directly
-    const formatted = Number(balance) / Number(dem);
+    const balance = await provider.getBalance(address)
 
     return {
-        balance: new BN(balance.toString()), // raw wei as BN
-        formatted,                           // e.g. 0.1
+        balance: new BN(balance),
+        formatted: Number(balance / 10n ** 18n),
         decimal: 18
-    };
+    }
 }
 
 export const getTokenInfo = async (
@@ -774,9 +769,9 @@ export async function performSwap(params: {
             amountIn: params.amountIn,
             chainId: params.chainId
         });
-
+        
         console.log('Fetching best swap route across all DEXs...');
-
+        
         const routeResponse = await getKyberSwapRoute({
             chainId: params.chainId,
             tokenIn: params.tokenIn,
@@ -797,7 +792,7 @@ export async function performSwap(params: {
         }
 
         const { routeSummary, routerAddress } = routeResponse.data;
-
+        
         // Debug: Log what we actually received
         console.log('routeSummary keys:', Object.keys(routeSummary));
         console.log('routeSummary.swaps exists:', !!routeSummary.swaps);
@@ -813,13 +808,13 @@ export async function performSwap(params: {
             // Only try to access swaps if it exists
             swapsCount: routeSummary.swaps ? routeSummary.swaps.length : 0,
             // Only extract exchange names if swaps exists and has the expected structure
-            dexSources: routeSummary.swaps && Array.isArray(routeSummary.swaps)
+            dexSources: routeSummary.swaps && Array.isArray(routeSummary.swaps) 
                 ? routeSummary.swaps.map(swap => swap?.exchange || 'unknown').filter(Boolean)
                 : ['unknown']
         });
 
         console.log('Building executable transaction...');
-
+        
         const buildResponse = await buildKyberSwapTransaction(
             params.chainId,
             routeSummary,
@@ -857,7 +852,7 @@ export async function performSwap(params: {
 
     } catch (error) {
         console.error('❌ KyberSwap aggregation failed:', error);
-
+        
         // More detailed error logging
         if (error instanceof Error) {
             console.error('Error details:', {
@@ -866,7 +861,7 @@ export async function performSwap(params: {
                 name: error.name
             });
         }
-
+        
         throw new Error(`Swap preparation failed: ${error instanceof Error ? error.message : 'Unknown error'}`);
     }
 }

package/utils/index.ts

@@ -1,10 +1,9 @@
-export * from "./bip32"
+export * from "./walletBip32"
 export * from "./evm/evm"
 export * from "./types"
 export * from "./vm"
 export * from "./evm"
 export * from "./svm"
-export * from "./bip32"
 export * from "./types"
 export * from "./constant"
 export * from "bs58"

package/utils/svm/svm.ts

@@ -1,5 +1,5 @@
 import { Connection, Keypair, PublicKey } from "@solana/web3.js";
-import { SVMDeriveChildPrivateKey } from "../bip32";
+import { SVMDeriveChildPrivateKey } from "../walletBip32";
 import { VM } from "../vm";
 import { ChainWallet } from "../IChainWallet";
 import { Balance, ChainWalletConfig, TokenInfo, TransactionResult } from "../types";

package/utils/test.ts

@@ -7,9 +7,7 @@ import { NATIVE_MINT } from "@solana/spl-token";
 import { SVMChainWallet, SVMVM } from "./svm";
 import { VM } from "./vm";
 import { ChainWalletConfig } from "./types";
-import { EVMChainWallet, EVMVM, Keypair } from ".";
-import { JsonRpcProvider } from "ethers";
-import BN from "bn.js";
+import { Keypair } from ".";
 // const mnemonic = GenerateNewMnemonic()
 
 
@@ -46,34 +44,12 @@ const evmChainConfig: ChainWalletConfig = {
     nativeToken: { name: "Ethereum", symbol: "ETH", decimals: 18 },
     confirmationNo: 1,
 }
-const gChainConfig: ChainWalletConfig = {
-    chainId: "16661",
-    name: "Ethereum",
-    rpcUrl: "https://evmrpc.0g.ai",
-    explorerUrl: "https://chainscan.0g.ai",
-    nativeToken: {
-        name: "OG Mainnet",
-        symbol: "0G",
-        decimals: 18,
-    },
-    confirmationNo: 1,
-}
 
-// const wallet = new SVMChainWallet(chainConfig, testUserKeyPair, 0)
-// const wallet = new EVMChainWallet(chainConfig, testUserKeyPair, 0)
-const address = "0x34906823118C27B83243a4d3B19dd2984DdfB645"
-EVMVM.getNativeBalance(address, new JsonRpcProvider(gChainConfig.rpcUrl)).then(e => {
-    const bal = (e.balance as BN).toString()
-    console.log('bal: ', bal);
-    console.log('native balance: ', e)
 
-})
+const wallet = new SVMChainWallet(chainConfig, testUserKeyPair, 0)
 // console.log('wallet: ', wallet);
 
-// wallet.getNativeBalance().then(e => console.log('native balance: ', e))
-
-
-
+wallet.getNativeBalance().then(e => console.log('native balance: ', e))
 // const toBuy = new PublicKey("9BB6NFEcjBCtnNLFko2FqVQBq8HHM13kCyYcdQbgpump")
 // wallet.swap({
 //     name: NATIVE_MINT.toBase58(),

package/utils/{bip32.ts → walletBip32.ts}

@@ -73,7 +73,7 @@ if (typeof window !== 'undefined') {
     window.Buffer = Buffer; // Inject Buffer into the global scope
 }
 
-import { wordlist } from "@scure/bip39/wordlists/english";
+import { wordlist } from "./english";
 import { hmac } from "@noble/hashes/hmac";
 import { sha512 } from "@noble/hashes/sha2";