cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #2898 from filecoin-project/inc/min-gas-premium

Browse Source 
Update MinGasPremium for estimation to 10e3, improve estimation
This commit is contained in:
Łukasz Magiera 2020-08-07 19:03:36 +02:00 committed by GitHub
commit f1140e5c89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
node/impl/full/gas.go
View File

@ -26,7 +26,7 @@ type GasAPI struct {
Mpool *messagepool.MessagePool Mpool *messagepool.MessagePool
} }
const MinGasPrice = 1 const MinGasPremium = 10e3
const BaseFeeEstimNBlocks = 20 const BaseFeeEstimNBlocks = 20
func (a *GasAPI) GasEstimateFeeCap(ctx context.Context, maxqueueblks int64, func (a *GasAPI) GasEstimateFeeCap(ctx context.Context, maxqueueblks int64,
@ -50,11 +50,10 @@ func (a *GasAPI) GasEsitmateGasPremium(ctx context.Context, nblocksincl uint64,
type gasMeta struct { type gasMeta struct {
price big.Int price big.Int
used int64 limit int64
} }
var prices []gasMeta var prices []gasMeta
var gasUsed int64
var blocks int var blocks int
ts := a.Chain.GetHeaviestTipSet() ts := a.Chain.GetHeaviestTipSet()
@ -74,18 +73,11 @@ func (a *GasAPI) GasEsitmateGasPremium(ctx context.Context, nblocksincl uint64,
if err != nil { if err != nil {
return types.BigInt{}, xerrors.Errorf("loading messages: %w", err) return types.BigInt{}, xerrors.Errorf("loading messages: %w", err)
} }
for _, msg := range msgs {
for i, msg := range msgs {
r, err := a.Chain.GetParentReceipt(ts.MinTicketBlock(), i)
if err != nil {
return types.BigInt{}, xerrors.Errorf("getting receipt: %w", err)
}
prices = append(prices, gasMeta{ prices = append(prices, gasMeta{
price: msg.VMMessage().GasPremium, price: msg.VMMessage().GasPremium,
used: r.GasUsed, limit: msg.VMMessage().GasLimit,
}) })
gasUsed += r.GasUsed
} }
ts = pts ts = pts
@ -98,26 +90,30 @@ func (a *GasAPI) GasEsitmateGasPremium(ctx context.Context, nblocksincl uint64,
// todo: account for how full blocks are // todo: account for how full blocks are
at := gasUsed / 2 at := build.BlockGasTarget * int64(blocks) / 2
prev := big.Zero() prev := big.Zero()
for _, price := range prices { for _, price := range prices {
at -= price.used at -= price.limit
if at > 0 { if at > 0 {
prev = price.price prev = price.price
continue continue
} }
if prev.Equals(big.Zero()) {
return types.BigAdd(price.price, big.NewInt(1)), nil
}
return types.BigAdd(big.Div(types.BigAdd(price.price, prev), types.NewInt(2)), big.NewInt(1)), nil return types.BigAdd(big.Div(types.BigAdd(price.price, prev), types.NewInt(2)), big.NewInt(1)), nil
} }
switch nblocksincl { switch nblocksincl {
case 1: case 1:
return types.NewInt(MinGasPrice + 2), nil return types.NewInt(2 * MinGasPremium), nil
case 2: case 2:
return types.NewInt(MinGasPrice + 1), nil return types.NewInt(1.5 * MinGasPremium), nil
default: default:
return types.NewInt(MinGasPrice), nil return types.NewInt(MinGasPremium), nil
} }
} }