Merge pull request #2295 from matter-labs/sb-custom-da-with-sl

feat!: Custom DA with SyncLayer
matter-labs · Jun 25, 2024 · 8b8d427 · 8b8d427
2 parents 87dad50 + 8badad6
commit 8b8d427
Show file tree

Hide file tree

Showing 74 changed files with 1,052 additions and 328 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts b/contracts
diff --git a/core/bin/system-constants-generator/src/utils.rs b/core/bin/system-constants-generator/src/utils.rs
@@ -230,6 +230,7 @@ pub(super) fn execute_internal_transfer_test() -> u32 {
         execution_mode: TxExecutionMode::VerifyExecute,
         default_validation_computational_gas_limit: BATCH_COMPUTATIONAL_GAS_LIMIT,
         chain_id: L2ChainId::default(),
+        pubdata_params: Default::default(),
     };
 
     let eth_token_sys_contract = load_sys_contract("L2BaseToken");
@@ -313,6 +314,7 @@ pub(super) fn execute_user_txs_in_test_gas_vm(
         execution_mode: TxExecutionMode::VerifyExecute,
         default_validation_computational_gas_limit: BATCH_COMPUTATIONAL_GAS_LIMIT,
         chain_id: L2ChainId::default(),
+        pubdata_params: Default::default(),
     };
 
     let mut vm: Vm<_, HistoryEnabled> =

diff --git a/core/lib/contracts/src/lib.rs b/core/lib/contracts/src/lib.rs
@@ -183,6 +183,10 @@ pub fn l1_messenger_contract() -> Contract {
     load_sys_contract("L1Messenger")
 }
 
+pub fn l2_rollup_da_validator_bytecode() -> Vec<u8> {
+    read_bytecode_from_path("contracts/l2-contracts/artifacts-zk/contracts/data-availability/RollupL2DAValidator.sol/RollupL2DAValidator.json")
+}
+
 /// Reads bytecode from the path RELATIVE to the Cargo workspace location.
 pub fn read_bytecode(relative_path: impl AsRef<Path> + std::fmt::Debug) -> Vec<u8> {
     read_bytecode_from_path(relative_path)

diff --git a/...2945b091fece95bb85f954230c26ba78540a.json → ...102932a06baec784942cd8c975ed7c53a72f.json b/...2945b091fece95bb85f954230c26ba78540a.json → ...102932a06baec784942cd8c975ed7c53a72f.json
diff --git a/...4d38c6631b37c2894c2ff16449e7a2b0c7a2.json → ...0a68fe5eaf687131ae56fc0c5b0ed565c27e.json b/...4d38c6631b37c2894c2ff16449e7a2b0c7a2.json → ...0a68fe5eaf687131ae56fc0c5b0ed565c27e.json
diff --git a/...5eb58a0cc4e868ac01a12fae52f7be6b739d.json → ...828b7a436ed538a6e08b69b9462de72a02ea.json b/...5eb58a0cc4e868ac01a12fae52f7be6b739d.json → ...828b7a436ed538a6e08b69b9462de72a02ea.json
diff --git a/...cf7e45774cb5aa8b1d27bdecacc8de4956ea.json → ...446fda4355360c5ddbe0ac40a45a7c4b82da.json b/...cf7e45774cb5aa8b1d27bdecacc8de4956ea.json → ...446fda4355360c5ddbe0ac40a45a7c4b82da.json
diff --git a/...25fad494a512ba92df95439d2d7fe0f3a285.json → ...5b344ff7492c579568ead57a4b9aecbd5795.json b/...25fad494a512ba92df95439d2d7fe0f3a285.json → ...5b344ff7492c579568ead57a4b9aecbd5795.json
+1 −0		.gitignore
+6 −6		l1-contracts/contracts/bridgehub/ISTMDeploymentTracker.sol
+2 −1		l1-contracts/contracts/bridgehub/STMDeploymentTracker.sol
+11 −0		l1-contracts/contracts/common/interfaces/IL1Messenger.sol
+1 −1		l1-contracts/contracts/dev-contracts/test/ExecutorProvingTest.sol
+6 −6		l1-contracts/contracts/dev-contracts/test/TestExecutor.sol
+6 −0		l1-contracts/contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol
+24 −0		l1-contracts/contracts/state-transition/chain-deps/facets/Admin.sol
+29 −150		l1-contracts/contracts/state-transition/chain-deps/facets/Executor.sol
+11 −0		l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol
+9 −4		l1-contracts/contracts/state-transition/chain-interfaces/IExecutor.sol
+34 −0		l1-contracts/contracts/state-transition/chain-interfaces/IL1DAValidator.sol
+92 −0		l1-contracts/contracts/state-transition/data-availability/CalldataDA.sol
+83 −0		l1-contracts/contracts/state-transition/data-availability/RelayedSLDAValidator.sol
+180 −0		l1-contracts/contracts/state-transition/data-availability/RollupL1DAValidator.sol
+25 −0		l1-contracts/contracts/state-transition/data-availability/ValidiumL1DAValidator.sol
+6 −0		l1-contracts/scripts/sync-layer.ts
+3 −3		l1-contracts/src.ts/deploy-process.ts
+14 −0		l1-contracts/src.ts/deploy-test-process.ts
+6 −0		l1-contracts/src.ts/deploy-utils.ts
+24 −0		l1-contracts/src.ts/deploy.ts
+5 −0		l1-contracts/src.ts/utils.ts
+1 −1		l1-contracts/test/foundry/unit/concrete/Executor/ExecutorProof.t.sol
+7 −7		l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/CreateNewChain.t.sol
+16 −21		l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/FreezeChain.t.sol
+119 −119		l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/RevertBatches.t.sol
+1 −1		l1-contracts/test/foundry/unit/concrete/state-transition/libraries/TransactionValidator/ValidateL1L2Tx.t.sol
+16 −16		l1-contracts/test/test_config/constant/hardhat.json
+22 −3		l1-contracts/test/unit_tests/l2-upgrade.test.spec.ts
+79 −5		l1-contracts/test/unit_tests/utils.ts
+1 −1		l1-contracts/test/unit_tests/validator_timelock_test.spec.ts
+9 −0		l2-contracts/contracts/L2ContractErrors.sol
+64 −0		l2-contracts/contracts/L2ContractHelper.sol
+14 −0		l2-contracts/contracts/data-availability/DAErrors.sol
+62 −0		l2-contracts/contracts/data-availability/RollupL2DAValidator.sol
+145 −0		l2-contracts/contracts/data-availability/StateDiffL2DAValidator.sol
+29 −0		l2-contracts/contracts/data-availability/ValidiumL2DAValidator.sol
+18 −0		l2-contracts/contracts/interfaces/IL2DAValidator.sol
+1 −0		l2-contracts/package.json
+132 −0		l2-contracts/src/deploy-l2-da-validator-on-l2-through-l1.ts
+30 −30		system-contracts/SystemContractsHashes.json
+15 −7		system-contracts/bootloader/bootloader.yul
+1 −1		system-contracts/bootloader/tests/bootloader/bootloader_test.yul
+1 −1		system-contracts/contracts/Compressor.sol
+3 −1		system-contracts/contracts/Constants.sol
+1 −1		system-contracts/contracts/ContractDeployer.sol
+21 −103		system-contracts/contracts/L1Messenger.sol
+10 −17		system-contracts/contracts/PubdataChunkPublisher.sol
+18 −0		system-contracts/contracts/interfaces/IL2DAValidator.sol
+2 −1		system-contracts/contracts/interfaces/IPubdataChunkPublisher.sol
+0 −7		system-contracts/test/Compressor.spec.ts
+2 −1		system-contracts/test/L1Messenger.spec.ts
+4 −11		system-contracts/test/PubdataChunkPublisher.spec.ts