subxt-core crate

.github/workflows/rust.yml

@@ -187,8 +187,8 @@ jobs:
       - name: Cargo check subxt-signer
         run: |
           cargo check -p subxt-signer
-          cargo check -p subxt-signer --no-default-features --features sr25519,native
-          cargo check -p subxt-signer --no-default-features --features ecdsa,native
+          cargo check -p subxt-signer --no-default-features --features sr25519
+          cargo check -p subxt-signer --no-default-features --features ecdsa
 
       # We can't enable web features here, so no cargo hack.
       - name: Cargo check subxt-lightclient

Cargo.toml

@@ -2,6 +2,7 @@
 members = [
     "cli",
     "codegen",
+    "core",
     "lightclient",
     "testing/substrate-runner",
     "testing/test-runtime",
@@ -70,7 +71,7 @@ codec = { package = "parity-scale-codec", version = "3.6.9", default-features =
 color-eyre = "0.6.3"
 console_error_panic_hook = "0.1.7"
 darling = "0.20.8"
-derivative = "2.2.0"
+derive-where = "1.2.7"
 derive_more = "0.99.17"
 either = { version = "1.10.0", default-features = false }
 frame-metadata = { version = "16.0.0", default-features = false }
@@ -93,6 +94,8 @@ scale-value = { version = "0.14.1", default-features = false }
 scale-bits = { version = "0.5.0", default-features = false }
 scale-decode = { version = "0.11.1", default-features = false }
 scale-encode = { version = "0.6.0", default-features = false }
+scale-typegen = "0.4.2"
+scale-typegen-description = "0.4.2"
 serde = { version = "1.0.197", default-features = false, features = ["derive"] }
 serde_json = { version = "1.0.114", default-features = false }
 syn = { version = "2.0.15", features = ["full", "extra-traits"] }
@@ -106,8 +109,6 @@ url = "2.5.0"
 wabt = "0.10.0"
 wasm-bindgen-test = "0.3.24"
 which = "5.0.0"
-scale-typegen-description = "0.2.0"
-scale-typegen = "0.2.0"
 strip-ansi-escapes = "0.2.0"
 
 # Light client support:
@@ -136,6 +137,7 @@ sp-keyring = "34.0.0"
 
 # Subxt workspace crates:
 subxt = { version = "0.35.0", path = "subxt", default-features = false }
+subxt-core = { version = "0.35.0", path = "core", default-features = false }
 subxt-macro = { version = "0.35.0", path = "macro" }
 subxt-metadata = { version = "0.35.0", path = "metadata", default-features = false }
 subxt-codegen = { version = "0.35.0", path = "codegen" }

cli/src/commands/codegen.rs

@@ -46,7 +46,7 @@ pub struct Opts {
     #[clap(long = "substitute-type", value_parser = substitute_type_parser)]
     substitute_types: Vec<(String, String)>,
     /// The `subxt` crate access path in the generated code.
-    /// Defaults to `::subxt`.
+    /// Defaults to `::subxt::ext::subxt_core`.
     #[clap(long = "crate")]
     crate_path: Option<String>,
     /// Do not generate documentation for the runtime API code.

cli/src/commands/explore/pallets/calls.rs

@@ -154,10 +154,7 @@ fn mocked_offline_client(metadata: Metadata) -> OfflineClient<SubstrateConfig> {
         H256::from_str("91b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c3")
             .expect("Valid hash; qed");
 
-    let runtime_version = subxt::backend::RuntimeVersion {
-        spec_version: 9370,
-        transaction_version: 20,
-    };
+    let runtime_version = subxt::client::RuntimeVersion::new(9370, 20);
 
     OfflineClient::<SubstrateConfig>::new(genesis_hash, runtime_version, metadata)
 }

codegen/src/api/calls.rs

@@ -6,6 +6,7 @@ use super::CodegenError;
 use heck::{ToSnakeCase as _, ToUpperCamelCase as _};
 use proc_macro2::TokenStream as TokenStream2;
 use quote::{format_ident, quote};
+use scale_typegen::typegen::ir::ToTokensWithSettings;
 use scale_typegen::{typegen::ir::type_ir::CompositeIRKind, TypeGenerator};
 use subxt_metadata::PalletMetadata;
 
@@ -16,7 +17,7 @@ use subxt_metadata::PalletMetadata;
 ///
 /// - `type_gen` - [`scale_typegen::TypeGenerator`] that contains settings and all types from the runtime metadata.
 /// - `pallet` - Pallet metadata from which the calls are generated.
-/// - `crate_path` - The crate path under which subxt is located, e.g. `::subxt` when using subxt as a dependency.
+/// - `crate_path` - The crate path under which the `subxt-core` crate is located, e.g. `::subxt::ext::subxt_core` when using subxt as a dependency.
 pub fn generate_calls(
     type_gen: &TypeGenerator,
     pallet: &PalletMetadata,
@@ -41,9 +42,9 @@ pub fn generate_calls(
                     .iter()
                     .map(|(name, field)| {
                         // Note: fn_arg_type this is relative the type path of the type alias when prefixed with `types::`, e.g. `set_max_code_size::New`
-                        let fn_arg_type = &field.type_path;
+                        let fn_arg_type = field.type_path.to_token_stream(type_gen.settings());
                         let call_arg = if field.is_boxed {
-                            quote! { #name: ::std::boxed::Box::new(#name) }
+                            quote! { #name: #crate_path::alloc::boxed::Box::new(#name) }
                         } else {
                             quote! { #name }
                         };
@@ -71,7 +72,9 @@ pub fn generate_calls(
             let docs = &var.composite.docs;
 
             // this converts the composite into a full struct type. No Type Parameters needed here.
-            let struct_def = type_gen.upcast_composite(&var.composite);
+            let struct_def = type_gen
+                .upcast_composite(&var.composite)
+                .to_token_stream(type_gen.settings());
             let alias_mod = var.type_alias_mod;
             // The call structure's documentation was stripped above.
             let call_struct = quote! {
@@ -105,7 +108,9 @@ pub fn generate_calls(
         .into_iter()
         .unzip();
 
-    let call_type = type_gen.resolve_type_path(call_ty)?;
+    let call_type = type_gen
+        .resolve_type_path(call_ty)?
+        .to_token_stream(type_gen.settings());
     let call_ty = type_gen.resolve_type(call_ty)?;
     let docs = type_gen.docs_from_scale_info(&call_ty.docs);
 

codegen/src/api/constants.rs

@@ -5,6 +5,7 @@
 use heck::ToSnakeCase as _;
 use proc_macro2::TokenStream as TokenStream2;
 use quote::{format_ident, quote};
+use scale_typegen::typegen::ir::ToTokensWithSettings;
 use scale_typegen::TypeGenerator;
 use subxt_metadata::PalletMetadata;
 
@@ -31,7 +32,7 @@ use super::CodegenError;
 ///
 /// - `type_gen` - [`scale_typegen::TypeGenerator`] that contains settings and all types from the runtime metadata.
 /// - `pallet` - Pallet metadata from which the constants are generated.
-/// - `crate_path` - The crate path under which subxt is located, e.g. `::subxt` when using subxt as a dependency.
+/// - `crate_path` - The crate path under which the `subxt-core` crate is located, e.g. `::subxt::ext::subxt_core` when using subxt as a dependency.
 pub fn generate_constants(
     type_gen: &TypeGenerator,
     pallet: &PalletMetadata,
@@ -55,7 +56,9 @@ pub fn generate_constants(
                 ));
             };
 
-            let return_ty = type_gen.resolve_type_path(constant.ty())?;
+            let return_ty = type_gen
+                .resolve_type_path(constant.ty())?
+                .to_token_stream(type_gen.settings());
             let docs = constant.docs();
             let docs = type_gen
                 .settings()

codegen/src/api/custom_values.rs

@@ -3,12 +3,13 @@
 // see LICENSE for license details.
 
 use heck::ToSnakeCase as _;
+use scale_typegen::typegen::ir::ToTokensWithSettings;
 use scale_typegen::TypeGenerator;
 use std::collections::HashSet;
 use subxt_metadata::{CustomValueMetadata, Metadata};
 
 use proc_macro2::TokenStream as TokenStream2;
-use quote::{quote, ToTokens};
+use quote::quote;
 
 /// Generate the custom values mod, if there are any custom values in the metadata. Else returns None.
 pub fn generate_custom_values(
@@ -60,8 +61,8 @@ fn generate_custom_value_fn(
         let return_ty = type_gen
             .resolve_type_path(custom_value.type_id())
             .expect("type is in metadata; qed")
-            .to_token_stream();
-        let decodable = quote!(#crate_path::custom_values::Yes);
+            .to_token_stream(type_gen.settings());
+        let decodable = quote!(#crate_path::utils::Yes);
         (return_ty, decodable)
     } else {
         // if type registry does not contain the type, we can just return the Encoded scale bytes.

codegen/src/api/errors.rs

@@ -8,6 +8,7 @@ use scale_typegen::TypeGenerator;
 use subxt_metadata::PalletMetadata;
 
 use super::CodegenError;
+use scale_typegen::typegen::ir::ToTokensWithSettings;
 
 /// Generate error type alias from the provided pallet metadata.
 pub fn generate_error_type_alias(
@@ -18,7 +19,9 @@ pub fn generate_error_type_alias(
         return Ok(quote!());
     };
 
-    let error_type = type_gen.resolve_type_path(error_ty)?;
+    let error_type = type_gen
+        .resolve_type_path(error_ty)?
+        .to_token_stream(type_gen.settings());
     let error_ty = type_gen.resolve_type(error_ty)?;
     let docs = &error_ty.docs;
     let docs = type_gen

codegen/src/api/events.rs

@@ -2,13 +2,13 @@
 // This file is dual-licensed as Apache-2.0 or GPL-3.0.
 // see LICENSE for license details.
 
+use super::CodegenError;
 use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
+use scale_typegen::typegen::ir::ToTokensWithSettings;
 use scale_typegen::TypeGenerator;
 use subxt_metadata::PalletMetadata;
 
-use super::CodegenError;
-
 /// Generate events from the provided pallet metadata.
 ///
 /// The function creates a new module named `events` under the pallet's module.
@@ -37,7 +37,7 @@ use super::CodegenError;
 ///
 /// - `type_gen` - [`scale_typegen::TypeGenerator`] that contains settings and all types from the runtime metadata.
 /// - `pallet` - Pallet metadata from which the events are generated.
-/// - `crate_path` - The crate path under which subxt is located, e.g. `::subxt` when using subxt as a dependency.
+/// - `crate_path` - The crate path under which the `subxt-core` crate is located, e.g. `::subxt::ext::subxt_core` when using subxt as a dependency.
 pub fn generate_events(
     type_gen: &TypeGenerator,
     pallet: &PalletMetadata,
@@ -56,7 +56,9 @@ pub fn generate_events(
         let event_struct_name = &var.composite.name;
         let event_name = var.variant_name;
         let alias_mod = var.type_alias_mod;
-        let struct_def = type_gen.upcast_composite(&var.composite);
+        let struct_def = type_gen
+            .upcast_composite(&var.composite)
+            .to_token_stream(type_gen.settings());
         quote! {
             #struct_def
             #alias_mod
@@ -68,7 +70,9 @@ pub fn generate_events(
         }
     });
 
-    let event_type = type_gen.resolve_type_path(event_ty)?;
+    let event_type = type_gen
+        .resolve_type_path(event_ty)?
+        .to_token_stream(type_gen.settings());
     let event_ty = type_gen.resolve_type(event_ty)?;
     let docs = &event_ty.docs;
     let docs = type_gen