aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei-Ning Huang <w@dexon.org>2018-10-26 10:28:42 +0800
committerWei-Ning Huang <w@dexon.org>2019-04-09 21:32:52 +0800
commit2c38bf1bfb209424d5e5567f395268a90be9c58f (patch)
treefed14ec9029d2e77f2525b46173ac4d4f6934554
parentadb92b903b733e739e3c8ceff33cf0814f0dda31 (diff)
downloaddexon-2c38bf1bfb209424d5e5567f395268a90be9c58f.tar
dexon-2c38bf1bfb209424d5e5567f395268a90be9c58f.tar.gz
dexon-2c38bf1bfb209424d5e5567f395268a90be9c58f.tar.bz2
dexon-2c38bf1bfb209424d5e5567f395268a90be9c58f.tar.lz
dexon-2c38bf1bfb209424d5e5567f395268a90be9c58f.tar.xz
dexon-2c38bf1bfb209424d5e5567f395268a90be9c58f.tar.zst
dexon-2c38bf1bfb209424d5e5567f395268a90be9c58f.zip
dex: return round in get block rpc output
-rw-r--r--core/types/block.go1
-rw-r--r--core/types/gen_header_json.go8
-rw-r--r--internal/ethapi/api.go1
3 files changed, 6 insertions, 4 deletions
diff --git a/core/types/block.go b/core/types/block.go
index 24750ba97..9e42a776a 100644
--- a/core/types/block.go
+++ b/core/types/block.go
@@ -105,6 +105,7 @@ type headerMarshaling struct {
Time hexutil.Uint64
Extra hexutil.Bytes
Randomness hexutil.Bytes
+ Round hexutil.Uint64
DexconMeta hexutil.Bytes
Hash common.Hash `json:"hash"` // adds call to Hash() in MarshalJSON
}
diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go
index dd2ca136e..31796bf5b 100644
--- a/core/types/gen_header_json.go
+++ b/core/types/gen_header_json.go
@@ -34,7 +34,7 @@ func (h Header) MarshalJSON() ([]byte, error) {
Nonce BlockNonce `json:"nonce"`
Randomness hexutil.Bytes `json:"randomness" gencodec:"required"`
Position types.Position `json:"position" gencodec:"required"`
- Round uint64 `json:"round" gencodec:"required"`
+ Round hexutil.Uint64 `json:"round" gencodec:"required"`
DexconMeta hexutil.Bytes `json:"dexconMeta" gencodec:"required"`
Hash common.Hash `json:"hash"`
}
@@ -56,7 +56,7 @@ func (h Header) MarshalJSON() ([]byte, error) {
enc.Nonce = h.Nonce
enc.Randomness = h.Randomness
enc.Position = h.Position
- enc.Round = h.Round
+ enc.Round = hexutil.Uint64(h.Round)
enc.DexconMeta = h.DexconMeta
enc.Hash = h.Hash()
return json.Marshal(&enc)
@@ -82,7 +82,7 @@ func (h *Header) UnmarshalJSON(input []byte) error {
Nonce *BlockNonce `json:"nonce"`
Randomness *hexutil.Bytes `json:"randomness" gencodec:"required"`
Position *types.Position `json:"position" gencodec:"required"`
- Round *uint64 `json:"round" gencodec:"required"`
+ Round *hexutil.Uint64 `json:"round" gencodec:"required"`
DexconMeta *hexutil.Bytes `json:"dexconMeta" gencodec:"required"`
}
var dec Header
@@ -158,7 +158,7 @@ func (h *Header) UnmarshalJSON(input []byte) error {
if dec.Round == nil {
return errors.New("missing required field 'round' for Header")
}
- h.Round = *dec.Round
+ h.Round = uint64(*dec.Round)
if dec.DexconMeta == nil {
return errors.New("missing required field 'dexconMeta' for Header")
}
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
index edfc2e8b5..f8af995f4 100644
--- a/internal/ethapi/api.go
+++ b/internal/ethapi/api.go
@@ -895,6 +895,7 @@ func RPCMarshalBlock(b *types.Block, inclTx bool, fullTx bool) (map[string]inter
"transactionsRoot": head.TxHash,
"receiptsRoot": head.ReceiptHash,
"randomness": hexutil.Bytes(head.Randomness),
+ "round": hexutil.Uint64(head.Round),
"dexconMeta": hexutil.Bytes(head.DexconMeta),
}