@imtbl/sdk 0.40.0 → 0.41.1

package/dist/index.cjs

@@ -4256,7 +4256,7 @@ class MultiRollupApiClients {
 }
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-0.40.0' };
+const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-0.41.1' };
 const createConfig = ({ basePath, headers, }) => {
     if (!basePath.trim()) {
         throw Error('basePath can not be empty');
@@ -4316,7 +4316,7 @@ class APIError extends Error {
 
 /* eslint-disable implicit-arrow-linebreak */
 const defaultHeaders = {
-    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-0.40.0',
+    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-0.41.1',
 };
 /**
  * createAPIConfiguration to create a custom Configuration
@@ -4755,7 +4755,7 @@ const createImmutableXConfiguration = ({ basePath, chainID, coreContractAddress,
     chainID,
     coreContractAddress,
     registrationContractAddress,
-    sdkVersion: 'ts-immutable-sdk-0.40.0',
+    sdkVersion: 'ts-immutable-sdk-0.41.1',
 });
 /**
  * Sets `sdkVersion` at the time of build
@@ -35533,7 +35533,7 @@ const GAS_OVERRIDES = {
     maxPriorityFeePerGas: ethers.BigNumber.from(101e9),
 };
 
-const SDK_VERSION_MARKER = '0.40.0';
+const SDK_VERSION_MARKER = '0.41.1';
 // This SDK version is replaced by the `yarn build` command ran on the root level
 const globalPackageVersion = () => SDK_VERSION_MARKER;
 
@@ -35680,6 +35680,8 @@ class CheckoutConfiguration {
     }
 }
 
+const isMatchingAddress = (addressA = '', addressB = '') => (addressA.toLowerCase() === addressB.toLowerCase());
+
 const getTokenAllowList = async (config, { type = TokenFilterTypes.ALL, chainId, exclude, }) => {
     let tokens = [];
     let onRampConfig;
@@ -35715,7 +35717,7 @@ const getTokenAllowList = async (config, { type = TokenFilterTypes.ALL, chainId,
         tokens: tokens.filter((token) => !exclude.map((e) => e.address).includes(token.address || '')),
     };
 };
-const isNativeToken = (address) => !address || address.toLocaleLowerCase() === NATIVE;
+const isNativeToken = (address) => !address || isMatchingAddress(address, NATIVE);
 async function getERC20TokenInfo(web3Provider, tokenAddress) {
     return await withCheckoutError(async () => {
         const contract = new ethers.Contract(tokenAddress, JSON.stringify(ERC20ABI), web3Provider);
@@ -36005,7 +36007,7 @@ const getBalances = async (config, web3Provider, walletAddress, tokens) => {
         // For some reason isNativeToken always returns undefined.
         // We have spent way too much time figuring out why this is happening.
         // That we have given up -- keep it as it is for now.
-        if (!token.address || token.address.toLocaleLowerCase() === NATIVE) {
+        if (!token.address || isMatchingAddress(token.address, NATIVE)) {
             allBalancePromises.push(getBalance(config, web3Provider, walletAddress));
         }
         else {
@@ -36019,7 +36021,7 @@ const getBalances = async (config, web3Provider, walletAddress, tokens) => {
         // For some reason isNativeToken always returns undefined.
         // We have spent way too much time figuring out why this is happening.
         // That we have given up -- keep it as it is for now.
-        if (!token.address || token.address.toLocaleLowerCase() === NATIVE)
+        if (!token.address || isMatchingAddress(token.address, NATIVE))
             resp.value.token.address = NATIVE;
         return resp.value;
     });
@@ -36781,7 +36783,7 @@ const getERC721BalanceRequirement = (itemRequirement, balances) => {
     // Find the requirements related balance
     const itemBalanceResult = balances.find((balance) => {
         const balanceERC721Result = balance;
-        return balanceERC721Result.contractAddress === itemRequirement.contractAddress
+        return isMatchingAddress(balanceERC721Result.contractAddress, itemRequirement.contractAddress)
             && balanceERC721Result.id === itemRequirement.id;
     });
     // Calculate the balance delta
@@ -36821,7 +36823,7 @@ const getTokenBalanceRequirement = (itemRequirement, balances) => {
     // Get the requirements related balance
     if (itemRequirement.type === ItemType.ERC20) {
         itemBalanceResult = balances.find((balance) => {
-            return balance.token?.address === itemRequirement.tokenAddress;
+            return isMatchingAddress(balance.token?.address, itemRequirement.tokenAddress);
         });
     }
     else if (itemRequirement.type === ItemType.NATIVE) {
@@ -36943,7 +36945,7 @@ const getERC721Balances = async (provider, ownerAddress, itemRequirements) => {
         erc721Owners.forEach((erc721OwnerAddress, index) => {
             const itemRequirement = erc721s.get(erc721OwnersPromiseIds[index]);
             let itemCount = 0;
-            if (itemRequirement && ownerAddress === erc721OwnerAddress) {
+            if (itemRequirement && isMatchingAddress(ownerAddress, erc721OwnerAddress)) {
                 itemCount = 1;
             }
             erc721Balances.push({
@@ -37091,15 +37093,15 @@ const availabilityService = (isDevelopment, isProduction) => {
             response = await globalAxios$1.post(`${postEndpoint()}/v1/availability/checkout/swap`);
         }
         catch (error) {
+            // The request was made and the server responded with a status code
+            // that falls out of the range of 2xx
             response = error.response;
+            // If 403 then the service is geo-blocked
+            if (response.status === 403)
+                return false;
+            throw new CheckoutError(`Error fetching from api: ${response.status} ${response.statusText}`, CheckoutErrorType.API_ERROR);
         }
-        if (response.status === 403) {
-            return false;
-        }
-        if (response.status === 204) {
-            return true;
-        }
-        throw new CheckoutError(`Error fetching from api: ${response.status} ${response.statusText}`, CheckoutErrorType.API_ERROR);
+        return true;
     };
     return {
         checkDexAvailability,
@@ -37383,7 +37385,7 @@ const checkUserCanCoverApprovalFees = (l2Balances, approval) => {
     }
     // Find the users balance of the approval token
     const l2BalanceOfApprovalToken = l2Balances.find((balance) => (isNativeToken(balance.token.address) && isNativeToken(approvalGasTokenAddress))
-        || balance.token.address === approvalGasTokenAddress);
+        || isMatchingAddress(balance.token.address, approvalGasTokenAddress));
     if (!l2BalanceOfApprovalToken)
         return { sufficient: false, approvalGasFee, approvalGasTokenAddress };
     // If the user does not have enough of the token to cover approval fees then return sufficient false
@@ -37438,7 +37440,7 @@ const checkUserCanCoverSwapFees = (l2Balances, approvalFees, swapGasFee, swapFee
         if (fee === ethers.BigNumber.from(0))
             continue;
         const l2BalanceOfFeeToken = l2Balances.find((balance) => (isNativeToken(balance.token.address) && isNativeToken(tokenAddress))
-            || balance.token.address === tokenAddress);
+            || isMatchingAddress(balance.token.address, tokenAddress));
         if (!l2BalanceOfFeeToken) {
             return false;
         }
@@ -37459,7 +37461,8 @@ const checkIfUserCanCoverRequirement = (l2balance, balanceRequirements, quoteTok
     let requirementExists = false;
     balanceRequirements.balanceRequirements.forEach((requirement) => {
         if (requirement.type === ItemType.NATIVE || requirement.type === ItemType.ERC20) {
-            if (requirement.required.token.address === quoteTokenAddress) {
+            if (requirement.required.token.address
+                && isMatchingAddress(requirement.required.token.address, quoteTokenAddress)) {
                 balanceRequirementToken = requirement.required.token.address;
                 requirementExists = true;
                 // Get the balance that would remain if the requirement was removed from the users balance
@@ -37471,12 +37474,12 @@ const checkIfUserCanCoverRequirement = (l2balance, balanceRequirements, quoteTok
     if (!requirementExists)
         return true;
     // Remove approval fees from the remainder if token matches as these need to be taken out to cover the swap
-    if (approvalFees.approvalGasTokenAddress === balanceRequirementToken) {
+    if (isMatchingAddress(approvalFees.approvalGasTokenAddress, balanceRequirementToken)) {
         remainingBalance = remainingBalance.sub(approvalFees.approvalGasFee);
     }
     // Remove swap fees from the remainder if token matches as these need to be taken out to cover the swap
     for (const swapFee of swapFees) {
-        if (swapFee.amount.token.address === balanceRequirementToken) {
+        if (isMatchingAddress(swapFee.amount.token.address, balanceRequirementToken)) {
             remainingBalance = remainingBalance.sub(swapFee.amount.value);
         }
     }
@@ -37507,7 +37510,7 @@ const swapRoute = async (config, availableRoutingOptions, walletAddress, balance
         if (!quote)
             continue;
         // Find the balance the user has for this quoted token
-        const userBalanceOfQuotedToken = l2Balances.find((balance) => balance.token.address === quoteTokenAddress);
+        const userBalanceOfQuotedToken = l2Balances.find((balance) => isMatchingAddress(balance.token.address, quoteTokenAddress));
         // If no balance found on L2 for this quoted token then continue
         if (!userBalanceOfQuotedToken)
             continue;
@@ -37540,7 +37543,8 @@ const filterTokens = (allowedTokens, balances) => {
     if (balances && balances.success) {
         return allowedTokens.filter((token) => {
             if ('address' in token) {
-                return balances.balances.find((balance) => balance.token.address === token.address && balance.balance.gt(0));
+                return balances.balances.find((balance) => isMatchingAddress(balance.token.address, token.address)
+                    && balance.balance.gt(0));
             }
             return balances.balances.find((balance) => !('address' in balance.token) && balance.balance.gt(0));
         });
@@ -37640,9 +37644,8 @@ const fetchL1Representation = async (config, l2address) => {
         chainName,
         contractAddress: l2address,
     });
-    // TODO: When bridge is ready we need to understand how L2 ETH will be mapped back to L1 ETH
     const l1address = tokenData.result.root_contract_address;
-    if (l1address === INDEXER_ETH_ROOT_CONTRACT_ADDRESS) {
+    if (isMatchingAddress(l1address ?? '', INDEXER_ETH_ROOT_CONTRACT_ADDRESS)) {
         return {
             l1address: 'native',
             l2address,
@@ -37744,7 +37747,7 @@ const bridgeRoute = async (config, readOnlyProviders, availableRoutingOptions, b
         if (!allowedL1TokenList.find((token) => isNativeToken(token.address)))
             return undefined;
     }
-    else if (!allowedL1TokenList.find((token) => token.address === l1address)) {
+    else if (!allowedL1TokenList.find((token) => isMatchingAddress(token.address, l1address))) {
         return undefined;
     }
     const feesFromBridge = await getBridgeFeeEstimate(config, readOnlyProviders, l1ChainId, l2ChainId);
@@ -37763,7 +37766,7 @@ const bridgeRoute = async (config, readOnlyProviders, availableRoutingOptions, b
         return undefined;
     }
     // Find the balance of the L1 representation of the token and check if the balance covers the delta
-    const erc20balance = tokenBalanceResult.balances.find((balance) => balance.token.address === l1address);
+    const erc20balance = tokenBalanceResult.balances.find((balance) => isMatchingAddress(balance.token.address, l1address));
     if (erc20balance && erc20balance.balance.gte(bridgeRequirement.amount)) {
         const bridgeFees = constructFees(sourceChainGas, bridgeFee, imtblFee, approvalGas, nativeToken);
         return constructBridgeFundingRoute(l1ChainId, erc20balance, bridgeRequirement, ItemType.ERC20, bridgeFees);
@@ -37801,12 +37804,12 @@ const getBalancesByChain = (config, tokenBalances) => {
 const getFeesForTokenAddress = (dexQuote, tokenAddress) => {
     let fees = ethers.BigNumber.from(0);
     dexQuote.quote.fees.forEach((fee) => {
-        if (fee.amount.token.address === tokenAddress) {
+        if (isMatchingAddress(fee.amount.token.address, tokenAddress)) {
             fees = fees.add(fee.amount.value);
         }
     });
     if (dexQuote.approval) {
-        if (dexQuote.approval.token.address === tokenAddress) {
+        if (isMatchingAddress(dexQuote.approval.token.address, tokenAddress)) {
             fees = fees.add(dexQuote.approval.value);
         }
     }
@@ -37819,7 +37822,7 @@ const getAmountFromBalanceRequirement = (balanceRequirements, quotedTokenAddress
     // Find if there is an existing balance requirement of the token attempting to be bridged->swapped
     for (const requirement of balanceRequirements.balanceRequirements) {
         if (requirement.type === ItemType.NATIVE || requirement.type === ItemType.ERC20) {
-            if (requirement.required.token.address === quotedTokenAddress) {
+            if (isMatchingAddress(requirement.required.token.address, quotedTokenAddress)) {
                 return requirement.required.balance;
             }
         }
@@ -37857,8 +37860,8 @@ const constructBridgeRequirements = (dexQuotes, l1balances, l2balances, l1tol2ad
     const bridgeRequirements = [];
     for (const [tokenAddress, quote] of dexQuotes) {
         // Get the L2 balance for the token address
-        const l2balance = l2balances.find((balance) => balance.token.address === tokenAddress);
-        const l1tol2TokenMapping = l1tol2addresses.find((token) => token.l2address === tokenAddress);
+        const l2balance = l2balances.find((balance) => isMatchingAddress(balance.token.address, tokenAddress));
+        const l1tol2TokenMapping = l1tol2addresses.find((token) => isMatchingAddress(token.l2address, tokenAddress));
         if (!l1tol2TokenMapping)
             continue;
         const { l1address, l2address } = l1tol2TokenMapping;
@@ -37867,10 +37870,10 @@ const constructBridgeRequirements = (dexQuotes, l1balances, l2balances, l1tol2ad
         // If the user does not have any L1 balance for this token then cannot bridge
         const l1balance = l1balances.find((balance) => {
             if (balance.token.address === undefined
-                && l1address === INDEXER_ETH_ROOT_CONTRACT_ADDRESS) {
+                && isMatchingAddress(l1address, INDEXER_ETH_ROOT_CONTRACT_ADDRESS)) {
                 return true;
             }
-            return balance.token.address === l1address;
+            return isMatchingAddress(balance.token.address, l1address);
         });
         if (!l1balance)
             continue;
@@ -37950,9 +37953,9 @@ const filterSwappableTokensByBridgeableAddresses = (requiredTokenAddress, bridge
         if (!bridgeableTokens.includes(addresses.l1address))
             continue;
         // Filter out the token that is required from the swappable tokens list
-        if (addresses.l2address === requiredTokenAddress)
+        if (isMatchingAddress(addresses.l2address, requiredTokenAddress))
             continue;
-        const tokenInfo = swappableTokens.find((token) => token.address === addresses.l2address);
+        const tokenInfo = swappableTokens.find((token) => isMatchingAddress(token.address, addresses.l2address));
         if (!tokenInfo)
             continue;
         filteredSwappableTokens.push(tokenInfo);
@@ -37989,7 +37992,7 @@ const modifyTokenBalancesWithBridgedAmount = (config, tokenBalances, l2balances,
         if (currentBalance)
             l2balance = currentBalance.balance;
         const newBalance = l2balance.add(amount);
-        const tokenInfo = swappableTokens.find((token) => token.address === l2address);
+        const tokenInfo = swappableTokens.find((token) => isMatchingAddress(token.address, l2address));
         balanceMap.set(l2address, {
             balance: newBalance,
             formattedBalance: ethers.utils.formatUnits(newBalance, tokenInfo.decimals),
@@ -38015,7 +38018,7 @@ const reapplyOriginalSwapBalances = (tokenBalances, swapRoutes) => {
             continue;
         let originalBalance = ethers.BigNumber.from(0);
         let originalFormattedBalance = '0';
-        const l2balance = tokenBalance.balances.find((balance) => balance.token.address === fundingItem.token.address);
+        const l2balance = tokenBalance.balances.find((balance) => isMatchingAddress(balance.token.address, fundingItem.token.address));
         if (l2balance) {
             originalBalance = l2balance.balance;
             originalFormattedBalance = l2balance.formattedBalance;
@@ -38033,13 +38036,14 @@ const constructBridgeAndSwapRoutes = (bridgeFundingSteps, swapFundingSteps, l1to
             continue;
         const mapping = l1tol2Addresses.find((addresses) => {
             if (bridgeFundingStep.fundingItem.token.address === undefined) {
-                return addresses.l1address === INDEXER_ETH_ROOT_CONTRACT_ADDRESS && addresses.l2address;
+                return isMatchingAddress(addresses.l1address, INDEXER_ETH_ROOT_CONTRACT_ADDRESS) && addresses.l2address;
             }
-            return addresses.l1address === bridgeFundingStep.fundingItem.token.address && addresses.l2address;
+            return (isMatchingAddress(addresses.l1address, bridgeFundingStep.fundingItem.token.address)
+                && addresses.l2address);
         });
         if (!mapping)
             continue;
-        const swapFundingStep = swapFundingSteps.find((step) => step.fundingItem.token.address === mapping.l2address);
+        const swapFundingStep = swapFundingSteps.find((step) => isMatchingAddress(step.fundingItem.token.address, mapping.l2address));
         if (!swapFundingStep)
             continue;
         bridgeAndSwapRoutes.push({
@@ -38131,7 +38135,7 @@ const onRampRoute = async (config, availableRoutingOptions, balanceRequirement)
         if (!required.token)
             return;
         if (isNativeToken(required.token.address)
-            || token.address.toLowerCase() === required.token.address?.toLowerCase()) {
+            || isMatchingAddress(token.address, required.token.address)) {
             hasAllowList = true;
         }
     });
@@ -39378,7 +39382,7 @@ class Checkout {
             email = userInfo?.email;
         }
         const tokenList = await getTokenAllowList(this.config, { type: TokenFilterTypes.ONRAMP });
-        const token = tokenList.tokens?.find((t) => t.address?.toLowerCase() === params.tokenAddress?.toLowerCase());
+        const token = tokenList.tokens?.find((t) => isMatchingAddress(t.address, params.tokenAddress));
         if (token) {
             tokenAmount = params.tokenAmount;
             tokenSymbol = token.symbol;

package/dist/index.js

@@ -4234,7 +4234,7 @@ class MultiRollupApiClients {
 }
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-0.40.0' };
+const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-0.41.1' };
 const createConfig = ({ basePath, headers, }) => {
     if (!basePath.trim()) {
         throw Error('basePath can not be empty');
@@ -4294,7 +4294,7 @@ class APIError extends Error {
 
 /* eslint-disable implicit-arrow-linebreak */
 const defaultHeaders = {
-    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-0.40.0',
+    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-0.41.1',
 };
 /**
  * createAPIConfiguration to create a custom Configuration
@@ -4733,7 +4733,7 @@ const createImmutableXConfiguration = ({ basePath, chainID, coreContractAddress,
     chainID,
     coreContractAddress,
     registrationContractAddress,
-    sdkVersion: 'ts-immutable-sdk-0.40.0',
+    sdkVersion: 'ts-immutable-sdk-0.41.1',
 });
 /**
  * Sets `sdkVersion` at the time of build
@@ -35511,7 +35511,7 @@ const GAS_OVERRIDES = {
     maxPriorityFeePerGas: BigNumber$1.from(101e9),
 };
 
-const SDK_VERSION_MARKER = '0.40.0';
+const SDK_VERSION_MARKER = '0.41.1';
 // This SDK version is replaced by the `yarn build` command ran on the root level
 const globalPackageVersion = () => SDK_VERSION_MARKER;
 
@@ -35658,6 +35658,8 @@ class CheckoutConfiguration {
     }
 }
 
+const isMatchingAddress = (addressA = '', addressB = '') => (addressA.toLowerCase() === addressB.toLowerCase());
+
 const getTokenAllowList = async (config, { type = TokenFilterTypes.ALL, chainId, exclude, }) => {
     let tokens = [];
     let onRampConfig;
@@ -35693,7 +35695,7 @@ const getTokenAllowList = async (config, { type = TokenFilterTypes.ALL, chainId,
         tokens: tokens.filter((token) => !exclude.map((e) => e.address).includes(token.address || '')),
     };
 };
-const isNativeToken = (address) => !address || address.toLocaleLowerCase() === NATIVE;
+const isNativeToken = (address) => !address || isMatchingAddress(address, NATIVE);
 async function getERC20TokenInfo(web3Provider, tokenAddress) {
     return await withCheckoutError(async () => {
         const contract = new Contract$1(tokenAddress, JSON.stringify(ERC20ABI), web3Provider);
@@ -35983,7 +35985,7 @@ const getBalances = async (config, web3Provider, walletAddress, tokens) => {
         // For some reason isNativeToken always returns undefined.
         // We have spent way too much time figuring out why this is happening.
         // That we have given up -- keep it as it is for now.
-        if (!token.address || token.address.toLocaleLowerCase() === NATIVE) {
+        if (!token.address || isMatchingAddress(token.address, NATIVE)) {
             allBalancePromises.push(getBalance(config, web3Provider, walletAddress));
         }
         else {
@@ -35997,7 +35999,7 @@ const getBalances = async (config, web3Provider, walletAddress, tokens) => {
         // For some reason isNativeToken always returns undefined.
         // We have spent way too much time figuring out why this is happening.
         // That we have given up -- keep it as it is for now.
-        if (!token.address || token.address.toLocaleLowerCase() === NATIVE)
+        if (!token.address || isMatchingAddress(token.address, NATIVE))
             resp.value.token.address = NATIVE;
         return resp.value;
     });
@@ -36759,7 +36761,7 @@ const getERC721BalanceRequirement = (itemRequirement, balances) => {
     // Find the requirements related balance
     const itemBalanceResult = balances.find((balance) => {
         const balanceERC721Result = balance;
-        return balanceERC721Result.contractAddress === itemRequirement.contractAddress
+        return isMatchingAddress(balanceERC721Result.contractAddress, itemRequirement.contractAddress)
             && balanceERC721Result.id === itemRequirement.id;
     });
     // Calculate the balance delta
@@ -36799,7 +36801,7 @@ const getTokenBalanceRequirement = (itemRequirement, balances) => {
     // Get the requirements related balance
     if (itemRequirement.type === ItemType.ERC20) {
         itemBalanceResult = balances.find((balance) => {
-            return balance.token?.address === itemRequirement.tokenAddress;
+            return isMatchingAddress(balance.token?.address, itemRequirement.tokenAddress);
         });
     }
     else if (itemRequirement.type === ItemType.NATIVE) {
@@ -36921,7 +36923,7 @@ const getERC721Balances = async (provider, ownerAddress, itemRequirements) => {
         erc721Owners.forEach((erc721OwnerAddress, index) => {
             const itemRequirement = erc721s.get(erc721OwnersPromiseIds[index]);
             let itemCount = 0;
-            if (itemRequirement && ownerAddress === erc721OwnerAddress) {
+            if (itemRequirement && isMatchingAddress(ownerAddress, erc721OwnerAddress)) {
                 itemCount = 1;
             }
             erc721Balances.push({
@@ -37069,15 +37071,15 @@ const availabilityService = (isDevelopment, isProduction) => {
             response = await globalAxios$1.post(`${postEndpoint()}/v1/availability/checkout/swap`);
         }
         catch (error) {
+            // The request was made and the server responded with a status code
+            // that falls out of the range of 2xx
             response = error.response;
+            // If 403 then the service is geo-blocked
+            if (response.status === 403)
+                return false;
+            throw new CheckoutError(`Error fetching from api: ${response.status} ${response.statusText}`, CheckoutErrorType.API_ERROR);
         }
-        if (response.status === 403) {
-            return false;
-        }
-        if (response.status === 204) {
-            return true;
-        }
-        throw new CheckoutError(`Error fetching from api: ${response.status} ${response.statusText}`, CheckoutErrorType.API_ERROR);
+        return true;
     };
     return {
         checkDexAvailability,
@@ -37361,7 +37363,7 @@ const checkUserCanCoverApprovalFees = (l2Balances, approval) => {
     }
     // Find the users balance of the approval token
     const l2BalanceOfApprovalToken = l2Balances.find((balance) => (isNativeToken(balance.token.address) && isNativeToken(approvalGasTokenAddress))
-        || balance.token.address === approvalGasTokenAddress);
+        || isMatchingAddress(balance.token.address, approvalGasTokenAddress));
     if (!l2BalanceOfApprovalToken)
         return { sufficient: false, approvalGasFee, approvalGasTokenAddress };
     // If the user does not have enough of the token to cover approval fees then return sufficient false
@@ -37416,7 +37418,7 @@ const checkUserCanCoverSwapFees = (l2Balances, approvalFees, swapGasFee, swapFee
         if (fee === BigNumber$1.from(0))
             continue;
         const l2BalanceOfFeeToken = l2Balances.find((balance) => (isNativeToken(balance.token.address) && isNativeToken(tokenAddress))
-            || balance.token.address === tokenAddress);
+            || isMatchingAddress(balance.token.address, tokenAddress));
         if (!l2BalanceOfFeeToken) {
             return false;
         }
@@ -37437,7 +37439,8 @@ const checkIfUserCanCoverRequirement = (l2balance, balanceRequirements, quoteTok
     let requirementExists = false;
     balanceRequirements.balanceRequirements.forEach((requirement) => {
         if (requirement.type === ItemType.NATIVE || requirement.type === ItemType.ERC20) {
-            if (requirement.required.token.address === quoteTokenAddress) {
+            if (requirement.required.token.address
+                && isMatchingAddress(requirement.required.token.address, quoteTokenAddress)) {
                 balanceRequirementToken = requirement.required.token.address;
                 requirementExists = true;
                 // Get the balance that would remain if the requirement was removed from the users balance
@@ -37449,12 +37452,12 @@ const checkIfUserCanCoverRequirement = (l2balance, balanceRequirements, quoteTok
     if (!requirementExists)
         return true;
     // Remove approval fees from the remainder if token matches as these need to be taken out to cover the swap
-    if (approvalFees.approvalGasTokenAddress === balanceRequirementToken) {
+    if (isMatchingAddress(approvalFees.approvalGasTokenAddress, balanceRequirementToken)) {
         remainingBalance = remainingBalance.sub(approvalFees.approvalGasFee);
     }
     // Remove swap fees from the remainder if token matches as these need to be taken out to cover the swap
     for (const swapFee of swapFees) {
-        if (swapFee.amount.token.address === balanceRequirementToken) {
+        if (isMatchingAddress(swapFee.amount.token.address, balanceRequirementToken)) {
             remainingBalance = remainingBalance.sub(swapFee.amount.value);
         }
     }
@@ -37485,7 +37488,7 @@ const swapRoute = async (config, availableRoutingOptions, walletAddress, balance
         if (!quote)
             continue;
         // Find the balance the user has for this quoted token
-        const userBalanceOfQuotedToken = l2Balances.find((balance) => balance.token.address === quoteTokenAddress);
+        const userBalanceOfQuotedToken = l2Balances.find((balance) => isMatchingAddress(balance.token.address, quoteTokenAddress));
         // If no balance found on L2 for this quoted token then continue
         if (!userBalanceOfQuotedToken)
             continue;
@@ -37518,7 +37521,8 @@ const filterTokens = (allowedTokens, balances) => {
     if (balances && balances.success) {
         return allowedTokens.filter((token) => {
             if ('address' in token) {
-                return balances.balances.find((balance) => balance.token.address === token.address && balance.balance.gt(0));
+                return balances.balances.find((balance) => isMatchingAddress(balance.token.address, token.address)
+                    && balance.balance.gt(0));
             }
             return balances.balances.find((balance) => !('address' in balance.token) && balance.balance.gt(0));
         });
@@ -37618,9 +37622,8 @@ const fetchL1Representation = async (config, l2address) => {
         chainName,
         contractAddress: l2address,
     });
-    // TODO: When bridge is ready we need to understand how L2 ETH will be mapped back to L1 ETH
     const l1address = tokenData.result.root_contract_address;
-    if (l1address === INDEXER_ETH_ROOT_CONTRACT_ADDRESS) {
+    if (isMatchingAddress(l1address ?? '', INDEXER_ETH_ROOT_CONTRACT_ADDRESS)) {
         return {
             l1address: 'native',
             l2address,
@@ -37722,7 +37725,7 @@ const bridgeRoute = async (config, readOnlyProviders, availableRoutingOptions, b
         if (!allowedL1TokenList.find((token) => isNativeToken(token.address)))
             return undefined;
     }
-    else if (!allowedL1TokenList.find((token) => token.address === l1address)) {
+    else if (!allowedL1TokenList.find((token) => isMatchingAddress(token.address, l1address))) {
         return undefined;
     }
     const feesFromBridge = await getBridgeFeeEstimate(config, readOnlyProviders, l1ChainId, l2ChainId);
@@ -37741,7 +37744,7 @@ const bridgeRoute = async (config, readOnlyProviders, availableRoutingOptions, b
         return undefined;
     }
     // Find the balance of the L1 representation of the token and check if the balance covers the delta
-    const erc20balance = tokenBalanceResult.balances.find((balance) => balance.token.address === l1address);
+    const erc20balance = tokenBalanceResult.balances.find((balance) => isMatchingAddress(balance.token.address, l1address));
     if (erc20balance && erc20balance.balance.gte(bridgeRequirement.amount)) {
         const bridgeFees = constructFees(sourceChainGas, bridgeFee, imtblFee, approvalGas, nativeToken);
         return constructBridgeFundingRoute(l1ChainId, erc20balance, bridgeRequirement, ItemType.ERC20, bridgeFees);
@@ -37779,12 +37782,12 @@ const getBalancesByChain = (config, tokenBalances) => {
 const getFeesForTokenAddress = (dexQuote, tokenAddress) => {
     let fees = BigNumber$1.from(0);
     dexQuote.quote.fees.forEach((fee) => {
-        if (fee.amount.token.address === tokenAddress) {
+        if (isMatchingAddress(fee.amount.token.address, tokenAddress)) {
             fees = fees.add(fee.amount.value);
         }
     });
     if (dexQuote.approval) {
-        if (dexQuote.approval.token.address === tokenAddress) {
+        if (isMatchingAddress(dexQuote.approval.token.address, tokenAddress)) {
             fees = fees.add(dexQuote.approval.value);
         }
     }
@@ -37797,7 +37800,7 @@ const getAmountFromBalanceRequirement = (balanceRequirements, quotedTokenAddress
     // Find if there is an existing balance requirement of the token attempting to be bridged->swapped
     for (const requirement of balanceRequirements.balanceRequirements) {
         if (requirement.type === ItemType.NATIVE || requirement.type === ItemType.ERC20) {
-            if (requirement.required.token.address === quotedTokenAddress) {
+            if (isMatchingAddress(requirement.required.token.address, quotedTokenAddress)) {
                 return requirement.required.balance;
             }
         }
@@ -37835,8 +37838,8 @@ const constructBridgeRequirements = (dexQuotes, l1balances, l2balances, l1tol2ad
     const bridgeRequirements = [];
     for (const [tokenAddress, quote] of dexQuotes) {
         // Get the L2 balance for the token address
-        const l2balance = l2balances.find((balance) => balance.token.address === tokenAddress);
-        const l1tol2TokenMapping = l1tol2addresses.find((token) => token.l2address === tokenAddress);
+        const l2balance = l2balances.find((balance) => isMatchingAddress(balance.token.address, tokenAddress));
+        const l1tol2TokenMapping = l1tol2addresses.find((token) => isMatchingAddress(token.l2address, tokenAddress));
         if (!l1tol2TokenMapping)
             continue;
         const { l1address, l2address } = l1tol2TokenMapping;
@@ -37845,10 +37848,10 @@ const constructBridgeRequirements = (dexQuotes, l1balances, l2balances, l1tol2ad
         // If the user does not have any L1 balance for this token then cannot bridge
         const l1balance = l1balances.find((balance) => {
             if (balance.token.address === undefined
-                && l1address === INDEXER_ETH_ROOT_CONTRACT_ADDRESS) {
+                && isMatchingAddress(l1address, INDEXER_ETH_ROOT_CONTRACT_ADDRESS)) {
                 return true;
             }
-            return balance.token.address === l1address;
+            return isMatchingAddress(balance.token.address, l1address);
         });
         if (!l1balance)
             continue;
@@ -37928,9 +37931,9 @@ const filterSwappableTokensByBridgeableAddresses = (requiredTokenAddress, bridge
         if (!bridgeableTokens.includes(addresses.l1address))
             continue;
         // Filter out the token that is required from the swappable tokens list
-        if (addresses.l2address === requiredTokenAddress)
+        if (isMatchingAddress(addresses.l2address, requiredTokenAddress))
             continue;
-        const tokenInfo = swappableTokens.find((token) => token.address === addresses.l2address);
+        const tokenInfo = swappableTokens.find((token) => isMatchingAddress(token.address, addresses.l2address));
         if (!tokenInfo)
             continue;
         filteredSwappableTokens.push(tokenInfo);
@@ -37967,7 +37970,7 @@ const modifyTokenBalancesWithBridgedAmount = (config, tokenBalances, l2balances,
         if (currentBalance)
             l2balance = currentBalance.balance;
         const newBalance = l2balance.add(amount);
-        const tokenInfo = swappableTokens.find((token) => token.address === l2address);
+        const tokenInfo = swappableTokens.find((token) => isMatchingAddress(token.address, l2address));
         balanceMap.set(l2address, {
             balance: newBalance,
             formattedBalance: utils$3.formatUnits(newBalance, tokenInfo.decimals),
@@ -37993,7 +37996,7 @@ const reapplyOriginalSwapBalances = (tokenBalances, swapRoutes) => {
             continue;
         let originalBalance = BigNumber$1.from(0);
         let originalFormattedBalance = '0';
-        const l2balance = tokenBalance.balances.find((balance) => balance.token.address === fundingItem.token.address);
+        const l2balance = tokenBalance.balances.find((balance) => isMatchingAddress(balance.token.address, fundingItem.token.address));
         if (l2balance) {
             originalBalance = l2balance.balance;
             originalFormattedBalance = l2balance.formattedBalance;
@@ -38011,13 +38014,14 @@ const constructBridgeAndSwapRoutes = (bridgeFundingSteps, swapFundingSteps, l1to
             continue;
         const mapping = l1tol2Addresses.find((addresses) => {
             if (bridgeFundingStep.fundingItem.token.address === undefined) {
-                return addresses.l1address === INDEXER_ETH_ROOT_CONTRACT_ADDRESS && addresses.l2address;
+                return isMatchingAddress(addresses.l1address, INDEXER_ETH_ROOT_CONTRACT_ADDRESS) && addresses.l2address;
             }
-            return addresses.l1address === bridgeFundingStep.fundingItem.token.address && addresses.l2address;
+            return (isMatchingAddress(addresses.l1address, bridgeFundingStep.fundingItem.token.address)
+                && addresses.l2address);
         });
         if (!mapping)
             continue;
-        const swapFundingStep = swapFundingSteps.find((step) => step.fundingItem.token.address === mapping.l2address);
+        const swapFundingStep = swapFundingSteps.find((step) => isMatchingAddress(step.fundingItem.token.address, mapping.l2address));
         if (!swapFundingStep)
             continue;
         bridgeAndSwapRoutes.push({
@@ -38109,7 +38113,7 @@ const onRampRoute = async (config, availableRoutingOptions, balanceRequirement)
         if (!required.token)
             return;
         if (isNativeToken(required.token.address)
-            || token.address.toLowerCase() === required.token.address?.toLowerCase()) {
+            || isMatchingAddress(token.address, required.token.address)) {
             hasAllowList = true;
         }
     });
@@ -39356,7 +39360,7 @@ class Checkout {
             email = userInfo?.email;
         }
         const tokenList = await getTokenAllowList(this.config, { type: TokenFilterTypes.ONRAMP });
-        const token = tokenList.tokens?.find((t) => t.address?.toLowerCase() === params.tokenAddress?.toLowerCase());
+        const token = tokenList.tokens?.find((t) => isMatchingAddress(t.address, params.tokenAddress));
         if (token) {
             tokenAmount = params.tokenAmount;
             tokenSymbol = token.symbol;