tests passing mostly hardhat

.vscode/launch.json

@@ -19,7 +19,9 @@
                     "kind": "bin"
                 }
             },
-            "args": ["run"],
+            "args": [
+                "run"
+            ],
             "cwd": "${workspaceFolder}"
         },
         {
@@ -41,7 +43,10 @@
                 "RUST_LOG": "vm=trace",
                 "ZKSYNC_HOME": "${workspaceFolder}"
             },
-            "args": ["--dev-use-local-contracts", "run"],
+            "args": [
+                "--dev-use-local-contracts",
+                "run"
+            ],
             "preLaunchTask": "rebuild-contracts",
             "cwd": "${workspaceFolder}"
         },

Cargo.toml

@@ -11,15 +11,15 @@ categories = ["cryptography"]
 publish = false # We don't want to publish our binaries.
 
 [dependencies]
-zksync_basic_types = { git = "https://github.com/matter-labs/zksync-era.git", rev = "a43bc402a204ac92fb74ad348b68f61e24d7a84a" }
-zksync_core = { git = "https://github.com/matter-labs/zksync-era.git", rev = "a43bc402a204ac92fb74ad348b68f61e24d7a84a" }
-vm = { git = "https://github.com/matter-labs/zksync-era.git", rev = "a43bc402a204ac92fb74ad348b68f61e24d7a84a" }
-vlog = { git = "https://github.com/matter-labs/zksync-era.git", rev = "a43bc402a204ac92fb74ad348b68f61e24d7a84a" }
-zksync_contracts = { git = "https://github.com/matter-labs/zksync-era.git", rev = "a43bc402a204ac92fb74ad348b68f61e24d7a84a" }
-zksync_types = { git = "https://github.com/matter-labs/zksync-era.git", rev = "a43bc402a204ac92fb74ad348b68f61e24d7a84a" }
-zksync_utils = { git = "https://github.com/matter-labs/zksync-era.git", rev = "a43bc402a204ac92fb74ad348b68f61e24d7a84a" }
-zksync_state = { git = "https://github.com/matter-labs/zksync-era.git", rev = "a43bc402a204ac92fb74ad348b68f61e24d7a84a" }
-zksync_web3_decl = { git = "https://github.com/matter-labs/zksync-era.git", rev = "a43bc402a204ac92fb74ad348b68f61e24d7a84a" }
+zksync_basic_types = { git = "https://github.com/matter-labs/zksync-era.git", tag = "v7.0.0-rc0" }
+zksync_core = { git = "https://github.com/matter-labs/zksync-era.git", tag = "v7.0.0-rc0" }
+vm = { git = "https://github.com/matter-labs/zksync-era.git", tag = "v7.0.0-rc0" }
+vlog = { git = "https://github.com/matter-labs/zksync-era.git", tag = "v7.0.0-rc0" }
+zksync_contracts = { git = "https://github.com/matter-labs/zksync-era.git", tag = "v7.0.0-rc0" }
+zksync_types = { git = "https://github.com/matter-labs/zksync-era.git", tag = "v7.0.0-rc0" }
+zksync_utils = { git = "https://github.com/matter-labs/zksync-era.git", tag = "v7.0.0-rc0" }
+zksync_state = { git = "https://github.com/matter-labs/zksync-era.git", tag = "v7.0.0-rc0" }
+zksync_web3_decl = { git = "https://github.com/matter-labs/zksync-era.git", tag = "v7.0.0-rc0" }
 
 
 

src/hardhat.rs

@@ -250,7 +250,7 @@ mod tests {
     use std::str::FromStr;
     use zksync_basic_types::{Nonce, H256};
     use zksync_core::api_server::web3::backend_jsonrpc::namespaces::eth::EthNamespaceT;
-    use zksync_types::{api::BlockNumber, fee::Fee, l2::L2Tx};
+    use zksync_types::{api::BlockNumber, fee::Fee, l2::L2Tx, PackedEthSignature};
 
     #[tokio::test]
     async fn test_set_balance() {
@@ -401,6 +401,9 @@ mod tests {
             Default::default(),
         );
         tx.set_input(vec![], H256::random());
+        if tx.common_data.signature.is_empty() {
+            tx.common_data.signature = PackedEthSignature::default().serialize_packed().into();
+        }
 
         // try to execute the tx- should fail without signature
         assert!(node.apply_txs(vec![tx.clone()]).is_err());

src/node.rs

@@ -1220,6 +1220,13 @@ impl<S: ForkSource + std::fmt::Debug> InMemoryNode<S> {
 
         let (keys, result, block, bytecodes) =
             self.run_l2_tx_inner(l2_tx.clone(), execution_mode)?;
+
+        if let ExecutionResult::Halt { reason } = result.result {
+            // Halt means that something went really bad with the transaction execution (in most cases invalid signature,
+            // but it could also be bootloader panic etc).
+            // In such case, we should not persist the VM data, and we should pretend that transaction never existed.
+            return Err(format!("Transaction HALT: {}", reason.to_string()));
+        }
         // Write all the mutated keys (storage slots).
         let mut inner = self
             .inner