tornadocontrib/bsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core/txpool/blobpool: fix a merge conflict from a package rename (#27790)

Browse Source
This commit is contained in:
Péter Szilágyi 2023-07-27 14:53:05 +03:00 committed by GitHub
parent 393d4db18c
commit 0f4b21feac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/txpool/blobpool/blobpool.go
View File

@ -30,6 +30,7 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/consensus/misc" "github.com/ethereum/go-ethereum/consensus/misc"
"github.com/ethereum/go-ethereum/consensus/misc/eip4844"
"github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/txpool" "github.com/ethereum/go-ethereum/core/txpool"
@ -402,7 +403,7 @@ func (p *BlobPool) Init(gasTip *big.Int, head *types.Header, reserve txpool.Addr
blobfee = uint256.MustFromBig(big.NewInt(params.BlobTxMinDataGasprice)) blobfee = uint256.MustFromBig(big.NewInt(params.BlobTxMinDataGasprice))
) )
if p.head.ExcessDataGas != nil { if p.head.ExcessDataGas != nil {
blobfee = uint256.MustFromBig(misc.CalcBlobFee(*p.head.ExcessDataGas)) blobfee = uint256.MustFromBig(eip4844.CalcBlobFee(*p.head.ExcessDataGas))
} }
p.evict = newPriceHeap(basefee, blobfee, &p.index) p.evict = newPriceHeap(basefee, blobfee, &p.index)
@ -775,7 +776,7 @@ func (p *BlobPool) Reset(oldHead, newHead *types.Header) {
blobfee = uint256.MustFromBig(big.NewInt(params.BlobTxMinDataGasprice)) blobfee = uint256.MustFromBig(big.NewInt(params.BlobTxMinDataGasprice))
) )
if newHead.ExcessDataGas != nil { if newHead.ExcessDataGas != nil {
blobfee = uint256.MustFromBig(misc.CalcBlobFee(*newHead.ExcessDataGas)) blobfee = uint256.MustFromBig(eip4844.CalcBlobFee(*newHead.ExcessDataGas))
} }
p.evict.reinit(basefee, blobfee, false) p.evict.reinit(basefee, blobfee, false)

3
core/txpool/blobpool/blobpool_test.go
View File

@ -31,6 +31,7 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/consensus/misc" "github.com/ethereum/go-ethereum/consensus/misc"
"github.com/ethereum/go-ethereum/consensus/misc/eip4844"
"github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/rawdb" "github.com/ethereum/go-ethereum/core/rawdb"
"github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/state"
@ -130,7 +131,7 @@ func (bc *testBlockChain) CurrentBlock() *types.Header {
mid := new(big.Int).Add(lo, hi) mid := new(big.Int).Add(lo, hi)
mid.Div(mid, big.NewInt(2)) mid.Div(mid, big.NewInt(2))
if misc.CalcBlobFee(mid.Uint64()).Cmp(bc.blobfee.ToBig()) > 0 { if eip4844.CalcBlobFee(mid.Uint64()).Cmp(bc.blobfee.ToBig()) > 0 {
hi = mid hi = mid
} else { } else {
lo = mid lo = mid