miner: assign header fields in usual order

fjl · fjl · commit 0d2ec8e1816e · 2023-08-25T18:10:24.000+02:00
diff --git a/miner/worker.go b/miner/worker.go
@@ -945,9 +945,9 @@ func (w *worker) prepareWork(genParams *generateParams) (*environment, error) {
 			// For the first post-fork block, both parent.data_gas_used and parent.excess_data_gas are evaluated as 0
 			excessBlobGas = eip4844.CalcExcessBlobGas(0, 0)
 		}
+		header.BlobGasUsed = new(uint64)
 		header.ExcessBlobGas = &excessBlobGas
 		header.BeaconRoot = genParams.beaconRoot
-		header.BlobGasUsed = new(uint64)
 	}
 	// Run the consensus preparation with the default or customized consensus engine.
 	if err := w.engine.Prepare(w.chain, header); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -945,9 +945,9 @@ func (w worker) prepareWork(genParams generateParams) (*environment, error) {`
`945`	`945`	`// For the first post-fork block, both parent.data_gas_used and parent.excess_data_gas are evaluated as 0`
`946`	`946`	`excessBlobGas = eip4844.CalcExcessBlobGas(0, 0)`
`947`	`947`	`}`
	`948`	`+ header.BlobGasUsed = new(uint64)`
`948`	`949`	`header.ExcessBlobGas = &excessBlobGas`
`949`	`950`	`header.BeaconRoot = genParams.beaconRoot`
`950`		`- header.BlobGasUsed = new(uint64)`
`951`	`951`	`}`
`952`	`952`	`// Run the consensus preparation with the default or customized consensus engine.`
`953`	`953`	`if err := w.engine.Prepare(w.chain, header); err != nil {`