@debridge-finance/solana-utils 5.4.2 → 5.5.1

package/dist/browser/index.js

@@ -11468,13 +11468,15 @@ function getTokenInfo(connection, tokenAddress) {
  * @param associatedAccount associated account address
  * @param owner owner of the associated account
  * @param payer who pays for account creation
+ * @param isToken2022
+ * @param associatedTokenProgramId
  */
-function createAssociatedWalletInstruction(tokenMint, associatedAccount, owner, payer, associatedTokenProramId) {
+function createAssociatedWalletInstruction(tokenMint, associatedAccount, owner, payer, isToken2022, associatedTokenProgramId) {
     tokenMint = new PublicKey(tokenMint);
     payer = new PublicKey(payer);
     owner = new PublicKey(owner);
     return new TransactionInstruction({
-        programId: associatedTokenProramId || ASSOCIATED_TOKEN_PROGRAM_ID,
+        programId: associatedTokenProgramId !== null && associatedTokenProgramId !== void 0 ? associatedTokenProgramId : ASSOCIATED_TOKEN_PROGRAM_ID,
         data: buffer.Buffer.from([1]),
         keys: [
             {
@@ -11503,7 +11505,7 @@ function createAssociatedWalletInstruction(tokenMint, associatedAccount, owner,
                 isWritable: false,
             },
             {
-                pubkey: TOKEN_PROGRAM_ID$1,
+                pubkey: isToken2022 ? TOKEN_2022_PROGRAM_ID : TOKEN_PROGRAM_ID$1,
                 isSigner: false,
                 isWritable: false,
             },
@@ -11571,11 +11573,27 @@ function getNativeWalletBalance(connection, wallet) {
  */
 function getAssocSPLWalletBalance(connection, originalWallet, tokenMint) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d;
         originalWallet = new PublicKey(originalWallet);
         tokenMint = new PublicKey(tokenMint);
         const [wallet] = findAssociatedTokenAddress(originalWallet, tokenMint);
-        const result = yield connection.getTokenAccountBalance(wallet, "finalized");
-        return new BN(result.value.amount);
+        const [wallet22] = findAssociatedTokenAddress(originalWallet, tokenMint, TOKEN_2022_PROGRAM_ID);
+        const [tokenMintInfo, walletInfo, wallet22Info] = yield connection.getMultipleAccountsInfo([tokenMint, wallet, wallet22]);
+        if (!tokenMintInfo) {
+            throw new Error("Mint doesn't exist");
+        }
+        const owner = tokenMintInfo.owner.toBase58();
+        switch (owner) {
+            case TOKEN_PROGRAM_ID$1.toBase58(): {
+                return new BN((_b = (_a = parseSplAccount(walletInfo !== null && walletInfo !== void 0 ? walletInfo : null)) === null || _a === void 0 ? void 0 : _a.amount.toString()) !== null && _b !== void 0 ? _b : 0);
+            }
+            case TOKEN_2022_PROGRAM_ID.toBase58(): {
+                return new BN((_d = (_c = parseSplAccount(wallet22Info !== null && wallet22Info !== void 0 ? wallet22Info : null)) === null || _c === void 0 ? void 0 : _c.amount.toString()) !== null && _d !== void 0 ? _d : 0);
+            }
+            default: {
+                throw new Error(`Unexpected tokenMint owner: ${owner}`);
+            }
+        }
     });
 }
 /**
@@ -11585,8 +11603,15 @@ function getAssocSPLWalletBalance(connection, originalWallet, tokenMint) {
 function getSPLWalletBalance(connection, wallet) {
     return __awaiter(this, void 0, void 0, function* () {
         wallet = new PublicKey(wallet);
-        const result = yield connection.getTokenAccountBalance(wallet, "finalized");
-        return new BN(result.value.amount);
+        const info = yield getAccountInfo(connection, wallet, "finalized");
+        if (!info) {
+            return new BN(0);
+        }
+        const parsed = parseSplAccount(info.data);
+        if (!parsed) {
+            return new BN(0);
+        }
+        return new BN(parsed.amount.toString());
     });
 }
 /**
@@ -11596,9 +11621,17 @@ function getSPLWalletBalance(connection, wallet) {
  */
 function getAllTokenAccountsWithBalances(connection, owner) {
     return __awaiter(this, void 0, void 0, function* () {
-        const walletsData = yield connection.getParsedTokenAccountsByOwner(new PublicKey(owner), { programId: TOKEN_PROGRAM_ID$1 });
+        const [walletsData, walletsDataToken22] = yield Promise.all([
+            connection.getParsedTokenAccountsByOwner(new PublicKey(owner), {
+                programId: TOKEN_PROGRAM_ID$1,
+            }),
+            connection.getParsedTokenAccountsByOwner(new PublicKey(owner), {
+                programId: TOKEN_2022_PROGRAM_ID,
+            }),
+        ]);
         const wallets = walletsData.value;
-        return wallets.map((wallet) => {
+        const walletsToken22 = walletsDataToken22.value;
+        const parseTokenAccount = (isToken22) => (wallet) => {
             const tokenInfo = wallet.account.data.parsed;
             return {
                 address: wallet.pubkey,
@@ -11608,8 +11641,13 @@ function getAllTokenAccountsWithBalances(connection, owner) {
                 isInitialized: true,
                 isNative: tokenInfo.info.isNative,
                 owner: new PublicKey(tokenInfo.info.owner),
+                isToken22,
             };
-        });
+        };
+        return [
+            ...wallets.map(parseTokenAccount(false)),
+            ...walletsToken22.map(parseTokenAccount(true)),
+        ];
     });
 }
 /**
@@ -11620,7 +11658,11 @@ function getAllTokenAccountsWithBalances(connection, owner) {
  */
 function getTokenAccountsWithBalance(connection, tokenMint, owner) {
     return __awaiter(this, void 0, void 0, function* () {
-        const walletsData = yield connection.getParsedTokenAccountsByOwner(new PublicKey(owner), { mint: new PublicKey(tokenMint) });
+        const mint = new PublicKey(tokenMint);
+        const [walletsData, accountInfo] = yield Promise.all([
+            connection.getParsedTokenAccountsByOwner(new PublicKey(owner), { mint }),
+            connection.getAccountInfo(mint),
+        ]);
         const wallets = walletsData.value;
         return wallets.map((wallet) => {
             const tokenInfo = wallet.account.data.parsed;
@@ -11632,6 +11674,7 @@ function getTokenAccountsWithBalance(connection, tokenMint, owner) {
                 isInitialized: true,
                 isNative: tokenInfo.info.isNative,
                 owner: new PublicKey(tokenInfo.info.owner),
+                isToken22: accountInfo.owner.equals(TOKEN_2022_PROGRAM_ID),
             };
         });
     });