chore: update Rust, deps, and submodules

matter-labs · May 8, 2024 · 9d74f8b · 9d74f8b
1 parent 24fe436
commit 9d74f8b
Show file tree

Hide file tree

Showing 8 changed files with 3,058 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/compiler_tester/Cargo.toml b/compiler_tester/Cargo.toml
@@ -19,23 +19,23 @@ doctest = false
 [dependencies]
 structopt = { version = "0.3", default-features = false }
 anyhow = "1.0"
-which = "5.0"
+which = "6.0"
 colored = "2.1"
 
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_yaml = "0.9"
 md5 = "0.7"
 hex = "0.4"
-sha3 = "0.10.6"
+sha3 = "0.10"
 ron = "0.8"
 rlp = "0.5"
 regex = "1.9"
 glob = "0.3"
 semver = { version = "1.0", features = ["serde"] }
 itertools = "0.12"
 once_cell = "1.19"
-rayon = "1.8"
+rayon = "1.9"
 lazy_static = "1.4"
 bincode = "1.3"
 evm = { git = "https://github.com/rust-ethereum/evm", branch = "master" }

diff --git a/compiler_tester/src/directories/matter_labs/test/metadata/case/input/expected/mod.rs b/compiler_tester/src/directories/matter_labs/test/metadata/case/input/expected/mod.rs
@@ -8,8 +8,8 @@ use serde::Deserialize;
 
 use crate::compilers::mode::Mode;
 
-use self::variant::Variant;
 use self::variant::extended::Extended;
+use self::variant::Variant;
 
 ///
 /// The Matter Labs compiler test metadata expected data variant.

diff --git a/compiler_tester/src/directories/matter_labs/test/mod.rs b/compiler_tester/src/directories/matter_labs/test/mod.rs
@@ -340,7 +340,9 @@ impl MatterLabsTest {
                         value: None,
                         storage: HashMap::new(),
                         expected: Some(
-                            MatterLabsCaseInputExpected::successful_evm_interpreter_benchmark(false),
+                            MatterLabsCaseInputExpected::successful_evm_interpreter_benchmark(
+                                false,
+                            ),
                         ),
                     },
                     MatterLabsCaseInput {
@@ -355,11 +357,15 @@ impl MatterLabsTest {
                         value: None,
                         storage: HashMap::new(),
                         expected: Some(
-                            MatterLabsCaseInputExpected::successful_evm_interpreter_benchmark(exception),
+                            MatterLabsCaseInputExpected::successful_evm_interpreter_benchmark(
+                                exception,
+                            ),
                         ),
                     },
                 ],
-                expected: MatterLabsCaseInputExpected::successful_evm_interpreter_benchmark(exception),
+                expected: MatterLabsCaseInputExpected::successful_evm_interpreter_benchmark(
+                    exception,
+                ),
                 ignore: false,
                 cycles: None,
             })

diff --git a/compiler_tester/src/test/case/input/runtime.rs b/compiler_tester/src/test/case/input/runtime.rs
@@ -107,7 +107,8 @@ impl Runtime {
                 .return_data
                 .remove(0)
                 .unwrap_certain_as_ref()
-                .as_u64() - EraVM::EVM_INTERPRETER_GAS_OVERHEAD
+                .as_u64()
+                - EraVM::EVM_INTERPRETER_GAS_OVERHEAD
         } else {
             0
         };

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
 profile = "default"
-channel = "1.77.2"
+channel = "1.78.0"
diff --git a/solidity b/solidity
diff --git a/solidity_adapter/Cargo.toml b/solidity_adapter/Cargo.toml
@@ -24,7 +24,7 @@ colored = "2.0"
 serde = { version = "1.0", features = [ "derive" ] }
 serde_yaml = "0.9"
 semver = { version = "1.0", features = [ "serde" ] }
-regex = "1.7"
+regex = "1.9"
 md5 = "0.7"
 
 era-compiler-common = { git = "https://github.com/matter-labs/era-compiler-common", branch = "main" }
+1 −0		Changelog.md
+92 −91		docs/internals/optimizer.rst
+20 −1		libsolidity/formal/SMTEncoder.cpp
+1 −1		test/cmdlineTests/model_checker_invariants_all/err
+1 −1		test/cmdlineTests/model_checker_invariants_contract_reentrancy/err
+8 −12		test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal.sol
+8 −12		test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal_no_unproved.sol
+7 −10		test/libsolidity/smtCheckerTests/abi/abi_encode_string_literal.sol
+9 −12		test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_string_literal.sol
+2 −5		test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice.sol
+2 −5		test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice_2.sol
+8 −12		test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_string_literal.sol
+23 −0		test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_array.sol
+23 −0		test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_string_literal.sol
+2 −2		test/libsolidity/smtCheckerTests/external_calls/call_mutex_unsafe.sol
+1 −1		test/libsolidity/smtCheckerTests/types/array_literal_3.sol