diff --git a/Cargo.lock b/Cargo.lock index 8f503bae..b40cf1ce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1072,7 +1072,7 @@ dependencies = [ [[package]] name = "era-compiler-solidity" version = "1.5.8" -source = "git+https://github.com/matter-labs/era-compiler-solidity?branch=az-support-evmla-pushsize#2b0da9ed28045642125af15f3d69d5dce8b070dc" +source = "git+https://github.com/matter-labs/era-compiler-solidity?branch=main#cad69d46f008e96909282921ce79fca6d2fe9b5a" dependencies = [ "anyhow", "clap", @@ -1122,7 +1122,7 @@ dependencies = [ [[package]] name = "era-solc" version = "1.5.8" -source = "git+https://github.com/matter-labs/era-compiler-solidity?branch=az-support-evmla-pushsize#2b0da9ed28045642125af15f3d69d5dce8b070dc" +source = "git+https://github.com/matter-labs/era-compiler-solidity?branch=main#cad69d46f008e96909282921ce79fca6d2fe9b5a" dependencies = [ "anyhow", "boolinator", @@ -1139,7 +1139,7 @@ dependencies = [ [[package]] name = "era-yul" version = "1.5.8" -source = "git+https://github.com/matter-labs/era-compiler-solidity?branch=az-support-evmla-pushsize#2b0da9ed28045642125af15f3d69d5dce8b070dc" +source = "git+https://github.com/matter-labs/era-compiler-solidity?branch=main#cad69d46f008e96909282921ce79fca6d2fe9b5a" dependencies = [ "anyhow", "regex", diff --git a/benchmark_analyzer/src/lib.rs b/benchmark_analyzer/src/lib.rs index 88547fa1..f18b07de 100644 --- a/benchmark_analyzer/src/lib.rs +++ b/benchmark_analyzer/src/lib.rs @@ -12,6 +12,7 @@ pub use self::benchmark::group::element::Element as BenchmarkElement; pub use self::benchmark::group::Group as BenchmarkGroup; pub use self::benchmark::metadata::Metadata; pub use self::benchmark::Benchmark; + /// /// The all elements group name. /// diff --git a/compiler_tester/Cargo.toml b/compiler_tester/Cargo.toml index 5b2a3c12..9fec6205 100644 --- a/compiler_tester/Cargo.toml +++ b/compiler_tester/Cargo.toml @@ -49,8 +49,8 @@ vm2 = { git = "https://github.com/matter-labs/vm2", optional = true, package = " era-compiler-common = { git = "https://github.com/matter-labs/era-compiler-common", branch = "main" } era-compiler-downloader = { git = "https://github.com/matter-labs/era-compiler-common", branch = "main" } era-compiler-llvm-context = { git = "https://github.com/matter-labs/era-compiler-llvm-context", branch = "main" } -era-compiler-solidity = { git = "https://github.com/matter-labs/era-compiler-solidity", branch = "az-support-evmla-pushsize" } -era-solc = { git = "https://github.com/matter-labs/era-compiler-solidity", branch = "az-support-evmla-pushsize" } +era-compiler-solidity = { git = "https://github.com/matter-labs/era-compiler-solidity", branch = "main" } +era-solc = { git = "https://github.com/matter-labs/era-compiler-solidity", branch = "main" } era-compiler-vyper = { git = "https://github.com/matter-labs/era-compiler-vyper", branch = "main" } solidity-adapter = { path = "../solidity_adapter" } diff --git a/compiler_tester/src/test/case/input/deploy_evm.rs b/compiler_tester/src/test/case/input/deploy_evm.rs index ad894d3e..ebb9fdf6 100644 --- a/compiler_tester/src/test/case/input/deploy_evm.rs +++ b/compiler_tester/src/test/case/input/deploy_evm.rs @@ -131,15 +131,14 @@ impl DeployEVM { contract_identifier: self.identifier.clone(), }, ); - + let size = self.deploy_code.len(); let calldata = self.calldata.inner.clone(); let mut code = self.deploy_code; code.extend(self.calldata.inner); let vm = vm.update_deploy_balance(&self.caller); - let mut vm = - vm.fill_deploy_new_transaction(self.caller, self.value, evm_version, code); + let mut vm = vm.fill_deploy_new_transaction(self.caller, self.value, evm_version, code); let result = match vm.state.transact_commit() { Ok(res) => res,