Merge pull request #98 from Interport-Finance/itp/new-vaults

interport: update Fantom vault asset addresses and add CCTP support

Author: vrtnd

src/adapters/interport-finance/constants.ts

@@ -1,5 +1,6 @@
 export const VAULT_TYPE_USDC = 1;
 export const VAULT_TYPE_USDT = 2;
+export const VAULT_TYPE_CIRCLE_CCTP = 4;
 
 export const ACTION_EXECUTOR_ADDRESSES = {
     ethereum: "0x7b2E3FC7510D1A51b3bef735F985446589219354",
@@ -18,6 +19,23 @@ export const ACTION_EXECUTOR_ADDRESSES = {
     fantom: "0x7b2E3FC7510D1A51b3bef735F985446589219354",
 } as const;
 
+export const ACTION_EXECUTOR_CCTP_ADDRESSES = {
+    ethereum: "0x41b84aea119E945f4C275BADA0eD38b8aFE864c8",
+    arbitrum: "0x41b84aea119E945f4C275BADA0eD38b8aFE864c8",
+    bsc: "",
+    era: "",
+    base: "0x41b84aea119E945f4C275BADA0eD38b8aFE864c8",
+    scroll: "",
+    linea: "",
+    polygon: "0x41b84aea119E945f4C275BADA0eD38b8aFE864c8",
+    polygon_zkevm: "",
+    optimism: "0x41b84aea119E945f4C275BADA0eD38b8aFE864c8",
+    opbnb: "",
+    avax: "0x41b84aea119E945f4C275BADA0eD38b8aFE864c8",
+    eon: "",
+    fantom: "",
+} as const;
+
 export const VAULT_ASSET_ADDRESSES = {
     [VAULT_TYPE_USDC]: {
         ethereum: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
@@ -33,7 +51,7 @@ export const VAULT_ASSET_ADDRESSES = {
         opbnb: undefined,
         avax: '0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E',
         eon: '0xCc44eB064CD32AAfEEb2ebb2a47bE0B882383b53',
-        fantom: '0x04068DA6C83AFCFA0e13ba15A6696662335D5B75',
+        fantom: '0x28a92dde19D9989F39A49905d7C9C2FAc7799bDf',
     },
     [VAULT_TYPE_USDT]: {
         ethereum: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
@@ -49,6 +67,22 @@ export const VAULT_ASSET_ADDRESSES = {
         opbnb: '0x9e5aac1ba1a2e6aed6b32689dfcf62a509ca96f3',
         avax: '0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7',
         eon: '0xA167bcAb6791304EDa9B636C8beEC75b3D2829E6',
-        fantom: '0x049d68029688eAbF473097a2fC38ef61633A3C7A',
+        fantom: '0xcc1b99dDAc1a33c201a742A1851662E87BC7f22C',
+    },
+    [VAULT_TYPE_CIRCLE_CCTP] : {
+        ethereum: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
+        arbitrum: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
+        bsc: undefined,
+        era: undefined,
+        base: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+        scroll: undefined,
+        linea: undefined,
+        polygon: '0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359',
+        polygon_zkevm: undefined,
+        optimism: '0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85',
+        opbnb: undefined,
+        avax: '0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E',
+        eon: undefined,
+        fantom: undefined,
     },
 };

src/adapters/interport-finance/index.ts

@@ -1,12 +1,22 @@
 import { BridgeAdapter, PartialContractEventParams } from "../../helpers/bridgeAdapter.type";
 import { BigNumber } from "ethers";
 import { getTxDataFromEVMEventLogsCustom } from "./processTransactionsCustom";
-import {ACTION_EXECUTOR_ADDRESSES, VAULT_TYPE_USDC, VAULT_TYPE_USDT, VAULT_ASSET_ADDRESSES} from "./constants";
+import {
+    ACTION_EXECUTOR_ADDRESSES,
+    ACTION_EXECUTOR_CCTP_ADDRESSES,
+    VAULT_TYPE_USDC,
+    VAULT_TYPE_USDT,
+    VAULT_TYPE_CIRCLE_CCTP,
+    VAULT_ASSET_ADDRESSES
+} from "./constants";
 
 type SupportedChains = keyof typeof ACTION_EXECUTOR_ADDRESSES;
 
-const depositParams = (chain: SupportedChains): PartialContractEventParams => {
-    const actionExecutorAddress = ACTION_EXECUTOR_ADDRESSES[chain];
+const depositParams = (chain: SupportedChains, isCCTP = false): PartialContractEventParams => {
+    const actionExecutorAddress =
+        isCCTP ?
+            ACTION_EXECUTOR_CCTP_ADDRESSES[chain] :
+            ACTION_EXECUTOR_ADDRESSES[chain];
 
     return {
         target: actionExecutorAddress,
@@ -33,8 +43,11 @@ const depositParams = (chain: SupportedChains): PartialContractEventParams => {
     };
 };
 
-const withdrawParams = (chain: SupportedChains): PartialContractEventParams => {
-    const actionExecutorAddress = ACTION_EXECUTOR_ADDRESSES[chain];
+const withdrawParams = (chain: SupportedChains, isCCTP = false): PartialContractEventParams => {
+    const actionExecutorAddress =
+        isCCTP ?
+            ACTION_EXECUTOR_CCTP_ADDRESSES[chain] :
+            ACTION_EXECUTOR_ADDRESSES[chain];
 
     return {
         target: actionExecutorAddress,
@@ -114,9 +127,42 @@ const variableBalanceUsdtParams = (chain: SupportedChains): PartialContractEvent
     };
 };
 
+const variableBalanceCctpParams = (chain: SupportedChains): PartialContractEventParams => {
+    const actionExecutorAddress = ACTION_EXECUTOR_CCTP_ADDRESSES[chain];
+
+    return {
+        target: actionExecutorAddress,
+        topic: "VariableBalanceAllocated(uint256,address,uint256,uint256)",
+        abi: [
+            "event VariableBalanceAllocated(uint256 indexed actionId, address indexed recipient, uint256 vaultType, uint256 amount)"
+        ],
+        isDeposit: false,
+        logKeys: {
+            blockNumber: "blockNumber",
+            txHash: "transactionHash",
+        },
+        argKeys: {
+            amount: "amount",
+            to: "recipient",
+        },
+        fixedEventData: {
+            token: VAULT_ASSET_ADDRESSES[VAULT_TYPE_CIRCLE_CCTP][chain],
+            from: actionExecutorAddress,
+        },
+        filter: {
+            includeArg: [{ vaultType: BigNumber.from(VAULT_TYPE_CIRCLE_CCTP) as unknown as string }],
+        },
+    };
+};
+
 const constructParams = (chain: SupportedChains) => {
     const eventParams = [depositParams(chain), withdrawParams(chain)];
 
+    if (ACTION_EXECUTOR_CCTP_ADDRESSES[chain]) {
+        eventParams.push(depositParams(chain, true));
+        eventParams.push(withdrawParams(chain, true));
+    }
+
     if (VAULT_ASSET_ADDRESSES[VAULT_TYPE_USDC][chain]) {
         eventParams.push(variableBalanceUsdcParams(chain));
     }
@@ -125,6 +171,10 @@ const constructParams = (chain: SupportedChains) => {
         eventParams.push(variableBalanceUsdtParams(chain));
     }
 
+    if (VAULT_ASSET_ADDRESSES[VAULT_TYPE_CIRCLE_CCTP][chain]) {
+        eventParams.push(variableBalanceCctpParams(chain));
+    }
+
     return async (fromBlock: number, toBlock: number) =>
         getTxDataFromEVMEventLogsCustom("interport", chain, fromBlock, toBlock, eventParams);
 };