Feat/673 add events filters to the postman

postman/.env.sample

@@ -41,4 +41,15 @@ POSTGRES_DB=postman_db
 DB_CLEANER_ENABLED=false
 DB_CLEANING_INTERVAL=10000
 DB_DAYS_BEFORE_NOW_TO_DELETE=1
-ENABLE_LINEA_ESTIMATE_GAS=false
+ENABLE_LINEA_ESTIMATE_GAS=false
+
+# Optional event filter params
+L1_EVENT_FILTER_FROM_ADDRESS=<FROM_ADDRESS>
+L1_EVENT_FILTER_TO_ADDRESS=<TO_ADDRESS>
+L1_EVENT_FILTER_CALLDATA=<criteria>
+L1_EVENT_FILTER_CALLDATA_FUNCTION_INTERFACE=<FUNCTION_INTERFACE>
+
+L2_EVENT_FILTER_FROM_ADDRESS=<FROM_ADDRESS>
+L2_EVENT_FILTER_TO_ADDRESS=<TO_ADDRESS>
+L2_EVENT_FILTER_CALLDATA=<criteria>
+L2_EVENT_FILTER_CALLDATA_FUNCTION_INTERFACE=<FUNCTION_INTERFACE>

postman/README.md

@@ -28,6 +28,16 @@ All messages are stored in a configurable Postgres DB.
 - `L1_LISTENER_BLOCK_CONFIRMATION`: Required block confirmations
 - `L1_MAX_BLOCKS_TO_FETCH_LOGS`: Maximum blocks to fetch in one request
 - `L1_MAX_GAS_FEE_ENFORCED`: Enable/disable gas fee enforcement
+- `L1_EVENT_FILTER_FROM_ADDRESS`: Filter events using a from address
+- `L1_EVENT_FILTER_TO_ADDRESS`: Filter events using a to address
+- `L1_EVENT_FILTER_CALLDATA`: MessageSent event calldata filtering criteria expression. See [Filtrex repo](https://github.com/joewalnes/filtrex/tree/master).
+    <br>
+    You can filter by the calldata field:
+    <br>
+
+    Example:
+    `calldata.funcSignature == "0x6463fb2a" and calldata.params.messageNumber == 85804`,
+- `L1_EVENT_FILTER_CALLDATA_FUNCTION_INTERFACE`: Calldata data function interface following this format: `"function transfer(address to, uint256 amount)"`. Make sure you specify parameters names in order to use syntax like `calldata.params.messageNumber`.
 
 #### L2 Configuration
 - `L2_RPC_URL`: Linea node RPC endpoint
@@ -39,6 +49,16 @@ All messages are stored in a configurable Postgres DB.
 - `L2_MAX_BLOCKS_TO_FETCH_LOGS`: Maximum blocks to fetch in one request
 - `L2_MAX_GAS_FEE_ENFORCED`: Enable/disable gas fee enforcement
 - `L2_MESSAGE_TREE_DEPTH`: Depth of the message Merkle tree
+- `L2_EVENT_FILTER_FROM_ADDRESS`: Filter events using a from address
+- `L2_EVENT_FILTER_TO_ADDRESS`: Filter events using a to address
+- `L2_EVENT_FILTER_CALLDATA`: MessageSent event calldata filtering criteria expression. See [Filtrex repo](https://github.com/joewalnes/filtrex/tree/master).
+    <br>
+    You can filter by the calldata field:
+    <br>
+
+    Example:
+    `calldata.funcSignature == "0x6463fb2a" and calldata.params.messageNumber == 85804`,
+- `L2_EVENT_FILTER_CALLDATA_FUNCTION_INTERFACE`: Calldata data function interface following this format: `"function transfer(address to, uint256 amount)"`. Make sure you specify parameters names in order to use syntax like `calldata.params.messageNumber`.
 
 #### Message Processing
 - `MESSAGE_SUBMISSION_TIMEOUT`: Timeout for message submission (ms)
@@ -80,7 +100,7 @@ All messages are stored in a configurable Postgres DB.
 
 From the root folder, run the following command:
 ```bash
-make fresh-start-all
+make start-env-with-tracing-v2
 ```
 
 Stop the postman docker container manually.

postman/package.json

@@ -24,6 +24,7 @@
     "class-validator": "0.14.1",
     "dotenv": "16.4.5",
     "ethers": "6.13.4",
+    "filtrex": "3.1.0",
     "pg": "8.13.1",
     "typeorm": "0.3.20",
     "typeorm-naming-strategies": "4.1.0",

postman/scripts/runPostman.ts

@@ -25,6 +25,24 @@ async function main() {
         ...(parseInt(process.env.L1_LISTENER_BLOCK_CONFIRMATION ?? "") >= 0
           ? { blockConfirmation: parseInt(process.env.L1_LISTENER_BLOCK_CONFIRMATION ?? "") }
           : {}),
+        ...(process.env.L1_EVENT_FILTER_FROM_ADDRESS ||
+        process.env.L1_EVENT_FILTER_TO_ADDRESS ||
+        (process.env.L1_EVENT_FILTER_CALLDATA && process.env.L1_EVENT_FILTER_CALLDATA_FUNCTION_INTERFACE)
+          ? {
+              eventFilters: {
+                fromAddressFilter: process.env.L1_EVENT_FILTER_FROM_ADDRESS,
+                toAddressFilter: process.env.L1_EVENT_FILTER_TO_ADDRESS,
+                ...(process.env.L1_EVENT_FILTER_CALLDATA && process.env.L1_EVENT_FILTER_CALLDATA_FUNCTION_INTERFACE
+                  ? {
+                      calldataFilter: {
+                        criteriaExpression: process.env.L1_EVENT_FILTER_CALLDATA,
+                        calldataFunctionInterface: process.env.L1_EVENT_FILTER_CALLDATA_FUNCTION_INTERFACE,
+                      },
+                    }
+                  : {}),
+              },
+            }
+          : {}),
       },
       claiming: {
         signerPrivateKey: process.env.L1_SIGNER_PRIVATE_KEY ?? "",
@@ -65,6 +83,24 @@ async function main() {
         ...(parseInt(process.env.L2_LISTENER_BLOCK_CONFIRMATION ?? "") >= 0
           ? { blockConfirmation: parseInt(process.env.L2_LISTENER_BLOCK_CONFIRMATION ?? "") }
           : {}),
+        ...(process.env.L2_EVENT_FILTER_FROM_ADDRESS ||
+        process.env.L2_EVENT_FILTER_TO_ADDRESS ||
+        (process.env.L2_EVENT_FILTER_CALLDATA && process.env.L2_EVENT_FILTER_CALLDATA_FUNCTION_INTERFACE)
+          ? {
+              eventFilters: {
+                fromAddressFilter: process.env.L2_EVENT_FILTER_FROM_ADDRESS,
+                toAddressFilter: process.env.L2_EVENT_FILTER_TO_ADDRESS,
+                ...(process.env.L2_EVENT_FILTER_CALLDATA && process.env.L2_EVENT_FILTER_CALLDATA_FUNCTION_INTERFACE
+                  ? {
+                      calldataFilter: {
+                        criteriaExpression: process.env.L2_EVENT_FILTER_CALLDATA,
+                        calldataFunctionInterface: process.env.L2_EVENT_FILTER_CALLDATA_FUNCTION_INTERFACE,
+                      },
+                    }
+                  : {}),
+              },
+            }
+          : {}),
       },
       claiming: {
         signerPrivateKey: process.env.L2_SIGNER_PRIVATE_KEY ?? "",

postman/src/application/postman/app/PostmanServiceClient.ts

@@ -120,6 +120,7 @@ export class PostmanServiceClient {
         blockConfirmation: config.l1Config.listener.blockConfirmation,
         isEOAEnabled: config.l1Config.isEOAEnabled,
         isCalldataEnabled: config.l1Config.isCalldataEnabled,
+        eventFilters: config.l1Config.listener.eventFilters,
       },
       new WinstonLogger(`L1${MessageSentEventProcessor.name}`, config.loggerOptions),
     );
@@ -245,6 +246,7 @@ export class PostmanServiceClient {
         blockConfirmation: config.l2Config.listener.blockConfirmation,
         isEOAEnabled: config.l2Config.isEOAEnabled,
         isCalldataEnabled: config.l2Config.isCalldataEnabled,
+        eventFilters: config.l2Config.listener.eventFilters,
       },
       new WinstonLogger(`L2${MessageSentEventProcessor.name}`, config.loggerOptions),
     );

postman/src/application/postman/app/__tests__/PostmanServiceClient.test.ts

@@ -135,6 +135,36 @@ describe("PostmanServiceClient", () => {
         new Error("Something went wrong when trying to generate Wallet. Please check your private key."),
       );
     });
+
+    it("should throw an error when events filters are not valid", () => {
+      const postmanServiceClientOptionsWithInvalidPrivateKey: PostmanOptions = {
+        ...postmanServiceClientOptions,
+        l1Options: {
+          ...postmanServiceClientOptions.l1Options,
+          listener: {
+            ...postmanServiceClientOptions.l1Options.listener,
+            eventFilters: {
+              fromAddressFilter: "0x",
+            },
+          },
+          claiming: {
+            ...postmanServiceClientOptions.l1Options.claiming,
+            signerPrivateKey: "0x",
+          },
+        },
+        l2Options: {
+          ...postmanServiceClientOptions.l2Options,
+          claiming: {
+            ...postmanServiceClientOptions.l2Options.claiming,
+            signerPrivateKey: "0x",
+          },
+        },
+      };
+
+      expect(() => new PostmanServiceClient(postmanServiceClientOptionsWithInvalidPrivateKey)).toThrow(
+        new Error("Invalid fromAddressFilter: 0x"),
+      );
+    });
   });
 
   describe("connectDatabase", () => {

postman/src/application/postman/app/config/__tests__/utils.test.ts

@@ -1,5 +1,5 @@
 import { describe } from "@jest/globals";
-import { getConfig } from "../utils";
+import { getConfig, validateEventsFiltersConfig } from "../utils";
 import {
   TEST_ADDRESS_1,
   TEST_ADDRESS_2,
@@ -235,4 +235,61 @@ describe("Config utils", () => {
       });
     });
   });
+
+  describe("validateEventsFiltersConfig", () => {
+    it("should throw an error when the from address event filter is not valid", () => {
+      expect(() =>
+        validateEventsFiltersConfig({
+          fromAddressFilter: "0x123",
+        }),
+      ).toThrow("Invalid fromAddressFilter: 0x123");
+    });
+
+    it("should throw an error when the to address event filter is not valid", () => {
+      expect(() =>
+        validateEventsFiltersConfig({
+          toAddressFilter: "0x123",
+        }),
+      ).toThrow("Invalid toAddressFilter: 0x123");
+    });
+
+    it("should not throw an error when filters are valid", () => {
+      expect(() =>
+        validateEventsFiltersConfig({
+          fromAddressFilter: "0xc59d8de7f984AbC4913f0177bfb7BBdaFaC41fA6",
+          toAddressFilter: "0xc59d8de7f984AbC4913f0177bfb7BBdaFaC41fA6",
+          calldataFilter: {
+            criteriaExpression: `calldata.funcSignature == "0x26dfbc20" and calldata.amount > 0`,
+            calldataFunctionInterface: "function receiveFromOtherLayer(address recipient, uint256 amount)",
+          },
+        }),
+      ).not.toThrow();
+    });
+
+    it("should throw an error when calldataFilter filter expression is invalid", () => {
+      expect(() =>
+        validateEventsFiltersConfig({
+          fromAddressFilter: "0xc59d8de7f984AbC4913f0177bfb7BBdaFaC41fA6",
+          toAddressFilter: "0xc59d8de7f984AbC4913f0177bfb7BBdaFaC41fA6",
+          calldataFilter: {
+            criteriaExpression: `calldata.funcSignature == "0x26dfbc20" and calldata.amount = 0`,
+            calldataFunctionInterface: "function receiveFromOtherLayer(address recipient, uint256 amount)",
+          },
+        }),
+      ).toThrow('Invalid calldataFilter expression: calldata.funcSignature == "0x26dfbc20" and calldata.amount = 0');
+    });
+
+    it("should throw an error when calldataFunctionInterface is invalid", () => {
+      expect(() =>
+        validateEventsFiltersConfig({
+          fromAddressFilter: "0xc59d8de7f984AbC4913f0177bfb7BBdaFaC41fA6",
+          toAddressFilter: "0xc59d8de7f984AbC4913f0177bfb7BBdaFaC41fA6",
+          calldataFilter: {
+            criteriaExpression: `calldata.funcSignature == "0x26dfbc20" and calldata.amount > 0`,
+            calldataFunctionInterface: "function receiveFromOtherLayer(address recipient uint256 amount)",
+          },
+        }),
+      ).toThrow("Invalid calldataFunctionInterface: function receiveFromOtherLayer(address recipient uint256 amount)");
+    });
+  });
 });

postman/src/application/postman/app/config/config.ts

@@ -99,6 +99,15 @@ export type ListenerOptions = {
   blockConfirmation?: number;
   maxFetchMessagesFromDb?: number;
   maxBlocksToFetchLogs?: number;
+  eventFilters?: {
+    fromAddressFilter?: string;
+    toAddressFilter?: string;
+    calldataFilter?: {
+      criteriaExpression: string;
+      calldataFunctionInterface: string;
+    };
+  };
 };
 
-export type ListenerConfig = Required<ListenerOptions>;
+export type ListenerConfig = Required<Omit<ListenerOptions, "eventFilters">> &
+  Partial<Pick<ListenerOptions, "eventFilters">>;