diff --git a/config/config.go b/config/config.go index 872b2df89..49efae8ba 100644 --- a/config/config.go +++ b/config/config.go @@ -976,11 +976,11 @@ type ConsensusConfig struct { TimeoutPropose time.Duration `mapstructure:"timeout_propose"` // How much timeout_propose increases with each round TimeoutProposeDelta time.Duration `mapstructure:"timeout_propose_delta"` - // How long we wait after receiving +2/3 prevotes for “anything” (ie. not a single block or nil) + // How long we wait after receiving +2/3 prevotes for "anything" (ie. not a single block or nil) TimeoutPrevote time.Duration `mapstructure:"timeout_prevote"` // How much the timeout_prevote increases with each round TimeoutPrevoteDelta time.Duration `mapstructure:"timeout_prevote_delta"` - // How long we wait after receiving +2/3 precommits for “anything” (ie. not a single block or nil) + // How long we wait after receiving +2/3 precommits for "anything" (ie. not a single block or nil) TimeoutPrecommit time.Duration `mapstructure:"timeout_precommit"` // How much the timeout_precommit increases with each round TimeoutPrecommitDelta time.Duration `mapstructure:"timeout_precommit_delta"` diff --git a/config/toml.go b/config/toml.go index a43773630..d4d35116a 100644 --- a/config/toml.go +++ b/config/toml.go @@ -485,11 +485,11 @@ wal_file = "{{ js .Consensus.WalPath }}" timeout_propose = "{{ .Consensus.TimeoutPropose }}" # How much timeout_propose increases with each round timeout_propose_delta = "{{ .Consensus.TimeoutProposeDelta }}" -# How long we wait after receiving +2/3 prevotes for “anything” (ie. not a single block or nil) +# How long we wait after receiving +2/3 prevotes for "anything" (ie. not a single block or nil) timeout_prevote = "{{ .Consensus.TimeoutPrevote }}" # How much the timeout_prevote increases with each round timeout_prevote_delta = "{{ .Consensus.TimeoutPrevoteDelta }}" -# How long we wait after receiving +2/3 precommits for “anything” (ie. not a single block or nil) +# How long we wait after receiving +2/3 precommits for "anything" (ie. not a single block or nil) timeout_precommit = "{{ .Consensus.TimeoutPrecommit }}" # How much the timeout_precommit increases with each round timeout_precommit_delta = "{{ .Consensus.TimeoutPrecommitDelta }}" diff --git a/spec/consensus/proposer-selection.md b/spec/consensus/proposer-selection.md index 885682f2f..ca4e840a2 100644 --- a/spec/consensus/proposer-selection.md +++ b/spec/consensus/proposer-selection.md @@ -5,7 +5,7 @@ order: 3 # Proposer Selection Procedure This document specifies the Proposer Selection Procedure that is used in Tendermint, the consensus algorithm adopted in CometBFT, to choose a round proposer. -As Tendermint is “leader-based consensus protocol”, the proposer selection is critical for its correct functioning. +As Tendermint is "leader-based consensus protocol", the proposer selection is critical for its correct functioning. At a given block height, the proposer selection algorithm runs with the same validator set at each round . Between heights, an updated validator set may be specified by the application as part of the ABCIResponses' EndBlock. diff --git a/spec/light-client/README.md b/spec/light-client/README.md index 4357dd7dd..8ba1ff88c 100644 --- a/spec/light-client/README.md +++ b/spec/light-client/README.md @@ -103,7 +103,7 @@ version 001. The TLA+ properties can be found in the [TLA+ specification](verification/Lightclient_A_1.tla). The experiments were run in an AWS instance equipped with 32GB RAM and a 4-core Intel® Xeon® CPU E5-2686 v4 @ 2.30GHz CPU. -We write “✗=k” when a bug is reported at depth k, and “✓<=k” when +We write "✗=k" when a bug is reported at depth k, and "✓<=k" when no bug is reported up to depth k. ![Experimental results](experiments.png) diff --git a/spec/p2p/config.md b/spec/p2p/config.md index a087f8e1d..d9b615e6d 100644 --- a/spec/p2p/config.md +++ b/spec/p2p/config.md @@ -12,14 +12,14 @@ and upon incoming connection shares some peers and disconnects. ## Seeds -`--p2p.seeds “id100000000000000000000000000000000@1.2.3.4:26656,id200000000000000000000000000000000@2.3.4.5:4444”` +`--p2p.seeds "id100000000000000000000000000000000@1.2.3.4:26656,id200000000000000000000000000000000@2.3.4.5:4444"` Dials these seeds when we need more peers. They should return a list of peers and then disconnect. If we already have enough peers in the address book, we may never need to dial them. ## Persistent Peers -`--p2p.persistent_peers “id100000000000000000000000000000000@1.2.3.4:26656,id200000000000000000000000000000000@2.3.4.5:26656”` +`--p2p.persistent_peers "id100000000000000000000000000000000@1.2.3.4:26656,id200000000000000000000000000000000@2.3.4.5:26656"` Dial these peers and auto-redial them if the connection fails. These are intended to be trusted persistent peers that can help @@ -36,14 +36,14 @@ and that the node may not be able to keep the connection persistent. ## Private Peers -`--p2p.private_peer_ids “id100000000000000000000000000000000,id200000000000000000000000000000000”` +`--p2p.private_peer_ids "id100000000000000000000000000000000,id200000000000000000000000000000000"` These are IDs of the peers that we do not add to the address book or gossip to other peers. They stay private to us. ## Unconditional Peers -`--p2p.unconditional_peer_ids “id100000000000000000000000000000000,id200000000000000000000000000000000”` +`--p2p.unconditional_peer_ids "id100000000000000000000000000000000,id200000000000000000000000000000000"` These are IDs of the peers which are allowed to be connected by both inbound or outbound regardless of `max_num_inbound_peers` or `max_num_outbound_peers` of user's node reached or not. diff --git a/spec/p2p/v0.34/configuration.md b/spec/p2p/v0.34/configuration.md index 53ac3183d..88d92804b 100644 --- a/spec/p2p/v0.34/configuration.md +++ b/spec/p2p/v0.34/configuration.md @@ -32,13 +32,13 @@ These parameters can be set using the `$CMTHOME/config/config.toml` file. A subs | Parameter | Flag| Example| | --- | --- | ---| | Listen address| `p2p.laddr` | "tcp://0.0.0.0:26656" | -| Seed nodes | `p2p.seeds` | `--p2p.seeds “id100000000000000000000000000000000@1.2.3.4:26656,id200000000000000000000000000000000@2.3.4.5:4444”` | -| Persistent peers | `p2p.persistent_peers` | `--p2p.persistent_peers “id100000000000000000000000000000000@1.2.3.4:26656,id200000000000000000000000000000000@2.3.4.5:26656”` | -| Unconditional peers | `p2p.unconditional_peer_ids` | `--p2p.unconditional_peer_ids “id100000000000000000000000000000000,id200000000000000000000000000000000”` | +| Seed nodes | `p2p.seeds` | `--p2p.seeds "id100000000000000000000000000000000@1.2.3.4:26656,id200000000000000000000000000000000@2.3.4.5:4444"` | +| Persistent peers | `p2p.persistent_peers` | `--p2p.persistent_peers "id100000000000000000000000000000000@1.2.3.4:26656,id200000000000000000000000000000000@2.3.4.5:26656"` | +| Unconditional peers | `p2p.unconditional_peer_ids` | `--p2p.unconditional_peer_ids "id100000000000000000000000000000000,id200000000000000000000000000000000"` | | UPNP | `p2p.upnp` | `--p2p.upnp` | | PexReactor | `p2p.pex` | `--p2p.pex` | | Seed mode | `p2p.seed_mode` | `--p2p.seed_mode` | - | Private peer ids | `p2p.private_peer_ids` | `--p2p.private_peer_ids “id100000000000000000000000000000000,id200000000000000000000000000000000”` | + | Private peer ids | `p2p.private_peer_ids` | `--p2p.private_peer_ids "id100000000000000000000000000000000,id200000000000000000000000000000000"` | **Note on persistent peers**