feat: uniswap v3 exact output support + UniversalSwapAndBridge

.github/workflows/dependency-review.yaml

@@ -16,6 +16,8 @@ jobs:
         with:
           fail-on-severity: high
           # Comma-separated list of GHSA IDs to allow.
-          # We allow @openzeppelin/contracts@3.4.1-solc-0.7-2 critical vulnerabilities
+          # We allow the following critical vulnerabilities
           # because they are not exploitable in our usage of the package.
-          allow-ghsas: GHSA-fg47-3c2x-m2wr, GHSA-88g8-f5mf-f5rj, GHSA-3h5v-q93c-6h6q
+          # - @openzeppelin/contracts@3.4.1-solc-0.7-2
+          # - @openzeppelin/contracts@4.7.0
+          allow-ghsas: GHSA-fg47-3c2x-m2wr, GHSA-88g8-f5mf-f5rj, GHSA-3h5v-q93c-6h6q, GHSA-qh9x-gcfh-pcrw, GHSA-4g63-c64m-25w9, GHSA-xrc4-737v-9q75, GHSA-4h98-2769-gh6h, GHSA-4h98-2769-gh6h, GHSA-93hq-5wgc-jc82

api/_dexes/1inch.ts

@@ -1,27 +1,24 @@
 import axios from "axios";
 
-import { AcrossSwap, SwapQuoteAndCalldata } from "./types";
+import { Swap, OriginSwapQuoteAndCalldata } from "./types";
 import { getSwapAndBridgeAddress } from "./utils";
 
-export async function get1inchQuoteAndCalldata(
-  swap: AcrossSwap
-): Promise<SwapQuoteAndCalldata> {
-  const swapAndBridgeAddress = getSwapAndBridgeAddress(
-    "1inch",
-    swap.swapToken.chainId
-  );
-  const apiBaseUrl = `https://api.1inch.dev/swap/v6.0/${swap.swapToken.chainId}`;
+export async function get1inchQuoteForOriginSwapExactInput(
+  swap: Omit<Swap, "recipient">
+): Promise<OriginSwapQuoteAndCalldata> {
+  const swapAndBridgeAddress = getSwapAndBridgeAddress("1inch", swap.chainId);
+  const apiBaseUrl = `https://api.1inch.dev/swap/v6.0/${swap.chainId}`;
   const apiHeaders = {
     Authorization: `Bearer ${process.env.ONEINCH_API_KEY}`,
     accept: "application/json",
   };
 
   const swapParams = {
-    src: swap.swapToken.address,
-    dst: swap.acrossInputToken.address,
-    amount: swap.swapTokenAmount,
+    src: swap.tokenIn.address,
+    dst: swap.tokenOut.address,
+    amount: swap.amount,
     from: swapAndBridgeAddress,
-    slippage: swap.slippage,
+    slippage: swap.slippageTolerance,
     disableEstimate: true,
     allowPartialFill: false,
     receiver: swapAndBridgeAddress,
@@ -47,6 +44,6 @@ export async function get1inchQuoteAndCalldata(
     value: response.data.tx.value,
     swapAndBridgeAddress,
     dex: "1inch",
-    slippage: swap.slippage,
+    slippage: swap.slippageTolerance,
   };
 }

api/_dexes/types.ts

@@ -5,22 +5,19 @@ export type Token = {
   chainId: number;
 };
 
-/**
- * @property `swapToken` - Address of the token that will be swapped for acrossInputToken.
- * @property `acrossInputToken` - Address of the token that will be bridged via Across as the inputToken.
- * @property `swapTokenAmount` - The amount of swapToken to be swapped for acrossInputToken.
- * @property `slippage` - The slippage tolerance for the swap in decimals, e.g. 1 for 1%.
- */
-export type AcrossSwap = {
-  swapToken: Token;
-  acrossInputToken: Token;
-  swapTokenAmount: string;
-  slippage: number;
+export type Swap = {
+  chainId: number;
+  tokenIn: Token;
+  tokenOut: Token;
+  amount: string;
+  recipient: string;
+  slippageTolerance: number;
+  type: "EXACT_INPUT" | "MIN_OUTPUT";
 };
 
 export type SupportedDex = "1inch" | "uniswap";
 
-export type SwapQuoteAndCalldata = {
+export type OriginSwapQuoteAndCalldata = {
   minExpectedInputTokenAmount: string;
   routerCalldata: string;
   value: string;