Fix bugs with relay adapter

pedromcunha · pedromcunha · commit 60adad737c82 · 2024-12-16T13:59:43.000-05:00
diff --git a/src/adapters/relay/index.ts b/src/adapters/relay/index.ts
@@ -11,9 +11,58 @@ const retry = require("async-retry");
  *
  */
 
+const startingBlocks: Record<string, number> = {
+  1: 18976112,
+  10: 114647896,
+  56: 39739873,
+  100: 33619680,
+  137: 55172593,
+  185: 3417903,
+  288: 2353048,
+  324: 25006838,
+  360: 2691201,
+  480: 3466510,
+  690: 254553,
+  1101: 12491343,
+  1135: 761002,
+  1329: 118912096,
+  2741: 4116,
+  2911: 2136055,
+  4321: 138647,
+  5000: 72911632,
+  5112: 1462668,
+  7560: 896262,
+  8333: 144055,
+  8453: 9046270,
+  17071: 58343,
+  33139: 636958,
+  33979: 238923,
+  34443: 7297896,
+  42161: 169028419,
+  42170: 38963884,
+  43114: 44583244,
+  55244: 30,
+  57073: 275058,
+  59144: 1814719,
+  60808: 275964,
+  70700: 19,
+  70701: 1543,
+  81457: 216675,
+  534352: 5560094,
+  543210: 1282,
+  660279: 4759873,
+  984122: 2655107,
+  7777777: 9094029,
+  8253038: 865885,
+  9286185: 17617195,
+  666666666: 1310814,
+  792703809: 279758248,
+  888888888: 1278785,
+  1380012617: 205727,
+};
+
 const convertRequestToEvent = (
-  request: NonNullable<RelayRequestsResponse["requests"]>["0"],
-  blockNumber: number
+  request: NonNullable<RelayRequestsResponse["requests"]>["0"]
 ): { deposit?: EventData; withdraw?: EventData; depositChainId?: number; withdrawChainId?: number } => {
   const deposit = request.data?.metadata?.currencyIn;
   const withdraw = request.data?.metadata?.currencyOut;
@@ -23,31 +72,33 @@ const convertRequestToEvent = (
 
   return {
     depositChainId: depositTx?.chainId,
-    deposit: depositTx
-      ? {
-          blockNumber: blockNumber, //MISSING: going to just fudge it for now
-          txHash: depositTx.hash as string,
-          from: (depositTx.data as any).to,
-          to: (depositTx.data as any).from,
-          token: deposit?.currency?.address!,
-          amount: deposit?.amountUsd as any,
-          isDeposit: true,
-          isUSDVolume: true,
-        }
-      : undefined,
+    deposit:
+      depositTx && depositTx.data && deposit
+        ? {
+            blockNumber: depositTx.block!,
+            txHash: depositTx.hash as string,
+            from: (depositTx.data as any).to,
+            to: (depositTx.data as any).from,
+            token: deposit?.currency?.address!,
+            amount: deposit?.amountUsd as any,
+            isDeposit: true,
+            isUSDVolume: true,
+          }
+        : undefined,
     withdrawChainId: withdrawTx?.chainId,
-    withdraw: withdrawTx
-      ? {
-          blockNumber: blockNumber, //MISSING: going to just fudge it for now
-          txHash: withdrawTx.hash!,
-          from: (withdrawTx.data as unknown as any).from,
-          to: (withdrawTx.data as unknown as any).to,
-          token: withdraw?.currency?.address!,
-          amount: withdraw?.amountUsd as any,
-          isDeposit: false,
-          isUSDVolume: true,
-        }
-      : undefined,
+    withdraw:
+      withdrawTx && withdrawTx.data && withdraw
+        ? {
+            blockNumber: withdrawTx.block!,
+            txHash: withdrawTx.hash!,
+            from: (withdrawTx.data as unknown as any).from,
+            to: (withdrawTx.data as unknown as any).to,
+            token: withdraw?.currency?.address!,
+            amount: withdraw?.amountUsd as any,
+            isDeposit: false,
+            isUSDVolume: true,
+          }
+        : undefined,
   };
 };
 
@@ -77,7 +128,7 @@ const fetchAllRequests = async (
   let maxRequests = 10000;
   let requestCount = 0;
   while (continuation !== undefined && requestCount < maxRequests) {
-    const response = await fetchRequests(chainId, fromBlock, toBlock);
+    const response = await fetchRequests(chainId, fromBlock, toBlock, continuation);
     continuation = response.continuation;
     allRequests = [...allRequests, ...(response.requests ?? [])];
   }
@@ -86,10 +137,15 @@ const fetchAllRequests = async (
 
 const constructParams = (chainId: number) => {
   return async (fromBlock: number, toBlock: number): Promise<EventData[]> => {
+    //Performance optimization to limit empty requests
+    const startingBlock = startingBlocks[chainId];
+    if (startingBlock !== undefined && toBlock < startingBlock) {
+      return [];
+    }
     const requests = await fetchAllRequests(chainId, fromBlock, toBlock);
     const events: EventData[] = [];
     requests?.forEach((request) => {
-      const event = convertRequestToEvent(request, fromBlock);
+      const event = convertRequestToEvent(request);
       if (event.depositChainId === chainId && event.deposit) {
         events.push(event.deposit);
       }
diff --git a/src/adapters/relay/type.ts b/src/adapters/relay/type.ts
@@ -1,6 +1,10 @@
 export type RelayRequestsResponse = {
   requests?: {
     id?: string;
+    /**
+     * @description Note that fallback is returned in the case of a refund
+     * @enum {string}
+     */
     status?: "refund" | "delayed" | "waiting" | "failure" | "pending" | "success";
     user?: string;
     recipient?: string;
@@ -13,8 +17,11 @@ export type RelayRequestsResponse = {
         | "DEPOSIT_CHAIN_MISMATCH"
         | "N/A";
       fees?: {
+        /** @description Estimated gas cost required for execution, in wei */
         gas?: string;
+        /** @description The fixed fee which is always added to execution, in wei */
         fixed?: string;
+        /** @description The dynamic fee which is a result of the chain and the amount, in wei */
         price?: string;
       };
       feesUsd?: {
@@ -23,10 +30,13 @@ export type RelayRequestsResponse = {
         price?: string;
       };
       inTxs?: {
+        /** @description Total fees in wei */
         fee?: string;
         data?: unknown;
         stateChanges?: unknown;
         hash?: string;
+        block?: number;
+        /** @description The type of transaction, always set to onchain */
         type?: string;
         chainId?: number;
         timestamp?: number;
@@ -57,6 +67,26 @@ export type RelayRequestsResponse = {
           isNative?: boolean;
         };
       };
+      /**
+       * @example {
+       *   "currency": {
+       *     "chainId": 8453,
+       *     "address": "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
+       *     "symbol": "USDC",
+       *     "name": "USD Coin",
+       *     "decimals": 6,
+       *     "metadata": {
+       *       "logoURI": "https://ethereum-optimism.github.io/data/USDC/logo.png",
+       *       "verified": false,
+       *       "isNative": false
+       *     }
+       *   },
+       *   "amount": "30754920",
+       *   "amountFormatted": "30.75492",
+       *   "amountUsd": "30.901612",
+       *   "minimumAmount": "30454920"
+       * }
+       */
       refundCurrencyData?: {
         currency?: {
           chainId?: number;
@@ -82,6 +112,26 @@ export type RelayRequestsResponse = {
       metadata?: {
         sender?: string;
         recipient?: string;
+        /**
+         * @example {
+         *   "currency": {
+         *     "chainId": 8453,
+         *     "address": "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
+         *     "symbol": "USDC",
+         *     "name": "USD Coin",
+         *     "decimals": 6,
+         *     "metadata": {
+         *       "logoURI": "https://ethereum-optimism.github.io/data/USDC/logo.png",
+         *       "verified": false,
+         *       "isNative": false
+         *     }
+         *   },
+         *   "amount": "30754920",
+         *   "amountFormatted": "30.75492",
+         *   "amountUsd": "30.901612",
+         *   "minimumAmount": "30454920"
+         * }
+         */
         currencyIn?: {
           currency?: {
             chainId?: number;
@@ -100,6 +150,26 @@ export type RelayRequestsResponse = {
           amountUsd?: string;
           minimumAmount?: string;
         };
+        /**
+         * @example {
+         *   "currency": {
+         *     "chainId": 8453,
+         *     "address": "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
+         *     "symbol": "USDC",
+         *     "name": "USD Coin",
+         *     "decimals": 6,
+         *     "metadata": {
+         *       "logoURI": "https://ethereum-optimism.github.io/data/USDC/logo.png",
+         *       "verified": false,
+         *       "isNative": false
+         *     }
+         *   },
+         *   "amount": "30754920",
+         *   "amountFormatted": "30.75492",
+         *   "amountUsd": "30.901612",
+         *   "minimumAmount": "30454920"
+         * }
+         */
         currencyOut?: {
           currency?: {
             chainId?: number;
@@ -124,10 +194,13 @@ export type RelayRequestsResponse = {
       usesExternalLiquidity?: boolean;
       timeEstimate?: number;
       outTxs?: {
+        /** @description Total fees in wei */
         fee?: string;
         data?: unknown;
         stateChanges?: unknown;
         hash?: string;
+        block?: number;
+        /** @description The type of transaction, always set to onchain */
         type?: string;
         chainId?: number;
         timestamp?: number;
diff --git a/src/data/bridgeNetworkData.ts b/src/data/bridgeNetworkData.ts
@@ -1762,18 +1762,46 @@ export default [
     chains: [
       "Ethereum",
       "Optimism",
+      "BNB",
+      "Gnosis",
       "Polygon",
+      "Mint",
+      "Boba",
+      "Zksync",
+      "Shape",
+      "World Chain",
+      "Redstone",
+      "Polygon Zkevm",
+      "Lisk",
+      "Sei",
+      "Hychain",
+      "Mantle",
+      "Ham",
+      "Cyber",
+      "B3",
+      "Base",
       "Arbitrum",
       "Arbitrum Nova",
       "Avalanche",
-      "Mint",
+      "Superposition",
       "Linea",
-      "Base",
+      "Bob",
+      "Apex",
+      "Boss",
       "Blast",
       "Scroll",
+      "Zero Network",
+      "Xai",
       "Solana",
-      "Boba",
-      "Polygon zkEVM",
+      "Ancient8",
+      "Rari",
+      "Bitcoin",
+      "Eclipse",
+      "Degen",
+      "Funki",
+      "Mode",
+      "Proof of Play",
+      "Proof of Play Boss",
     ],
   },
 ] as BridgeNetwork[];
diff --git a/src/utils/adapter.ts b/src/utils/adapter.ts
@@ -513,7 +513,7 @@ export const runAdapterHistorical = async (
 
               let solanaTimestampsMap = {} as { [blockNumber: number]: number };
 
-              if (chain === "solana" && !["debridgedln", "portal"].includes(bridgeDbName)) {
+              if (chain === "solana" && !["debridgedln", "portal", "relay"].includes(bridgeDbName)) {
                 latestSolanaBlock = await getLatestBlock("solana");
                 const connection = getConnection();
 
