Merge/foundation release/1.12.2

[ziogaschr]

Merges ethereum/go-ethereum branch release/1.12.2 to core-geth master.

Notes

---

• Do you agree on replacing Clique with Catalyst for --dev mode? We still allow use --dev.pow for ethash. 9d4ea2e
• This change follows the go-ethereum interfaces, where a Block header can have withdrawalsRoot while the Block itself can have withdrawals. 23da7ca
  ...

TODO

• Re-implement RemovePendingTransaction, as it's not working now that blobpool has been added Ref: rpc: add txpool_removeTransaction method #203
  • ➡️ We decided to remove this method since it's not well supported by all transaction types anymore. (Merge/foundation release/1.12.2 #560 (comment))
• Test that --dev mode works Merge/foundation release/1.12.2 #560 (comment)

[ziogaschr]

Note: I still want to test the functionality while running in --dev mode

[diega]

This looks really well. Just made two microscopical comments

[meowsbits]

Two new fields are added to the Genesis type: ExcessBlobGas and BlobGasUsed. While these, along with BaseFee, are relevant to ETHereum chains, they are not relevant for all chains that core-geth supports, resulting in empty (null) fields.

What do you think about adding omitempty tags for these fields?

diff --git a/params/types/genesisT/gen_genesis.go b/params/types/genesisT/gen_genesis.go
index 0136309ee6..12f3d10b05 100644
--- a/params/types/genesisT/gen_genesis.go
+++ b/params/types/genesisT/gen_genesis.go
@@ -33,9 +33,9 @@ func (g Genesis) MarshalJSON() ([]byte, error) {
 		Number        math.HexOrDecimal64                         `json:"number"`
 		GasUsed       math.HexOrDecimal64                         `json:"gasUsed"`
 		ParentHash    common.Hash                                 `json:"parentHash"`
-		BaseFee       *math.HexOrDecimal256                       `json:"baseFeePerGas"`
-		ExcessBlobGas *math.HexOrDecimal64                        `json:"excessBlobGas"`
-		BlobGasUsed   *math.HexOrDecimal64                        `json:"blobGasUsed"`
+		BaseFee       *math.HexOrDecimal256                       `json:"baseFeePerGas,omitempty"`
+		ExcessBlobGas *math.HexOrDecimal64                        `json:"excessBlobGas,omitempty"`
+		BlobGasUsed   *math.HexOrDecimal64                        `json:"blobGasUsed,omitempty"`
 	}
 	var enc Genesis
 	enc.Config = g.Config
diff --git a/params/types/genesisT/genesis.go b/params/types/genesisT/genesis.go
index f2be54ec74..97676daee0 100644
--- a/params/types/genesisT/genesis.go
+++ b/params/types/genesisT/genesis.go
@@ -55,9 +55,9 @@ type Genesis struct {
 	Number        uint64      `json:"number"`
 	GasUsed       uint64      `json:"gasUsed"`
 	ParentHash    common.Hash `json:"parentHash"`
-	BaseFee       *big.Int    `json:"baseFeePerGas"` // EIP-1559
-	ExcessBlobGas *uint64     `json:"excessBlobGas"` // EIP-4844
-	BlobGasUsed   *uint64     `json:"blobGasUsed"`   // EIP-4844
+	BaseFee       *big.Int    `json:"baseFeePerGas,omitempty"` // EIP-1559
+	ExcessBlobGas *uint64     `json:"excessBlobGas,omitempty"` // EIP-4844
+	BlobGasUsed   *uint64     `json:"blobGasUsed,omitempty"`   // EIP-4844
 }
 
 func (g *Genesis) GetElasticityMultiplier() uint64 {

[ziogaschr]

Two new fields are added to the Genesis type: ExcessBlobGas and BlobGasUsed. While these, along with BaseFee, are relevant to ETHereum chains, they are not relevant for all chains that core-geth supports, resulting in empty (null) fields.

What do you think about adding omitempty tags for these fields?

diff --git a/params/types/genesisT/gen_genesis.go b/params/types/genesisT/gen_genesis.go
index 0136309ee6..12f3d10b05 100644
--- a/params/types/genesisT/gen_genesis.go
+++ b/params/types/genesisT/gen_genesis.go
@@ -33,9 +33,9 @@ func (g Genesis) MarshalJSON() ([]byte, error) {
 		Number        math.HexOrDecimal64                         `json:"number"`
 		GasUsed       math.HexOrDecimal64                         `json:"gasUsed"`
 		ParentHash    common.Hash                                 `json:"parentHash"`
-		BaseFee       *math.HexOrDecimal256                       `json:"baseFeePerGas"`
-		ExcessBlobGas *math.HexOrDecimal64                        `json:"excessBlobGas"`
-		BlobGasUsed   *math.HexOrDecimal64                        `json:"blobGasUsed"`
+		BaseFee       *math.HexOrDecimal256                       `json:"baseFeePerGas,omitempty"`
+		ExcessBlobGas *math.HexOrDecimal64                        `json:"excessBlobGas,omitempty"`
+		BlobGasUsed   *math.HexOrDecimal64                        `json:"blobGasUsed,omitempty"`
 	}
 	var enc Genesis
 	enc.Config = g.Config
diff --git a/params/types/genesisT/genesis.go b/params/types/genesisT/genesis.go
index f2be54ec74..97676daee0 100644
--- a/params/types/genesisT/genesis.go
+++ b/params/types/genesisT/genesis.go
@@ -55,9 +55,9 @@ type Genesis struct {
 	Number        uint64      `json:"number"`
 	GasUsed       uint64      `json:"gasUsed"`
 	ParentHash    common.Hash `json:"parentHash"`
-	BaseFee       *big.Int    `json:"baseFeePerGas"` // EIP-1559
-	ExcessBlobGas *uint64     `json:"excessBlobGas"` // EIP-4844
-	BlobGasUsed   *uint64     `json:"blobGasUsed"`   // EIP-4844
+	BaseFee       *big.Int    `json:"baseFeePerGas,omitempty"` // EIP-1559
+	ExcessBlobGas *uint64     `json:"excessBlobGas,omitempty"` // EIP-4844
+	BlobGasUsed   *uint64     `json:"blobGasUsed,omitempty"`   // EIP-4844
 }
 
 func (g *Genesis) GetElasticityMultiplier() uint64 {

Makes sense to me too. Might be that a test can break, in case they check for this fields, but maybe it makes sense to modify those tests as well.

[meowsbits]

Yea, my rationale for removing them is mostly based on the pattern of extensive use of omitempty in the chain config types, which is obviously a closely related data type. So I would infer and assume that similar tests would be used for both data types, and that therefore checks for the existence or absence of fields should have similar expectations (permitting, or even expecting, that zero-value fields are omitted).