@debridge-finance/solana-utils 5.5.0 → 5.5.1

package/dist/browser/index.js

@@ -11573,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}`);
+            }
+        }
     });
 }
 /**
@@ -11587,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());
     });
 }
 /**