Merge pull request #17 from init4tech/prestwich/header-in-event

fix: header event emits indexed and unindexed header

Author: anna-carroll

.gas-snapshot

@@ -1,7 +1,7 @@
 HelpersTest:test_signature() (gas: 6587)
-ZenithTest:test_badSequence() (gas: 77336)
-ZenithTest:test_badSignature() (gas: 66901)
-ZenithTest:test_blockExpired() (gas: 55457)
-ZenithTest:test_notSequencer() (gas: 58632)
-ZenithTest:test_onePerBlock() (gas: 121189)
-ZenithTest:test_submitBlock() (gas: 88201)
+ZenithTest:test_badSequence() (gas: 77167)
+ZenithTest:test_badSignature() (gas: 66732)
+ZenithTest:test_blockExpired() (gas: 55352)
+ZenithTest:test_notSequencer() (gas: 58463)
+ZenithTest:test_onePerBlock() (gas: 123114)
+ZenithTest:test_submitBlock() (gas: 90231)

src/Zenith.sol

@@ -50,9 +50,21 @@ contract Zenith is Passage, AccessControlDefaultAdminRules {
 
     /// @notice Emitted when a new rollup block is successfully submitted.
     /// @param sequencer - the address of the sequencer that signed the block.
-    /// @param header - the block header information for the block.
+    /// @param rollupChainId - the chainId of the rollup chain.
+    /// @param sequence - the sequence number of the rollup block.
+    /// @param confirmBy - the timestamp by which the block must be submitted.
+    /// @param gasLimit - the gas limit for the rollup block.
+    /// @param rewardAddress - the address to receive the rollup block reward.
     /// @param blockDataHash - keccak256(blockData). the Node will discard the block if the hash doens't match.
-    event BlockSubmitted(address indexed sequencer, BlockHeader indexed header, bytes32 blockDataHash);
+    event BlockSubmitted(
+        address indexed sequencer,
+        uint256 indexed rollupChainId,
+        uint256 indexed sequence,
+        uint256 confirmBy,
+        uint256 gasLimit,
+        address rewardAddress,
+        bytes32 blockDataHash
+    );
 
     /// @notice Emit the entire block data for easy visibility
     event BlockData(bytes blockData);
@@ -115,7 +127,15 @@ contract Zenith is Passage, AccessControlDefaultAdminRules {
         lastSubmittedAtBlock[header.rollupChainId] = block.number;
 
         // emit event
-        emit BlockSubmitted(sequencer, header, blockDataHash);
+        emit BlockSubmitted(
+            sequencer,
+            header.rollupChainId,
+            header.sequence,
+            header.confirmBy,
+            header.gasLimit,
+            header.rewardAddress,
+            blockDataHash
+        );
     }
 
     /// @notice Construct hash of block details that the sequencer signs.

test/Zenith.t.sol

@@ -16,7 +16,15 @@ contract ZenithTest is Test {
     uint256 sequencerKey = 123;
     uint256 notSequencerKey = 300;
 
-    event BlockSubmitted(address indexed sequencer, Zenith.BlockHeader indexed header, bytes32 blockDataHash);
+    event BlockSubmitted(
+        address indexed sequencer,
+        uint256 indexed rollupChainId,
+        uint256 indexed sequence,
+        uint256 confirmBy,
+        uint256 gasLimit,
+        address rewardAddress,
+        bytes32 blockDataHash
+    );
 
     function setUp() public {
         target = new Zenith(block.chainid + 1, address(this));
@@ -68,7 +76,15 @@ contract ZenithTest is Test {
 
         // should emit BlockSubmitted event
         vm.expectEmit();
-        emit BlockSubmitted(vm.addr(sequencerKey), header, blockDataHash);
+        emit BlockSubmitted(
+            vm.addr(sequencerKey),
+            header.rollupChainId,
+            header.sequence,
+            header.confirmBy,
+            header.gasLimit,
+            header.rewardAddress,
+            blockDataHash
+        );
         target.submitBlock(header, blockDataHash, v, r, s, blockData);
 
         // should increment sequence number
@@ -105,7 +121,15 @@ contract ZenithTest is Test {
 
         // should emit BlockSubmitted event
         vm.expectEmit();
-        emit BlockSubmitted(vm.addr(sequencerKey), header, blockDataHash);
+        emit BlockSubmitted(
+            vm.addr(sequencerKey),
+            header.rollupChainId,
+            header.sequence,
+            header.confirmBy,
+            header.gasLimit,
+            header.rewardAddress,
+            blockDataHash
+        );
         target.submitBlock(header, blockDataHash, v, r, s, blockData);
 
         // incerement the header sequence