Fix approval on openocean

functions/api/openocean/index.ts

@@ -4,7 +4,7 @@
   tac: '0xBBAFF3Bf6eC4C15992c0Fb37F12491Fd62C5B496',
   ethereum: '0x60917e542aDdd13bfd1a7f81cD654758052dAdC4',
 };
 const referrerFee = '0.25';
 
 const proOrigin = 'https://open-api-pro.openocean.finance/v4';
 const allowedEndpoints = ['reverseQuote', 'quote', 'swap', 'gasPrice'];
@@ -43,16 +43,15 @@
       throw new Error(`Unsupported VITE_NETWORK: ${chain}`);
     }
 
-    const referrer = referrers[network];
-
     // Copy search params from request to openocean
     for (const [key, value] of searchParams.entries()) {
       url.searchParams.set(key, value);
     }
 
     if (endpoint === 'swap') {
-      url.searchParams.set('referrer', referrer);
-      url.searchParams.set('referrerFee', referrerFee);
+      const referrer = referrers[network];
+      // url.searchParams.set('referrer', referrer);
+      // url.searchParams.set('referrerFee', referrerFee);
     }
 
     const response = await fetch(url, {

src/config/ethereum/common.ts

@@ -210,7 +210,7 @@ export const commonConfig: AppConfig = {
     showCart: true,
     // rewardUrl: 'https://app.merkl.xyz/?chain=1&protocol=carbon',
     // walkthroughId: 'i2ok96zcpzqw',
-    useOpenocean: false, // !navigator.webdriver, // use sdk in E2E
+    useOpenocean: !navigator.webdriver, // use sdk in E2E
     useEIP7702: false,
   },
 };

src/config/sei/common.ts

@@ -137,6 +137,6 @@ export const commonConfig: AppConfig = {
     showCart: true,
     // rewardUrl: 'https://app.merkl.xyz/?chain=1329&protocol=carbon',
     // walkthroughId: '51xep69sd3io',
-    useOpenocean: false, // true,
+    useOpenocean: true,
   },
 };

src/libs/queries/sdk/trade.ts

@@ -12,6 +12,7 @@ import { useStore } from 'store';
 import { Token } from 'libs/tokens';
 import { TransactionRequest } from 'ethers';
 import config from 'config';
+import { useBatchTransaction } from 'libs/wagmi/batch-transaction';
 
 interface GetTradeDataResult {
   tradeActions: TradeActionBNStr[];
@@ -51,6 +52,7 @@ export const useTradeQuery = () => {
     trade: { settings },
   } = useStore();
   const { signer } = useWagmi();
+  const { canBatchTransactions } = useBatchTransaction();
   return useMutation({
     mutationFn: async (params: TradeParams) => {
       const { calcDeadline, calcMinReturn, calcMaxInput } = params;
@@ -72,17 +74,20 @@ export const useTradeQuery = () => {
           value: BigInt(tx.value),
           data: tx.data,
         };
-        // Bump estimated gas because openocean isn't working correctly
-        const estimateGas = await signer?.estimateGas(unsignedTx);
-        if (estimateGas) {
-          const limit = new SafeDecimal(estimateGas?.toString())
-            .mul(1.1)
-            .round()
-            .toString();
-          unsignedTx.gasLimit = BigInt(limit);
+        // If tokens are not approved, the estimate gas will fail with EIP7702
+        if (!canBatchTransactions) {
+          // Bump estimated gas because openocean isn't working correctly
+          const estimateGas = await signer?.estimateGas(unsignedTx);
+          if (estimateGas) {
+            const limit = new SafeDecimal(estimateGas?.toString())
+              .mul(1.1)
+              .round()
+              .toString();
+            unsignedTx.gasLimit = BigInt(limit);
+          }
         }
         unsignedTx.customData = {
-          spender: config.addresses.carbon.carbonController,
+          spender: config.addresses.openocean,
           assets: [
             {
               address: params.source.address,