Add BaseFee field in block structure (#255)

* added baseFee in block header * baseFee in block marshalling * corrected implementation * refactored and corrected implementation * fix typo * fix error string
umbracle · Sep 6, 2023 · b3ad0a0 · b3ad0a0 · XanderShum · Oct 26, 2023
1 parent c9c19bc
commit b3ad0a0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/structs.go b/structs.go
@@ -148,6 +148,7 @@ type Block struct {
 	Transactions       []*Transaction
 	TransactionsHashes []Hash
 	Uncles             []Hash
+	BaseFee            *big.Int
 }
 
 func (b *Block) Copy() *Block {

diff --git a/structs_marshal.go b/structs_marshal.go
@@ -66,6 +66,10 @@ func (t *Block) MarshalJSON() ([]byte, error) {
 	o.Set("mixHash", a.NewString("0x"+hex.EncodeToString(t.MixHash[:])))
 	o.Set("nonce", a.NewString("0x"+hex.EncodeToString(t.Nonce[:])))
 
+	if t.BaseFee != nil {
+		o.Set("baseFee", a.NewString(fmt.Sprintf("0x%x", t.BaseFee)))
+	}
+
 	// uncles
 	if len(t.Uncles) != 0 {
 		uncles := a.NewArray()

diff --git a/structs_unmarshal.go b/structs_unmarshal.go
@@ -67,6 +67,11 @@ func (b *Block) UnmarshalJSON(buf []byte) error {
 	if b.ExtraData, err = decodeBytes(b.ExtraData[:0], v, "extraData"); err != nil {
 		return err
 	}
+	if b.BaseFee, err = decodeBigInt(b.BaseFee, v, "baseFee"); err != nil {
+		if err.Error() != "field 'baseFee' not found" {
+			return err
+		}
+	}
 
 	b.TransactionsHashes = b.TransactionsHashes[:0]
 	b.Transactions = b.Transactions[:0]