feat: gelato and local signers

api/_cache.ts

@@ -61,6 +61,13 @@ export class RedisCache implements interfaces.CachingMechanismInterface {
       throw error;
     }
   }
+
+  async del(key: string) {
+    if (!this.client) {
+      return;
+    }
+    await this.client.del(key);
+  }
 }
 
 export const redisCache = new RedisCache();

api/_dexes/utils.ts

@@ -1,4 +1,4 @@
-import { BigNumber, constants } from "ethers";
+import { BigNumber, BigNumberish, constants } from "ethers";
 import { utils } from "@across-protocol/sdk";
 import { SpokePool } from "@across-protocol/contracts/dist/typechain";
 
@@ -24,7 +24,9 @@ import {
   isOutputTokenBridgeable,
   getSpokePool,
 } from "../_utils";
-
+import { GAS_SPONSOR_ADDRESS } from "../relay/_utils";
+import { SpokePoolV3PeripheryInterface } from "../_typechain/SpokePoolV3Periphery";
+import { TransferType } from "../_spoke-pool-periphery";
 export type CrossSwapType =
   (typeof CROSS_SWAP_TYPE)[keyof typeof CROSS_SWAP_TYPE];
 
@@ -195,7 +197,11 @@ export function getFallbackRecipient(crossSwap: CrossSwap) {
 }
 
 export async function extractDepositDataStruct(
-  crossSwapQuotes: CrossSwapQuotes
+  crossSwapQuotes: CrossSwapQuotes,
+  submissionFees?: {
+    amount: BigNumberish;
+    recipient: string;
+  }
 ) {
   const originChainId = crossSwapQuotes.crossSwap.inputToken.chainId;
   const destinationChainId = crossSwapQuotes.crossSwap.outputToken.chainId;
@@ -204,7 +210,7 @@ export async function extractDepositDataStruct(
   const refundAddress =
     crossSwapQuotes.crossSwap.refundAddress ??
     crossSwapQuotes.crossSwap.depositor;
-  const deposit = {
+  const baseDepositData = {
     depositor: crossSwapQuotes.crossSwap.refundOnOrigin
       ? refundAddress
       : crossSwapQuotes.crossSwap.depositor,
@@ -226,7 +232,46 @@ export async function extractDepositDataStruct(
       crossSwapQuotes.bridgeQuote.suggestedFees.exclusivityDeadline,
     message,
   };
-  return deposit;
+  return {
+    inputAmount: baseDepositData.inputAmount,
+    baseDepositData,
+    submissionFees: submissionFees || {
+      amount: "0",
+      recipient: GAS_SPONSOR_ADDRESS,
+    },
+  };
+}
+
+export async function extractSwapAndDepositDataStruct(
+  crossSwapQuotes: CrossSwapQuotes,
+  submissionFees?: {
+    amount: BigNumberish;
+    recipient: string;
+  }
+): Promise<SpokePoolV3PeripheryInterface.SwapAndDepositDataStruct> {
+  const { originSwapQuote, contracts } = crossSwapQuotes;
+  const { originRouter } = contracts;
+  if (!originSwapQuote || !originRouter) {
+    throw new Error(
+      "Can not extract 'SwapAndDepositDataStruct' without originSwapQuote and originRouter"
+    );
+  }
+
+  const { baseDepositData, submissionFees: _submissionFees } =
+    await extractDepositDataStruct(crossSwapQuotes, submissionFees);
+  return {
+    submissionFees: submissionFees || _submissionFees,
+    depositData: baseDepositData,
+    swapToken: originSwapQuote.tokenIn.address,
+    swapTokenAmount: originSwapQuote.maximumAmountIn,
+    minExpectedInputTokenAmount: originSwapQuote.minAmountOut,
+    routerCalldata: originSwapQuote.swapTx.data,
+    exchange: originRouter.address,
+    transferType:
+      originRouter.name === "UniswapV3UniversalRouter"
+        ? TransferType.Transfer
+        : TransferType.Approval,
+  };
 }
 
 async function getFillDeadline(spokePool: SpokePool): Promise<number> {

api/_permit.ts

@@ -87,24 +87,6 @@ export async function getPermitTypedData(params: {
     domainSeparator,
     eip712: {
       types: {
-        EIP712Domain: [
-          {
-            name: "name",
-            type: "string",
-          },
-          {
-            name: "version",
-            type: "string",
-          },
-          {
-            name: "chainId",
-            type: "uint256",
-          },
-          {
-            name: "verifyingContract",
-            type: "address",
-          },
-        ],
         Permit: [
           {
             name: "owner",

api/_spoke-pool-periphery.ts

@@ -1,28 +1,9 @@
-import { BigNumber } from "ethers";
-import { extractDepositDataStruct } from "./_dexes/utils";
 import { SpokePoolPeripheryProxy__factory } from "./_typechain/factories/SpokePoolPeripheryProxy__factory";
 import { SpokePoolV3Periphery__factory } from "./_typechain/factories/SpokePoolV3Periphery__factory";
 import { ENABLED_ROUTES, getProvider } from "./_utils";
+import { SpokePoolV3PeripheryInterface } from "./_typechain/SpokePoolV3Periphery";
 
 const sharedEIP712Types = {
-  EIP712Domain: [
-    {
-      name: "name",
-      type: "string",
-    },
-    {
-      name: "version",
-      type: "string",
-    },
-    {
-      name: "chainId",
-      type: "uint256",
-    },
-    {
-      name: "verifyingContract",
-      type: "address",
-    },
-  ],
   Fees: [
     {
       name: "amount",
@@ -133,14 +114,7 @@ export function getSpokePoolPeripheryProxy(address: string, chainId: number) {
 }
 
 export async function getDepositTypedData(params: {
-  depositData: {
-    submissionFees: {
-      amount: BigNumber;
-      recipient: string;
-    };
-    baseDepositData: Awaited<ReturnType<typeof extractDepositDataStruct>>;
-    inputAmount: BigNumber;
-  };
+  depositData: SpokePoolV3PeripheryInterface.DepositDataStruct;
   chainId: number;
 }) {
   const spokePoolPeriphery = getSpokePoolPeriphery(
@@ -185,19 +159,7 @@ export async function getDepositTypedData(params: {
 }
 
 export async function getSwapAndDepositTypedData(params: {
-  swapAndDepositData: {
-    submissionFees: {
-      amount: BigNumber;
-      recipient: string;
-    };
-    depositData: Awaited<ReturnType<typeof extractDepositDataStruct>>;
-    swapToken: string;
-    exchange: string;
-    transferType: TransferType;
-    swapTokenAmount: BigNumber;
-    minExpectedInputTokenAmount: BigNumber;
-    routerCalldata: string;
-  };
+  swapAndDepositData: SpokePoolV3PeripheryInterface.SwapAndDepositDataStruct;
   chainId: number;
 }) {
   const spokePoolPeriphery = getSpokePoolPeriphery(
@@ -260,3 +222,41 @@ export async function getSwapAndDepositTypedData(params: {
     },
   };
 }
+
+export function encodeDepositWithPermitCalldata(args: {
+  signatureOwner: string;
+  depositData: SpokePoolV3PeripheryInterface.DepositDataStruct;
+  deadline: number;
+  permitSignature: string;
+  depositDataSignature: string;
+}) {
+  return SpokePoolV3Periphery__factory.createInterface().encodeFunctionData(
+    "depositWithPermit",
+    [
+      args.signatureOwner,
+      args.depositData,
+      args.deadline,
+      args.permitSignature,
+      args.depositDataSignature,
+    ]
+  );
+}
+
+export function encodeSwapAndBridgeWithPermitCalldata(args: {
+  signatureOwner: string;
+  swapAndDepositData: SpokePoolV3PeripheryInterface.SwapAndDepositDataStruct;
+  deadline: number;
+  permitSignature: string;
+  swapAndDepositDataSignature: string;
+}) {
+  return SpokePoolV3Periphery__factory.createInterface().encodeFunctionData(
+    "swapAndBridgeWithPermit",
+    [
+      args.signatureOwner,
+      args.swapAndDepositData,
+      args.deadline,
+      args.permitSignature,
+      args.swapAndDepositDataSignature,
+    ]
+  );
+}

api/_utils.ts

@@ -201,8 +201,8 @@ export const getLogger = (): LoggingUtility => {
  * Resolves the current vercel endpoint dynamically
  * @returns A valid URL of the current endpoint in vercel
  */
-export const resolveVercelEndpoint = () => {
-  if (process.env.REACT_APP_VERCEL_API_BASE_URL_OVERRIDE) {
+export const resolveVercelEndpoint = (omitOverride = false) => {
+  if (!omitOverride && process.env.REACT_APP_VERCEL_API_BASE_URL_OVERRIDE) {
     return process.env.REACT_APP_VERCEL_API_BASE_URL_OVERRIDE;
   }
   const url = process.env.VERCEL_URL ?? "across.to";
@@ -1487,7 +1487,7 @@ export function validAddressOrENS() {
 
 export function positiveIntStr() {
   return define<string>("positiveIntStr", (value) => {
-    return Number.isInteger(Number(value)) && Number(value) > 0;
+    return Number.isInteger(Number(value)) && Number(value) >= 0;
   });
 }
 
@@ -1503,6 +1503,12 @@ export function boolStr() {
   });
 }
 
+export function hexString() {
+  return define<string>("hexString", (value) => {
+    return utils.isHexString(value);
+  });
+}
+
 /**
  * Returns the cushion for a given token symbol and route. If no route is specified, the cushion for the token symbol
  * @param symbol The token symbol

api/relay/_queue.ts

@@ -0,0 +1,46 @@
+import { Client } from "@upstash/qstash";
+
+import { RelayRequest, RelayStrategy, RelayStrategyName } from "./_types";
+import { resolveVercelEndpoint } from "../_utils";
+
+const client = new Client({
+  token: process.env.QSTASH_TOKEN!,
+});
+
+export async function pushRelayRequestToQueue({
+  request,
+  strategy,
+}: {
+  request: RelayRequest;
+  strategy: RelayStrategy;
+}) {
+  const strategyName = strategy.strategyName;
+  const queue = getRelayRequestQueue(strategyName, request.chainId);
+  await queue.upsert({
+    parallelism: strategy.queueParallelism,
+  });
+
+  const baseUrl = resolveVercelEndpoint(true);
+  const response = await queue.enqueueJSON({
+    retries: 3,
+    contentBasedDeduplication: true,
+    headers: new Headers({
+      "Retry-After": "1",
+    }),
+    url: `${baseUrl}/api/relay/jobs/process`,
+    body: {
+      request,
+      strategyName,
+    },
+  });
+  return response;
+}
+
+function getRelayRequestQueue(
+  strategyName: RelayStrategyName,
+  chainId: number
+) {
+  return client.queue({
+    queueName: `relay-request-queue-${chainId}-${strategyName}`,
+  });
+}