feat: new zap executor (#2382)

* feat: new zap executor * feat: new zap executor * feat(zap): add gasInclude=1 when getRoute * chore: update new contract zap
KyberNetwork · Nov 17, 2023 · 2116782 · 2116782
1 parent 08e4e63
commit 2116782
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 14 deletions.
diff --git a/src/constants/networks/arbitrum.ts b/src/constants/networks/arbitrum.ts
@@ -68,8 +68,8 @@ const arbitrumInfo: EVMNetworkInfo = {
     zap: {
       router: '0x30C5322E4e08AD500c348007f92f120ab4E2b79e',
       validator: '0xf0096e5B4AAfeEA1DF557264091569ba125c1172',
-      executor: '0x4f097F7074D52952006a0763312724929Ff95Cf0',
-      helper: '0x4E8419EFa0b0A149Dad77b689D37AF17f762f20A',
+      executor: '0x8ac7895130e3be8654fff544ae20bf2a93ef19d1',
+      helper: '0x214061F0e250A27a49f609d9caf2987a7bC8fA6B',
     },
   },
   limitOrder: '*',

diff --git a/src/constants/networks/avax.ts b/src/constants/networks/avax.ts
@@ -77,8 +77,8 @@ const avaxInfo: EVMNetworkInfo = {
     zap: {
       router: '0x30C5322E4e08AD500c348007f92f120ab4E2b79e',
       validator: '0xf0096e5B4AAfeEA1DF557264091569ba125c1172',
-      executor: '0x4f097F7074D52952006a0763312724929Ff95Cf0',
-      helper: '0x4E8419EFa0b0A149Dad77b689D37AF17f762f20A',
+      executor: '0x8ac7895130e3be8654fff544ae20bf2a93ef19d1',
+      helper: '0x214061F0e250A27a49f609d9caf2987a7bC8fA6B',
     },
   },
   limitOrder: '*',

diff --git a/src/constants/networks/base.ts b/src/constants/networks/base.ts
@@ -60,8 +60,8 @@ const base: EVMNetworkInfo = {
     zap: {
       router: '0x30C5322E4e08AD500c348007f92f120ab4E2b79e',
       validator: '0xf0096e5B4AAfeEA1DF557264091569ba125c1172',
-      executor: '0x4f097F7074D52952006a0763312724929Ff95Cf0',
-      helper: '0x4E8419EFa0b0A149Dad77b689D37AF17f762f20A',
+      executor: '0x8ac7895130e3be8654fff544ae20bf2a93ef19d1',
+      helper: '0x214061F0e250A27a49f609d9caf2987a7bC8fA6B',
     },
   },
   limitOrder: '*',

diff --git a/src/constants/networks/matic.ts b/src/constants/networks/matic.ts
@@ -72,8 +72,8 @@ const maticInfo: EVMNetworkInfo = {
     zap: {
       router: '0x30C5322E4e08AD500c348007f92f120ab4E2b79e',
       validator: '0xf0096e5B4AAfeEA1DF557264091569ba125c1172',
-      executor: '0x4f097F7074D52952006a0763312724929Ff95Cf0',
-      helper: '0x4E8419EFa0b0A149Dad77b689D37AF17f762f20A',
+      executor: '0x8ac7895130e3be8654fff544ae20bf2a93ef19d1',
+      helper: '0x214061F0e250A27a49f609d9caf2987a7bC8fA6B',
     },
     'farmV2.1S': [],
   },

diff --git a/src/constants/networks/optimism.ts b/src/constants/networks/optimism.ts
@@ -63,8 +63,8 @@ const optimismInfo: EVMNetworkInfo = {
     zap: {
       router: '0x30C5322E4e08AD500c348007f92f120ab4E2b79e',
       validator: '0xf0096e5B4AAfeEA1DF557264091569ba125c1172',
-      executor: '0x4f097F7074D52952006a0763312724929Ff95Cf0',
-      helper: '0x4E8419EFa0b0A149Dad77b689D37AF17f762f20A',
+      executor: '0x8ac7895130e3be8654fff544ae20bf2a93ef19d1',
+      helper: '0x214061F0e250A27a49f609d9caf2987a7bC8fA6B',
     },
   },
   limitOrder: '*',

diff --git a/src/constants/networks/scroll.ts b/src/constants/networks/scroll.ts
@@ -62,8 +62,8 @@ const scroll: EVMNetworkInfo = {
     zap: {
       router: '0x30C5322E4e08AD500c348007f92f120ab4E2b79e',
       validator: '0xf0096e5B4AAfeEA1DF557264091569ba125c1172',
-      executor: '0x4f097F7074D52952006a0763312724929Ff95Cf0',
-      helper: '0x4E8419EFa0b0A149Dad77b689D37AF17f762f20A',
+      executor: '0x8ac7895130e3be8654fff544ae20bf2a93ef19d1',
+      helper: '0x214061F0e250A27a49f609d9caf2987a7bC8fA6B',
     },
   },
   limitOrder: NOT_SUPPORT,

diff --git a/src/hooks/elasticZap/index.ts b/src/hooks/elasticZap/index.ts
@@ -89,6 +89,7 @@ export function useZapInPoolResult(params?: {
                 saveGas: '',
                 amountIn: item.quotient.toString(),
                 excludedPools: poolAddress,
+                gasInclude: 'true',
               },
               clientId: 'kyberswap-zap',
             })
@@ -273,9 +274,10 @@ export function useZapInAction() {
           exp6,
         ).toString(2)
 
-        const minZapAmount = BigInt(
+        const minZapAmounts = BigInt(
           '0b' + (zeros + minZapAmount0).slice(-128) + (zeros + minZapAmount1).slice(-128),
         ).toString()
+        const minRefundAmounts = minZapAmounts
 
         const zapExecutorData = abiEncoder.encode(
           [
@@ -286,6 +288,7 @@ export function useZapInAction() {
             'address',
             'uint256',
             'uint256',
+            'uint256',
             'int24',
             'int24',
             'int24[2]',
@@ -299,7 +302,8 @@ export function useZapInAction() {
             tokenId,
             account,
             1,
-            minZapAmount,
+            minZapAmounts,
+            minRefundAmounts,
             tickLower,
             tickUpper,
             tickPrevious,
@@ -354,6 +358,7 @@ export function useZapInAction() {
           value: options.zapWithNative ? amountIn : undefined,
           data: callData,
           to: zapRouterAddress,
+          minRefundAmounts,
         })
 
         const gasEstimated = await zapRouterContract.estimateGas[options.zapWithNative ? 'zapInWithNative' : 'zapIn'](