Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(protoocl): optimize code based on OZ defender suggestions #18879

Merged
merged 5 commits into from
Feb 6, 2025
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 22 additions & 16 deletions packages/protocol/contracts/layer1/based/TaikoInbox.sol
Original file line number Diff line number Diff line change
Expand Up @@ -205,17 +205,18 @@ abstract contract TaikoInbox is EssentialContract, ITaikoInbox, ITaiko {
(BatchMetadata[] memory metas, Transition[] memory trans) =
abi.decode(_params, (BatchMetadata[], Transition[]));

require(metas.length != 0, NoBlocksToProve());
require(metas.length == trans.length, ArraySizesMismatch());
uint256 metasLength = metas.length;
require(metasLength != 0, NoBlocksToProve());
require(metasLength == trans.length, ArraySizesMismatch());

Stats2 memory stats2 = state.stats2;
require(!stats2.paused, ContractPaused());

Config memory config = pacayaConfig();
IVerifier.Context[] memory ctxs = new IVerifier.Context[](metas.length);
IVerifier.Context[] memory ctxs = new IVerifier.Context[](metasLength);

bool hasConflictingProof;
for (uint256 i; i < metas.length; ++i) {
for (uint256 i; i < metasLength; ++i) {
BatchMetadata memory meta = metas[i];

require(meta.batchId >= pacayaConfig().forkHeights.pacaya, ForkNotActivated());
Expand Down Expand Up @@ -298,8 +299,8 @@ abstract contract TaikoInbox is EssentialContract, ITaikoInbox, ITaiko {

// Emit the event
{
uint64[] memory batchIds = new uint64[](metas.length);
for (uint256 i; i < metas.length; ++i) {
uint64[] memory batchIds = new uint64[](metasLength);
for (uint256 i; i < metasLength; ++i) {
batchIds[i] = metas[i].batchId;
}

Expand All @@ -310,7 +311,7 @@ abstract contract TaikoInbox is EssentialContract, ITaikoInbox, ITaiko {
_pause();
emit Paused(verifier);
} else {
_verifyBatches(config, stats2, metas.length);
_verifyBatches(config, stats2, metasLength);
}
}

Expand Down Expand Up @@ -568,13 +569,15 @@ abstract contract TaikoInbox is EssentialContract, ITaikoInbox, ITaiko {
if (_blobParams.blobHashes.length != 0) {
blobHashes_ = _blobParams.blobHashes;
} else {
blobHashes_ = new bytes32[](_blobParams.numBlobs);
for (uint256 i; i < _blobParams.numBlobs; ++i) {
uint256 numBlobs = _blobParams.numBlobs;
blobHashes_ = new bytes32[](numBlobs);
for (uint256 i; i < numBlobs; ++i) {
blobHashes_[i] = blobhash(_blobParams.firstBlobIndex + i);
}
}

for (uint256 i; i < blobHashes_.length; ++i) {
uint256 bloblHashesLength = blobHashes_.length;
for (uint256 i; i < bloblHashesLength; ++i) {
require(blobHashes_[i] != 0, BlobNotFound());
}
hash_ = keccak256(abi.encode(_txListHash, blobHashes_));
Expand Down Expand Up @@ -751,6 +754,7 @@ abstract contract TaikoInbox is EssentialContract, ITaikoInbox, ITaiko {
view
returns (uint64 anchorBlockId_, uint64 lastBlockTimestamp_)
{
uint256 blocksLength = _params.blocks.length;
unchecked {
if (_params.anchorBlockId == 0) {
anchorBlockId_ = uint64(block.number - 1);
Expand All @@ -774,7 +778,7 @@ abstract contract TaikoInbox is EssentialContract, ITaikoInbox, ITaiko {
require(lastBlockTimestamp_ <= block.timestamp, TimestampTooLarge());

uint64 totalShift;
for (uint256 i; i < _params.blocks.length; ++i) {
for (uint256 i; i < blocksLength; ++i) {
totalShift += _params.blocks[i].timeShift;
}

Expand All @@ -799,19 +803,21 @@ abstract contract TaikoInbox is EssentialContract, ITaikoInbox, ITaiko {
);
}

if (_params.signalSlots.length != 0) {
require(_params.signalSlots.length <= _maxSignalsToReceive, TooManySignals());
uint256 signalSlotsLength = _params.signalSlots.length;

if (signalSlotsLength != 0) {
require(signalSlotsLength <= _maxSignalsToReceive, TooManySignals());

ISignalService signalService =
ISignalService(resolve(LibStrings.B_SIGNAL_SERVICE, false));

for (uint256 i; i < _params.signalSlots.length; ++i) {
for (uint256 i; i < signalSlotsLength; ++i) {
require(signalService.isSignalSent(_params.signalSlots[i]), SignalNotSent());
}
}

require(_params.blocks.length != 0, BlockNotFound());
require(_params.blocks.length <= _maxBlocksPerBatch, TooManyBlocks());
require(blocksLength != 0, BlockNotFound());
require(blocksLength <= _maxBlocksPerBatch, TooManyBlocks());
}

// Memory-only structs ----------------------------------------------------------------------
Expand Down
1 change: 0 additions & 1 deletion packages/protocol/contracts/layer2/based/TaikoAnchor.sol
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ contract TaikoAnchor is EssentialContract, IBlockHashProvider, TaikoAnchorDeprec
error L2_FORK_ERROR();
error L2_INVALID_L1_CHAIN_ID();
error L2_INVALID_L2_CHAIN_ID();
error L2_INVALID_PARAM();
error L2_INVALID_SENDER();
error L2_PUBLIC_INPUT_HASH_MISMATCH();
error L2_TOO_LATE();
Expand Down