refactor: addContract and checkForAndPlaceOrder

cowprotocol · Sep 21, 2023 · be0666b · be0666b
1 parent eb43a53
commit be0666b
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 70 deletions.
diff --git a/src/addContract.ts b/src/addContract.ts
@@ -1,69 +1,63 @@
-import {
-  ActionFn,
-  Context,
-  Event,
-  TransactionEvent,
-  Log,
-} from "@tenderly/actions";
 import { BytesLike, ethers } from "ethers";
 
 import type {
   ComposableCoW,
   ComposableCoWInterface,
+  ConditionalOrderCreatedEvent,
   IConditionalOrder,
-} from "./types/ComposableCoW";
-import { ComposableCoW__factory } from "./types/factories/ComposableCoW__factory";
+  MerkleRootSetEvent,
+} from "./types/generated/ComposableCoW";
+import { ComposableCoW__factory } from "./types/generated/factories/ComposableCoW__factory";
 
 import {
   isComposableCowCompatible,
   handleExecutionError,
-  initContext,
   writeRegistry,
-  toChainId,
 } from "./utils";
-import { ChainContext, Owner, Proof, Registry } from "./model";
+import { Owner, Proof, Registry } from "./types/model";
+import { ChainWatcher } from "./modes";
 
 /**
  * Listens to these events on the `ComposableCoW` contract:
  * - `ConditionalOrderCreated`
  * - `MerkleRootSet`
- * @param context tenderly context
+ * @param chainWatcher chain watcher
  * @param event transaction event
  */
-export const addContract: ActionFn = async (context: Context, event: Event) => {
-  return _addContract(context, event).catch(handleExecutionError);
+export const addContract = async (
+  chainWatcher: ChainWatcher,
+  event: ConditionalOrderCreatedEvent
+) => {
+  return _addContract(chainWatcher, event).catch(handleExecutionError);
 };
 
-const _addContract: ActionFn = async (context: Context, event: Event) => {
-  const transactionEvent = event as TransactionEvent;
-  const tx = transactionEvent.hash;
+const _addContract = async (
+  context: ChainWatcher,
+  event: ConditionalOrderCreatedEvent
+) => {
   const composableCow = ComposableCoW__factory.createInterface();
-
-  const chainId = toChainId(transactionEvent.network);
-  const { provider } = await ChainContext.create(context, chainId);
-  const { registry } = await initContext("addContract", chainId, context);
+  const { chainContext, registry } = context;
+  const { provider } = chainContext;
 
   // Process the logs
   let hasErrors = false;
   let numContractsAdded = 0;
-  for (const log of transactionEvent.logs) {
-    // Do not process logs that are not from a `ComposableCoW`-compatible contract
-    // This is a *normal* case, if the contract is not `ComposableCoW`-compatible
-    // then we do not need to do anything, and therefore don't flag as an error.
-    if (!isComposableCowCompatible(await provider.getCode(log.address))) {
-      continue;
-    }
-    const { error, added } = await _registerNewOrder(
-      tx,
-      log,
-      composableCow,
-      registry
-    );
-    if (added) {
-      numContractsAdded++;
-    }
-    hasErrors ||= error;
+
+  // Do not process logs that are not from a `ComposableCoW`-compatible contract
+  // This is a *normal* case, if the contract is not `ComposableCoW`-compatible
+  // then we do not need to do anything, and therefore don't flag as an error.
+  if (!isComposableCowCompatible(await provider.getCode(event.address))) {
+    return;
+  }
+  const { error, added } = await _registerNewOrder(
+    event,
+    composableCow,
+    registry
+  );
+  if (added) {
+    numContractsAdded++;
   }
+  hasErrors ||= error;
 
   console.log(`[addContract] Added ${numContractsAdded} contracts`);
   hasErrors ||= !(await writeRegistry());
@@ -76,27 +70,38 @@ const _addContract: ActionFn = async (context: Context, event: Event) => {
 };
 
 export async function _registerNewOrder(
-  tx: string,
-  log: Log,
+  event: ConditionalOrderCreatedEvent | MerkleRootSetEvent,
   composableCow: ComposableCoWInterface,
   registry: Registry
 ): Promise<{ error: boolean; added: boolean }> {
   let added = false;
   try {
     // Check if the log is a ConditionalOrderCreated event
     if (
-      log.topics[0] === composableCow.getEventTopic("ConditionalOrderCreated")
+      event.topics[0] === composableCow.getEventTopic("ConditionalOrderCreated")
     ) {
+      const log = event as ConditionalOrderCreatedEvent;
+      // Decode the log
       const [owner, params] = composableCow.decodeEventLog(
         "ConditionalOrderCreated",
         log.data,
         log.topics
       ) as [string, IConditionalOrder.ConditionalOrderParamsStruct];
 
       // Attempt to add the conditional order to the registry
-      await add(tx, owner, params, null, log.address, registry);
+      await add(
+        log.transactionHash,
+        owner,
+        params,
+        null,
+        log.address,
+        registry
+      );
       added = true;
-    } else if (log.topics[0] == composableCow.getEventTopic("MerkleRootSet")) {
+    } else if (
+      event.topics[0] == composableCow.getEventTopic("MerkleRootSet")
+    ) {
+      const log = event as MerkleRootSetEvent;
       const [owner, root, proof] = composableCow.decodeEventLog(
         "MerkleRootSet",
         log.data,
@@ -125,7 +130,7 @@ export async function _registerNewOrder(
           );
           // Attempt to add the conditional order to the registry
           await add(
-            tx,
+            event.transactionHash,
             owner,
             decodedOrder[1],
             { merkleRoot: root, path: decodedOrder[0] },

diff --git a/src/checkForAndPlaceOrder.ts b/src/checkForAndPlaceOrder.ts
@@ -1,4 +1,3 @@
-import { ActionFn, BlockEvent, Context, Event } from "@tenderly/actions";
 import {
   Order,
   OrderBalance,
@@ -16,20 +15,18 @@ import {
   ComposableCoW__factory,
   Multicall3,
   Multicall3__factory,
-} from "./types";
+} from "./types/generated";
 import {
   LowLevelError,
   ORDER_NOT_VALID_SELECTOR,
   PROOF_NOT_AUTHED_SELECTOR,
   SINGLE_ORDER_NOT_AUTHED_SELECTOR,
   formatStatus,
   handleExecutionError,
-  initContext,
   parseCustomError,
-  toChainId,
   writeRegistry,
 } from "./utils";
-import { ChainContext, ConditionalOrder, OrderStatus } from "./model";
+import { ChainContext, ConditionalOrder, OrderStatus } from "./types/model";
 import { pollConditionalOrder } from "./utils/poll";
 import {
   PollParams,
@@ -41,6 +38,7 @@ import {
   PollResultUnexpectedError,
   SupportedChainId,
 } from "@cowprotocol/cow-sdk";
+import { ChainWatcher } from "./modes";
 
 const GPV2SETTLEMENT = "0x9008D19f58AAbD9eD0D60971565AA8510560ab41";
 const MULTICALL3 = "0xcA11bde05977b3631167028862bE2a173976CA11";
@@ -60,31 +58,36 @@ const ORDER_BOOK_API_HANDLED_ERRORS = [
  * @param context tenderly context
  * @param event block event
  */
-export const checkForAndPlaceOrder: ActionFn = async (
-  context: Context,
-  event: Event
+export const checkForAndPlaceOrder = async (
+  context: ChainWatcher,
+  block: ethers.providers.Block,
+  blockNumberOverride?: number,
+  blockTimestampOverride?: number
 ) => {
-  return _checkForAndPlaceOrder(context, event).catch(handleExecutionError);
+  return _checkForAndPlaceOrder(
+    context,
+    block,
+    blockNumberOverride,
+    blockTimestampOverride
+  ).catch(handleExecutionError);
 };
 
 /**
  * Asyncronous version of checkForAndPlaceOrder. It will process all the orders, and will throw an error at the end if there was at least one error
  */
-const _checkForAndPlaceOrder: ActionFn = async (
-  context: Context,
-  event: Event
+const _checkForAndPlaceOrder = async (
+  context: ChainWatcher,
+  block: ethers.providers.Block,
+  blockNumberOverride?: number,
+  blockTimestampOverride?: number
 ) => {
-  const blockEvent = event as BlockEvent;
-  const { network, blockNumber } = blockEvent;
-  const chainId = toChainId(network);
-  const chainContext = await ChainContext.create(context, chainId);
-  const { registry } = await initContext(
-    "checkForAndPlaceOrder",
-    chainId,
-    context
-  );
+  const { chainContext, registry } = context;
+  const { chainId } = chainContext;
   const { ownerOrders } = registry;
 
+  const blockNumber = blockNumberOverride || block.number;
+  const blockTimestamp = blockTimestampOverride || block.timestamp;
+
   let hasErrors = false;
   let ownerCounter = 0;
   let orderCounter = 0;
@@ -93,10 +96,6 @@ const _checkForAndPlaceOrder: ActionFn = async (
     console.log(`[checkForAndPlaceOrder] Processing Block ${blockNumber}`);
   }
 
-  const { timestamp: blockTimestamp } = await chainContext.provider.getBlock(
-    blockNumber
-  );
-
   console.log("[checkForAndPlaceOrder] Number of orders: ", registry.numOrders);
 
   for (const [owner, conditionalOrders] of ownerOrders.entries()) {