Merge pull request #90 from terenc3t/collation-header

Align collation header with minimal sharding protocol

Former-commit-id: c5b6c8c04d537a5a6d41c27562a477b88dc25dd8 [formerly bed47e36747ae7a3b1f95ec4dce1cb6f8cb4b09b]
Former-commit-id: 0814bd14e96fcc607a9b4f4a2e93ace248bcebf0
This commit is contained in:
Raul Jordan
2018-04-23 15:24:22 -05:00
committed by GitHub

View File

@@ -15,22 +15,17 @@ type Collation struct {
type CollationHeader struct {
shardID *big.Int //the shard ID of the shard
parentHash *common.Hash //the hash of the parent collation
chunkRoot *common.Hash //the root of the chunk tree which identifies collation body
period *big.Int //the period number in which collation to be included
proposerAddress *common.Address //address of the collation proposer
proposerBid *big.Int //the reward from proposer to collator for a winning proposal
proposerSignature []byte //the proposer's signature as part of a proposal
proposerSignature []byte //the proposer's signature for calculating collation hash
}
func (c *Collation) Header() *CollationHeader { return c.header }
func (c *Collation) Transactions() []*types.Transaction { return c.transactions }
func (c *Collation) ShardID() *big.Int { return c.header.shardID }
func (c *Collation) ParentHash() *common.Hash { return c.header.parentHash }
func (c *Collation) Period() *big.Int { return c.header.period }
func (c *Collation) ProposerAddress() *common.Address { return c.header.proposerAddress }
func (c *Collation) ProposerBid() *big.Int { return c.header.proposerBid }
func (c *Collation) ProposerSignature() []byte { return c.header.proposerSignature }
func (c *Collation) SetHeader(h *CollationHeader) { c.header = h }