Skip to content

Commit

Permalink
Fix GasEstimateGasPremium when there is only one message on chain
Browse files Browse the repository at this point in the history
Signed-off-by: Jakub Sztandera <[email protected]>
  • Loading branch information
Jakub Sztandera committed Aug 31, 2020
1 parent 606a58b commit 56235ae
Showing 1 changed file with 8 additions and 13 deletions.
21 changes: 8 additions & 13 deletions node/impl/full/gas.go
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 {
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

0 comments on commit 56235ae

Please sign in to comment.