fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-12 21:01:21 +00:00
Code Issues Projects Releases Wiki Activity

abci header takes ValidatorsHash

Browse Source
This commit is contained in:
Ethan Buchman
2018-06-06 00:28:12 -07:00
parent 71556c62eb
commit 2897685c57
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Gopkg.lock generated
View File

@ -238,8 +238,8 @@
"server", "server",
"types" "types"
] ]
revision = "9af8b7a7c87478869f8c280ed9539470b8f470b4" revision = "7cf66f570e2f47b286985e2d688b0a400c028e4c"
version = "v0.11.0-rc4" version = "v0.11.0-rc6"
[[projects]] [[projects]]
branch = "master" branch = "master"
@ -293,7 +293,7 @@
"ripemd160", "ripemd160",
"salsa20/salsa" "salsa20/salsa"
] ]
revision = "df8d4716b3472e4a531c33cedbe537dae921a1a9" revision = "b47b1587369238182299fe4dad77d05b8b461e06"
[[projects]] [[projects]]
branch = "master" branch = "master"
@ -374,6 +374,6 @@
[solve-meta] [solve-meta]
analyzer-name = "dep" analyzer-name = "dep"
analyzer-version = 1 analyzer-version = 1
inputs-digest = "6d7d755329cebd1f640324a38507c41b638ca0898737db9d633c75eff58c46f0" inputs-digest = "132980da98fc92b6c0dd988df07316a340f5fc91ee77593cf984ade4e3e5fd62"
solver-name = "gps-cdcl" solver-name = "gps-cdcl"
solver-version = 1 solver-version = 1

2
Gopkg.toml
View File

@ -71,7 +71,7 @@
[[constraint]] [[constraint]]
name = "github.com/tendermint/abci" name = "github.com/tendermint/abci"
version = "~0.11.0-rc4" version = "~0.11.0-rc6"
[[constraint]] [[constraint]]
name = "github.com/tendermint/go-crypto" name = "github.com/tendermint/go-crypto"

13
types/protobuf.go
View File

@ -32,12 +32,13 @@ type tm2pb struct{}
func (tm2pb) Header(header *Header) abci.Header { func (tm2pb) Header(header *Header) abci.Header {
return abci.Header{ return abci.Header{
ChainID: header.ChainID, ChainID: header.ChainID,
Height: header.Height, Height: header.Height,
Time: header.Time.Unix(), Time: header.Time.Unix(),
NumTxs: int32(header.NumTxs), // XXX: overflow NumTxs: int32(header.NumTxs), // XXX: overflow
LastBlockHash: header.LastBlockID.Hash, LastBlockHash: header.LastBlockID.Hash,
AppHash: header.AppHash, ValidatorsHash: header.ValidatorsHash,
AppHash: header.AppHash,
} }
} }