feat(new-chains): add q4 chains

config.json.example

@@ -140,5 +140,25 @@
         }
       }
     }
+    {
+      "name": "linea",
+      "rpc": "https://rpc.linea.build",
+      "deploymentBlock": 25028604,
+      "filterPolicy": {
+        "defaultAction": "ACCEPT",
+        "conditionalOrderIds": {
+          "0x5b3cdb6ffa3c95507cbfc459162609007865c2e87340312d3cd469c4ffbfae81": "DROP"
+        },
+        "transactions": {
+          "0x33ef06af308d1e4f94dd61fa8df43fe52b67e8a485f4e4fff75235080e663bfa": "DROP"
+        },
+        "handlers": {
+          "0xd3338f21c89745e46af56aeaf553cf96ba9bc66f": "DROP"
+        },
+        "owners": {
+          "0xd3338f21c89745e46af56aeaf553cf96ba9bc66f": "DROP"
+        }
+      }
+    }
   ]
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cowprotocol/watch-tower",
   "license": "GPL-3.0-or-later",
-  "version": "2.11.1",
+  "version": "2.13.0",
   "description": "A standalone watch tower, keeping an eye on Composable Cows  👀🐮",
   "author": {
     "name": "Cow Protocol"
@@ -46,7 +46,9 @@
   "dependencies": {
     "@commander-js/extra-typings": "^11.0.0",
     "@cowprotocol/contracts": "^1.4.0",
-    "@cowprotocol/cow-sdk": "6.2.0-RC.0",
+    "@cowprotocol/cow-sdk": "^7.1.0",
+    "@cowprotocol/sdk-composable": "^0.1.10",
+    "@cowprotocol/sdk-ethers-v5-adapter": "^0.2.0",
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
     "chalk": "^4.1.2",

src/domain/events/index.ts

@@ -1,12 +1,10 @@
 import {
-  getAreConditionalOrderParamsEqual,
-  getLogger,
-  handleExecutionError,
-  metrics,
-  toConditionalOrderParams,
-} from "../../utils";
+  ConditionalOrder,
+  ConditionalOrderParams,
+} from "@cowprotocol/sdk-composable";
 import { BytesLike, ethers } from "ethers";
 
+import { ChainContext } from "../../services/chain";
 import {
   ComposableCoW,
   ComposableCoW__factory,
@@ -17,9 +15,13 @@ import {
   Proof,
   Registry,
 } from "../../types";
-import { ConditionalOrder, ConditionalOrderParams } from "@cowprotocol/cow-sdk";
-
-import { ChainContext } from "../../services/chain";
+import {
+  getAreConditionalOrderParamsEqual,
+  getLogger,
+  handleExecutionError,
+  metrics,
+  toConditionalOrderParams,
+} from "../../utils";
 import { policy } from "../polling/filtering";
 
 const composableCow = ComposableCoW__factory.createInterface();

src/domain/polling/filtering/policy.ts

@@ -1,4 +1,5 @@
-import { ConditionalOrderParams } from "@cowprotocol/cow-sdk";
+import { ConditionalOrderParams } from "@cowprotocol/sdk-composable";
+
 import { Config, FilterAction as FilterActionSchema } from "../../../types";
 
 export enum FilterAction {

src/domain/polling/index.ts

@@ -4,26 +4,28 @@ import {
   OrderKind,
   computeOrderUid,
 } from "@cowprotocol/contracts";
-
-import { ethers } from "ethers";
-import { BytesLike } from "ethers/lib/utils";
-
 import {
-  ConditionalOrder as ConditionalOrderSDK,
   OrderBookApi,
   OrderCreation,
   OrderPostError,
+  SigningScheme,
+  SupportedChainId,
+} from "@cowprotocol/cow-sdk";
+import {
+  ConditionalOrder as ConditionalOrderSDK,
   PollParams,
   PollResult,
   PollResultCode,
   PollResultErrors,
   PollResultSuccess,
-  SigningScheme,
-  SupportedChainId,
   formatEpoch,
-} from "@cowprotocol/cow-sdk";
+} from "@cowprotocol/sdk-composable";
+import { ethers } from "ethers";
+import { BytesLike } from "ethers/lib/utils";
+
 import { ChainContext } from "../../services";
 import { ConditionalOrder, OrderStatus } from "../../types";
+
 import {
   LoggerWithMethods,
   formatStatus,
@@ -410,9 +412,10 @@ async function processConditionalOrder(
 
     const orderToSubmit: Order = {
       ...order,
-      kind: kindToString(order.kind.toString()),
-      sellTokenBalance: balanceToString(order.sellTokenBalance.toString()),
-      buyTokenBalance: balanceToString(order.buyTokenBalance.toString()),
+      appData: order.appData as string,
+      kind: kindToString(order.kind as string),
+      sellTokenBalance: balanceToString(order.sellTokenBalance as string),
+      buyTokenBalance: balanceToString(order.buyTokenBalance as string),
       validTo: Number(order.validTo),
     };
 

src/domain/polling/poll.ts

@@ -1,11 +1,11 @@
+import { SupportedChainId } from "@cowprotocol/cow-sdk";
 import {
   ConditionalOrderFactory,
   ConditionalOrderParams,
   DEFAULT_CONDITIONAL_ORDER_REGISTRY,
   PollParams,
   PollResult,
-  SupportedChainId,
-} from "@cowprotocol/cow-sdk";
+} from "@cowprotocol/sdk-composable";
 import { getLogger } from "../../utils/logging";
 
 // Watch-tower will index every block, so we will by default the processing block and not the latest.

src/services/chain.ts

@@ -1,8 +1,10 @@
 import {
   ApiBaseUrls,
   OrderBookApi,
+  setGlobalAdapter,
   SupportedChainId,
 } from "@cowprotocol/cow-sdk";
+import { EthersV5Adapter } from "@cowprotocol/sdk-ethers-v5-adapter";
 import { ethers, providers } from "ethers";
 import { DBService } from ".";
 import { processNewOrderEvent } from "../domain/events";
@@ -18,10 +20,10 @@ import {
   RegistryBlock,
 } from "../types";
 import {
-  LoggerWithMethods,
   composableCowContract,
   getLogger,
   isRunningInKubernetesPod,
+  LoggerWithMethods,
   metrics,
 } from "../utils";
 
@@ -152,6 +154,8 @@ export class ChainContext {
     const provider = getProvider(rpc.toLowerCase());
     const chainId = (await provider.getNetwork()).chainId;
 
+    setGlobalAdapter(new EthersV5Adapter({ provider: provider }));
+
     const registry = await Registry.load(
       storage,
       chainId.toString(),

src/types/model.ts

@@ -3,13 +3,13 @@ import Slack = require("node-slack");
 import { BytesLike } from "ethers";
 
 import {
-  ConditionalOrder as ConditionalOrderSdk,
   ConditionalOrderParams,
+  ConditionalOrder as ConditionalOrderSdk,
   PollResult,
-} from "@cowprotocol/cow-sdk";
+} from "@cowprotocol/sdk-composable";
 import { DBService } from "../services";
-import * as metrics from "../utils/metrics";
 import { getLogger } from "../utils/logging";
+import * as metrics from "../utils/metrics";
 
 // Standardise the storage key
 const LAST_NOTIFIED_ERROR_STORAGE_KEY = "LAST_NOTIFIED_ERROR";

src/utils/contracts.ts

@@ -1,14 +1,13 @@
-import { BigNumber, ethers } from "ethers";
-import { ComposableCoW, ComposableCoW__factory } from "../types";
 import {
   COMPOSABLE_COW_CONTRACT_ADDRESS,
   MAX_UINT32,
-  PollResultCode,
-  PollResultErrors,
   SupportedChainId,
 } from "@cowprotocol/cow-sdk";
-import { getLogger } from "./logging";
+import { PollResultCode, PollResultErrors } from "@cowprotocol/sdk-composable";
+import { BigNumber, ethers } from "ethers";
 import { metrics } from ".";
+import { ComposableCoW, ComposableCoW__factory } from "../types";
+import { getLogger } from "./logging";
 
 // Define an enum for the custom error revert hints that can be returned by the ComposableCoW's interfaces.
 export enum CustomErrorSelectors {

src/utils/misc.ts

@@ -1,4 +1,4 @@
-import { ConditionalOrderParams } from "@cowprotocol/cow-sdk";
+import { ConditionalOrderParams } from "@cowprotocol/sdk-composable";
 import { IConditionalOrder, OrderStatus } from "../types";
 export function formatStatus(status: OrderStatus) {
   switch (status) {