From dcb8cbd10f0c97b1709147fc8db27bc5be34807f Mon Sep 17 00:00:00 2001
From: Jorge Galat <jrgglt@gmail.com>
Date: Fri, 6 Oct 2023 15:58:17 -0300
Subject: [PATCH 1/2] =?UTF-8?q?=E2=9C=85=20e2e:=20add=20tests=20for=20'get?=
 =?UTF-8?q?=20EXA'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/SocketAssetSelector/index.tsx |  14 ++-
 components/getEXA/ChainSelector.tsx      |   4 +-
 components/getEXA/ReviewRoute.tsx        |  17 ++-
 components/getEXA/RouteSteps.tsx         |   2 +-
 components/getEXA/SelectRoute.tsx        |   8 +-
 components/getEXA/TXStatus.tsx           |   9 +-
 contexts/GetEXAContext.tsx               |   6 +-
 e2e/common/balance.ts                    |  10 +-
 e2e/fixture/base.ts                      |   4 +-
 e2e/fixture/socket.ts                    |  55 +++++++++
 e2e/page/getEXA.ts                       | 135 +++++++++++++++++++++++
 e2e/specs/9-get-exa/same-chain.spec.ts   | 102 +++++++++++++++++
 e2e/utils/contracts.ts                   |   8 ++
 types/contracts.ts                       |   2 +
 14 files changed, 357 insertions(+), 19 deletions(-)
 create mode 100644 e2e/fixture/socket.ts
 create mode 100644 e2e/page/getEXA.ts
 create mode 100644 e2e/specs/9-get-exa/same-chain.spec.ts

diff --git a/components/SocketAssetSelector/index.tsx b/components/SocketAssetSelector/index.tsx
index 0fbcca214..23fb1b8c2 100644
--- a/components/SocketAssetSelector/index.tsx
+++ b/components/SocketAssetSelector/index.tsx
@@ -13,13 +13,20 @@ type AssetOptionProps = {
   option?: boolean;
   optionSize?: number;
   selectedSize?: number;
+  'data-testid'?: string;
 };
 
-function AssetOption({ asset, option = false, optionSize = 20, selectedSize = 20 }: AssetOptionProps) {
+function AssetOption({
+  asset,
+  option = false,
+  optionSize = 20,
+  selectedSize = 20,
+  'data-testid': testId,
+}: AssetOptionProps) {
   const size = option ? optionSize : selectedSize;
 
   return (
-    <Box display="flex" gap={1} my={0.5} mx={option ? 0.5 : 0} alignItems="center" flex={1}>
+    <Box display="flex" gap={1} my={0.5} mx={option ? 0.5 : 0} alignItems="center" flex={1} data-testid={testId}>
       {asset.logoURI && (
         <Image
           src={asset.logoURI}
@@ -80,9 +87,10 @@ function SocketAssetSelector({ options, onChange, asset, disabled = false, onCli
       options={options}
       onChange={onChange}
       renderValue={<AssetOption asset={asset} />}
-      renderOption={(o: AssetBalance) => <AssetOption option asset={o} />}
+      renderOption={(o: AssetBalance) => <AssetOption option asset={o} data-testid={`get-exa-asset-${o.symbol}`} />}
       disabled={disabled}
       onClick={onClick}
+      data-testid="get-exa-asset"
     />
   );
 }
diff --git a/components/getEXA/ChainSelector.tsx b/components/getEXA/ChainSelector.tsx
index fa227db7f..2a227f2ed 100644
--- a/components/getEXA/ChainSelector.tsx
+++ b/components/getEXA/ChainSelector.tsx
@@ -41,7 +41,7 @@ function ChainOption({ chain, option = false, optionSize = 17, selectedSize = 14
           }}
         />
       )}
-      <Typography fontWeight={600} fontSize={size} color="grey.900">
+      <Typography fontWeight={600} fontSize={size} color="grey.900" data-testid="get-exa-chain">
         {chain.name}
       </Typography>
     </Box>
@@ -71,7 +71,7 @@ const ChainSelector = ({ disabled }: { disabled?: boolean }) => {
       onChange={handleChainChange}
       renderValue={<ChainOption chain={chain} />}
       renderOption={(o: string) => <ChainOption option chain={chains.find(({ name }) => o === name)} />}
-      data-testid="modal-asset-selector"
+      data-testid="get-exa-chain"
       disabled={disabled}
     />
   );
diff --git a/components/getEXA/ReviewRoute.tsx b/components/getEXA/ReviewRoute.tsx
index 7dd9f3dcb..cb4064f0f 100644
--- a/components/getEXA/ReviewRoute.tsx
+++ b/components/getEXA/ReviewRoute.tsx
@@ -23,7 +23,7 @@ const ReviewRoute = () => {
   }
 
   return (
-    <Box display="flex" flexDirection="column" gap={3}>
+    <Box display="flex" flexDirection="column" gap={3} data-testid="get-exa-view-review">
       <Typography fontSize={19} fontWeight={700}>
         {t('Transaction Summary')}
       </Typography>
@@ -177,11 +177,22 @@ const ReviewRoute = () => {
 
       {txError?.status && <ModalAlert message={txError.message} variant={txError.variant} mb={1} />}
       {txStep === TXStep.CONFIRM || txStep === TXStep.CONFIRM_PENDING ? (
-        <LoadingButton variant="contained" onClick={socketSubmit} loading={txStep === TXStep.CONFIRM_PENDING}>
+        <LoadingButton
+          variant="contained"
+          onClick={socketSubmit}
+          loading={txStep === TXStep.CONFIRM_PENDING}
+          data-testid="get-exa-submit"
+        >
           {t('Confirm')}
         </LoadingButton>
       ) : (
-        <LoadingButton fullWidth onClick={approve} variant="contained" loading={txStep === TXStep.APPROVE_PENDING}>
+        <LoadingButton
+          fullWidth
+          onClick={approve}
+          variant="contained"
+          loading={txStep === TXStep.APPROVE_PENDING}
+          data-testid="get-exa-approve"
+        >
           {t('Approve')}
         </LoadingButton>
       )}
diff --git a/components/getEXA/RouteSteps.tsx b/components/getEXA/RouteSteps.tsx
index dbed9e35a..95248fc48 100644
--- a/components/getEXA/RouteSteps.tsx
+++ b/components/getEXA/RouteSteps.tsx
@@ -54,7 +54,7 @@ const RouteSteps = () => {
   ];
 
   return (
-    <Box display="flex" alignItems="center" gap={1}>
+    <Box display="flex" alignItems="center" gap={1} data-testid="get-exa-route">
       {displaySteps.map((step, index) => (
         <>
           {index !== 0 && (
diff --git a/components/getEXA/SelectRoute.tsx b/components/getEXA/SelectRoute.tsx
index 440101b4a..a02998865 100644
--- a/components/getEXA/SelectRoute.tsx
+++ b/components/getEXA/SelectRoute.tsx
@@ -53,7 +53,7 @@ const SelectRoute = () => {
 
   return (
     <>
-      <Box display={'flex'} gap={2} flexDirection="column">
+      <Box display={'flex'} gap={2} flexDirection="column" data-testid="get-exa-view-route">
         <Box p={[2, 2, 3]} flexDirection="column" bgcolor="grey.100" borderRadius={1}>
           <Typography color="grey.400" fontWeight={500} fontSize={14} pb={1}>
             {t('Pay with')}:
@@ -91,6 +91,9 @@ const SelectRoute = () => {
               placeholder="0.0"
               value={qtyIn || ''}
               onChange={({ target: { value } }) => setQtyIn(value)}
+              inputProps={{
+                'data-testid': 'get-exa-input',
+              }}
             />
             {asset ? (
               <Typography
@@ -105,6 +108,7 @@ const SelectRoute = () => {
                     cursor: 'pointer',
                   },
                 }}
+                data-testid="get-exa-balance"
               >
                 {t('Balance')}: {formatNumber(asset.amount, asset.symbol)}
               </Typography>
@@ -203,7 +207,6 @@ const SelectRoute = () => {
             onClick={() => switchNetwork?.(chain?.chainId)}
             variant="contained"
             loading={switchIsLoading}
-            data-testid="modal-switch-network"
           >
             {t('Please switch to {{network}} network', { network: chain?.name })}
           </LoadingButton>
@@ -213,6 +216,7 @@ const SelectRoute = () => {
             variant="contained"
             onClick={handleSubmit}
             loading={txStep === TXStep.CONFIRM_PENDING}
+            data-testid={nativeSwap ? 'get-exa-submit' : 'get-exa-review'}
           >
             {insufficientBalance
               ? t('Insufficient {{symbol}} balance', { symbol: asset?.symbol })
diff --git a/components/getEXA/TXStatus.tsx b/components/getEXA/TXStatus.tsx
index 2b93323bf..76d473f79 100644
--- a/components/getEXA/TXStatus.tsx
+++ b/components/getEXA/TXStatus.tsx
@@ -63,10 +63,10 @@ const SpinnerThing = ({
         />
       )}
       <Box display="flex" flexDirection="column" alignItems="center">
-        <Typography variant="h6" fontSize="16px" data-testid="modal-transaction-status">
-          {isLoading && t('Transaction processing...')}
-          {status === 'success' && t('Transaction Success')}
-          {status === 'error' && t('Transaction Error')}
+        <Typography variant="h6" fontSize="16px" data-testid="transaction-status">
+          {isLoading && t('Processing transaction...')}
+          {status === 'success' && t('Transaction success')}
+          {status === 'error' && t('Transaction error')}
         </Typography>
         <Box display="flex" flexDirection="column" alignItems="center" gap="8px" pt={1}>
           <Button
@@ -118,6 +118,7 @@ const BridgeTXStatus = () => {
       position="relative"
       justifyContent="space-around"
       alignItems="center"
+      data-testid="get-exa-view-tx-status"
     >
       <SpinnerThing {...(isBridge ? bridgeTXProps : swapTXProps)} />
     </Box>
diff --git a/contexts/GetEXAContext.tsx b/contexts/GetEXAContext.tsx
index aff84feac..dacb59113 100644
--- a/contexts/GetEXAContext.tsx
+++ b/contexts/GetEXAContext.tsx
@@ -207,7 +207,7 @@ export const GetEXAProvider: FC<PropsWithChildren> = ({ children }) => {
       const approvePermit2 = !(await isPermit(asset.address));
 
       if (await isMultiSig(walletAddress)) {
-        const allowance = await erc20.read.allowance([walletAddress, swapper?.address], opts);
+        const allowance = await erc20.read.allowance([walletAddress, swapper.address], opts);
 
         if (allowance < minimumApprovalAmount) {
           const args = [swapper.address, minimumApprovalAmount] as const;
@@ -479,10 +479,12 @@ export const GetEXAProvider: FC<PropsWithChildren> = ({ children }) => {
         data,
         value: parseEther(qtyIn),
       });
+
+      setScreen(Screen.TX_STATUS);
+
       setTX({ status: 'processing', hash: txHash_ });
       const { status, transactionHash } = await waitForTransaction({ hash: txHash_ });
       setTX({ status: status ? 'success' : 'error', hash: transactionHash });
-      setScreen(Screen.TX_STATUS);
     } catch (err) {
       setTXError({ status: true, message: handleOperationError(err) });
     } finally {
diff --git a/e2e/common/balance.ts b/e2e/common/balance.ts
index e21db745e..cd4619bca 100644
--- a/e2e/common/balance.ts
+++ b/e2e/common/balance.ts
@@ -33,5 +33,13 @@ export default function ({ test, publicClient }: CommonTest & { publicClient: Pu
     });
   };
 
-  return { check };
+  const exists = async ({ address, symbol }: Pick<BalanceParams, 'address' | 'symbol'>) => {
+    await test.step(`checks that ${address} has some ${symbol} balance`, async () => {
+      const erc20Contract = await erc20(symbol, { publicClient });
+      const balance = await erc20Contract.read.balanceOf([address]);
+      expect(balance).toBeGreaterThan(0n);
+    });
+  };
+
+  return { check, exists };
 }
diff --git a/e2e/fixture/base.ts b/e2e/fixture/base.ts
index a6be777a3..8970dc587 100644
--- a/e2e/fixture/base.ts
+++ b/e2e/fixture/base.ts
@@ -13,6 +13,7 @@ import { optimism, type Chain } from 'viem/chains';
 
 import { type Tenderly, tenderly } from '../utils/tenderly';
 import actions, { type Actions } from './actions';
+import socket, { type Socket } from './socket';
 import graph, { type Graph } from './graph';
 import time, { type Time } from './time';
 
@@ -39,6 +40,7 @@ const defaultTestParams = {
 } as const;
 
 type Web2 = {
+  socket: Socket;
   graph: Graph;
   time: Time;
 };
@@ -66,7 +68,7 @@ const base = (params: TestParams = defaultTestParams) =>
   test.extend<TestProps>({
     bypassCSP: true,
     web2: async ({ page }, use) => {
-      await use({ graph: graph(page), time: time(page) });
+      await use({ graph: graph(page), time: time(page), socket: socket(page) });
     },
     web3: async ({ page }, use) => {
       const { privateKey, options } = {
diff --git a/e2e/fixture/socket.ts b/e2e/fixture/socket.ts
new file mode 100644
index 000000000..0cb8bb668
--- /dev/null
+++ b/e2e/fixture/socket.ts
@@ -0,0 +1,55 @@
+import { type Page } from '@playwright/test';
+import { type Address } from 'viem';
+
+import { chain } from './base';
+
+function socket(page: Page) {
+  const assets = {
+    ETH: {
+      chainId: chain.id,
+      address: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
+      name: 'Ethereum',
+      symbol: 'ETH',
+      decimals: 18,
+      chainAgnosticId: null,
+      icon: 'https://maticnetwork.github.io/polygon-token-assets/assets/eth.svg',
+      logoURI: 'https://maticnetwork.github.io/polygon-token-assets/assets/eth.svg',
+    },
+    OP: {
+      chainId: chain.id,
+      address: '0x4200000000000000000000000000000000000042',
+      name: 'Optimism',
+      symbol: 'OP',
+      decimals: 18,
+      chainAgnosticId: null,
+      icon: 'https://optimistic.etherscan.io/token/images/optimism_32.png',
+      logoURI: 'https://optimistic.etherscan.io/token/images/optimism_32.png',
+    },
+  };
+
+  type Balances = {
+    account: Address;
+    balances: {
+      symbol: 'ETH' | 'OP';
+      amount: number;
+    }[];
+  };
+
+  const balances = async (params: Balances) => {
+    await page.route(/api\.socket\.tech\/v2\/balances/, async (route) => {
+      const json = {
+        success: true,
+        result: params.balances.map(({ symbol, amount }) => ({ ...assets[symbol], amount })),
+      };
+      await route.fulfill({ json });
+    });
+  };
+
+  return {
+    balances,
+  };
+}
+
+export type Socket = ReturnType<typeof socket>;
+
+export default socket;
diff --git a/e2e/page/getEXA.ts b/e2e/page/getEXA.ts
new file mode 100644
index 000000000..0842a56b0
--- /dev/null
+++ b/e2e/page/getEXA.ts
@@ -0,0 +1,135 @@
+import { Page, expect } from '@playwright/test';
+
+export default function (page: Page) {
+  const waitForPageToBeReady = async () => {
+    await page.waitForTimeout(5_000);
+    await page.waitForFunction(
+      () => {
+        const skeletons = document.querySelectorAll('.MuiSkeleton-root').length > 0;
+        const submit = document.querySelector('[data-testid="get-exa-submit"]');
+        if (!submit || skeletons) return false;
+        const attr = submit.getAttribute('disabled');
+        return attr === null;
+      },
+      null,
+      {
+        timeout: 30_000,
+        polling: 1_000,
+      },
+    );
+  };
+
+  const checkView = async (view: 'route' | 'review' | 'tx-status') => {
+    await expect(page.getByTestId(`get-exa-view-${view}`)).toBeVisible();
+  };
+
+  const checkNetwork = async (network: string) => {
+    await expect(page.getByTestId('get-exa-chain')).toContainText(network);
+  };
+
+  const checkAsset = async (asset: string) => {
+    await expect(page.getByTestId('get-exa-asset')).toContainText(asset);
+  };
+
+  const selectAsset = async (asset: string) => {
+    const button = page.getByTestId('get-exa-asset');
+    await expect(button).toBeVisible();
+    await button.click();
+
+    const option = page.getByTestId(`get-exa-asset-${asset}`);
+    await expect(option).toBeVisible();
+    await option.click();
+
+    await checkAsset(asset);
+  };
+
+  const checkBalanceAvailable = async (balance: string | RegExp) => {
+    await expect(page.getByTestId('get-exa-balance')).toContainText(balance);
+  };
+
+  const input = async (text: string) => {
+    const inp = page.getByTestId('get-exa-input');
+    await expect(inp).toBeVisible();
+    await inp.fill(text);
+  };
+
+  const checkRouteVisible = async () => {
+    await expect(page.getByTestId('get-exa-route')).toBeVisible();
+  };
+
+  const checkDisabledSubmitLabel = async (label: string | RegExp) => {
+    const button = page.getByTestId('get-exa-submit');
+    await expect(button).toBeDisabled();
+    await expect(button).toContainText(label);
+  };
+
+  const submit = async () => {
+    const button = page.getByTestId('get-exa-submit');
+    await expect(button).not.toBeDisabled();
+    await button.click();
+  };
+
+  const waitForSubmitTransaction = async () => {
+    const status = page.getByTestId('transaction-status');
+    await expect(status).toBeVisible({ timeout: 30_000 });
+    await page.waitForFunction(
+      (message) => {
+        const text = document.querySelector('[data-testid="transaction-status"]');
+        if (!text) return false;
+        return text.textContent !== message;
+      },
+      'Processing transaction...',
+      { timeout: 30_000, polling: 1_000 },
+    );
+  };
+
+  const checkTransactionStatus = async (target: 'success' | 'error') => {
+    const status = page.getByTestId('transaction-status');
+    await expect(status).toHaveText(`Transaction ${target}`);
+  };
+
+  const review = async () => {
+    const button = page.getByTestId('get-exa-review');
+    await expect(button).not.toBeDisabled();
+    await button.click();
+  };
+
+  const approve = async () => {
+    const button = page.getByTestId('get-exa-approve');
+    await expect(button).not.toBeDisabled();
+    await button.click();
+  };
+
+  const waitForApproveTransaction = async () => {
+    await page.waitForFunction(
+      () => {
+        const button = document.querySelector('[data-testid="get-exa-approve"]');
+        if (!button) return true;
+        return !button.classList.contains('MuiLoadingButton-loading');
+      },
+      null,
+      {
+        timeout: 30_000,
+        polling: 1_000,
+      },
+    );
+  };
+
+  return {
+    waitForPageToBeReady,
+    checkView,
+    checkNetwork,
+    checkAsset,
+    selectAsset,
+    checkBalanceAvailable,
+    input,
+    checkRouteVisible,
+    checkDisabledSubmitLabel,
+    submit,
+    waitForSubmitTransaction,
+    checkTransactionStatus,
+    review,
+    approve,
+    waitForApproveTransaction,
+  };
+}
diff --git a/e2e/specs/9-get-exa/same-chain.spec.ts b/e2e/specs/9-get-exa/same-chain.spec.ts
new file mode 100644
index 000000000..88ccde081
--- /dev/null
+++ b/e2e/specs/9-get-exa/same-chain.spec.ts
@@ -0,0 +1,102 @@
+import base, { chain } from '../../fixture/base';
+import _app from '../../common/app';
+import _balance from '../../common/balance';
+import _allowance from '../../common/allowance';
+import _getEXA from '../../page/getEXA';
+import { erc20, swapper } from '../../utils/contracts';
+
+const test = base();
+
+test.describe.configure({ mode: 'serial' });
+
+test('Get EXA on same chain', async ({ page, web2, web3 }) => {
+  await web3.fork.setBalance(web3.account.address, {
+    ETH: 1,
+    OP: 100,
+  });
+
+  const exa = await erc20('EXA', { walletClient: web3.walletClient, publicClient: web3.publicClient });
+  const swap = await swapper();
+
+  const app = _app({ test, page });
+  const balance = _balance({ test, page, publicClient: web3.publicClient });
+  const allowance = _allowance({ test, page, publicClient: web3.publicClient });
+  const getEXA = _getEXA(page);
+
+  await web2.socket.balances({
+    account: web3.account.address,
+    balances: [
+      { symbol: 'OP', amount: 100 },
+      { symbol: 'ETH', amount: 1 },
+    ],
+  });
+
+  await page.goto('/get-exa');
+  await getEXA.waitForPageToBeReady();
+
+  await test.step('Swap ETH for EXA', async () => {
+    await getEXA.checkView('route');
+    await getEXA.checkNetwork('Optimism');
+
+    await getEXA.selectAsset('ETH');
+
+    await getEXA.checkBalanceAvailable(/1\.00/);
+
+    await getEXA.input('1000');
+    await getEXA.checkDisabledSubmitLabel('Insufficient ETH balance');
+
+    await getEXA.input('0.01');
+
+    await getEXA.submit();
+
+    await getEXA.checkView('tx-status');
+    await getEXA.waitForSubmitTransaction();
+
+    await getEXA.checkTransactionStatus('success');
+
+    await balance.exists({ address: web3.account.address, symbol: 'EXA' });
+  });
+
+  const balanceOf = await exa.read.balanceOf([web3.account.address]);
+  await exa.write.transfer(['0x0000000000000000000000000000000000000002', balanceOf], { account: web3.account, chain });
+
+  await app.reload();
+  await getEXA.waitForPageToBeReady();
+
+  await test.step('Swap OP for EXA', async () => {
+    await getEXA.checkView('route');
+    await getEXA.checkNetwork('Optimism');
+
+    await getEXA.selectAsset('OP');
+
+    await getEXA.checkBalanceAvailable(/100\.00/);
+
+    await getEXA.input('10');
+
+    await getEXA.checkRouteVisible();
+
+    await getEXA.review();
+    await getEXA.checkView('review');
+
+    await getEXA.approve();
+    await getEXA.waitForApproveTransaction();
+
+    await getEXA.submit();
+
+    await getEXA.checkView('tx-status');
+    await getEXA.waitForSubmitTransaction();
+
+    await getEXA.checkTransactionStatus('success');
+
+    await balance.exists({ address: web3.account.address, symbol: 'EXA' });
+
+    await balance.check({ address: web3.account.address, symbol: 'OP', amount: '90' });
+    await allowance.check({
+      address: web3.account.address,
+      type: 'erc20',
+      symbol: 'OP',
+      spender: swap.address,
+      less: '0',
+    });
+  });
+});
diff --git a/e2e/utils/contracts.ts b/e2e/utils/contracts.ts
index 7cb939f26..d93f054e0 100644
--- a/e2e/utils/contracts.ts
+++ b/e2e/utils/contracts.ts
@@ -5,6 +5,7 @@ import debtManagerContract from '@exactly/protocol/deployments/optimism/DebtMana
 import permit2Contract from '@exactly/protocol/deployments/optimism/Permit2.json' assert { type: 'json' };
 import sablierV2LockupLinearContract from '@exactly/protocol/deployments/optimism/SablierV2LockupLinear.json' assert { type: 'json' };
 import escrowedEXAContract from '@exactly/protocol/deployments/optimism/esEXA.json' assert { type: 'json' };
+import swapperContract from '@exactly/protocol/deployments/optimism/Swapper.json' assert { type: 'json' };
 
 import type {
   Auditor,
@@ -15,6 +16,7 @@ import type {
   Permit2,
   SablierV2LockupLinear,
   EscrowedEXA,
+  Swapper,
 } from '../../types/contracts';
 import {
   auditorABI,
@@ -25,6 +27,7 @@ import {
   permit2ABI,
   sablierV2LockupLinearABI,
   escrowedExaABI,
+  swapperABI,
 } from '../../types/abi';
 
 const ERC20TokenSymbols = ['WETH', 'USDC', 'OP', 'esEXA', 'EXA'] as const;
@@ -85,3 +88,8 @@ export const escrowedEXA = async (clients: Clients = {}): Promise<EscrowedEXA> =
   if (!isAddress(escrowedEXAContract.address)) throw new Error('Invalid address');
   return getContract({ address: escrowedEXAContract.address, abi: escrowedExaABI, ...clients });
 };
+
+export const swapper = async (clients: Clients = {}): Promise<Swapper> => {
+  if (!isAddress(swapperContract.address)) throw new Error('Invalid address');
+  return getContract({ address: swapperContract.address, abi: swapperABI, ...clients });
+};
diff --git a/types/contracts.ts b/types/contracts.ts
index 29c46919b..2d1c06479 100644
--- a/types/contracts.ts
+++ b/types/contracts.ts
@@ -14,6 +14,7 @@ import {
   permit2ABI,
   sablierV2LockupLinearABI,
   escrowedExaABI,
+  swapperABI,
 } from './abi';
 
 export type ContractType<T extends Abi> = ReturnType<typeof getContract<T, WalletClient>>;
@@ -31,3 +32,4 @@ export type Permit2 = ContractType<typeof permit2ABI>;
 export type DebtPreviewer = ContractType<typeof debtPreviewerABI>;
 export type SablierV2LockupLinear = ContractType<typeof sablierV2LockupLinearABI>;
 export type EscrowedEXA = ContractType<typeof escrowedExaABI>;
+export type Swapper = ContractType<typeof swapperABI>;

From 250c313f6876d2394ed1c2cdbae968387bc70ab6 Mon Sep 17 00:00:00 2001
From: Jorge Galat <jrgglt@gmail.com>
Date: Wed, 18 Oct 2023 10:03:28 -0300
Subject: [PATCH 2/2] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20e2e:=20rename=20type?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 e2e/fixture/socket.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/e2e/fixture/socket.ts b/e2e/fixture/socket.ts
index 0cb8bb668..88866b6c5 100644
--- a/e2e/fixture/socket.ts
+++ b/e2e/fixture/socket.ts
@@ -27,7 +27,7 @@ function socket(page: Page) {
     },
   };
 
-  type Balances = {
+  type Balance = {
     account: Address;
     balances: {
       symbol: 'ETH' | 'OP';
@@ -35,7 +35,7 @@ function socket(page: Page) {
     }[];
   };
 
-  const balances = async (params: Balances) => {
+  const balances = async (params: Balance) => {
     await page.route(/api\.socket\.tech\/v2\/balances/, async (route) => {
       const json = {
         success: true,