diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-06-16 00:09:44 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-06-16 00:09:44 +0800 |
| commit | cc0b451119478ba4a005ec8840573252636f45dc (patch) | |
| tree | f1e9882b7dea20eab9cd30850224a07bb312f067 /rpc | |
| parent | f2a2164184a9397d8e6100c370595ccdcd00ca0b (diff) | |
| parent | 2628103f1df35ad6a130f2f41e73c7703bf61886 (diff) | |
| download | dexon-cc0b451119478ba4a005ec8840573252636f45dc.tar dexon-cc0b451119478ba4a005ec8840573252636f45dc.tar.gz dexon-cc0b451119478ba4a005ec8840573252636f45dc.tar.bz2 dexon-cc0b451119478ba4a005ec8840573252636f45dc.tar.lz dexon-cc0b451119478ba4a005ec8840573252636f45dc.tar.xz dexon-cc0b451119478ba4a005ec8840573252636f45dc.tar.zst dexon-cc0b451119478ba4a005ec8840573252636f45dc.zip | |
Merge pull request #1260 from obscuren/tx-drop-low-tx
core: drop low gas tx
Diffstat (limited to 'rpc')
| -rw-r--r-- | rpc/api/eth.go | 9 | ||||
| -rw-r--r-- | rpc/api/eth_args.go | 8 |
2 files changed, 10 insertions, 7 deletions
diff --git a/rpc/api/eth.go b/rpc/api/eth.go index 943f19b90..66ee69930 100644 --- a/rpc/api/eth.go +++ b/rpc/api/eth.go @@ -259,7 +259,14 @@ func (self *ethApi) SendTransaction(req *shared.Request) (interface{}, error) { nonce = args.Nonce.String() } - v, err := self.xeth.Transact(args.From, args.To, nonce, args.Value.String(), args.Gas.String(), args.GasPrice.String(), args.Data) + var gas, price string + if args.Gas != nil { + gas = args.Gas.String() + } + if args.GasPrice != nil { + price = args.GasPrice.String() + } + v, err := self.xeth.Transact(args.From, args.To, nonce, args.Value.String(), gas, price, args.Data) if err != nil { return nil, err } diff --git a/rpc/api/eth_args.go b/rpc/api/eth_args.go index ad9a35fa2..1c86bee51 100644 --- a/rpc/api/eth_args.go +++ b/rpc/api/eth_args.go @@ -333,9 +333,7 @@ func (args *NewTxArgs) UnmarshalJSON(b []byte) (err error) { args.Value = num num = nil - if ext.Gas == nil { - num = big.NewInt(0) - } else { + if ext.Gas != nil { if num, err = numString(ext.Gas); err != nil { return err } @@ -343,9 +341,7 @@ func (args *NewTxArgs) UnmarshalJSON(b []byte) (err error) { args.Gas = num num = nil - if ext.GasPrice == nil { - num = big.NewInt(0) - } else { + if ext.GasPrice != nil { if num, err = numString(ext.GasPrice); err != nil { return err } |