From 038f3e025a19fed9dc96e718b9834ab1b545f136 Mon Sep 17 00:00:00 2001 From: Marko Date: Wed, 27 Jan 2021 11:29:54 +0000 Subject: [PATCH] params: remove block timeiota (#248) --- spec/abci/abci.md | 15 ++------------- spec/consensus/bft-time.md | 7 +++---- spec/core/data_structures.md | 1 - 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/spec/abci/abci.md b/spec/abci/abci.md index cef54344c..b55a7fc5b 100644 --- a/spec/abci/abci.md +++ b/spec/abci/abci.md @@ -674,21 +674,10 @@ The data types not listed below are the same as the [core data structures](../co | Name | Type | Description | Field Number | |-----------|---------------------------------------------------------------|------------------------------------------------------------------------------|--------------| - | block | [BlockParams](#blockparams) | Parameters limiting the size of a block and time between consecutive blocks. | 1 | + | block | [BlockParams](../core/data_structures.md#blockparams) | Parameters limiting the size of a block and time between consecutive blocks. | 1 | | evidence | [EvidenceParams](../core/data_structures.md#evidenceparams) | Parameters limiting the validity of evidence of byzantine behaviour. | 2 | | validator | [ValidatorParams](../core/data_structures.md#validatorparams) | Parameters limiting the types of public keys validators can use. | 3 | - | version | [BlockParams](../core/data_structures.md#versionparams) | The ABCI application version. | 4 | - -### BlockParams - -- **Fields**: - - | Name | Type | Description | Field Number | - |-----------|-------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------| - | max_bytes | int64 | Max size of a block, in bytes. | 1 | - | max_gas | int64 | Max sum of `GasWanted` in a proposed block. NOTE: blocks that violate this may be committed if there are Byzantine proposers. It's the application's responsibility to handle this when processing a block! | 2 | - -> Note: time_iota_ms is removed from this data structure. + | version | [VersionsParams](../core/data_structures.md#versionparams) | The ABCI application version. | 4 | ### ProofOps diff --git a/spec/consensus/bft-time.md b/spec/consensus/bft-time.md index 3d4421d54..cec3b91ab 100644 --- a/spec/consensus/bft-time.md +++ b/spec/consensus/bft-time.md @@ -45,12 +45,11 @@ rs.Proposal.Timestamp == rs.ProposalBlock.Header.Time`. - Furthermore, when creating the `vote` message, the following rules for determining `vote.Time` field should hold: - if `rs.LockedBlock` is defined then - `vote.Time = max(rs.LockedBlock.Timestamp + config.BlockTimeIota, time.Now())`, where `time.Now()` - denotes local Unix time in milliseconds, and `config.BlockTimeIota` is a configuration parameter that corresponds - to the minimum timestamp increment of the next block. + `vote.Time = max(rs.LockedBlock.Timestamp + time.Millisecond, time.Now())`, where `time.Now()` + denotes local Unix time in milliseconds - else if `rs.Proposal` is defined then - `vote.Time = max(rs.Proposal.Timestamp + config.BlockTimeIota, time.Now())`, + `vote.Time = max(rs.Proposal.Timestamp + time.Millisecond,, time.Now())`, - otherwise, `vote.Time = time.Now())`. In this case vote is for `nil` so it is not taken into account for the timestamp of the next block. diff --git a/spec/core/data_structures.md b/spec/core/data_structures.md index d2919bb8c..4906db423 100644 --- a/spec/core/data_structures.md +++ b/spec/core/data_structures.md @@ -445,7 +445,6 @@ func SumTruncated(bz []byte) []byte { |--------------|-------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------| | max_bytes | int64 | Max size of a block, in bytes. | 1 | | max_gas | int64 | Max sum of `GasWanted` in a proposed block. NOTE: blocks that violate this may be committed if there are Byzantine proposers. It's the application's responsibility to handle this when processing a block! | 2 | -| time_iota_ms | int64 | (**Deprecated**) Unused Param | 3 | ### EvidenceParams