@lifi/sdk 3.7.4 → 3.7.6

package/package.json

@@ -69,5 +69,5 @@
   "sideEffects": false,
   "types": "./src/_types/index.d.ts",
   "typings": "./src/_types/index.d.ts",
-  "version": "3.7.4"
+  "version": "3.7.6"
 }

package/src/_cjs/core/EVM/parseEVMErrors.js

@@ -50,7 +50,8 @@ const isAtomicReadyWalletRejectedUpgradeError = (e) => {
         return true;
     }
     const details = e.cause?.details?.toLowerCase();
-    const isTransactionError = e.name === 'TransactionExecutionError';
+    const isTransactionError = e.name === 'TransactionExecutionError' ||
+        e.cause?.name === 'TransactionExecutionError';
     const hasRejectedUpgrade = details?.includes('rejected') && details?.includes('upgrade');
     const has7702ErrorCode = details?.includes('7702');
     return isTransactionError && (hasRejectedUpgrade || has7702ErrorCode);

package/src/_cjs/core/EVM/parseEVMErrors.js.map

@@ -1 +1 @@
-{"version":3,"file":"parseEVMErrors.js","sourceRoot":"","sources":["../../../core/EVM/parseEVMErrors.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parseEVMErrors.js","sourceRoot":"","sources":["../../../core/EVM/parseEVMErrors.ts"],"names":[],"mappings":"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"}

package/src/_cjs/core/Solana/getSolanaBalance.js

@@ -21,25 +21,38 @@ const getSolanaBalance = async (walletAddress, tokens) => {
 exports.getSolanaBalance = getSolanaBalance;
 const getSolanaBalanceDefault = async (_chainId, tokens, walletAddress) => {
     const accountPublicKey = new web3_js_1.PublicKey(walletAddress);
-    const tokenProgramPublicKey = new web3_js_1.PublicKey(types_js_1.TokenProgramAddress);
-    const [slot, balance, tokenAccountsByOwner] = await Promise.allSettled([
+    const tokenProgramIdPublicKey = new web3_js_1.PublicKey(types_js_1.TokenProgramId);
+    const token2022ProgramIdPublicKey = new web3_js_1.PublicKey(types_js_1.Token2022ProgramId);
+    const [slot, balance, tokenAccountsByOwner, token2022AccountsByOwner] = await Promise.allSettled([
         (0, withDedupe_js_1.withDedupe)(() => (0, connection_js_1.callSolanaWithRetry)((connection) => connection.getSlot('confirmed')), { id: `${getSolanaBalanceDefault.name}.getSlot` }),
         (0, withDedupe_js_1.withDedupe)(() => (0, connection_js_1.callSolanaWithRetry)((connection) => connection.getBalance(accountPublicKey, 'confirmed')), { id: `${getSolanaBalanceDefault.name}.getBalance` }),
         (0, withDedupe_js_1.withDedupe)(() => (0, connection_js_1.callSolanaWithRetry)((connection) => connection.getParsedTokenAccountsByOwner(accountPublicKey, {
-            programId: tokenProgramPublicKey,
-        }, 'confirmed')), { id: `${getSolanaBalanceDefault.name}.getParsedTokenAccountsByOwner` }),
+            programId: tokenProgramIdPublicKey,
+        }, 'confirmed')), {
+            id: `${getSolanaBalanceDefault.name}.getParsedTokenAccountsByOwner.${types_js_1.TokenProgramId}`,
+        }),
+        (0, withDedupe_js_1.withDedupe)(() => (0, connection_js_1.callSolanaWithRetry)((connection) => connection.getParsedTokenAccountsByOwner(accountPublicKey, {
+            programId: token2022ProgramIdPublicKey,
+        }, 'confirmed')), {
+            id: `${getSolanaBalanceDefault.name}.getParsedTokenAccountsByOwner.${types_js_1.Token2022ProgramId}`,
+        }),
     ]);
     const blockNumber = slot.status === 'fulfilled' ? BigInt(slot.value) : 0n;
     const solBalance = balance.status === 'fulfilled' ? BigInt(balance.value) : 0n;
-    const walletTokenAmounts = tokenAccountsByOwner.status === 'fulfilled'
-        ? tokenAccountsByOwner.value.value.reduce((tokenAmounts, value) => {
-            const amount = BigInt(value.account.data.parsed.info.tokenAmount.amount);
-            if (amount > 0n) {
-                tokenAmounts[value.account.data.parsed.info.mint] = amount;
-            }
-            return tokenAmounts;
-        }, {})
-        : {};
+    const walletTokenAmounts = [
+        ...(tokenAccountsByOwner.status === 'fulfilled'
+            ? tokenAccountsByOwner.value.value
+            : []),
+        ...(token2022AccountsByOwner.status === 'fulfilled'
+            ? token2022AccountsByOwner.value.value
+            : []),
+    ].reduce((tokenAmounts, value) => {
+        const amount = BigInt(value.account.data.parsed.info.tokenAmount.amount);
+        if (amount > 0n) {
+            tokenAmounts[value.account.data.parsed.info.mint] = amount;
+        }
+        return tokenAmounts;
+    }, {});
     walletTokenAmounts[constants_js_1.SolSystemProgram] = solBalance;
     const tokenAmounts = tokens.map((token) => {
         if (walletTokenAmounts[token.address]) {

package/src/_cjs/core/Solana/getSolanaBalance.js.map

@@ -1 +1 @@
-{"version":3,"file":"getSolanaBalance.js","sourceRoot":"","sources":["../../../core/Solana/getSolanaBalance.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getSolanaBalance.js","sourceRoot":"","sources":["../../../core/Solana/getSolanaBalance.ts"],"names":[],"mappings":"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"}

package/src/_cjs/core/Solana/types.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TokenProgramAddress = void 0;
+exports.Token2022ProgramId = exports.TokenProgramId = void 0;
 exports.isSolana = isSolana;
 const types_1 = require("@lifi/types");
 function isSolana(provider) {
     return provider.type === types_1.ChainType.SVM;
 }
-exports.TokenProgramAddress = 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';
+exports.TokenProgramId = 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';
+exports.Token2022ProgramId = 'TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb';
 //# sourceMappingURL=types.js.map

package/src/_cjs/core/Solana/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../core/Solana/types.ts"],"names":[],"mappings":";;;AAYA,4BAEC;AAdD,uCAAuC;AAYvC,SAAgB,QAAQ,CAAC,QAAqB;IAC5C,OAAO,QAAQ,CAAC,IAAI,KAAK,iBAAS,CAAC,GAAG,CAAA;AACxC,CAAC;AAMY,QAAA,mBAAmB,GAAG,6CAA6C,CAAA"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../core/Solana/types.ts"],"names":[],"mappings":";;;AAYA,4BAEC;AAdD,uCAAuC;AAYvC,SAAgB,QAAQ,CAAC,QAAqB;IAC5C,OAAO,QAAQ,CAAC,IAAI,KAAK,iBAAS,CAAC,GAAG,CAAA;AACxC,CAAC;AAMY,QAAA,cAAc,GAAG,6CAA6C,CAAA;AAC9D,QAAA,kBAAkB,GAAG,6CAA6C,CAAA"}

package/src/_cjs/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = exports.name = void 0;
 exports.name = '@lifi/sdk';
-exports.version = '3.7.4';
+exports.version = '3.7.6';
 //# sourceMappingURL=version.js.map

package/src/_esm/core/EVM/parseEVMErrors.js

@@ -58,7 +58,8 @@ export const isAtomicReadyWalletRejectedUpgradeError = (e) => {
         return true;
     }
     const details = e.cause?.details?.toLowerCase();
-    const isTransactionError = e.name === 'TransactionExecutionError';
+    const isTransactionError = e.name === 'TransactionExecutionError' ||
+        e.cause?.name === 'TransactionExecutionError';
     const hasRejectedUpgrade = details?.includes('rejected') && details?.includes('upgrade');
     const has7702ErrorCode = details?.includes('7702');
     return isTransactionError && (hasRejectedUpgrade || has7702ErrorCode);

package/src/_esm/core/EVM/parseEVMErrors.js.map

@@ -1 +1 @@
-{"version":3,"file":"parseEVMErrors.js","sourceRoot":"","sources":["../../../core/EVM/parseEVMErrors.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parseEVMErrors.js","sourceRoot":"","sources":["../../../core/EVM/parseEVMErrors.ts"],"names":[],"mappings":"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"}

package/src/_esm/core/Solana/getSolanaBalance.js

@@ -2,7 +2,7 @@ import { PublicKey } from '@solana/web3.js';
 import { SolSystemProgram } from '../../constants.js';
 import { withDedupe } from '../../utils/withDedupe.js';
 import { callSolanaWithRetry } from './connection.js';
-import { TokenProgramAddress } from './types.js';
+import { Token2022ProgramId, TokenProgramId } from './types.js';
 export const getSolanaBalance = async (walletAddress, tokens) => {
     if (tokens.length === 0) {
         return [];
@@ -17,25 +17,38 @@ export const getSolanaBalance = async (walletAddress, tokens) => {
 };
 const getSolanaBalanceDefault = async (_chainId, tokens, walletAddress) => {
     const accountPublicKey = new PublicKey(walletAddress);
-    const tokenProgramPublicKey = new PublicKey(TokenProgramAddress);
-    const [slot, balance, tokenAccountsByOwner] = await Promise.allSettled([
+    const tokenProgramIdPublicKey = new PublicKey(TokenProgramId);
+    const token2022ProgramIdPublicKey = new PublicKey(Token2022ProgramId);
+    const [slot, balance, tokenAccountsByOwner, token2022AccountsByOwner] = await Promise.allSettled([
         withDedupe(() => callSolanaWithRetry((connection) => connection.getSlot('confirmed')), { id: `${getSolanaBalanceDefault.name}.getSlot` }),
         withDedupe(() => callSolanaWithRetry((connection) => connection.getBalance(accountPublicKey, 'confirmed')), { id: `${getSolanaBalanceDefault.name}.getBalance` }),
         withDedupe(() => callSolanaWithRetry((connection) => connection.getParsedTokenAccountsByOwner(accountPublicKey, {
-            programId: tokenProgramPublicKey,
-        }, 'confirmed')), { id: `${getSolanaBalanceDefault.name}.getParsedTokenAccountsByOwner` }),
+            programId: tokenProgramIdPublicKey,
+        }, 'confirmed')), {
+            id: `${getSolanaBalanceDefault.name}.getParsedTokenAccountsByOwner.${TokenProgramId}`,
+        }),
+        withDedupe(() => callSolanaWithRetry((connection) => connection.getParsedTokenAccountsByOwner(accountPublicKey, {
+            programId: token2022ProgramIdPublicKey,
+        }, 'confirmed')), {
+            id: `${getSolanaBalanceDefault.name}.getParsedTokenAccountsByOwner.${Token2022ProgramId}`,
+        }),
     ]);
     const blockNumber = slot.status === 'fulfilled' ? BigInt(slot.value) : 0n;
     const solBalance = balance.status === 'fulfilled' ? BigInt(balance.value) : 0n;
-    const walletTokenAmounts = tokenAccountsByOwner.status === 'fulfilled'
-        ? tokenAccountsByOwner.value.value.reduce((tokenAmounts, value) => {
-            const amount = BigInt(value.account.data.parsed.info.tokenAmount.amount);
-            if (amount > 0n) {
-                tokenAmounts[value.account.data.parsed.info.mint] = amount;
-            }
-            return tokenAmounts;
-        }, {})
-        : {};
+    const walletTokenAmounts = [
+        ...(tokenAccountsByOwner.status === 'fulfilled'
+            ? tokenAccountsByOwner.value.value
+            : []),
+        ...(token2022AccountsByOwner.status === 'fulfilled'
+            ? token2022AccountsByOwner.value.value
+            : []),
+    ].reduce((tokenAmounts, value) => {
+        const amount = BigInt(value.account.data.parsed.info.tokenAmount.amount);
+        if (amount > 0n) {
+            tokenAmounts[value.account.data.parsed.info.mint] = amount;
+        }
+        return tokenAmounts;
+    }, {});
     walletTokenAmounts[SolSystemProgram] = solBalance;
     const tokenAmounts = tokens.map((token) => {
         if (walletTokenAmounts[token.address]) {

package/src/_esm/core/Solana/getSolanaBalance.js.map

@@ -1 +1 @@
-{"version":3,"file":"getSolanaBalance.js","sourceRoot":"","sources":["../../../core/Solana/getSolanaBalance.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getSolanaBalance.js","sourceRoot":"","sources":["../../../core/Solana/getSolanaBalance.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAE/D,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACnC,aAAqB,EACrB,MAAe,EACS,EAAE;IAC1B,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,EAAE,CAAA;IACX,CAAC;IACD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;IAC7B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,KAAK,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;YAC9B,OAAO,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAA;QAChE,CAAC;IACH,CAAC;IAED,OAAO,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,CAAA;AAChE,CAAC,CAAA;AAED,MAAM,uBAAuB,GAAG,KAAK,EACnC,QAAiB,EACjB,MAAe,EACf,aAAqB,EACG,EAAE;IAC1B,MAAM,gBAAgB,GAAG,IAAI,SAAS,CAAC,aAAa,CAAC,CAAA;IACrD,MAAM,uBAAuB,GAAG,IAAI,SAAS,CAAC,cAAc,CAAC,CAAA;IAC7D,MAAM,2BAA2B,GAAG,IAAI,SAAS,CAAC,kBAAkB,CAAC,CAAA;IACrE,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,CAAC,GACnE,MAAM,OAAO,CAAC,UAAU,CAAC;QACvB,UAAU,CACR,GAAG,EAAE,CACH,mBAAmB,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,EACtE,EAAE,EAAE,EAAE,GAAG,uBAAuB,CAAC,IAAI,UAAU,EAAE,CAClD;QACD,UAAU,CACR,GAAG,EAAE,CACH,mBAAmB,CAAC,CAAC,UAAU,EAAE,EAAE,CACjC,UAAU,CAAC,UAAU,CAAC,gBAAgB,EAAE,WAAW,CAAC,CACrD,EACH,EAAE,EAAE,EAAE,GAAG,uBAAuB,CAAC,IAAI,aAAa,EAAE,CACrD;QACD,UAAU,CACR,GAAG,EAAE,CACH,mBAAmB,CAAC,CAAC,UAAU,EAAE,EAAE,CACjC,UAAU,CAAC,6BAA6B,CACtC,gBAAgB,EAChB;YACE,SAAS,EAAE,uBAAuB;SACnC,EACD,WAAW,CACZ,CACF,EACH;YACE,EAAE,EAAE,GAAG,uBAAuB,CAAC,IAAI,kCAAkC,cAAc,EAAE;SACtF,CACF;QACD,UAAU,CACR,GAAG,EAAE,CACH,mBAAmB,CAAC,CAAC,UAAU,EAAE,EAAE,CACjC,UAAU,CAAC,6BAA6B,CACtC,gBAAgB,EAChB;YACE,SAAS,EAAE,2BAA2B;SACvC,EACD,WAAW,CACZ,CACF,EACH;YACE,EAAE,EAAE,GAAG,uBAAuB,CAAC,IAAI,kCAAkC,kBAAkB,EAAE;SAC1F,CACF;KACF,CAAC,CAAA;IACJ,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IACzE,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAE9E,MAAM,kBAAkB,GAAG;QACzB,GAAG,CAAC,oBAAoB,CAAC,MAAM,KAAK,WAAW;YAC7C,CAAC,CAAC,oBAAoB,CAAC,KAAK,CAAC,KAAK;YAClC,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,wBAAwB,CAAC,MAAM,KAAK,WAAW;YACjD,CAAC,CAAC,wBAAwB,CAAC,KAAK,CAAC,KAAK;YACtC,CAAC,CAAC,EAAE,CAAC;KACR,CAAC,MAAM,CACN,CAAC,YAAoC,EAAE,KAAU,EAAE,EAAE;QACnD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;QACxE,IAAI,MAAM,GAAG,EAAE,EAAE,CAAC;YAChB,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,CAAA;QAC5D,CAAC;QACD,OAAO,YAAY,CAAA;IACrB,CAAC,EACD,EAA4B,CAC7B,CAAA;IAED,kBAAkB,CAAC,gBAAgB,CAAC,GAAG,UAAU,CAAA;IACjD,MAAM,YAAY,GAAkB,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACvD,IAAI,kBAAkB,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YACtC,OAAO;gBACL,GAAG,KAAK;gBACR,MAAM,EAAE,kBAAkB,CAAC,KAAK,CAAC,OAAO,CAAC;gBACzC,WAAW;aACZ,CAAA;QACH,CAAC;QACD,OAAO;YACL,GAAG,KAAK;YACR,WAAW;SACZ,CAAA;IACH,CAAC,CAAC,CAAA;IACF,OAAO,YAAY,CAAA;AACrB,CAAC,CAAA"}

package/src/_esm/core/Solana/types.js

@@ -2,5 +2,6 @@ import { ChainType } from '@lifi/types';
 export function isSolana(provider) {
     return provider.type === ChainType.SVM;
 }
-export const TokenProgramAddress = 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';
+export const TokenProgramId = 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';
+export const Token2022ProgramId = 'TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb';
 //# sourceMappingURL=types.js.map

package/src/_esm/core/Solana/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../core/Solana/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAYvC,MAAM,UAAU,QAAQ,CAAC,QAAqB;IAC5C,OAAO,QAAQ,CAAC,IAAI,KAAK,SAAS,CAAC,GAAG,CAAA;AACxC,CAAC;AAMD,MAAM,CAAC,MAAM,mBAAmB,GAAG,6CAA6C,CAAA"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../core/Solana/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAYvC,MAAM,UAAU,QAAQ,CAAC,QAAqB;IAC5C,OAAO,QAAQ,CAAC,IAAI,KAAK,SAAS,CAAC,GAAG,CAAA;AACxC,CAAC;AAMD,MAAM,CAAC,MAAM,cAAc,GAAG,6CAA6C,CAAA;AAC3E,MAAM,CAAC,MAAM,kBAAkB,GAAG,6CAA6C,CAAA"}

package/src/_esm/version.js

@@ -1,3 +1,3 @@
 export const name = '@lifi/sdk';
-export const version = '3.7.4';
+export const version = '3.7.6';
 //# sourceMappingURL=version.js.map

package/src/_types/core/EVM/parseEVMErrors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseEVMErrors.d.ts","sourceRoot":"","sources":["../../../core/EVM/parseEVMErrors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAE3C,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAKnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAE1C,eAAO,MAAM,cAAc,GACzB,GAAG,KAAK,EACR,OAAO,QAAQ,EACf,UAAU,OAAO,KAChB,OAAO,CAAC,QAAQ,CAUlB,CAAA;AAiED,eAAO,MAAM,uCAAuC,GAAI,GAAG,GAAG,QAY7D,CAAA"}
+{"version":3,"file":"parseEVMErrors.d.ts","sourceRoot":"","sources":["../../../core/EVM/parseEVMErrors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAE3C,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAKnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAE1C,eAAO,MAAM,cAAc,GACzB,GAAG,KAAK,EACR,OAAO,QAAQ,EACf,UAAU,OAAO,KAChB,OAAO,CAAC,QAAQ,CAUlB,CAAA;AAiED,eAAO,MAAM,uCAAuC,GAAI,GAAG,GAAG,QAc7D,CAAA"}

package/src/_types/core/Solana/types.d.ts

@@ -10,5 +10,6 @@ export declare function isSolana(provider: SDKProvider): provider is SolanaProvi
 export interface SolanaStepExecutorOptions extends StepExecutorOptions {
     walletAdapter: SignerWalletAdapter;
 }
-export declare const TokenProgramAddress = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
+export declare const TokenProgramId = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
+export declare const Token2022ProgramId = "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb";
 //# sourceMappingURL=types.d.ts.map

package/src/_types/core/Solana/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../core/Solana/types.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AAEnE,MAAM,WAAW,qBAAqB;IACpC,gBAAgB,CAAC,EAAE,MAAM,OAAO,CAAC,mBAAmB,CAAC,CAAA;CACtD;AAED,MAAM,WAAW,cAAe,SAAQ,WAAW;IACjD,UAAU,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,CAAA;CACjD;AAED,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,WAAW,GAAG,QAAQ,IAAI,cAAc,CAE1E;AAED,MAAM,WAAW,yBAA0B,SAAQ,mBAAmB;IACpE,aAAa,EAAE,mBAAmB,CAAA;CACnC;AAED,eAAO,MAAM,mBAAmB,gDAAgD,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../core/Solana/types.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AAEnE,MAAM,WAAW,qBAAqB;IACpC,gBAAgB,CAAC,EAAE,MAAM,OAAO,CAAC,mBAAmB,CAAC,CAAA;CACtD;AAED,MAAM,WAAW,cAAe,SAAQ,WAAW;IACjD,UAAU,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,CAAA;CACjD;AAED,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,WAAW,GAAG,QAAQ,IAAI,cAAc,CAE1E;AAED,MAAM,WAAW,yBAA0B,SAAQ,mBAAmB;IACpE,aAAa,EAAE,mBAAmB,CAAA;CACnC;AAED,eAAO,MAAM,cAAc,gDAAgD,CAAA;AAC3E,eAAO,MAAM,kBAAkB,gDAAgD,CAAA"}

package/src/_types/version.d.ts

@@ -1,3 +1,3 @@
 export declare const name = "@lifi/sdk";
-export declare const version = "3.7.4";
+export declare const version = "3.7.6";
 //# sourceMappingURL=version.d.ts.map

package/src/core/EVM/parseEVMErrors.ts

@@ -92,7 +92,9 @@ export const isAtomicReadyWalletRejectedUpgradeError = (e: any) => {
   }
 
   const details = e.cause?.details?.toLowerCase()
-  const isTransactionError = e.name === 'TransactionExecutionError'
+  const isTransactionError =
+    e.name === 'TransactionExecutionError' ||
+    e.cause?.name === 'TransactionExecutionError'
   const hasRejectedUpgrade =
     details?.includes('rejected') && details?.includes('upgrade')
   const has7702ErrorCode = details?.includes('7702')

package/src/core/Solana/getSolanaBalance.ts

@@ -3,7 +3,7 @@ import { PublicKey } from '@solana/web3.js'
 import { SolSystemProgram } from '../../constants.js'
 import { withDedupe } from '../../utils/withDedupe.js'
 import { callSolanaWithRetry } from './connection.js'
-import { TokenProgramAddress } from './types.js'
+import { Token2022ProgramId, TokenProgramId } from './types.js'
 
 export const getSolanaBalance = async (
   walletAddress: string,
@@ -28,51 +28,74 @@ const getSolanaBalanceDefault = async (
   walletAddress: string
 ): Promise<TokenAmount[]> => {
   const accountPublicKey = new PublicKey(walletAddress)
-  const tokenProgramPublicKey = new PublicKey(TokenProgramAddress)
-  const [slot, balance, tokenAccountsByOwner] = await Promise.allSettled([
-    withDedupe(
-      () =>
-        callSolanaWithRetry((connection) => connection.getSlot('confirmed')),
-      { id: `${getSolanaBalanceDefault.name}.getSlot` }
-    ),
-    withDedupe(
-      () =>
-        callSolanaWithRetry((connection) =>
-          connection.getBalance(accountPublicKey, 'confirmed')
-        ),
-      { id: `${getSolanaBalanceDefault.name}.getBalance` }
-    ),
-    withDedupe(
-      () =>
-        callSolanaWithRetry((connection) =>
-          connection.getParsedTokenAccountsByOwner(
-            accountPublicKey,
-            {
-              programId: tokenProgramPublicKey,
-            },
-            'confirmed'
-          )
-        ),
-      { id: `${getSolanaBalanceDefault.name}.getParsedTokenAccountsByOwner` }
-    ),
-  ])
+  const tokenProgramIdPublicKey = new PublicKey(TokenProgramId)
+  const token2022ProgramIdPublicKey = new PublicKey(Token2022ProgramId)
+  const [slot, balance, tokenAccountsByOwner, token2022AccountsByOwner] =
+    await Promise.allSettled([
+      withDedupe(
+        () =>
+          callSolanaWithRetry((connection) => connection.getSlot('confirmed')),
+        { id: `${getSolanaBalanceDefault.name}.getSlot` }
+      ),
+      withDedupe(
+        () =>
+          callSolanaWithRetry((connection) =>
+            connection.getBalance(accountPublicKey, 'confirmed')
+          ),
+        { id: `${getSolanaBalanceDefault.name}.getBalance` }
+      ),
+      withDedupe(
+        () =>
+          callSolanaWithRetry((connection) =>
+            connection.getParsedTokenAccountsByOwner(
+              accountPublicKey,
+              {
+                programId: tokenProgramIdPublicKey,
+              },
+              'confirmed'
+            )
+          ),
+        {
+          id: `${getSolanaBalanceDefault.name}.getParsedTokenAccountsByOwner.${TokenProgramId}`,
+        }
+      ),
+      withDedupe(
+        () =>
+          callSolanaWithRetry((connection) =>
+            connection.getParsedTokenAccountsByOwner(
+              accountPublicKey,
+              {
+                programId: token2022ProgramIdPublicKey,
+              },
+              'confirmed'
+            )
+          ),
+        {
+          id: `${getSolanaBalanceDefault.name}.getParsedTokenAccountsByOwner.${Token2022ProgramId}`,
+        }
+      ),
+    ])
   const blockNumber = slot.status === 'fulfilled' ? BigInt(slot.value) : 0n
   const solBalance = balance.status === 'fulfilled' ? BigInt(balance.value) : 0n
-  const walletTokenAmounts =
-    tokenAccountsByOwner.status === 'fulfilled'
-      ? tokenAccountsByOwner.value.value.reduce(
-          (tokenAmounts, value) => {
-            const amount = BigInt(
-              value.account.data.parsed.info.tokenAmount.amount
-            )
-            if (amount > 0n) {
-              tokenAmounts[value.account.data.parsed.info.mint] = amount
-            }
-            return tokenAmounts
-          },
-          {} as Record<string, bigint>
-        )
-      : {}
+
+  const walletTokenAmounts = [
+    ...(tokenAccountsByOwner.status === 'fulfilled'
+      ? tokenAccountsByOwner.value.value
+      : []),
+    ...(token2022AccountsByOwner.status === 'fulfilled'
+      ? token2022AccountsByOwner.value.value
+      : []),
+  ].reduce(
+    (tokenAmounts: Record<string, bigint>, value: any) => {
+      const amount = BigInt(value.account.data.parsed.info.tokenAmount.amount)
+      if (amount > 0n) {
+        tokenAmounts[value.account.data.parsed.info.mint] = amount
+      }
+      return tokenAmounts
+    },
+    {} as Record<string, bigint>
+  )
+
   walletTokenAmounts[SolSystemProgram] = solBalance
   const tokenAmounts: TokenAmount[] = tokens.map((token) => {
     if (walletTokenAmounts[token.address]) {

package/src/core/Solana/types.ts

@@ -18,4 +18,5 @@ export interface SolanaStepExecutorOptions extends StepExecutorOptions {
   walletAdapter: SignerWalletAdapter
 }
 
-export const TokenProgramAddress = 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'
+export const TokenProgramId = 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'
+export const Token2022ProgramId = 'TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb'

package/src/version.ts

@@ -1,2 +1,2 @@
 export const name = '@lifi/sdk'
-export const version = '3.7.4'
+export const version = '3.7.6'