fix: custom slippage (#1708)

audit-ci.jsonc

@@ -13,7 +13,6 @@
     "GHSA-353f-5xf4-qw67",
     "GHSA-j8xg-fqg3-53r7",
     "GHSA-67hx-6x53-jw92",
-    "GHSA-c24v-8rfc-w8vw",
-    "GHSA-m95q-7qp3-xv42"
+    "GHSA-c24v-8rfc-w8vw"
   ]
 }

e2e/serial/swap/1_swapFlow1.test.ts

@@ -1,7 +1,7 @@
 import { StaticJsonRpcProvider } from '@ethersproject/providers';
 import 'chromedriver';
 import 'geckodriver';
-import { WebDriver } from 'selenium-webdriver';
+import { Key, WebDriver } from 'selenium-webdriver';
 import { afterAll, afterEach, beforeAll, beforeEach, expect, it } from 'vitest';
 
 import { ChainId } from '~/core/types/chains';
@@ -222,14 +222,16 @@ it('should be able to interact with slippage settings', async () => {
     id: 'explainer-action-button',
     driver,
   });
-  await clearInput({
+  await typeOnTextInput({
     id: 'slippage-input-mask',
     driver,
+    text: Key.BACK_SPACE,
   });
+  await delayTime('short');
   await typeOnTextInput({
     id: 'slippage-input-mask',
     driver,
-    text: '4',
+    text: '5',
   });
   await delayTime('short');
   const warning = await findElementByTestId({
@@ -1005,11 +1007,12 @@ it('should be able to execute swap', async () => {
     id: 'swap-settings-navbar-button',
     driver,
   });
-  await delayTime('short');
-  await clearInput({
+  await typeOnTextInput({
     id: 'slippage-input-mask',
     driver,
+    text: Key.BACK_SPACE,
   });
+  await delayTime('short');
   await typeOnTextInput({
     id: 'slippage-input-mask',
     driver,

e2e/serial/swap/2_swapFlow2.test.ts

@@ -2,7 +2,7 @@ import 'chromedriver';
 import 'geckodriver';
 import { Contract } from '@ethersproject/contracts';
 import { StaticJsonRpcProvider } from '@ethersproject/providers';
-import { WebDriver } from 'selenium-webdriver';
+import { Key, WebDriver } from 'selenium-webdriver';
 import { erc20Abi } from 'viem';
 import {
   afterAll,
@@ -154,6 +154,7 @@ describe('Swap Flow 2', () => {
       id: `${SWAP_VARIABLES.USDC_MAINNET_ID}-token-to-sell-swap-token-input-swap-input-mask`,
       driver,
     });
+    await delayTime('medium');
     await typeOnTextInput({
       id: `${SWAP_VARIABLES.USDC_MAINNET_ID}-token-to-sell-swap-token-input-swap-input-mask`,
       text: `\b50`,
@@ -181,10 +182,13 @@ describe('Swap Flow 2', () => {
       driver,
     });
     await delayTime('short');
-    await clearInput({
+
+    await typeOnTextInput({
       id: 'slippage-input-mask',
       driver,
+      text: Key.BACK_SPACE,
     });
+    await delayTime('short');
     await typeOnTextInput({
       id: 'slippage-input-mask',
       driver,

lavamoat/build-webpack/policy.json

@@ -1184,8 +1184,13 @@
         "define": true
       },
       "packages": {
-        "jest>@jest/core>jest-snapshot>@babel/traverse>@babel/generator>@jridgewell/trace-mapping>@jridgewell/sourcemap-codec": true,
-        "webpack>terser-webpack-plugin>@jridgewell/trace-mapping>@jridgewell/resolve-uri": true
+        "jest>@jest/core>jest-snapshot>@babel/traverse>@babel/generator>@jridgewell/trace-mapping>@jridgewell/resolve-uri": true,
+        "jest>@jest/core>jest-snapshot>@babel/traverse>@babel/generator>@jridgewell/trace-mapping>@jridgewell/sourcemap-codec": true
+      }
+    },
+    "jest>@jest/core>jest-snapshot>@babel/traverse>@babel/generator>@jridgewell/trace-mapping>@jridgewell/resolve-uri": {
+      "globals": {
+        "define": true
       }
     },
     "jest>@jest/core>jest-snapshot>@babel/traverse>@babel/generator>@jridgewell/trace-mapping>@jridgewell/sourcemap-codec": {

package.json

@@ -279,7 +279,9 @@
     "micromatch": "4.0.8",
     "webpack": "5.94.0",
     "path-to-regexp": "6.3.0",
-    "dset": "3.1.4"
+    "dset": "3.1.4",
+    "zod": "3.23.8",
+    "rollup": "4.22.4"
   },
   "lavamoat": {
     "allowScripts": {

src/core/raps/unlockAndSwap.test.ts

@@ -242,7 +242,6 @@ test('[rap/unlockAndSwap] :: create unwrap eth rap', async () => {
     assetToSell: WETH_MAINNET_ASSET,
     assetToBuy: ETH_MAINNET_ASSET,
   });
-  console.log('-- rap.actions', rap.actions);
   expect(rap.actions.length).toBe(1);
 });
 

src/core/utils/gas.ts

@@ -10,6 +10,7 @@ import { serialize } from '@ethersproject/transactions';
 import BigNumber from 'bignumber.js';
 
 import { globalColors } from '~/design-system/styles/designTokens';
+import { RainbowError, logger } from '~/logger';
 
 import { i18n } from '../languages';
 import {
@@ -549,6 +550,7 @@ export const estimateGasWithPadding = async ({
     // otherwise default to the last block gas limit
     return lastBlockGasLimit;
   } catch (error) {
+    logger.error(new RainbowError(`estimateGasWithPadding error: ${error}`));
     return null;
   }
 };

src/entries/background/handlers/handleWallets.ts

@@ -42,7 +42,6 @@ import { flashbotsEnabledStore } from '~/core/state';
 import { WalletAction } from '~/core/types/walletActions';
 import { EthereumWalletSeed } from '~/core/utils/ethereum';
 import { getFlashbotsProvider } from '~/core/utils/flashbots';
-import { wagmiConfig } from '~/core/wagmi';
 import { getProvider } from '~/core/wagmi/clientToProvider';
 
 type WalletActionArguments = {
@@ -192,12 +191,9 @@ export const handleWallets = () =>
             ) {
               provider = getFlashbotsProvider();
             } else {
-              console.log('get background provider');
-              console.log('get background wagmiconfig', wagmiConfig);
               provider = getProvider({
                 chainId: (payload as TransactionRequest).chainId,
               });
-              console.log(' background provider', provider);
             }
             response = await sendTransaction(
               payload as TransactionRequest,

src/entries/popup/pages/swap/SwapSettings/SwapSettings.tsx

@@ -8,7 +8,6 @@ import { i18n } from '~/core/languages';
 import { useCurrentAddressStore, useFlashbotsEnabledStore } from '~/core/state';
 import { useFeatureFlagsStore } from '~/core/state/currentSettings/featureFlags';
 import { ChainId } from '~/core/types/chains';
-import { divide } from '~/core/utils/numbers';
 import {
   Bleed,
   Box,
@@ -280,12 +279,12 @@ export const SwapSettings = ({
     try {
       setSettings({
         source,
-        slippage: divide(slippage, 100).toString(),
+        slippage,
         swapFlashbotsEnabled,
       });
       onDone();
     } catch (e) {
-      console.log('DONEEEEEEE e', e);
+      //
     }
   }, [swapFlashbotsEnabled, onDone, setSettings, slippage, source]);