@deserialize/multi-vm-wallet 1.2.0 → 1.2.2

package/utils/evm/evm.ts

@@ -6,7 +6,7 @@
 
 import { EVMDeriveChildPrivateKey } from "../walletBip32";
 import { ChainWallet } from "../IChainWallet";
-import { Balance, ChainWalletConfig, NFTInfo, TokenInfo, TransactionResult } from "../types";
+import { Balance, ChainWalletConfig, NFTInfo, UserTokenBalance, TokenInfo, TransactionResult } from "../types";
 import { VM } from "../vm";
 import { ethers, JsonRpcProvider, Wallet, formatUnits } from "ethers";
 import BN from "bn.js";
@@ -29,8 +29,11 @@ import {
     approveToken,
     executeContractMethod,
     getTokenInfo,
-    DESERIALIZED_SUPPORTED_CHAINS
+    DESERIALIZED_SUPPORTED_CHAINS,
+    discoverTokens
 } from "./utils";
+import { EVMTransactionHistoryItem, getEVMTransactionHistory } from "./transactionParsing";
+import { createPublicClient, Hex, http, PublicClient } from "viem";
 
 interface DebonkQuoteResponse {
     tokenA: string;
@@ -110,12 +113,45 @@ export class EVMVM extends VM<string, string, JsonRpcProvider> {
 }
 
 export class EVMChainWallet extends ChainWallet<string, string, JsonRpcProvider> {
+    client: PublicClient
     constructor(config: ChainWalletConfig, privateKey: string, index: number) {
         super(config, privateKey, index);
         const wallet = new Wallet(privateKey);
         this.address = wallet.address;
         this.privateKey = privateKey;
         this.connection = new JsonRpcProvider(config.rpcUrl)
+
+        //client for viem
+        this.client = createPublicClient(
+            {
+                chain: {
+                    rpcUrls: {
+                        default: {
+                            http: [config.rpcUrl]
+                        }
+                    },
+                    id: config.chainId,
+                    name: config.name,
+                    nativeCurrency: {
+                        name: config.nativeToken.name,
+                        symbol: config.nativeToken.symbol,
+                        decimals: config.nativeToken.decimals
+                    },
+                    blockExplorers: {
+                        default: {
+                            name: config.name + " Explorer",
+                            url: config.explorerUrl,
+                            apiUrl: config.explorerUrl
+                        },
+
+                    },
+                    testnet: config.testnet || false
+
+                },
+                transport: http(config.rpcUrl)
+            },
+
+        )
     }
 
     getWallet(): Wallet {
@@ -136,6 +172,11 @@ export class EVMChainWallet extends ChainWallet<string, string, JsonRpcProvider>
         return await EVMVM.getTokenBalance(this.address, tokenAddress, this.connection!)
     }
 
+    async discoverToken(): Promise<UserTokenBalance<string>[]> {
+        // Implement token discovery logic here
+        return await discoverTokens(this.address, this.config)
+    }
+
     async transferNative(to: string, amount: number): Promise<TransactionResult> {
         // Implement native transfer logic here
         const wallet = this.getWallet()
@@ -148,6 +189,11 @@ export class EVMChainWallet extends ChainWallet<string, string, JsonRpcProvider>
         return await sendERC20Token(wallet, tokenAddress.address, to, amount.toString(), undefined, this.config.confirmationNo || 5)
     }
 
+    async getTransactionHistory(): Promise<EVMTransactionHistoryItem[]> {
+        const wallet = this.getWallet();
+        return await getEVMTransactionHistory(this.client, wallet.address as Hex);
+    }
+
     // Updated swap method signature to match base class so created another method to use it inside swap
     async swap(
         tokenAddress: TokenInfo,
@@ -222,20 +268,12 @@ export class EVMChainWallet extends ChainWallet<string, string, JsonRpcProvider>
 
             // Convert amount to wei (multiply by 10^18 for 18 decimal tokens)
             const amountInWei = (amount * Math.pow(10, tokenIn.decimals || 18)).toString();
-            console.log("amountInWei", amountInWei)
+
             // Convert slippage from bps to percentage (e.g., 50 bps -> 0.5%)
             const slippagePercentage = slippage / 100;
 
-            console.log("Debonk API swap params:", {
-                tokenA: tokenInAddress,
-                tokenB: tokenOutAddress,
-                amountIn: amount,
-                amountInWei: amountInWei,
-                slippage: slippagePercentage,
-            });
 
             // Step 1: Get quote from API
-            console.log("Getting quote from Debonk API...");
 
             const quotePayload = {
                 tokenA: tokenInAddress,
@@ -244,7 +282,6 @@ export class EVMChainWallet extends ChainWallet<string, string, JsonRpcProvider>
                 dexId: "ZERO_G"
             };
 
-            console.log("Quote request payload:", quotePayload);
 
             const quoteResponse = await fetch(`${BASE_URL}/quote`, {
                 method: 'POST',
@@ -261,7 +298,6 @@ export class EVMChainWallet extends ChainWallet<string, string, JsonRpcProvider>
             }
 
             const quote: DebonkQuoteResponse = await quoteResponse.json();
-            console.log("Quote received:", JSON.stringify(quote, null, 2));
 
             // Step 2: Fix the quote dexId for swap API (it expects "ALL")
             const modifiedQuote = {
@@ -269,22 +305,16 @@ export class EVMChainWallet extends ChainWallet<string, string, JsonRpcProvider>
                 dexId: "ALL"  // Change from "ZERO_G" to "ALL" as required by swap API
             };
 
-            console.log("Modified quote for swap API:", JSON.stringify(modifiedQuote, null, 2));
-
             // Step 3: Get wallet address
             const walletAddress = await this.getWallet().getAddress();
-            console.log("Wallet address:", walletAddress);
-
-            // Step 4: Call swap API with modified quote
-            console.log("Calling swap API...");
 
             const swapPayload = {
                 publicKey: walletAddress,
                 slippage: slippagePercentage,
                 quote: modifiedQuote
+
             };
 
-            console.log("Swap request payload:", JSON.stringify(swapPayload, null, 2));
 
             const swapResponse = await fetch(`${BASE_URL}/swap`, {
                 method: 'POST',
@@ -301,17 +331,14 @@ export class EVMChainWallet extends ChainWallet<string, string, JsonRpcProvider>
             }
 
             const swapData: DebonkSwapResponse = await swapResponse.json();
-            console.log("Swap API response:", JSON.stringify(swapData, null, 2));
 
             const wallet = this.getWallet();
             let lastTxHash = '';
 
             // Step 5: Execute each transaction sequentially
-            console.log(`Executing ${swapData.transactions.length} transactions...`);
 
             for (let i = 0; i < swapData.transactions.length; i++) {
                 const transaction = swapData.transactions[i];
-                console.log(`Executing transaction ${i + 1} of ${swapData.transactions.length}`);
 
                 // Prepare transaction object
                 const txRequest = {
@@ -321,8 +348,6 @@ export class EVMChainWallet extends ChainWallet<string, string, JsonRpcProvider>
                     // gasPrice: 70000000000,
                     // gasLimit: 70000, // Increase significantly
                 };
-                console.log("Prepared transaction request:", txRequest);
-                console.log(`Transaction ${i + 1} request:`, txRequest);
 
                 try {
                     const txResponse = await wallet.sendTransaction(txRequest);
@@ -338,11 +363,6 @@ export class EVMChainWallet extends ChainWallet<string, string, JsonRpcProvider>
                     const txHash = receipt.hash || txResponse.hash;
                     lastTxHash = txHash;
 
-                    console.log(`Transaction ${i + 1} confirmed:`, {
-                        hash: txHash,
-                        blockNumber: receipt.blockNumber,
-                        gasUsed: receipt.gasUsed?.toString()
-                    });
 
                 } catch (txError: any) {
                     console.error(`Transaction ${i + 1} failed:`, txError);
@@ -350,7 +370,7 @@ export class EVMChainWallet extends ChainWallet<string, string, JsonRpcProvider>
                 }
             }
 
-            console.log("All transactions completed successfully");
+
 
             return {
                 success: true,
@@ -411,12 +431,7 @@ export class EVMChainWallet extends ChainWallet<string, string, JsonRpcProvider>
                 isNativeOut
             );
 
-            console.log('Kyber swap parameters:', {
-                tokenInAddress,
-                tokenOutAddress,
-                formattedAmountIn,
-                tokenInDecimals
-            });
+
 
             if (isNativeIn) {
                 const nativeBalance = await this.getNativeBalance();
@@ -452,7 +467,7 @@ export class EVMChainWallet extends ChainWallet<string, string, JsonRpcProvider>
             });
 
             if (!isNativeIn) {
-                console.log('Checking token approval...');
+
                 const approvalResult = await checkAndApprove(
                     wallet,
                     tokenIn.address,
@@ -486,20 +501,11 @@ export class EVMChainWallet extends ChainWallet<string, string, JsonRpcProvider>
                 this.config.confirmationNo || 1,
             );
 
-            if (result.success) {
-                console.log(' Kyber swap completed successfully:', {
-                    hash: result.hash,
-                    gasUsed: result.gasUsed?.toString(),
-                    blockNumber: result.blockNumber
-                });
-            } else {
-                console.log(' Kyber swap failed:', result);
-            }
 
             return result;
 
         } catch (error) {
-            console.error('Kyber swap failed:', error);
+
             throw new Error(`Kyber swap failed: ${error instanceof Error ? error.message : 'Unknown error'}`);
         }
     }