consistently use uint64 for eip-1559 params

roberto-bayardo · Oct 18, 2024 · f9062a9 · f9062a9
1 parent a7d3295
commit f9062a9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/consensus/misc/eip1559/eip1559.go b/consensus/misc/eip1559/eip1559.go
@@ -20,6 +20,7 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
+	gomath "math"
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -78,18 +79,24 @@ func DecodeHoloceneExtraData(extra []byte) (uint64, uint64) {
 	return DecodeHolocene1559Params(extra[1:])
 }
 
-func EncodeHolocene1559Params(denom, elasticity uint32) []byte {
+func EncodeHolocene1559Params(denom, elasticity uint64) []byte {
 	r := make([]byte, 8)
-	binary.BigEndian.PutUint32(r[:4], denom)
-	binary.BigEndian.PutUint32(r[4:], elasticity)
+	if denom > gomath.MaxUint32 || elasticity > gomath.MaxUint32 {
+		panic("eip-1559 parameters out of uint32 range")
+	}
+	binary.BigEndian.PutUint32(r[:4], uint32(denom))
+	binary.BigEndian.PutUint32(r[4:], uint32(elasticity))
 	return r
 }
 
-func EncodeHoloceneExtraData(denom, elasticity uint32) []byte {
+func EncodeHoloceneExtraData(denom, elasticity uint64) []byte {
 	r := make([]byte, 9)
+	if denom > gomath.MaxUint32 || elasticity > gomath.MaxUint32 {
+		panic("eip-1559 parameters out of uint32 range")
+	}
 	// leave version byte 0
-	binary.BigEndian.PutUint32(r[1:5], denom)
-	binary.BigEndian.PutUint32(r[5:], elasticity)
+	binary.BigEndian.PutUint32(r[1:5], uint32(denom))
+	binary.BigEndian.PutUint32(r[5:], uint32(elasticity))
 	return r
 }
 

diff --git a/consensus/misc/eip1559/eip1559_test.go b/consensus/misc/eip1559/eip1559_test.go
@@ -195,7 +195,7 @@ func TestCalcBaseFeeOptimismHolocene(t *testing.T) {
 	tests := []struct {
 		parentGasUsed     uint64
 		expectedBaseFee   int64
-		denom, elasticity uint32
+		denom, elasticity uint64
 	}{
 		{parentGasLimit / 2, parentBaseFee, 10, 2},  // target
 		{10_000_000, 9_666_667, 10, 2},              // below

diff --git a/miner/worker.go b/miner/worker.go
@@ -262,7 +262,7 @@ func (miner *Miner) prepareWork(genParams *generateParams, witness bool) (*envir
 			d = miner.chainConfig.BaseFeeChangeDenominator(header.Time)
 			e = miner.chainConfig.ElasticityMultiplier()
 		}
-		header.Extra = eip1559.EncodeHoloceneExtraData(uint32(d), uint32(e))
+		header.Extra = eip1559.EncodeHoloceneExtraData(d, e)
 	} else if genParams.eip1559Params != nil {
 		return nil, errors.New("got eip1559 params, expected none")
 	}