Update AssembleL2Block

eth/catalyst/api_types.go

@@ -41,12 +41,14 @@ type assembleBlockParamsMarshaling struct {
 type AssembleL2BlockParams struct {
 	Number       uint64   `json:"number"        gencodec:"required"`
 	Transactions [][]byte `json:"transactions"`
+	Timestamp    *uint64  `json:"timestamp"`
 }
 
 // JSON type overrides for assembleL2BlockParams.
 type assembleL2BlockParamsMarshaling struct {
 	Number       hexutil.Uint64
 	Transactions []hexutil.Bytes
+	Timestamp    *hexutil.Uint64
 }
 
 //go:generate go run github.com/fjl/gencodec -type executableData -field-override executableDataMarshaling -out gen_ed.go

eth/catalyst/l2_api.go

@@ -82,7 +82,11 @@ func (api *l2ConsensusAPI) AssembleL2Block(params AssembleL2BlockParams) (*Execu
 	}
 
 	start := time.Now()
-	newBlockResult, err := api.eth.Miner().BuildBlock(parent.Hash(), time.Now(), transactions)
+	timestamp := time.Now()
+	if params.Timestamp != nil {
+		timestamp = time.Unix(int64(*params.Timestamp), 0)
+	}
+	newBlockResult, err := api.eth.Miner().BuildBlock(parent.Hash(), timestamp, transactions)
 	if err != nil {
 		return nil, err
 	}

ethclient/authclient/engine.go

@@ -12,7 +12,7 @@ import (
 )
 
 // AssembleL2Block assembles L2 Block used for L2 sequencer to propose a block in L2 consensus progress
-func (ec *Client) AssembleL2Block(ctx context.Context, number *big.Int, transactions types.Transactions) (*catalyst.ExecutableL2Data, error) {
+func (ec *Client) AssembleL2Block(ctx context.Context, timeStamp *uint64, number *big.Int, transactions types.Transactions) (*catalyst.ExecutableL2Data, error) {
 	txs := make([][]byte, 0, len(transactions))
 	for i, tx := range transactions {
 		bz, err := tx.MarshalBinary()
@@ -25,6 +25,7 @@ func (ec *Client) AssembleL2Block(ctx context.Context, number *big.Int, transact
 	err := ec.c.CallContext(ctx, &result, "engine_assembleL2Block", &catalyst.AssembleL2BlockParams{
 		Number:       number.Uint64(),
 		Transactions: txs,
+		Timestamp:    timeStamp,
 	})
 	return &result, err
 }

miner/worker.go

@@ -164,7 +164,7 @@ func (miner *Miner) prepareWork(genParams *generateParams) (*environment, error)
 	}
 
 	timestamp := genParams.timestamp
-	if parent.Time() >= genParams.timestamp {
+	if parent.Time() > genParams.timestamp {
 		timestamp = parent.Time() + 1
 	}
 	var coinBase common.Address