Merge v0.50.x to master (#2127)

* v0.50.0: Integrate frame-decode, redo storage APIs and break up Error. (#2100) * WIP integrating new frame-decode and working out new storage APIS * WIP: first pass adding new storage things to subxt-core * Second pass over Address type and start impl in Subxt * WIP new storage APIs * WIP New storage APIs roughly completed, lots of errors still * Remove PlainorMap enum; plain and map values now use same struct to simplify usage * Begin 'fixing' errors * WIP splitting errors and tidying payload/address traits * Get subxt-core compiling * Small fixes in subxt-core and remove metadata mod * subxt-core: cargo check --all-targets passes * Fix test * WIP starting to update subxt from subxt-core changes * WIP splitting up subxt errors into smaller variants * WIP errors: add DispatchError errors * Port new Storage APIs to subxt-core * cargo check -p subxt passes * Quick-fix errors in subxt-cli (explore subcommand) * fmt * Finish fixing codegen up and start fixing examples * get Subxt examples compiling and bytes_at for constants * Add some arcs to limit lifetimes in subxt/subxt-core storage APIs * A little Arcing to allow more method chaining in Storage APIs, aligning with Subxt * Update codegen test * cargo check --all-targets passing * cargo check --features 'unstable-light-client' passing * clippy * Remove unused dep in subxt * use published frame-decode * fix wasm-example * Add new tx extension to fix daily tests * Remove unused subxt_core::dynamic::DecodedValue type * Update book to match changes * Update docs to fix more broken bits * Add missing docs * fmt * allow larger result errs for now * Add missing alloc imports in subxt-core * Fix doc tests and fix bug getting constant info * Fix V14 -> Metadata transform for storage & constants * Fix parachain example * Fix FFI example * BlockLength decodes t ostruct, not u128 * use fetch/iter shorthands rather than entry in most storage tests * Fix some integration tests * Fix Runtime codegen tests * Expose the dynamic custom_value selecter and use in a UI test * Update codegen metadata * Tidy CLI storage query and support (str,str) as a storage address * Add (str,str) as valid constant address too * Show string tuple in constants example * Via the magic of traits, avoid needing any clones of queries/addresses and accept references to them * clippy * [v0.50] update scale-info-legacy and frame-decode to latest (#2119) * bump scale-info-legacy and frame-decode to latest * Remove something we don't need in this PR * Fully remove unused for now dep * [v0.50] Convert historic metadata to subxt::Metadata (#2120) * First pass converting historic metadatas to our subxt::Metadata type * use published frame-decode * fmt and rename legacy metadata macro * Enable legacy feature where needed in subxt_metadata so it compiles on its own * Use cargo hack more in CI and fix subxt-metadata features * Add tests for metadata conversion (need to optimise; some too expensive right now * Address performance and equality issues in metadata conversion testing * fmt * fmt all * clippy * Fix a doc link * Test codegen and fixes to make it work * Remove local frame-decode patch * bump frame-decode to latest * [v0.50.0] Allow visiting extrinsic fields in subxt_historic (#2124) * Allow visiting extrinsic fields * fmt * Don't use local scale-decode dep * Clippy and tidy * Extend 'subxt codegen' CLI to work with legacy metadatas * Simplify historic extrinsics example now that AccountId32s have paths/names * clippy * clippy * clippy.. * Allow visiting storage values, too, and clean up extrinsic visiting a little by narrowing lifetime * Try to fix flaky test * Add custom value decode to extrinsics example * Remove useless else branch ra thought I needed * Simplify examples * Prep to release v0.0.5 (#2126)
2026-06-13 15:11:03 +00:00 · 2025-11-22 10:44:03 +00:00
parent 586b814ecd
commit 8203679cbd
158 changed files with 13736 additions and 16451 deletions
@@ -13,7 +13,7 @@
 //! use subxt_core::config::DefaultExtrinsicParamsBuilder as Params;
 //! use subxt_core::tx;
 //! use subxt_core::utils::H256;
-//! use subxt_core::metadata;
+//! use subxt_core::Metadata;
 //!
 //! // If we generate types without `subxt`, we need to point to `::subxt_core`:
 //! #[subxt(
@@ -26,7 +26,7 @@
 //! let state = tx::ClientState::<PolkadotConfig> {
 //!     metadata: {
 //!         let metadata_bytes = include_bytes!("../../../artifacts/polkadot_metadata_small.scale");
-//!         metadata::decode_from(&metadata_bytes[..]).unwrap()
+//!         Metadata::decode_from(&metadata_bytes[..]).unwrap()
 //!     },
 //!     genesis_hash: {
 //!         let h = "91b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c3";
@@ -59,11 +59,12 @@
 pub mod payload;
 pub mod signer;

+use crate::Metadata;
 use crate::config::{Config, ExtrinsicParams, ExtrinsicParamsEncoder, HashFor, Hasher};
-use crate::error::{Error, ExtrinsicError, MetadataError};
-use crate::metadata::Metadata;
+use crate::error::ExtrinsicError;
 use crate::utils::Encoded;
-use alloc::borrow::{Cow, ToOwned};
+use alloc::borrow::Cow;
+use alloc::string::ToString;
 use alloc::vec::Vec;
 use codec::{Compact, Encode};
 use payload::Payload;
@@ -77,18 +78,28 @@ pub use crate::client::{ClientState, RuntimeVersion};
 /// if the call is valid (or if it's not possible to check since the call has no validation hash).
 /// Return an error if the call was not valid or something went wrong trying to validate it (ie
 /// the pallet or call in question do not exist at all).
-pub fn validate<Call: Payload>(call: &Call, metadata: &Metadata) -> Result<(), Error> {
-    if let Some(details) = call.validation_details() {
-        let expected_hash = metadata
-            .pallet_by_name_err(details.pallet_name)?
-            .call_hash(details.call_name)
-            .ok_or_else(|| MetadataError::CallNameNotFound(details.call_name.to_owned()))?;
+pub fn validate<Call: Payload>(call: &Call, metadata: &Metadata) -> Result<(), ExtrinsicError> {
+    let Some(details) = call.validation_details() else {
+        return Ok(());
+    };

-        if details.hash != expected_hash {
-            return Err(MetadataError::IncompatibleCodegen.into());
-        }
+    let pallet_name = details.pallet_name;
+    let call_name = details.call_name;
+
+    let expected_hash = metadata
+        .pallet_by_name(pallet_name)
+        .ok_or_else(|| ExtrinsicError::PalletNameNotFound(pallet_name.to_string()))?
+        .call_hash(call_name)
+        .ok_or_else(|| ExtrinsicError::CallNameNotFound {
+            pallet_name: pallet_name.to_string(),
+            call_name: call_name.to_string(),
+        })?;
+
+    if details.hash != expected_hash {
+        Err(ExtrinsicError::IncompatibleCodegen)
+    } else {
+        Ok(())
    }
-    Ok(())
 }

 /// Returns the suggested transaction versions to build for a given chain, or an error
@@ -96,7 +107,7 @@ pub fn validate<Call: Payload>(call: &Call, metadata: &Metadata) -> Result<(), E
 ///
 /// If the result is [`TransactionVersion::V4`], use the `v4` methods in this module. If it's
 /// [`TransactionVersion::V5`], use the `v5` ones.
-pub fn suggested_version(metadata: &Metadata) -> Result<TransactionVersion, Error> {
+pub fn suggested_version(metadata: &Metadata) -> Result<TransactionVersion, ExtrinsicError> {
    let versions = metadata.extrinsic().supported_versions();

    if versions.contains(&4) {
@@ -104,7 +115,7 @@ pub fn suggested_version(metadata: &Metadata) -> Result<TransactionVersion, Erro
    } else if versions.contains(&5) {
        Ok(TransactionVersion::V5)
    } else {
-        Err(ExtrinsicError::UnsupportedVersion.into())
+        Err(ExtrinsicError::UnsupportedVersion)
    }
 }

@@ -118,7 +129,10 @@ pub enum TransactionVersion {
 }

 /// Return the SCALE encoded bytes representing the call data of the transaction.
-pub fn call_data<Call: Payload>(call: &Call, metadata: &Metadata) -> Result<Vec<u8>, Error> {
+pub fn call_data<Call: Payload>(
+    call: &Call,
+    metadata: &Metadata,
+) -> Result<Vec<u8>, ExtrinsicError> {
    let mut bytes = Vec::new();
    call.encode_call_data_to(metadata, &mut bytes)?;
    Ok(bytes)
@@ -128,7 +142,7 @@ pub fn call_data<Call: Payload>(call: &Call, metadata: &Metadata) -> Result<Vec<
 pub fn create_v4_unsigned<T: Config, Call: Payload>(
    call: &Call,
    metadata: &Metadata,
-) -> Result<Transaction<T>, Error> {
+) -> Result<Transaction<T>, ExtrinsicError> {
    create_unsigned_at_version(call, 4, metadata)
 }

@@ -136,7 +150,7 @@ pub fn create_v4_unsigned<T: Config, Call: Payload>(
 pub fn create_v5_bare<T: Config, Call: Payload>(
    call: &Call,
    metadata: &Metadata,
-) -> Result<Transaction<T>, Error> {
+) -> Result<Transaction<T>, ExtrinsicError> {
    create_unsigned_at_version(call, 5, metadata)
 }

@@ -145,7 +159,7 @@ fn create_unsigned_at_version<T: Config, Call: Payload>(
    call: &Call,
    tx_version: u8,
    metadata: &Metadata,
-) -> Result<Transaction<T>, Error> {
+) -> Result<Transaction<T>, ExtrinsicError> {
    // 1. Validate this call against the current node metadata if the call comes
    // with a hash allowing us to do so.
    validate(call, metadata)?;
@@ -176,7 +190,7 @@ pub fn create_v4_signed<T: Config, Call: Payload>(
    call: &Call,
    client_state: &ClientState<T>,
    params: <T::ExtrinsicParams as ExtrinsicParams<T>>::Params,
-) -> Result<PartialTransactionV4<T>, Error> {
+) -> Result<PartialTransactionV4<T>, ExtrinsicError> {
    // 1. Validate this call against the current node metadata if the call comes
    // with a hash allowing us to do so.
    validate(call, &client_state.metadata)?;
@@ -200,7 +214,7 @@ pub fn create_v5_general<T: Config, Call: Payload>(
    call: &Call,
    client_state: &ClientState<T>,
    params: <T::ExtrinsicParams as ExtrinsicParams<T>>::Params,
-) -> Result<PartialTransactionV5<T>, Error> {
+) -> Result<PartialTransactionV5<T>, ExtrinsicError> {
    // 1. Validate this call against the current node metadata if the call comes
    // with a hash allowing us to do so.
    validate(call, &client_state.metadata)?;
@@ -5,12 +5,11 @@
 //! This module contains the trait and types used to represent
 //! transactions that can be submitted.

-use crate::Error;
-use crate::error::MetadataError;
-use crate::metadata::Metadata;
-use alloc::borrow::{Cow, ToOwned};
+use crate::Metadata;
+use crate::error::ExtrinsicError;
+use alloc::borrow::Cow;
 use alloc::boxed::Box;
-use alloc::string::String;
+use alloc::string::{String, ToString};

 use alloc::vec::Vec;
 use codec::Encode;
@@ -21,11 +20,15 @@ use scale_value::{Composite, Value, ValueDef, Variant};
 /// to a node.
 pub trait Payload {
    /// Encode call data to the provided output.
-    fn encode_call_data_to(&self, metadata: &Metadata, out: &mut Vec<u8>) -> Result<(), Error>;
+    fn encode_call_data_to(
+        &self,
+        metadata: &Metadata,
+        out: &mut Vec<u8>,
+    ) -> Result<(), ExtrinsicError>;

    /// Encode call data and return the output. This is a convenience
    /// wrapper around [`Payload::encode_call_data_to`].
-    fn encode_call_data(&self, metadata: &Metadata) -> Result<Vec<u8>, Error> {
+    fn encode_call_data(&self, metadata: &Metadata) -> Result<Vec<u8>, ExtrinsicError> {
        let mut v = Vec::new();
        self.encode_call_data_to(metadata, &mut v)?;
        Ok(v)
@@ -46,10 +49,10 @@ macro_rules! boxed_payload {
                &self,
                metadata: &Metadata,
                out: &mut Vec<u8>,
-            ) -> Result<(), Error> {
+            ) -> Result<(), ExtrinsicError> {
                self.as_ref().encode_call_data_to(metadata, out)
            }
-            fn encode_call_data(&self, metadata: &Metadata) -> Result<Vec<u8>, Error> {
+            fn encode_call_data(&self, metadata: &Metadata) -> Result<Vec<u8>, ExtrinsicError> {
                self.as_ref().encode_call_data(metadata)
            }
            fn validation_details(&self) -> Option<ValidationDetails<'_>> {
@@ -164,13 +167,22 @@ impl DefaultPayload<Composite<()>> {
 }

 impl<CallData: EncodeAsFields> Payload for DefaultPayload<CallData> {
-    fn encode_call_data_to(&self, metadata: &Metadata, out: &mut Vec<u8>) -> Result<(), Error> {
-        let pallet = metadata.pallet_by_name_err(&self.pallet_name)?;
+    fn encode_call_data_to(
+        &self,
+        metadata: &Metadata,
+        out: &mut Vec<u8>,
+    ) -> Result<(), ExtrinsicError> {
+        let pallet = metadata
+            .pallet_by_name(&self.pallet_name)
+            .ok_or_else(|| ExtrinsicError::PalletNameNotFound(self.pallet_name.to_string()))?;
        let call = pallet
            .call_variant_by_name(&self.call_name)
-            .ok_or_else(|| MetadataError::CallNameNotFound((*self.call_name).to_owned()))?;
+            .ok_or_else(|| ExtrinsicError::CallNameNotFound {
+                pallet_name: pallet.name().to_string(),
+                call_name: self.call_name.to_string(),
+            })?;

-        let pallet_index = pallet.index();
+        let pallet_index = pallet.call_index();
        let call_index = call.index;

        pallet_index.encode_to(out);
@@ -182,7 +194,8 @@ impl<CallData: EncodeAsFields> Payload for DefaultPayload<CallData> {
            .map(|f| scale_encode::Field::new(f.ty.id, f.name.as_deref()));

        self.call_data
-            .encode_as_fields_to(&mut fields, metadata.types(), out)?;
+            .encode_as_fields_to(&mut fields, metadata.types(), out)
+            .map_err(ExtrinsicError::CannotEncodeCallData)?;
        Ok(())
    }

@@ -208,7 +221,7 @@ pub fn dynamic(
 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::metadata::Metadata;
+    use crate::Metadata;
    use codec::Decode;
    use scale_value::Composite;