diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-06-09 20:49:55 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-06-09 20:49:55 +0800 |
| commit | f371e6c81a219b09b8c1822db764ab942ab8ca98 (patch) | |
| tree | 297b58ce1acadc044325693fc8ed32bd9f1f7d0f /rpc/args.go | |
| parent | 3054fd481175286591e5d867ec119e9151d02cb8 (diff) | |
| parent | 1a967986428315b5551500f7db9c55c637fe6105 (diff) | |
| download | go-tangerine-f371e6c81a219b09b8c1822db764ab942ab8ca98.tar go-tangerine-f371e6c81a219b09b8c1822db764ab942ab8ca98.tar.gz go-tangerine-f371e6c81a219b09b8c1822db764ab942ab8ca98.tar.bz2 go-tangerine-f371e6c81a219b09b8c1822db764ab942ab8ca98.tar.lz go-tangerine-f371e6c81a219b09b8c1822db764ab942ab8ca98.tar.xz go-tangerine-f371e6c81a219b09b8c1822db764ab942ab8ca98.tar.zst go-tangerine-f371e6c81a219b09b8c1822db764ab942ab8ca98.zip | |
Merge pull request #1156 from tgerring/issue1145
Differentiate between 0 and unspecified gas/gasprice
Diffstat (limited to 'rpc/args.go')
| -rw-r--r-- | rpc/args.go | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/rpc/args.go b/rpc/args.go index 686872a59..50b0f5826 100644 --- a/rpc/args.go +++ b/rpc/args.go @@ -261,22 +261,22 @@ 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 } + } else { + num = nil } 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 } + } else { + num = nil } args.GasPrice = num @@ -346,21 +346,21 @@ func (args *CallArgs) UnmarshalJSON(b []byte) (err error) { } args.Value = num - if ext.Gas == nil { - num = big.NewInt(0) - } else { + if ext.Gas != nil { if num, err = numString(ext.Gas); err != nil { return err } + } else { + num = nil } args.Gas = num - if ext.GasPrice == nil { - num = big.NewInt(0) - } else { + if ext.GasPrice != nil { if num, err = numString(ext.GasPrice); err != nil { return err } + } else { + num = nil } args.GasPrice = num |