Skip to content

Commit

Permalink
Merge branch 'main' into az-update-minimal-proxy
Browse files Browse the repository at this point in the history
  • Loading branch information
hedgar2017 committed Dec 6, 2024
2 parents af6bae7 + fdf40e2 commit f33a565
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 16 deletions.
28 changes: 14 additions & 14 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion compiler_tester/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ era-compiler-downloader = { git = "https://github.com/matter-labs/era-compiler-c
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" }
era-compiler-vyper = { git = "https://github.com/matter-labs/era-compiler-vyper", branch = "az-update-minimal-proxy" }

solidity-adapter = { path = "../solidity_adapter" }
benchmark-analyzer = { path = "../benchmark_analyzer" }
Expand Down
10 changes: 9 additions & 1 deletion compiler_tester/src/vm/eravm/system_contracts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ impl SystemContracts {
const PATH_SHA256: &'static str =
"era-contracts/system-contracts/contracts/precompiles/SHA256.yul";

/// The `identity` system contract implementation path.
const PATH_IDENTITY: &'static str = "tests/solidity/simple/system/identity.sol:Identity";

/// The `ecadd` system contract implementation path.
const PATH_ECADD: &'static str =
"era-contracts/system-contracts/contracts/precompiles/EcAdd.yul";
Expand Down Expand Up @@ -194,6 +197,10 @@ impl SystemContracts {

let solidity_system_contracts = vec![
(web3::types::Address::zero(), Self::PATH_EMPTY_CONTRACT),
(
web3::types::Address::from_low_u64_be(zkevm_opcode_defs::ADDRESS_IDENTITY.into()),
Self::PATH_IDENTITY,
),
(
web3::types::Address::from_low_u64_be(
zkevm_opcode_defs::ADDRESS_ACCOUNT_CODE_STORAGE.into(),
Expand Down Expand Up @@ -274,8 +281,9 @@ impl SystemContracts {
debug_config.clone(),
)?;

let mut solidity_file_paths = Vec::with_capacity(solidity_system_contracts.len() + 1);
let mut solidity_file_paths = Vec::with_capacity(solidity_system_contracts.len() + 2);
for pattern in [
"tests/solidity/simple/system/identity.sol",
"era-contracts/system-contracts/contracts/*.sol",
"era-contracts/system-contracts/contracts/libraries/**/*.sol",
"era-contracts/system-contracts/contracts/interfaces/**/*.sol",
Expand Down
Binary file modified system-contracts-stable-build
Binary file not shown.

0 comments on commit f33a565

Please sign in to comment.