Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to polkadot 1.1.0 #800

Merged
merged 76 commits into from
Dec 13, 2023
Merged

Upgrade to polkadot 1.1.0 #800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
944ed8b
Upgrade towards 1.0.0
simonsso Sep 15, 2023
4413826
Patched orml
simonsso Sep 19, 2023
2e3d299
Refactor BlockNumber to BlockNumberFor
simonsso Sep 20, 2023
97e6c9d
GenesisBuild DefaultNoBound
simonsso Sep 20, 2023
09fd602
Temporary remove uniques pallet
simonsso Sep 20, 2023
04b08fe
Pallet consensus new interface
simonsso Sep 20, 2023
c1ed159
Cleanup integration
simonsso Sep 20, 2023
5ac1d9e
Auto reformat
simonsso Sep 20, 2023
ea4c013
construct_runtime
simonsso Sep 21, 2023
2043a78
Index of a transaction in the chain.
simonsso Sep 25, 2023
742483a
Auto reformat
simonsso Sep 25, 2023
9c30273
CI: Allow warnings
simonsso Sep 25, 2023
db277c0
Remove index and blocknumber from grant and allocation tests
simonsso Sep 25, 2023
44efa73
Update Cargo.lock
simonsso Sep 25, 2023
bf66775
fix(nodle-parachain): use the Nonce type as newly defined in the crate
aliXsed Sep 26, 2023
3b17c54
Implement missing members
simonsso Sep 26, 2023
76cfaff
Auto fmt
simonsso Sep 26, 2023
5811fdf
Genesis build config for reserve pallet
simonsso Sep 26, 2023
1790f6a
Reseved pallet test case
simonsso Sep 26, 2023
eb9c565
Update test dependecies
simonsso Sep 26, 2023
1e00e49
WIP Where is Runtime?
simonsso Sep 29, 2023
d758414
fix(nodle-parachain): Fix issue of not finding public pallet identifi…
aliXsed Oct 1, 2023
d2e2756
Subrstrate rpc server: break legacy CLI options and remove "backward …
simonsso Oct 2, 2023
8a599de
Stub some important functions
simonsso Oct 2, 2023
3354e18
Ignore one benchmark in xcm_config
simonsso Oct 2, 2023
5e198f4
Import BuildStorage
simonsso Oct 2, 2023
3d46cc2
Build storage test case
simonsso Oct 3, 2023
91f94a9
Restore uniques pallet
simonsso Oct 11, 2023
75c24b4
Auto reformat
simonsso Oct 11, 2023
fc96f5d
Uniques test
simonsso Oct 13, 2023
55fcf52
Remove warnings and errors
simonsso Oct 16, 2023
0237738
Reintegrate uniques pallet and cleanup CLI
simonsso Oct 19, 2023
2f6dba6
Cleanup
simonsso Oct 19, 2023
68f6683
RuntimeGenesisConfig
simonsso Oct 19, 2023
4bd744b
Buildstorage
simonsso Oct 19, 2023
b8c4d0a
Collections are no longer Copy
simonsso Oct 19, 2023
f938e03
Try to add some migration
simonsso Oct 20, 2023
5a16cfc
Update migrations
simonsso Oct 23, 2023
7dd1f95
Add migrations for data without chaning storage
simonsso Oct 24, 2023
dacefac
Update runtimes/eden/src/lib.rs
simonsso Oct 24, 2023
9cab189
Null migration for all updated pallets.
simonsso Oct 25, 2023
d569f2f
Auto format
simonsso Oct 26, 2023
babffd2
Merge remote-tracking branch 'origin/master' into iso/20230914-upgrade
simonsso Oct 26, 2023
5baa9a3
Clippy warnings
simonsso Oct 26, 2023
05c5c64
Update after review
simonsso Oct 31, 2023
15ac860
CI save snapshot
simonsso Oct 31, 2023
cc9ff58
Use action 0.3.3
simonsso Oct 31, 2023
b54ec8f
GH actions
simonsso Oct 31, 2023
49cc7f0
chore: clean up and remove redundant clones
aliXsed Nov 3, 2023
41d63fb
feat(runtime-eden): add pallet_identity
aliXsed Nov 3, 2023
066994a
fix(runtime-eden): add missing pallet_identity weight file
aliXsed Nov 3, 2023
5efddd2
Add doc link.
simonsso Nov 6, 2023
f3d54da
More research on migrations
simonsso Nov 6, 2023
e2a227e
WIP
simonsso Nov 7, 2023
b9e76a0
Merge remote-tracking branch 'origin/master' into iso/20230914-upgrade
simonsso Nov 7, 2023
4d8e8e7
WIP xcm migration
simonsso Nov 7, 2023
8f00c53
XCM migration done
simonsso Nov 9, 2023
25592c9
Auto reformat
simonsso Nov 9, 2023
0d8b5e3
Update CI
simonsso Nov 14, 2023
92b6411
ci.yml --no-idempotency-checks
simonsso Nov 14, 2023
a2e6acb
WIP
simonsso Nov 16, 2023
615f689
WIP migrate to polkadot-sdk repo
simonsso Nov 16, 2023
6431388
Merge remote-tracking branch 'origin/master' into iso/20230914-upgrade
simonsso Nov 20, 2023
2fe7285
Integrate 1.1.0 wip
simonsso Nov 20, 2023
a090abe
Cleanup
simonsso Nov 20, 2023
16da0ca
Update CI version
simonsso Nov 21, 2023
b9f403d
Merge branch 'master' into iso/upgrade_to_polkadot_1_1_0
simonsso Dec 6, 2023
e2e42b5
WIP
simonsso Dec 7, 2023
aecdd13
Cargo update
simonsso Dec 8, 2023
7da3280
Merge remote-tracking branch 'origin/master' into iso/upgrade_to_polk…
simonsso Dec 11, 2023
b4704f8
Auto format
simonsso Dec 11, 2023
5eac00d
New errors
simonsso Dec 12, 2023
543d9ee
polkadot 1.1 dependencies
simonsso Dec 12, 2023
029dd97
Merge updates for benchmarks
simonsso Dec 12, 2023
70acb47
Cargo tests
simonsso Dec 12, 2023
a3de301
Update weights
simonsso Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3,420 changes: 1,658 additions & 1,762 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

104 changes: 52 additions & 52 deletions node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version = "2.3.1"
targets = ["x86_64-unknown-linux-gnu"]

[build-dependencies]
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }

[[bin]]
name = "nodle-parachain"
Expand All @@ -36,67 +36,67 @@ runtime-eden = { path = "../runtimes/eden" }
primitives = { version = "2.0.17", path = "../primitives" }

# Substrate Dependencies
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }

pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }

frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }

## Substrate Client Dependencies
sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-network-sync = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sc-keystore = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sc-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sc-rpc-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sc-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sc-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sc-sysinfo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }

## Substrate Primitive Dependencies
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sp-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }

# Cumulus dependencies
cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
cumulus-client-collator = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
cumulus-client-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
cumulus-client-collator = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
cumulus-client-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
cumulus-client-consensus-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
cumulus-relay-chain-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }

# Polkadot dependencies
polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v1.0.0" }
polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
polkadot-parachain-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
polkadot-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0"}

[dev-dependencies]
hex-literal = "0.3.4"
14 changes: 8 additions & 6 deletions node/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
pub use primitives::{AccountId, Balance, Block, BlockNumber, Hash, Header, Nonce};

// Cumulus Imports
use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion};

Check warning on line 30 in node/src/service.rs

View workflow job for this annotation

GitHub Actions / test-runtime 

use of deprecated struct `cumulus_client_consensus_aura::BuildAuraConsensusParams`: Use the `aura::collators::basic` collator instead
use cumulus_client_consensus_common::{ParachainBlockImport as TParachainBlockImport, ParachainConsensus};
use cumulus_client_service::{
build_network, build_relay_chain_interface, prepare_node_config, start_collator, start_full_node,

Check warning on line 33 in node/src/service.rs

View workflow job for this annotation

GitHub Actions / test-runtime 

use of deprecated function `cumulus_client_service::start_collator`: use start_relay_chain_tasks instead

Check warning on line 33 in node/src/service.rs

View workflow job for this annotation

GitHub Actions / test-runtime 

use of deprecated function `cumulus_client_service::start_full_node`: use start_relay_chain_tasks instead
BuildNetworkParams, StartCollatorParams, StartFullNodeParams,
};
use cumulus_primitives_core::ParaId;
Expand Down Expand Up @@ -77,7 +77,7 @@
ParachainClient<RuntimeApi>,
ParachainBackend,
(),
sc_consensus::DefaultImportQueue<Block, ParachainClient<RuntimeApi>>,
sc_consensus::DefaultImportQueue<Block>,
sc_transaction_pool::FullPool<Block, ParachainClient<RuntimeApi>>,
(
ParachainBlockImport<RuntimeApi>,
Expand All @@ -92,7 +92,7 @@
RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>
+ sp_api::Metadata<Block>
+ sp_session::SessionKeys<Block>
+ sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<ParachainBackend, Block>>
// + sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<ParachainBackend, Block>>
+ sp_offchain::OffchainWorkerApi<Block>
+ sp_block_builder::BlockBuilder<Block>,
sc_client_api::StateBackendFor<ParachainBackend, Block>: sp_api::StateBackend<BlakeTwo256>,
Expand All @@ -102,7 +102,7 @@
&Configuration,
Option<TelemetryHandle>,
&TaskManager,
) -> Result<sc_consensus::DefaultImportQueue<Block, ParachainClient<RuntimeApi>>, sc_service::Error>,
) -> Result<sc_consensus::DefaultImportQueue<Block>, sc_service::Error>,
{
let telemetry = config
.telemetry_endpoints
Expand Down Expand Up @@ -186,7 +186,7 @@
RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>
+ sp_api::Metadata<Block>
+ sp_session::SessionKeys<Block>
+ sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<ParachainBackend, Block>>
// + sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<ParachainBackend, Block>>
+ sp_offchain::OffchainWorkerApi<Block>
+ sp_block_builder::BlockBuilder<Block>
+ cumulus_primitives_core::CollectCollationInfo<Block>
Expand All @@ -200,7 +200,7 @@
&Configuration,
Option<TelemetryHandle>,
&TaskManager,
) -> Result<sc_consensus::DefaultImportQueue<Block, ParachainClient<RuntimeApi>>, sc_service::Error>,
) -> Result<sc_consensus::DefaultImportQueue<Block>, sc_service::Error>,
BIC: FnOnce(
Arc<ParachainClient<RuntimeApi>>,
ParachainBlockImport<RuntimeApi>,
Expand Down Expand Up @@ -239,6 +239,7 @@
let prometheus_registry = parachain_config.prometheus_registry().cloned();
let transaction_pool = params.transaction_pool.clone();
let import_queue_service = params.import_queue.service();
// TODO there should be more here:
let net_config = sc_network::config::FullNetworkConfiguration::new(&parachain_config.network);

let (network, system_rpc_tx, tx_handler_controller, start_network, sync_service) =
Expand All @@ -251,6 +252,7 @@
relay_chain_interface: relay_chain_interface.clone(),
import_queue: params.import_queue,
net_config,
sybil_resistance_level: cumulus_client_service::CollatorSybilResistance::Unresistant,
})
.await?;

Expand Down Expand Up @@ -343,7 +345,7 @@
sync_service: sync_service.clone(),
};

start_collator(params).await?;

Check warning on line 348 in node/src/service.rs

View workflow job for this annotation

GitHub Actions / test-runtime 

use of deprecated function `cumulus_client_service::start_collator`: use start_relay_chain_tasks instead
} else {
let params = StartFullNodeParams {
client: client.clone(),
Expand All @@ -357,7 +359,7 @@
sync_service: sync_service.clone(),
};

start_full_node(params)?;

Check warning on line 362 in node/src/service.rs

View workflow job for this annotation

GitHub Actions / test-runtime 

use of deprecated function `cumulus_client_service::start_full_node`: use start_relay_chain_tasks instead
}

start_network.start_network();
Expand All @@ -373,7 +375,7 @@
config: &Configuration,
telemetry: Option<TelemetryHandle>,
task_manager: &TaskManager,
) -> Result<sc_consensus::DefaultImportQueue<Block, ParachainClient<runtime_eden::RuntimeApi>>, sc_service::Error> {
) -> Result<sc_consensus::DefaultImportQueue<Block>, sc_service::Error> {
let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;

cumulus_client_consensus_aura::import_queue::<sp_consensus_aura::sr25519::AuthorityPair, _, _, _, _, _>(
Expand Down Expand Up @@ -433,7 +435,7 @@
telemetry.clone(),
);

Ok(AuraConsensus::build::<

Check warning on line 438 in node/src/service.rs

View workflow job for this annotation

GitHub Actions / test-runtime 

use of deprecated associated function `cumulus_client_consensus_aura::AuraConsensus::<B, CIDP, ()>::build`: Use the `aura::collators::basic` collator instead
sp_consensus_aura::sr25519::AuthorityPair,
_,
_,
Expand All @@ -441,8 +443,8 @@
_,
_,
_,
>(BuildAuraConsensusParams {

Check warning on line 446 in node/src/service.rs

View workflow job for this annotation

GitHub Actions / test-runtime 

use of deprecated struct `cumulus_client_consensus_aura::BuildAuraConsensusParams`: Use the `aura::collators::basic` collator instead
proposer_factory,

Check warning on line 447 in node/src/service.rs

View workflow job for this annotation

GitHub Actions / test-runtime 

use of deprecated field `cumulus_client_consensus_aura::BuildAuraConsensusParams::proposer_factory`: Use the `aura::collators::basic` collator instead
create_inherent_data_providers: move |_, (relay_parent, validation_data)| {
let relay_chain_interface = relay_chain_interface.clone();
async move {
Expand Down
22 changes: 11 additions & 11 deletions pallets/allocations/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,18 @@ log = { version = "0.4.17", default-features = false }
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.152", optional = true, features = ["derive"] }
scale-info = { version = "2.0.1", default-features = false, features = [ "derive",] }
frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v1.0.0" }
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v1.0.0" }
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v1.0.0" }
pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v1.0.0" }
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v1.0.0" }
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v1.0.0" }
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v1.0.0" }
sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v1.0.0" }
frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, optional = true, branch = "release-polkadot-v1.1.0" }
frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
sp-io = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
support = { path = "../../support", default-features = false }

[dev-dependencies]
sp-tracing = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v1.0.0" }
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v1.0.0" }
pallet-membership = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v1.0.0" }
sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
sp-core = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
pallet-membership = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.1.0" }
lazy_static = {version = "1.4.0", default-features = false, features = ["spin_no_std"] }
4 changes: 2 additions & 2 deletions pallets/allocations/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
use super::*;
use crate::{self as pallet_allocations};
use frame_support::{
assert_noop, assert_ok, bounded_vec, dispatch::Pays, ord_parameter_types, parameter_types, traits::ConstU32,
PalletId,
assert_noop, assert_ok, dispatch::Pays, ord_parameter_types, parameter_types, traits::ConstU32, PalletId,
};
use frame_system::EnsureSignedBy;
use lazy_static::lazy_static;
use sp_core::H256;
use sp_runtime::{
bounded_vec,
traits::{BadOrigin, BlakeTwo256, IdentityLookup},
BuildStorage, Perbill,
};
Expand Down
Loading
Loading