LBRYCommunity/lbcd
1
0
Fork 0
Code Issues 17 Pull requests 4 Projects Releases 28 Packages Wiki Activity

Merge pull request #1259 from cfromknecht/bhv-int64-confs

Browse source 
btcjson: use int64 for GetBlockHeader[Verbose] confirmations
This commit is contained in:
Olaoluwa Osuntokun 2018-08-22 19:45:43 -07:00 committed by GitHub
commit 9d15e63c50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
btcjson/chainsvrresults.go
View file

@ -11,7 +11,7 @@ import "encoding/json"
// returns a hex-encoded string. // returns a hex-encoded string.
type GetBlockHeaderVerboseResult struct { type GetBlockHeaderVerboseResult struct {
Hash string `json:"hash"` Hash string `json:"hash"`
Confirmations uint64 `json:"confirmations"` Confirmations int64 `json:"confirmations"`
Height int32 `json:"height"` Height int32 `json:"height"`
Version int32 `json:"version"` Version int32 `json:"version"`
VersionHex string `json:"versionHex"` VersionHex string `json:"versionHex"`
@ -29,7 +29,7 @@ type GetBlockHeaderVerboseResult struct {
// hex-encoded string. // hex-encoded string.
type GetBlockVerboseResult struct { type GetBlockVerboseResult struct {
Hash string `json:"hash"` Hash string `json:"hash"`
Confirmations uint64 `json:"confirmations"` Confirmations int64 `json:"confirmations"`
StrippedSize int32 `json:"strippedsize"` StrippedSize int32 `json:"strippedsize"`
Size int32 `json:"size"` Size int32 `json:"size"`
Weight int32 `json:"weight"` Weight int32 `json:"weight"`

4
rpcserver.go
View file

@ -1126,7 +1126,7 @@ func handleGetBlock(s *rpcServer, cmd interface{}, closeChan <-chan struct{}) (i
PreviousHash: blockHeader.PrevBlock.String(), PreviousHash: blockHeader.PrevBlock.String(),
Nonce: blockHeader.Nonce, Nonce: blockHeader.Nonce,
Time: blockHeader.Timestamp.Unix(), Time: blockHeader.Timestamp.Unix(),
Confirmations: uint64(1 + best.Height - blockHeight), Confirmations: int64(1 + best.Height - blockHeight),
Height: int64(blockHeight), Height: int64(blockHeight),
Size: int32(len(blkBytes)), Size: int32(len(blkBytes)),
StrippedSize: int32(blk.MsgBlock().SerializeSizeStripped()), StrippedSize: int32(blk.MsgBlock().SerializeSizeStripped()),
@ -1364,7 +1364,7 @@ func handleGetBlockHeader(s *rpcServer, cmd interface{}, closeChan <-chan struct
params := s.cfg.ChainParams params := s.cfg.ChainParams
blockHeaderReply := btcjson.GetBlockHeaderVerboseResult{ blockHeaderReply := btcjson.GetBlockHeaderVerboseResult{
Hash: c.Hash, Hash: c.Hash,
Confirmations: uint64(1 + best.Height - blockHeight), Confirmations: int64(1 + best.Height - blockHeight),
Height: blockHeight, Height: blockHeight,
Version: blockHeader.Version, Version: blockHeader.Version,
VersionHex: fmt.Sprintf("%08x", blockHeader.Version), VersionHex: fmt.Sprintf("%08x", blockHeader.Version),