fix filter issue (#9)

* add contract address to filters * add contract address to filters * Add a rustfmt.toml to get around linting issues. --------- Co-authored-by: Yaron <[email protected]>
Zilliqa · Aug 22, 2024 · 117b6c0 · 117b6c0
1 parent 94a1e81
commit 117b6c0
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 22 deletions.
diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
@@ -1,34 +1,34 @@
 version: 0.1
 cli:
-  version: 1.22.0
+  version: 1.22.3
 plugins:
   sources:
     - id: trunk
-      ref: v1.2.1
+      ref: v1.6.2
       uri: https://github.com/trunk-io/plugins
 
 lint:
   enabled:
-    - clippy@1.65.0
+    - clippy@1.79.0
     - [email protected]
-    - golangci-lint@1.57.2
-    - [email protected].1
+    - golangci-lint@1.60.2
+    - [email protected].2
     - [email protected]
-    - taplo@0.8.1
-    - actionlint@1.6.27
+    - taplo@0.9.3
+    - actionlint@1.7.1
     - [email protected]
-    - eslint@8.57.0
-    - [email protected].1
+    - eslint@9.9.0
+    - [email protected].2
     - git-diff-check
-    - markdownlint@0.40.0
-    - prettier@3.2.5
+    - markdownlint@0.41.0
+    - prettier@3.3.3
     - [email protected]
-    - svgo@3.2.0
-    - [email protected].2
-    - flake8@7.0.0
+    - svgo@3.3.2
+    - [email protected].4
+    - flake8@7.1.1
     - [email protected]
-    - black@24.4.2
-    - rustfmt@1.65.0
+    - black@24.8.0
+    - rustfmt@1.79.0
     # - [email protected] - removed for being over-prissy and wanting tab indents - rrw 2023-04-25
   ignore:
     - linters: [gitleaks]
@@ -60,9 +60,9 @@ lint:
 
 runtimes:
   enabled:
-    - go@1.18.3
-    - node@16.14.2
-    - [email protected].3
+    - go@1.21.0
+    - node@18.12.1
+    - [email protected].8
 actions:
   enabled:
     - trunk-announce

diff --git a/bridge-validators/rust-toolchain.toml b/bridge-validators/rust-toolchain.toml
@@ -0,0 +1,4 @@
+[toolchain]
+channel = "1.79.0"
+components = ["rustfmt", "clippy"]
+profile = "minimal"
diff --git a/bridge-validators/rustfmt.toml b/bridge-validators/rustfmt.toml
@@ -0,0 +1,3 @@
+edition = "2021"
+imports_granularity = "Crate"
+group_imports = "StdExternalCrate"
diff --git a/bridge-validators/src/bridge_node.rs b/bridge-validators/src/bridge_node.rs
@@ -76,7 +76,9 @@ impl BridgeNode {
     {
         self.chain_client
             .get_events(
-                event.filter,
+                event
+                    .filter
+                    .address(self.chain_client.chain_gateway_address),
                 self.chain_client.chain_gateway_block_deployed.into(),
                 to_block,
             )
@@ -138,8 +140,14 @@ impl BridgeNode {
         let chain_gateway: ChainGateway<Client> = self.chain_client.get_contract();
 
         // TODO: polling finalized events
-        let relayed_filter = chain_gateway.event::<RelayedFilter>().filter;
-        let dispatched_filter = chain_gateway.event::<DispatchedFilter>().filter;
+        let relayed_filter = chain_gateway
+            .event::<RelayedFilter>()
+            .filter
+            .address(self.chain_client.chain_gateway_address);
+        let dispatched_filter = chain_gateway
+            .event::<DispatchedFilter>()
+            .filter
+            .address(self.chain_client.chain_gateway_address);
 
         let relayed_listener: EventListener<RelayedFilter> =
             EventListener::new(self.chain_client.clone(), relayed_filter);