Merge branch 'dev' into deniallugo-refactor-eth-watcher

Cargo.toml

@@ -8,7 +8,7 @@ members = [
     "core/bin/parse_pub_data",
     "core/bin/block_revert",
     "core/bin/remove_proofs",
-
+    "core/bin/remove_outstanding_tx_filters",
     # Server micro-services
     "core/bin/zksync_api",
     "core/bin/zksync_core",

core/bin/remove_outstanding_tx_filters/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "remove_outstanding_tx_filters"
+version = "0.1.0"
+edition = "2021"
+authors = ["The Matter Labs Team <[email protected]>"]
+homepage = "https://zksync.io/"
+repository = "https://github.com/matter-labs/zksync"
+license = "Apache-2.0"
+keywords = ["blockchain", "zksync"]
+categories = ["cryptography"]
+publish = false # We don't want to publish our binaries.
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+# TODO remove it ZKS-931
+[dependencies]
+zksync_types = { path = "../../lib/types", version = "1.0" }
+zksync_storage = { path = "../../lib/storage", version = "1.0" }
+zksync_eth_client = { path = "../../lib/eth_client", version = "1.0" }
+zksync_config = { path = "../../lib/config", version = "1.0" }
+
+tokio = { version = "1", features = ["full"] }
+ethabi = "14.0.0"
+anyhow = "1.0"
+web3 = "0.16.0"
+structopt = "0.3.20"

core/bin/remove_outstanding_tx_filters/src/main.rs

@@ -0,0 +1,12 @@
+use zksync_storage::StorageProcessor;
+
+#[tokio::main]
+async fn main() -> anyhow::Result<()> {
+    let mut storage = StorageProcessor::establish_connection().await?;
+    storage
+        .chain()
+        .operations_schema()
+        .remove_outstanding_tx_filters()
+        .await?;
+    Ok(())
+}

core/bin/zksync_core/src/mempool/mod.rs

@@ -725,7 +725,7 @@ impl MempoolTransactionsHandler {
                     resp.send(tx_add_result).unwrap_or_default();
                 }
                 MempoolTransactionRequest::NewPriorityOps(ops, confirmed, resp) => {
-                    let tx_add_result = self.add_priority_op(ops, confirmed).await;
+                    let tx_add_result = self.add_priority_ops(ops, confirmed).await;
                     resp.send(tx_add_result).unwrap_or_default();
                 }
             }

core/lib/config/src/configs/database.rs

@@ -32,7 +32,7 @@ impl DBConfig {
     }
 
     pub fn rejected_transactions_cleaner_interval(&self) -> time::Duration {
-        time::Duration::from_secs(self.rejected_transactions_cleaner_interval * Self::SECS_PER_HOUR)
+        time::Duration::from_secs(self.rejected_transactions_cleaner_interval)
     }
 }