From 613803a15da49499a41a87c9e03a218ba8d55621 Mon Sep 17 00:00:00 2001 From: Hernando Castano Date: Thu, 17 Jun 2021 12:44:04 -0400 Subject: [PATCH] Bump Substrate to `286d7ce` (#1006) * Bump dependencies - Substrate to `74a1bfdcc` - `finality-grandpa` to `0.14.1` - `fs-swap` to `0.2.6` * Add `pallet_randomness_collective_flip` to runtimes * Rename GenesisConfig fields See Substrate PR: https://github.com/paritytech/substrate/pull/8990 * Missed PoA renames in Rialto GenesisConfig * Use `spawn_essential_handle` for transaction pool See Substrate PR: https://github.com/paritytech/substrate/pull/9074 --- bridges/bin/millau/node/src/chain_spec.rs | 14 ++++++------- bridges/bin/millau/node/src/service.rs | 4 ++-- bridges/bin/millau/runtime/src/lib.rs | 4 +++- bridges/bin/rialto/node/src/chain_spec.rs | 22 ++++++++++---------- bridges/bin/rialto/node/src/service.rs | 4 ++-- bridges/bin/rialto/runtime/src/lib.rs | 14 +++++++------ bridges/bin/rialto/runtime/src/rialto_poa.rs | 2 +- bridges/modules/dispatch/src/lib.rs | 18 ++++++++-------- bridges/modules/messages/src/lib.rs | 8 +++---- bridges/relays/bin-ethereum/src/instances.rs | 4 ++-- 10 files changed, 49 insertions(+), 45 deletions(-) diff --git a/bridges/bin/millau/node/src/chain_spec.rs b/bridges/bin/millau/node/src/chain_spec.rs index 872b81a88c..2b920786c9 100644 --- a/bridges/bin/millau/node/src/chain_spec.rs +++ b/bridges/bin/millau/node/src/chain_spec.rs @@ -175,27 +175,27 @@ fn testnet_genesis( _enable_println: bool, ) -> GenesisConfig { GenesisConfig { - frame_system: SystemConfig { + system: SystemConfig { code: WASM_BINARY.expect("Millau development WASM not available").to_vec(), changes_trie_config: Default::default(), }, - pallet_balances: BalancesConfig { + balances: BalancesConfig { balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 50)).collect(), }, - pallet_aura: AuraConfig { + aura: AuraConfig { authorities: Vec::new(), }, - pallet_grandpa: GrandpaConfig { + grandpa: GrandpaConfig { authorities: Vec::new(), }, - pallet_sudo: SudoConfig { key: root_key }, - pallet_session: SessionConfig { + sudo: SudoConfig { key: root_key }, + session: SessionConfig { keys: initial_authorities .iter() .map(|x| (x.0.clone(), x.0.clone(), session_keys(x.1.clone(), x.2.clone()))) .collect::>(), }, - pallet_bridge_grandpa_Instance1: BridgeWestendGrandpaConfig { + bridge_westend_grandpa: BridgeWestendGrandpaConfig { // for our deployments to avoid multiple same-nonces transactions: // //Alice is already used to initialize Rialto<->Millau bridge // => let's use //George to initialize Westend->Millau bridge diff --git a/bridges/bin/millau/node/src/service.rs b/bridges/bin/millau/node/src/service.rs index 3c138a649e..a9d555a872 100644 --- a/bridges/bin/millau/node/src/service.rs +++ b/bridges/bin/millau/node/src/service.rs @@ -103,7 +103,7 @@ pub fn new_partial( config.transaction_pool.clone(), config.role.is_authority().into(), config.prometheus_registry(), - task_manager.spawn_handle(), + task_manager.spawn_essential_handle(), client.clone(), ); @@ -389,7 +389,7 @@ pub fn new_light(mut config: Configuration) -> Result let transaction_pool = Arc::new(sc_transaction_pool::BasicPool::new_light( config.transaction_pool.clone(), config.prometheus_registry(), - task_manager.spawn_handle(), + task_manager.spawn_essential_handle(), client.clone(), on_demand.clone(), )); diff --git a/bridges/bin/millau/runtime/src/lib.rs b/bridges/bin/millau/runtime/src/lib.rs index da2db79b55..dd13afb064 100644 --- a/bridges/bin/millau/runtime/src/lib.rs +++ b/bridges/bin/millau/runtime/src/lib.rs @@ -205,6 +205,8 @@ impl frame_system::Config for Runtime { type OnSetCode = (); } +impl pallet_randomness_collective_flip::Config for Runtime {} + impl pallet_aura::Config for Runtime { type AuthorityId = AuraId; } @@ -398,7 +400,7 @@ construct_runtime!( BridgeRialtoGrandpa: pallet_bridge_grandpa::{Pallet, Call, Storage}, BridgeWestendGrandpa: pallet_bridge_grandpa::::{Pallet, Call, Config, Storage}, System: frame_system::{Pallet, Call, Config, Storage, Event}, - RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Call, Storage}, + RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage}, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, Aura: pallet_aura::{Pallet, Config}, Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event}, diff --git a/bridges/bin/rialto/node/src/chain_spec.rs b/bridges/bin/rialto/node/src/chain_spec.rs index 17b13c88fb..e354cbc881 100644 --- a/bridges/bin/rialto/node/src/chain_spec.rs +++ b/bridges/bin/rialto/node/src/chain_spec.rs @@ -16,7 +16,7 @@ use bp_rialto::derive_account_from_millau_id; use rialto_runtime::{ - AccountId, AuraConfig, BalancesConfig, BridgeKovanConfig, BridgeRialtoPoAConfig, GenesisConfig, GrandpaConfig, + AccountId, AuraConfig, BalancesConfig, BridgeKovanConfig, BridgeRialtoPoaConfig, GenesisConfig, GrandpaConfig, SessionConfig, SessionKeys, Signature, SudoConfig, SystemConfig, WASM_BINARY, }; use serde_json::json; @@ -176,23 +176,23 @@ fn testnet_genesis( _enable_println: bool, ) -> GenesisConfig { GenesisConfig { - frame_system: SystemConfig { + system: SystemConfig { code: WASM_BINARY.expect("Rialto development WASM not available").to_vec(), changes_trie_config: Default::default(), }, - pallet_balances: BalancesConfig { + balances: BalancesConfig { balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 50)).collect(), }, - pallet_aura: AuraConfig { + aura: AuraConfig { authorities: Vec::new(), }, - pallet_bridge_eth_poa_Instance1: load_rialto_poa_bridge_config(), - pallet_bridge_eth_poa_Instance2: load_kovan_bridge_config(), - pallet_grandpa: GrandpaConfig { + bridge_rialto_poa: load_rialto_poa_bridge_config(), + bridge_kovan: load_kovan_bridge_config(), + grandpa: GrandpaConfig { authorities: Vec::new(), }, - pallet_sudo: SudoConfig { key: root_key }, - pallet_session: SessionConfig { + sudo: SudoConfig { key: root_key }, + session: SessionConfig { keys: initial_authorities .iter() .map(|x| (x.0.clone(), x.0.clone(), session_keys(x.1.clone(), x.2.clone()))) @@ -201,8 +201,8 @@ fn testnet_genesis( } } -fn load_rialto_poa_bridge_config() -> BridgeRialtoPoAConfig { - BridgeRialtoPoAConfig { +fn load_rialto_poa_bridge_config() -> BridgeRialtoPoaConfig { + BridgeRialtoPoaConfig { initial_header: rialto_runtime::rialto_poa::genesis_header(), initial_difficulty: 0.into(), initial_validators: rialto_runtime::rialto_poa::genesis_validators(), diff --git a/bridges/bin/rialto/node/src/service.rs b/bridges/bin/rialto/node/src/service.rs index a1844aa1af..103929cff5 100644 --- a/bridges/bin/rialto/node/src/service.rs +++ b/bridges/bin/rialto/node/src/service.rs @@ -105,7 +105,7 @@ pub fn new_partial( config.transaction_pool.clone(), config.role.is_authority().into(), config.prometheus_registry(), - task_manager.spawn_handle(), + task_manager.spawn_essential_handle(), client.clone(), ); @@ -393,7 +393,7 @@ pub fn new_light(mut config: Configuration) -> Result let transaction_pool = Arc::new(sc_transaction_pool::BasicPool::new_light( config.transaction_pool.clone(), config.prometheus_registry(), - task_manager.spawn_handle(), + task_manager.spawn_essential_handle(), client.clone(), on_demand.clone(), )); diff --git a/bridges/bin/rialto/runtime/src/lib.rs b/bridges/bin/rialto/runtime/src/lib.rs index 854acdbe1d..dff373afb5 100644 --- a/bridges/bin/rialto/runtime/src/lib.rs +++ b/bridges/bin/rialto/runtime/src/lib.rs @@ -212,6 +212,8 @@ impl frame_system::Config for Runtime { type OnSetCode = (); } +impl pallet_randomness_collective_flip::Config for Runtime {} + impl pallet_aura::Config for Runtime { type AuthorityId = AuraId; } @@ -500,7 +502,7 @@ construct_runtime!( NodeBlock = opaque::Block, UncheckedExtrinsic = UncheckedExtrinsic { - BridgeRialtoPoA: pallet_bridge_eth_poa::::{Pallet, Call, Config, Storage, ValidateUnsigned}, + BridgeRialtoPoa: pallet_bridge_eth_poa::::{Pallet, Call, Config, Storage, ValidateUnsigned}, BridgeKovan: pallet_bridge_eth_poa::::{Pallet, Call, Config, Storage, ValidateUnsigned}, BridgeRialtoCurrencyExchange: pallet_bridge_currency_exchange::::{Pallet, Call}, BridgeKovanCurrencyExchange: pallet_bridge_currency_exchange::::{Pallet, Call}, @@ -508,7 +510,7 @@ construct_runtime!( BridgeDispatch: pallet_bridge_dispatch::{Pallet, Event}, BridgeMillauMessages: pallet_bridge_messages::{Pallet, Call, Storage, Event}, System: frame_system::{Pallet, Call, Config, Storage, Event}, - RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Call, Storage}, + RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage}, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, Aura: pallet_aura::{Pallet, Config}, Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event}, @@ -600,21 +602,21 @@ impl_runtime_apis! { impl bp_eth_poa::RialtoPoAHeaderApi for Runtime { fn best_block() -> (u64, bp_eth_poa::H256) { - let best_block = BridgeRialtoPoA::best_block(); + let best_block = BridgeRialtoPoa::best_block(); (best_block.number, best_block.hash) } fn finalized_block() -> (u64, bp_eth_poa::H256) { - let finalized_block = BridgeRialtoPoA::finalized_block(); + let finalized_block = BridgeRialtoPoa::finalized_block(); (finalized_block.number, finalized_block.hash) } fn is_import_requires_receipts(header: bp_eth_poa::AuraHeader) -> bool { - BridgeRialtoPoA::is_import_requires_receipts(header) + BridgeRialtoPoa::is_import_requires_receipts(header) } fn is_known_block(hash: bp_eth_poa::H256) -> bool { - BridgeRialtoPoA::is_known_block(hash) + BridgeRialtoPoa::is_known_block(hash) } } diff --git a/bridges/bin/rialto/runtime/src/rialto_poa.rs b/bridges/bin/rialto/runtime/src/rialto_poa.rs index 83b263975a..9bc74a2eba 100644 --- a/bridges/bin/rialto/runtime/src/rialto_poa.rs +++ b/bridges/bin/rialto/runtime/src/rialto_poa.rs @@ -130,7 +130,7 @@ impl InclusionProofVerifier for RialtoBlockchain { fn verify_transaction_inclusion_proof(proof: &Self::TransactionInclusionProof) -> Option { let is_transaction_finalized = - crate::BridgeRialtoPoA::verify_transaction_finalized(proof.block, proof.index, &proof.proof); + crate::BridgeRialtoPoa::verify_transaction_finalized(proof.block, proof.index, &proof.proof); if !is_transaction_finalized { return None; diff --git a/bridges/modules/dispatch/src/lib.rs b/bridges/modules/dispatch/src/lib.rs index 3a4fb8f87a..42749e075e 100644 --- a/bridges/modules/dispatch/src/lib.rs +++ b/bridges/modules/dispatch/src/lib.rs @@ -531,7 +531,7 @@ mod tests { System::events(), vec![EventRecord { phase: Phase::Initialization, - event: Event::call_dispatch(call_dispatch::Event::::MessageVersionSpecMismatch( + event: Event::Dispatch(call_dispatch::Event::::MessageVersionSpecMismatch( SOURCE_CHAIN_ID, id, TEST_SPEC_VERSION, @@ -558,7 +558,7 @@ mod tests { System::events(), vec![EventRecord { phase: Phase::Initialization, - event: Event::call_dispatch(call_dispatch::Event::::MessageWeightMismatch( + event: Event::Dispatch(call_dispatch::Event::::MessageWeightMismatch( SOURCE_CHAIN_ID, id, 1345000, @@ -588,7 +588,7 @@ mod tests { System::events(), vec![EventRecord { phase: Phase::Initialization, - event: Event::call_dispatch(call_dispatch::Event::::MessageSignatureMismatch( + event: Event::Dispatch(call_dispatch::Event::::MessageSignatureMismatch( SOURCE_CHAIN_ID, id )), @@ -610,7 +610,7 @@ mod tests { System::events(), vec![EventRecord { phase: Phase::Initialization, - event: Event::call_dispatch(call_dispatch::Event::::MessageRejected( + event: Event::Dispatch(call_dispatch::Event::::MessageRejected( SOURCE_CHAIN_ID, id )), @@ -636,7 +636,7 @@ mod tests { System::events(), vec![EventRecord { phase: Phase::Initialization, - event: Event::call_dispatch(call_dispatch::Event::::MessageCallDecodeFailed( + event: Event::Dispatch(call_dispatch::Event::::MessageCallDecodeFailed( SOURCE_CHAIN_ID, id )), @@ -663,7 +663,7 @@ mod tests { System::events(), vec![EventRecord { phase: Phase::Initialization, - event: Event::call_dispatch(call_dispatch::Event::::MessageCallRejected( + event: Event::Dispatch(call_dispatch::Event::::MessageCallRejected( SOURCE_CHAIN_ID, id )), @@ -686,7 +686,7 @@ mod tests { System::events(), vec![EventRecord { phase: Phase::Initialization, - event: Event::call_dispatch(call_dispatch::Event::::MessageDispatched( + event: Event::Dispatch(call_dispatch::Event::::MessageDispatched( SOURCE_CHAIN_ID, id, Ok(()) @@ -712,7 +712,7 @@ mod tests { System::events(), vec![EventRecord { phase: Phase::Initialization, - event: Event::call_dispatch(call_dispatch::Event::::MessageDispatched( + event: Event::Dispatch(call_dispatch::Event::::MessageDispatched( SOURCE_CHAIN_ID, id, Ok(()) @@ -738,7 +738,7 @@ mod tests { System::events(), vec![EventRecord { phase: Phase::Initialization, - event: Event::call_dispatch(call_dispatch::Event::::MessageDispatched( + event: Event::Dispatch(call_dispatch::Event::::MessageDispatched( SOURCE_CHAIN_ID, id, Ok(()) diff --git a/bridges/modules/messages/src/lib.rs b/bridges/modules/messages/src/lib.rs index 0d9b5788d2..e8a004b19a 100644 --- a/bridges/modules/messages/src/lib.rs +++ b/bridges/modules/messages/src/lib.rs @@ -891,7 +891,7 @@ mod tests { System::::events(), vec![EventRecord { phase: Phase::Initialization, - event: TestEvent::pallet_bridge_messages(RawEvent::MessageAccepted(TEST_LANE_ID, 1)), + event: TestEvent::Messages(RawEvent::MessageAccepted(TEST_LANE_ID, 1)), topics: vec![], }], ); @@ -920,7 +920,7 @@ mod tests { System::::events(), vec![EventRecord { phase: Phase::Initialization, - event: TestEvent::pallet_bridge_messages(RawEvent::MessagesDelivered(TEST_LANE_ID, 1, 1)), + event: TestEvent::Messages(RawEvent::MessagesDelivered(TEST_LANE_ID, 1, 1)), topics: vec![], }], ); @@ -1021,7 +1021,7 @@ mod tests { System::::events(), vec![EventRecord { phase: Phase::Initialization, - event: TestEvent::pallet_bridge_messages(RawEvent::ParameterUpdated(parameter)), + event: TestEvent::Messages(RawEvent::ParameterUpdated(parameter)), topics: vec![], }], ); @@ -1045,7 +1045,7 @@ mod tests { System::::events(), vec![EventRecord { phase: Phase::Initialization, - event: TestEvent::pallet_bridge_messages(RawEvent::ParameterUpdated(parameter)), + event: TestEvent::Messages(RawEvent::ParameterUpdated(parameter)), topics: vec![], }], ); diff --git a/bridges/relays/bin-ethereum/src/instances.rs b/bridges/relays/bin-ethereum/src/instances.rs index 6d3966ca45..2ade8632a9 100644 --- a/bridges/relays/bin-ethereum/src/instances.rs +++ b/bridges/relays/bin-ethereum/src/instances.rs @@ -60,7 +60,7 @@ impl BridgeInstance for RialtoPoA { .collect(), ); - rialto_runtime::Call::BridgeRialtoPoA(pallet_call) + rialto_runtime::Call::BridgeRialtoPoa(pallet_call) } fn build_unsigned_header_call(&self, header: QueuedEthereumHeader) -> Call { @@ -69,7 +69,7 @@ impl BridgeInstance for RialtoPoA { into_substrate_ethereum_receipts(header.extra()), ); - rialto_runtime::Call::BridgeRialtoPoA(pallet_call) + rialto_runtime::Call::BridgeRialtoPoa(pallet_call) } fn build_currency_exchange_call(&self, proof: Proof) -> Call {