@deserialize/multi-vm-wallet 1.2.0 → 1.2.2

package/utils/svm/utils.ts

@@ -2,9 +2,10 @@
 
 import { Account, createAssociatedTokenAccountIdempotentInstruction, createTransferCheckedInstruction, getAccount, getAssociatedTokenAddress, getAssociatedTokenAddressSync, getMint, Mint, NATIVE_MINT, TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID } from "@solana/spl-token";
 import { Connection, Keypair, LAMPORTS_PER_SOL, PublicKey, SystemProgram, TransactionInstruction, TransactionMessage, VersionedTransaction } from "@solana/web3.js";
-import { TokenInfo } from "../types";
+import { ChainWalletConfig, UserTokenBalance, TokenInfo } from "../types";
 import { transactionSenderAndConfirmationWaiter } from "./transactionSender";
 import { BN } from "bn.js";
+import { Metaplex } from "@metaplex-foundation/js";
 
 const JUPITER_BASE_URL = 'https://lite-api.jup.ag';
 
@@ -270,9 +271,25 @@ export const getTransferNativeTransaction = async (from: Keypair, to: PublicKey,
     console.log('getTransferNativeTransaction: Completed');
     return transaction;
 }
+const getMetaTokenMetaplexData = (mintAddress: PublicKey, connection: Connection) => {
+    const metaplex = Metaplex.make(connection);
+    return metaplex.nfts().findByMint({ mintAddress: mintAddress });
+}
 
-export const getTokenInfo = async (tokenAddress: PublicKey, connection: Connection): Promise<TokenInfo> => {
+export const getTokenInfo = async (tokenAddress: PublicKey, connection: Connection, programId?: PublicKey): Promise<TokenInfo> => {
     let mint: Mint
+
+
+    const metaplexData = await getMetaTokenMetaplexData(tokenAddress, connection).catch(() => null);
+    if (programId) {
+        const mint = await getMint(connection, tokenAddress, "confirmed", programId)
+        return {
+            address: tokenAddress.toString(),
+            decimals: mint.decimals,
+            name: metaplexData?.name || "",
+            symbol: metaplexData?.symbol || ""
+        }
+    }
     try {
         mint = await getMint(connection, tokenAddress, "confirmed", TOKEN_PROGRAM_ID)
 
@@ -286,8 +303,8 @@ export const getTokenInfo = async (tokenAddress: PublicKey, connection: Connecti
     return {
         address: tokenAddress.toString(),
         decimals: mint.decimals,
-        name: "",
-        symbol: ""
+        name: metaplexData?.name || "",
+        symbol: metaplexData?.symbol || ""
     }
 }
 
@@ -359,6 +376,35 @@ export const signAndSendTransaction = async (transaction: VersionedTransaction,
     console.log('Transaction successful, signature:', signature);
     return signature;
 }
+export const discoverTokens = async (ownerAddress: PublicKey, connection: Connection): Promise<UserTokenBalance<PublicKey>[]> => {
+
+    const owner = new PublicKey(ownerAddress);
+    let response = await connection.getParsedTokenAccountsByOwner(owner, {
+        programId: TOKEN_PROGRAM_ID
+    });
+    console.log('response: ', response);
+    let tokens2022 = await connection.getParsedTokenAccountsByOwner(owner, {
+        programId: TOKEN_2022_PROGRAM_ID
+    });
+    console.log('tokens2022: ', tokens2022);
+
+    response.value = response.value.concat(tokens2022.value);
+    const tokens = await Promise.all(response.value.map(async (accountInfo) => {
+
+        const mintAddress = accountInfo.account.data["parsed"]["info"]["mint"]
+        const mint = await getTokenInfo(new PublicKey(mintAddress), connection)
+        return {
+            owner: accountInfo.account.data["parsed"]["info"]["owner"],
+            address: accountInfo.account.data["parsed"]["info"]["mint"],
+            decimals: accountInfo.account.data["parsed"]["info"]["tokenAmount"]["decimals"],
+            symbol: mint.symbol,
+            name: mint.name,
+            balance: accountInfo.account.data["parsed"]["info"]["tokenAmount"]["amount"]
+        }
+    }))
+
+    return tokens;
+}
 
 //swap
 //you will. use jupiter for this
@@ -417,17 +463,21 @@ export const getJupiterQuote = async (
 export const buildJupiterSwapTransaction = async (
     quote: JupiterQuoteResponse,
     userPublicKey: string,
-    prioritizationFeeLamports?: number
+    prioritizationFeeLamports?: number,
+    useSharedAccounts: boolean = true
 ): Promise<JupiterSwapResponse> => {
     console.log('buildJupiterSwapTransaction: Starting');
     console.log('User public key:', userPublicKey);
+    console.log('Use shared accounts:', useSharedAccounts);
+
     const priorityFee = prioritizationFeeLamports || 5000;
     console.log('Prioritization fee:', priorityFee);
+
     const body = {
         quoteResponse: quote,
         userPublicKey,
         wrapAndUnwrapSol: true,
-        useSharedAccounts: true,
+        useSharedAccounts: useSharedAccounts,
         feeAccount: undefined,
         trackingAccount: undefined,
         computeUnitPriceMicroLamports: undefined,
@@ -436,7 +486,7 @@ export const buildJupiterSwapTransaction = async (
         useTokenLedger: false,
         destinationTokenAccount: undefined,
         dynamicComputeUnitLimit: true,
-        skipUserAccountsRpcCalls: false
+        skipUserAccountsRpcCalls: true
     };
 
     console.log('Request body:', body);
@@ -459,9 +509,23 @@ export const buildJupiterSwapTransaction = async (
         try {
             const error = await response.json();
             console.log('Swap build error details:', error);
+
+            // Check if this is the shared accounts error
+            if (error.errorCode === 'NOT_SUPPORTED' &&
+                error.error?.includes('Simple AMMs are not supported with shared accounts')) {
+                console.log('Detected shared accounts incompatibility error');
+                throw new Error('SHARED_ACCOUNTS_NOT_SUPPORTED');
+            }
+
             throw new Error(`Jupiter swap transaction build failed: ${error.message || response.statusText}`);
         } catch (parseError) {
             console.log('Failed to parse error response:', parseError);
+
+            // Re-throw if it's our custom error
+            if (parseError instanceof Error && parseError.message === 'SHARED_ACCOUNTS_NOT_SUPPORTED') {
+                throw parseError;
+            }
+
             throw new Error(`Jupiter swap transaction build failed: ${response.statusText}`);
         }
     }
@@ -500,12 +564,38 @@ export const executeJupiterSwap = async (
             priceImpact: quote.priceImpactPct
         });
 
-        console.log('Building swap transaction...');
-        const swapResponse = await buildJupiterSwapTransaction(
-            quote,
-            swapParams.userPublicKey.toString()
-        );
+        let swapResponse: JupiterSwapResponse;
+        let usedSharedAccounts = true;
 
+        try {
+            console.log('Building swap transaction with shared accounts enabled...');
+            swapResponse = await buildJupiterSwapTransaction(
+                quote,
+                swapParams.userPublicKey.toString(),
+                undefined,
+                true // Try with shared accounts first
+            );
+            console.log('Successfully built transaction with shared accounts');
+        } catch (error) {
+            if (error instanceof Error && error.message === 'SHARED_ACCOUNTS_NOT_SUPPORTED') {
+                console.log('Shared accounts not supported, retrying without shared accounts...');
+
+                // Retry without shared accounts
+                swapResponse = await buildJupiterSwapTransaction(
+                    quote,
+                    swapParams.userPublicKey.toString(),
+                    undefined,
+                    false // Retry with shared accounts disabled
+                );
+                usedSharedAccounts = false;
+                console.log('Successfully built transaction without shared accounts');
+            } else {
+                // Re-throw if it's a different error
+                throw error;
+            }
+        }
+
+        console.log('Transaction build method:', usedSharedAccounts ? 'with shared accounts' : 'without shared accounts');
         console.log('Deserializing transaction...');
         const swapTransactionBuf = Buffer.from(swapResponse.swapTransaction, 'base64');
         console.log('Transaction buffer length:', swapTransactionBuf.length);
@@ -530,7 +620,6 @@ export const executeJupiterSwap = async (
             }
         });
 
-        // console.log('signature: ', signature);
         if (!signature) {
             console.log('Transaction failed to confirm');
             return {
@@ -541,6 +630,7 @@ export const executeJupiterSwap = async (
 
         const txSignature = signature.transaction.signatures[0];
         console.log('Swap successful! Signature:', txSignature);
+        console.log('Used shared accounts:', usedSharedAccounts);
 
         return {
             success: true,
@@ -631,4 +721,5 @@ export const validateJupiterTokens = async (
         console.log('Token validation failed:', error);
         return { valid: false, message: 'Failed to validate tokens' };
     }
-};
+};
+

package/utils/test.ts

@@ -3,11 +3,16 @@ import { generateKey } from "crypto";
 
 import base58 from "bs58";
 import { NATIVE_MINT } from "@solana/spl-token";
+import { Connection, PublicKey, Keypair } from "@solana/web3.js";
 // import { GenerateNewMnemonic } from "./bip32";
-import { SVMChainWallet, SVMVM } from "./svm";
+import { SVMChainWallet, SVMVM, } from "./svm";
 import { VM } from "./vm";
 import { ChainWalletConfig } from "./types";
-import { Keypair } from ".";
+import { EVMChainWallet } from "./evm";
+import { } from "./svm/transactionParsing";
+import { getEVMTransactionHistory } from "./evm/transactionParsing";
+import { createPublicClient, http, PublicClient } from "viem";
+import { base, baseGoerli } from "viem/chains";
 // const mnemonic = GenerateNewMnemonic()
 
 
@@ -18,6 +23,9 @@ const pKey = "4QxETeX9pndiF1XNghUiDTnZnHq3cfjmuPLBJysrgocsLq1yb8w96aPWALa8ZnRZWm
 
 export const testUserKeyPair = Keypair.fromSecretKey(base58.decode(pKey));
 const x = testUserKeyPair instanceof Keypair;
+const evePrivateKey = "0x4c0883a69102937d6231471b5dbb6204fe5129617082792ae468d01a3f362318"
+const evmPrivateKey2 = "0x0123456789012345678901234567890123456789012345678901234567890123"
+
 // const vm = new SVMVM(seed)
 
 
@@ -27,7 +35,7 @@ const x = testUserKeyPair instanceof Keypair;
 // const key = vm.generatePrivateKey(0)
 // console.log('key: ', key.privateKey.publicKey);
 const chainConfig: ChainWalletConfig = {
-    chainId: "solana-mainnet",
+    chainId: 123456789,
     name: "Solana",
     rpcUrl: "https://solana-mainnet.g.alchemy.com/v2/vB5mKztdJeFdz9RkW99Qf",
     explorerUrl: "https://explorer.solana.com",
@@ -37,7 +45,7 @@ const chainConfig: ChainWalletConfig = {
 }
 
 const evmChainConfig: ChainWalletConfig = {
-    chainId: "evm-mainnet",
+    chainId: 8453,
     name: "Ethereum",
     rpcUrl: "https://eth-mainnet.g.alchemy.com/v2/vB5mKztdJeFdz9RkW99Qf",
     explorerUrl: "https://explorer.ethereum.com",
@@ -46,10 +54,13 @@ const evmChainConfig: ChainWalletConfig = {
 }
 
 
-const wallet = new SVMChainWallet(chainConfig, testUserKeyPair, 0)
+// const wallet = new SVMChainWallet(chainConfig, testUserKeyPair, 0)
+const wallet = new EVMChainWallet(evmChainConfig, evmPrivateKey2, 0)
 // console.log('wallet: ', wallet);
 
-wallet.getNativeBalance().then(e => console.log('native balance: ', e))
+// wallet.discoverToken().then(e => console.log('discovered tokens: ', e))
+// wallet.getNativeBalance().then(e => console.log('native balance: ', e))
+console.log('address: ', wallet.address);
 // const toBuy = new PublicKey("9BB6NFEcjBCtnNLFko2FqVQBq8HHM13kCyYcdQbgpump")
 // wallet.swap({
 //     name: NATIVE_MINT.toBase58(),
@@ -63,3 +74,42 @@ wallet.getNativeBalance().then(e => console.log('native balance: ', e))
 // wal.getNativeBalance().then(e => console.log(e))
 
 
+
+
+
+
+const RPC_URL = chainConfig.rpcUrl;
+const connection = new Connection(RPC_URL);
+
+/**
+ * Fetches and logs the token metadata for a given mint address.
+ * @param mintAddress - The mint address of the token.
+ */
+
+// get transaction history
+// getTransactionHistory(
+//     connection,
+//     wallet.address,
+//     {
+//         limit: 2,
+//         before: "5RKG5zKJdz9PqWSav1J358hm1GtfnV1QnYcrw3sRpY7aCgT7f4HTKnp4c9pXrJRujcHHisu3Z6jdtbzq5aTRbikq"
+//     }
+// ).then((history: any) => {
+//     console.log("Transaction History:", history);
+// }).catch((error: any) => {
+//     console.error("Error fetching 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);
+});
+

package/utils/types.ts

@@ -3,7 +3,7 @@ import { EVMVM } from "./evm";
 import { SVMVM } from "./svm";
 
 export interface ChainWalletConfig {
-    chainId: string | number;
+    chainId: number;
     name: string;
     rpcUrl: string;
     explorerUrl: string;
@@ -26,6 +26,11 @@ export interface TokenInfo {
     decimals: number;
 }
 
+export interface UserTokenBalance<AddressType> extends TokenInfo {
+    balance: number;
+    owner: AddressType;
+}
+
 export interface NFTInfo {
     tokenId: string;
     contractAddress: string;

package/utils/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";