@clonegod/ttd-sol-common 2.0.51 → 2.0.52

package/dist/common/get_wallet_token_account.d.ts

@@ -1,5 +1,5 @@
 import { StandardPoolInfoType, StandardTokenInfoType } from "@clonegod/ttd-core";
 import { Connection, Keypair, PublicKey } from "@solana/web3.js";
 export declare const get_token_program_id: (token: StandardTokenInfoType) => PublicKey;
-export declare function get_wallet_token_account(wallet_pubkey: string, pool_list: StandardPoolInfoType[]): Promise<Map<string, string>>;
+export declare function get_wallet_token_account(wallet_pubkey: string, pool_list: StandardPoolInfoType[]): Map<string, string>;
 export declare const create_token_account_if_not_exist: (connection: Connection, owner: Keypair, token_list: StandardTokenInfoType[]) => Promise<void>;

package/dist/common/get_wallet_token_account.js

@@ -14,11 +14,26 @@ const get_token_program_id = (token) => {
     return programId;
 };
 exports.get_token_program_id = get_token_program_id;
-async function get_wallet_token_account(wallet_pubkey, pool_list) {
+const wallet_token_accounts_cache = new Map();
+function getWalletTokenAccountCacheKey(wallet_pubkey, token_address) {
+    return `${wallet_pubkey}_${token_address}}`;
+}
+function getCachedAtaAddress(wallet_pubkey, token_address, programId) {
+    const cacheKey = getWalletTokenAccountCacheKey(wallet_pubkey, token_address);
+    if (wallet_token_accounts_cache.has(cacheKey)) {
+        return wallet_token_accounts_cache.get(cacheKey);
+    }
+    const ataAddress = (0, spl_token_1.getAssociatedTokenAddressSync)(new web3_js_1.PublicKey(token_address), new web3_js_1.PublicKey(wallet_pubkey), false, programId).toBase58();
+    wallet_token_accounts_cache.set(cacheKey, ataAddress);
+    return ataAddress;
+}
+function get_wallet_token_account(wallet_pubkey, pool_list) {
     let account_map = new Map();
     for (let { tokenA, tokenB } of pool_list) {
-        account_map.set(tokenA.symbol, (await (0, spl_token_1.getAssociatedTokenAddress)(new web3_js_1.PublicKey(tokenA.address), new web3_js_1.PublicKey(wallet_pubkey), false, (0, exports.get_token_program_id)(tokenA))).toBase58());
-        account_map.set(tokenB.symbol, (await (0, spl_token_1.getAssociatedTokenAddress)(new web3_js_1.PublicKey(tokenB.address), new web3_js_1.PublicKey(wallet_pubkey), false, (0, exports.get_token_program_id)(tokenB))).toBase58());
+        const programIdA = (0, exports.get_token_program_id)(tokenA);
+        const programIdB = (0, exports.get_token_program_id)(tokenB);
+        account_map.set(tokenA.symbol, getCachedAtaAddress(wallet_pubkey, tokenA.address, programIdA));
+        account_map.set(tokenB.symbol, getCachedAtaAddress(wallet_pubkey, tokenB.address, programIdB));
     }
     return account_map;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clonegod/ttd-sol-common",
-  "version": "2.0.51",
+  "version": "2.0.52",
   "description": "",
   "main": "dist/index.js",
   "types": "types/index.d.ts",

package/src/common/get_wallet_token_account.ts

@@ -1,7 +1,7 @@
 import { StandardPoolInfoType, StandardTokenInfoType } from "@clonegod/ttd-core";
 import { log_info, log_error } from "@clonegod/ttd-core/dist";
 import { COMMITMENT_LEVEL } from "./constants";
-import { ASSOCIATED_TOKEN_PROGRAM_ID, createAssociatedTokenAccountIdempotent, getAssociatedTokenAddress, TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID } from "@solana/spl-token";
+import { ASSOCIATED_TOKEN_PROGRAM_ID, createAssociatedTokenAccountIdempotent, getAssociatedTokenAddress, getAssociatedTokenAddressSync, TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID } from "@solana/spl-token";
 import { Connection, Keypair, PublicKey } from "@solana/web3.js";
 
 
@@ -13,13 +13,51 @@ export const get_token_program_id = (token: StandardTokenInfoType) => {
     return programId
 }
 
-export async function get_wallet_token_account(wallet_pubkey:string, pool_list:StandardPoolInfoType[]
+// 缓存 ATA 地址：key = `${wallet_pubkey}_${token_address}`
+const wallet_token_accounts_cache = new Map<string, string>()
+
+function getWalletTokenAccountCacheKey(wallet_pubkey: string, token_address: string): string {
+    return `${wallet_pubkey}_${token_address}}`
+}
+
+function getCachedAtaAddress(
+    wallet_pubkey: string,
+    token_address: string,
+    programId: PublicKey
+): string {
+    const cacheKey = getWalletTokenAccountCacheKey(wallet_pubkey, token_address)
+    
+    if (wallet_token_accounts_cache.has(cacheKey)) {
+        return wallet_token_accounts_cache.get(cacheKey)!
+    }
+    
+    const ataAddress = getAssociatedTokenAddressSync(
+        new PublicKey(token_address),
+        new PublicKey(wallet_pubkey),
+        false,
+        programId
+    ).toBase58()
+    
+    wallet_token_accounts_cache.set(cacheKey, ataAddress)
+    return ataAddress
+}
+
+export function get_wallet_token_account(wallet_pubkey:string, pool_list:StandardPoolInfoType[]
 ) {
     let account_map = new Map<string,string>()
 
     for(let {tokenA, tokenB} of pool_list) {
-        account_map.set(tokenA.symbol, (await getAssociatedTokenAddress(new PublicKey(tokenA.address), new PublicKey(wallet_pubkey), false, get_token_program_id(tokenA))).toBase58())
-        account_map.set(tokenB.symbol, (await getAssociatedTokenAddress(new PublicKey(tokenB.address), new PublicKey(wallet_pubkey), false, get_token_program_id(tokenB))).toBase58())
+        const programIdA = get_token_program_id(tokenA)
+        const programIdB = get_token_program_id(tokenB)
+        
+        account_map.set(
+            tokenA.symbol,
+            getCachedAtaAddress(wallet_pubkey, tokenA.address, programIdA)
+        )
+        account_map.set(
+            tokenB.symbol,
+            getCachedAtaAddress(wallet_pubkey, tokenB.address, programIdB)
+        )
     }
     return account_map
 }