Skip to content

Commit fc06abb

Browse files
atodorovatodorov
committed
Update from polkadot-v0.9.38 to polkadot-v0.9.39
Breaking changes from upstream: - Rename pallet-random-collective-flip to Insecure... paritytech/substrate#13301 - sc_service::BuildNetworkParams::warp_sync field has changed, paritytech/substrate#12761 - SortedListProvider::try_state() now only available for the try-runtime feature, see paritytech/substrate#13296 - When calling cmd.run() for try-runtime we also need something called BlockBuildingInfoProvider, see paritytech/substrate#12896 - Updaged function arguments b/c of mismatched types: --> node/rpc/src/task.rs:64:26 | 64 | api.offchain_nonce_key(&at, &account_id).map_err(|e| { | ------------------ ^^^ expected associated type, found `&BlockId<_>` | | | arguments to this method are incorrect | = note: expected associated type `<B as BlockT>::Hash` found reference `&BlockId<_>` --> sha3pow/src/lib.rs:84:33 | 84 | self.runtime_api().difficulty(&parent_id).map_err(|err| { | ---------- ^^^^^^^^^^ expected struct `H256`, found `&BlockId<B>` | | | arguments to this method are incorrect | = note: expected struct `H256` found reference `&BlockId<B>`
1 parent 1a5b9c5 commit fc06abb

File tree

10 files changed

+416
-372
lines changed

10 files changed

+416
-372
lines changed

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -52,69 +52,69 @@ runtime-utils = { package = "test-runtime-utils", path = "test/runtime-utils", d
5252
task-scheduler-runtime-api = { path = "pallets/offchain-task-scheduler/runtime-api", default-features = false }
5353

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

‎node/rpc/src/task.rs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use core::str::FromStr;
44
use creditcoin_node_runtime as runtime;
55
use sc_rpc::DenyUnsafe;
66
use sp_blockchain::HeaderBackend;
7-
use sp_runtime::{generic::BlockId, traits};
7+
use sp_runtime::traits;
88
use std::sync::Arc;
99
use task_scheduler_runtime_api::TaskApi;
1010

@@ -49,10 +49,7 @@ where
4949
async fn offchain_nonce_key(&self, account_id: String) -> RpcResult<Vec<u8>> {
5050
self.deny_unsafe.check_if_safe()?;
5151
let api = self.client.runtime_api();
52-
let at = {
53-
let best = self.client.info().best_hash;
54-
BlockId::hash(best)
55-
};
52+
let at = self.client.info().best_hash;
5653
let account_id = AccountId::from_str(&account_id).map_err(|e| {
5754
JsonRpseeError::Call(CallError::Custom(ErrorObject::owned(
5855
ErrorCode::InvalidParams.code(),
@@ -61,7 +58,7 @@ where
6158
)))
6259
})?;
6360

64-
api.offchain_nonce_key(&at, &account_id).map_err(|e| {
61+
api.offchain_nonce_key(at, &account_id).map_err(|e| {
6562
JsonRpseeError::Call(CallError::Custom(ErrorObject::owned(
6663
ErrorCode::ServerError(Error::RuntimeError.into()).code(),
6764
"Unable to query offchain nonce key.",

‎node/src/command.rs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,16 @@ pub fn run() -> sc_cli::Result<()> {
112112
},
113113
#[cfg(feature = "try-runtime")]
114114
Some(Subcommand::TryRuntime(cmd)) => {
115+
use creditcoin_node_runtime::SLOT_DURATION;
115116
use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch};
116117
use sp_io::SubstrateHostFunctions;
118+
use try_runtime_cli::block_building_info::substrate_info;
119+
117120
let runner = cli.create_runner(cmd)?;
121+
// https://github.com/paritytech/substrate/pull/12896/files#diff-c57da6fbeff8c46ce15f55ea42fedaa5a4684d79578006ce4af01ae04fd6b8f8R245
122+
// for reference implementation
123+
let info_provider = substrate_info(SLOT_DURATION);
124+
118125
runner.async_run(|config| {
119126
// we don't need any of the components of new_partial, just a runtime, or a task
120127
// manager to do `async_run`.
@@ -126,7 +133,7 @@ pub fn run() -> sc_cli::Result<()> {
126133
cmd.run::<Block, ExtendedHostFunctions<
127134
SubstrateHostFunctions,
128135
<service::ExecutorDispatch as NativeExecutionDispatch>::ExtendHostFunctions,
129-
>>(),
136+
>, _>(Some(info_provider)),
130137
task_manager,
131138
))
132139
})

‎node/src/service.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ pub fn new_full(config: Configuration, cli: Cli) -> Result<TaskManager, ServiceE
229229
spawn_handle: task_manager.spawn_handle(),
230230
import_queue,
231231
block_announce_validator_builder: None,
232-
warp_sync: None,
232+
warp_sync_params: None,
233233
})?;
234234

235235
if config.offchain_worker.enabled {

‎pallets/staking/Cargo.toml‎

Lines changed: 6 additions & 2 deletions
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.38", git = "https://github.com/paritytech/substrate.git" }
23+
pallet-staking-substrate = { package = "pallet-staking", default-features = false, branch = "polkadot-v0.9.39", git = "https://github.com/paritytech/substrate.git" }
2424
parity-scale-codec = { workspace = true }
2525
serde.workspace = true
2626
scale-info = { workspace = true }
@@ -49,4 +49,8 @@ std = [
4949
'pallet-offchain-task-scheduler/std',
5050
'sp-std/std',
5151
]
52-
try-runtime = ['frame-support/try-runtime']
52+
try-runtime = [
53+
'frame-support/try-runtime',
54+
'frame-election-provider-support/try-runtime',
55+
'pallet-staking-substrate/try-runtime',
56+
]

‎pallets/staking/src/lib.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ impl<T: Config> SortedListProvider<T::AccountId> for EmptyList<T> {
101101
defensive!();
102102
}
103103

104+
#[cfg(feature = "try-runtime")]
104105
fn try_state() -> Result<(), &'static str> {
105106
defensive!();
106107
Ok(())
@@ -214,6 +215,7 @@ where
214215
defensive!();
215216
}
216217

218+
#[cfg(feature = "try-runtime")]
217219
fn try_state() -> Result<(), &'static str> {
218220
defensive!();
219221
Ok(())

‎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.38", default-features = false, git = "https://github.com/paritytech/substrate.git" }
22+
sp-consensus-vrf = { branch = "polkadot-v0.9.39", 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 }

0 commit comments

Comments
 (0)