forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 01:13:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 9417a681bc into f7ca03ae87

Browse source
This commit is contained in:
baizhenxuan 2017-12-28 14:05:07 +00:00 committed by GitHub
commit 24b42c2a95
2 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
accounts/abi/bind/base.go
View file

@ -189,7 +189,6 @@ func (c *BoundContract) transact(opts *TransactOpts, contract *common.Address, i
} }
} }
gasLimit := opts.GasLimit gasLimit := opts.GasLimit
if gasLimit == nil {
// Gas estimation cannot succeed without code for method invocations // Gas estimation cannot succeed without code for method invocations
if contract != nil { if contract != nil {
if code, err := c.transactor.PendingCodeAt(ensureContext(opts.Context), c.address); err != nil { if code, err := c.transactor.PendingCodeAt(ensureContext(opts.Context), c.address); err != nil {
@ -204,6 +203,8 @@ func (c *BoundContract) transact(opts *TransactOpts, contract *common.Address, i
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to estimate gas needed: %v", err) return nil, fmt.Errorf("failed to estimate gas needed: %v", err)
} }
if opts.GasLimit != nil && opts.GasLimit.Cmp(gasLimit) < 0 {
return nil, fmt.Errorf("Gas required is %s, it exceeds limit: %s. An important gas estimation might also be the sign of a problem in the contract code", gasLimit, opts.GasLimit)
} }
// Create the transaction, sign it and schedule it for execution // Create the transaction, sign it and schedule it for execution
var rawTx *types.Transaction var rawTx *types.Transaction

4
whisper/shhclient/client.go
View file

@ -45,8 +45,8 @@ func NewClient(c *rpc.Client) *Client {
} }
// Version returns the Whisper sub-protocol version. // Version returns the Whisper sub-protocol version.
func (sc *Client) Version(ctx context.Context) (string, error) { func (sc *Client) Version(ctx context.Context) (uint, error) {
var result string var result uint
err := sc.c.CallContext(ctx, &result, "shh_version") err := sc.c.CallContext(ctx, &result, "shh_version")
return result, err return result, err
} }