Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Commit

Permalink
Merge branch 'master' into ao-prometheus-metrics
Browse files Browse the repository at this point in the history 
* master:
  [CI] Fix draft release publishing (#1546)
  Bump Substrate, version (#1541)
  Update check_labels runtimenoteworthy label (#1540)
  revert enabling authority discovery by default (#1532)
  • Loading branch information
@ordian
ordian committed Aug 5, 2020
2 parents 7fac800 + 00e4556 commit 844783a
Show file tree
Hide file tree
Showing 11 changed files with 173 additions and 176 deletions.
274 changes: 137 additions & 137 deletions Cargo.lock
View file

Large diffs are not rendered by default.

9 changes: 3 additions & 6 deletions cli/src/cli.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,7 @@ pub struct RunCmd {
#[structopt(long = "force-westend")]
pub force_westend: bool,

/// Disable the authority discovery module on validator or sentry nodes.
///
/// Enabled by default on validator and sentry nodes. Always disabled on
/// non validator or sentry nodes.
/// Enable the authority discovery module on validator or sentry nodes.
///
/// When enabled:
///
Expand All @@ -73,8 +70,8 @@ pub struct RunCmd {
/// (2) As a validator or sentry node: Discover addresses of validators or
/// addresses of their sentry nodes and maintain a permanent connection
/// to a subset.
#[structopt(long = "disable-authority-discovery")]
pub authority_discovery_disabled: bool,
#[structopt(long = "enable-authority-discovery")]
pub authority_discovery_enabled: bool,

/// Setup a GRANDPA scheduled voting pause.
///
Expand Down
4 changes: 2 additions & 2 deletions cli/src/command.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ pub fn run() -> Result<()> {

set_default_ss58_version(chain_spec);

let authority_discovery_disabled = cli.run.authority_discovery_disabled;
let authority_discovery_enabled = cli.run.authority_discovery_enabled;
let grandpa_pause = if cli.run.grandpa_pause.is_empty() {
None
} else {
Expand All @@ -138,7 +138,7 @@ pub fn run() -> Result<()> {
config,
None,
None,
authority_discovery_disabled,
authority_discovery_enabled,
6000,
grandpa_pause,
).map(|r| r.0),
Expand Down
14 changes: 7 additions & 7 deletions node/service/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ fn new_full<RuntimeApi, Executor>(
mut config: Configuration,
collating_for: Option<(CollatorId, ParaId)>,
_max_block_data_size: Option<u64>,
_authority_discovery_disabled: bool,
_authority_discovery_enabled: bool,
_slot_duration: u64,
grandpa_pause: Option<(u32, u32)>,
) -> Result<(
Expand Down Expand Up @@ -646,7 +646,7 @@ pub fn polkadot_new_full(
config: Configuration,
collating_for: Option<(CollatorId, ParaId)>,
max_block_data_size: Option<u64>,
authority_discovery_disabled: bool,
authority_discovery_enabled: bool,
slot_duration: u64,
grandpa_pause: Option<(u32, u32)>,
)
Expand All @@ -664,7 +664,7 @@ pub fn polkadot_new_full(
config,
collating_for,
max_block_data_size,
authority_discovery_disabled,
authority_discovery_enabled,
slot_duration,
grandpa_pause,
)?;
Expand All @@ -678,7 +678,7 @@ pub fn kusama_new_full(
config: Configuration,
collating_for: Option<(CollatorId, ParaId)>,
max_block_data_size: Option<u64>,
authority_discovery_disabled: bool,
authority_discovery_enabled: bool,
slot_duration: u64,
grandpa_pause: Option<(u32, u32)>,
) -> Result<(
Expand All @@ -696,7 +696,7 @@ pub fn kusama_new_full(
config,
collating_for,
max_block_data_size,
authority_discovery_disabled,
authority_discovery_enabled,
slot_duration,
grandpa_pause,
)?;
Expand All @@ -710,7 +710,7 @@ pub fn westend_new_full(
config: Configuration,
collating_for: Option<(CollatorId, ParaId)>,
max_block_data_size: Option<u64>,
authority_discovery_disabled: bool,
authority_discovery_enabled: bool,
slot_duration: u64,
grandpa_pause: Option<(u32, u32)>,
)
Expand All @@ -728,7 +728,7 @@ pub fn westend_new_full(
config,
collating_for,
max_block_data_size,
authority_discovery_disabled,
authority_discovery_enabled,
slot_duration,
grandpa_pause,
)?;
Expand Down
8 changes: 4 additions & 4 deletions node/test-service/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ pub fn polkadot_test_new_full(
config: Configuration,
collating_for: Option<(CollatorId, ParaId)>,
max_block_data_size: Option<u64>,
authority_discovery_disabled: bool,
authority_discovery_enabled: bool,
slot_duration: u64,
) -> Result<
(
Expand All @@ -79,7 +79,7 @@ pub fn polkadot_test_new_full(
config,
collating_for,
max_block_data_size,
authority_discovery_disabled,
authority_discovery_enabled,
slot_duration,
None,
true,
Expand Down Expand Up @@ -198,9 +198,9 @@ pub fn run_test_node(
> {
let config = node_config(storage_update_func, task_executor, key, boot_nodes);
let multiaddr = config.network.listen_addresses[0].clone();
let authority_discovery_disabled = true;
let authority_discovery_enabled = false;
let (task_manager, client, handles, network, rpc_handlers) =
polkadot_test_new_full(config, None, None, authority_discovery_disabled, 6000)
polkadot_test_new_full(config, None, None, authority_discovery_enabled, 6000)
.expect("could not create Polkadot test service");

let peer_id = network.local_peer_id().clone();
Expand Down
2 changes: 1 addition & 1 deletion runtime/kusama/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("kusama"),
impl_name: create_runtime_str!("parity-kusama"),
authoring_version: 2,
spec_version: 2023,
spec_version: 2022,
impl_version: 0,
#[cfg(not(feature = "disable-runtime-api"))]
apis: RUNTIME_API_VERSIONS,
Expand Down
2 changes: 1 addition & 1 deletion runtime/polkadot/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("polkadot"),
impl_name: create_runtime_str!("parity-polkadot"),
authoring_version: 0,
spec_version: 23,
spec_version: 22,
impl_version: 0,
#[cfg(not(feature = "disable-runtime-api"))]
apis: RUNTIME_API_VERSIONS,
Expand Down
2 changes: 1 addition & 1 deletion runtime/westend/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("westend"),
impl_name: create_runtime_str!("parity-westend"),
authoring_version: 2,
spec_version: 43,
spec_version: 42,
impl_version: 0,
#[cfg(not(feature = "disable-runtime-api"))]
apis: RUNTIME_API_VERSIONS,
Expand Down
2 changes: 1 addition & 1 deletion scripts/github/generate_release_text.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
.sort_by { |v| Gem::Version.new(v.slice(1...)) }[-2]

polkadot_cl = Changelog.new(
'paritytech/polkadot', version, last_version, token: token
'paritytech/polkadot', last_version, version, token: token
)

# Get prev and cur substrate SHAs - parse the old and current Cargo.lock for
Expand Down
2 changes: 1 addition & 1 deletion scripts/gitlab/check_labels.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ensure_labels() {
releasenotes_labels=(
'B0-silent'
'B1-releasenotes'
'B2-runtimenoteworthy'
'B7-runtimenoteworthy'
)

priority_labels=(
Expand Down
30 changes: 15 additions & 15 deletions service/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ pub fn new_full<RuntimeApi, Executor>(
mut config: Configuration,
collating_for: Option<(CollatorId, parachain::Id)>,
max_block_data_size: Option<u64>,
authority_discovery_disabled: bool,
authority_discovery_enabled: bool,
slot_duration: u64,
grandpa_pause: Option<(u32, u32)>,
test: bool,
Expand Down Expand Up @@ -453,7 +453,7 @@ pub fn new_full<RuntimeApi, Executor>(
}

if matches!(role, Role::Authority{..} | Role::Sentry{..}) {
if !authority_discovery_disabled {
if authority_discovery_enabled {
let (sentries, authority_discovery_role) = match role {
Role::Authority { ref sentry_nodes } => (
sentry_nodes.clone(),
Expand Down Expand Up @@ -690,7 +690,7 @@ pub fn polkadot_new_full(
config: Configuration,
collating_for: Option<(CollatorId, parachain::Id)>,
max_block_data_size: Option<u64>,
authority_discovery_disabled: bool,
authority_discovery_enabled: bool,
slot_duration: u64,
grandpa_pause: Option<(u32, u32)>,
)
Expand All @@ -704,7 +704,7 @@ pub fn polkadot_new_full(
config,
collating_for,
max_block_data_size,
authority_discovery_disabled,
authority_discovery_enabled,
slot_duration,
grandpa_pause,
false,
Expand All @@ -719,7 +719,7 @@ pub fn kusama_new_full(
config: Configuration,
collating_for: Option<(CollatorId, parachain::Id)>,
max_block_data_size: Option<u64>,
authority_discovery_disabled: bool,
authority_discovery_enabled: bool,
slot_duration: u64,
grandpa_pause: Option<(u32, u32)>,
) -> Result<(
Expand All @@ -732,7 +732,7 @@ pub fn kusama_new_full(
config,
collating_for,
max_block_data_size,
authority_discovery_disabled,
authority_discovery_enabled,
slot_duration,
grandpa_pause,
false,
Expand All @@ -747,7 +747,7 @@ pub fn westend_new_full(
config: Configuration,
collating_for: Option<(CollatorId, parachain::Id)>,
max_block_data_size: Option<u64>,
authority_discovery_disabled: bool,
authority_discovery_enabled: bool,
slot_duration: u64,
grandpa_pause: Option<(u32, u32)>,
)
Expand All @@ -761,7 +761,7 @@ pub fn westend_new_full(
config,
collating_for,
max_block_data_size,
authority_discovery_disabled,
authority_discovery_enabled,
slot_duration,
grandpa_pause,
false,
Expand All @@ -776,7 +776,7 @@ pub fn rococo_new_full(
config: Configuration,
collating_for: Option<(CollatorId, parachain::Id)>,
max_block_data_size: Option<u64>,
authority_discovery_disabled: bool,
authority_discovery_enabled: bool,
slot_duration: u64,
grandpa_pause: Option<(u32, u32)>,
)
Expand All @@ -790,7 +790,7 @@ pub fn rococo_new_full(
config,
collating_for,
max_block_data_size,
authority_discovery_disabled,
authority_discovery_enabled,
slot_duration,
grandpa_pause,
false,
Expand Down Expand Up @@ -829,7 +829,7 @@ pub fn build_full(
config: Configuration,
collating_for: Option<(CollatorId, parachain::Id)>,
max_block_data_size: Option<u64>,
authority_discovery_disabled: bool,
authority_discovery_enabled: bool,
slot_duration: u64,
grandpa_pause: Option<(u32, u32)>,
) -> Result<(TaskManager, Client, FullNodeHandles), ServiceError> {
Expand All @@ -838,7 +838,7 @@ pub fn build_full(
config,
collating_for,
max_block_data_size,
authority_discovery_disabled,
authority_discovery_enabled,
slot_duration,
grandpa_pause,
false,
Expand All @@ -848,7 +848,7 @@ pub fn build_full(
config,
collating_for,
max_block_data_size,
authority_discovery_disabled,
authority_discovery_enabled,
slot_duration,
grandpa_pause,
false,
Expand All @@ -858,7 +858,7 @@ pub fn build_full(
config,
collating_for,
max_block_data_size,
authority_discovery_disabled,
authority_discovery_enabled,
slot_duration,
grandpa_pause,
false,
Expand All @@ -868,7 +868,7 @@ pub fn build_full(
config,
collating_for,
max_block_data_size,
authority_discovery_disabled,
authority_discovery_enabled,
slot_duration,
grandpa_pause,
false,
Expand Down

0 comments on commit 844783a

Please sign in to comment.