Merge branch 'master' into gas-dimension-tracing

Author: eljobe

.github/workflows/go.yml

@@ -9,6 +9,7 @@ on:
 
 jobs:
   lint:
+    if: false # not supported on OffchainLabs fork, ci.yml is used instead
     name: Lint
     runs-on: self-hosted
     steps:

core/types/arb_types.go

@@ -552,7 +552,7 @@ func (info HeaderInfo) UpdateHeaderWithInfo(header *Header) {
 }
 
 func DeserializeHeaderExtraInformation(header *Header) HeaderInfo {
-	if header == nil || header.BaseFee == nil || header.BaseFee.Sign() == 0 || len(header.Extra) != 32 || header.Difficulty.Cmp(common.Big1) != 0 {
+	if header == nil || header.BaseFee == nil || len(header.Extra) != 32 || header.Difficulty.Cmp(common.Big1) != 0 {
 		// imported blocks have no base fee
 		// The genesis block doesn't have an ArbOS encoded extra field
 		return HeaderInfo{}

internal/ethapi/simulate.go

@@ -411,6 +411,8 @@ func (sim *simulator) makeHeaders(blocks []simBlock) ([]*types.Header, error) {
 			Coinbase:         header.Coinbase,
 			Difficulty:       header.Difficulty,
 			GasLimit:         header.GasLimit,
+			MixDigest:        header.MixDigest,
+			Extra:            header.Extra,
 			WithdrawalsHash:  withdrawalsHash,
 			ParentBeaconRoot: parentBeaconRoot,
 		})