mirror of
https://github.com/fluencelabs/tendermint
synced 2025-07-31 20:21:56 +00:00
Updates -> ValidatoSetUpdates
This commit is contained in:
@@ -13,58 +13,58 @@ const (
|
||||
// ConsensusParams contains consensus critical parameters
|
||||
// that determine the validity of blocks.
|
||||
type ConsensusParams struct {
|
||||
BlockSizeParams `json:"block_size_params"`
|
||||
TxSizeParams `json:"tx_size_params"`
|
||||
BlockGossipParams `json:"block_gossip_params"`
|
||||
BlockSize `json:"block_size_params"`
|
||||
TxSize `json:"tx_size_params"`
|
||||
BlockGossip `json:"block_gossip_params"`
|
||||
}
|
||||
|
||||
// BlockSizeParams contain limits on the block size.
|
||||
type BlockSizeParams struct {
|
||||
// BlockSize contain limits on the block size.
|
||||
type BlockSize struct {
|
||||
MaxBytes int `json:"max_bytes"` // NOTE: must not be 0 nor greater than 100MB
|
||||
MaxTxs int `json:"max_txs"`
|
||||
MaxGas int `json:"max_gas"`
|
||||
}
|
||||
|
||||
// TxSizeParams contain limits on the tx size.
|
||||
type TxSizeParams struct {
|
||||
// TxSize contain limits on the tx size.
|
||||
type TxSize struct {
|
||||
MaxBytes int `json:"max_bytes"`
|
||||
MaxGas int `json:"max_gas"`
|
||||
}
|
||||
|
||||
// BlockGossipParams determine consensus critical elements of how blocks are gossiped
|
||||
type BlockGossipParams struct {
|
||||
// BlockGossip determine consensus critical elements of how blocks are gossiped
|
||||
type BlockGossip struct {
|
||||
BlockPartSizeBytes int `json:"block_part_size_bytes"` // NOTE: must not be 0
|
||||
}
|
||||
|
||||
// DefaultConsensusParams returns a default ConsensusParams.
|
||||
func DefaultConsensusParams() *ConsensusParams {
|
||||
return &ConsensusParams{
|
||||
DefaultBlockSizeParams(),
|
||||
DefaultTxSizeParams(),
|
||||
DefaultBlockGossipParams(),
|
||||
DefaultBlockSize(),
|
||||
DefaultTxSize(),
|
||||
DefaultBlockGossip(),
|
||||
}
|
||||
}
|
||||
|
||||
// DefaultBlockSizeParams returns a default BlockSizeParams.
|
||||
func DefaultBlockSizeParams() BlockSizeParams {
|
||||
return BlockSizeParams{
|
||||
// DefaultBlockSize returns a default BlockSize.
|
||||
func DefaultBlockSize() BlockSize {
|
||||
return BlockSize{
|
||||
MaxBytes: 22020096, // 21MB
|
||||
MaxTxs: 100000,
|
||||
MaxGas: -1,
|
||||
}
|
||||
}
|
||||
|
||||
// DefaultTxSizeParams returns a default TxSizeParams.
|
||||
func DefaultTxSizeParams() TxSizeParams {
|
||||
return TxSizeParams{
|
||||
// DefaultTxSize returns a default TxSize.
|
||||
func DefaultTxSize() TxSize {
|
||||
return TxSize{
|
||||
MaxBytes: 10240, // 10kB
|
||||
MaxGas: -1,
|
||||
}
|
||||
}
|
||||
|
||||
// DefaultBlockGossipParams returns a default BlockGossipParams.
|
||||
func DefaultBlockGossipParams() BlockGossipParams {
|
||||
return BlockGossipParams{
|
||||
// DefaultBlockGossip returns a default BlockGossip.
|
||||
func DefaultBlockGossip() BlockGossip {
|
||||
return BlockGossip{
|
||||
BlockPartSizeBytes: 65536, // 64kB,
|
||||
}
|
||||
}
|
||||
@@ -73,17 +73,17 @@ func DefaultBlockGossipParams() BlockGossipParams {
|
||||
// are within their allowed limits, and returns an error if they are not.
|
||||
func (params *ConsensusParams) Validate() error {
|
||||
// ensure some values are greater than 0
|
||||
if params.BlockSizeParams.MaxBytes <= 0 {
|
||||
return errors.Errorf("BlockSizeParams.MaxBytes must be greater than 0. Got %d", params.BlockSizeParams.MaxBytes)
|
||||
if params.BlockSize.MaxBytes <= 0 {
|
||||
return errors.Errorf("BlockSize.MaxBytes must be greater than 0. Got %d", params.BlockSize.MaxBytes)
|
||||
}
|
||||
if params.BlockGossipParams.BlockPartSizeBytes <= 0 {
|
||||
return errors.Errorf("BlockGossipParams.BlockPartSizeBytes must be greater than 0. Got %d", params.BlockGossipParams.BlockPartSizeBytes)
|
||||
if params.BlockGossip.BlockPartSizeBytes <= 0 {
|
||||
return errors.Errorf("BlockGossip.BlockPartSizeBytes must be greater than 0. Got %d", params.BlockGossip.BlockPartSizeBytes)
|
||||
}
|
||||
|
||||
// ensure blocks aren't too big
|
||||
if params.BlockSizeParams.MaxBytes > maxBlockSizeBytes {
|
||||
return errors.Errorf("BlockSizeParams.MaxBytes is too big. %d > %d",
|
||||
params.BlockSizeParams.MaxBytes, maxBlockSizeBytes)
|
||||
if params.BlockSize.MaxBytes > maxBlockSizeBytes {
|
||||
return errors.Errorf("BlockSize.MaxBytes is too big. %d > %d",
|
||||
params.BlockSize.MaxBytes, maxBlockSizeBytes)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -92,11 +92,11 @@ func (params *ConsensusParams) Validate() error {
|
||||
// in the block header
|
||||
func (params *ConsensusParams) Hash() []byte {
|
||||
return merkle.SimpleHashFromMap(map[string]interface{}{
|
||||
"block_gossip_part_size_bytes": params.BlockGossipParams.BlockPartSizeBytes,
|
||||
"block_size_max_bytes": params.BlockSizeParams.MaxBytes,
|
||||
"block_size_max_gas": params.BlockSizeParams.MaxGas,
|
||||
"block_size_max_txs": params.BlockSizeParams.MaxTxs,
|
||||
"tx_size_max_bytes": params.TxSizeParams.MaxBytes,
|
||||
"tx_size_max_gas": params.TxSizeParams.MaxGas,
|
||||
"block_gossip_part_size_bytes": params.BlockGossip.BlockPartSizeBytes,
|
||||
"block_size_max_bytes": params.BlockSize.MaxBytes,
|
||||
"block_size_max_gas": params.BlockSize.MaxGas,
|
||||
"block_size_max_txs": params.BlockSize.MaxTxs,
|
||||
"tx_size_max_bytes": params.TxSize.MaxBytes,
|
||||
"tx_size_max_gas": params.TxSize.MaxGas,
|
||||
})
|
||||
}
|
||||
|
Reference in New Issue
Block a user