chore: Update contracts (#115)

matter-labs · Oct 18, 2024 · 237ff47 · 237ff47
1 parent 9e0bc1b
commit 237ff47
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/compiler_tester/src/vm/eravm/system_contracts.rs b/compiler_tester/src/vm/eravm/system_contracts.rs
@@ -114,7 +114,7 @@ impl SystemContracts {
 
     /// The EVM gas manager system contract implementation path.
     const PATH_EVM_GAS_MANAGER: &'static str =
-        "era-contracts/system-contracts/contracts/EvmGasManager.sol:EvmGasManager";
+        "era-contracts/system-contracts/contracts/EvmGasManager.yul";
 
     ///
     /// Loads or builds the system contracts.
@@ -187,6 +187,10 @@ impl SystemContracts {
                 web3::types::Address::from_low_u64_be(0x8012),
                 Self::PATH_CODE_ORACLE,
             ),
+            (
+                web3::types::Address::from_low_u64_be(ADDRESS_EVM_GAS_MANAGER.into()),
+                Self::PATH_EVM_GAS_MANAGER,
+            ),
         ];
 
         let solidity_system_contracts = vec![
@@ -241,10 +245,6 @@ impl SystemContracts {
                 web3::types::Address::from_low_u64_be(zkevm_opcode_defs::ADDRESS_ETH_TOKEN.into()),
                 Self::PATH_BASE_TOKEN,
             ),
-            (
-                web3::types::Address::from_low_u64_be(ADDRESS_EVM_GAS_MANAGER.into()),
-                Self::PATH_EVM_GAS_MANAGER,
-            ),
         ];
 
         let mut yul_file_paths = Vec::with_capacity(yul_system_contracts.len() + 1);

diff --git a/era-contracts b/era-contracts
+1 −1		.github/workflows/system-contracts-ci.yaml
+2 −0		.gitignore
+42 −12		l1-contracts/deploy-scripts/DeployL2Contracts.sol
+1 −1		l1-contracts/deploy-scripts/Utils.sol
+155 −0		l1-contracts/deploy-scripts/dev/SetupLegacyBridge.s.sol
+6 −1		l1-contracts/scripts/utils.ts
+2 −1		l1-contracts/test/unit_tests/custom_base_token.spec.ts
+3 −3		l1-contracts/test/unit_tests/l1_shared_bridge_test.spec.ts
+1 −1		l1-contracts/test/unit_tests/l2-upgrade.test.spec.ts
+1 −1		l1-contracts/test/unit_tests/legacy_era_test.spec.ts
+1 −1		l1-contracts/test/unit_tests/mailbox_test.spec.ts
+3 −3		l1-contracts/test/unit_tests/proxy_test.spec.ts
+58 −58		system-contracts/SystemContractsHashes.json
+2,281 −1,551		system-contracts/bootloader/test_infra/Cargo.lock
+6 −6		system-contracts/bootloader/test_infra/Cargo.toml
+1 −1		system-contracts/bootloader/test_infra/rust-toolchain
+3 −3		system-contracts/bootloader/test_infra/src/hook.rs
+33 −20		system-contracts/bootloader/test_infra/src/main.rs
+4 −4		system-contracts/bootloader/test_infra/src/test_count_tracer.rs
+7 −6		system-contracts/bootloader/test_infra/src/tracer.rs
+1 −2		system-contracts/contracts/Constants.sol
+29 −57		system-contracts/contracts/ContractDeployer.sol
+83 −101		system-contracts/contracts/EvmEmulator.yul
+1 −0		system-contracts/contracts/EvmEmulator.yul.llvm.options
+0 −165		system-contracts/contracts/EvmGasManager.sol
+203 −0		system-contracts/contracts/EvmGasManager.yul
+14 −6		system-contracts/contracts/KnownCodesStorage.sol
+0 −2		system-contracts/contracts/interfaces/IContractDeployer.sol
+0 −14		system-contracts/contracts/interfaces/IEvmGasManager.sol
+1 −1		system-contracts/contracts/interfaces/IKnownCodesStorage.sol
+28 −26		system-contracts/contracts/test-contracts/ExtraAbiCaller.zasm
+5 −35		system-contracts/evm-emulator/EvmEmulator.template.yul
+39 −33		system-contracts/evm-emulator/EvmEmulatorFunctions.template.yul
+1 −1		system-contracts/foundry.toml
+5 −5		system-contracts/hardhat.config.ts
+1 −1		system-contracts/package.json
+2 −2		system-contracts/scripts/calculate-hashes.ts
+17 −12		system-contracts/scripts/compile-yul.ts
+2 −2		system-contracts/scripts/compile-zasm.ts
+9 −2		system-contracts/scripts/deploy-preimages.ts
+5 −1		system-contracts/scripts/preprocess-system-contracts.ts
+8 −4		system-contracts/scripts/utils.ts
+99 −14		yarn.lock