Skip to content

Commit c4fae24

Browse files
atodorovatodorov
committed
Update from polkadot-v0.9.39 to polkadot-v0.9.40
- 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.
1 parent e9d674f commit c4fae24

File tree

11 files changed

+335
-265
lines changed

11 files changed

+335
-265
lines changed

‎Cargo.lock

Lines changed: 254 additions & 185 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 65 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -54,69 +54,70 @@ task-scheduler-runtime-api = { path = "pallets/offchain-task-scheduler/runtime-a
5454
traced-test = { path = "test/traced-test" }
5555

5656
# Substrate Dependencies
57-
frame-benchmarking-cli = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git"}
58-
frame-benchmarking = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
59-
frame-executive = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
60-
frame-election-provider-support = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
61-
frame-support = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
62-
frame-system = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
63-
frame-system-benchmarking = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
64-
frame-system-rpc-runtime-api = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
65-
pallet-balances = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
66-
pallet-insecure-randomness-collective-flip = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
67-
pallet-session = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
68-
pallet-staking-substrate = { package = "pallet-staking", branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
69-
pallet-scheduler = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
70-
pallet-sudo = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
71-
pallet-timestamp = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
72-
pallet-transaction-payment = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
73-
pallet-transaction-payment-rpc = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
74-
pallet-transaction-payment-rpc-runtime-api = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
75-
sc-basic-authorship = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
76-
sc-cli = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git"}
77-
sc-client-api = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
78-
sc-client-db = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", features = ["test-helpers"] }
79-
sc-consensus = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
80-
sc-consensus-pow = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
81-
sc-executor = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git"}
82-
sc-keystore = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
83-
sc-offchain = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
84-
sc-rpc = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
85-
sc-rpc-api = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
86-
sc-telemetry = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
87-
sc-transaction-pool = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
88-
sc-transaction-pool-api = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
89-
sc-service = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", features = [
57+
frame-benchmarking-cli = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git"}
58+
frame-benchmarking = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
59+
frame-executive = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
60+
frame-election-provider-support = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
61+
frame-support = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
62+
frame-system = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
63+
frame-system-benchmarking = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
64+
frame-system-rpc-runtime-api = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
65+
pallet-balances = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
66+
pallet-insecure-randomness-collective-flip = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
67+
pallet-session = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
68+
pallet-staking-substrate = { package = "pallet-staking", branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
69+
pallet-scheduler = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
70+
pallet-sudo = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
71+
pallet-timestamp = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
72+
pallet-transaction-payment = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
73+
pallet-transaction-payment-rpc = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
74+
pallet-transaction-payment-rpc-runtime-api = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
75+
sc-basic-authorship = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
76+
sc-chain-spec = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
77+
sc-cli = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git"}
78+
sc-client-api = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
79+
sc-client-db = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", features = ["test-helpers"] }
80+
sc-consensus = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
81+
sc-consensus-pow = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
82+
sc-executor = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git"}
83+
sc-keystore = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
84+
sc-offchain = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
85+
sc-rpc = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
86+
sc-rpc-api = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
87+
sc-telemetry = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
88+
sc-transaction-pool = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
89+
sc-transaction-pool-api = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
90+
sc-service = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", features = [
9091
"test-helpers",
9192
] }
92-
sp-api = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
93-
sp-application-crypto = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
94-
sp-arithmetic = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
95-
sp-block-builder = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
96-
sp-blockchain = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
97-
sp-consensus = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
98-
sp-consensus-pow = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
99-
sp-core = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
100-
sp-inherents = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
101-
sp-io = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
102-
sp-keystore = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
103-
sp-offchain = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
104-
sp-runtime = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
105-
sp-runtime-interface = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
106-
sp-session = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
107-
sp-state-machine = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
108-
sp-staking = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
109-
sp-std = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
110-
sp-timestamp = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
111-
sp-transaction-pool = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
112-
sp-version = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
113-
substrate-build-script-utils = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
114-
substrate-frame-rpc-system = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
115-
substrate-prometheus-endpoint = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
116-
substrate-test-client = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
117-
tracing = { package = "sp-tracing", branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
118-
frame-try-runtime = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
119-
sp-externalities = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git", default-features = false }
120-
substrate-wasm-builder = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
121-
try-runtime-cli = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
122-
sp-keyring = { branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
93+
sp-api = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
94+
sp-application-crypto = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
95+
sp-arithmetic = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
96+
sp-block-builder = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
97+
sp-blockchain = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
98+
sp-consensus = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
99+
sp-consensus-pow = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
100+
sp-core = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
101+
sp-inherents = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
102+
sp-io = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
103+
sp-keystore = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
104+
sp-offchain = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
105+
sp-runtime = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
106+
sp-runtime-interface = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
107+
sp-session = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
108+
sp-state-machine = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
109+
sp-staking = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
110+
sp-std = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
111+
sp-timestamp = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
112+
sp-transaction-pool = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
113+
sp-version = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
114+
substrate-build-script-utils = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
115+
substrate-frame-rpc-system = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
116+
substrate-prometheus-endpoint = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
117+
substrate-test-client = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
118+
tracing = { package = "sp-tracing", branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
119+
frame-try-runtime = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
120+
sp-externalities = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git", default-features = false }
121+
substrate-wasm-builder = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
122+
try-runtime-cli = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
123+
sp-keyring = { branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }

‎node/src/service.rs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ pub fn new_full(config: Configuration, cli: Cli) -> Result<TaskManager, ServiceE
221221
};
222222
}
223223

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

282282
let rpc_handlers = sc_service::spawn_tasks(sc_service::SpawnTasksParams {
283-
network: network.clone(),
283+
config,
284284
client: client.clone(),
285-
keystore: keystore_container.sync_keystore(),
285+
backend: backend.clone(),
286286
task_manager: &mut task_manager,
287+
keystore: keystore_container.sync_keystore(),
287288
transaction_pool: transaction_pool.clone(),
288-
backend: backend.clone(),
289+
rpc_builder: rpc_extensions_builder,
290+
network,
289291
system_rpc_tx,
290-
config,
291-
telemetry: telemetry.as_mut(),
292292
tx_handler_controller,
293-
rpc_builder: rpc_extensions_builder,
293+
sync_service: sync_service.clone(),
294+
telemetry: telemetry.as_mut(),
294295
})?;
295296

296297
if let Some(monitor_target) = monitor_nonce_account {
@@ -325,8 +326,8 @@ pub fn new_full(config: Configuration, cli: Cli) -> Result<TaskManager, ServiceE
325326
select_chain,
326327
algorithm,
327328
proposer_factory,
328-
network.clone(),
329-
network,
329+
sync_service.clone(),
330+
sync_service,
330331
Some(mining_key.encode()),
331332
move |_, ()| async move {
332333
let timestamp = sp_timestamp::InherentDataProvider::from_system_time();

‎pallets/creditcoin/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ pub mod pallet {
137137

138138
#[pallet::pallet]
139139
#[pallet::storage_version(STORAGE_VERSION)]
140-
#[pallet::generate_store(pub(super) trait Store)]
141140
pub struct Pallet<T>(_);
142141

143142
#[pallet::storage]

‎pallets/difficulty/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ pub mod pallet {
5858
}
5959

6060
#[pallet::pallet]
61-
#[pallet::generate_store(pub(super) trait Store)]
6261
pub struct Pallet<T>(_);
6362

6463
#[pallet::genesis_config]

‎pallets/offchain-task-scheduler/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ pub mod pallet {
105105
pub enum Event<T: Config> {}
106106

107107
#[pallet::pallet]
108-
#[pallet::generate_store(pub(super) trait Store)]
109108
pub struct Pallet<T>(_);
110109

111110
#[pallet::storage]

‎pallets/rewards/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ pub mod pallet {
5656
}
5757

5858
#[pallet::pallet]
59-
#[pallet::generate_store(pub(super) trait Store)]
6059
pub struct Pallet<T>(_);
6160

6261
#[pallet::storage]

‎pallets/staking/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ frame-system = { workspace = true }
2020
log = { workspace = true }
2121
pallet-offchain-task-scheduler = { workspace = true }
2222
pallet-session = { workspace = true }
23-
pallet-staking-substrate = { package = "pallet-staking", default-features = false, branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
23+
pallet-staking-substrate = { package = "pallet-staking", default-features = false, branch = "polkadot-v0.9.40", git = "https://github.com/paritytech/substrate.git" }
2424
parity-scale-codec = { workspace = true }
2525
serde.workspace = true
2626
scale-info = { workspace = true }

‎primitives/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ num = { version = "0.4.0", default-features = false, features = [
1919
parity-scale-codec = { workspace = true }
2020
schnorrkel = { version = "0.9", default-features = false }
2121
sp-arithmetic = { workspace = true }
22-
sp-consensus-vrf = { branch = "polkadot-v0.9.39", default-features = false, git = "https://github.com/paritytech/substrate.git" }
22+
sp-consensus-vrf = { branch = "polkadot-v0.9.40", default-features = false, git = "https://github.com/paritytech/substrate.git" }
2323
sp-externalities = { workspace = true }
2424
sp-keystore = { workspace = true, optional = true }
2525
sp-runtime-interface = { workspace = true }

‎test/client/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
1414

1515
[dependencies]
1616
creditcoin-node-runtime = { workspace = true }
17+
sc-chain-spec = { workspace = true }
1718
sc-client-db = { workspace = true }
1819
sc-executor = { workspace = true }
1920
sc-service = { workspace = true }

‎test/client/src/lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use creditcoin_node_runtime::{
22
self as runtime, Block, GenesisConfig, SystemConfig as SystemGenesisConfig, WASM_BINARY,
33
};
4+
use sc_chain_spec::construct_genesis_block;
45
use sc_service::client;
56
use sp_core::twox_128;
67
use sp_runtime::traits::{Block as BlockT, Hash as HashT, Header as HeaderT};
@@ -84,7 +85,8 @@ impl substrate_test_client::GenesisInit for GenesisParameters {
8485
storage.top.clone().into_iter().chain(child_roots).collect(),
8586
sp_runtime::StateVersion::V1,
8687
);
87-
let block: runtime::Block = client::genesis::construct_genesis_block(state_root);
88+
let block: runtime::Block =
89+
construct_genesis_block(state_root, sp_runtime::StateVersion::V1);
8890
storage.top.extend(additional_storage_with_genesis(&block));
8991

9092
storage

0 commit comments

Comments
 (0)