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