diff options
| author | bas-vk <bas-vk@users.noreply.github.com> | 2017-03-29 17:59:13 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@users.noreply.github.com> | 2017-03-29 17:59:13 +0800 |
| commit | baf20010e72e31a34e0e2f7c58ccb8135e388b83 (patch) | |
| tree | 54b42fc25af3ce6774c3d514b4cc6ccf33dc7e75 /core | |
| parent | 16afb5c468856d9d047de2c770e008a55d593ffc (diff) | |
| download | dexon-baf20010e72e31a34e0e2f7c58ccb8135e388b83.tar dexon-baf20010e72e31a34e0e2f7c58ccb8135e388b83.tar.gz dexon-baf20010e72e31a34e0e2f7c58ccb8135e388b83.tar.bz2 dexon-baf20010e72e31a34e0e2f7c58ccb8135e388b83.tar.lz dexon-baf20010e72e31a34e0e2f7c58ccb8135e388b83.tar.xz dexon-baf20010e72e31a34e0e2f7c58ccb8135e388b83.tar.zst dexon-baf20010e72e31a34e0e2f7c58ccb8135e388b83.zip | |
core/types: rename txdata.gasLimit -> txdata.gas in JSON (#13848)
Diffstat (limited to 'core')
| -rw-r--r-- | core/types/gen_tx_json.go | 6 | ||||
| -rw-r--r-- | core/types/transaction.go | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/types/gen_tx_json.go b/core/types/gen_tx_json.go index 0adcc59b5..6101b9637 100644 --- a/core/types/gen_tx_json.go +++ b/core/types/gen_tx_json.go @@ -15,7 +15,7 @@ func (t txdata) MarshalJSON() ([]byte, error) { type txdataJSON struct { AccountNonce hexutil.Uint64 `json:"nonce"` Price *hexutil.Big `json:"gasPrice"` - GasLimit *hexutil.Big `json:"gasLimit"` + GasLimit *hexutil.Big `json:"gas"` Recipient *common.Address `json:"to" optional:"yes" rlp:"nil"` Amount *hexutil.Big `json:"value"` Payload hexutil.Bytes `json:"input"` @@ -42,7 +42,7 @@ func (t *txdata) UnmarshalJSON(input []byte) error { type txdataJSON struct { AccountNonce *hexutil.Uint64 `json:"nonce"` Price *hexutil.Big `json:"gasPrice"` - GasLimit *hexutil.Big `json:"gasLimit"` + GasLimit *hexutil.Big `json:"gas"` Recipient *common.Address `json:"to" optional:"yes" rlp:"nil"` Amount *hexutil.Big `json:"value"` Payload hexutil.Bytes `json:"input"` @@ -65,7 +65,7 @@ func (t *txdata) UnmarshalJSON(input []byte) error { } x.Price = (*big.Int)(dec.Price) if dec.GasLimit == nil { - return errors.New("missing required field 'gasLimit' for txdata") + return errors.New("missing required field 'gas' for txdata") } x.GasLimit = (*big.Int)(dec.GasLimit) if dec.Recipient != nil { diff --git a/core/types/transaction.go b/core/types/transaction.go index ee2f25b52..3945684a1 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -57,7 +57,7 @@ type Transaction struct { type txdata struct { AccountNonce uint64 `json:"nonce"` Price *big.Int `json:"gasPrice"` - GasLimit *big.Int `json:"gasLimit"` + GasLimit *big.Int `json:"gas"` Recipient *common.Address `json:"to" optional:"yes" rlp:"nil"` // nil means contract creation Amount *big.Int `json:"value"` Payload []byte `json:"input"` |