feat: implement deposit v3 events

src/modules/configuration/index.ts

@@ -63,6 +63,7 @@ export const configValues = () => ({
       324: process.env.WEB3_NODE_URL_324,
       8453: process.env.WEB3_NODE_URL_8453,
       84531: process.env.WEB3_NODE_URL_84531,
+      84532: process.env.WEB3_NODE_URL_84532,
       11155420: process.env.WEB3_NODE_URL_11155420,
       11155111: process.env.WEB3_NODE_URL_11155111,
     },
@@ -179,10 +180,18 @@ export const configValues = () => ({
           acrossVersion: AcrossContractsVersion.V2_5,
         },
       ],
+      [ChainIds.baseSepolia]: [
+        {
+          address: "0x82B564983aE7274c86695917BBf8C99ECb6F0F8F",
+          startBlockNumber: 6082004,
+          abi: JSON.stringify(SpokePoolV3Abi),
+          acrossVersion: AcrossContractsVersion.V3,
+        },
+      ],
       [ChainIds.sepolia]: [
         {
-          address: "0x622d59F3dbD28fcFE746E0d2f83ebdC286E89A3c",
-          startBlockNumber: 5146129,
+          address: "0x5ef6C01E11889d86803e0B23e3cB3F9E9d97B662",
+          startBlockNumber: 5288470,
           abi: JSON.stringify(SpokePoolV3Abi),
           acrossVersion: AcrossContractsVersion.V3,
         },

src/modules/deposit/model/deposit.entity.ts

@@ -208,13 +208,13 @@ export class Deposit {
   acxUsdPrice?: string;
 
   @Column({ nullable: true })
-  fillDeadline: Date;
+  fillDeadline?: Date;
 
   @Column({ nullable: true })
-  exclusivityDeadline: Date;
+  exclusivityDeadline?: Date;
 
   @Column({ nullable: true })
-  relayer: string;
+  relayer?: string;
 
   @CreateDateColumn()
   createdAt: Date;

src/modules/scraper/adapter/messaging/BlocksEventsConsumer.ts

@@ -230,7 +230,7 @@
 
     for (const event of events) {
       const { address } = event;
       const { acrossVersion } = this.appConfig.values.web3.spokePoolContracts[chainId].filter(
         (contract) => contract.address === address,
       )[0];
 
@@ -392,6 +392,9 @@
 
     const wei = BigNumber.from(10).pow(18);
     const feePct = outputAmount.mul(wei).div(inputAmount);
+    let exclusivityDeadlineDate = undefined;
+
+    if (exclusivityDeadline > 0) exclusivityDeadlineDate = new Date(exclusivityDeadline * 1000);
 
     return this.depositRepository.create({
       depositId,
@@ -407,14 +410,13 @@
       depositorAddr: depositor,
       recipientAddr: recipient,
       depositRelayerFeePct: feePct.toString(),
-      // what happens with relayer fee?
       initialRelayerFeePct: feePct.toString(),
       //relayerFeePct = realizedLpFeePct + (gasFeePct + capitalCostFeePct)(old usage of relayerFeePct)
       // v3 properties
       outputAmount: outputAmount.toString(),
       outputTokenAddress: outputToken,
       fillDeadline: new Date(fillDeadline * 1000),
-      exclusivityDeadline: new Date(exclusivityDeadline * 1000),
+      exclusivityDeadline: exclusivityDeadlineDate,
       relayer,
     });
   }

src/modules/scraper/adapter/messaging/FeeBreakdownConsumer.ts

@@ -9,7 +9,7 @@ import { GasFeesService } from "../gas-fees/gas-fees-service";
 import { ScraperQueuesService } from "../../service/ScraperQueuesService";
 import { FeeBreakdownQueueMessage, OpRebateRewardMessage, ScraperQueue } from ".";
 import { Deposit, DepositFillTx, DepositFillTx2, DepositFillTxV3 } from "../../../deposit/model/deposit.entity";
-import { deriveRelayerFeeComponents, makePctValuesCalculator, toWeiPct } from "../../utils";
+import { deriveRelayerFeeComponents, fixedPointAdjustment, makePctValuesCalculator, toWeiPct } from "../../utils";
 import { AcrossContractsVersion } from "../../../web3/model/across-version";
 
 @Processor(ScraperQueue.FeeBreakdown)
@@ -74,17 +74,20 @@ export class FeeBreakdownConsumer {
 
     const { feeUsd, fee } = await this.gasFeesService.getFillTxNetworkFee(deposit.destinationChainId, fillTx.hash);
     const relayGasFeeUsd = feeUsd;
-    const relayGasFeeAmount = fee;
+    const relayGasFeeAmount = fixedPointAdjustment.multipliedBy(fee).toFixed(0);
 
     // Bridge fee computation
     const wei = new BigNumber(10).pow(18);
     const outputWeiPct = toWeiPct(new BigNumber(fillTx.updatedOutputAmount).dividedBy(deposit.amount).toString());
     const bridgeFeePct = wei.minus(outputWeiPct);
-    const inputAmountUsd = new BigNumber(deposit.amount).multipliedBy(deposit.price.usd);
-    const outputAmountUsd = new BigNumber(deposit.outputAmount).multipliedBy(deposit.outputTokenPrice.usd);
+    const inputAmountUsd = new BigNumber(deposit.amount)
+      .multipliedBy(deposit.price.usd)
+      .dividedBy(new BigNumber(10).pow(deposit.token.decimals));
+    const outputAmountUsd = new BigNumber(deposit.outputAmount)
+      .multipliedBy(deposit.outputTokenPrice.usd)
+      .dividedBy(new BigNumber(10).pow(deposit.outputToken.decimals));
     const bridgeFeeUsd = inputAmountUsd.minus(outputAmountUsd);
-    const bridgeFeeAmount = bridgeFeeUsd.dividedBy(deposit.price.usd);
-    const relayGasFeePct = new BigNumber(relayGasFeeAmount).dividedBy(deposit.amount);
+    const bridgeFeeAmount = bridgeFeeUsd.multipliedBy(fixedPointAdjustment).dividedBy(deposit.price.usd);
     const feeBreakdown = {
       lpFeeUsd: undefined,
       lpFeePct: undefined,
@@ -93,7 +96,7 @@ export class FeeBreakdownConsumer {
       relayCapitalFeePct: undefined,
       relayCapitalFeeAmount: undefined,
       relayGasFeeUsd,
-      relayGasFeePct: relayGasFeePct.toString(),
+      relayGasFeePct: undefined,
       relayGasFeeAmount,
       totalBridgeFeeUsd: bridgeFeeUsd.toString(),
       totalBridgeFeePct: bridgeFeePct.toString(),

src/modules/scraper/adapter/messaging/TokenDetailsConsumer.ts

@@ -3,19 +3,22 @@ import { Logger } from "@nestjs/common";
 import { Job } from "bull";
 import { InjectRepository } from "@nestjs/typeorm";
 import { Repository } from "typeorm";
+import { ethers } from "ethers";
 
 import { ScraperQueue, TokenDetailsQueueMessage, TokenPriceQueueMessage } from ".";
 import { Deposit } from "../../../deposit/model/deposit.entity";
 import { EthProvidersService } from "../../../web3/services/EthProvidersService";
 import { ScraperQueuesService } from "../../service/ScraperQueuesService";
 import { Token } from "../../../web3/model/token.entity";
+import { ChainIds } from "../../../web3/model/ChainId";
 
 @Processor(ScraperQueue.TokenDetails)
 export class TokenDetailsConsumer {
   private logger = new Logger(TokenDetailsConsumer.name);
 
   constructor(
     @InjectRepository(Deposit) private depositRepository: Repository<Deposit>,
+    @InjectRepository(Token) private tokenRepository: Repository<Token>,
     private ethProvidersService: EthProvidersService,
     private scraperQueuesService: ScraperQueuesService,
   ) {}
@@ -25,21 +28,34 @@ export class TokenDetailsConsumer {
     const { depositId } = job.data;
     const deposit = await this.depositRepository.findOne({ where: { id: depositId } });
     if (!deposit) return;
-    const { sourceChainId, tokenAddr, destinationChainId, outputTokenAddress } = deposit;
+    const { sourceChainId, tokenAddr, destinationChainId } = deposit;
     const inputToken = await this.ethProvidersService.getCachedToken(sourceChainId, tokenAddr);
+
+    if (!inputToken) throw new Error(`Input token not found for deposit ${depositId}`);
+
     let outputToken: Token | undefined = undefined;
 
-    if (outputTokenAddress === "0x0000000000000000000000000000000000000000") return;
-    if (outputTokenAddress) {
-      outputToken = await this.ethProvidersService.getCachedToken(destinationChainId, outputTokenAddress);
+    if (deposit.outputTokenAddress) {
+      if (deposit.outputTokenAddress === ethers.constants.AddressZero) {
+        const outputTokenSymbol =
+          destinationChainId === ChainIds.base && inputToken.symbol === "USDC" ? "USDbC" : inputToken.symbol;
+        outputToken = await this.tokenRepository.findOne({
+          where: { chainId: destinationChainId, symbol: outputTokenSymbol },
+        });
+      } else {
+        outputToken = await this.ethProvidersService.getCachedToken(destinationChainId, deposit.outputTokenAddress);
+      }
     }
 
-    if (!inputToken) throw new Error(`Input token not found for deposit ${depositId}`);
-    if (outputTokenAddress && !outputToken) throw new Error(`Output token not found for deposit ${depositId}`);
+    if (deposit.outputTokenAddress && !outputToken) throw new Error(`Output token not found for deposit ${depositId}`);
 
     await this.depositRepository.update(
       { id: deposit.id },
-      { tokenId: inputToken.id, outputTokenId: outputToken ? outputToken.id : null },
+      {
+        tokenId: inputToken.id,
+        outputTokenId: outputToken ? outputToken.id : null,
+        outputTokenAddress: outputToken ? outputToken.address : deposit.outputTokenAddress,
+      },
     );
     await this.scraperQueuesService.publishMessage<TokenPriceQueueMessage>(ScraperQueue.TokenPrice, {
       depositId,

src/modules/scraper/module.ts

@@ -49,6 +49,7 @@ import { QueueJobCount } from "../monitoring/model/QueueJobCount.entity";
 import { MerkleDistributorClaim } from "../airdrop/model/merkle-distributor-claim.entity";
 import { MerkleDistributorWindow } from "../airdrop/model/merkle-distributor-window.entity";
 import { SpeedUpEventsV3Consumer } from "./adapter/messaging/SpeedUpEventsV3Consumer";
+import { Token } from "../web3/model/token.entity";
 
 @Module({})
 export class ScraperModule {
@@ -101,6 +102,7 @@ export class ScraperModule {
           QueueJobCount,
           MerkleDistributorClaim,
           MerkleDistributorWindow,
+          Token,
         ]),
         MarketPriceModule.forRoot(moduleOptions),
         HttpModule,

src/modules/web3/model/ChainId.ts

@@ -19,6 +19,7 @@ export const ChainIds = {
   zkSyncTestnet: 280,
   base: 8453,
   baseGoerli: 84531,
+  baseSepolia: 84532,
 };
 
 export const ChainIdToName = Object.entries(ChainIds).reduce((idToName, entry) => {

src/utils.ts

@@ -46,6 +46,11 @@ export const chainIdToInfo = {
     chainId: ChainIds.base,
     nativeSymbol: "eth",
   },
+  [ChainIds.baseSepolia]: {
+    name: "Base Sepolia",
+    chainId: ChainIds.baseSepolia,
+    nativeSymbol: "eth",
+  },
   [ChainIds.zkSyncMainnet]: {
     name: "zkSync",
     chainId: ChainIds.zkSyncMainnet,