Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix GasEstimateGasPremium when there is only one message on chain #3428

Merged
merged 2 commits into from
Sep 1, 2020
Merged

Fix GasEstimateGasPremium when there is only one message on chain #3428

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56235ae
Fix GasEstimateGasPremium when there is only one message on chain
Aug 31, 2020
cfe5134
Use Sign() to check zero-equality
arajasek Aug 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions node/impl/full/gas.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,27 +109,22 @@ func (a *GasAPI) GasEstimateGasPremium(ctx context.Context, nblocksincl uint64,
return prices[i].price.GreaterThan(prices[j].price)
})

// todo: account for how full blocks are

at := build.BlockGasTarget * int64(blocks) / 2
prev := big.Zero()

premium := big.Zero()
prev1, prev2 := big.Zero(), big.Zero()
for _, price := range prices {
prev1, prev2 = price.price, prev1
at -= price.limit
if at > 0 {
prev = price.price
continue
}
}

if prev.Equals(big.Zero()) {
return types.BigAdd(price.price, big.NewInt(1)), nil
}

premium = types.BigAdd(big.Div(types.BigAdd(price.price, prev), types.NewInt(2)), big.NewInt(1))
premium := prev1
if types.BigCmp(prev2, big.Zero()) != 0 {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

prev2.Sign() != 0

premium = big.Div(types.BigAdd(prev1, prev2), types.NewInt(2))
}

if types.BigCmp(premium, big.Zero()) == 0 {
if types.BigCmp(premium, types.NewInt(MinGasPremium)) < 0 {
switch nblocksincl {
case 1:
premium = types.NewInt(2 * MinGasPremium)
Expand All @@ -144,7 +139,7 @@ func (a *GasAPI) GasEstimateGasPremium(ctx context.Context, nblocksincl uint64,
const precision = 32
// mean 1, stddev 0.005 => 95% within +-1%
noise := 1 + rand.NormFloat64()*0.005
premium = types.BigMul(premium, types.NewInt(uint64(noise*(1<<precision))))
premium = types.BigMul(premium, types.NewInt(uint64(noise*(1<<precision))+1))
premium = types.BigDiv(premium, types.NewInt(1<<precision))
return premium, nil
}
Expand Down