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

fix gas estimation.

Browse Source 
Make it use GasEstimateMessageGas, which applies overestimation
by default. This accounts for inclusion costs.
This commit is contained in:
Raúl Kripalani 2022-10-22 20:07:32 +01:00 committed by vyzo
parent ab5f0216f6
commit 78dd7a246a
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
node/impl/full/eth.go
View File

@ -505,7 +505,7 @@ func (a *EthModule) EthSendRawTransaction(ctx context.Context, rawTx api.EthByte
return api.EthHashFromCid(cid) return api.EthHashFromCid(cid)
} }
func (a *EthModule) applyEvmMsg(ctx context.Context, tx api.EthCall) (*api.InvocResult, error) { func (a *EthModule) ethCallToFilecoinMessage(ctx context.Context, tx api.EthCall) (*types.Message, error) {
// The from address must be translatable to an f4 address. // The from address must be translatable to an f4 address.
from, err := tx.From.ToFilecoinAddress() from, err := tx.From.ToFilecoinAddress()
if err != nil { if err != nil {
@ -560,7 +560,7 @@ func (a *EthModule) applyEvmMsg(ctx context.Context, tx api.EthCall) (*api.Invoc
} }
} }
msg := &types.Message{ return &types.Message{
From: from, From: from,
To: to, To: to,
Value: big.Int(tx.Value), Value: big.Int(tx.Value),
@ -569,11 +569,13 @@ func (a *EthModule) applyEvmMsg(ctx context.Context, tx api.EthCall) (*api.Invoc
GasLimit: build.BlockGasLimit, GasLimit: build.BlockGasLimit,
GasFeeCap: big.Zero(), GasFeeCap: big.Zero(),
GasPremium: big.Zero(), GasPremium: big.Zero(),
} }, nil
}
func (a *EthModule) applyMessage(ctx context.Context, msg *types.Message) (res *api.InvocResult, err error) {
ts := a.Chain.GetHeaviestTipSet() ts := a.Chain.GetHeaviestTipSet()
// Try calling until we find a height with no migration. // Try calling until we find a height with no migration.
var res *api.InvocResult
for { for {
res, err = a.StateManager.CallWithGas(ctx, msg, []types.ChainMsg{}, ts) res, err = a.StateManager.CallWithGas(ctx, msg, []types.ChainMsg{}, ts)
if err != stmgr.ErrExpensiveFork { if err != stmgr.ErrExpensiveFork {
@ -594,16 +596,26 @@ func (a *EthModule) applyEvmMsg(ctx context.Context, tx api.EthCall) (*api.Invoc
} }
func (a *EthModule) EthEstimateGas(ctx context.Context, tx api.EthCall) (api.EthUint64, error) { func (a *EthModule) EthEstimateGas(ctx context.Context, tx api.EthCall) (api.EthUint64, error) {
invokeResult, err := a.applyEvmMsg(ctx, tx) msg, err := a.ethCallToFilecoinMessage(ctx, tx)
if err != nil { if err != nil {
return api.EthUint64(0), err return api.EthUint64(0), err
} }
ret := invokeResult.MsgRct.GasUsed
return api.EthUint64(ret), nil msg, err = a.GasAPI.GasEstimateMessageGas(ctx, msg, nil, types.EmptyTSK)
if err != nil {
return api.EthUint64(0), err
}
return api.EthUint64(msg.GasLimit), nil
} }
func (a *EthModule) EthCall(ctx context.Context, tx api.EthCall, blkParam string) (api.EthBytes, error) { func (a *EthModule) EthCall(ctx context.Context, tx api.EthCall, blkParam string) (api.EthBytes, error) {
invokeResult, err := a.applyEvmMsg(ctx, tx) msg, err := a.ethCallToFilecoinMessage(ctx, tx)
if err != nil {
return nil, err
}
invokeResult, err := a.applyMessage(ctx, msg)
if err != nil { if err != nil {
return nil, err return nil, err
} }