fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-07-31 12:11:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into 564-add-app-options-to-genesis-resp

Browse Source
This commit is contained in:
Ethan Buchman
2017-10-23 11:30:00 -04:00
parent 616b07ff6b ac2ef9e0ea
commit a75bccfbc4
27 changed files with 370 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
types/block.go
View File

@@ -14,15 +14,15 @@ import (
"github.com/tendermint/tmlibs/merkle"
)
// Block defines the atomic unit of a Tendermint blockchain
// Block defines the atomic unit of a Tendermint blockchain.
type Block struct {
*Header `json:"header"`
*Data `json:"data"`
LastCommit *Commit `json:"last_commit"`
}
// MakeBlock returns a new block and corresponding part set from the given information
// TODO: version
// MakeBlock returns a new block and corresponding partset from the given information.
// TODO: Add version information to the Block struct.
func MakeBlock(height int, chainID string, txs []Tx, commit *Commit,
prevBlockID BlockID, valHash, appHash []byte, partSize int) (*Block, *PartSet) {
block := &Block{