mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-26 14:46:42 +00:00
Merge branch 'develop' into manav/upstream_merge_v1.14.13
This commit is contained in:
commit
9e430e8925
1 changed files with 7 additions and 1 deletions
|
|
@ -1038,7 +1038,10 @@ func applyMessageWithEVM(ctx context.Context, evm *vm.EVM, msg *core.Message, ti
|
||||||
}
|
}
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return result, fmt.Errorf("err: %w (supplied gas %d)", err, msg.GasLimit)
|
return nil, fmt.Errorf("err: %w (supplied gas %d)", err, msg.GasLimit)
|
||||||
|
}
|
||||||
|
if result == nil {
|
||||||
|
return nil, errors.New("EVM ApplyMessage returned nil result without error")
|
||||||
}
|
}
|
||||||
|
|
||||||
return result, nil
|
return result, nil
|
||||||
|
|
@ -1102,6 +1105,9 @@ func (api *BlockChainAPI) CallWithState(ctx context.Context, args TransactionArg
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
if result == nil {
|
||||||
|
return nil, fmt.Errorf("DoCall returned nil result with no error (block=%v)", blockNrOrHash)
|
||||||
|
}
|
||||||
|
|
||||||
if int(api.b.RPCRpcReturnDataLimit()) > 0 && len(result.ReturnData) > int(api.b.RPCRpcReturnDataLimit()) {
|
if int(api.b.RPCRpcReturnDataLimit()) > 0 && len(result.ReturnData) > int(api.b.RPCRpcReturnDataLimit()) {
|
||||||
return nil, fmt.Errorf("call returned result of length %d exceeding limit %d", len(result.ReturnData), int(api.b.RPCRpcReturnDataLimit()))
|
return nil, fmt.Errorf("call returned result of length %d exceeding limit %d", len(result.ReturnData), int(api.b.RPCRpcReturnDataLimit()))
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue