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

network > chain_id, put in genesis.json

Browse Source
This commit is contained in:
Ethan Buchman
2015-05-29 14:13:45 -04:00
parent bb67fe0356
commit 8a2d9525f0
22 changed files with 139 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
types/block.go
View File

@ -23,8 +23,8 @@ type Block struct {
// Basic validation that doesn't involve state data.
func (b *Block) ValidateBasic(lastBlockHeight uint, lastBlockHash []byte,
lastBlockParts PartSetHeader, lastBlockTime time.Time) error {
if b.Network != config.GetString("network") {
return errors.New("Wrong Block.Header.Network")
if b.ChainID != config.GetString("chain_id") {
return errors.New("Wrong Block.Header.ChainID")
}
if b.Height != lastBlockHeight+1 {
return errors.New("Wrong Block.Header.Height")
@ -122,7 +122,7 @@ func (b *Block) StringShort() string {
//-----------------------------------------------------------------------------
type Header struct {
Network string `json:"network"`
ChainID string `json:"chain_id"`
Height uint `json:"height"`
Time time.Time `json:"time"`
Fees uint64 `json:"fees"`
@ -154,7 +154,7 @@ func (h *Header) StringIndented(indent string) string {
return "nil-Header"
}
return fmt.Sprintf(`Header{
%s Network: %v
%s ChainID: %v
%s Height: %v
%s Time: %v
%s Fees: %v
@ -163,7 +163,7 @@ func (h *Header) StringIndented(indent string) string {
%s LastBlockParts: %v
%s StateHash: %X
%s}#%X`,
indent, h.Network,
indent, h.ChainID,
indent, h.Height,
indent, h.Time,
indent, h.Fees,