Merge 2.0-bridge into master

Justfile

@@ -26,17 +26,7 @@ versions:
     cargo clippy -- --version
 
 # additional clippy lints
-export CLIPPY_LINTS := '-D warnings
-    -D clippy::cast-lossless
-    -D clippy::cast-possible-truncation
-    -D clippy::cast-possible-wrap
-    -D clippy::cast-precision-loss
-    -D clippy::cast-sign-loss
-    -D clippy::checked-conversions
-    -A clippy::upper-case-acronyms
-    -A clippy::uninlined-format-args
-    -A renamed_and_removed_lints
-'
+export CLIPPY_LINTS := '-D warnings -D clippy::cast-lossless -D clippy::cast-possible-truncation -D clippy::cast-possible-wrap -D clippy::cast-precision-loss -D clippy::cast-sign-loss -D clippy::checked-conversions -A clippy::upper-case-acronyms -A clippy::uninlined-format-args -A renamed_and_removed_lints'
 
 # run clippy
 clippy +flags="":

bridges/centralized-ethereum/Cargo.toml

@@ -7,6 +7,7 @@ edition = "2018"
 [dependencies]
 actix = { version = "0.13.0", default-features = false }
 async-jsonrpc-client = { git = "https://github.com/witnet/async-jsonrpc-client", features = ["tcp"], branch = "fix-tcp-leak" }
+chrono = "0.4.38"
 ctrlc = "3.1.3"
 env_logger = "0.9.0"
 envy = "0.4"

bridges/centralized-ethereum/src/actors/dr_database.rs

@@ -179,6 +179,13 @@ impl Message for SetDrState {
     type Result = Result<(), ()>;
 }
 
+/// Count number of data requests in given state
+pub struct CountDrsPerState;
+
+impl Message for CountDrsPerState {
+    type Result = Result<(u32, u32, u32, u32), ()>;
+}
+
 impl Handler<SetDrInfoBridge> for DrDatabase {
     type Result = ();
 
@@ -274,6 +281,26 @@ impl Handler<SetDrState> for DrDatabase {
     }
 }
 
+impl Handler<CountDrsPerState> for DrDatabase {
+    type Result = Result<(u32, u32, u32, u32), ()>;
+
+    fn handle(&mut self, _msg: CountDrsPerState, _ctx: &mut Self::Context) -> Self::Result {
+        Ok(self.dr.iter().fold(
+            (0u32, 0u32, 0u32, 0u32),
+            |(mut drs_new, mut drs_pending, mut drs_finished, mut drs_dismissed),
+             (_dr_id, dr_info)| {
+                match dr_info.dr_state {
+                    DrState::New => drs_new += 1,
+                    DrState::Pending => drs_pending += 1,
+                    DrState::Finished => drs_finished += 1,
+                    DrState::Dismissed => drs_dismissed += 1,
+                };
+                (drs_new, drs_pending, drs_finished, drs_dismissed)
+            },
+        ))
+    }
+}
+
 /// Required trait for being able to retrieve DrDatabase address from system registry
 impl actix::Supervised for DrDatabase {}
 

bridges/centralized-ethereum/src/actors/dr_reporter.rs

@@ -653,15 +653,14 @@ mod tests {
                 ])
             })
             .collect();
-        let verbose = true;
 
         let params_one = unwrap_batch(batch_results[0].clone());
         wrb_contract_abi
             .function("reportResult")
             .and_then(|function| function.encode_input(&params_one.into_tokens()))
             .expect("encode args failed");
 
-        let params_batch = (batch_results, verbose);
+        let params_batch = batch_results;
         wrb_contract_abi
             .function("reportResultBatch")
             .and_then(|function| function.encode_input(&params_batch.into_tokens()))
@@ -682,15 +681,11 @@ mod tests {
                 .parse()
                 .unwrap(),
             topics: vec![
-                "0x00e9413c6321ec446a267b7ebf5bb108663f2ef58b35c4f6e18905ac8f205cb2"
+                "0x4df64445edc775fba59db44b8001852fb1b777eea88fd54f04572dd114e3ff7f"
                     .parse()
                     .unwrap(),
             ],
-            data: web3::types::Bytes(vec![
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 248, 117, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 232, 36, 130, 44, 106, 92,
-                40, 222, 53, 104, 223, 153, 96, 77, 104, 233, 253, 156, 140,
-            ]),
+            data: web3::types::Bytes(hex::decode("0000000000000000000000000000000000000000000000000000000000001b58000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000146e6f7420696e20506f7374656420737461747573000000000000000000000000").unwrap()),
             block_hash: None,
             block_number: None,
             transaction_hash: None,
@@ -700,13 +695,9 @@ mod tests {
             log_type: None,
             removed: None,
         };
-
         assert_eq!(
             parse_batch_report_error_log(&wrb_contract_abi, log_posted_result),
-            Some((
-                U256::from(63605),
-                String::from("WitnetOracle: query not in Posted status"),
-            ))
+            Some((U256::from(7_000), String::from("not in Posted status"),))
         );
     }
 

bridges/centralized-ethereum/src/actors/dr_sender/tests.rs

@@ -80,8 +80,8 @@ fn deserialize_dr_collateral_one_nanowit() {
     assert_eq!(total_value, 20_000_000);
 
     let dro_bytes = dro.to_pb_bytes().unwrap();
-    let err = deserialize_and_validate_dr_bytes(&dro_bytes, 1, total_value).unwrap_err();
-    assert_eq!(err.encode_cbor(), vec![216, 39, 129, 24, 224]);
+    let err = deserialize_and_validate_dr_bytes(&dro_bytes, total_value, 1).unwrap_err();
+    assert_eq!(err.encode_cbor(), vec![216, 39, 129, 24, 225]);
 }
 
 #[test]
@@ -97,8 +97,8 @@ fn deserialize_dr_value_overflow() {
     };
 
     let dro_bytes = dro.to_pb_bytes().unwrap();
-    let err = deserialize_and_validate_dr_bytes(&dro_bytes, 0, 1).unwrap_err();
-    assert_eq!(err.encode_cbor(), vec![216, 39, 129, 24, 224]);
+    let err = deserialize_and_validate_dr_bytes(&dro_bytes, 1, 1).unwrap_err();
+    assert_eq!(err.encode_cbor(), vec![216, 39, 129, 24, 225]);
 }
 
 #[test]

bridges/centralized-ethereum/src/actors/eth_poller.rs

@@ -111,7 +111,7 @@ impl EthPoller {
                     );
                     last_dr_id = skip_first;
                 }
-                while last_dr_id < next_dr_id {
+                while last_dr_id + 1 < next_dr_id {
                     let init_index = usize::try_from(last_dr_id + 1).unwrap();
                     let last_index = match next_dr_id.cmp(&(last_dr_id + max_batch_size)) {
                         std::cmp::Ordering::Greater => {

bridges/centralized-ethereum/src/actors/mod.rs

@@ -12,3 +12,6 @@ pub mod eth_poller;
 
 /// wit_poller actor module
 pub mod wit_poller;
+
+/// watch_dog actor module
+pub mod watch_dog;