From 0ec342b62063600a7ad7ead4ffb6ba7e1d328938 Mon Sep 17 00:00:00 2001
From: Kurdistan Tech Ministry <info@pezkuwichain.io>
Date: Fri, 19 Dec 2025 21:38:01 +0300
Subject: [PATCH] fix: Update subxt 0.44 API compatibility for workspace-wide
 compilation

- txtesttool: Update dynamic storage API (try_fetch, Value type)
- txtesttool: Add From<ExtrinsicError> for Error
- omni-node-lib: Replace StorageEntryType with keys()/value_ty() API

Workspace cargo check now passes successfully.
---
 bizinikiwi/utils/txtesttool/src/error.rs          |  6 ++++++
 .../utils/txtesttool/src/subxt_transaction.rs     | 15 +++++++++------
 .../pezkuwi-omni-node/lib/src/common/runtime.rs   | 14 +++++++++-----
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/bizinikiwi/utils/txtesttool/src/error.rs b/bizinikiwi/utils/txtesttool/src/error.rs
index ad0c1075..7b0d1975 100644
--- a/bizinikiwi/utils/txtesttool/src/error.rs
+++ b/bizinikiwi/utils/txtesttool/src/error.rs
@@ -17,3 +17,9 @@ pub enum Error {
 	#[error("Mortal transaction lifetime surpassed, block number: {0}")]
 	MortalLifetimeSurpassed(u64),
 }
+
+impl From<subxt::error::ExtrinsicError> for Error {
+	fn from(err: subxt::error::ExtrinsicError) -> Self {
+		Error::Subxt(subxt::Error::from(err))
+	}
+}
diff --git a/bizinikiwi/utils/txtesttool/src/subxt_transaction.rs b/bizinikiwi/utils/txtesttool/src/subxt_transaction.rs
index 1f608905..f2659d00 100644
--- a/bizinikiwi/utils/txtesttool/src/subxt_transaction.rs
+++ b/bizinikiwi/utils/txtesttool/src/subxt_transaction.rs
@@ -317,12 +317,15 @@ pub async fn check_account_nonce<C: subxt::Config>(
 where
 	AccountIdOf<C>: Send + Sync + AsRef<[u8]>,
 {
-	let storage_query =
-		subxt::dynamic::storage("System", "Account", vec![Value::from_bytes(account.clone())]);
-	let result = api.storage().at_latest().await?.fetch(&storage_query).await?;
-	let value = result
-		.ok_or(format!("Sender account {:?} does not exist", hex::encode(account.clone())))?
-		.to_value()?;
+	let storage_query = subxt::dynamic::storage("System", "Account");
+	let storage_at = api.storage().at_latest().await?;
+	let storage_value = storage_at
+		.try_fetch(storage_query, (Value::from_bytes(account.clone()),))
+		.await?
+		.ok_or_else(|| format!("Sender account {:?} does not exist", hex::encode(account.clone())))?;
+	let value: subxt::dynamic::Value = storage_value
+		.decode()
+		.map_err(|e| format!("Failed to decode storage: {:?}", e))?;
 
 	debug!(target:LOG_TARGET,"account has free balance: {:?}", value.at("data").at("free"));
 	debug!(target:LOG_TARGET,"account has nonce: {:?}", value.at("nonce"));
diff --git a/pezcumulus/pezkuwi-omni-node/lib/src/common/runtime.rs b/pezcumulus/pezkuwi-omni-node/lib/src/common/runtime.rs
index c4579e28..d97e4407 100644
--- a/pezcumulus/pezkuwi-omni-node/lib/src/common/runtime.rs
+++ b/pezcumulus/pezkuwi-omni-node/lib/src/common/runtime.rs
@@ -23,7 +23,7 @@ use pezsc_executor::WasmExecutor;
 use pezsc_runtime_utilities::fetch_latest_metadata_from_code_blob;
 use scale_info::{form::PortableForm, TypeDef, TypeDefPrimitive};
 use std::fmt::Display;
-use subxt_metadata::{Metadata, StorageEntryType};
+use subxt_metadata::Metadata;
 
 /// Expected teyrchain system pezpallet runtime type name.
 pub const DEFAULT_TEYRCHAIN_SYSTEM_PALLET_NAME: &str = "TeyrchainSystem";
@@ -149,11 +149,15 @@ impl MetadataInspector {
 		pezpallet_metadata
 			.and_then(|inner| inner.storage())
 			.and_then(|inner| inner.entry_by_name("Number"))
-			.and_then(|number_ty| match number_ty.entry_type() {
-				StorageEntryType::Plain(ty_id) => Some(ty_id),
-				_ => None,
+			.and_then(|number_ty| {
+				// Plain storage has no keys, Map storage has keys
+				if number_ty.keys().len() == 0 {
+					Some(number_ty.value_ty())
+				} else {
+					None
+				}
 			})
-			.and_then(|ty_id| self.0.types().resolve(*ty_id))
+			.and_then(|ty_id| self.0.types().resolve(ty_id))
 			.and_then(|portable_type| BlockNumber::from_type_def(&portable_type.type_def))
 	}