Merge remote-tracking branch 'origin/dev' into fix/approved-modules

defi-wonderland · Oct 28, 2024 · b451286 · b451286
2 parents 05d9b28 + df1481c
commit b451286
Show file tree

Hide file tree

Showing 6 changed files with 140 additions and 36 deletions.
diff --git a/apps/agent/src/index.ts b/apps/agent/src/index.ts
@@ -14,18 +14,19 @@ import { config } from "./config/index.js";
 const logger = Logger.getInstance();
 
 const main = async (): Promise<void> => {
-    const protocolProvider = new ProtocolProvider(
-        config.protocolProvider.rpcsConfig,
-        config.protocolProvider.contracts,
-        config.protocolProvider.privateKey,
-    );
-
     const blockNumberService = new BlockNumberService(
         config.blockNumberService.chainRpcUrls,
         config.blockNumberService.blockmetaConfig,
         logger,
     );
 
+    const protocolProvider = new ProtocolProvider(
+        config.protocolProvider.rpcsConfig,
+        config.protocolProvider.contracts,
+        config.protocolProvider.privateKey,
+        blockNumberService,
+    );
+
     const actorsManager = new EboActorsManager();
 
     const notifier = await DiscordNotifier.create(

diff --git a/packages/automated-dispute/src/exceptions/blockNumberServiceRequired.exception.ts b/packages/automated-dispute/src/exceptions/blockNumberServiceRequired.exception.ts
@@ -0,0 +1,6 @@
+export class BlockNumberServiceRequiredError extends Error {
+    constructor() {
+        super("BlockNumberService is required to get the current epoch");
+        this.name = "BlockNumberServiceRequiredError";
+    }
+}
diff --git a/packages/automated-dispute/src/exceptions/index.ts b/packages/automated-dispute/src/exceptions/index.ts
@@ -16,5 +16,6 @@ export * from "./invalidBlockRangeError.exception.js";
 export * from "./unknownCustomError.exception.js";
 export * from "./invalidBlockHash.exception.js";
 export * from "./unknownDisputeStatus.exception.js";
+export * from "./blockNumberServiceRequired.exception.js";
 export * from "./customContractError.js";
 export * from "./errorFactory.js";
diff --git a/packages/automated-dispute/src/providers/protocolProvider.ts b/packages/automated-dispute/src/providers/protocolProvider.ts
@@ -1,4 +1,4 @@
-import { UnsupportedChain } from "@ebo-agent/blocknumber";
+import { BlockNumberService, UnsupportedChain } from "@ebo-agent/blocknumber";
 import { Caip2ChainId, HexUtils, UnixTimestamp } from "@ebo-agent/shared";
 import {
     Account,
@@ -42,6 +42,7 @@ import {
     oracleAbi,
 } from "../abis/index.js";
 import {
+    BlockNumberServiceRequiredError,
     ErrorFactory,
     InvalidBlockHashError,
     InvalidBlockRangeError,
@@ -75,6 +76,7 @@ export class ProtocolProvider implements IProtocolProvider {
     private l1ReadClient: PublicClient<FallbackTransport<HttpTransport[]>>;
     private l2ReadClient: PublicClient<FallbackTransport<HttpTransport[]>>;
     private l2WriteClient: WalletClient<FallbackTransport<HttpTransport[]>, Chain, Account>;
+    private readonly blockNumberService?: BlockNumberService;
 
     private oracleContract: GetContractReturnType<
         typeof oracleAbi,
@@ -111,18 +113,21 @@ export class ProtocolProvider implements IProtocolProvider {
      * @param rpcConfig The configuration for RPC connections including URLs, timeout, retry interval, and transaction receipt confirmations
      * @param contracts The addresses of the protocol contracts that will be instantiated
      * @param privateKey The private key of the account that will be used to interact with the contracts
+     * @param blockNumberService The service that will be used to fetch block numbers
      */
     constructor(
         private readonly rpcConfig: ProtocolRpcConfig,
         contracts: ProtocolContractsAddresses,
         privateKey: Hex,
+        blockNumberService?: BlockNumberService,
     ) {
         const l1Chain = this.getViemChain(rpcConfig.l1.chainId);
         const l2Chain = this.getViemChain(rpcConfig.l2.chainId);
 
         this.l1ReadClient = this.createReadClient(rpcConfig.l1, l1Chain);
         this.l2ReadClient = this.createReadClient(rpcConfig.l2, l2Chain);
         this.l2WriteClient = this.createWriteClient(rpcConfig.l2, l2Chain, privateKey);
+        this.blockNumberService = blockNumberService;
 
         // Instantiate all the protocol contracts
         this.oracleContract = getContract({
@@ -267,6 +272,10 @@ export class ProtocolProvider implements IProtocolProvider {
      * @returns {Promise<Epoch>} The current epoch, its block number, and its timestamp.
      */
     async getCurrentEpoch(): Promise<Epoch> {
+        if (!this.blockNumberService) {
+            throw new BlockNumberServiceRequiredError();
+        }
+
         const [epoch, epochFirstBlockNumber] = await Promise.all([
             this.epochManagerContract.read.currentEpoch(),
             this.epochManagerContract.read.currentEpochBlock(),
@@ -276,10 +285,18 @@ export class ProtocolProvider implements IProtocolProvider {
             blockNumber: epochFirstBlockNumber,
         });
 
+        const startTimestamp = epochFirstBlock.timestamp as UnixTimestamp;
+
+        const l2ChainId = this.rpcConfig.l2.chainId;
+        const l2FirstBlockNumber = await this.blockNumberService.getEpochBlockNumber(
+            startTimestamp,
+            l2ChainId,
+        );
+
         return {
             number: epoch,
-            firstBlockNumber: epochFirstBlockNumber,
-            startTimestamp: epochFirstBlock.timestamp as UnixTimestamp,
+            firstBlockNumber: l2FirstBlockNumber,
+            startTimestamp: startTimestamp,
         };
     }
 

diff --git a/packages/automated-dispute/tests/mocks/eboProcessor.mocks.ts b/packages/automated-dispute/tests/mocks/eboProcessor.mocks.ts
@@ -1,9 +1,10 @@
-import { BlockNumberService, Caip2ChainId } from "@ebo-agent/blocknumber";
-import { ILogger } from "@ebo-agent/shared";
+import { BlockNumberService } from "@ebo-agent/blocknumber";
+import { Caip2ChainId, ILogger } from "@ebo-agent/shared";
 import { vi } from "vitest";
 
+import { NotificationService } from "../../src/index.js";
 import { ProtocolProvider } from "../../src/providers/index.js";
-import { EboProcessor, NotificationService } from "../../src/services";
+import { EboProcessor } from "../../src/services";
 import { EboActorsManager } from "../../src/services/index.js";
 import { AccountingModules } from "../../src/types/prophet.js";
 import {
@@ -20,6 +21,24 @@ export function buildEboProcessor(
     },
     notifier?: NotificationService,
 ) {
+    const blockNumberRpcUrls = new Map<Caip2ChainId, string[]>([
+        ["eip155:1" as Caip2ChainId, ["http://localhost:8539"]],
+    ]);
+
+    const blockNumberService = new BlockNumberService(
+        blockNumberRpcUrls,
+        {
+            baseUrl: new URL("http://localhost"),
+            bearerToken: "secret-token",
+            bearerTokenExpirationWindow: 10,
+            servicePaths: {
+                block: "/block",
+                blockByTime: "/blockbytime",
+            },
+        },
+        logger,
+    );
+
     const protocolProvider = new ProtocolProvider(
         {
             l1: {
@@ -39,23 +58,7 @@ export function buildEboProcessor(
         },
         DEFAULT_MOCKED_PROTOCOL_CONTRACTS,
         mockedPrivateKey,
-    );
-
-    const blockNumberRpcUrls = new Map<Caip2ChainId, string[]>([
-        ["eip155:1" as Caip2ChainId, ["http://localhost:8539"]],
-    ]);
-    const blockNumberService = new BlockNumberService(
-        blockNumberRpcUrls,
-        {
-            baseUrl: new URL("http://localhost"),
-            bearerToken: "secret-token",
-            bearerTokenExpirationWindow: 10,
-            servicePaths: {
-                block: "/block",
-                blockByTime: "/blockbytime",
-            },
-        },
-        logger,
+        blockNumberService,
     );
 
     const actorsManager = new EboActorsManager();