diff options
author | Maran <maran.hidskes@gmail.com> | 2014-06-11 16:28:18 +0800 |
---|---|---|
committer | Maran <maran.hidskes@gmail.com> | 2014-06-11 16:28:18 +0800 |
commit | 97cc76214350b3ef9b0c15f53d06c684e01ede37 (patch) | |
tree | 21fd1b21d22f502dbb57371b948739f95980f59b | |
parent | bdc206885a1d9c730464f60ec65557403720be1e (diff) | |
download | dexon-97cc76214350b3ef9b0c15f53d06c684e01ede37.tar.gz dexon-97cc76214350b3ef9b0c15f53d06c684e01ede37.tar.zst dexon-97cc76214350b3ef9b0c15f53d06c684e01ede37.zip |
Expose GasLimit to ethPub
-rw-r--r-- | ethpub/types.go | 3 | ||||
-rw-r--r-- | ethutil/common.go | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ethpub/types.go b/ethpub/types.go index 6893c7e09..40ac32a27 100644 --- a/ethpub/types.go +++ b/ethpub/types.go @@ -46,6 +46,7 @@ type PBlock struct { Transactions string `json:"transactions"` Time int64 `json:"time"` Coinbase string `json:"coinbase"` + GasLimit string `json:"gasLimit"` } // Creates a new QML Block from a chain block @@ -64,7 +65,7 @@ func NewPBlock(block *ethchain.Block) *PBlock { return nil } - return &PBlock{ref: block, Number: int(block.Number.Uint64()), Hash: ethutil.Hex(block.Hash()), Transactions: string(txJson), Time: block.Time, Coinbase: ethutil.Hex(block.Coinbase)} + return &PBlock{ref: block, Number: int(block.Number.Uint64()), GasLimit: block.GasLimit.String(), Hash: ethutil.Hex(block.Hash()), Transactions: string(txJson), Time: block.Time, Coinbase: ethutil.Hex(block.Coinbase)} } func (self *PBlock) ToString() string { diff --git a/ethutil/common.go b/ethutil/common.go index c7973eb92..ddaf78f88 100644 --- a/ethutil/common.go +++ b/ethutil/common.go @@ -18,8 +18,8 @@ var ( Wei = big.NewInt(1) ) -// Currency to string // +// Currency to string // Returns a string representing a human readable format func CurrencyToString(num *big.Int) string { switch { |