Polkadot staging update

.gitlab-ci.yml

@@ -15,7 +15,7 @@ variables:                         &default-vars
   GIT_DEPTH:                       100
   CARGO_INCREMENTAL:               0
   ARCH:                            "x86_64"
-  CI_IMAGE:                        "paritytech/bridges-ci:staging"
+  CI_IMAGE:                        "paritytech/bridges-ci:e8a9ef25-20211215"
   RUST_BACKTRACE:                  full
 
 default:

Dockerfile

@@ -8,7 +8,7 @@
 #
 # See the `deployments/README.md` for all the available `PROJECT` values.
 
-FROM paritytech/bridges-ci:latest as builder
+FROM paritytech/bridges-ci:e8a9ef25-20211215 as builder
 WORKDIR /parity-bridges-common
 
 COPY . .

bin/millau/node/src/chain_spec.rs

@@ -88,15 +88,7 @@ impl Alternative {
 					testnet_genesis(
 						vec![get_authority_keys_from_seed("Alice")],
 						get_account_id_from_seed::<sr25519::Public>("Alice"),
-						vec![
-							get_account_id_from_seed::<sr25519::Public>("Alice"),
-							get_account_id_from_seed::<sr25519::Public>("Bob"),
-							get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-							get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-							derive_account_from_rialto_id(bp_runtime::SourceAccount::Account(
-								get_account_id_from_seed::<sr25519::Public>("Alice"),
-							)),
-						],
+						endowed_accounts(),
 						true,
 					)
 				},
@@ -120,48 +112,7 @@ impl Alternative {
 							get_authority_keys_from_seed("Eve"),
 						],
 						get_account_id_from_seed::<sr25519::Public>("Alice"),
-						vec![
-							get_account_id_from_seed::<sr25519::Public>("Alice"),
-							get_account_id_from_seed::<sr25519::Public>("Bob"),
-							get_account_id_from_seed::<sr25519::Public>("Charlie"),
-							get_account_id_from_seed::<sr25519::Public>("Dave"),
-							get_account_id_from_seed::<sr25519::Public>("Eve"),
-							get_account_id_from_seed::<sr25519::Public>("Ferdie"),
-							get_account_id_from_seed::<sr25519::Public>("George"),
-							get_account_id_from_seed::<sr25519::Public>("Harry"),
-							get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-							get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-							get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
-							get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
-							get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
-							get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
-							get_account_id_from_seed::<sr25519::Public>("George//stash"),
-							get_account_id_from_seed::<sr25519::Public>("Harry//stash"),
-							get_account_id_from_seed::<sr25519::Public>("RialtoMessagesOwner"),
-							get_account_id_from_seed::<sr25519::Public>("WithRialtoTokenSwap"),
-							pallet_bridge_messages::relayer_fund_account_id::<
-								bp_millau::AccountId,
-								bp_millau::AccountIdConverter,
-							>(),
-							derive_account_from_rialto_id(bp_runtime::SourceAccount::Account(
-								get_account_id_from_seed::<sr25519::Public>("Alice"),
-							)),
-							derive_account_from_rialto_id(bp_runtime::SourceAccount::Account(
-								get_account_id_from_seed::<sr25519::Public>("Bob"),
-							)),
-							derive_account_from_rialto_id(bp_runtime::SourceAccount::Account(
-								get_account_id_from_seed::<sr25519::Public>("Charlie"),
-							)),
-							derive_account_from_rialto_id(bp_runtime::SourceAccount::Account(
-								get_account_id_from_seed::<sr25519::Public>("Dave"),
-							)),
-							derive_account_from_rialto_id(bp_runtime::SourceAccount::Account(
-								get_account_id_from_seed::<sr25519::Public>("Eve"),
-							)),
-							derive_account_from_rialto_id(bp_runtime::SourceAccount::Account(
-								get_account_id_from_seed::<sr25519::Public>("Ferdie"),
-							)),
-						],
+						endowed_accounts(),
 						true,
 					)
 				},
@@ -175,6 +126,55 @@ impl Alternative {
 	}
 }
 
+/// We're using the same set of endowed accounts on all Millau chains (dev/local) to make
+/// sure that all accounts, required for bridge to be functional (e.g. relayers fund account,
+/// accounts used by relayers in our test deployments, accounts used for demonstration
+/// purposes), are all available on these chains.
+fn endowed_accounts() -> Vec<AccountId> {
+	vec![
+		get_account_id_from_seed::<sr25519::Public>("Alice"),
+		get_account_id_from_seed::<sr25519::Public>("Bob"),
+		get_account_id_from_seed::<sr25519::Public>("Charlie"),
+		get_account_id_from_seed::<sr25519::Public>("Dave"),
+		get_account_id_from_seed::<sr25519::Public>("Eve"),
+		get_account_id_from_seed::<sr25519::Public>("Ferdie"),
+		get_account_id_from_seed::<sr25519::Public>("George"),
+		get_account_id_from_seed::<sr25519::Public>("Harry"),
+		get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
+		get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+		get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
+		get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
+		get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
+		get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
+		get_account_id_from_seed::<sr25519::Public>("George//stash"),
+		get_account_id_from_seed::<sr25519::Public>("Harry//stash"),
+		get_account_id_from_seed::<sr25519::Public>("RialtoMessagesOwner"),
+		get_account_id_from_seed::<sr25519::Public>("WithRialtoTokenSwap"),
+		pallet_bridge_messages::relayer_fund_account_id::<
+			bp_millau::AccountId,
+			bp_millau::AccountIdConverter,
+		>(),
+		derive_account_from_rialto_id(bp_runtime::SourceAccount::Account(
+			get_account_id_from_seed::<sr25519::Public>("Alice"),
+		)),
+		derive_account_from_rialto_id(bp_runtime::SourceAccount::Account(
+			get_account_id_from_seed::<sr25519::Public>("Bob"),
+		)),
+		derive_account_from_rialto_id(bp_runtime::SourceAccount::Account(
+			get_account_id_from_seed::<sr25519::Public>("Charlie"),
+		)),
+		derive_account_from_rialto_id(bp_runtime::SourceAccount::Account(
+			get_account_id_from_seed::<sr25519::Public>("Dave"),
+		)),
+		derive_account_from_rialto_id(bp_runtime::SourceAccount::Account(
+			get_account_id_from_seed::<sr25519::Public>("Eve"),
+		)),
+		derive_account_from_rialto_id(bp_runtime::SourceAccount::Account(
+			get_account_id_from_seed::<sr25519::Public>("Ferdie"),
+		)),
+	]
+}
+
 fn session_keys(aura: AuraId, beefy: BeefyId, grandpa: GrandpaId) -> SessionKeys {
 	SessionKeys { aura, beefy, grandpa }
 }

bin/millau/node/src/service.rs

@@ -66,6 +66,7 @@ type FullClient =
 type FullBackend = sc_service::TFullBackend<Block>;
 type FullSelectChain = sc_consensus::LongestChain<FullBackend, Block>;
 
+#[allow(clippy::type_complexity)]
 pub fn new_partial(
 	config: &Configuration,
 ) -> Result<
@@ -89,7 +90,7 @@ pub fn new_partial(
 	ServiceError,
 > {
 	if config.keystore_remote.is_some() {
-		return Err(ServiceError::Other(format!("Remote Keystores are not supported.")))
+		return Err(ServiceError::Other("Remote Keystores are not supported.".into()))
 	}
 
 	let telemetry = config
@@ -111,7 +112,7 @@ pub fn new_partial(
 
 	let (client, backend, keystore_container, task_manager) =
 		sc_service::new_full_parts::<Block, RuntimeApi, _>(
-			&config,
+			config,
 			telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()),
 			executor,
 		)?;
@@ -178,7 +179,7 @@ pub fn new_partial(
 	})
 }
 
-fn remote_keystore(_url: &String) -> Result<Arc<LocalKeystore>, &'static str> {
+fn remote_keystore(_url: &str) -> Result<Arc<LocalKeystore>, &'static str> {
 	// FIXME: here would the concrete keystore be built,
 	//        must return a concrete type (NOT `LocalKeystore`) that
 	//        implements `CryptoStore` and `SyncCryptoStore`