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:
2025-12-19 03:17:14 +03:00
parent 549c23d4b6
commit cb4117a15d
32 changed files with 201 additions and 136 deletions
@@ -24,7 +24,18 @@ futures = { features = ["thread-pool"], workspace = true }
futures-timer = { workspace = true }
jsonrpsee = { features = ["server"], workspace = true }
pezkuwi-sdk = { workspace = true, features = ["experimental", "node"] }
# Direct dependency needed (not through umbrella due to macro visibility issues)
pezsp-runtime = { workspace = true }
pezkuwi-sdk = { workspace = true, features = [
"experimental",
"node",
"pezsp-core",
"pezsp-io",
"pezsp-genesis-builder",
"pezsp-block-builder",
"pezsp-timestamp",
] }
pez-revive-dev-runtime = { workspace = true }
[build-dependencies]
@@ -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())
}
@@ -81,11 +81,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,
{
@@ -22,12 +22,12 @@ use pezkuwi_sdk::{
pezsc_executor::WasmExecutor,
pezsc_service::{error::Error as ServiceError, Configuration, TaskManager},
pezsc_telemetry::{Telemetry, TelemetryWorker},
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 =
@@ -190,10 +190,10 @@ pub fn new_full<Network: pezsc_network::NetworkBackend<Block, <Block as BlockT>:
move |parent, ()| {
let client = client.clone();
async move {
let key = pezsp_core::storage::StorageKey(
let key = pezkuwi_sdk::pezsp_core::storage::StorageKey(
pezkuwi_sdk::pezpallet_timestamp::Now::<Runtime>::hashed_key().to_vec(),
);
let current = pezsp_timestamp::Timestamp::current();
let current = pezkuwi_sdk::pezsp_timestamp::Timestamp::current();
let next = client
.storage(parent, &key)
.ok()
@@ -201,10 +201,10 @@ pub fn new_full<Network: pezsc_network::NetworkBackend<Block, <Block as BlockT>:
.and_then(|data| data.0.try_into().ok())
.map(|data| {
let last = u64::from_le_bytes(data) / 1000;
pezsp_timestamp::Timestamp::new((last + 1) * 1000)
pezkuwi_sdk::pezsp_timestamp::Timestamp::new((last + 1) * 1000)
})
.unwrap_or(current);
Ok(pezsp_timestamp::InherentDataProvider::new(current.max(next)))
Ok(pezkuwi_sdk::pezsp_timestamp::InherentDataProvider::new(current.max(next)))
}
}
};
@@ -1,20 +0,0 @@
{
"db_name": "SQLite",
"query": "\n\t\t\tSELECT bizinikiwi_block_hash\n\t\t\tFROM eth_to_bizinikiwi_blocks\n\t\t\tWHERE ethereum_block_hash = $1\n\t\t\t",
"describe": {
"columns": [
{
"name": "bizinikiwi_block_hash",
"ordinal": 0,
"type_info": "Blob"
}
],
"parameters": {
"Right": 1
},
"nullable": [
false
]
},
"hash": "47b830cef6768ed5b119c74037482baef86a7c3d3469873a205805ef342ba031"
}
@@ -1,20 +0,0 @@
{
"db_name": "SQLite",
"query": "\n\t\t\tSELECT ethereum_block_hash\n\t\t\tFROM eth_to_bizinikiwi_blocks\n\t\t\tWHERE bizinikiwi_block_hash = $1\n\t\t\t",
"describe": {
"columns": [
{
"name": "ethereum_block_hash",
"ordinal": 0,
"type_info": "Blob"
}
],
"parameters": {
"Right": 1
},
"nullable": [
false
]
},
"hash": "7e5be81ad6f5d96bc6dbf62098cbd61d257d1ffad222317634327e12be403ab2"
}
@@ -1,12 +0,0 @@
{
"db_name": "SQLite",
"query": "\n\t\t\tINSERT OR REPLACE INTO eth_to_bizinikiwi_blocks (ethereum_block_hash, bizinikiwi_block_hash)\n\t\t\tVALUES ($1, $2)\n\t\t\t",
"describe": {
"columns": [],
"parameters": {
"Right": 2
},
"nullable": []
},
"hash": "cf515b47790a2ac4b3802c29e36a07ace0c67849e5b20c92532d7a77861ebf80"
}
@@ -1,20 +0,0 @@
{
"db_name": "SQLite",
"query": "SELECT EXISTS(SELECT 1 FROM eth_to_bizinikiwi_blocks WHERE bizinikiwi_block_hash = $1) AS \"exists!:bool\"",
"describe": {
"columns": [
{
"name": "exists!:bool",
"ordinal": 0,
"type_info": "Integer"
}
],
"parameters": {
"Right": 1
},
"nullable": [
false
]
},
"hash": "e712acbeb712c0a61fc2a47f966abae1ae43ffba0920a9d209d01dcfce44c5e0"
}
@@ -27,6 +27,32 @@ pub use subxt::config::PolkadotConfig as SrcChainConfig;
with = "::subxt::utils::Static<::pezsp_core::U256>"
),
// The metadata is generated from our rebranded runtime, so paths already use pezsp_* names
substitute_type(
path = "pezsp_runtime::DispatchError",
with = "::subxt::utils::Static<::pezsp_runtime::DispatchError>"
),
substitute_type(
path = "pezsp_runtime::ModuleError",
with = "::subxt::utils::Static<::pezsp_runtime::ModuleError>"
),
substitute_type(
path = "pezsp_runtime::TokenError",
with = "::subxt::utils::Static<::pezsp_runtime::TokenError>"
),
substitute_type(
path = "pezsp_arithmetic::ArithmeticError",
with = "::subxt::utils::Static<::pezsp_runtime::ArithmeticError>"
),
substitute_type(
path = "pezsp_runtime::TransactionalError",
with = "::subxt::utils::Static<::pezsp_runtime::TransactionalError>"
),
substitute_type(
path = "pezsp_runtime::MultiSignature",
with = "::subxt::utils::Static<::pezsp_runtime::MultiSignature>"
),
substitute_type(
path = "pezsp_runtime::generic::block::Block<A, B, C, D, E>",
with = "::subxt::utils::Static<::pezsp_runtime::generic::Block<
@@ -88,13 +88,7 @@ pub fn build(input: TokenStream) -> TokenStream {
let ident = syn::Ident::new(&pezsp_runtime, Span::call_site());
quote!( #[doc(hidden)] pub use #ident as _sp_runtime; )
},
Err(e) => match crate_name("pezkuwi-sdk") {
Ok(FoundCrate::Name(pezkuwi_sdk)) => {
let ident = syn::Ident::new(&pezkuwi_sdk, Span::call_site());
quote!( #[doc(hidden)] pub use #ident::pezsp_runtime as _sp_runtime; )
},
_ => syn::Error::new(Span::call_site(), e).to_compile_error(),
},
Err(e) => syn::Error::new(Span::call_site(), e).to_compile_error(),
};
let const_name = input.ident;