relayer: use auto-generated types as interfaces

beamer-bridge · May 31, 2023 · b459360 · b459360
1 parent 2188936
commit b459360
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 23 deletions.
diff --git a/relayer/package.json b/relayer/package.json
@@ -18,7 +18,7 @@
     "lint:fix": "eslint --ext .js,.ts --ignore-path .gitignore --fix .",
     "test:unit": "jest unit",
     "test:coverage": "jest --collect-coverage",
-    "generate-types": "typechain --target=ethers-v5 ./node_modules/@beamer-bridge/deployments/dist/abis/mainnet/**.json --out-dir=./types-gen/contracts/",
+    "generate-types": "typechain --target=ethers-v5 --glob='./node_modules/@beamer-bridge/deployments/dist/abis/mainnet/!(deployment).json' --out-dir=./types-gen/contracts/",
     "postinstall": "yarn generate-types"
   },
   "dependencies": {

diff --git a/relayer/src/common/events/FillInvalidated.ts b/relayer/src/common/events/FillInvalidated.ts
@@ -1,7 +1,6 @@
 import type { Log } from "@ethersproject/providers";
-import { Interface } from "ethers/lib/utils";
 
-import { abis } from "../../deployments";
+import { FillManager__factory } from "../../../types-gen/contracts/beamer/factories/FillManager__factory";
 import { isUndefined } from "../util";
 
 interface Result extends ReadonlyArray<unknown> {
@@ -21,7 +20,7 @@ export const isValidFillInvalidatedEvent = (data: Result): data is FillInvalidat
 };
 
 export const parseFillInvalidatedEvent = (logs: Log[]): FillInvalidatedEventData | null => {
-  const iface = new Interface(abis.FillManager);
+  const iface = FillManager__factory.createInterface();
 
   for (const log of logs) {
     try {

diff --git a/relayer/src/common/events/RequestFilled.ts b/relayer/src/common/events/RequestFilled.ts
@@ -1,8 +1,7 @@
 import type { Log } from "@ethersproject/providers";
 import type { BigNumber } from "ethers";
-import { Interface } from "ethers/lib/utils";
 
-import { abis } from "../../deployments";
+import { FillManager__factory } from "../../../types-gen/contracts/beamer/factories/FillManager__factory";
 import { isUndefined } from "../util";
 
 interface Result extends ReadonlyArray<unknown> {
@@ -33,7 +32,7 @@ export const isValidRequestFilledEventData = (data: Result): data is RequestFill
 };
 
 export const parseRequestFilledEvent = (logs: Log[]): RequestFilledEventData | null => {
-  const iface = new Interface(abis.FillManager);
+  const iface = FillManager__factory.createInterface();
 
   for (const log of logs) {
     try {

diff --git a/relayer/src/common/events/polygon-zkevm/BridgeEvent.ts b/relayer/src/common/events/polygon-zkevm/BridgeEvent.ts
@@ -1,7 +1,7 @@
 import type { Log } from "@ethersproject/providers";
 import type { BigNumber } from "ethers";
 
-import { PolygonZKEvmBridge__factory } from "../../../../types-gen/contracts";
+import { PolygonZKEvmBridge__factory } from "../../../../types-gen/contracts/external/";
 import { isUndefined } from "../../util";
 
 interface Result extends ReadonlyArray<unknown> {

diff --git a/relayer/src/deployments.ts b/relayer/src/deployments.ts
@@ -1,4 +1,3 @@
-import { abi as FillManagerABI } from "@beamer-bridge/deployments/dist/abis/mainnet/FillManager.json";
 import { chain as chainEthereumGoerli } from "@beamer-bridge/deployments/dist/artifacts/goerli/5-ethereum.deployment.json";
 import { base as baseArbitrumGoerli } from "@beamer-bridge/deployments/dist/artifacts/goerli/421613-arbitrum.deployment.json";
 import { base as baseGoerli } from "@beamer-bridge/deployments/dist/artifacts/goerli/base.deployment.json";
@@ -25,7 +24,3 @@ export const contractsMeta = {
     RESOLVER_DEPLOY_BLOCK_NUMBER: baseMainnet.Resolver.deployment_block,
   },
 };
-
-export const abis = {
-  FillManager: FillManagerABI,
-};
diff --git a/relayer/src/services/arbitrum.ts b/relayer/src/services/arbitrum.ts
@@ -11,7 +11,7 @@ import type { Signer } from "@ethersproject/abstract-signer";
 import { BigNumber } from "ethers";
 import { readFileSync } from "fs";
 
-import { ArbitrumL1Messenger__factory } from "../../types-gen/contracts";
+import { ArbitrumL1Messenger__factory } from "../../types-gen/contracts/beamer";
 import { addresses } from "../deployments";
 import type { TransactionHash } from "./types";
 import { BaseRelayerService } from "./types";

diff --git a/relayer/src/services/ethereum.ts b/relayer/src/services/ethereum.ts
@@ -1,7 +1,7 @@
 import { BigNumber } from "ethers";
 import { keccak256 } from "ethers/lib/utils";
 
-import { EthereumL2Messenger__factory, Resolver__factory } from "../../types-gen/contracts";
+import { EthereumL2Messenger__factory, Resolver__factory } from "../../types-gen/contracts/beamer";
 import { parseFillInvalidatedEvent } from "../common/events/FillInvalidated";
 import { parseRequestFilledEvent } from "../common/events/RequestFilled";
 import { addresses, contractsMeta } from "../deployments";
@@ -78,16 +78,17 @@ export class EthereumRelayerService extends BaseRelayerService {
     filler: string,
     fillChainId: BigNumber,
     resolverAddress: string,
-  ): Promise<string | null> {
+  ): Promise<string | undefined> {
     const resolver = Resolver__factory.connect(resolverAddress, this.l1Wallet);
     const currentBlock = await this.l1Wallet.provider.getBlock("latest");
     let currentBlockNumber = currentBlock.number;
     const resolverDeployBlockNumber =
       CONTRACTS_DATA[await this.getL1ChainId()].RESOLVER_DEPLOY_BLOCK_NUMBER;
 
+    const filter = resolver.filters.Resolution();
     while (currentBlockNumber > resolverDeployBlockNumber) {
       const events = await resolver.queryFilter(
-        "Resolution" as unknown,
+        filter,
         currentBlockNumber - FILTER_BLOCKS_PER_ITERATION,
         currentBlockNumber,
       );
@@ -110,7 +111,7 @@ export class EthereumRelayerService extends BaseRelayerService {
       currentBlockNumber -= FILTER_BLOCKS_PER_ITERATION;
     }
 
-    return null;
+    return undefined;
   }
 
   private createMessageHash(

diff --git a/relayer/src/services/polygon-zkevm.ts b/relayer/src/services/polygon-zkevm.ts
@@ -1,7 +1,7 @@
 import type { TransactionReceipt } from "@ethersproject/abstract-provider";
 import { readFileSync } from "fs";
 
-import { PolygonZKEvmBridge__factory } from "../../types-gen/contracts";
+import { PolygonZKEvmBridge__factory } from "../../types-gen/contracts/external/factories/";
 import { parseBridgeEvent } from "../common/events/polygon-zkevm/BridgeEvent";
 import { sleep } from "../common/util";
 import type { TransactionHash } from "./types";
@@ -40,7 +40,7 @@ export class PolygonZKEvmRelayerService extends BaseRelayerService {
   async getMessageMerkleProof(
     depositCount: number,
     originNetwork: number,
-  ): Promise<MerkleProofResponse | undefined> {
+  ): Promise<MerkleProofResponse> {
     const networkConfig = await this.getNetworkConfig();
 
     const merkleProofUrl = new URL(networkConfig.bridgeServiceUrl + this.MERKLE_PROOF_ENDPOINT);
@@ -96,9 +96,7 @@ export class PolygonZKEvmRelayerService extends BaseRelayerService {
 
   checkTransactionValidity(transactionReceipt: TransactionReceipt, networkName: string): void {
     if (!transactionReceipt) {
-      throw new Error(
-        `Transaction "${transactionReceipt.transactionHash}" cannot be found on ${networkName}...`,
-      );
+      throw new Error(`Transaction cannot be found on ${networkName}...`);
     }
     if (!transactionReceipt.status) {
       throw new Error(