Merge branch 'boba-develop' into fix-basefee-for-pre-bedrock

bobanetwork · Oct 17, 2023 · 31b343f · 31b343f
2 parents 1bb9668 + 9946e98
commit 31b343f
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 153 deletions.
diff --git a/core/types/gen_genesis.go b/core/types/gen_genesis.go
diff --git a/core/types/gen_receipt_json.go b/core/types/gen_receipt_json.go
diff --git a/core/types/receipt.go b/core/types/receipt.go
@@ -62,10 +62,9 @@ type Receipt struct {
 
 	// Implementation fields: These fields are added by geth when processing a transaction.
 	// They are stored in the chain database.
-	TxHash            libcommon.Hash    `json:"transactionHash" gencodec:"required" codec:"-"`
-	ContractAddress   libcommon.Address `json:"contractAddress" codec:"-"`
-	GasUsed           uint64            `json:"gasUsed" gencodec:"required" codec:"-"`
-	EffectiveGasPrice *big.Int          `json:"effectiveGasPrice"`
+	TxHash          libcommon.Hash    `json:"transactionHash" gencodec:"required" codec:"-"`
+	ContractAddress libcommon.Address `json:"contractAddress" codec:"-"`
+	GasUsed         uint64            `json:"gasUsed" gencodec:"required" codec:"-"`
 
 	// DepositNonce was introduced in Regolith to store the actual nonce used by deposit transactions
 	// The state transition process ensures this is only set for Regolith deposit transactions.