merge hyperchain and statediff hash

matter-labs · May 29, 2024 · a28a65d · a28a65d
1 parent 68f6074
commit a28a65d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/system-contracts/contracts/Compressor.sol b/system-contracts/contracts/Compressor.sol
@@ -111,7 +111,8 @@ contract Compressor is ICompressor, ISystemContract {
         uint256 _numberOfStateDiffs,
         uint256 _enumerationIndexSize,
         bytes calldata _stateDiffs,
-        bytes calldata _compressedStateDiffs
+        bytes calldata _compressedStateDiffs,
+        bytes memory _hyperchainData
     ) external onlyCallFrom(address(L1_MESSENGER_CONTRACT)) returns (bytes32 stateDiffHash) {
         // We do not enforce the operator to use the optimal, i.e. the minimally possible _enumerationIndexSize.
         // We do enforce however, that the _enumerationIndexSize is not larger than 8 bytes long, which is the
@@ -187,6 +188,8 @@ contract Compressor is ICompressor, ISystemContract {
         require(stateDiffPtr == _compressedStateDiffs.length, "Extra data in _compressedStateDiffs");
 
         stateDiffHash = EfficientCall.keccak(_stateDiffs);
+        bytes32 hyperchainHash = keccak256(_hyperchainData);
+        stateDiffHash = keccak256(abi.encode(stateDiffHash,hyperchainHash));
     }
 
     /// @notice Decode the raw compressed data into the dictionary and the encoded data.

diff --git a/system-contracts/contracts/L1Messenger.sol b/system-contracts/contracts/L1Messenger.sol
@@ -194,12 +194,7 @@ contract L1Messenger is IL1Messenger, ISystemContract {
     function publishPubdataAndClearState(
         bytes calldata _totalL2ToL1PubdataAndStateDiffs
     ) external onlyCallFromBootloader {
-        // Send hyperchain batches
-        SystemContractHelper.toL1(
-            true,
-            bytes32(uint256(SystemLogKey.HYPERCHAIN_PUBDATA_KEY)),
-            keccak256(BATCH_AGGREGATOR.returnBatchesAndClearState())
-        );
+
 
         uint256 calldataPtr = 0;
 
@@ -313,7 +308,8 @@ contract L1Messenger is IL1Messenger, ISystemContract {
             numberOfStateDiffs,
             enumerationIndexSize,
             stateDiffs,
-            compressedStateDiffs
+            compressedStateDiffs,
+            BATCH_AGGREGATOR.returnBatchesAndClearState()
         );
         //
 

diff --git a/system-contracts/contracts/interfaces/ICompressor.sol b/system-contracts/contracts/interfaces/ICompressor.sol
@@ -25,6 +25,7 @@ interface ICompressor {
         uint256 _numberOfStateDiffs,
         uint256 _enumerationIndexSize,
         bytes calldata _stateDiffs,
-        bytes calldata _compressedStateDiffs
+        bytes calldata _compressedStateDiffs,
+        bytes memory _hyperchainData
     ) external returns (bytes32 stateDiffHash);
 }