Verifier V1 [NUF-176]

Cargo.toml

@@ -5,9 +5,6 @@ resolver = "2"
 members = [
     "indexer",
     "contracts/evm/test/ffi/bls-utils",
-    "relayer-rs",
-    "operator-rs",
-    "core-rs",
     "workers",
 ]
 
@@ -19,26 +16,26 @@ repository = "https://github.com/NethermindEth/near-sffl"
 [workspace.dependencies]
 alloy = { version = "0.4.2", features = ["full", "node-bindings", "rpc-types-debug", "rpc-types-trace", "json-rpc", "rpc-client", "serde", "json-abi"] }
 alloy-primitives = "0.8.3"
+alloy-rlp = "0.3.8"
 alloy-rpc-client = "0.4.2"
 alloy-rpc-types = "0.4.2"
 alloy-transport-ws = "0.4.2"
-alloy-rlp = "0.3.8"
-tokio = { version = "1.0", features = ["full"] }
+anyhow = "1.0.79"
+async-trait = "0.1"
+bincode = "1.3"
+clap = "4.5.18"
+eyre = "0.6"
+futures-util = "0.3.30"
+log = "0.4"
 prometheus = "0.13"
+reqwest = "0.12.8"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-anyhow = "1.0"
-tracing = "0.1"
-tracing-subscriber = "0.3"
-futures-util = "0.3.30"
-eyre = "0.6"
-bincode = "1.3"
 serde_yaml = "0.9"
-clap = "4.5.18"
 tempfile = "3.10.0"
-async-trait = "0.1"
-log = "0.4"
-core-rs = { path = "core-rs" }
+tokio = { version = "1", features = ["full"] }
+tracing = "0.1"
+tracing-subscriber = "0.3"
 
 [patch.crates-io]
 parity-secp256k1 = { git = 'https://github.com/paritytech/rust-secp256k1.git' }

indexer/src/block_listener.rs

@@ -338,6 +338,7 @@ mod tests {
                     gas: 100,
                     deposit: 100,
                 }],
+                priority_fee: 0,
                 signature: Signature::default(),
                 hash: CryptoHash::default(),
             },
@@ -355,6 +356,7 @@ mod tests {
                 nonce: 0,
                 receiver_id: da_contract_id,
                 actions: vec![ActionView::CreateAccount],
+                priority_fee: 0,
                 signature: Signature::default(),
                 hash: CryptoHash::default(),
             },
@@ -415,6 +417,7 @@ mod tests {
                 nonce: 0,
                 receiver_id: da_contract_id.clone(),
                 actions,
+                priority_fee: 0,
                 signature: Signature::default(),
                 hash: CryptoHash::hash_bytes(b"test_tx_id"),
             },

workers/Cargo.toml

@@ -14,8 +14,12 @@ bytes = "1.7.2"
 config = { version = "0.14.0", features = ["toml"] }
 eyre.workspace = true
 futures = "0.3.31"
+reqwest.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 tokio.workspace = true
 tracing.workspace = true
 tracing-subscriber = {workspace = true, features = ["env-filter"] }
+
+[dev-dependencies]
+wiremock = "0.6.2"

workers/src/bin/dvn.rs

@@ -1,17 +1,18 @@
-//! Main offchain workflow for Nuff DVN.
+//! Main off-chain workflow for Nuff DVN.
 
 use alloy::primitives::U256;
 use eyre::{OptionExt, Result};
 use futures::stream::StreamExt;
 use tracing::{debug, error, info, warn};
 use tracing_subscriber::EnvFilter;
+use workers::data::dvn::Dvn;
+use workers::verifier::NFFLVerifier;
 use workers::{
     abi::{L0V2EndpointAbi::PacketSent, SendLibraryAbi::DVNFeePaid},
     chain::{
         connections::{build_subscriptions, get_abi_from_path, get_http_provider},
         contracts::{create_contract_instance, query_already_verified, query_confirmations, verify},
     },
-    data::dvn::Dvn,
 };
 
 #[tokio::main]
@@ -23,6 +24,7 @@ async fn main() -> Result<()> {
         .init();
 
     let mut dvn_data = Dvn::new_from_env()?;
+    let verifier = NFFLVerifier::new_from_config(&dvn_data.config).await?;
 
     // Create the WS subscriptions for listening to the events.
     let (_provider, mut endpoint_stream, mut sendlib_stream) = build_subscriptions(&dvn_data.config).await?;
@@ -92,7 +94,15 @@ async fn main() -> Result<()> {
                                         dvn_data.verifying();
                                         debug!("Packet NOT verified. Calling verification.");
 
-                                        // FIXME: logic for NFFL verification
+                                        if log.block_number.is_none() {
+                                            error!("Block number is None, can't verify Packet.");
+                                            continue;
+                                        }
+
+                                        if !verifier.verify(log.block_number.unwrap()).await? {
+                                            error!("Failed to verify the state root.");
+                                            continue;
+                                        }
 
                                         verify(
                                             &receivelib_contract,

workers/src/config.rs

@@ -25,6 +25,8 @@ pub struct DVNConfig {
     pub network_eid: u64,
     /// Own DVN address. Used to check when the DVN is assigned to a task.
     pub dvn_addr: Address,
+    /// NFFL Aggregator URL
+    pub aggregator_url: String,
 }
 
 impl DVNConfig {

workers/src/lib.rs

@@ -4,3 +4,4 @@ pub mod abi;
 pub mod chain;
 pub mod config;
 pub mod data;
+pub mod verifier;