fix: Checkout types after DEX amount change (#1013)

immutable · Oct 18, 2023 · f4b0610 · f4b0610
1 parent 581a0be
commit f4b0610
Show file tree

Hide file tree

Showing 14 changed files with 116 additions and 83 deletions.
diff --git a/packages/checkout/sdk/src/gasEstimate/gasEstimator.test.ts b/packages/checkout/sdk/src/gasEstimate/gasEstimator.test.ts
@@ -91,6 +91,7 @@ describe('gasServiceEstimator', () => {
                 name: 'TEST',
                 decimals: 18,
                 chainId: 1,
+                type: 'erc20',
               },
             },
           },
@@ -150,6 +151,7 @@ describe('gasServiceEstimator', () => {
                 name: 'TEST',
                 decimals: 18,
                 chainId: 1,
+                type: 'erc20',
               },
             },
           },

diff --git a/packages/checkout/sdk/src/smartCheckout/routing/bridgeAndSwap/bridgeAndSwapRoute.test.ts b/packages/checkout/sdk/src/smartCheckout/routing/bridgeAndSwap/bridgeAndSwapRoute.test.ts
@@ -163,7 +163,7 @@ describe('bridgeAndSwapRoute', () => {
           },
         ],
       } as Quote,
-      approval: undefined,
+      approval: null,
       swap: null,
     };
     const dexQuoteETH: DexQuote = {
@@ -194,7 +194,7 @@ describe('bridgeAndSwapRoute', () => {
           },
         ],
       } as Quote,
-      approval: undefined,
+      approval: null,
       swap: null,
     };
 

diff --git a/.../checkout/sdk/src/smartCheckout/routing/bridgeAndSwap/constructBridgeRequirements.test.ts b/.../checkout/sdk/src/smartCheckout/routing/bridgeAndSwap/constructBridgeRequirements.test.ts
@@ -1,5 +1,5 @@
 import { BigNumber } from 'ethers';
-import { TokenInfo as DexTokenInfo } from '@imtbl/dex-sdk';
+import { ERC20 as DexTokenInfo } from '@imtbl/dex-sdk';
 import { DexQuote } from '../types';
 import {
   ChainId,
@@ -26,7 +26,7 @@ describe('constructBridgeRequirements', () => {
     approval?: number,
   ) => {
     const dexQuote: DexQuote = {
-      approval: undefined,
+      approval: null,
       swap: null,
       quote: {
         amount: {
@@ -75,6 +75,7 @@ describe('constructBridgeRequirements', () => {
       decimals: 18,
       symbol: 'ERC20',
       name: 'ERC20',
+      type: 'erc20',
     };
 
     const swapTokenInfoB: DexTokenInfo = {
@@ -83,6 +84,7 @@ describe('constructBridgeRequirements', () => {
       decimals: 18,
       symbol: 'ERC20',
       name: 'ERC20',
+      type: 'erc20',
     };
 
     const feesTokenInfo: DexTokenInfo = {
@@ -91,6 +93,7 @@ describe('constructBridgeRequirements', () => {
       decimals: 18,
       symbol: 'ERC20',
       name: 'ERC20',
+      type: 'erc20',
     };
 
     const dexQuoteA = constructDexQuote(
@@ -195,6 +198,7 @@ describe('constructBridgeRequirements', () => {
       decimals: 18,
       symbol: 'ETH',
       name: 'ETH',
+      type: 'erc20',
     };
 
     const feesTokenInfo: DexTokenInfo = {
@@ -203,6 +207,7 @@ describe('constructBridgeRequirements', () => {
       decimals: 18,
       symbol: 'IMX',
       name: 'IMX',
+      type: 'erc20',
     };
 
     const ethDexQuote = constructDexQuote(
@@ -278,6 +283,7 @@ describe('constructBridgeRequirements', () => {
       decimals: 18,
       symbol: 'ERC20',
       name: 'ERC20',
+      type: 'erc20',
     };
 
     const swapTokenInfoB: DexTokenInfo = {
@@ -286,6 +292,7 @@ describe('constructBridgeRequirements', () => {
       decimals: 18,
       symbol: 'ERC20',
       name: 'ERC20',
+      type: 'erc20',
     };
 
     const feesTokenInfo: DexTokenInfo = {
@@ -294,6 +301,7 @@ describe('constructBridgeRequirements', () => {
       decimals: 18,
       symbol: 'ERC20',
       name: 'ERC20',
+      type: 'erc20',
     };
 
     const dexQuoteA = constructDexQuote(
@@ -394,6 +402,7 @@ describe('constructBridgeRequirements', () => {
       decimals: 18,
       symbol: '0xIMX',
       name: '0xIMX',
+      type: 'erc20',
     };
 
     const feesTokenInfo: DexTokenInfo = {
@@ -402,6 +411,7 @@ describe('constructBridgeRequirements', () => {
       decimals: 18,
       symbol: '0xIMX',
       name: '0xIMX',
+      type: 'erc20',
     };
 
     const dexQuote = constructDexQuote(
@@ -487,6 +497,7 @@ describe('constructBridgeRequirements', () => {
       decimals: 18,
       symbol: '0xL2',
       name: '0xL2',
+      type: 'erc20',
     };
 
     const feesTokenInfo: DexTokenInfo = {
@@ -495,6 +506,7 @@ describe('constructBridgeRequirements', () => {
       decimals: 18,
       symbol: '0xIMX',
       name: '0xIMX',
+      type: 'erc20',
     };
 
     const dexQuote = constructDexQuote(

diff --git a/packages/checkout/sdk/src/smartCheckout/routing/routingCalculator.test.ts b/packages/checkout/sdk/src/smartCheckout/routing/routingCalculator.test.ts
@@ -1,7 +1,7 @@
 import { BigNumber, utils } from 'ethers';
 import { Environment } from '@imtbl/config';
 import { JsonRpcProvider } from '@ethersproject/providers';
-import { TokenInfo } from '@imtbl/dex-sdk';
+import { ERC20 } from '@imtbl/dex-sdk';
 import {
   getBridgeAndSwapFundingSteps,
   getSwapFundingSteps,
@@ -67,11 +67,11 @@ describe('routingCalculator', () => {
                     symbol: 'ERC20_2',
                     decimals: 18,
                     address: '0xERC20_2',
-                  } as TokenInfo,
+                  } as ERC20,
                 },
                 amountWithMaxSlippage: {
                   value: BigNumber.from(1),
-                  token: {} as TokenInfo,
+                  token: {} as ERC20,
                 },
                 slippage: 0,
                 fees: [
@@ -84,7 +84,7 @@ describe('routingCalculator', () => {
                         symbol: 'IMX',
                         decimals: 18,
                         address: IMX_ADDRESS_ZKEVM,
-                      } as TokenInfo,
+                      } as ERC20,
                     },
                     recipient: '',
                     basisPoints: 0,
@@ -99,11 +99,11 @@ describe('routingCalculator', () => {
                   symbol: 'IMX',
                   decimals: 18,
                   address: IMX_ADDRESS_ZKEVM,
-                } as TokenInfo,
+                } as ERC20,
               },
               swap: {
                 value: BigNumber.from(1),
-                token: {} as TokenInfo,
+                token: {} as ERC20,
               },
             },
           ],
@@ -123,11 +123,11 @@ describe('routingCalculator', () => {
                     symbol: 'ERC20_1',
                     decimals: 18,
                     address: '0xERC20_1',
-                  } as TokenInfo,
+                  } as ERC20,
                 },
                 amountWithMaxSlippage: {
                   value: BigNumber.from(2),
-                  token: {} as TokenInfo,
+                  token: {} as ERC20,
                 },
                 slippage: 0,
                 fees: [
@@ -140,7 +140,7 @@ describe('routingCalculator', () => {
                         symbol: 'IMX',
                         decimals: 18,
                         address: IMX_ADDRESS_ZKEVM,
-                      } as TokenInfo,
+                      } as ERC20,
                     },
                     recipient: '',
                     basisPoints: 0,
@@ -155,11 +155,11 @@ describe('routingCalculator', () => {
                   symbol: 'IMX',
                   decimals: 18,
                   address: IMX_ADDRESS_ZKEVM,
-                } as TokenInfo,
+                } as ERC20,
               },
               swap: {
                 value: BigNumber.from(2),
-                token: {} as TokenInfo,
+                token: {} as ERC20,
               },
             },
           ],