fix: use keccak chain ID

apps/agent/src/config/schemas.ts

@@ -1,4 +1,4 @@
-import { Caip2ChainId, Caip2Utils } from "@ebo-agent/blocknumber";
+import { Caip2ChainId, Caip2Utils } from "@ebo-agent/shared";
 import { isAddress, isHex } from "viem";
 import { z } from "zod";
 

apps/agent/src/index.ts

@@ -1,7 +1,11 @@
 import { inspect } from "util";
 import { isNativeError } from "util/types";
-import { EboActorsManager, EboProcessor, ProtocolProvider } from "@ebo-agent/automated-dispute";
-import { DiscordNotifier } from "@ebo-agent/automated-dispute/src/services/index.js";
+import {
+    DiscordNotifier,
+    EboActorsManager,
+    EboProcessor,
+    ProtocolProvider,
+} from "@ebo-agent/automated-dispute";
 import { BlockNumberService } from "@ebo-agent/blocknumber";
 import { Logger } from "@ebo-agent/shared";
 

apps/agent/test/e2e/scenarios/01_happy_path/index.spec.ts

@@ -1,6 +1,11 @@
-import { EboActorsManager, EboProcessor, ProtocolProvider } from "@ebo-agent/automated-dispute";
-import { BlockNumberService, Caip2ChainId } from "@ebo-agent/blocknumber";
-import { Logger } from "@ebo-agent/shared";
+import {
+    EboActorsManager,
+    EboProcessor,
+    NotificationService,
+    ProtocolProvider,
+} from "@ebo-agent/automated-dispute";
+import { BlockNumberService } from "@ebo-agent/blocknumber";
+import { Caip2ChainId, Logger } from "@ebo-agent/shared";
 import { CreateServerReturnType } from "prool";
 import {
     Account,
@@ -89,7 +94,7 @@ describe.sequential("single agent", () => {
         await setUpProphet({
             accounts: accounts.map((account) => account.account),
             arbitratorAddress: ARBITRATOR_ADDRESS,
-            chainsToAdd: ["eip155:42161"],
+            chainsToAdd: [ARBITRUM_ID],
             anvilClient: createTestClient({
                 mode: "anvil",
                 transport: http(url),
@@ -163,6 +168,9 @@ describe.sequential("single agent", () => {
             blockNumberService,
             actorsManager,
             logger,
+            {
+                notifyError: vi.fn(),
+            } as unknown as NotificationService,
         );
 
         const anvilClient = createTestClient({

apps/agent/test/e2e/utils/prophet-e2e-scaffold/eboCore.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import { Caip2ChainId } from "@ebo-agent/blocknumber";
+import { Caip2ChainId } from "@ebo-agent/shared";
 import { execa } from "execa";
 import {
     Account,

packages/automated-dispute/src/exceptions/errorHandler.ts

@@ -1,7 +1,7 @@
 import { ILogger } from "@ebo-agent/shared";
 
 import { CustomContractError } from "../exceptions/index.js";
-import { NotificationService } from "../services/index.js";
+import { NotificationService } from "../interfaces/index.js";
 
 export class ErrorHandler {
     private notificationService: NotificationService;

packages/automated-dispute/src/external.ts

@@ -1,3 +1,4 @@
-export { EboProcessor, EboActorsManager } from "./services/index.js";
+export { EboProcessor, EboActorsManager, DiscordNotifier } from "./services/index.js";
+export type { NotificationService } from "./interfaces/index.js";
 export { ProtocolProvider } from "./providers/index.js";
 export type { AccountingModules } from "./types/index.js";

packages/automated-dispute/src/interfaces/index.ts

@@ -1,3 +1,4 @@
 export * from "./eboRegistry.js";
 export * from "./eboRegistryCommand.js";
 export * from "./protocolProvider.js";
+export * from "./notificationService.js";

packages/automated-dispute/src/interfaces/protocolProvider.ts

@@ -1,4 +1,4 @@
-import { Caip2ChainId } from "@ebo-agent/blocknumber";
+import { Caip2ChainId } from "@ebo-agent/shared";
 import { Address, Block } from "viem";
 
 import type {

packages/automated-dispute/src/providers/protocolProvider.ts

@@ -1,5 +1,4 @@
-import { Caip2ChainId } from "@ebo-agent/blocknumber";
-import { UnixTimestamp } from "@ebo-agent/shared";
+import { Caip2ChainId, UnixTimestamp } from "@ebo-agent/shared";
 import {
     AbiEvent,
     Address,

packages/automated-dispute/src/services/discordNotifier.ts

@@ -2,7 +2,7 @@ import { ILogger } from "@ebo-agent/shared";
 import { Client, IntentsBitField, TextChannel } from "discord.js";
 import { stringify } from "viem";
 
-import { NotificationService } from "./notificationService.js";
+import { NotificationService } from "../interfaces/index.js";
 
 interface DiscordNotifierConfig {
     discordBotToken: string;

packages/automated-dispute/src/services/eboActor.ts

@@ -1,5 +1,5 @@
-import { BlockNumberService, Caip2ChainId } from "@ebo-agent/blocknumber";
-import { Address, ILogger, UnixTimestamp } from "@ebo-agent/shared";
+import { BlockNumberService } from "@ebo-agent/blocknumber";
+import { Address, Caip2ChainId, Caip2Utils, ILogger, UnixTimestamp } from "@ebo-agent/shared";
 import { Mutex } from "async-mutex";
 import { Heap } from "heap-js";
 import { ContractFunctionRevertedError } from "viem";
@@ -29,14 +29,13 @@ import {
     ResponseNotFound,
     UnknownEvent,
 } from "../exceptions/index.js";
-import { EboRegistry, EboRegistryCommand } from "../interfaces/index.js";
+import { EboRegistry, EboRegistryCommand, NotificationService } from "../interfaces/index.js";
 import { ProtocolProvider } from "../providers/index.js";
 import {
     AddDispute,
     AddRequest,
     AddResponse,
     FinalizeRequest,
-    NotificationService,
     UpdateDisputeStatus,
 } from "../services/index.js";
 import { ActorRequest } from "../types/index.js";
@@ -506,7 +505,14 @@ export class EboActor {
      * @param event `RequestCreated` event
      */
     private async onRequestCreated(event: EboEvent<"RequestCreated">): Promise<void> {
-        const { chainId } = event.metadata;
+        const { chainId: hashedChainId } = event.metadata;
+        const chainId = Caip2Utils.findByHash(hashedChainId);
+
+        if (chainId === undefined) {
+            this.logger.error(`Unsupported chain hash ${hashedChainId}`);
+
+            return;
+        }
 
         try {
             await this.proposeResponse(chainId);

packages/automated-dispute/src/services/eboActorsManager.ts

@@ -3,11 +3,11 @@ import { Address, ILogger } from "@ebo-agent/shared";
 import { Mutex } from "async-mutex";
 
 import { RequestAlreadyHandled } from "../exceptions/index.js";
+import { NotificationService } from "../interfaces/index.js";
 import { ProtocolProvider } from "../providers/protocolProvider.js";
 import { ActorRequest, RequestId } from "../types/index.js";
 import { EboActor } from "./eboActor.js";
 import { EboMemoryRegistry } from "./eboRegistry/eboMemoryRegistry.js";
-import { NotificationService } from "./notificationService.js";
 
 export class EboActorsManager {
     private readonly requestActorMap: Map<RequestId, EboActor>;

packages/automated-dispute/src/services/eboProcessor.ts

@@ -1,10 +1,11 @@
 import { isNativeError } from "util/types";
-import { BlockNumberService, Caip2ChainId } from "@ebo-agent/blocknumber";
-import { Address, EBO_SUPPORTED_CHAIN_IDS, ILogger, UnixTimestamp } from "@ebo-agent/shared";
+import { BlockNumberService } from "@ebo-agent/blocknumber";
+import { Address, Caip2ChainId, Caip2Utils, ILogger, UnixTimestamp } from "@ebo-agent/shared";
 import { Block } from "viem";
 
 import { PendingModulesApproval, ProcessorAlreadyStarted } from "../exceptions/index.js";
 import { isRequestCreatedEvent } from "../guards.js";
+import { NotificationService } from "../interfaces/index.js";
 import { ProtocolProvider } from "../providers/index.js";
 import {
     alreadyDeletedActorWarning,
@@ -20,7 +21,6 @@ import {
     RequestId,
 } from "../types/index.js";
 import { EboActorsManager } from "./eboActorsManager.js";
-import { NotificationService } from "./notificationService.js";
 
 const DEFAULT_MS_BETWEEN_CHECKS = 10 * 60 * 1000; // 10 minutes
 
@@ -284,12 +284,16 @@ export class EboProcessor {
         if (actor) return actor;
 
         if (firstEvent && isRequestCreatedEvent(firstEvent)) {
-            const chainId = firstEvent.metadata.chainId;
+            const hashedChainId = firstEvent.metadata.chainId;
+            const chainId = Caip2Utils.findByHash(hashedChainId);
+
+            if (chainId) {
+                const requestId = Address.normalize(firstEvent.requestId) as RequestId;
+                const epoch = firstEvent.metadata.epoch;
 
-            if (this.isChainSupported(chainId)) {
                 this.logger.info(`Creating a new EboActor to handle request ${requestId}...`);
 
-                return this.createNewActor(firstEvent);
+                return this.createNewActor(requestId, epoch, chainId);
             } else {
                 this.logger.warn(`Chain ${chainId} not supported by the agent. Skipping...`);
 
@@ -306,28 +310,13 @@ export class EboProcessor {
         }
     }
 
-    /**
-     * Returns true if the CAIP2 compliant chain ID is supported by the EBO agent.
-     *
-     * @param chainId CAIP2 chain ID
-     * @returns true if the chain is supported, otherwise false
-     */
-    private isChainSupported(chainId: Caip2ChainId): boolean {
-        return EBO_SUPPORTED_CHAIN_IDS.includes(chainId);
-    }
-
     /**
      * Create a new actor based on the data provided by a `RequestCreated` event.
      *
-     * @param event a `RequestCreated` event
      * @returns a new `EboActor` instance, `null` if the actor was not created
      */
-    private createNewActor(event: EboEvent<"RequestCreated">) {
-        const actorRequest: ActorRequest = {
-            id: Address.normalize(event.requestId) as RequestId,
-            epoch: event.metadata.epoch,
-            chainId: event.metadata.chainId,
-        };
+    private createNewActor(id: RequestId, epoch: bigint, chainId: Caip2ChainId) {
+        const actorRequest: ActorRequest = { id, epoch, chainId };
 
         const actor = this.actorsManager.createActor(
             actorRequest,
@@ -404,6 +393,9 @@ export class EboProcessor {
                     this.logger.error(
                         `Could not create a request for epoch ${epoch} and chain ${chain}.`,
                     );
+
+                    this.logger.error(err as Error);
+
                     await this.notifier.notifyError(err as Error, {
                         message: `Could not create a request for epoch ${epoch} and chain ${chain}.`,
                         epoch,

packages/automated-dispute/src/services/eboRegistry/commands/addRequest.ts

@@ -1,3 +1,6 @@
+import { UnsupportedChain } from "@ebo-agent/blocknumber";
+import { Caip2Utils } from "@ebo-agent/shared";
+
 import { CommandAlreadyRun, CommandNotRun } from "../../../exceptions/index.js";
 import { EboRegistry, EboRegistryCommand } from "../../../interfaces/index.js";
 import { ProtocolProvider } from "../../../providers/index.js";
@@ -17,9 +20,14 @@ export class AddRequest implements EboRegistryCommand {
     ): AddRequest {
         // @ts-expect-error: must fetch request differently
         const eventRequest = event.metadata.request;
+        const chainId = Caip2Utils.findByHash(event.metadata.chainId);
+
+        if (chainId === undefined) throw new UnsupportedChain(event.metadata.chainId);
+
         const request: Request = {
             id: event.requestId,
-            chainId: event.metadata.chainId,
+            // TODO: move chainId and epoch into decodedData + add request property to it
+            chainId: chainId,
             epoch: event.metadata.epoch,
             createdAt: {
                 timestamp: event.timestamp,

packages/automated-dispute/src/services/index.ts

@@ -2,5 +2,4 @@ export * from "./eboActor.js";
 export * from "./eboActorsManager.js";
 export * from "./eboProcessor.js";
 export * from "./eboRegistry/index.js";
-export * from "./notificationService.js";
 export * from "./discordNotifier.js";

packages/automated-dispute/src/types/actorRequest.ts

@@ -1,4 +1,4 @@
-import { Caip2ChainId } from "@ebo-agent/blocknumber";
+import { Caip2ChainId } from "@ebo-agent/shared";
 
 import { RequestId } from "./prophet.js";
 

packages/automated-dispute/src/types/events.ts

@@ -1,4 +1,3 @@
-import { Caip2ChainId } from "@ebo-agent/blocknumber";
 import { UnixTimestamp } from "@ebo-agent/shared";
 import { Address, Hex, Log } from "viem";
 
@@ -20,7 +19,7 @@ export interface ResponseProposed {
 
 export interface RequestCreated {
     epoch: bigint;
-    chainId: Caip2ChainId;
+    chainId: Hex; // keccak256 CAIP-2 chain ID
     requestId: RequestId;
 }
 

packages/automated-dispute/src/types/prophet.ts

@@ -1,5 +1,4 @@
-import { Caip2ChainId } from "@ebo-agent/blocknumber";
-import { Branded, NormalizedAddress, UnixTimestamp } from "@ebo-agent/shared";
+import { Branded, Caip2ChainId, NormalizedAddress, UnixTimestamp } from "@ebo-agent/shared";
 import { Address, Hex } from "viem";
 
 export type RequestId = Branded<NormalizedAddress, "RequestId">;

packages/automated-dispute/tests/guards.spec.ts

@@ -1,4 +1,4 @@
-import { Caip2ChainId } from "@ebo-agent/blocknumber";
+import { Caip2ChainId } from "@ebo-agent/shared";
 import { describe, expect, it } from "vitest";
 
 import { isRequestCreatedEvent } from "../src/guards.js";

packages/automated-dispute/tests/services/eboActor.spec.ts

@@ -1,5 +1,5 @@
 import { UnixTimestamp } from "@ebo-agent/shared";
-import { Abi, ContractFunctionRevertedError, encodeErrorResult } from "viem";
+import { Abi, ContractFunctionRevertedError, encodeErrorResult, keccak256, toHex } from "viem";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 import {
@@ -25,7 +25,7 @@ describe("EboActor", () => {
         timestamp: BigInt(Date.UTC(2024, 0, 1, 0, 0, 0) / 1000) as UnixTimestamp,
         requestId: request.id,
         metadata: {
-            chainId: request.chainId,
+            chainId: keccak256(toHex(request.chainId)),
             epoch: request.epoch,
             requestId: request.id,
             request: request.prophetData,
@@ -452,7 +452,7 @@ describe("EboActor", () => {
                 timestamp: BigInt(Date.UTC(2024, 0, 1, 0, 0, 0) / 1000) as UnixTimestamp,
                 requestId: request.id,
                 metadata: {
-                    chainId: request.chainId,
+                    chainId: keccak256(toHex(request.chainId)),
                     epoch: request.epoch,
                     requestId: request.id,
                     request: request.prophetData,

packages/automated-dispute/tests/services/eboActor/fixtures.ts

@@ -24,12 +24,14 @@ export const DEFAULT_MOCKED_PROTOCOL_CONTRACTS: ProtocolContractsAddresses = {
 
 export const DEFAULT_MOCKED_RESPONSE_DATA: Response = {
     id: "0x1234567890123456789012345678901234567890" as ResponseId,
-    createdAt: 1625097600n,
+    createdAt: {
+        timestamp: 1625097600n as UnixTimestamp,
+        blockNumber: 1n,
+        logIndex: 0,
+    },
     decodedData: {
         response: {
-            chainId: "eip155:1",
             block: 123456n,
-            epoch: 1n,
         },
     },
     prophetData: {

packages/automated-dispute/tests/services/eboActor/onRequestCreated.spec.ts

@@ -1,5 +1,5 @@
-import { Caip2ChainId } from "@ebo-agent/blocknumber";
-import { ILogger } from "@ebo-agent/shared";
+import { Caip2ChainId, ILogger, UnixTimestamp } from "@ebo-agent/shared";
+import { keccak256, toHex } from "viem";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 import { ResponseAlreadyProposed } from "../../../src/exceptions/index.js";
@@ -28,7 +28,7 @@ describe("EboActor", () => {
             const protocolEpoch: Epoch = {
                 number: request.epoch,
                 firstBlockNumber: 1n,
-                startTimestamp: BigInt(Date.UTC(2024, 1, 1, 0, 0, 0, 0)),
+                startTimestamp: BigInt(Date.UTC(2024, 1, 1, 0, 0, 0, 0)) as UnixTimestamp,
             };
 
             const requestCreatedEvent: EboEvent<"RequestCreated"> = {
@@ -37,7 +37,7 @@ describe("EboActor", () => {
                 logIndex: 1,
                 name: "RequestCreated",
                 metadata: {
-                    chainId: indexedChainId,
+                    chainId: keccak256(toHex(indexedChainId)),
                     epoch: protocolEpoch.number,
                     requestId: requestId,
                     request: request.prophetData,
@@ -90,8 +90,6 @@ describe("EboActor", () => {
                         requestId: requestCreatedEvent.metadata.requestId,
                         response: ProtocolProvider.encodeResponse({
                             block: indexedEpochBlockNumber,
-                            chainId: requestCreatedEvent.metadata.chainId,
-                            epoch: protocolEpoch.number,
                         }),
                     }),
                 );