Update deps and submodules

matter-labs · Apr 17, 2024 · bfcbe5e · bfcbe5e
1 parent 6afbef6
commit bfcbe5e
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git 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
diff --git 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
diff --git a/solidity b/solidity
diff --git a/system-contracts-stable-build b/system-contracts-stable-build
diff --git a/tests b/tests
+0 −0		.github/workflows/build-release-manual.yaml
+50 −0		.github/workflows/buld-release.yaml
+1 −1		.github/workflows/system-contracts-ci.yaml
+7 −0		.prettierignore
+1 −0		.solhintignore
+2 −2		l1-contracts/contracts/common/libraries/L2ContractHelper.sol
+41 −12		l1-contracts/contracts/zksync/facets/Executor.sol
+5 −0		l1-contracts/contracts/zksync/interfaces/IExecutor.sol
+1 −0		l1-contracts/contracts/zksync/libraries/TransactionValidator.sol
+65 −10		l1-contracts/scripts/deploy-erc20.ts
+1 −4		l1-contracts/scripts/utils.ts
+35 −11		l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol
+2 −2		l1-contracts/test/unit_tests/executor_proof.spec.ts
+3 −9		l2-contracts/src/utils.ts
+278 −93		system-contracts/bootloader/bootloader.yul
+224 −729		system-contracts/bootloader/test_infra/Cargo.lock
+6 −6		system-contracts/bootloader/test_infra/Cargo.toml
+1 −1		system-contracts/bootloader/test_infra/src/hook.rs
+2 −2		system-contracts/bootloader/test_infra/src/test_count_tracer.rs
+2 −2		system-contracts/bootloader/test_infra/src/tracer.rs
+4 −4		system-contracts/bootloader/tests/bootloader/bootloader_test.yul
+7 −1		system-contracts/contracts/AccountCodeStorage.sol
+10 −4		system-contracts/contracts/BootloaderUtilities.sol
+1 −1		system-contracts/contracts/ComplexUpgrader.sol
+1 −1		system-contracts/contracts/Compressor.sol
+24 −1		system-contracts/contracts/Constants.sol
+155 −24		system-contracts/contracts/ContractDeployer.sol
+7 −1		system-contracts/contracts/DefaultAccount.sol
+1 −1		system-contracts/contracts/EmptyContract.sol
+4 −0		system-contracts/contracts/EvmConstants.sol
+147 −0		system-contracts/contracts/EvmGasManager.sol
+2,498 −0		system-contracts/contracts/EvmInterpreter.sol
+156 −0		system-contracts/contracts/EvmOpcodes.sol
+84 −0		system-contracts/contracts/GasBoundCaller.sol
+1 −1		system-contracts/contracts/ImmutableSimulator.sol
+20 −2		system-contracts/contracts/KnownCodesStorage.sol
+13 −17		system-contracts/contracts/L1Messenger.sol
+1 −1		system-contracts/contracts/L2EthToken.sol
+25 −5		system-contracts/contracts/MsgValueSimulator.sol
+4 −3		system-contracts/contracts/NonceHolder.sol
+1 −1		system-contracts/contracts/PubdataChunkPublisher.sol
+24 −1		system-contracts/contracts/SystemContext.sol
+1 −1		system-contracts/contracts/interfaces/IAccount.sol
+3 −1		system-contracts/contracts/interfaces/IAccountCodeStorage.sol
+1 −1		system-contracts/contracts/interfaces/IBootloaderUtilities.sol
+1 −1		system-contracts/contracts/interfaces/IComplexUpgrader.sol
+1 −1		system-contracts/contracts/interfaces/ICompressor.sol
+39 −1		system-contracts/contracts/interfaces/IContractDeployer.sol
+1 −1		system-contracts/contracts/interfaces/IEthToken.sol
+1 −1		system-contracts/contracts/interfaces/IImmutableSimulator.sol
+3 −1		system-contracts/contracts/interfaces/IKnownCodesStorage.sol
+1 −1		system-contracts/contracts/interfaces/IL1Messenger.sol
+1 −1		system-contracts/contracts/interfaces/IL2StandardToken.sol
+1 −1		system-contracts/contracts/interfaces/IMailbox.sol
+1 −1		system-contracts/contracts/interfaces/INonceHolder.sol
+1 −1		system-contracts/contracts/interfaces/IPaymaster.sol
+1 −1		system-contracts/contracts/interfaces/IPaymasterFlow.sol
+1 −1		system-contracts/contracts/interfaces/IPubdataChunkPublisher.sol
+5 −1		system-contracts/contracts/interfaces/ISystemContext.sol
+1 −1		system-contracts/contracts/interfaces/ISystemContextDeprecated.sol
+1 −1		system-contracts/contracts/interfaces/ISystemContract.sol
+1 −1		system-contracts/contracts/libraries/EfficientCall.sol
+1 −1		system-contracts/contracts/libraries/RLPEncoder.sol
+83 −18		system-contracts/contracts/libraries/SystemContractHelper.sol
+5 −1		system-contracts/contracts/libraries/SystemContractsCaller.sol
+10 −4		system-contracts/contracts/libraries/TransactionHelper.sol
+1 −1		system-contracts/contracts/libraries/UnsafeBytesCalldata.sol
+61 −2		system-contracts/contracts/libraries/Utils.sol
+161 −0		system-contracts/contracts/precompiles/CodeOracle.yul
+101 −0		system-contracts/contracts/precompiles/P256Verify.yul
+41 −0		system-contracts/contracts/test-contracts/CodeOracleTest.sol
+1 −1		system-contracts/contracts/test-contracts/Deployable.sol
+2 −2		system-contracts/contracts/test-contracts/ExtraAbiCaller.zasm
+146 −0		system-contracts/contracts/test-contracts/GasBoundCallerTester.sol
+1 −1		system-contracts/contracts/test-contracts/MockContract.sol
+1 −1		system-contracts/contracts/test-contracts/SystemCaller.sol
+51 −0		system-contracts/contracts/test-contracts/TransferTest.sol
+22 −5		system-contracts/hardhat.config.ts
+6 −2		system-contracts/package.json
+7 −6		system-contracts/scripts/compile-yul.ts
+2 −1		system-contracts/scripts/compile-zasm.ts
+12 −0		system-contracts/scripts/constants.ts
+1 −1		system-contracts/scripts/preprocess-bootloader.ts
+19 −4		system-contracts/scripts/utils.ts
+94 −0		system-contracts/test/CodeOracle.spec.ts
+109 −0		system-contracts/test/GasBoundCaller.spec.ts
+17 −67		system-contracts/test/Keccak256.spec.ts
+1 −1		system-contracts/test/L1Messenger.spec.ts
+90 −0		system-contracts/test/MsgValueSimulator.spec.ts
+162 −0		system-contracts/test/P256Verify.spec.ts
+4 −0		system-contracts/test/shared/constants.ts
+1 −1		system-contracts/test/shared/utils.ts
+170 −5		yarn.lock
+4 −5		docs/types/conversion.rst
+20 −0		test/libsolidity/syntaxTests/types/hex_string_to_bytesNN_different_size_implicit.sol