diff --git a/docs/architecture/README.md b/docs/architecture/README.md index 7256e5038..1a97addfa 100644 --- a/docs/architecture/README.md +++ b/docs/architecture/README.md @@ -101,3 +101,4 @@ Note the context/background should be written in the present tense. - [ADR-057: RPC](./adr-057-RPC.md) - [ADR-069: Node Initialization](./adr-069-flexible-node-initialization.md) - [ADR-071: Proposer-Based Timestamps](adr-071-proposer-based-timestamps.md) +- [ADR-074: Migrate Timeout Parameters to Consensus Parameters](./adr-074-timeout-params.md) diff --git a/docs/architecture/adr-74-timeout-params.md b/docs/architecture/adr-074-timeout-params.md similarity index 96% rename from docs/architecture/adr-74-timeout-params.md rename to docs/architecture/adr-074-timeout-params.md index 55c703dfe..a79bdfade 100644 --- a/docs/architecture/adr-74-timeout-params.md +++ b/docs/architecture/adr-074-timeout-params.md @@ -167,12 +167,13 @@ set for these parameters][current-timeout-defaults] in the local configuration file will be used as the defaults for these new consensus parameters in the [consensus parameter defaults][default-consensus-params]. -Validation of these new parameters will be identical to their validation currently. +Validation of these new parameters will be identical to their [validation +currently][time-param-validation]. Namely, these parameters must be non-negative. ### Removal of Old Parameters -The old `timeout-*` parameters that are configured in the [config.toml][config-toml] +The old `timeout-*` parameters that are configured in the [config.toml][config-toml] will be removed completely. ### Optional: Temporary Local Overrides @@ -222,3 +223,6 @@ should be included in in the hash as part of that release. [current-timeout-defaults]: https://github.com/tendermint/tendermint/blob/7cdf560173dee6773b80d1c574a06489d4c394fe/config/config.go#L955 [config-toml]: https://github.com/tendermint/tendermint/blob/5cc980698a3402afce76b26693ab54b8f67f038b/config/toml.go#L425-L440 [cosmos-sdk-consensus-params]: https://github.com/cosmos/cosmos-sdk/issues/6197 +[time-param-validation]: https://github.com/tendermint/tendermint/blob/7cdf560173dee6773b80d1c574a06489d4c394fe/config/config.go#L1038 +[tendermint-issue-5911-comment]: https://github.com/tendermint/tendermint/issues/5911#issuecomment-973560381 +[spec-issue-359]: https://github.com/tendermint/spec/issues/359