Skip to content

Commit

Permalink
Update system contracts to main (#12)
Browse files Browse the repository at this point in the history
  • Loading branch information
@hedgar2017
hedgar2017 authored Apr 14, 2024
1 parent d0d2562 commit 09d2f84
Show file tree
Hide file tree
Showing 7 changed files with 60 additions and 53 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
/llvm/

# External compilers
/solc-bin/*
/solc-bin*/*
/vyper-bin/*

# The debug and trace artifacts
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
[submodule "era-contracts"]
path = era-contracts
url = https://github.com/matter-labs/era-contracts
branch = release-v20-1.4.1-short-term-fee-model
branch = main
103 changes: 55 additions & 48 deletions Cargo.lock
View file

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

2 changes: 1 addition & 1 deletion era-contracts
Submodule era-contracts updated 80 files
+17 −6 .github/workflows/build-release.yaml
+5 −5 .github/workflows/l1-contracts-ci.yaml
+3 −3 .github/workflows/l2-contracts-ci.yaml
+2 −2 .github/workflows/nodejs-license.yaml
+5 −5 .github/workflows/system-contracts-ci.yaml
+9 −6 l1-contracts/contracts/common/L2ContractAddresses.sol
+7 −14 l1-contracts/contracts/dev-contracts/test/ExecutorProvingTest.sol
+22 −0 l1-contracts/contracts/upgrades/Upgrade_4844.sol
+3 −0 l1-contracts/contracts/zksync/Config.sol
+3 −0 l1-contracts/contracts/zksync/DiamondInit.sol
+2 −0 l1-contracts/contracts/zksync/Storage.sol
+37 −14 l1-contracts/contracts/zksync/ValidatorTimelock.sol
+4 −4 l1-contracts/contracts/zksync/Verifier.sol
+161 −53 l1-contracts/contracts/zksync/facets/Executor.sol
+57 −2 l1-contracts/contracts/zksync/interfaces/IExecutor.sol
+33 −0 l1-contracts/contracts/zksync/utils/BlobVersionedHashRetriever.yul
+1 −1 l1-contracts/foundry.toml
+3 −0 l1-contracts/hardhat.config.ts
+2 −0 l1-contracts/scripts/deploy-erc20.ts
+2 −0 l1-contracts/scripts/deploy-testkit.ts
+3 −1 l1-contracts/scripts/deploy-testnet-token.ts
+2 −0 l1-contracts/scripts/deploy-withdrawal-helpers.ts
+1 −0 l1-contracts/scripts/deploy.ts
+3 −1 l1-contracts/scripts/migrate-governance.ts
+3 −1 l1-contracts/scripts/read-variable.ts
+3 −1 l1-contracts/scripts/revert-reason.ts
+11 −1 l1-contracts/scripts/utils.ts
+2 −0 l1-contracts/scripts/verify.ts
+29 −6 l1-contracts/src.ts/deploy-utils.ts
+54 −3 l1-contracts/src.ts/deploy.ts
+2 −1 l1-contracts/test/foundry/unit/concrete/Admin/_Admin_Shared.t.sol
+2 −1 l1-contracts/test/foundry/unit/concrete/Bridge/L1WethBridge/_L1WethBridge_Shared.t.sol
+2 −1 l1-contracts/test/foundry/unit/concrete/DiamondCut/UpgradeLogic.t.sol
+1 −1 l1-contracts/test/foundry/unit/concrete/Executor/Authorization.t.sol
+519 −39 l1-contracts/test/foundry/unit/concrete/Executor/Committing.t.sol
+19 −20 l1-contracts/test/foundry/unit/concrete/Executor/Executing.t.sol
+7 −8 l1-contracts/test/foundry/unit/concrete/Executor/Proving.t.sol
+7 −8 l1-contracts/test/foundry/unit/concrete/Executor/Reverting.t.sol
+5 −2 l1-contracts/test/foundry/unit/concrete/Executor/_Executor_Shared.t.sol
+99 −19 l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol
+46 −16 l1-contracts/test/foundry/unit/concrete/Utils/Utils.t.sol
+123 −0 l1-contracts/test/foundry/unit/concrete/ValidatorTimelock.t.sol
+12 −6 l1-contracts/test/unit_tests/executor_proof.spec.ts
+1 −0 l1-contracts/test/unit_tests/l1_erc20_bridge_test.spec.ts
+1 −0 l1-contracts/test/unit_tests/l1_weth_bridge_test.spec.ts
+3 −2 l1-contracts/test/unit_tests/l2-upgrade.test.spec.ts
+1 −0 l1-contracts/test/unit_tests/mailbox_test.spec.ts
+1 −0 l1-contracts/test/unit_tests/proxy_test.spec.ts
+6 −1 l1-contracts/test/unit_tests/utils.ts
+6 −5 l1-contracts/test/unit_tests/validator_timelock_test.spec.ts
+2 −1 l2-contracts/package.json
+3 −1 l2-contracts/src/deployForceDeployUpgrader.ts
+3 −1 l2-contracts/src/deployTestnetPaymaster.ts
+3 −1 l2-contracts/src/publish-bridge-preimages.ts
+188 −0 l2-contracts/src/updateL2ERC20Metadata.ts
+2 −0 l2-contracts/src/upgradeBridgeImpl.ts
+9 −3 l2-contracts/src/utils.ts
+1 −0 l2-contracts/src/verify.ts
+31 −24 system-contracts/SystemContractsHashes.json
+4 −4 system-contracts/bootloader/bootloader.yul
+22 −21 system-contracts/bootloader/test_infra/Cargo.lock
+6 −6 system-contracts/bootloader/test_infra/Cargo.toml
+12 −1 system-contracts/bootloader/tests/bootloader/bootloader_test.yul
+18 −3 system-contracts/contracts/Constants.sol
+8 −1 system-contracts/contracts/L1Messenger.sol
+58 −0 system-contracts/contracts/PubdataChunkPublisher.sol
+13 −0 system-contracts/contracts/interfaces/IPubdataChunkPublisher.sol
+3 −1 system-contracts/scripts/compile-yul.ts
+5 −0 system-contracts/scripts/constants.ts
+1 −0 system-contracts/scripts/deploy-preimages.ts
+8 −7 system-contracts/scripts/preprocess-bootloader.ts
+1 −0 system-contracts/scripts/utils.ts
+1 −72 system-contracts/test/Compressor.spec.ts
+529 −0 system-contracts/test/L1Messenger.spec.ts
+60 −0 system-contracts/test/PubdataChunkPublisher.spec.ts
+2 −0 system-contracts/test/shared/constants.ts
+6 −0 system-contracts/test/shared/mocks.ts
+76 −1 system-contracts/test/shared/utils.ts
+1 −1 tools/README.md
+17 −17 tools/data/scheduler_key.json
2 changes: 1 addition & 1 deletion solidity
Submodule solidity updated 96 files
+0 −8 .circleci/config.yml
+2 −0 Changelog.md
+11 −17 libsmtutil/SolverInterface.h
+2 −0 libsmtutil/Z3Interface.cpp
+1 −1 libsolidity/analysis/TypeChecker.cpp
+0 −0 test/cmdlineTests/import_asm_json_all_valid_flags/args
+0 −0 test/cmdlineTests/import_asm_json_all_valid_flags/output
+0 −0 test/cmdlineTests/import_asm_json_all_valid_flags/stdin
+0 −0 test/cmdlineTests/import_asm_json_difficulty_prevrandao/args
+0 −0 test/cmdlineTests/import_asm_json_difficulty_prevrandao/output
+0 −0 test/cmdlineTests/import_asm_json_difficulty_prevrandao/stdin
+0 −0 test/cmdlineTests/import_asm_json_hex_subassembly_indices/args
+0 −0 test/cmdlineTests/import_asm_json_hex_subassembly_indices/output
+0 −0 test/cmdlineTests/import_asm_json_hex_subassembly_indices/stdin
+0 −0 test/cmdlineTests/import_asm_json_invalid_data_not_hex/args
+0 −0 test/cmdlineTests/import_asm_json_invalid_data_not_hex/err
+0 −0 test/cmdlineTests/import_asm_json_invalid_data_not_hex/exit
+0 −0 test/cmdlineTests/import_asm_json_invalid_data_not_hex/stdin
+0 −0 test/cmdlineTests/import_asm_json_invalid_data_not_object/args
+0 −0 test/cmdlineTests/import_asm_json_invalid_data_not_object/err
+0 −0 test/cmdlineTests/import_asm_json_invalid_data_not_object/exit
+0 −0 test/cmdlineTests/import_asm_json_invalid_data_not_object/stdin
+0 −0 test/cmdlineTests/import_asm_json_invalid_jumptype_instruction/args
+0 −0 test/cmdlineTests/import_asm_json_invalid_jumptype_instruction/err
+0 −0 test/cmdlineTests/import_asm_json_invalid_jumptype_instruction/exit
+0 −0 test/cmdlineTests/import_asm_json_invalid_jumptype_instruction/stdin
+0 −0 test/cmdlineTests/import_asm_json_invalid_value/args
+0 −0 test/cmdlineTests/import_asm_json_invalid_value/err
+0 −0 test/cmdlineTests/import_asm_json_invalid_value/exit
+0 −0 test/cmdlineTests/import_asm_json_invalid_value/stdin
+0 −0 test/cmdlineTests/import_asm_json_missing_subobject_indices/args
+0 −0 test/cmdlineTests/import_asm_json_missing_subobject_indices/err
+0 −0 test/cmdlineTests/import_asm_json_missing_subobject_indices/exit
+0 −0 test/cmdlineTests/import_asm_json_missing_subobject_indices/stdin
+0 −0 test/cmdlineTests/import_asm_json_no_value/args
+0 −0 test/cmdlineTests/import_asm_json_no_value/err
+0 −0 test/cmdlineTests/import_asm_json_no_value/exit
+0 −0 test/cmdlineTests/import_asm_json_no_value/stdin
+0 −0 test/cmdlineTests/import_asm_json_non_unique_sources/args
+0 −0 test/cmdlineTests/import_asm_json_non_unique_sources/err
+0 −0 test/cmdlineTests/import_asm_json_non_unique_sources/exit
+0 −0 test/cmdlineTests/import_asm_json_non_unique_sources/stdin
+0 −0 test/cmdlineTests/import_asm_json_optimize_not_supported/args
+0 −0 test/cmdlineTests/import_asm_json_optimize_not_supported/err
+0 −0 test/cmdlineTests/import_asm_json_optimize_not_supported/exit
+0 −0 test/cmdlineTests/import_asm_json_optimize_not_supported/stdin
+0 −0 test/cmdlineTests/import_asm_json_out_of_range_data_index/args
+0 −0 test/cmdlineTests/import_asm_json_out_of_range_data_index/err
+0 −0 test/cmdlineTests/import_asm_json_out_of_range_data_index/exit
+0 −0 test/cmdlineTests/import_asm_json_out_of_range_data_index/stdin
+0 −0 test/cmdlineTests/import_asm_json_random_order_data_index/args
+0 −0 test/cmdlineTests/import_asm_json_random_order_data_index/output
+0 −0 test/cmdlineTests/import_asm_json_random_order_data_index/stdin
+0 −0 test/cmdlineTests/import_asm_json_unrecognized_field/args
+0 −0 test/cmdlineTests/import_asm_json_unrecognized_field/err
+0 −0 test/cmdlineTests/import_asm_json_unrecognized_field/exit
+0 −0 test/cmdlineTests/import_asm_json_unrecognized_field/stdin
+0 −0 test/cmdlineTests/import_asm_json_untagged_jumpdest/args
+0 −0 test/cmdlineTests/import_asm_json_untagged_jumpdest/err
+0 −0 test/cmdlineTests/import_asm_json_untagged_jumpdest/exit
+0 −0 test/cmdlineTests/import_asm_json_untagged_jumpdest/stdin
+0 −0 test/cmdlineTests/import_asm_json_verbatim/args
+0 −0 test/cmdlineTests/import_asm_json_verbatim/output
+0 −0 test/cmdlineTests/import_asm_json_verbatim/stdin
+0 −0 test/cmdlineTests/import_asm_json_yul_more_subobjects/args
+0 −0 test/cmdlineTests/import_asm_json_yul_more_subobjects/output
+0 −0 test/cmdlineTests/import_asm_json_yul_more_subobjects/stdin
+0 −0 test/cmdlineTests/import_asm_json_yul_subobjects/args
+0 −0 test/cmdlineTests/import_asm_json_yul_subobjects/output
+0 −0 test/cmdlineTests/import_asm_json_yul_subobjects/stdin
+0 −0 test/cmdlineTests/standard_import_asm_json/input.json
+0 −0 test/cmdlineTests/standard_import_asm_json/output.json
+0 −0 test/cmdlineTests/standard_import_asm_json_immutable_references/input.json
+0 −0 test/cmdlineTests/standard_import_asm_json_immutable_references/output.json
+0 −0 test/cmdlineTests/standard_import_asm_json_invalid_input_array/input.json
+0 −0 test/cmdlineTests/standard_import_asm_json_invalid_input_array/output.json
+0 −0 test/cmdlineTests/standard_import_asm_json_invalid_key_inside_source/input.json
+0 −0 test/cmdlineTests/standard_import_asm_json_invalid_key_inside_source/output.json
+0 −0 test/cmdlineTests/standard_import_asm_json_invalid_key_other_source/input.json
+0 −0 test/cmdlineTests/standard_import_asm_json_invalid_key_other_source/output.json
+0 −0 test/cmdlineTests/standard_import_asm_json_invalid_no_source/input.json
+0 −0 test/cmdlineTests/standard_import_asm_json_invalid_no_source/output.json
+0 −0 test/cmdlineTests/standard_import_asm_json_invalid_opcode/input.json
+0 −0 test/cmdlineTests/standard_import_asm_json_invalid_opcode/output.json
+0 −0 test/cmdlineTests/standard_import_asm_json_invalid_two_sources/input.json
+0 −0 test/cmdlineTests/standard_import_asm_json_invalid_two_sources/output.json
+0 −0 test/cmdlineTests/standard_import_asm_json_link_references/input.json
+0 −0 test/cmdlineTests/standard_import_asm_json_link_references/output.json
+0 −0 test/cmdlineTests/standard_import_asm_json_multiple_keys_inside_source/input.json
+0 −0 test/cmdlineTests/standard_import_asm_json_multiple_keys_inside_source/output.json
+0 −0 test/cmdlineTests/standard_import_asm_json_no_output_selection/input.json
+0 −0 test/cmdlineTests/standard_import_asm_json_no_output_selection/output.json
+17 −0 test/libsolidity/smtCheckerTests/operators/bitwise_and_array.sol
+25 −0 test/libsolidity/smtCheckerTests/types/mapping_integer_signedness_compatibility.sol
+1 −1 test/libsolidity/syntaxTests/denominations/combining_hex_and_denomination.sol
+1 −1 test/libsolidity/syntaxTests/denominations/invalid_denomination_address.sol
Binary file modified system-contracts-stable-build
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion tests
Submodule tests updated 10 files
+2 −2 llvm/memset/memset_0.ll
+2 −2 llvm/memset/memset_0n.ll
+2 −2 llvm/memset/memset_20.ll
+2 −2 llvm/memset/memset_20n.ll
+2 −2 llvm/memset/memset_32.ll
+2 −2 llvm/memset/memset_32n.ll
+2 −2 llvm/memset/memset_41.ll
+2 −2 llvm/memset/memset_41n.ll
+2 −2 llvm/memset/memset_64.ll
+2 −2 llvm/memset/memset_64n.ll

0 comments on commit 09d2f84

Please sign in to comment.