Use bridge registry for substrate chains (#447)

* use bridge registry for substrate * cargo.lock file
tangle-network · Apr 10, 2023 · d73369e · d73369e
1 parent bd5d911
commit d73369e
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/event-watchers/substrate/Cargo.toml b/event-watchers/substrate/Cargo.toml
@@ -12,6 +12,7 @@ repository = { workspace = true }
 
 [dependencies]
 webb-proposal-signing-backends = { workspace = true }
+webb-bridge-registry-backends = { workspace = true }
 webb-event-watcher-traits = { workspace = true }
 webb-relayer-types = { workspace = true }
 webb-relayer-store = { workspace = true }

diff --git a/event-watchers/substrate/src/vanchor_deposit_handler.rs b/event-watchers/substrate/src/vanchor_deposit_handler.rs
@@ -19,6 +19,7 @@ use webb::substrate::protocol_substrate_runtime::api as RuntimeApi;
 use webb::substrate::protocol_substrate_runtime::api::v_anchor_bn254;
 use webb::substrate::scale::Encode;
 use webb::substrate::subxt::{self, OnlineClient, SubstrateConfig};
+use webb_bridge_registry_backends::BridgeRegistryBackend;
 use webb_event_watcher_traits::substrate::EventHandler;
 
 use webb_proposal_signing_backends::{
@@ -29,30 +30,36 @@ use webb_relayer_store::EventHashStore;
 use webb_relayer_store::SledStore;
 use webb_relayer_utils::metric;
 /// SubstrateVAnchorDeposit handler handles `Transaction` event and creates `AnchorUpdate` proposals for linked anchors.
-pub struct SubstrateVAnchorDepositHandler<B> {
+pub struct SubstrateVAnchorDepositHandler<B, C> {
     proposal_signing_backend: B,
-    linked_anchors: Vec<LinkedAnchorConfig>,
+    bridge_registry_backend: C,
+    linked_anchors: Option<Vec<LinkedAnchorConfig>>,
 }
 
-impl<B> SubstrateVAnchorDepositHandler<B>
+impl<B, C> SubstrateVAnchorDepositHandler<B, C>
 where
     B: ProposalSigningBackend,
+    C: BridgeRegistryBackend,
 {
     pub fn new(
         proposal_signing_backend: B,
-        linked_anchors: Vec<LinkedAnchorConfig>,
+        bridge_registry_backend: C,
+        linked_anchors: Option<Vec<LinkedAnchorConfig>>,
     ) -> Self {
         Self {
             proposal_signing_backend,
+            bridge_registry_backend,
             linked_anchors,
         }
     }
 }
 
 #[async_trait::async_trait]
-impl<B> EventHandler<SubstrateConfig> for SubstrateVAnchorDepositHandler<B>
+impl<B, C> EventHandler<SubstrateConfig>
+    for SubstrateVAnchorDepositHandler<B, C>
 where
     B: ProposalSigningBackend + Send + Sync,
+    C: BridgeRegistryBackend + Send + Sync,
 {
     type Client = OnlineClient<SubstrateConfig>;
 
@@ -130,8 +137,13 @@ where
             let mut merkle_root = [0; 32];
             merkle_root.copy_from_slice(&root.encode());
 
+            let linked_anchors = self
+                .bridge_registry_backend
+                .config_or_dkg_bridges(&self.linked_anchors, &src_resource_id)
+                .await?;
+
             // update linked anchors
-            for linked_anchor in &self.linked_anchors {
+            for linked_anchor in linked_anchors {
                 let target_resource_id = match linked_anchor {
                     LinkedAnchorConfig::Raw(target) => {
                         let bytes: [u8; 32] = target.resource_id.into();

diff --git a/services/webb-relayer/src/service/substrate.rs b/services/webb-relayer/src/service/substrate.rs
@@ -5,6 +5,8 @@ use axum::Router;
 use sp_core::sr25519;
 use webb::substrate::subxt::config::ExtrinsicParams;
 use webb::substrate::subxt::{self, PolkadotConfig};
+use webb_bridge_registry_backends::dkg::DkgBridgeRegistryBackend;
+use webb_bridge_registry_backends::mocked::MockedBridgeRegistryBackend;
 use webb_event_watcher_traits::{
     SubstrateBridgeWatcher, SubstrateEventWatcher,
 };
@@ -361,12 +363,13 @@ pub fn start_substrate_vanchor_event_watcher(
         .await?;
         match proposal_signing_backend {
             ProposalSigningBackendSelector::Dkg(backend) => {
-                // its safe to use unwrap on linked_anchors here
-                // since this option is always going to return Some(value).
-                // linked_anchors are validated in make_proposal_signing_backend() method
+                let bridge_registry =
+                    DkgBridgeRegistryBackend::new(backend.client.clone());
+
                 let deposit_handler = SubstrateVAnchorDepositHandler::new(
                     backend,
-                    my_config.linked_anchors.unwrap_or_default(),
+                    bridge_registry,
+                    my_config.linked_anchors,
                 );
                 let leaves_handler = SubstrateVAnchorLeavesHandler::default();
                 let encrypted_output_handler =
@@ -403,11 +406,13 @@ pub fn start_substrate_vanchor_event_watcher(
                 }
             }
             ProposalSigningBackendSelector::Mocked(backend) => {
-                // its safe to use unwrap on linked_anchors here
-                // since this option is always going to return Some(value).
+                let bridge_registry =
+                    MockedBridgeRegistryBackend::builder().build();
+
                 let deposit_handler = SubstrateVAnchorDepositHandler::new(
                     backend,
-                    my_config.linked_anchors.unwrap_or_default(),
+                    bridge_registry,
+                    my_config.linked_anchors,
                 );
                 let leaves_handler = SubstrateVAnchorLeavesHandler::default();
                 let encrypted_output_handler =