From c74eb447596091c66f446e51548ab65e56cc5883 Mon Sep 17 00:00:00 2001
From: Oleksandr Zarudnyi <hedgar2017@gmail.com>
Date: Sat, 7 Dec 2024 13:10:55 +0800
Subject: [PATCH] chore: update the minimal proxy contract assembly (#128)

---
 .gitmodules                |  2 +-
 Cargo.lock                 | 28 ++++++++++++++--------------
 compiler_tester/Cargo.toml |  8 ++++----
 tests                      |  2 +-
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index faaab707..72622394 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "tests"]
     path = tests
     url = https://github.com/matter-labs/era-compiler-tests
-    branch = az-identity-precompile-no-memcopy
+    branch = main
 [submodule "solidity"]
     path = solidity
     url = https://github.com/ethereum/solidity
diff --git a/Cargo.lock b/Cargo.lock
index b2e501dc..d1953aed 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -636,9 +636,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7"
+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
 
 [[package]]
 name = "colorchoice"
@@ -1057,7 +1057,7 @@ dependencies = [
 [[package]]
 name = "era-compiler-llvm-context"
 version = "1.5.0"
-source = "git+https://github.com/matter-labs/era-compiler-llvm-context?branch=az-identity-precompile-no-memcopy#3068d634773ec2074b9baf98be694d45782a17dc"
+source = "git+https://github.com/matter-labs/era-compiler-llvm-context?branch=main#0902a3c9e777e1f3b22ad54c81f1a74f475a375c"
 dependencies = [
  "anyhow",
  "era-compiler-common",
@@ -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-identity-precompile-no-memcopy#34093762e4f2856ae6b8bede0844e5dbff0977b2"
+source = "git+https://github.com/matter-labs/era-compiler-solidity?branch=main#55a36d78bbbdbb2611c13719c116a71c683474cc"
 dependencies = [
  "anyhow",
  "clap",
@@ -1099,7 +1099,7 @@ dependencies = [
 [[package]]
 name = "era-compiler-vyper"
 version = "1.5.8"
-source = "git+https://github.com/matter-labs/era-compiler-vyper?branch=az-identity-precompile-no-memcopy#1369f180ada4114a522b65221b56be9ced4006c9"
+source = "git+https://github.com/matter-labs/era-compiler-vyper?branch=main#0a9ad163aaa761af7fe7b8ccd9936ce42526402e"
 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-identity-precompile-no-memcopy#34093762e4f2856ae6b8bede0844e5dbff0977b2"
+source = "git+https://github.com/matter-labs/era-compiler-solidity?branch=main#55a36d78bbbdbb2611c13719c116a71c683474cc"
 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-identity-precompile-no-memcopy#34093762e4f2856ae6b8bede0844e5dbff0977b2"
+source = "git+https://github.com/matter-labs/era-compiler-solidity?branch=main#55a36d78bbbdbb2611c13719c116a71c683474cc"
 dependencies = [
  "anyhow",
  "regex",
@@ -2373,14 +2373,14 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "3.7.0"
+version = "3.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8781a75c6205af67215f382092b6e0a4ff3734798523e69073d4bcd294ec767b"
+checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c"
 dependencies = [
  "proc-macro-crate 3.2.0",
  "proc-macro2",
  "quote",
- "syn 2.0.90",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -3588,9 +3588,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.41.1"
+version = "1.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33"
+checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
 dependencies = [
  "backtrace",
  "bytes",
@@ -3623,9 +3623,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.12"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
  "bytes",
  "futures-core",
diff --git a/compiler_tester/Cargo.toml b/compiler_tester/Cargo.toml
index 9a9eceb3..9fec6205 100644
--- a/compiler_tester/Cargo.toml
+++ b/compiler_tester/Cargo.toml
@@ -48,10 +48,10 @@ 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 = "az-identity-precompile-no-memcopy" }
-era-compiler-solidity = { git = "https://github.com/matter-labs/era-compiler-solidity", branch = "az-identity-precompile-no-memcopy" }
-era-solc = { git = "https://github.com/matter-labs/era-compiler-solidity", branch = "az-identity-precompile-no-memcopy" }
-era-compiler-vyper = { git = "https://github.com/matter-labs/era-compiler-vyper", branch = "az-identity-precompile-no-memcopy" }
+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 = "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" }
 benchmark-analyzer = { path = "../benchmark_analyzer" }
diff --git a/tests b/tests
index 9549358c..bc1cd8e1 160000
--- a/tests
+++ b/tests
@@ -1 +1 @@
-Subproject commit 9549358c0cf1c5a4846511f08d34ff8781a39cd2
+Subproject commit bc1cd8e1ac2cf7f6ce5f5e9ec1f68188c171607a