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

feat: eth: return revert data on failed gas estimation (#10298)

Browse Source 
Unfortunately, we need to execute the message twice to get this (unless
we want to change some APIs). But it's unlikely to be a performance
issue and will definitely help people debug failures.
This commit is contained in:
Steven Allen 2023-02-17 10:36:30 -08:00 committed by GitHub
parent d589443a5e
commit 30615a4ed6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
itests/fevm_test.go
View File

@ -901,14 +901,23 @@ func TestFEVMErrorParsing(t *testing.T) {
"failCustom()": customError, "failCustom()": customError,
} { } {
sig := sig sig := sig
expected := expected expected := fmt.Sprintf("exit 33, revert reason: %s, vm error", expected)
t.Run(sig, func(t *testing.T) { t.Run(sig, func(t *testing.T) {
entryPoint := kit.CalcFuncSignature(sig) entryPoint := kit.CalcFuncSignature(sig)
_, err := e.EthCall(ctx, ethtypes.EthCall{ t.Run("EthCall", func(t *testing.T) {
To: &contractAddrEth, _, err := e.EthCall(ctx, ethtypes.EthCall{
Data: entryPoint, To: &contractAddrEth,
}, "latest") Data: entryPoint,
require.ErrorContains(t, err, fmt.Sprintf("exit 33, revert reason: %s, vm error", expected)) }, "latest")
require.ErrorContains(t, err, expected)
})
t.Run("EthEstimateGas", func(t *testing.T) {
_, err := e.EthEstimateGas(ctx, ethtypes.EthCall{
To: &contractAddrEth,
Data: entryPoint,
})
require.ErrorContains(t, err, expected)
})
}) })
} }
} }

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

@ -888,12 +888,22 @@ func (a *EthModule) EthEstimateGas(ctx context.Context, tx ethtypes.EthCall) (et
msg.GasLimit = 0 msg.GasLimit = 0
ts := a.Chain.GetHeaviestTipSet() ts := a.Chain.GetHeaviestTipSet()
msg, err = a.GasAPI.GasEstimateMessageGas(ctx, msg, nil, ts.Key()) gassedMsg, err := a.GasAPI.GasEstimateMessageGas(ctx, msg, nil, ts.Key())
if err != nil { if err != nil {
// On failure, GasEstimateMessageGas doesn't actually return the invocation result,
// it just returns an error. That means we can't get the revert reason.
//
// So we re-execute the message with EthCall (well, applyMessage which contains the
// guts of EthCall). This will give us an ethereum specific error with revert
// information.
msg.GasLimit = build.BlockGasLimit
if _, err2 := a.applyMessage(ctx, msg, ts.Key()); err2 != nil {
err = err2
}
return ethtypes.EthUint64(0), xerrors.Errorf("failed to estimate gas: %w", err) return ethtypes.EthUint64(0), xerrors.Errorf("failed to estimate gas: %w", err)
} }
expectedGas, err := ethGasSearch(ctx, a.Chain, a.Stmgr, a.Mpool, msg, ts) expectedGas, err := ethGasSearch(ctx, a.Chain, a.Stmgr, a.Mpool, gassedMsg, ts)
if err != nil { if err != nil {
log.Errorw("expected gas", "err", err) log.Errorw("expected gas", "err", err)
} }