Skip to content

Commit

Permalink
Merge pull request #1304 from 0xPolygonHermez/zkevm-2.60
Browse files Browse the repository at this point in the history
Restore upstream commit history
  • Loading branch information
hexoscott authored Oct 10, 2024
2 parents fe753f2 + 3019ac4 commit 2583364
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions zk/stages/stage_sequence_execute_blocks.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"github.com/ledgerwatch/erigon/zk/erigon_db"
"github.com/ledgerwatch/erigon/zk/hermez_db"
zktypes "github.com/ledgerwatch/erigon/zk/types"
"github.com/ledgerwatch/erigon/zk/utils"
"github.com/ledgerwatch/secp256k1"
)

Expand Down Expand Up @@ -191,7 +190,6 @@ func finaliseBlock(
finalHeader := finalBlock.HeaderNoCopy()
finalHeader.Root = newRoot
finalHeader.Coinbase = batchState.getCoinbase(batchContext.cfg)
finalHeader.GasLimit = utils.GetBlockGasLimitForFork(batchState.forkId)
finalHeader.ReceiptHash = types.DeriveSha(builtBlockElements.receipts)
finalHeader.Bloom = types.CreateBloom(builtBlockElements.receipts)
newNum := finalBlock.Number()
Expand Down

0 comments on commit 2583364

Please sign in to comment.