gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

internal/ethapi: unified handling of errors in DoEstimateGas

Browse Source
This commit is contained in:
Marius van der Wijden
2020-06-02 14:05:16 +02:00
committed by Péter Szilágyi
parent 693db4dc17
commit 5048fd1028
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/ethapi/api.go
View File

@ -999,19 +999,16 @@ func DoEstimateGas(ctx context.Context, b Backend, args CallArgs, blockNrOrHash
} }
if failed { if failed {
if result != nil && result.Err != vm.ErrOutOfGas { if result != nil && result.Err != vm.ErrOutOfGas {
var revert string
if len(result.Revert()) > 0 { if len(result.Revert()) > 0 {
ret, err := abi.UnpackRevert(result.Revert()) reason, err := abi.UnpackRevert(result.Revert())
if err != nil { if err == nil {
revert = hexutil.Encode(result.Revert()) return 0, &revertError{
} else { error: errors.New("execution reverted"),
revert = ret errData: reason,
} }
} }
return 0, revertError{
error: errors.New("always failing transaction"),
errData: revert,
} }
return 0, result.Err
} }
// Otherwise, the specified gas cap is too low // Otherwise, the specified gas cap is too low
return 0, fmt.Errorf("gas required exceeds allowance (%d)", cap) return 0, fmt.Errorf("gas required exceeds allowance (%d)", cap)