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.

Sign up for GitHub

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

Jump to bottom

smart-contract V6 review small tweaks #207

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+20 −15
Open

smart-contract V6 review small tweaks #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fee567d
smart-contract: small tweak on validation and consistent naming on pa…
jpnovais Oct 17, 2024
7e33834
use currentL2BlockNumber vs. memory
thedarkjester Oct 18, 2024
c475447
cache blobFirstBlockNumber
thedarkjester Oct 18, 2024
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
27 changes: 16 additions & 11 deletions contracts/contracts/LineaRollup.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,15 +224,22 @@ contract LineaRollup is

bytes32 currentDataEvaluationPoint;
bytes32 currentDataHash;
uint256 lastFinalizedBlockNumber = currentL2BlockNumber;

/// @dev Assigning in memory saves a lot of gas vs. calldata reading.
BlobSubmissionData memory blobSubmissionData;

bytes32 computedShnarf = _parentShnarf;

uint256 blobFirstBlockNumber = _blobSubmissionData[0].submissionData.firstBlockInData;
uint256 blobFinalBlockNumber = shnarfFinalBlockNumbers[computedShnarf];

if (blobFirstBlockNumber <= currentL2BlockNumber) {
revert FirstBlockLessThanOrEqualToLastFinalizedBlock(
blobFirstBlockNumber,
currentL2BlockNumber
);
}

for (uint256 i; i < blobSubmissionLength; i++) {
blobSubmissionData = _blobSubmissionData[i];

Expand All @@ -242,7 +249,7 @@ contract LineaRollup is
revert EmptyBlobDataAtIndex(i);
}

_validateSubmissionData(blobSubmissionData.submissionData, blobFinalBlockNumber, lastFinalizedBlockNumber);
_validateSubmissionData(blobSubmissionData.submissionData, blobFinalBlockNumber);

currentDataEvaluationPoint = Utils._efficientKeccak(blobSubmissionData.submissionData.snarkHash, currentDataHash);

Expand Down Expand Up @@ -282,7 +289,7 @@ contract LineaRollup is
shnarfFinalBlockNumbers[computedShnarf] = blobFinalBlockNumber;

emit DataSubmittedV3(
_blobSubmissionData[0].submissionData.firstBlockInData,
blobFirstBlockNumber,
blobFinalBlockNumber,
_parentShnarf,
computedShnarf,
Expand Down Expand Up @@ -315,7 +322,11 @@ contract LineaRollup is

bytes32 currentDataHash = keccak256(_submissionData.compressedData);

_validateSubmissionData(submissionData, shnarfFinalBlockNumbers[_parentShnarf], currentL2BlockNumber);
if (_submissionData.firstBlockInData <= currentL2BlockNumber) {
revert FirstBlockLessThanOrEqualToLastFinalizedBlock(_submissionData.firstBlockInData, currentL2BlockNumber);
}

_validateSubmissionData(submissionData, shnarfFinalBlockNumbers[_parentShnarf]);

bytes32 dataEvaluationPoint = Utils._efficientKeccak(_submissionData.snarkHash, currentDataHash);
bytes32 computedShnarf = _computeShnarf(
Expand Down Expand Up @@ -349,12 +360,10 @@ contract LineaRollup is
* @notice Internal function to validate submission data.
* @param _submissionData The supporting data for compressed data submission excluding compressed data.
* @param _parentFinalBlockNumber The final block number for the parent blob.
* @param _lastFinalizedBlockNumber The last finalized block number.
*/
function _validateSubmissionData(
SupportingSubmissionDataV2 memory _submissionData,
uint256 _parentFinalBlockNumber,
uint256 _lastFinalizedBlockNumber
uint256 _parentFinalBlockNumber
) internal pure {
if (_submissionData.finalStateRootHash == EMPTY_HASH) {
revert FinalBlockStateEqualsZeroHash();
Expand All @@ -371,10 +380,6 @@ contract LineaRollup is
}
}

if (_submissionData.firstBlockInData <= _lastFinalizedBlockNumber) {
revert FirstBlockLessThanOrEqualToLastFinalizedBlock(_submissionData.firstBlockInData, _lastFinalizedBlockNumber);
}

if (_submissionData.firstBlockInData > _submissionData.finalBlockInData) {
revert FirstBlockGreaterThanFinalBlock(_submissionData.firstBlockInData, _submissionData.finalBlockInData);
}
Expand Down
8 changes: 4 additions & 4 deletions contracts/contracts/interfaces/l1/ILineaRollup.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,15 +172,15 @@ interface ILineaRollup {
/**
* @notice Emitted when compressed data is being submitted and verified succesfully on L1.
* @dev The block range is indexed and parent shnarf included for state reconstruction simplicity.
* @param startBlock The indexed L2 block number indicating which block the data starts from.
* @param endBlock The indexed L2 block number indicating which block the data ends on.
* @param startBlockNumber The indexed L2 block number indicating which block the data starts from.
* @param endBlockNumber The indexed L2 block number indicating which block the data ends on.
* @param parentShnarf The parent shnarf for the data being submitted.
* @param shnarf The indexed shnarf for the data being submitted.
* @param finalStateRootHash The L2 state root hash that the current blob submission ends on. NB: The last blob in the collection.
*/
event DataSubmittedV3(
uint256 indexed startBlock,
uint256 indexed endBlock,
uint256 indexed startBlockNumber,
uint256 indexed endBlockNumber,
bytes32 parentShnarf,
bytes32 indexed shnarf,
bytes32 finalStateRootHash
Expand Down
Loading