From e532efee9e7268e7d591b53bfa54ebfe76a0b5a9 Mon Sep 17 00:00:00 2001 From: Daniel Wang Date: Thu, 23 Jan 2025 13:43:01 +0800 Subject: [PATCH] removed 1 TODO --- .../contracts/layer1/based/IForcedInclusionStore.sol | 2 +- .../layer1/based/TaikoInboxWithForcedTxInclusion.sol | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/packages/protocol/contracts/layer1/based/IForcedInclusionStore.sol b/packages/protocol/contracts/layer1/based/IForcedInclusionStore.sol index 05c8ee9616..3d07b6d723 100644 --- a/packages/protocol/contracts/layer1/based/IForcedInclusionStore.sol +++ b/packages/protocol/contracts/layer1/based/IForcedInclusionStore.sol @@ -5,7 +5,7 @@ pragma solidity ^0.8.24; /// @custom:security-contact security@taiko.xyz interface IForcedInclusionStore { struct ForcedInclusion { - bytes32 blobhash; + bytes32 blobHash; uint64 id; uint32 blobByteOffset; uint32 blobByteSize; diff --git a/packages/protocol/contracts/layer1/based/TaikoInboxWithForcedTxInclusion.sol b/packages/protocol/contracts/layer1/based/TaikoInboxWithForcedTxInclusion.sol index 59abd5972e..7dd83be133 100644 --- a/packages/protocol/contracts/layer1/based/TaikoInboxWithForcedTxInclusion.sol +++ b/packages/protocol/contracts/layer1/based/TaikoInboxWithForcedTxInclusion.sol @@ -63,13 +63,10 @@ contract TaikoInboxWithForcedTxInclusion is EssentialContract { params.blocks = new ITaikoInbox.BlockParams[](1); params.blocks[0].numTransactions = MAX_FORCED_TXS_PER_FORCED_INCLUSION; - ITaikoInbox.BlobParams2 memory blobParams2; - blobParams2.blobhash = forcedInclusion.blobhash; - blobParams2.byteOffset = forcedInclusion.blobByteOffset; - blobParams2.byteSize = forcedInclusion.blobByteSize; - - // TODO: TaikoInbox should support `BlobParams2` in `BatchParams` - // params.blobParams2 = blobParams2; + params.blobParams.blobHashes = new bytes32[](1); + params.blobParams.blobHashes[0] = forcedInclusion.blobHash; + params.blobParams.byteOffset = forcedInclusion.blobByteOffset; + params.blobParams.byteSize = forcedInclusion.blobByteSize; inbox.proposeBatch(abi.encode(params), ""); msg.sender.sendEtherAndVerify(forcedInclusion.priorityFee, gasleft());