From dfd639af16571c52137efa8754a427090b04a449 Mon Sep 17 00:00:00 2001 From: crystalin Date: Fri, 6 Dec 2024 12:44:45 +0100 Subject: [PATCH 1/2] Updates Moonkit to fix experimental import --- Cargo.lock | 30 ++++++++++++++-------------- node/service/src/lazy_loading/mod.rs | 2 +- node/service/src/lib.rs | 8 ++++---- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 21c0dab88e..988ad5d84d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -486,7 +486,7 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-backing-primitives" version = "0.9.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#54564227255cc8e6cd6a01fb8540459337fb43ff" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#53ef5c7c4eff9287af6ca51fa613b6bbf7cf989b" dependencies = [ "sp-api", "sp-consensus-slots", @@ -7574,7 +7574,7 @@ dependencies = [ [[package]] name = "nimbus-consensus" version = "0.9.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#54564227255cc8e6cd6a01fb8540459337fb43ff" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#53ef5c7c4eff9287af6ca51fa613b6bbf7cf989b" dependencies = [ "async-backing-primitives", "async-trait", @@ -7614,7 +7614,7 @@ dependencies = [ [[package]] name = "nimbus-primitives" version = "0.9.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#54564227255cc8e6cd6a01fb8540459337fb43ff" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#53ef5c7c4eff9287af6ca51fa613b6bbf7cf989b" dependencies = [ "async-trait", "frame-benchmarking", @@ -8129,7 +8129,7 @@ dependencies = [ [[package]] name = "pallet-async-backing" version = "0.9.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#54564227255cc8e6cd6a01fb8540459337fb43ff" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#53ef5c7c4eff9287af6ca51fa613b6bbf7cf989b" dependencies = [ "cumulus-pallet-parachain-system", "cumulus-primitives-core", @@ -8149,7 +8149,7 @@ dependencies = [ [[package]] name = "pallet-author-inherent" version = "0.9.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#54564227255cc8e6cd6a01fb8540459337fb43ff" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#53ef5c7c4eff9287af6ca51fa613b6bbf7cf989b" dependencies = [ "frame-benchmarking", "frame-support", @@ -8168,7 +8168,7 @@ dependencies = [ [[package]] name = "pallet-author-mapping" version = "2.0.5" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#54564227255cc8e6cd6a01fb8540459337fb43ff" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#53ef5c7c4eff9287af6ca51fa613b6bbf7cf989b" dependencies = [ "frame-benchmarking", "frame-support", @@ -8187,7 +8187,7 @@ dependencies = [ [[package]] name = "pallet-author-slot-filter" version = "0.9.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#54564227255cc8e6cd6a01fb8540459337fb43ff" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#53ef5c7c4eff9287af6ca51fa613b6bbf7cf989b" dependencies = [ "frame-benchmarking", "frame-support", @@ -8544,7 +8544,7 @@ dependencies = [ [[package]] name = "pallet-emergency-para-xcm" version = "0.1.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#54564227255cc8e6cd6a01fb8540459337fb43ff" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#53ef5c7c4eff9287af6ca51fa613b6bbf7cf989b" dependencies = [ "cumulus-pallet-parachain-system", "cumulus-primitives-core", @@ -9256,7 +9256,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-xcm" version = "0.1.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#54564227255cc8e6cd6a01fb8540459337fb43ff" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#53ef5c7c4eff9287af6ca51fa613b6bbf7cf989b" dependencies = [ "cumulus-primitives-core", "evm", @@ -9505,7 +9505,7 @@ dependencies = [ [[package]] name = "pallet-maintenance-mode" version = "0.1.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#54564227255cc8e6cd6a01fb8540459337fb43ff" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#53ef5c7c4eff9287af6ca51fa613b6bbf7cf989b" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -9556,7 +9556,7 @@ dependencies = [ [[package]] name = "pallet-migrations" version = "0.1.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#54564227255cc8e6cd6a01fb8540459337fb43ff" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#53ef5c7c4eff9287af6ca51fa613b6bbf7cf989b" dependencies = [ "frame-benchmarking", "frame-support", @@ -9890,7 +9890,7 @@ dependencies = [ [[package]] name = "pallet-randomness" version = "0.1.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#54564227255cc8e6cd6a01fb8540459337fb43ff" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#53ef5c7c4eff9287af6ca51fa613b6bbf7cf989b" dependencies = [ "environmental", "frame-benchmarking", @@ -9965,7 +9965,7 @@ dependencies = [ [[package]] name = "pallet-relay-storage-roots" version = "0.1.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#54564227255cc8e6cd6a01fb8540459337fb43ff" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#53ef5c7c4eff9287af6ca51fa613b6bbf7cf989b" dependencies = [ "cumulus-pallet-parachain-system", "cumulus-primitives-core", @@ -14825,7 +14825,7 @@ dependencies = [ [[package]] name = "session-keys-primitives" version = "0.1.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#54564227255cc8e6cd6a01fb8540459337fb43ff" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#53ef5c7c4eff9287af6ca51fa613b6bbf7cf989b" dependencies = [ "async-trait", "frame-support", @@ -18478,7 +18478,7 @@ dependencies = [ [[package]] name = "xcm-primitives" version = "0.1.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#54564227255cc8e6cd6a01fb8540459337fb43ff" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-stable2407#53ef5c7c4eff9287af6ca51fa613b6bbf7cf989b" dependencies = [ "frame-support", "impl-trait-for-tuples", diff --git a/node/service/src/lazy_loading/mod.rs b/node/service/src/lazy_loading/mod.rs index a581619edf..1e34788753 100644 --- a/node/service/src/lazy_loading/mod.rs +++ b/node/service/src/lazy_loading/mod.rs @@ -337,7 +337,7 @@ where create_inherent_data_providers, &task_manager.spawn_essential_handle(), config.prometheus_registry(), - None, + false, )?; let block_import = BlockImportPipeline::Dev(frontier_block_import); diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index 064e61b57c..5473a32588 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -569,9 +569,9 @@ where &task_manager.spawn_essential_handle(), config.prometheus_registry(), if experimental_block_import_strategy { - None + true } else { - Some(!dev_service) + !dev_service }, )?, BlockImportPipeline::Dev(frontier_block_import), @@ -593,9 +593,9 @@ where &task_manager.spawn_essential_handle(), config.prometheus_registry(), if experimental_block_import_strategy { - None + true } else { - Some(!dev_service) + !dev_service }, )?, BlockImportPipeline::Parachain(parachain_block_import), From 7806c9185b46750813ac29b9a66f330d012b8d67 Mon Sep 17 00:00:00 2001 From: Alan Sapede Date: Fri, 6 Dec 2024 12:53:56 +0100 Subject: [PATCH 2/2] Update lib.rs --- node/service/src/lib.rs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index 5473a32588..d6a66cb4af 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -568,11 +568,7 @@ where create_inherent_data_providers, &task_manager.spawn_essential_handle(), config.prometheus_registry(), - if experimental_block_import_strategy { - true - } else { - !dev_service - }, + !experimental_block_import_strategy, )?, BlockImportPipeline::Dev(frontier_block_import), ) @@ -592,11 +588,7 @@ where create_inherent_data_providers, &task_manager.spawn_essential_handle(), config.prometheus_registry(), - if experimental_block_import_strategy { - true - } else { - !dev_service - }, + !experimental_block_import_strategy, )?, BlockImportPipeline::Parachain(parachain_block_import), )