fix: resolve pezsp_runtime visibility issues across workspace
- Add direct pezsp-runtime dependency to crates requiring pezsp_runtime types - Update imports to use pezkuwi_sdk:: prefix for primitive crates - Fix subxt_client.rs substitute_type paths to match rebranded metadata - Update umbrella crate with additional feature exports - Fix pezstaging-node-cli, pez-minimal-template-node, teyrchain templates - Delete stale sqlx query cache files (require regeneration with running chain)
This commit is contained in:
@@ -24,8 +24,19 @@ futures = { features = ["thread-pool"], workspace = true }
|
||||
futures-timer = { workspace = true }
|
||||
jsonrpsee = { features = ["server"], workspace = true }
|
||||
|
||||
# Direct dependency needed (not through umbrella due to macro visibility issues)
|
||||
pezsp-runtime = { workspace = true }
|
||||
|
||||
pez-minimal-template-runtime = { workspace = true }
|
||||
pezkuwi-sdk = { workspace = true, features = ["experimental", "node"] }
|
||||
pezkuwi-sdk = { workspace = true, features = [
|
||||
"experimental",
|
||||
"node",
|
||||
"pezsp-api",
|
||||
"pezsp-block-builder",
|
||||
"pezsp-genesis-builder",
|
||||
"pezsp-io",
|
||||
"pezsp-timestamp",
|
||||
] }
|
||||
|
||||
[build-dependencies]
|
||||
pezkuwi-sdk = { workspace = true, features = ["bizinikiwi-build-script-utils"] }
|
||||
|
||||
@@ -36,7 +36,7 @@ pub fn development_chain_spec() -> Result<ChainSpec, String> {
|
||||
.with_name("Development")
|
||||
.with_id("dev")
|
||||
.with_chain_type(ChainType::Development)
|
||||
.with_genesis_config_preset_name(pezsp_genesis_builder::DEV_RUNTIME_PRESET)
|
||||
.with_genesis_config_preset_name(pezkuwi_sdk::pezsp_genesis_builder::DEV_RUNTIME_PRESET)
|
||||
.with_properties(props())
|
||||
.build())
|
||||
}
|
||||
|
||||
@@ -48,11 +48,11 @@ where
|
||||
C: Send
|
||||
+ Sync
|
||||
+ 'static
|
||||
+ pezsp_api::ProvideRuntimeApi<OpaqueBlock>
|
||||
+ pezkuwi_sdk::pezsp_api::ProvideRuntimeApi<OpaqueBlock>
|
||||
+ HeaderBackend<OpaqueBlock>
|
||||
+ HeaderMetadata<OpaqueBlock, Error = BlockChainError>
|
||||
+ 'static,
|
||||
C::Api: pezsp_block_builder::BlockBuilder<OpaqueBlock>,
|
||||
C::Api: pezkuwi_sdk::pezsp_block_builder::BlockBuilder<OpaqueBlock>,
|
||||
C::Api: bizinikiwi_frame_rpc_system::AccountNonceApi<OpaqueBlock, AccountId, Nonce>,
|
||||
P: TransactionPool + 'static,
|
||||
{
|
||||
|
||||
@@ -24,12 +24,12 @@ use pezkuwi_sdk::{
|
||||
pezsc_service::{error::Error as ServiceError, Configuration, TaskManager},
|
||||
pezsc_telemetry::{Telemetry, TelemetryWorker},
|
||||
pezsc_transaction_pool_api::OffchainTransactionPoolFactory,
|
||||
pezsp_runtime::traits::Block as BlockT,
|
||||
*,
|
||||
};
|
||||
use pezsp_runtime::traits::Block as BlockT;
|
||||
use std::sync::Arc;
|
||||
|
||||
type HostFunctions = pezsp_io::BizinikiwiHostFunctions;
|
||||
type HostFunctions = pezkuwi_sdk::pezsp_io::BizinikiwiHostFunctions;
|
||||
|
||||
#[docify::export]
|
||||
pub(crate) type FullClient =
|
||||
@@ -215,7 +215,7 @@ pub fn new_full<Network: pezsc_network::NetworkBackend<Block, <Block as BlockT>:
|
||||
select_chain,
|
||||
consensus_data_provider: None,
|
||||
create_inherent_data_providers: move |_, ()| async move {
|
||||
Ok(pezsp_timestamp::InherentDataProvider::from_system_time())
|
||||
Ok(pezkuwi_sdk::pezsp_timestamp::InherentDataProvider::from_system_time())
|
||||
},
|
||||
};
|
||||
|
||||
@@ -251,7 +251,7 @@ pub fn new_full<Network: pezsc_network::NetworkBackend<Block, <Block as BlockT>:
|
||||
commands_stream: Box::pin(commands_stream),
|
||||
consensus_data_provider: None,
|
||||
create_inherent_data_providers: move |_, ()| async move {
|
||||
Ok(pezsp_timestamp::InherentDataProvider::from_system_time())
|
||||
Ok(pezkuwi_sdk::pezsp_timestamp::InherentDataProvider::from_system_time())
|
||||
},
|
||||
};
|
||||
let authorship_future = pezsc_consensus_manual_seal::run_manual_seal(params);
|
||||
|
||||
@@ -16,6 +16,8 @@ workspace = true
|
||||
[dependencies]
|
||||
codec = { workspace = true }
|
||||
pezkuwi-sdk = { workspace = true, features = [
|
||||
"pezsp-api",
|
||||
"pezsp-keyring",
|
||||
"pezpallet-balances",
|
||||
"pezpallet-sudo",
|
||||
"pezpallet-timestamp",
|
||||
|
||||
@@ -24,7 +24,10 @@ jsonrpsee = { features = ["server"], workspace = true }
|
||||
log = { workspace = true, default-features = true }
|
||||
serde = { features = ["derive"], workspace = true, default-features = true }
|
||||
|
||||
pezkuwi-sdk = { workspace = true, features = ["node", "pezkuwi-primitives"] }
|
||||
# Direct dependency needed (not through umbrella due to macro visibility issues)
|
||||
pezsp-runtime = { workspace = true }
|
||||
|
||||
pezkuwi-sdk = { workspace = true, features = ["node", "pezkuwi-primitives", "pezsp-keystore", "pezsp-timestamp"] }
|
||||
|
||||
teyrchain-template-runtime = { workspace = true }
|
||||
|
||||
@@ -36,7 +39,7 @@ pezkuwi-sdk = { workspace = true, features = ["bizinikiwi-build-script-utils"] }
|
||||
|
||||
[features]
|
||||
default = ["std"]
|
||||
std = ["log/std", "pezkuwi-sdk/std", "teyrchain-template-runtime/std"]
|
||||
std = ["log/std", "pezkuwi-sdk/std", "pezsp-runtime/std", "teyrchain-template-runtime/std"]
|
||||
runtime-benchmarks = [
|
||||
"pezkuwi-sdk/runtime-benchmarks",
|
||||
"teyrchain-template-runtime/runtime-benchmarks",
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
use pezkuwi_sdk::*;
|
||||
|
||||
use log::info;
|
||||
use pezsp_runtime;
|
||||
use pezcumulus_client_service::storage_proof_size::HostFunctions as ReclaimHostFunctions;
|
||||
use pezframe_benchmarking_cli::{BenchmarkCmd, BIZINIKIWI_REFERENCE_HARDWARE};
|
||||
use pezsc_cli::{
|
||||
|
||||
@@ -41,8 +41,8 @@ use pezsc_network::{NetworkBackend, NetworkBlock};
|
||||
use pezsc_service::{Configuration, PartialComponents, TFullBackend, TFullClient, TaskManager};
|
||||
use pezsc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle};
|
||||
use pezsc_transaction_pool_api::OffchainTransactionPoolFactory;
|
||||
use pezsp_api::ProvideRuntimeApi;
|
||||
use pezsp_keystore::KeystorePtr;
|
||||
use pezkuwi_sdk::pezsp_api::ProvideRuntimeApi;
|
||||
use pezkuwi_sdk::pezsp_keystore::KeystorePtr;
|
||||
use prometheus_endpoint::Registry;
|
||||
|
||||
#[docify::export(wasm_executor)]
|
||||
@@ -161,7 +161,7 @@ fn build_import_queue(
|
||||
client,
|
||||
block_import,
|
||||
move |_, _| async move {
|
||||
let timestamp = pezsp_timestamp::InherentDataProvider::from_system_time();
|
||||
let timestamp = pezkuwi_sdk::pezsp_timestamp::InherentDataProvider::from_system_time();
|
||||
Ok(timestamp)
|
||||
},
|
||||
&task_manager.spawn_essential_handle(),
|
||||
|
||||
@@ -30,7 +30,26 @@ smallvec = { workspace = true, default-features = true }
|
||||
# Local
|
||||
pezpallet-teyrchain-template = { workspace = true }
|
||||
|
||||
# Direct dependency needed for runtime (not through umbrella due to macro visibility issues)
|
||||
pezsp-runtime = { workspace = true }
|
||||
|
||||
pezkuwi-sdk = { workspace = true, default-features = false, features = [
|
||||
# Primitives needed for runtime
|
||||
"pezsp-core",
|
||||
"pezsp-consensus-aura",
|
||||
"pezsp-version",
|
||||
"pezsp-genesis-builder",
|
||||
"pezsp-keyring",
|
||||
"pezsp-api",
|
||||
"pezsp-block-builder",
|
||||
"pezsp-inherents",
|
||||
"pezsp-transaction-pool",
|
||||
"pezsp-offchain",
|
||||
"pezsp-session",
|
||||
"pezframe-support",
|
||||
"pezframe-system",
|
||||
"pezframe-executive",
|
||||
|
||||
"pezpallet-aura",
|
||||
"pezpallet-authorship",
|
||||
"pezpallet-balances",
|
||||
@@ -78,6 +97,7 @@ std = [
|
||||
"log/std",
|
||||
"pezpallet-teyrchain-template/std",
|
||||
"pezkuwi-sdk/std",
|
||||
"pezsp-runtime/std",
|
||||
"scale-info/std",
|
||||
"serde_json/std",
|
||||
"bizinikiwi-wasm-builder",
|
||||
@@ -87,6 +107,7 @@ runtime-benchmarks = [
|
||||
"hex-literal",
|
||||
"pezpallet-teyrchain-template/runtime-benchmarks",
|
||||
"pezkuwi-sdk/runtime-benchmarks",
|
||||
"pezsp-runtime/runtime-benchmarks",
|
||||
"bizinikiwi-wasm-builder?/runtime-benchmarks",
|
||||
]
|
||||
try-runtime = [
|
||||
|
||||
@@ -49,7 +49,7 @@ fn testnet_genesis(
|
||||
session: SessionConfig {
|
||||
keys: invulnerables
|
||||
.into_iter()
|
||||
.map(|(acc, aura)| {
|
||||
.map(|(acc, aura): (AccountId, AuraId)| {
|
||||
(
|
||||
acc.clone(), // account id
|
||||
acc, // validator id
|
||||
@@ -70,7 +70,7 @@ fn local_testnet_genesis() -> Value {
|
||||
(Sr25519Keyring::Alice.to_account_id(), Sr25519Keyring::Alice.public().into()),
|
||||
(Sr25519Keyring::Bob.to_account_id(), Sr25519Keyring::Bob.public().into()),
|
||||
],
|
||||
Sr25519Keyring::well_known().map(|k| k.to_account_id()).collect(),
|
||||
Sr25519Keyring::well_known().map(|k: Sr25519Keyring| k.to_account_id()).collect(),
|
||||
Sr25519Keyring::Alice.to_account_id(),
|
||||
TEYRCHAIN_ID.into(),
|
||||
)
|
||||
@@ -83,7 +83,7 @@ fn development_config_genesis() -> Value {
|
||||
(Sr25519Keyring::Alice.to_account_id(), Sr25519Keyring::Alice.public().into()),
|
||||
(Sr25519Keyring::Bob.to_account_id(), Sr25519Keyring::Bob.public().into()),
|
||||
],
|
||||
Sr25519Keyring::well_known().map(|k| k.to_account_id()).collect(),
|
||||
Sr25519Keyring::well_known().map(|k: Sr25519Keyring| k.to_account_id()).collect(),
|
||||
Sr25519Keyring::Alice.to_account_id(),
|
||||
TEYRCHAIN_ID.into(),
|
||||
)
|
||||
|
||||
@@ -137,8 +137,8 @@ impl WeightToFeePolynomial for WeightToFee {
|
||||
/// to even the core data structures.
|
||||
pub mod opaque {
|
||||
use super::*;
|
||||
pub use pezkuwi_sdk::pezsp_runtime::OpaqueExtrinsic as UncheckedExtrinsic;
|
||||
use pezkuwi_sdk::pezsp_runtime::{
|
||||
pub use pezsp_runtime::OpaqueExtrinsic as UncheckedExtrinsic;
|
||||
use pezsp_runtime::{
|
||||
generic,
|
||||
traits::{BlakeTwo256, Hash as HashT},
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user