From 2c311e1aea456bca815f8cbbe42b2f5810d0db9f Mon Sep 17 00:00:00 2001 From: Daniel Wang <99078276+dantaik@users.noreply.github.com> Date: Thu, 4 Apr 2024 16:52:20 +0800 Subject: [PATCH] fix(protocol): revert removing `proposedIn` (being used by node/client) (#16644) Co-authored-by: David --- packages/protocol/contracts/L1/TaikoData.sol | 2 +- packages/protocol/contracts/L1/libs/LibProposing.sol | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/protocol/contracts/L1/TaikoData.sol b/packages/protocol/contracts/L1/TaikoData.sol index 831caf4de92..a06e62c636e 100644 --- a/packages/protocol/contracts/L1/TaikoData.sol +++ b/packages/protocol/contracts/L1/TaikoData.sol @@ -113,7 +113,7 @@ library TaikoData { uint96 livenessBond; uint64 blockId; // slot 3 uint64 proposedAt; // timestamp - uint64 __reserved1; + uint64 proposedIn; // L1 block number, required/used by node/client. uint32 nextTransitionId; uint32 verifiedTransitionId; } diff --git a/packages/protocol/contracts/L1/libs/LibProposing.sol b/packages/protocol/contracts/L1/libs/LibProposing.sol index 89872362baf..bca8d3b43aa 100644 --- a/packages/protocol/contracts/L1/libs/LibProposing.sol +++ b/packages/protocol/contracts/L1/libs/LibProposing.sol @@ -159,7 +159,7 @@ library LibProposing { livenessBond: _config.livenessBond, blockId: b.numBlocks, proposedAt: meta_.timestamp, - __reserved1: 0, + proposedIn: uint64(block.number), // For a new block, the next transition ID is always 1, not 0. nextTransitionId: 1, // For unverified block, its verifiedTransitionId is always 0.