Merge remote-tracking branch 'upstream/master' into td-offchain-signing

Author: rakanalh

.maintain/gitlab/check_polkadot_companion_status.sh

@@ -76,11 +76,11 @@ then
   exit 0
 fi
 
-if jq -e '.mergeable and .mergeable_state == "clean"' < companion_pr.json >/dev/null
+if jq -e '.mergeable' < companion_pr.json >/dev/null
 then
   boldprint "polkadot pr #${pr_companion} mergeable"
 else
-  boldprint "polkadot pr #${pr_companion} not mergeable or clean"
+  boldprint "polkadot pr #${pr_companion} not mergeable"
   exit 1
 fi
 

Cargo.lock

@@ -20,9 +20,10 @@ use sc_chain_spec::ChainSpecExtension;
 use sp_core::{Pair, Public, crypto::UncheckedInto, sr25519};
 use serde::{Serialize, Deserialize};
 use node_runtime::{
-	AuthorityDiscoveryConfig, BabeConfig, BalancesConfig, ContractsConfig, CouncilConfig, DemocracyConfig,
-	GrandpaConfig, ImOnlineConfig, SessionConfig, SessionKeys, StakerStatus, StakingConfig,
-	IndicesConfig, SocietyConfig, SudoConfig, SystemConfig, TechnicalCommitteeConfig, WASM_BINARY,
+	AuthorityDiscoveryConfig, BabeConfig, BalancesConfig, ContractsConfig, CouncilConfig,
+	DemocracyConfig,GrandpaConfig, ImOnlineConfig, SessionConfig, SessionKeys, StakerStatus,
+	StakingConfig, ElectionsConfig, IndicesConfig, SocietyConfig, SudoConfig, SystemConfig,
+	TechnicalCommitteeConfig, WASM_BINARY,
 };
 use node_runtime::Block;
 use node_runtime::constants::currency::*;
@@ -270,13 +271,14 @@ pub fn testnet_genesis(
 			.. Default::default()
 		}),
 		pallet_democracy: Some(DemocracyConfig::default()),
-		pallet_collective_Instance1: Some(CouncilConfig {
+		pallet_elections_phragmen: Some(ElectionsConfig {
 			members: endowed_accounts.iter()
 						.take((num_endowed_accounts + 1) / 2)
 						.cloned()
+						.map(|member| (member, STASH))
 						.collect(),
-			phantom: Default::default(),
 		}),
+		pallet_collective_Instance1: Some(CouncilConfig::default()),
 		pallet_collective_Instance2: Some(TechnicalCommitteeConfig {
 			members: endowed_accounts.iter()
 						.take((num_endowed_accounts + 1) / 2)

bin/node/cli/src/chain_spec.rs

@@ -178,7 +178,7 @@ fn submitted_transaction_should_be_valid() {
 			priority: 2_411_002_000_000,
 			requires: vec![],
 			provides: vec![(address, 0).encode()],
-			longevity: 127,
+			longevity: 128,
 			propagate: true,
 		});
 	});