diff --git a/.gitmodules b/.gitmodules index eae3273c..ecd25dfb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,4 +9,4 @@ [submodule "era-contracts"] path = era-contracts url = https://github.com/matter-labs/era-contracts - branch = main + branch = sb-1-5-0-evm-eq-integration diff --git a/Cargo.lock b/Cargo.lock index bcaf1c9a..3d47fd2c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2590,7 +2590,7 @@ checksum = "2266fcb904c50fb17fda4c9a751a1715629ecf8b21f4c9d78b4890fb71525d71" [[package]] name = "vm2" version = "0.1.0" -source = "git+https://github.com/matter-labs/vm2#66689ad17c1891d73dbe0fb0cc0a6ca65f453e1c" +source = "git+https://github.com/matter-labs/vm2#02e4b3113c560d2a2d2b23ec29b663f120ac6bab" dependencies = [ "enum_dispatch", "primitive-types", diff --git a/configs/solc-bin-system-contracts.json b/configs/solc-bin-system-contracts.json index 4f247eec..1451b735 100644 --- a/configs/solc-bin-system-contracts.json +++ b/configs/solc-bin-system-contracts.json @@ -1,6 +1,6 @@ { "binaries": { - "0.8.20": { + "0.8.25": { "is_enabled": true, "protocol": "https", "source": "https://github.com/matter-labs/era-solidity/releases/download/${VERSION}-1.0.0/solc-${PLATFORM}-${VERSION}-1.0.0", diff --git a/era-contracts b/era-contracts index 4aa70061..a961d57c 160000 --- a/era-contracts +++ b/era-contracts @@ -1 +1 @@ -Subproject commit 4aa7006153ad571643342dff22c16eaf4a70fdc1 +Subproject commit a961d57cb9f782b3b844c282df669024daa28a68 diff --git a/solidity b/solidity index 30d78788..37d45336 160000 --- a/solidity +++ b/solidity @@ -1 +1 @@ -Subproject commit 30d78788941b5f891c96fe8a1c7b924c32a1478c +Subproject commit 37d45336f795e1aa5b1d842a98bb29eb63a3c778 diff --git a/system-contracts-stable-build b/system-contracts-stable-build index 9a6a69ac..02c38858 100644 Binary files a/system-contracts-stable-build and b/system-contracts-stable-build differ diff --git a/tests b/tests index 5d268ea4..219989f2 160000 --- a/tests +++ b/tests @@ -1 +1 @@ -Subproject commit 5d268ea49c69d10729d6c142b6131df8ad4d80e8 +Subproject commit 219989f2041f56c710899bd4c63cf4304a9cdc7d