Skip to content

Commit

Permalink
Update from polkadot-v0.9.39 to polkadot-v0.9.40
Browse files Browse the repository at this point in the history 
- Use of `#[pallet::generate_store(pub(super) trait Store)]` will be removed soon,
  paritytech/substrate#13535

- Update return values and arguments, b/c syncing protocol was extracted from
  sc-network. See paritytech/substrate#12828

- Update call to construct_genesis_block(), see
  paritytech/substrate#13427

- Use of deprecated associated function
  `frame_support::dispatch::Weight::from_ref_time`: Will be removed soon; use
  `from_parts` instead.
  • Loading branch information
@atodorov
atodorov committed Apr 21, 2023
1 parent 1e493b6 commit 7bb8b7c
Show file tree
Hide file tree
Showing 11 changed files with 335 additions and 265 deletions.
439 changes: 254 additions & 185 deletions Cargo.lock
View file

Large diffs are not rendered by default.

129 changes: 65 additions & 64 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,69 +54,70 @@ task-scheduler-runtime-api = { path = "pallets/offchain-task-scheduler/runtime-a
traced-test = { path = "test/traced-test" }

# Substrate Dependencies
frame-benchmarking-cli = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git"}
frame-benchmarking = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
frame-executive = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
frame-election-provider-support = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
frame-support = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
frame-system = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
frame-system-benchmarking = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
frame-system-rpc-runtime-api = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
pallet-balances = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
pallet-insecure-randomness-collective-flip = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
pallet-session = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
pallet-staking-substrate = { package = "pallet-staking", branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
pallet-scheduler = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
pallet-sudo = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
pallet-timestamp = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
pallet-transaction-payment = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
pallet-transaction-payment-rpc = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
pallet-transaction-payment-rpc-runtime-api = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
sc-basic-authorship = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
sc-cli = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git"}
sc-client-api = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
sc-client-db = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", features = ["test-helpers"] }
sc-consensus = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
sc-consensus-pow = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
sc-executor = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git"}
sc-keystore = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
sc-offchain = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
sc-rpc = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
sc-rpc-api = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
sc-telemetry = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
sc-transaction-pool = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
sc-transaction-pool-api = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
sc-service = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", features = [
frame-benchmarking-cli = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git"}
frame-benchmarking = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
frame-executive = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
frame-election-provider-support = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
frame-support = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
frame-system = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
frame-system-benchmarking = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
frame-system-rpc-runtime-api = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
pallet-balances = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
pallet-insecure-randomness-collective-flip = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
pallet-session = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
pallet-staking-substrate = { package = "pallet-staking", branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
pallet-scheduler = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
pallet-sudo = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
pallet-timestamp = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
pallet-transaction-payment = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
pallet-transaction-payment-rpc = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
pallet-transaction-payment-rpc-runtime-api = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
sc-basic-authorship = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
sc-chain-spec = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
sc-cli = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git"}
sc-client-api = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
sc-client-db = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", features = ["test-helpers"] }
sc-consensus = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
sc-consensus-pow = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
sc-executor = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git"}
sc-keystore = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
sc-offchain = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
sc-rpc = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
sc-rpc-api = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
sc-telemetry = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
sc-transaction-pool = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
sc-transaction-pool-api = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
sc-service = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", features = [
"test-helpers",
] }
sp-api = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-application-crypto = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
sp-arithmetic = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-block-builder = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-blockchain = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
sp-consensus = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-consensus-pow = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-core = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-inherents = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-io = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-keystore = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-offchain = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-runtime = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-runtime-interface = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-session = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-state-machine = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-staking = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-std = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-timestamp = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
sp-transaction-pool = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-version = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
substrate-build-script-utils = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
substrate-frame-rpc-system = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
substrate-prometheus-endpoint = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
substrate-test-client = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
tracing = { package = "sp-tracing", branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
frame-try-runtime = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-externalities = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
substrate-wasm-builder = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
try-runtime-cli = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
sp-keyring = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
sp-api = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-application-crypto = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
sp-arithmetic = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-block-builder = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-blockchain = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
sp-consensus = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-consensus-pow = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-core = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-inherents = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-io = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-keystore = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-offchain = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-runtime = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-runtime-interface = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-session = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-state-machine = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-staking = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-std = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-timestamp = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
sp-transaction-pool = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-version = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
substrate-build-script-utils = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
substrate-frame-rpc-system = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
substrate-prometheus-endpoint = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
substrate-test-client = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
tracing = { package = "sp-tracing", branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
frame-try-runtime = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
sp-externalities = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
substrate-wasm-builder = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
try-runtime-cli = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
sp-keyring = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
19 changes: 10 additions & 9 deletions node/src/service.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ pub fn new_full(config: Configuration, cli: Cli) -> Result<TaskManager, ServiceE
};
}

let (network, system_rpc_tx, tx_handler_controller, network_starter) =
let (network, system_rpc_tx, tx_handler_controller, network_starter, sync_service) =
sc_service::build_network(sc_service::BuildNetworkParams {
config: &config,
client: client.clone(),
Expand Down Expand Up @@ -280,17 +280,18 @@ pub fn new_full(config: Configuration, cli: Cli) -> Result<TaskManager, ServiceE
};

let rpc_handlers = sc_service::spawn_tasks(sc_service::SpawnTasksParams {
network: network.clone(),
config,
client: client.clone(),
keystore: keystore_container.sync_keystore(),
backend: backend.clone(),
task_manager: &mut task_manager,
keystore: keystore_container.sync_keystore(),
transaction_pool: transaction_pool.clone(),
backend: backend.clone(),
rpc_builder: rpc_extensions_builder,
network,
system_rpc_tx,
config,
telemetry: telemetry.as_mut(),
tx_handler_controller,
rpc_builder: rpc_extensions_builder,
sync_service: sync_service.clone(),
telemetry: telemetry.as_mut(),
})?;

if let Some(monitor_target) = monitor_nonce_account {
Expand Down Expand Up @@ -325,8 +326,8 @@ pub fn new_full(config: Configuration, cli: Cli) -> Result<TaskManager, ServiceE
select_chain,
algorithm,
proposer_factory,
network.clone(),
network,
sync_service.clone(),
sync_service,
Some(mining_key.encode()),
move |_, ()| async move {
let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
Expand Down
1 change: 0 additions & 1 deletion pallets/creditcoin/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ pub mod pallet {

#[pallet::pallet]
#[pallet::storage_version(STORAGE_VERSION)]
#[pallet::generate_store(pub(super) trait Store)]
pub struct Pallet<T>(_);

#[pallet::storage]
Expand Down
1 change: 0 additions & 1 deletion pallets/difficulty/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ pub mod pallet {
}

#[pallet::pallet]
#[pallet::generate_store(pub(super) trait Store)]
pub struct Pallet<T>(_);

#[pallet::genesis_config]
Expand Down
1 change: 0 additions & 1 deletion pallets/offchain-task-scheduler/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ pub mod pallet {
pub enum Event<T: Config> {}

#[pallet::pallet]
#[pallet::generate_store(pub(super) trait Store)]
pub struct Pallet<T>(_);

#[pallet::storage]
Expand Down
1 change: 0 additions & 1 deletion pallets/rewards/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ pub mod pallet {
}

#[pallet::pallet]
#[pallet::generate_store(pub(super) trait Store)]
pub struct Pallet<T>(_);

#[pallet::storage]
Expand Down
2 changes: 1 addition & 1 deletion pallets/staking/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ frame-system = { workspace = true }
log = { workspace = true }
pallet-offchain-task-scheduler = { workspace = true }
pallet-session = { workspace = true }
pallet-staking-substrate = { package = "pallet-staking", default-features = false, branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
pallet-staking-substrate = { package = "pallet-staking", default-features = false, branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
parity-scale-codec = { workspace = true }
serde.workspace = true
scale-info = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion primitives/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ num = { version = "0.4.0", default-features = false, features = [
parity-scale-codec = { workspace = true }
schnorrkel = { version = "0.9", default-features = false }
sp-arithmetic = { workspace = true }
sp-consensus-vrf = { branch = "polkadot-v0.9.39", default-features = false, git = "https://github.com/paritytech/substrate.git" }
sp-consensus-vrf = { branch = "polkadot-v0.9.40", default-features = false, git = "https://github.com/paritytech/substrate.git" }
sp-externalities = { workspace = true }
sp-keystore = { workspace = true, optional = true }
sp-runtime-interface = { workspace = true }
Expand Down
1 change: 1 addition & 0 deletions test/client/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
creditcoin-node-runtime = { workspace = true }
sc-chain-spec = { workspace = true }
sc-client-db = { workspace = true }
sc-executor = { workspace = true }
sc-service = { workspace = true }
Expand Down
4 changes: 3 additions & 1 deletion test/client/src/lib.rs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use creditcoin_node_runtime::{
self as runtime, Block, GenesisConfig, SystemConfig as SystemGenesisConfig, WASM_BINARY,
};
use sc_chain_spec::construct_genesis_block;
use sc_service::client;
use sp_core::twox_128;
use sp_runtime::traits::{Block as BlockT, Hash as HashT, Header as HeaderT};
Expand Down Expand Up @@ -84,7 +85,8 @@ impl substrate_test_client::GenesisInit for GenesisParameters {
storage.top.clone().into_iter().chain(child_roots).collect(),
sp_runtime::StateVersion::V1,
);
let block: runtime::Block = client::genesis::construct_genesis_block(state_root);
let block: runtime::Block =
construct_genesis_block(state_root, sp_runtime::StateVersion::V1);
storage.top.extend(additional_storage_with_genesis(&block));

storage
Expand Down

0 comments on commit 7bb8b7c

Please sign in to comment.