@deserialize/multi-vm-wallet 1.2.21 → 1.2.23

package/utils/evm/transactionParsing.ts

@@ -610,30 +610,4 @@ async function parseTransferLogs(
     return { tokens, nfts };
 }
 
-/**
- * Helper function to create a client
- */
-export function createEVMClient(rpcUrl: string) {
-    return createPublicClient({
-        transport: http(rpcUrl),
-    });
-}
-
-// Example usage:
-/*
-import { mainnet } from 'viem/chains';
-
-const client = createPublicClient({
-  chain: mainnet,
-  transport: http('https://eth-mainnet.g.alchemy.com/v2/YOUR_API_KEY'),
-});
-
-const history = await getEVMTransactionHistoryWithAPI(
-  client,
-  '0x742d35Cc6634C0532925a3b844Bc9e7595f0bEb' as Address,
-  'https://api.etherscan.io/api',
-  'YOUR_ETHERSCAN_API_KEY'
-);
 
-console.log(history);
-*/

package/utils/evm/utils.ts

@@ -2,6 +2,7 @@ import { Balance, ChainWalletConfig, SUPPORTED_VM, UserTokenBalance, TokenInfo }
 import { JsonRpcProvider, Contract, Wallet, TransactionRequest, TransactionResponse, TransactionReceipt, parseUnits, formatUnits } from 'ethers'
 import BN from 'bn.js'
 import { HelperAPI } from '../helpers';
+import BigNumber from 'bignumber.js';
 
 const KYBER_BASE_URL = 'https://aggregator-api.kyberswap.com';
 
@@ -654,6 +655,24 @@ export const discoverTokens = async (wallet: string, chain: ChainWalletConfig):
     return formatBalances
 }
 
+export function calcGasTotal(gasLimit = '0', gasPrice = '0') {
+    return new BN(gasLimit, 16).mul(new BN(gasPrice, 16)).toString();
+}
+export function toPrecisionWithoutTrailingZeros(n: number, precision: number) {
+    return new BigNumber(n)
+        .toPrecision(precision)
+        .replace(/(\.[0-9]*[1-9])0*|(\.0*)/u, '$1');
+}
+
+/**
+ * @param {number|string|BigNumber} value
+ * @param {number=} decimals
+ * @returns {BigNumber}
+ */
+export function calcTokenAmount(value: number | string | BigNumber, decimals?: number): BigNumber {
+    const divisor = new BigNumber(10).pow(decimals ?? 0);
+    return new BigNumber(String(value)).div(divisor);
+}
 //swaps
 
 

package/utils/svm/utils.ts

@@ -5,7 +5,15 @@ import { Connection, Keypair, LAMPORTS_PER_SOL, PublicKey, SystemProgram, Transa
 import { ChainWalletConfig, UserTokenBalance, TokenInfo } from "../types";
 import { transactionSenderAndConfirmationWaiter } from "./transactionSender";
 import { BN } from "bn.js";
-import { Metaplex } from "@metaplex-foundation/js";
+import { generateSigner, percentAmount } from '@metaplex-foundation/umi'
+import {
+    createNft,
+    fetchDigitalAsset,
+    mplTokenMetadata,
+} from '@metaplex-foundation/mpl-token-metadata'
+import { createUmi } from "@metaplex-foundation/umi-bundle-defaults";
+
+import { PublicKey as UmiPublicKey } from "@metaplex-foundation/umi-public-keys"
 
 const JUPITER_BASE_URL = 'https://lite-api.jup.ag';
 
@@ -271,15 +279,16 @@ 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 });
+const getMetaTokenMetaplexData = async (mintAddress: PublicKey, connection: Connection) => {
+    const umi = createUmi(connection.rpcEndpoint).use(mplTokenMetadata())
+    const ass = await fetchDigitalAsset(umi, mintAddress.toBase58() as unknown as UmiPublicKey)
+    return ass.metadata
+
 }
 
 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)

package/utils/test.ts

@@ -13,6 +13,7 @@ import { } from "./svm/transactionParsing";
 import { getEVMTransactionHistory } from "./evm/transactionParsing";
 import { createPublicClient, http, PublicClient } from "viem";
 import { base, baseGoerli } from "viem/chains";
+import { getTokenInfo } from "./svm/utils";
 // const mnemonic = GenerateNewMnemonic()
 
 
@@ -54,10 +55,10 @@ const evmChainConfig: ChainWalletConfig = {
 }
 
 
-// const wallet = new SVMChainWallet(chainConfig, testUserKeyPair, 0)
-const wallet = new EVMChainWallet(evmChainConfig, evmPrivateKey2, 0)
+const wallet = new SVMChainWallet(chainConfig, testUserKeyPair, 0)
+// const wallet = new EVMChainWallet(evmChainConfig, evmPrivateKey2, 0)
 // 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);
@@ -99,17 +100,18 @@ const connection = new Connection(RPC_URL);
 // }).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);
-});
+// 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);
+// });
+