feat: migrate storage-client and provider-node to typed subxt bindings via storage-subxt

Cargo.toml

@@ -8,6 +8,7 @@ members = [
 	"provider-node",
 	"runtimes/web3-storage-local",
 	"runtimes/web3-storage-paseo",
+	"storage-subxt",
 
 	# Smart-contract precompiles (pallet_revive integration)
 	"precompiles/drive-registry-precompile",
@@ -41,6 +42,7 @@ storage-client = { path = "client" }
 storage-parachain-runtime = { path = "runtimes/web3-storage-local" }
 storage-primitives = { path = "primitives", default-features = false }
 storage-provider-node = { path = "provider-node" }
+storage-subxt = { path = "storage-subxt" }
 
 # Storage Interfaces: File System Interface
 file-system-client = { path = "storage-interfaces/file-system/client" }
@@ -164,6 +166,7 @@ rand = "0.8"
 
 # Subxt (chain interaction for off-chain clients)
 subxt = { version = "0.44.3" }
+subxt-core = { version = "0.44.3", default-features = false }
 subxt-signer = { version = "0.44.3", features = ["sr25519"] }
 
 # Testing

client/Cargo.toml

@@ -15,7 +15,6 @@ serde = { workspace = true, features = ["std"] }
 serde_json = { workspace = true }
 serde_with = { workspace = true }
 sp-core = { workspace = true, features = ["std"] }
-sp-runtime = { workspace = true, features = ["std"] }
 tokio = { workspace = true }
 base64 = { workspace = true }
 thiserror = { workspace = true }
@@ -25,12 +24,14 @@ rand = { workspace = true }
 chacha20poly1305 = { workspace = true }
 hex = { workspace = true, features = ["std"] }
 async-trait = { workspace = true }
-subxt = { workspace = true }
-subxt-signer = { workspace = true }
+storage-subxt = { workspace = true }
 futures = { workspace = true }
 
 [dev-dependencies]
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
 storage-provider-node = { workspace = true }
 axum = { workspace = true }
 tempfile = { workspace = true }
+
+[features]
+mainnet = ["storage-subxt/mainnet"]

client/examples/complete_workflow.rs

@@ -20,14 +20,12 @@
 //!   provider_url  - HTTP URL for the provider node   (default: http://127.0.0.1:3333)
 //!   user_seed     - Seed of the paying user          (default: //Bob)
 
-use sp_core::crypto::Ss58Codec;
-use sp_runtime::AccountId32;
 use std::env;
 use storage_client::{
     AdminClient, ChunkingStrategy, ClientConfig, NegotiateRequest, ProviderClient, SignedTerms,
     StorageUserClient,
 };
-use subxt_signer::{sr25519::Keypair, SecretUri};
+use storage_subxt::subxt_signer::{sr25519::Keypair, SecretUri};
 
 const DEFAULT_CHAIN_WS: &str = "ws://127.0.0.1:2222";
 const DEFAULT_PROVIDER_URL: &str = "http://127.0.0.1:3333";
@@ -46,12 +44,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let user_seed = args.get(3).map(String::as_str).unwrap_or(DEFAULT_USER_SEED);
 
     let user_keypair = Keypair::from_uri(&user_seed.parse::<SecretUri>()?)?;
-    let user_account = AccountId32::from(user_keypair.public_key().0);
-    let user_ss58 = user_account.to_ss58check();
+    let user_account = user_keypair.public_key().to_account_id();
+    let user_ss58 = user_account.to_string();
 
     let provider_ss58 = ProviderClient::fetch_provider_id(provider_url)
         .await?
-        .to_ss58check();
+        .to_string();
 
     println!("=== Complete Storage Workflow ===");
     println!("Chain WebSocket: {chain_ws}");

client/examples/register_provider.rs

@@ -14,10 +14,10 @@
 //!   multiaddr     - Provider multiaddr            (default: /ip4/127.0.0.1/tcp/3333)
 //!   keyfile       - Path to file containing seed  (default: dev seed //Alice)
 
-use sp_core::crypto::Ss58Codec;
 use std::env;
-use storage_client::{ClientConfig, ProviderClient, ProviderSettings};
-use subxt_signer::{sr25519::Keypair, SecretUri};
+use storage_client::{ClientConfig, ProviderClient};
+use storage_subxt::api::runtime_types::pallet_storage_provider::pallet::ProviderSettings;
+use storage_subxt::subxt_signer::{sr25519::Keypair, SecretUri};
 
 const DEFAULT_CHAIN_WS: &str = "ws://127.0.0.1:2222";
 const DEFAULT_PROVIDER_URL: &str = "http://127.0.0.1:3333";
@@ -52,8 +52,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     // Derive SS58 address from the keypair for display and ProviderClient identity.
     let public_key_bytes = keypair.public_key().0;
-    let account = sp_runtime::AccountId32::from(public_key_bytes);
-    let ss58_address = account.to_ss58check();
+    let account = storage_subxt::subxt::utils::AccountId32::from(public_key_bytes);
+    let ss58_address = account.to_string();
 
     println!("=== Provider Registration ===");
     println!("Chain WebSocket: {chain_ws}");