tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

internal/ethapi: fix nil deref + fix estimateGas console bindings (#21601)

Browse Source 
* tried to fix

* fix for js api

* fix for nil pointer ex

* rev space

* rev space

* input call formatter
This commit is contained in:
Marius van der Wijden 2020-09-23 13:08:40 +02:00 committed by GitHub
parent e5defccd58
commit c1544423d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/ethapi/api.go
View File

@ -963,6 +963,9 @@ func DoEstimateGas(ctx context.Context, b Backend, args CallArgs, blockNrOrHash
if err != nil { if err != nil {
return 0, err return 0, err
} }
if block == nil {
return 0, errors.New("block not found")
}
hi = block.GasLimit() hi = block.GasLimit()
} }
// Recap the highest gas limit with account's available balance. // Recap the highest gas limit with account's available balance.

7
internal/web3ext/web3ext.go
View File

@ -500,6 +500,13 @@ web3._extend({
params: 1, params: 1,
inputFormatter: [web3._extend.formatters.inputTransactionFormatter] inputFormatter: [web3._extend.formatters.inputTransactionFormatter]
}), }),
new web3._extend.Method({
name: 'estimateGas',
call: 'eth_estimateGas',
params: 2,
inputFormatter: [web3._extend.formatters.inputCallFormatter, web3._extend.formatters.inputBlockNumberFormatter],
outputFormatter: web3._extend.utils.toDecimal
}),
new web3._extend.Method({ new web3._extend.Method({
name: 'submitTransaction', name: 'submitTransaction',
call: 'eth_submitTransaction', call: 'eth_submitTransaction',