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

mpool: Fix capGasFee math

Browse Source
This commit is contained in:
Łukasz Magiera 2020-08-12 22:01:31 +02:00
parent e1a1b325bc
commit fd4d2067a9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
node/impl/full/mpool.go
View File

@ -115,10 +115,11 @@ func capGasFee(msg *types.Message, maxFee abi.TokenAmount) {
return return
} }
chainFee := types.BigMul(msg.GasFeeCap, types.NewInt(uint64(msg.GasLimit))) gl := types.BigMul(msg.GasPremium, types.NewInt(uint64(msg.GasLimit)))
minerFee := types.BigMul(msg.GasPremium, types.NewInt(uint64(msg.GasLimit))) totalFee := types.BigMul(msg.GasFeeCap, gl)
minerFee := types.BigMul(msg.GasPremium, gl)
if big.Add(chainFee, minerFee).LessThanEqual(maxFee) { if totalFee.LessThanEqual(maxFee) {
return return
} }
@ -126,9 +127,8 @@ func capGasFee(msg *types.Message, maxFee abi.TokenAmount) {
// TODO: there are probably smarter things we can do here to optimize // TODO: there are probably smarter things we can do here to optimize
// message inclusion latency // message inclusion latency
totalFee := big.Add(chainFee, minerFee) msg.GasFeeCap = big.Div(maxFee, gl)
msg.GasFeeCap = big.Div(big.Mul(chainFee, maxFee), totalFee) msg.GasPremium = big.Div(big.Div(big.Mul(minerFee, maxFee), totalFee), gl)
msg.GasPremium = big.Div(big.Mul(minerFee, maxFee), totalFee)
} }
func (a *MpoolAPI) MpoolPushMessage(ctx context.Context, msg *types.Message, maxFee abi.TokenAmount) (*types.SignedMessage, error) { func (a *MpoolAPI) MpoolPushMessage(ctx context.Context, msg *types.Message, maxFee abi.TokenAmount) (*types.SignedMessage, error) {