Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

eth: return state error via GetEVM #25876

Merged
merged 4 commits into from
Sep 27, 2022
Merged

eth: return state error via GetEVM #25876

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
51401fe
make vmError more useful
zhiqiangxu Sep 27, 2022
c02930b
fix for review
zhiqiangxu Sep 27, 2022
9551635
Update api.go
rjl493456442 Sep 27, 2022
6dcdd9d
revert calling site
zhiqiangxu Sep 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions eth/api_backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,13 +214,12 @@ func (b *EthAPIBackend) GetTd(ctx context.Context, hash common.Hash) *big.Int {
}

func (b *EthAPIBackend) GetEVM(ctx context.Context, msg core.Message, state *state.StateDB, header *types.Header, vmConfig *vm.Config) (*vm.EVM, func() error, error) {
vmError := func() error { return nil }
if vmConfig == nil {
vmConfig = b.eth.blockchain.GetVMConfig()
}
txContext := core.NewEVMTxContext(msg)
context := core.NewEVMBlockContext(header, b.eth.BlockChain(), nil)
return vm.NewEVM(context, txContext, state, b.eth.blockchain.Config(), *vmConfig), vmError, nil
return vm.NewEVM(context, txContext, state, b.eth.blockchain.Config(), *vmConfig), state.Error, nil
}

func (b *EthAPIBackend) SubscribeRemovedLogsEvent(ch chan<- core.RemovedLogsEvent) event.Subscription {
Expand Down
7 changes: 4 additions & 3 deletions internal/ethapi/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,6 +987,9 @@ func DoCall(ctx context.Context, b Backend, args TransactionArgs, blockNrOrHash
// Execute the message.
gp := new(core.GasPool).AddGas(math.MaxUint64)
result, err := core.ApplyMessage(evm, msg, gp)
if err != nil {
rjl493456442 marked this conversation as resolved.
Show resolved Hide resolved
return result, fmt.Errorf("err: %w (supplied gas %d)", err, msg.Gas())
}
if err := vmError(); err != nil {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there was nothing wrong with this, the way it was. Se https://go.dev/play/p/w3zIAvKsWbV

The err := vmError is scoped, and does not overwrite the outer-scoped err.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

However, I agree that it makes sense to check the returned err first, like this PR does. So I still approve

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, I'm not so sure. So the vmErr will (now) potentially return an underlying error, e.g if a part of the trie could not be loaded.
In a lot of cases, this will also trigger a secondary error during precheck -- typically something will be zero which shouldn't have been.

In this case, the vmErr() is the more interesting error, since it shows the underlying cause ("missing trie node") instead of the effect ("insufficient funds for transfer").

So now I'm leaning towards reverting this change

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make sense, reverted the calling site.

return nil, err
}
Expand All @@ -995,9 +998,7 @@ func DoCall(ctx context.Context, b Backend, args TransactionArgs, blockNrOrHash
if evm.Cancelled() {
return nil, fmt.Errorf("execution aborted (timeout = %v)", timeout)
}
if err != nil {
return result, fmt.Errorf("err: %w (supplied gas %d)", err, msg.Gas())
}

return result, nil
}

Expand Down