77 "fmt"
88 "math/big"
99
10+ "github.com/ethereum/go-ethereum"
1011 "github.com/ethereum/go-ethereum/beacon/engine"
1112 "github.com/ethereum/go-ethereum/common"
1213 consensus "github.com/ethereum/go-ethereum/consensus/taiko"
@@ -54,6 +55,21 @@ func createPayloadAndSetHead(
5455 meta .GasLimit += consensus .AnchorGasLimit
5556 }
5657
58+ // Update execution payload id for the L1 origin.
59+ var (
60+ txListHash = crypto .Keccak256Hash (txListBytes )
61+ args = & miner.BuildPayloadArgs {
62+ Parent : meta .ParentHash ,
63+ Timestamp : meta .Timestamp ,
64+ FeeRecipient : meta .SuggestedFeeRecipient ,
65+ Random : meta .Difficulty ,
66+ Withdrawals : make ([]* types.Withdrawal , 0 ),
67+ Version : engine .PayloadV2 ,
68+ TxListHash : & txListHash ,
69+ }
70+ )
71+ meta .L1Origin .BuildPayloadArgsID = args .Id ()
72+
5773 // Create a new execution payload and set the chain head.
5874 return createExecutionPayloadsAndSetHead (ctx , rpc , meta .createExecutionPayloadsMetaData , txListBytes )
5975}
@@ -193,9 +209,9 @@ func createExecutionPayloads(
193209 return payload , nil
194210}
195211
196- // isBatchPreconfirmed checks if all blocks in the given batch are preconfirmed ,
197- // and returns the header of the last block in the batch if it is preconfirmed .
198- func isBatchPreconfirmed (
212+ // isKnownCanonicalBatch checks if all blocks in the given batch are in the canonical chain already. ,
213+ // and returns the header of the last block in the batch if it is.
214+ func isKnownCanonicalBatch (
199215 ctx context.Context ,
200216 rpc * rpc.Client ,
201217 anchorConstructor * anchorTxConstructor.AnchorTxConstructor ,
@@ -235,7 +251,7 @@ func isBatchPreconfirmed(
235251 return fmt .Errorf ("failed to RLP encode tx list: %w" , err )
236252 }
237253
238- if headers [i ], err = isBlockPreconfirmed (
254+ if headers [i ], err = isKnownCanonicalBlock (
239255 ctx ,
240256 rpc ,
241257 & createPayloadAndSetHeadMetaData {
@@ -258,8 +274,8 @@ func isBatchPreconfirmed(
258274 return headers [len (headers )- 1 ], g .Wait ()
259275}
260276
261- // isBlockPreconfirmed checks if the block is preconfirmed .
262- func isBlockPreconfirmed (
277+ // isKnownCanonicalBlock checks if the block is in canonical chain already .
278+ func isKnownCanonicalBlock (
263279 ctx context.Context ,
264280 rpc * rpc.Client ,
265281 meta * createPayloadAndSetHeadMetaData ,
@@ -280,81 +296,31 @@ func isBlockPreconfirmed(
280296 txListHash = crypto .Keccak256Hash (txListBytes [:])
281297 args = & miner.BuildPayloadArgs {
282298 Parent : meta .Parent .Hash (),
283- Timestamp : block . Time () ,
284- FeeRecipient : block . Coinbase () ,
285- Random : block . MixDigest () ,
299+ Timestamp : meta . Timestamp ,
300+ FeeRecipient : meta . SuggestedFeeRecipient ,
301+ Random : meta . Difficulty ,
286302 Withdrawals : make ([]* types.Withdrawal , 0 ),
287303 Version : engine .PayloadV2 ,
288304 TxListHash : & txListHash ,
289305 }
290306 id = args .Id ()
291307 )
292- executableData , err := rpc .L2Engine .GetPayload (ctx , & id )
293- if err != nil {
294- return nil , fmt .Errorf ("failed to get payload: %w" , err )
295- }
296-
297- defer func () {
298- if err != nil {
299- log .Warn ("Invalid preconfirmed block" , "blockID" , blockID , "coinbase" , executableData .FeeRecipient , "reason" , err )
300- }
301- }()
302-
303- if executableData .BlockHash != block .Hash () {
304- err = fmt .Errorf ("block hash mismatch: %s != %s" , executableData .BlockHash , block .Hash ())
305- return nil , err
306- }
307- if block .ParentHash () != meta .ParentHash {
308- err = fmt .Errorf ("parent hash mismatch: %s != %s" , block .ParentHash (), meta .ParentHash )
309- return nil , err
310- }
311- if block .Transactions ().Len () == 0 {
312- err = errors .New ("transactions list is empty" )
313- return nil , err
314- }
315- if block .Transactions ()[0 ].Hash () != anchorTx .Hash () {
316- err = fmt .Errorf ("anchor transaction mismatch: %s != %s" , block .Transactions ()[0 ].Hash (), anchorTx .Hash ())
317- return nil , err
318- }
319- if block .UncleHash () != types .EmptyUncleHash {
320- err = fmt .Errorf ("uncle hash mismatch: %s != %s" , block .UncleHash (), types .EmptyUncleHash )
321- return nil , err
308+ l1Origin , err := rpc .L2 .L1OriginByID (ctx , blockID )
309+ if err != nil && ! errors .Is (err , ethereum .NotFound ) {
310+ return nil , fmt .Errorf ("failed to get L1Origin by ID %d: %w" , blockID , err )
322311 }
323- if block .Coinbase () != meta .SuggestedFeeRecipient {
324- err = fmt .Errorf ("coinbase mismatch: %s != %s" , block .Coinbase (), meta .SuggestedFeeRecipient )
325- return nil , err
326- }
327- if block .Difficulty ().Cmp (common .Big0 ) != 0 {
328- err = fmt .Errorf ("difficulty mismatch: %s != 0" , block .Difficulty ())
329- return nil , err
312+ // If L1Origin is not found, it means this block is synced from beacon sync.
313+ if l1Origin == nil {
314+ return nil , fmt .Errorf ("L1Origin not found by ID %d" , blockID )
330315 }
331- if block .MixDigest () != meta .Difficulty {
332- err = fmt .Errorf ("mixDigest mismatch: %s != %s" , block .MixDigest (), meta .Difficulty )
333- return nil , err
334- }
335- if block .Number ().Uint64 () != meta .BlockID .Uint64 () {
336- err = fmt .Errorf ("block number mismatch: %d != %d" , block .Number (), meta .BlockID )
337- return nil , err
338- }
339- if block .GasLimit () != meta .GasLimit + consensus .AnchorV3GasLimit {
340- err = fmt .Errorf ("gas limit mismatch: %d != %d" , block .GasLimit (), meta .GasLimit + consensus .AnchorV3GasLimit )
341- return nil , err
342- }
343- if block .Time () != meta .Timestamp {
344- err = fmt .Errorf ("timestamp mismatch: %d != %d" , block .Time (), meta .Timestamp )
345- return nil , err
346- }
347- if ! bytes .Equal (block .Extra (), meta .ExtraData ) {
348- err = fmt .Errorf ("extra data mismatch: %s != %s" , block .Extra (), meta .ExtraData )
349- return nil , err
350- }
351- if block .BaseFee ().Cmp (meta .BaseFee ) != 0 {
352- err = fmt .Errorf ("base fee mismatch: %s != %s" , block .BaseFee (), meta .BaseFee )
353- return nil , err
354- }
355- if block .Withdrawals ().Len () != 0 {
356- err = fmt .Errorf ("withdrawals mismatch: %d != 0" , block .Withdrawals ().Len ())
357- return nil , err
316+ // If the payload ID matches, it means this block is already in the canonical chain.
317+ if l1Origin .BuildPayloadArgsID != [8 ]byte {} && ! bytes .Equal (l1Origin .BuildPayloadArgsID [:], id [:]) {
318+ return nil , fmt .Errorf (
319+ "payload ID for block %d mismatch, l1Origin payload id: %s, current payload id %s" ,
320+ blockID ,
321+ engine .PayloadID (l1Origin .BuildPayloadArgsID ),
322+ id ,
323+ )
358324 }
359325
360326 return block .Header (), nil
@@ -460,6 +426,7 @@ func assembleCreateExecutionPayloadMetaPacaya(
460426 }, anchorTx , nil
461427}
462428
429+ // updateL1OriginForBatch updates the L1 origin for the given batch of blocks.
463430func updateL1OriginForBatch (
464431 ctx context.Context ,
465432 rpc * rpc.Client ,
@@ -489,9 +456,19 @@ func updateL1OriginForBatch(
489456 L1BlockHeight : meta .GetRawBlockHeight (),
490457 L1BlockHash : meta .GetRawBlockHash (),
491458 }
459+ // Fetch the original L1Origin to get the BuildPayloadArgsID.
460+ originalL1Origin , err := rpc .L2 .L1OriginByID (ctx , blockID )
461+ if err != nil && ! errors .Is (err , ethereum .NotFound ) {
462+ return fmt .Errorf ("failed to get L1Origin by ID %d: %w" , blockID , err )
463+ }
464+ // If L1Origin is not found, it means this block is synced from beacon sync,
465+ // and we also won't set the `BuildPayloadArgsID` value.
466+ if originalL1Origin != nil {
467+ l1Origin .BuildPayloadArgsID = originalL1Origin .BuildPayloadArgsID
468+ }
492469
493470 if _ , err := rpc .L2Engine .UpdateL1Origin (ctx , l1Origin ); err != nil {
494- return fmt .Errorf ("failed to update L1 origin : %w" , err )
471+ return fmt .Errorf ("failed to update L1Origin : %w" , err )
495472 }
496473
497474 // If this is the most recent block, update the HeadL1Origin.
0 commit comments