Skip to content

Commit

Permalink
feat: don't override fork strategy in import_queue
Browse files Browse the repository at this point in the history
  • Loading branch information
@RomarQ
RomarQ committed Nov 19, 2024
1 parent c26c7db commit 8a72adc
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 36 deletions.
31 changes: 16 additions & 15 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 15 additions & 15 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,23 +334,23 @@ westend-runtime = { git = "https://github.com/moonbeam-foundation/polkadot-sdk",
xcm-simulator = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-stable2407" }

# Moonkit (wasm)
async-backing-primitives = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-stable2407", default-features = false }
moonkit-xcm-primitives = { package = "xcm-primitives", git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-stable2407", default-features = false }
nimbus-primitives = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-stable2407", default-features = false }
pallet-async-backing = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-stable2407", default-features = false }
pallet-author-inherent = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-stable2407", default-features = false }
pallet-author-mapping = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-stable2407", default-features = false }
pallet-author-slot-filter = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-stable2407", default-features = false }
pallet-emergency-para-xcm = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-stable2407", default-features = false }
pallet-evm-precompile-xcm = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-stable2407", default-features = false }
pallet-maintenance-mode = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-stable2407", default-features = false }
pallet-migrations = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-stable2407", default-features = false }
pallet-randomness = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-stable2407", default-features = false }
pallet-relay-storage-roots = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-stable2407", default-features = false }
session-keys-primitives = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-stable2407", default-features = false }
async-backing-primitives = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "rq/remove-nimbus-block-import", default-features = false }
moonkit-xcm-primitives = { package = "xcm-primitives", git = "https://github.com/Moonsong-Labs/moonkit", branch = "rq/remove-nimbus-block-import", default-features = false }
nimbus-primitives = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "rq/remove-nimbus-block-import", default-features = false }
pallet-async-backing = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "rq/remove-nimbus-block-import", default-features = false }
pallet-author-inherent = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "rq/remove-nimbus-block-import", default-features = false }
pallet-author-mapping = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "rq/remove-nimbus-block-import", default-features = false }
pallet-author-slot-filter = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "rq/remove-nimbus-block-import", default-features = false }
pallet-emergency-para-xcm = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "rq/remove-nimbus-block-import", default-features = false }
pallet-evm-precompile-xcm = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "rq/remove-nimbus-block-import", default-features = false }
pallet-maintenance-mode = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "rq/remove-nimbus-block-import", default-features = false }
pallet-migrations = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "rq/remove-nimbus-block-import", default-features = false }
pallet-randomness = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "rq/remove-nimbus-block-import", default-features = false }
pallet-relay-storage-roots = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "rq/remove-nimbus-block-import", default-features = false }
session-keys-primitives = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "rq/remove-nimbus-block-import", default-features = false }

# Moonkit (client)
nimbus-consensus = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-stable2407" }
nimbus-consensus = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "rq/remove-nimbus-block-import" }

# Other (wasm)
async-trait = { version = "0.1.42" }
Expand Down
3 changes: 1 addition & 2 deletions node/service/src/lazy_loading/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,8 +339,7 @@ where
frontier_block_import.clone(),
create_inherent_data_providers,
&task_manager.spawn_essential_handle(),
config.prometheus_registry(),
false,
config.prometheus_registry()
)?;
let block_import = BlockImportPipeline::Dev(frontier_block_import);

Expand Down
6 changes: 2 additions & 4 deletions node/service/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -556,8 +556,7 @@ where
frontier_block_import.clone(),
create_inherent_data_providers,
&task_manager.spawn_essential_handle(),
config.prometheus_registry(),
!dev_service,
config.prometheus_registry()
)?,
BlockImportPipeline::Dev(frontier_block_import),
)
Expand All @@ -572,8 +571,7 @@ where
parachain_block_import.clone(),
create_inherent_data_providers,
&task_manager.spawn_essential_handle(),
config.prometheus_registry(),
!dev_service,
config.prometheus_registry()
)?,
BlockImportPipeline::Parachain(parachain_block_import),
)
Expand Down

0 comments on commit 8a72adc

Please sign in to comment.