From cf4ff643dd8c11dc3a81a16d40a2486767b8b190 Mon Sep 17 00:00:00 2001 From: Roberto Bayardo Date: Fri, 18 Oct 2024 10:36:04 -0700 Subject: [PATCH] consistently use uint64 for eip-1559 params --- consensus/misc/eip1559/eip1559.go | 6 +++--- miner/worker.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/consensus/misc/eip1559/eip1559.go b/consensus/misc/eip1559/eip1559.go index a7195f44a6..bf4e3db1e9 100644 --- a/consensus/misc/eip1559/eip1559.go +++ b/consensus/misc/eip1559/eip1559.go @@ -64,10 +64,10 @@ func DecodeHolocene1559Params(params types.BlockNonce) (uint64, uint64) { return uint64(elasticity), uint64(denominator) } -func EncodeHolocene1559Params(elasticity, denom uint32) types.BlockNonce { +func EncodeHolocene1559Params(elasticity, denom uint64) types.BlockNonce { var nonce types.BlockNonce - binary.BigEndian.PutUint32(nonce[4:], elasticity) - binary.BigEndian.PutUint32(nonce[:4], denom) + binary.BigEndian.PutUint32(nonce[4:], uint32(elasticity)) + binary.BigEndian.PutUint32(nonce[:4], uint32(denom)) return nonce } diff --git a/miner/worker.go b/miner/worker.go index f1a3cf724e..afd0dd4cd2 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -263,7 +263,7 @@ func (miner *Miner) prepareWork(genParams *generateParams, witness bool) (*envir if header.Nonce == types.BlockNonce([8]byte{}) { elasticity := miner.chainConfig.ElasticityMultiplier() denominator := miner.chainConfig.BaseFeeChangeDenominator(header.Time) - header.Nonce = eip1559.EncodeHolocene1559Params(uint32(elasticity), uint32(denominator)) + header.Nonce = eip1559.EncodeHolocene1559Params(elasticity, denominator) } } else if genParams.eip1559Params != nil { return nil, errors.New("got eip1559 params, expected none")