Merge branch 'develop' into manav/upstream_merge_v1.14.13

This commit is contained in:
Manav Darji 2025-03-28 15:37:26 +05:30
commit 9e430e8925
No known key found for this signature in database
GPG key ID: A426F0124435F36E

View file

@ -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()))