diff --git a/codegen/src/api/storage.rs b/codegen/src/api/storage.rs
index 640234b698..9712fe7f35 100644
--- a/codegen/src/api/storage.rs
+++ b/codegen/src/api/storage.rs
@@ -2,9 +2,10 @@
 // This file is dual-licensed as Apache-2.0 or GPL-3.0.
 // see LICENSE for license details.
 
+use crate::types::TypePath;
 use crate::{types::TypeGenerator, CratePath};
 use heck::ToSnakeCase as _;
-use proc_macro2::TokenStream as TokenStream2;
+use proc_macro2::{Ident, TokenStream as TokenStream2, TokenStream};
 use quote::{format_ident, quote};
 use scale_info::TypeDef;
 use subxt_metadata::{
@@ -61,147 +62,231 @@ fn generate_storage_entry_fns(
     crate_path: &CratePath,
     should_gen_docs: bool,
 ) -> Result<TokenStream2, CodegenError> {
-    let (fields, key_impl) = match storage_entry.entry_type() {
-        StorageEntryType::Plain(_) => (vec![], quote!(vec![])),
+    let keys: Vec<(Ident, TypePath)> = match storage_entry.entry_type() {
+        StorageEntryType::Plain(_) => vec![],
         StorageEntryType::Map { key_ty, .. } => {
             match &type_gen.resolve_type(*key_ty).type_def {
                 // An N-map; return each of the keys separately.
-                TypeDef::Tuple(tuple) => {
-                    let fields = tuple
-                        .fields
-                        .iter()
-                        .enumerate()
-                        .map(|(i, f)| {
-                            let field_name = format_ident!("_{}", syn::Index::from(i));
-                            let field_type = type_gen.resolve_type_path(f.id);
-                            (field_name, field_type)
-                        })
-                        .collect::<Vec<_>>();
-
-                    let keys = fields
-                        .iter()
-                        .map(|(field_name, _)| {
-                            quote!( #crate_path::storage::address::make_static_storage_map_key(#field_name.borrow()) )
-                        });
-                    let key_impl = quote! {
-                        vec![ #( #keys ),* ]
-                    };
-
-                    (fields, key_impl)
-                }
+                TypeDef::Tuple(tuple) => tuple
+                    .fields
+                    .iter()
+                    .enumerate()
+                    .map(|(i, f)| {
+                        let ident: Ident = format_ident!("_{}", syn::Index::from(i));
+                        let ty_path = type_gen.resolve_type_path(f.id);
+                        (ident, ty_path)
+                    })
+                    .collect::<Vec<_>>(),
                 // A map with a single key; return the single key.
                 _ => {
+                    let ident = format_ident!("_0");
                     let ty_path = type_gen.resolve_type_path(*key_ty);
-                    let fields = vec![(format_ident!("_0"), ty_path)];
-                    let key_impl = quote! {
-                        vec![ #crate_path::storage::address::make_static_storage_map_key(_0.borrow()) ]
-                    };
-                    (fields, key_impl)
+                    vec![(ident, ty_path)]
                 }
             }
         }
     };
-
     let pallet_name = pallet.name();
     let storage_name = storage_entry.name();
     let Some(storage_hash) = pallet.storage_hash(storage_name) else {
         return Err(CodegenError::MissingStorageMetadata(pallet_name.into(), storage_name.into()));
     };
 
-    let fn_name = format_ident!("{}", storage_entry.name().to_snake_case());
+    let snake_case_name = storage_entry.name().to_snake_case();
     let storage_entry_ty = match storage_entry.entry_type() {
         StorageEntryType::Plain(ty) => *ty,
         StorageEntryType::Map { value_ty, .. } => *value_ty,
     };
     let storage_entry_value_ty = type_gen.resolve_type_path(storage_entry_ty);
-
     let docs = storage_entry.docs();
     let docs = should_gen_docs
         .then_some(quote! { #( #[doc = #docs ] )* })
         .unwrap_or_default();
 
-    let key_args = fields.iter().map(|(field_name, field_type)| {
-        // The field type is translated from `std::vec::Vec<T>` to `[T]`. We apply
-        // Borrow to all types, so this just makes it a little more ergonomic.
-        //
-        // TODO [jsdw]: Support mappings like `String -> str` too for better borrow
-        // ergonomics.
-        let field_ty = match field_type.vec_type_param() {
-            Some(ty) => quote!([#ty]),
-            _ => quote!(#field_type),
-        };
-        quote!( #field_name: impl ::std::borrow::Borrow<#field_ty> )
-    });
-
-    let is_map_type = matches!(storage_entry.entry_type(), StorageEntryType::Map { .. });
-
-    // Is the entry iterable?
-    let is_iterable_type = if is_map_type {
-        quote!(#crate_path::storage::address::Yes)
-    } else {
-        quote!(())
-    };
-
-    let has_default_value = match storage_entry.modifier() {
-        StorageEntryModifier::Default => true,
-        StorageEntryModifier::Optional => false,
+    let is_defaultable_type = match storage_entry.modifier() {
+        StorageEntryModifier::Default => quote!(#crate_path::storage::address::Yes),
+        StorageEntryModifier::Optional => quote!(()),
     };
 
-    // Does the entry have a default value?
-    let is_defaultable_type = if has_default_value {
-        quote!(#crate_path::storage::address::Yes)
-    } else {
-        quote!(())
-    };
+    let all_fns = (0..=keys.len()).map(|n_keys| {
+        let keys_slice = &keys[..n_keys];
+        let (fn_name, is_fetchable, is_iterable) = if n_keys == keys.len() {
+            let fn_name = format_ident!("{snake_case_name}");
+            (fn_name, true, false)
+        } else {
+            let fn_name = if n_keys == 0 {
+                format_ident!("{snake_case_name}_iter")
+            } else {
+                format_ident!("{snake_case_name}_iter{}", n_keys)
+            };
+            (fn_name, false, true)
+        };
+        let is_fetchable_type = is_fetchable.then_some(quote!(#crate_path::storage::address::Yes)).unwrap_or(quote!(()));
+        let is_iterable_type = is_iterable.then_some(quote!(#crate_path::storage::address::Yes)).unwrap_or(quote!(()));
+        let key_impls = keys_slice.iter().map(|(field_name, _)| quote!( #crate_path::storage::address::make_static_storage_map_key(#field_name.borrow()) ));
+        let key_args = keys_slice.iter().map(|(field_name, field_type)| {
+            let field_ty = primitive_type_alias(field_type);
+            quote!( #field_name: impl ::std::borrow::Borrow<#field_ty> )
+        });
 
-    // If the item is a map, we want a way to access the root entry to do things like iterate over it,
-    // so expose a function to create this entry, too:
-    let root_entry_fn = if is_map_type {
-        let fn_name_root = format_ident!("{}_root", fn_name);
         quote!(
             #docs
-            pub fn #fn_name_root(
+            pub fn #fn_name(
                 &self,
+                #(#key_args,)*
             ) -> #crate_path::storage::address::Address::<
                 #crate_path::storage::address::StaticStorageMapKey,
                 #storage_entry_value_ty,
-                (),
+                #is_fetchable_type,
                 #is_defaultable_type,
                 #is_iterable_type
             > {
                 #crate_path::storage::address::Address::new_static(
                     #pallet_name,
                     #storage_name,
-                    Vec::new(),
+                    vec![#(#key_impls,)*],
                     [#(#storage_hash,)*]
                 )
             }
         )
-    } else {
-        quote!()
-    };
+    });
 
     Ok(quote! {
-        // Access a specific value from a storage entry
-        #docs
-        pub fn #fn_name(
-            &self,
-            #( #key_args, )*
-        ) -> #crate_path::storage::address::Address::<
-            #crate_path::storage::address::StaticStorageMapKey,
-            #storage_entry_value_ty,
-            #crate_path::storage::address::Yes,
-            #is_defaultable_type,
-            #is_iterable_type
-        > {
-            #crate_path::storage::address::Address::new_static(
-                #pallet_name,
-                #storage_name,
-                #key_impl,
-                [#(#storage_hash,)*]
-            )
-        }
+        #( #all_fns
 
-        #root_entry_fn
+        )*
     })
 }
+
+fn primitive_type_alias(type_path: &TypePath) -> TokenStream {
+    // Vec<T> is cast to [T]
+    if let Some(ty) = type_path.vec_type_param() {
+        return quote!([#ty]);
+    }
+    // String is cast to str
+    if type_path.is_string() {
+        return quote!(::core::primitive::str);
+    }
+    quote!(#type_path)
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::RuntimeGenerator;
+    use frame_metadata::v15;
+    use quote::{format_ident, quote};
+    use scale_info::{meta_type, MetaType};
+    use std::borrow::Cow;
+
+    use subxt_metadata::Metadata;
+
+    fn metadata_with_storage_entries(
+        storage_entries: impl IntoIterator<Item = (&'static str, MetaType)>,
+    ) -> Metadata {
+        let storage_entries: Vec<v15::StorageEntryMetadata> = storage_entries
+            .into_iter()
+            .map(|(name, key)| v15::StorageEntryMetadata {
+                name,
+                modifier: v15::StorageEntryModifier::Optional,
+                ty: v15::StorageEntryType::Map {
+                    hashers: vec![],
+                    key,
+                    value: meta_type::<bool>(),
+                },
+                default: vec![],
+                docs: vec![],
+            })
+            .collect();
+
+        let pallet_1 = v15::PalletMetadata {
+            name: "Pallet1",
+            storage: Some(v15::PalletStorageMetadata {
+                prefix: Default::default(),
+                entries: storage_entries,
+            }),
+            calls: None,
+            event: None,
+            constants: vec![],
+            error: None,
+            index: 0,
+            docs: vec![],
+        };
+
+        let extrinsic_metadata = v15::ExtrinsicMetadata {
+            version: 0,
+            signed_extensions: vec![],
+            address_ty: meta_type::<()>(),
+            call_ty: meta_type::<()>(),
+            signature_ty: meta_type::<()>(),
+            extra_ty: meta_type::<()>(),
+        };
+
+        let metadata: Metadata = v15::RuntimeMetadataV15::new(
+            vec![pallet_1],
+            extrinsic_metadata,
+            meta_type::<()>(),
+            vec![],
+            v15::OuterEnums {
+                call_enum_ty: meta_type::<()>(),
+                event_enum_ty: meta_type::<()>(),
+                error_enum_ty: meta_type::<()>(),
+            },
+            v15::CustomMetadata {
+                map: Default::default(),
+            },
+        )
+        .try_into()
+        .expect("can build valid metadata");
+        metadata
+    }
+
+    #[test]
+    fn borrow_type_replacements() {
+        let storage_entries = [
+            ("vector", meta_type::<Vec<u8>>()),
+            ("boxed", meta_type::<Box<u16>>()),
+            ("string", meta_type::<String>()),
+            ("static_string", meta_type::<&'static str>()),
+            ("cow_string", meta_type::<Cow<'_, str>>()),
+        ];
+
+        let expected_borrowed_types = [
+            quote!([::core::primitive::u8]),
+            quote!(::core::primitive::u16),
+            quote!(::core::primitive::str),
+            quote!(::core::primitive::str),
+            quote!(::core::primitive::str),
+        ];
+
+        let metadata = metadata_with_storage_entries(storage_entries);
+
+        let item_mod = syn::parse_quote!(
+            pub mod api {}
+        );
+        let generator = RuntimeGenerator::new(metadata);
+        let generated = generator
+            .generate_runtime(
+                item_mod,
+                Default::default(),
+                Default::default(),
+                "::subxt_path".into(),
+                false,
+            )
+            .expect("should be able to generate runtime");
+        let generated_str = generated.to_string();
+
+        for ((name, _), expected_type) in storage_entries
+            .into_iter()
+            .zip(expected_borrowed_types.into_iter())
+        {
+            let name_ident = format_ident!("{}", name);
+            let expected_storage_constructor = quote!(
+                fn #name_ident(
+                    &self,
+                    _0: impl ::std::borrow::Borrow<#expected_type>,
+                )
+            );
+            assert!(generated_str.contains(&expected_storage_constructor.to_string()));
+        }
+    }
+}
diff --git a/codegen/src/types/type_path.rs b/codegen/src/types/type_path.rs
index def2a6e374..9dafb62b5f 100644
--- a/codegen/src/types/type_path.rs
+++ b/codegen/src/types/type_path.rs
@@ -61,6 +61,10 @@ impl TypePath {
         matches!(&self.0, TypePathInner::Type(ty) if ty.is_compact())
     }
 
+    pub(crate) fn is_string(&self) -> bool {
+        matches!(&self.0, TypePathInner::Type(ty) if ty.is_string())
+    }
+
     /// Returns the type parameters in a path which are inherited from the containing type.
     ///
     /// # Example
@@ -214,6 +218,15 @@ impl TypePathType {
         matches!(self, TypePathType::Compact { .. })
     }
 
+    pub(crate) fn is_string(&self) -> bool {
+        matches!(
+            self,
+            TypePathType::Primitive {
+                def: TypeDefPrimitive::Str
+            }
+        )
+    }
+
     fn to_syn_type(&self) -> syn::Type {
         match &self {
             TypePathType::Path { path, params } => {
diff --git a/subxt/examples/storage_iterating.rs b/subxt/examples/storage_iterating.rs
index 07704d1d01..583efdaed9 100644
--- a/subxt/examples/storage_iterating.rs
+++ b/subxt/examples/storage_iterating.rs
@@ -9,7 +9,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let api = OnlineClient::<PolkadotConfig>::new().await?;
 
     // Build a storage query to iterate over account information.
-    let storage_query = polkadot::storage().system().account_root();
+    let storage_query = polkadot::storage().system().account_iter();
 
     // Get back an iterator of results (here, we are fetching 10 items at
     // a time from the node, but we always iterate over one at a time).
diff --git a/subxt/examples/storage_iterating_dynamic.rs b/subxt/examples/storage_iterating_dynamic.rs
index 9deca9ad8a..d9b4496030 100644
--- a/subxt/examples/storage_iterating_dynamic.rs
+++ b/subxt/examples/storage_iterating_dynamic.rs
@@ -6,7 +6,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let api = OnlineClient::<PolkadotConfig>::new().await?;
 
     // Build a dynamic storage query to iterate account information.
-    let storage_query = subxt::dynamic::storage_root("System", "Account");
+    // With a dynamic query, we can just provide an empty Vec as the keys to iterate over all entries.
+    let keys = Vec::<()>::new();
+    let storage_query = subxt::dynamic::storage("System", "Account", keys);
 
     // Use that query to return an iterator over the results.
     let mut results = api
diff --git a/subxt/examples/storage_iterating_partial.rs b/subxt/examples/storage_iterating_partial.rs
new file mode 100644
index 0000000000..fe8c6ae26e
--- /dev/null
+++ b/subxt/examples/storage_iterating_partial.rs
@@ -0,0 +1,83 @@
+use subxt::{OnlineClient, PolkadotConfig};
+
+#[subxt::subxt(runtime_metadata_path = "../artifacts/polkadot_metadata_full.scale")]
+pub mod polkadot {}
+
+use subxt::utils::AccountId32;
+use subxt_signer::sr25519::{dev, Keypair};
+
+use polkadot::multisig::events::NewMultisig;
+use polkadot::runtime_types::{
+    frame_system::pallet::Call, polkadot_runtime::RuntimeCall, sp_weights::weight_v2::Weight,
+};
+
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    // Create a new API client, configured to talk to Polkadot nodes.
+    let api = OnlineClient::<PolkadotConfig>::new().await?;
+
+    // Prepare the chain to have 3 open multisig requests (2 of them are alice + bob):
+    let alice_signer = dev::alice();
+    let bob = AccountId32(dev::bob().public_key().0);
+    let charlie = AccountId32(dev::charlie().public_key().0);
+
+    let new_multisig_1 = submit_remark_as_multi(&alice_signer, &bob, b"Hello", &api).await?;
+    let new_multisig_2 = submit_remark_as_multi(&alice_signer, &bob, b"Hi", &api).await?;
+    let new_multisig_3 = submit_remark_as_multi(&alice_signer, &charlie, b"Hello", &api).await?;
+    // Note: the NewMultisig event contains the multisig address we need to use for the storage queries:
+    assert_eq!(new_multisig_1.multisig, new_multisig_2.multisig);
+    assert_ne!(new_multisig_1.multisig, new_multisig_3.multisig);
+
+    // Build a storage query to iterate over open multisig extrinsics from
+    // new_multisig_1.multisig which is the AccountId of the alice + bob multisig account
+    let alice_bob_account_id = &new_multisig_1.multisig;
+    let storage_query = polkadot::storage()
+        .multisig()
+        .multisigs_iter1(alice_bob_account_id);
+
+    // Get back an iterator of results (here, we are fetching 10 items at
+    // a time from the node, but we always iterate over one at a time).
+    let mut results = api
+        .storage()
+        .at_latest()
+        .await?
+        .iter(storage_query, 10)
+        .await?;
+
+    while let Some((key, value)) = results.next().await? {
+        println!("Key: 0x{}", hex::encode(&key));
+        println!("Value: {:?}", value);
+    }
+
+    Ok(())
+}
+
+async fn submit_remark_as_multi(
+    signer: &Keypair,
+    other: &AccountId32,
+    remark: &[u8],
+    api: &OnlineClient<PolkadotConfig>,
+) -> Result<NewMultisig, Box<dyn std::error::Error>> {
+    let multisig_remark_tx = polkadot::tx().multisig().as_multi(
+        2,
+        vec![other.clone()],
+        None,
+        RuntimeCall::System(Call::remark {
+            remark: remark.to_vec(),
+        }),
+        Weight {
+            ref_time: 0,
+            proof_size: 0,
+        },
+    );
+    let events = api
+        .tx()
+        .sign_and_submit_then_watch_default(&multisig_remark_tx, signer)
+        .await?
+        .wait_for_finalized_success()
+        .await?;
+    let new_multisig = events
+        .find_first::<polkadot::multisig::events::NewMultisig>()?
+        .expect("should contain event");
+    Ok(new_multisig)
+}
diff --git a/subxt/src/book/usage/storage.rs b/subxt/src/book/usage/storage.rs
index 2bde301bfa..e387577b7c 100644
--- a/subxt/src/book/usage/storage.rs
+++ b/subxt/src/book/usage/storage.rs
@@ -39,7 +39,7 @@
 //! ```
 //!
 //! As well as accessing specific entries, some storage locations can also be iterated over (such as
-//! the map of account information). To do this, suffix `_root` onto the query constructor (this
+//! the map of account information). To do this, suffix `_iter` onto the query constructor (this
 //! will only be available on static constructors when iteration is actually possible):
 //!
 //! ```rust,no_run
@@ -47,11 +47,25 @@
 //! pub mod polkadot {}
 //!
 //! // A static query capable of iterating over accounts:
-//! let storage_query = polkadot::storage().system().account_root();
+//! let storage_query = polkadot::storage().system().account_iter();
 //! // A dynamic query to do the same:
-//! let storage_query = subxt::dynamic::storage_root("System", "Account");
+//! let storage_query = subxt::dynamic::storage("System", "Account", Vec::<u8>::new());
 //! ```
 //!
+//! Some storage entries are maps with multiple keys. As an example, we might end up with
+//! an API like `runtime::storage().foo().bar(u8, bool, u16, String)` to fetch some entry "bar".
+//! When this is the case, the codegen will generate multiple iterator query functions alongside
+//! the function to fetch an individual value:
+//!
+//! - `runtime::storage().foo().bar(u8, bool, u16, String)`: fetch a single entry from the "bar" map.
+//! - `runtime::storage().foo().bar_iter()`: iterate over all of the entries in the "bar" map.
+//! - `runtime::storage().foo().bar_iter1(u8)`: iterate over all of the entries in the "bar" map under
+//!   a given `u8`.
+//! - `runtime::storage().foo().bar_iter2(u8, bool)`: iterate over all of the entries in the "bar" map under
+//!   a given `u8` and `bool` value.
+//! - `runtime::storage().foo().bar_iter3(u8, bool, u16)`: iterate over all of the entries in the "bar" map under
+//!   a given `u8`, `bool` and `u16` value.
+//!
 //! All valid storage queries implement [`crate::storage::StorageAddress`]. As well as describing
 //! how to build a valid storage query, this trait also has some associated types that determine the
 //! shape of the result you'll get back, and determine what you can do with it (ie, can you iterate
@@ -99,6 +113,13 @@
 #![doc = include_str!("../../../examples/storage_iterating_dynamic.rs")]
 //! ```
 //!
+//! Here is an example of iterating over partial keys. In this example some multi-signature operations
+//! are sent to the node. We can iterate over the pending multisig operations of a single multisig account:
+//!
+//! ```rust,ignore
+#![doc = include_str!("../../../examples/storage_iterating_partial.rs")]
+//! ```
+//!
 //! ### Advanced
 //!
 //! For more advanced use cases, have a look at [`crate::storage::Storage::fetch_raw`] and
diff --git a/subxt/src/dynamic.rs b/subxt/src/dynamic.rs
index 389f8d6ff4..2801feb683 100644
--- a/subxt/src/dynamic.rs
+++ b/subxt/src/dynamic.rs
@@ -26,7 +26,7 @@ pub use crate::tx::dynamic as tx;
 pub use crate::constants::dynamic as constant;
 
 // Lookup storage values dynamically.
-pub use crate::storage::{dynamic as storage, dynamic_root as storage_root};
+pub use crate::storage::dynamic as storage;
 
 // Execute runtime API function call dynamically.
 pub use crate::runtime_api::dynamic as runtime_api_call;
diff --git a/subxt/src/storage/mod.rs b/subxt/src/storage/mod.rs
index 8fac6bfca0..5df31e8f64 100644
--- a/subxt/src/storage/mod.rs
+++ b/subxt/src/storage/mod.rs
@@ -21,11 +21,11 @@ pub use crate::rpc::types::StorageKey;
 /// entry lives and how to properly decode it.
 pub mod address {
     pub use super::storage_address::{
-        dynamic, dynamic_root, make_static_storage_map_key, Address, DynamicAddress,
-        StaticStorageMapKey, StorageAddress, Yes,
+        dynamic, make_static_storage_map_key, Address, DynamicAddress, StaticStorageMapKey,
+        StorageAddress, Yes,
     };
 }
 
 // For consistency with other modules, also expose
 // the basic address stuff at the root of the module.
-pub use storage_address::{dynamic, dynamic_root, Address, DynamicAddress, StorageAddress};
+pub use storage_address::{dynamic, Address, DynamicAddress, StorageAddress};
diff --git a/subxt/src/storage/storage_address.rs b/subxt/src/storage/storage_address.rs
index 8ba61d9f09..a1ad3c5fff 100644
--- a/subxt/src/storage/storage_address.rs
+++ b/subxt/src/storage/storage_address.rs
@@ -3,7 +3,7 @@
 // see LICENSE for license details.
 
 use crate::{
-    dynamic::{DecodedValueThunk, Value},
+    dynamic::DecodedValueThunk,
     error::{Error, MetadataError, StorageAddressError},
     metadata::{DecodeWithMetadata, EncodeWithMetadata, Metadata},
     utils::{Encoded, Static},
@@ -50,7 +50,7 @@ pub trait StorageAddress {
 pub struct Yes;
 
 /// A concrete storage address. This can be created from static values (ie those generated
-/// via the `subxt` macro) or dynamic values via [`dynamic`] and [`dynamic_root`].
+/// via the `subxt` macro) or dynamic values via [`dynamic`].
 pub struct Address<StorageKey, ReturnTy, Fetchable, Defaultable, Iterable> {
     pallet_name: Cow<'static, str>,
     entry_name: Cow<'static, str>,
@@ -228,14 +228,6 @@ pub fn make_static_storage_map_key<T: codec::Encode>(t: T) -> StaticStorageMapKe
     Static(Encoded(t.encode()))
 }
 
-/// Construct a new dynamic storage lookup to the root of some entry.
-pub fn dynamic_root(
-    pallet_name: impl Into<String>,
-    entry_name: impl Into<String>,
-) -> DynamicAddress<Value> {
-    DynamicAddress::new(pallet_name, entry_name, vec![])
-}
-
 /// Construct a new dynamic storage lookup.
 pub fn dynamic<StorageKey: EncodeWithMetadata>(
     pallet_name: impl Into<String>,
diff --git a/subxt/src/storage/storage_type.rs b/subxt/src/storage/storage_type.rs
index 1c510428bc..b4facee0d5 100644
--- a/subxt/src/storage/storage_type.rs
+++ b/subxt/src/storage/storage_type.rs
@@ -179,7 +179,7 @@ where
     /// let api = OnlineClient::<PolkadotConfig>::new().await.unwrap();
     ///
     /// // Address to the root of a storage entry that we'd like to iterate over.
-    /// let address = polkadot::storage().xcm_pallet().version_notifiers_root();
+    /// let address = polkadot::storage().xcm_pallet().version_notifiers_iter();
     ///
     /// // Iterate over keys and values at that address.
     /// let mut iter = api
diff --git a/testing/integration-tests/src/full_client/client/mod.rs b/testing/integration-tests/src/full_client/client/mod.rs
index 4626b040f2..9c6886f62b 100644
--- a/testing/integration-tests/src/full_client/client/mod.rs
+++ b/testing/integration-tests/src/full_client/client/mod.rs
@@ -133,7 +133,7 @@ async fn fetch_keys() {
     let ctx = test_context().await;
     let api = ctx.client();
 
-    let addr = node_runtime::storage().system().account_root();
+    let addr = node_runtime::storage().system().account_iter();
     let keys = api
         .storage()
         .at_latest()
@@ -150,7 +150,7 @@ async fn test_iter() {
     let ctx = test_context().await;
     let api = ctx.client();
 
-    let addr = node_runtime::storage().system().account_root();
+    let addr = node_runtime::storage().system().account_iter();
     let mut iter = api
         .storage()
         .at_latest()
@@ -435,7 +435,7 @@ async fn unsigned_extrinsic_is_same_shape_as_polkadotjs() {
     let expected_tx_bytes = hex::decode(
         "b004060700d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d0f0090c04bb6db2b"
     )
-    .unwrap();
+        .unwrap();
 
     // Make sure our encoding is the same as the encoding polkadot UI created.
     assert_eq!(actual_tx_bytes, expected_tx_bytes);
diff --git a/testing/integration-tests/src/full_client/codegen/mod.rs b/testing/integration-tests/src/full_client/codegen/mod.rs
index 8803838f6a..f2b3a97658 100644
--- a/testing/integration-tests/src/full_client/codegen/mod.rs
+++ b/testing/integration-tests/src/full_client/codegen/mod.rs
@@ -8,7 +8,7 @@
 /// Generate by running this at the root of the repository:
 ///
 /// ```
-/// cargo run --bin subxt -- codegen --file artifacts/polkadot_metadata_full.scale | rustfmt > testing/integration-tests/src/codegen/polkadot.rs
+/// cargo run --bin subxt -- codegen --file artifacts/polkadot_metadata_full.scale | rustfmt > testing/integration-tests/src/full_client/codegen/polkadot.rs
 /// ```
 #[rustfmt::skip]
 #[allow(clippy::all)]
diff --git a/testing/integration-tests/src/full_client/codegen/polkadot.rs b/testing/integration-tests/src/full_client/codegen/polkadot.rs
index b306c71f78..dbbe16bd25 100644
--- a/testing/integration-tests/src/full_client/codegen/polkadot.rs
+++ b/testing/integration-tests/src/full_client/codegen/polkadot.rs
@@ -188,9 +188,10 @@ pub mod api {
                         "version",
                         types::Version {},
                         [
-                            208u8, 156u8, 242u8, 175u8, 91u8, 142u8, 140u8, 147u8, 202u8, 252u8,
-                            59u8, 236u8, 42u8, 221u8, 134u8, 39u8, 177u8, 160u8, 223u8, 74u8, 36u8,
-                            141u8, 74u8, 4u8, 248u8, 111u8, 254u8, 214u8, 23u8, 59u8, 59u8, 160u8,
+                            76u8, 202u8, 17u8, 117u8, 189u8, 237u8, 239u8, 237u8, 151u8, 17u8,
+                            125u8, 159u8, 218u8, 92u8, 57u8, 238u8, 64u8, 147u8, 40u8, 72u8, 157u8,
+                            116u8, 37u8, 195u8, 156u8, 27u8, 123u8, 173u8, 178u8, 102u8, 136u8,
+                            6u8,
                         ],
                     )
                 }
@@ -204,10 +205,9 @@ pub mod api {
                         "execute_block",
                         types::ExecuteBlock { block },
                         [
-                            101u8, 219u8, 22u8, 226u8, 108u8, 12u8, 117u8, 235u8, 185u8, 6u8,
-                            210u8, 196u8, 241u8, 124u8, 122u8, 100u8, 196u8, 226u8, 6u8, 228u8,
-                            75u8, 247u8, 160u8, 208u8, 56u8, 53u8, 18u8, 69u8, 235u8, 125u8, 86u8,
-                            54u8,
+                            133u8, 135u8, 228u8, 65u8, 106u8, 27u8, 85u8, 158u8, 112u8, 254u8,
+                            93u8, 26u8, 102u8, 201u8, 118u8, 216u8, 249u8, 247u8, 91u8, 74u8, 56u8,
+                            208u8, 231u8, 115u8, 131u8, 29u8, 209u8, 6u8, 65u8, 57u8, 214u8, 125u8,
                         ],
                     )
                 }
@@ -224,10 +224,9 @@ pub mod api {
                         "initialize_block",
                         types::InitializeBlock { header },
                         [
-                            49u8, 128u8, 189u8, 185u8, 156u8, 217u8, 149u8, 251u8, 64u8, 175u8,
-                            28u8, 121u8, 111u8, 219u8, 161u8, 62u8, 176u8, 22u8, 167u8, 137u8,
-                            137u8, 14u8, 56u8, 29u8, 3u8, 98u8, 204u8, 14u8, 65u8, 79u8, 199u8,
-                            112u8,
+                            146u8, 138u8, 72u8, 240u8, 63u8, 96u8, 110u8, 189u8, 77u8, 92u8, 96u8,
+                            232u8, 41u8, 217u8, 105u8, 148u8, 83u8, 190u8, 152u8, 219u8, 19u8,
+                            87u8, 163u8, 1u8, 232u8, 25u8, 221u8, 74u8, 224u8, 67u8, 223u8, 34u8,
                         ],
                     )
                 }
@@ -407,10 +406,9 @@ pub mod api {
                         "apply_extrinsic",
                         types::ApplyExtrinsic { extrinsic },
                         [
-                            194u8, 184u8, 67u8, 94u8, 64u8, 72u8, 93u8, 72u8, 96u8, 149u8, 129u8,
-                            222u8, 62u8, 97u8, 38u8, 93u8, 138u8, 205u8, 203u8, 209u8, 100u8,
-                            130u8, 254u8, 59u8, 207u8, 44u8, 235u8, 194u8, 91u8, 119u8, 138u8,
-                            196u8,
+                            72u8, 54u8, 139u8, 3u8, 118u8, 136u8, 65u8, 47u8, 6u8, 105u8, 125u8,
+                            223u8, 160u8, 29u8, 103u8, 74u8, 79u8, 149u8, 48u8, 90u8, 237u8, 2u8,
+                            97u8, 201u8, 123u8, 34u8, 167u8, 37u8, 187u8, 35u8, 176u8, 97u8,
                         ],
                     )
                 }
@@ -429,10 +427,9 @@ pub mod api {
                         "finalize_block",
                         types::FinalizeBlock {},
                         [
-                            23u8, 247u8, 179u8, 24u8, 180u8, 7u8, 52u8, 202u8, 187u8, 15u8, 199u8,
-                            213u8, 193u8, 75u8, 103u8, 56u8, 190u8, 154u8, 81u8, 21u8, 209u8,
-                            178u8, 133u8, 136u8, 180u8, 112u8, 213u8, 76u8, 117u8, 156u8, 126u8,
-                            30u8,
+                            244u8, 207u8, 24u8, 33u8, 13u8, 69u8, 9u8, 249u8, 145u8, 143u8, 122u8,
+                            96u8, 197u8, 55u8, 64u8, 111u8, 238u8, 224u8, 34u8, 201u8, 27u8, 146u8,
+                            232u8, 99u8, 191u8, 30u8, 114u8, 16u8, 32u8, 220u8, 58u8, 62u8,
                         ],
                     )
                 }
@@ -442,9 +439,10 @@ pub mod api {
                         "inherent_extrinsics",
                         types::InherentExtrinsics { inherent },
                         [
-                            98u8, 190u8, 193u8, 3u8, 42u8, 89u8, 80u8, 230u8, 153u8, 241u8, 71u8,
-                            43u8, 108u8, 107u8, 63u8, 181u8, 9u8, 86u8, 244u8, 9u8, 237u8, 198u8,
-                            249u8, 164u8, 242u8, 137u8, 216u8, 210u8, 2u8, 197u8, 33u8, 169u8,
+                            254u8, 110u8, 245u8, 201u8, 250u8, 192u8, 27u8, 228u8, 151u8, 213u8,
+                            166u8, 89u8, 94u8, 81u8, 189u8, 234u8, 64u8, 18u8, 245u8, 80u8, 29u8,
+                            18u8, 140u8, 129u8, 113u8, 236u8, 135u8, 55u8, 79u8, 159u8, 175u8,
+                            183u8,
                         ],
                     )
                 }
@@ -462,10 +460,10 @@ pub mod api {
                         "check_inherents",
                         types::CheckInherents { block, data },
                         [
-                            195u8, 85u8, 54u8, 114u8, 231u8, 129u8, 188u8, 241u8, 167u8, 99u8,
-                            249u8, 100u8, 0u8, 48u8, 234u8, 88u8, 140u8, 75u8, 180u8, 233u8, 135u8,
-                            186u8, 31u8, 179u8, 64u8, 199u8, 12u8, 212u8, 191u8, 179u8, 71u8,
-                            226u8,
+                            153u8, 134u8, 1u8, 215u8, 139u8, 11u8, 53u8, 51u8, 210u8, 175u8, 197u8,
+                            28u8, 38u8, 209u8, 175u8, 247u8, 142u8, 157u8, 50u8, 151u8, 164u8,
+                            191u8, 181u8, 118u8, 80u8, 97u8, 160u8, 248u8, 110u8, 217u8, 181u8,
+                            234u8,
                         ],
                     )
                 }
@@ -556,10 +554,10 @@ pub mod api {
                         "points_to_balance",
                         types::PointsToBalance { pool_id, points },
                         [
-                            185u8, 86u8, 75u8, 107u8, 174u8, 197u8, 17u8, 216u8, 194u8, 41u8,
-                            170u8, 1u8, 113u8, 207u8, 77u8, 143u8, 211u8, 210u8, 181u8, 131u8,
-                            16u8, 223u8, 77u8, 134u8, 152u8, 8u8, 160u8, 20u8, 83u8, 241u8, 195u8,
-                            2u8,
+                            106u8, 191u8, 150u8, 40u8, 231u8, 8u8, 82u8, 104u8, 109u8, 105u8, 94u8,
+                            109u8, 38u8, 165u8, 199u8, 81u8, 37u8, 181u8, 115u8, 106u8, 52u8,
+                            192u8, 56u8, 255u8, 145u8, 204u8, 12u8, 241u8, 120u8, 20u8, 188u8,
+                            12u8,
                         ],
                     )
                 }
@@ -575,10 +573,10 @@ pub mod api {
                         "balance_to_points",
                         types::BalanceToPoints { pool_id, new_funds },
                         [
-                            95u8, 31u8, 119u8, 229u8, 217u8, 163u8, 94u8, 190u8, 149u8, 114u8,
-                            81u8, 21u8, 215u8, 86u8, 237u8, 48u8, 232u8, 142u8, 114u8, 162u8,
-                            176u8, 6u8, 210u8, 190u8, 56u8, 45u8, 229u8, 161u8, 201u8, 84u8, 137u8,
-                            76u8,
+                            5u8, 213u8, 46u8, 194u8, 117u8, 119u8, 10u8, 139u8, 191u8, 76u8, 59u8,
+                            81u8, 159u8, 38u8, 144u8, 176u8, 63u8, 138u8, 233u8, 138u8, 236u8,
+                            208u8, 113u8, 230u8, 131u8, 75u8, 67u8, 204u8, 160u8, 100u8, 198u8,
+                            174u8,
                         ],
                     )
                 }
@@ -705,9 +703,9 @@ pub mod api {
                             block_hash,
                         },
                         [
-                            0u8, 184u8, 223u8, 131u8, 207u8, 216u8, 71u8, 7u8, 51u8, 252u8, 130u8,
-                            189u8, 9u8, 21u8, 39u8, 75u8, 0u8, 1u8, 21u8, 157u8, 208u8, 5u8, 110u8,
-                            10u8, 212u8, 177u8, 59u8, 194u8, 178u8, 244u8, 238u8, 238u8,
+                            196u8, 50u8, 90u8, 49u8, 109u8, 251u8, 200u8, 35u8, 23u8, 150u8, 140u8,
+                            143u8, 232u8, 164u8, 133u8, 89u8, 32u8, 240u8, 115u8, 39u8, 95u8, 70u8,
+                            162u8, 76u8, 122u8, 73u8, 151u8, 144u8, 234u8, 120u8, 100u8, 29u8,
                         ],
                     )
                 }
@@ -746,10 +744,9 @@ pub mod api {
                         "offchain_worker",
                         types::OffchainWorker { header },
                         [
-                            203u8, 137u8, 171u8, 220u8, 51u8, 190u8, 230u8, 10u8, 77u8, 8u8, 141u8,
-                            224u8, 144u8, 82u8, 45u8, 116u8, 23u8, 223u8, 254u8, 209u8, 49u8,
-                            228u8, 161u8, 170u8, 202u8, 99u8, 200u8, 20u8, 61u8, 17u8, 191u8,
-                            203u8,
+                            10u8, 135u8, 19u8, 153u8, 33u8, 216u8, 18u8, 242u8, 33u8, 140u8, 4u8,
+                            223u8, 200u8, 130u8, 103u8, 118u8, 137u8, 24u8, 19u8, 127u8, 161u8,
+                            29u8, 184u8, 111u8, 222u8, 111u8, 253u8, 73u8, 45u8, 31u8, 79u8, 60u8,
                         ],
                     )
                 }
@@ -820,9 +817,10 @@ pub mod api {
                         "validator_groups",
                         types::ValidatorGroups {},
                         [
-                            24u8, 171u8, 23u8, 86u8, 7u8, 140u8, 37u8, 124u8, 240u8, 134u8, 32u8,
-                            107u8, 1u8, 57u8, 195u8, 88u8, 93u8, 176u8, 76u8, 58u8, 213u8, 209u8,
-                            45u8, 37u8, 176u8, 231u8, 95u8, 153u8, 127u8, 100u8, 188u8, 219u8,
+                            89u8, 221u8, 163u8, 73u8, 194u8, 196u8, 136u8, 242u8, 249u8, 182u8,
+                            239u8, 251u8, 157u8, 211u8, 41u8, 58u8, 242u8, 242u8, 177u8, 145u8,
+                            107u8, 167u8, 193u8, 204u8, 226u8, 228u8, 82u8, 249u8, 187u8, 211u8,
+                            37u8, 124u8,
                         ],
                     )
                 }
@@ -844,9 +842,9 @@ pub mod api {
                         "availability_cores",
                         types::AvailabilityCores {},
                         [
-                            20u8, 38u8, 87u8, 56u8, 94u8, 85u8, 87u8, 37u8, 142u8, 86u8, 34u8,
-                            211u8, 142u8, 20u8, 245u8, 111u8, 124u8, 96u8, 235u8, 130u8, 233u8,
-                            20u8, 112u8, 60u8, 100u8, 2u8, 173u8, 55u8, 167u8, 233u8, 213u8, 98u8,
+                            238u8, 20u8, 188u8, 206u8, 26u8, 17u8, 72u8, 123u8, 33u8, 54u8, 66u8,
+                            13u8, 244u8, 246u8, 228u8, 177u8, 176u8, 251u8, 82u8, 12u8, 170u8,
+                            29u8, 39u8, 158u8, 16u8, 23u8, 253u8, 169u8, 117u8, 12u8, 0u8, 65u8,
                         ],
                     )
                 }
@@ -876,9 +874,9 @@ pub mod api {
                             assumption,
                         },
                         [
-                            237u8, 50u8, 182u8, 228u8, 164u8, 127u8, 74u8, 248u8, 33u8, 12u8, 18u8,
-                            216u8, 135u8, 121u8, 146u8, 255u8, 242u8, 161u8, 227u8, 39u8, 107u8,
-                            78u8, 106u8, 54u8, 50u8, 26u8, 194u8, 91u8, 221u8, 207u8, 119u8, 25u8,
+                            119u8, 217u8, 57u8, 241u8, 70u8, 56u8, 102u8, 20u8, 98u8, 60u8, 47u8,
+                            78u8, 124u8, 81u8, 158u8, 254u8, 30u8, 14u8, 223u8, 195u8, 95u8, 179u8,
+                            228u8, 53u8, 149u8, 224u8, 62u8, 8u8, 27u8, 3u8, 100u8, 37u8,
                         ],
                     )
                 }
@@ -907,9 +905,9 @@ pub mod api {
                             expected_persisted_validation_data_hash,
                         },
                         [
-                            217u8, 79u8, 215u8, 232u8, 170u8, 10u8, 5u8, 200u8, 85u8, 10u8, 250u8,
-                            106u8, 7u8, 181u8, 176u8, 208u8, 18u8, 28u8, 95u8, 68u8, 227u8, 42u8,
-                            150u8, 20u8, 236u8, 253u8, 89u8, 217u8, 251u8, 131u8, 37u8, 109u8,
+                            37u8, 162u8, 100u8, 72u8, 19u8, 135u8, 13u8, 211u8, 51u8, 153u8, 201u8,
+                            97u8, 61u8, 193u8, 167u8, 118u8, 60u8, 242u8, 228u8, 81u8, 165u8, 62u8,
+                            191u8, 206u8, 157u8, 232u8, 62u8, 55u8, 240u8, 236u8, 76u8, 204u8,
                         ],
                     )
                 }
@@ -929,9 +927,10 @@ pub mod api {
                         "check_validation_outputs",
                         types::CheckValidationOutputs { para_id, outputs },
                         [
-                            130u8, 83u8, 118u8, 171u8, 9u8, 170u8, 167u8, 159u8, 82u8, 50u8, 197u8,
-                            71u8, 14u8, 124u8, 149u8, 187u8, 54u8, 52u8, 115u8, 109u8, 163u8, 58u8,
-                            138u8, 0u8, 197u8, 193u8, 50u8, 215u8, 223u8, 40u8, 94u8, 43u8,
+                            128u8, 33u8, 213u8, 120u8, 39u8, 18u8, 135u8, 248u8, 196u8, 43u8, 0u8,
+                            143u8, 198u8, 64u8, 93u8, 133u8, 248u8, 206u8, 103u8, 137u8, 168u8,
+                            255u8, 144u8, 29u8, 121u8, 246u8, 179u8, 187u8, 83u8, 53u8, 142u8,
+                            82u8,
                         ],
                     )
                 }
@@ -1002,9 +1001,10 @@ pub mod api {
                         "candidate_pending_availability",
                         types::CandidatePendingAvailability { para_id },
                         [
-                            154u8, 125u8, 63u8, 252u8, 163u8, 113u8, 154u8, 109u8, 73u8, 53u8,
-                            211u8, 166u8, 170u8, 8u8, 225u8, 175u8, 62u8, 234u8, 76u8, 210u8, 87u8,
-                            82u8, 41u8, 21u8, 138u8, 223u8, 68u8, 91u8, 42u8, 6u8, 92u8, 83u8,
+                            139u8, 185u8, 205u8, 255u8, 131u8, 180u8, 248u8, 168u8, 25u8, 124u8,
+                            105u8, 141u8, 59u8, 118u8, 109u8, 136u8, 103u8, 200u8, 5u8, 218u8,
+                            72u8, 55u8, 114u8, 89u8, 207u8, 140u8, 51u8, 86u8, 167u8, 41u8, 221u8,
+                            86u8,
                         ],
                     )
                 }
@@ -1024,9 +1024,10 @@ pub mod api {
                         "candidate_events",
                         types::CandidateEvents {},
                         [
-                            218u8, 47u8, 143u8, 92u8, 30u8, 179u8, 238u8, 141u8, 23u8, 90u8, 106u8,
-                            220u8, 164u8, 111u8, 198u8, 194u8, 157u8, 30u8, 141u8, 161u8, 111u8,
-                            18u8, 67u8, 161u8, 15u8, 10u8, 135u8, 117u8, 102u8, 46u8, 253u8, 200u8,
+                            101u8, 145u8, 200u8, 182u8, 213u8, 111u8, 180u8, 73u8, 14u8, 107u8,
+                            110u8, 145u8, 122u8, 35u8, 223u8, 219u8, 66u8, 101u8, 130u8, 255u8,
+                            44u8, 46u8, 50u8, 61u8, 104u8, 237u8, 34u8, 16u8, 179u8, 214u8, 115u8,
+                            7u8,
                         ],
                     )
                 }
@@ -1047,9 +1048,9 @@ pub mod api {
                         "dmq_contents",
                         types::DmqContents { recipient },
                         [
-                            101u8, 11u8, 228u8, 155u8, 29u8, 171u8, 197u8, 250u8, 190u8, 12u8,
-                            91u8, 126u8, 61u8, 245u8, 62u8, 84u8, 87u8, 188u8, 214u8, 179u8, 93u8,
-                            2u8, 253u8, 81u8, 173u8, 68u8, 202u8, 12u8, 153u8, 209u8, 195u8, 218u8,
+                            189u8, 11u8, 38u8, 223u8, 11u8, 108u8, 201u8, 122u8, 207u8, 7u8, 74u8,
+                            14u8, 247u8, 226u8, 108u8, 21u8, 213u8, 55u8, 8u8, 137u8, 211u8, 98u8,
+                            19u8, 11u8, 212u8, 218u8, 209u8, 63u8, 51u8, 252u8, 86u8, 53u8,
                         ],
                     )
                 }
@@ -1074,9 +1075,9 @@ pub mod api {
                         "inbound_hrmp_channels_contents",
                         types::InboundHrmpChannelsContents { recipient },
                         [
-                            137u8, 234u8, 23u8, 131u8, 16u8, 41u8, 19u8, 174u8, 230u8, 103u8, 68u8,
-                            163u8, 29u8, 47u8, 228u8, 22u8, 198u8, 42u8, 227u8, 88u8, 186u8, 140u8,
-                            137u8, 176u8, 26u8, 116u8, 172u8, 186u8, 39u8, 27u8, 50u8, 249u8,
+                            132u8, 29u8, 42u8, 39u8, 72u8, 243u8, 110u8, 43u8, 110u8, 9u8, 21u8,
+                            18u8, 91u8, 40u8, 231u8, 223u8, 239u8, 16u8, 110u8, 54u8, 108u8, 234u8,
+                            140u8, 205u8, 80u8, 221u8, 115u8, 48u8, 197u8, 248u8, 6u8, 25u8,
                         ],
                     )
                 }
@@ -1095,10 +1096,10 @@ pub mod api {
                         "validation_code_by_hash",
                         types::ValidationCodeByHash { hash },
                         [
-                            212u8, 83u8, 91u8, 51u8, 38u8, 58u8, 129u8, 5u8, 135u8, 147u8, 201u8,
-                            44u8, 104u8, 153u8, 22u8, 208u8, 205u8, 86u8, 132u8, 249u8, 194u8,
-                            207u8, 171u8, 60u8, 238u8, 180u8, 212u8, 153u8, 111u8, 220u8, 16u8,
-                            60u8,
+                            219u8, 250u8, 130u8, 89u8, 178u8, 234u8, 255u8, 33u8, 90u8, 78u8, 58u8,
+                            124u8, 141u8, 145u8, 156u8, 81u8, 184u8, 52u8, 65u8, 112u8, 35u8,
+                            153u8, 222u8, 23u8, 226u8, 53u8, 164u8, 22u8, 236u8, 103u8, 197u8,
+                            236u8,
                         ],
                     )
                 }
@@ -1118,10 +1119,9 @@ pub mod api {
                         "on_chain_votes",
                         types::OnChainVotes {},
                         [
-                            70u8, 204u8, 61u8, 216u8, 163u8, 243u8, 112u8, 157u8, 65u8, 106u8,
-                            165u8, 165u8, 101u8, 152u8, 219u8, 125u8, 225u8, 224u8, 202u8, 121u8,
-                            43u8, 227u8, 83u8, 67u8, 122u8, 186u8, 33u8, 33u8, 54u8, 97u8, 99u8,
-                            161u8,
+                            8u8, 253u8, 248u8, 13u8, 221u8, 83u8, 199u8, 65u8, 180u8, 193u8, 232u8,
+                            179u8, 56u8, 186u8, 72u8, 128u8, 27u8, 168u8, 177u8, 82u8, 194u8,
+                            139u8, 78u8, 32u8, 147u8, 67u8, 27u8, 252u8, 118u8, 60u8, 74u8, 31u8,
                         ],
                     )
                 }
@@ -1140,9 +1140,10 @@ pub mod api {
                         "session_info",
                         types::SessionInfo { index },
                         [
-                            197u8, 235u8, 25u8, 97u8, 207u8, 55u8, 83u8, 79u8, 10u8, 50u8, 90u8,
-                            28u8, 35u8, 53u8, 98u8, 128u8, 169u8, 228u8, 146u8, 131u8, 211u8,
-                            195u8, 98u8, 24u8, 209u8, 242u8, 118u8, 240u8, 194u8, 82u8, 77u8, 84u8,
+                            77u8, 115u8, 39u8, 190u8, 116u8, 250u8, 66u8, 128u8, 168u8, 24u8,
+                            120u8, 153u8, 111u8, 125u8, 249u8, 115u8, 112u8, 169u8, 208u8, 31u8,
+                            95u8, 234u8, 14u8, 242u8, 14u8, 190u8, 120u8, 171u8, 202u8, 67u8, 81u8,
+                            237u8,
                         ],
                     )
                 }
@@ -1160,9 +1161,10 @@ pub mod api {
                         "submit_pvf_check_statement",
                         types::SubmitPvfCheckStatement { stmt, signature },
                         [
-                            253u8, 165u8, 60u8, 122u8, 179u8, 73u8, 243u8, 228u8, 171u8, 146u8,
-                            223u8, 182u8, 87u8, 228u8, 72u8, 96u8, 5u8, 231u8, 46u8, 50u8, 69u8,
-                            13u8, 210u8, 244u8, 96u8, 218u8, 114u8, 68u8, 114u8, 82u8, 40u8, 233u8,
+                            91u8, 138u8, 75u8, 79u8, 171u8, 224u8, 206u8, 152u8, 202u8, 131u8,
+                            251u8, 200u8, 75u8, 99u8, 49u8, 192u8, 175u8, 212u8, 139u8, 236u8,
+                            188u8, 243u8, 82u8, 62u8, 190u8, 79u8, 113u8, 23u8, 222u8, 29u8, 255u8,
+                            196u8,
                         ],
                     )
                 }
@@ -1234,10 +1236,9 @@ pub mod api {
                         "disputes",
                         types::Disputes {},
                         [
-                            117u8, 4u8, 163u8, 44u8, 248u8, 183u8, 136u8, 222u8, 238u8, 108u8,
-                            92u8, 220u8, 5u8, 184u8, 43u8, 233u8, 36u8, 11u8, 221u8, 71u8, 48u8,
-                            162u8, 45u8, 218u8, 99u8, 252u8, 48u8, 244u8, 203u8, 215u8, 149u8,
-                            116u8,
+                            183u8, 88u8, 143u8, 44u8, 138u8, 79u8, 65u8, 198u8, 42u8, 109u8, 235u8,
+                            152u8, 3u8, 13u8, 106u8, 189u8, 197u8, 126u8, 44u8, 161u8, 67u8, 49u8,
+                            163u8, 193u8, 248u8, 207u8, 1u8, 108u8, 188u8, 152u8, 87u8, 125u8,
                         ],
                     )
                 }
@@ -1256,10 +1257,9 @@ pub mod api {
                         "session_executor_params",
                         types::SessionExecutorParams { session_index },
                         [
-                            187u8, 45u8, 218u8, 244u8, 148u8, 61u8, 108u8, 160u8, 113u8, 79u8,
-                            160u8, 106u8, 69u8, 189u8, 42u8, 197u8, 226u8, 233u8, 111u8, 178u8,
-                            169u8, 81u8, 68u8, 235u8, 67u8, 140u8, 45u8, 13u8, 135u8, 162u8, 229u8,
-                            23u8,
+                            207u8, 66u8, 10u8, 104u8, 146u8, 219u8, 75u8, 157u8, 93u8, 224u8,
+                            215u8, 13u8, 255u8, 62u8, 134u8, 168u8, 185u8, 101u8, 39u8, 78u8, 98u8,
+                            44u8, 129u8, 38u8, 48u8, 244u8, 103u8, 205u8, 66u8, 121u8, 18u8, 247u8,
                         ],
                     )
                 }
@@ -1280,10 +1280,9 @@ pub mod api {
                         "unapplied_slashes",
                         types::UnappliedSlashes {},
                         [
-                            133u8, 146u8, 7u8, 30u8, 251u8, 59u8, 90u8, 123u8, 77u8, 116u8, 105u8,
-                            109u8, 249u8, 226u8, 238u8, 95u8, 179u8, 251u8, 193u8, 200u8, 194u8,
-                            111u8, 21u8, 188u8, 19u8, 115u8, 119u8, 11u8, 172u8, 179u8, 142u8,
-                            159u8,
+                            205u8, 16u8, 246u8, 48u8, 72u8, 160u8, 7u8, 136u8, 225u8, 2u8, 209u8,
+                            254u8, 255u8, 115u8, 49u8, 214u8, 131u8, 22u8, 210u8, 9u8, 111u8,
+                            170u8, 109u8, 247u8, 110u8, 42u8, 55u8, 68u8, 85u8, 37u8, 250u8, 4u8,
                         ],
                     )
                 }
@@ -1303,10 +1302,9 @@ pub mod api {
                         "key_ownership_proof",
                         types::KeyOwnershipProof { validator_id },
                         [
-                            170u8, 101u8, 138u8, 1u8, 229u8, 13u8, 121u8, 167u8, 151u8, 112u8,
-                            197u8, 250u8, 189u8, 220u8, 67u8, 220u8, 42u8, 209u8, 173u8, 241u8,
-                            245u8, 167u8, 11u8, 3u8, 13u8, 223u8, 224u8, 12u8, 20u8, 210u8, 56u8,
-                            202u8,
+                            194u8, 237u8, 59u8, 4u8, 194u8, 235u8, 38u8, 58u8, 58u8, 221u8, 189u8,
+                            69u8, 254u8, 2u8, 242u8, 200u8, 86u8, 4u8, 138u8, 184u8, 198u8, 58u8,
+                            200u8, 34u8, 243u8, 91u8, 122u8, 35u8, 18u8, 83u8, 152u8, 191u8,
                         ],
                     )
                 }
@@ -1329,9 +1327,9 @@ pub mod api {
                             key_ownership_proof,
                         },
                         [
-                            108u8, 144u8, 248u8, 41u8, 84u8, 72u8, 122u8, 76u8, 193u8, 242u8, 6u8,
-                            18u8, 209u8, 6u8, 96u8, 131u8, 242u8, 252u8, 199u8, 222u8, 161u8,
-                            167u8, 52u8, 41u8, 252u8, 59u8, 26u8, 130u8, 48u8, 8u8, 68u8, 4u8,
+                            98u8, 63u8, 249u8, 13u8, 163u8, 161u8, 43u8, 96u8, 75u8, 65u8, 3u8,
+                            116u8, 8u8, 149u8, 122u8, 190u8, 179u8, 108u8, 17u8, 22u8, 59u8, 134u8,
+                            43u8, 31u8, 13u8, 254u8, 21u8, 112u8, 129u8, 16u8, 5u8, 180u8,
                         ],
                     )
                 }
@@ -1707,10 +1705,10 @@ pub mod api {
                             key_owner_proof,
                         },
                         [
-                            92u8, 203u8, 82u8, 194u8, 186u8, 242u8, 194u8, 177u8, 61u8, 148u8,
-                            127u8, 61u8, 96u8, 119u8, 185u8, 139u8, 74u8, 35u8, 77u8, 108u8, 157u8,
-                            80u8, 29u8, 226u8, 136u8, 136u8, 241u8, 212u8, 254u8, 192u8, 39u8,
-                            149u8,
+                            20u8, 162u8, 43u8, 173u8, 248u8, 140u8, 57u8, 151u8, 189u8, 96u8, 68u8,
+                            130u8, 14u8, 162u8, 230u8, 61u8, 169u8, 189u8, 239u8, 71u8, 121u8,
+                            137u8, 141u8, 206u8, 91u8, 164u8, 175u8, 93u8, 33u8, 161u8, 166u8,
+                            192u8,
                         ],
                     )
                 }
@@ -1743,10 +1741,9 @@ pub mod api {
                             authority_id,
                         },
                         [
-                            4u8, 194u8, 19u8, 164u8, 208u8, 221u8, 178u8, 109u8, 116u8, 85u8,
-                            175u8, 105u8, 85u8, 29u8, 191u8, 114u8, 169u8, 124u8, 196u8, 198u8,
-                            207u8, 241u8, 248u8, 212u8, 243u8, 153u8, 248u8, 17u8, 220u8, 198u8,
-                            250u8, 73u8,
+                            244u8, 175u8, 3u8, 235u8, 173u8, 34u8, 210u8, 81u8, 41u8, 5u8, 85u8,
+                            179u8, 53u8, 153u8, 16u8, 62u8, 103u8, 71u8, 180u8, 11u8, 165u8, 90u8,
+                            186u8, 156u8, 118u8, 114u8, 22u8, 108u8, 149u8, 9u8, 232u8, 174u8,
                         ],
                     )
                 }
@@ -1882,9 +1879,10 @@ pub mod api {
                             best_known_block_number,
                         },
                         [
-                            56u8, 239u8, 77u8, 199u8, 40u8, 38u8, 113u8, 43u8, 65u8, 189u8, 21u8,
-                            81u8, 216u8, 8u8, 3u8, 155u8, 202u8, 186u8, 117u8, 31u8, 140u8, 237u8,
-                            114u8, 30u8, 228u8, 77u8, 171u8, 183u8, 198u8, 198u8, 20u8, 98u8,
+                            187u8, 175u8, 153u8, 82u8, 245u8, 180u8, 126u8, 156u8, 67u8, 89u8,
+                            253u8, 29u8, 54u8, 168u8, 196u8, 144u8, 24u8, 123u8, 154u8, 69u8,
+                            245u8, 90u8, 110u8, 239u8, 15u8, 125u8, 204u8, 148u8, 71u8, 209u8,
+                            58u8, 32u8,
                         ],
                     )
                 }
@@ -1906,10 +1904,10 @@ pub mod api {
                         "verify_proof",
                         types::VerifyProof { leaves, proof },
                         [
-                            94u8, 245u8, 92u8, 162u8, 169u8, 237u8, 220u8, 144u8, 134u8, 89u8,
-                            164u8, 205u8, 28u8, 67u8, 164u8, 15u8, 185u8, 160u8, 255u8, 91u8,
-                            167u8, 63u8, 147u8, 199u8, 99u8, 103u8, 43u8, 182u8, 227u8, 1u8, 118u8,
-                            174u8,
+                            236u8, 54u8, 135u8, 196u8, 161u8, 247u8, 183u8, 78u8, 153u8, 69u8,
+                            59u8, 78u8, 62u8, 20u8, 187u8, 47u8, 77u8, 209u8, 209u8, 224u8, 127u8,
+                            85u8, 122u8, 33u8, 123u8, 128u8, 92u8, 251u8, 110u8, 233u8, 50u8,
+                            160u8,
                         ],
                     )
                 }
@@ -1938,10 +1936,9 @@ pub mod api {
                             proof,
                         },
                         [
-                            100u8, 183u8, 97u8, 190u8, 137u8, 183u8, 228u8, 70u8, 184u8, 42u8,
-                            195u8, 139u8, 234u8, 166u8, 137u8, 206u8, 128u8, 217u8, 40u8, 149u8,
-                            55u8, 107u8, 30u8, 154u8, 234u8, 132u8, 247u8, 37u8, 133u8, 19u8,
-                            141u8, 9u8,
+                            163u8, 232u8, 190u8, 65u8, 135u8, 136u8, 50u8, 60u8, 137u8, 37u8,
+                            192u8, 24u8, 137u8, 144u8, 165u8, 131u8, 49u8, 88u8, 15u8, 139u8, 83u8,
+                            152u8, 162u8, 148u8, 22u8, 74u8, 82u8, 25u8, 183u8, 83u8, 212u8, 56u8,
                         ],
                     )
                 }
@@ -2085,9 +2082,10 @@ pub mod api {
                             key_owner_proof,
                         },
                         [
-                            125u8, 230u8, 200u8, 151u8, 177u8, 13u8, 231u8, 44u8, 254u8, 4u8, 31u8,
-                            47u8, 190u8, 197u8, 208u8, 155u8, 198u8, 236u8, 136u8, 50u8, 81u8,
-                            35u8, 182u8, 150u8, 200u8, 56u8, 160u8, 180u8, 18u8, 85u8, 4u8, 253u8,
+                            112u8, 94u8, 150u8, 250u8, 132u8, 127u8, 185u8, 24u8, 113u8, 62u8,
+                            28u8, 171u8, 83u8, 9u8, 41u8, 228u8, 92u8, 137u8, 29u8, 190u8, 214u8,
+                            232u8, 100u8, 66u8, 100u8, 168u8, 149u8, 122u8, 93u8, 17u8, 236u8,
+                            104u8,
                         ],
                     )
                 }
@@ -2120,9 +2118,10 @@ pub mod api {
                             authority_id,
                         },
                         [
-                            192u8, 4u8, 250u8, 56u8, 51u8, 13u8, 210u8, 127u8, 92u8, 159u8, 91u8,
-                            139u8, 62u8, 18u8, 63u8, 52u8, 162u8, 69u8, 57u8, 186u8, 134u8, 63u8,
-                            31u8, 88u8, 23u8, 137u8, 131u8, 131u8, 117u8, 253u8, 46u8, 133u8,
+                            40u8, 126u8, 113u8, 27u8, 245u8, 45u8, 123u8, 138u8, 12u8, 3u8, 125u8,
+                            186u8, 151u8, 53u8, 186u8, 93u8, 13u8, 150u8, 163u8, 176u8, 206u8,
+                            89u8, 244u8, 127u8, 182u8, 85u8, 203u8, 41u8, 101u8, 183u8, 209u8,
+                            179u8,
                         ],
                     )
                 }
@@ -2220,10 +2219,9 @@ pub mod api {
                         "configuration",
                         types::Configuration {},
                         [
-                            94u8, 3u8, 187u8, 249u8, 239u8, 178u8, 74u8, 180u8, 159u8, 1u8, 114u8,
-                            106u8, 121u8, 13u8, 242u8, 142u8, 148u8, 59u8, 232u8, 229u8, 242u8,
-                            166u8, 230u8, 134u8, 161u8, 101u8, 45u8, 95u8, 118u8, 139u8, 144u8,
-                            168u8,
+                            8u8, 81u8, 234u8, 29u8, 30u8, 198u8, 76u8, 19u8, 188u8, 198u8, 127u8,
+                            33u8, 141u8, 95u8, 132u8, 106u8, 31u8, 41u8, 215u8, 54u8, 240u8, 65u8,
+                            59u8, 160u8, 188u8, 237u8, 10u8, 143u8, 250u8, 79u8, 45u8, 161u8,
                         ],
                     )
                 }
@@ -2258,9 +2256,9 @@ pub mod api {
                         "current_epoch",
                         types::CurrentEpoch {},
                         [
-                            232u8, 243u8, 129u8, 8u8, 254u8, 134u8, 15u8, 29u8, 174u8, 98u8, 249u8,
-                            165u8, 104u8, 134u8, 102u8, 116u8, 92u8, 70u8, 116u8, 107u8, 161u8,
-                            131u8, 122u8, 23u8, 108u8, 88u8, 11u8, 95u8, 175u8, 21u8, 54u8, 158u8,
+                            73u8, 171u8, 149u8, 138u8, 230u8, 95u8, 241u8, 189u8, 207u8, 145u8,
+                            103u8, 76u8, 79u8, 44u8, 250u8, 68u8, 238u8, 4u8, 149u8, 234u8, 165u8,
+                            91u8, 89u8, 228u8, 132u8, 201u8, 203u8, 98u8, 209u8, 137u8, 8u8, 63u8,
                         ],
                     )
                 }
@@ -2277,9 +2275,10 @@ pub mod api {
                         "next_epoch",
                         types::NextEpoch {},
                         [
-                            185u8, 92u8, 222u8, 66u8, 8u8, 41u8, 95u8, 28u8, 145u8, 214u8, 27u8,
-                            236u8, 228u8, 42u8, 184u8, 185u8, 255u8, 169u8, 59u8, 63u8, 68u8, 50u8,
-                            97u8, 72u8, 77u8, 181u8, 120u8, 30u8, 233u8, 217u8, 89u8, 80u8,
+                            191u8, 124u8, 183u8, 209u8, 73u8, 171u8, 164u8, 244u8, 68u8, 239u8,
+                            196u8, 54u8, 188u8, 85u8, 229u8, 175u8, 29u8, 89u8, 148u8, 108u8,
+                            208u8, 156u8, 62u8, 193u8, 167u8, 184u8, 251u8, 245u8, 123u8, 87u8,
+                            19u8, 225u8,
                         ],
                     )
                 }
@@ -2309,9 +2308,10 @@ pub mod api {
                         "generate_key_ownership_proof",
                         types::GenerateKeyOwnershipProof { slot, authority_id },
                         [
-                            129u8, 33u8, 146u8, 23u8, 214u8, 217u8, 211u8, 76u8, 213u8, 195u8,
-                            64u8, 182u8, 252u8, 42u8, 94u8, 121u8, 115u8, 198u8, 9u8, 45u8, 213u8,
-                            239u8, 48u8, 237u8, 16u8, 104u8, 233u8, 246u8, 99u8, 66u8, 177u8, 60u8,
+                            235u8, 220u8, 75u8, 20u8, 175u8, 246u8, 127u8, 176u8, 225u8, 25u8,
+                            240u8, 252u8, 58u8, 254u8, 153u8, 133u8, 197u8, 168u8, 19u8, 231u8,
+                            234u8, 173u8, 58u8, 152u8, 212u8, 123u8, 13u8, 131u8, 84u8, 221u8,
+                            98u8, 46u8,
                         ],
                     )
                 }
@@ -2345,9 +2345,9 @@ pub mod api {
                             key_owner_proof,
                         },
                         [
-                            246u8, 96u8, 99u8, 104u8, 13u8, 88u8, 201u8, 38u8, 92u8, 57u8, 253u8,
-                            173u8, 123u8, 68u8, 14u8, 101u8, 57u8, 89u8, 153u8, 236u8, 99u8, 117u8,
-                            202u8, 79u8, 213u8, 216u8, 216u8, 97u8, 107u8, 68u8, 89u8, 138u8,
+                            9u8, 163u8, 149u8, 31u8, 89u8, 32u8, 224u8, 116u8, 102u8, 46u8, 10u8,
+                            189u8, 35u8, 166u8, 111u8, 156u8, 204u8, 80u8, 35u8, 64u8, 223u8, 3u8,
+                            4u8, 0u8, 97u8, 118u8, 124u8, 142u8, 224u8, 160u8, 2u8, 50u8,
                         ],
                     )
                 }
@@ -2502,10 +2502,9 @@ pub mod api {
                         "generate_session_keys",
                         types::GenerateSessionKeys { seed },
                         [
-                            169u8, 35u8, 108u8, 136u8, 239u8, 85u8, 250u8, 171u8, 92u8, 77u8,
-                            200u8, 52u8, 59u8, 248u8, 134u8, 208u8, 101u8, 170u8, 160u8, 251u8,
-                            245u8, 224u8, 34u8, 132u8, 85u8, 24u8, 162u8, 180u8, 151u8, 65u8, 51u8,
-                            62u8,
+                            96u8, 171u8, 164u8, 166u8, 175u8, 102u8, 101u8, 47u8, 133u8, 95u8,
+                            102u8, 202u8, 83u8, 26u8, 238u8, 47u8, 126u8, 132u8, 22u8, 11u8, 33u8,
+                            190u8, 175u8, 94u8, 58u8, 245u8, 46u8, 80u8, 195u8, 184u8, 107u8, 65u8,
                         ],
                     )
                 }
@@ -2529,10 +2528,10 @@ pub mod api {
                         "decode_session_keys",
                         types::DecodeSessionKeys { encoded },
                         [
-                            156u8, 244u8, 114u8, 80u8, 184u8, 235u8, 37u8, 160u8, 130u8, 28u8,
-                            209u8, 72u8, 5u8, 200u8, 200u8, 213u8, 216u8, 137u8, 160u8, 10u8, 6u8,
-                            238u8, 89u8, 31u8, 165u8, 174u8, 51u8, 198u8, 161u8, 156u8, 202u8,
-                            151u8,
+                            57u8, 242u8, 18u8, 51u8, 132u8, 110u8, 238u8, 255u8, 39u8, 194u8, 8u8,
+                            54u8, 198u8, 178u8, 75u8, 151u8, 148u8, 176u8, 144u8, 197u8, 87u8,
+                            29u8, 179u8, 235u8, 176u8, 78u8, 252u8, 103u8, 72u8, 203u8, 151u8,
+                            248u8,
                         ],
                     )
                 }
@@ -2630,9 +2629,9 @@ pub mod api {
                         "query_info",
                         types::QueryInfo { uxt, len },
                         [
-                            105u8, 184u8, 31u8, 255u8, 154u8, 206u8, 112u8, 245u8, 135u8, 114u8,
-                            63u8, 219u8, 244u8, 245u8, 90u8, 185u8, 99u8, 24u8, 80u8, 67u8, 29u8,
-                            137u8, 42u8, 248u8, 19u8, 227u8, 200u8, 7u8, 253u8, 118u8, 140u8, 53u8,
+                            56u8, 30u8, 174u8, 34u8, 202u8, 24u8, 177u8, 189u8, 145u8, 36u8, 1u8,
+                            156u8, 98u8, 209u8, 178u8, 49u8, 198u8, 23u8, 150u8, 173u8, 35u8,
+                            205u8, 147u8, 129u8, 42u8, 22u8, 69u8, 3u8, 129u8, 8u8, 196u8, 139u8,
                         ],
                     )
                 }
@@ -2651,10 +2650,10 @@ pub mod api {
                         "query_fee_details",
                         types::QueryFeeDetails { uxt, len },
                         [
-                            226u8, 161u8, 181u8, 195u8, 172u8, 51u8, 19u8, 162u8, 77u8, 23u8,
-                            200u8, 239u8, 132u8, 197u8, 106u8, 138u8, 122u8, 34u8, 234u8, 116u8,
-                            104u8, 181u8, 213u8, 72u8, 154u8, 44u8, 110u8, 149u8, 49u8, 16u8,
-                            223u8, 245u8,
+                            117u8, 60u8, 137u8, 159u8, 237u8, 252u8, 216u8, 238u8, 232u8, 1u8,
+                            100u8, 152u8, 26u8, 185u8, 145u8, 125u8, 68u8, 189u8, 4u8, 30u8, 125u8,
+                            7u8, 196u8, 153u8, 235u8, 51u8, 219u8, 108u8, 185u8, 254u8, 100u8,
+                            201u8,
                         ],
                     )
                 }
@@ -2668,9 +2667,10 @@ pub mod api {
                         "query_weight_to_fee",
                         types::QueryWeightToFee { weight },
                         [
-                            45u8, 47u8, 133u8, 75u8, 72u8, 23u8, 150u8, 14u8, 71u8, 36u8, 148u8,
-                            48u8, 133u8, 175u8, 154u8, 76u8, 168u8, 104u8, 47u8, 33u8, 96u8, 206u8,
-                            67u8, 133u8, 104u8, 206u8, 126u8, 53u8, 225u8, 134u8, 14u8, 140u8,
+                            206u8, 243u8, 189u8, 83u8, 231u8, 244u8, 247u8, 52u8, 126u8, 208u8,
+                            224u8, 5u8, 163u8, 108u8, 254u8, 114u8, 214u8, 156u8, 227u8, 217u8,
+                            211u8, 198u8, 121u8, 164u8, 110u8, 54u8, 181u8, 146u8, 50u8, 146u8,
+                            146u8, 23u8,
                         ],
                     )
                 }
@@ -2765,9 +2765,9 @@ pub mod api {
                         "query_call_info",
                         types::QueryCallInfo { call, len },
                         [
-                            202u8, 48u8, 37u8, 1u8, 188u8, 18u8, 83u8, 225u8, 140u8, 1u8, 106u8,
-                            66u8, 63u8, 99u8, 77u8, 121u8, 66u8, 35u8, 140u8, 165u8, 226u8, 52u8,
-                            116u8, 94u8, 203u8, 54u8, 61u8, 176u8, 230u8, 61u8, 153u8, 38u8,
+                            170u8, 193u8, 123u8, 109u8, 45u8, 225u8, 83u8, 147u8, 7u8, 212u8, 48u8,
+                            215u8, 250u8, 154u8, 224u8, 162u8, 13u8, 183u8, 118u8, 49u8, 17u8,
+                            240u8, 44u8, 5u8, 45u8, 79u8, 92u8, 242u8, 90u8, 108u8, 153u8, 21u8,
                         ],
                     )
                 }
@@ -2787,10 +2787,10 @@ pub mod api {
                         "query_call_fee_details",
                         types::QueryCallFeeDetails { call, len },
                         [
-                            43u8, 223u8, 246u8, 145u8, 202u8, 27u8, 167u8, 160u8, 65u8, 144u8,
-                            236u8, 225u8, 125u8, 96u8, 135u8, 147u8, 188u8, 242u8, 81u8, 71u8,
-                            160u8, 228u8, 51u8, 204u8, 37u8, 118u8, 174u8, 6u8, 72u8, 149u8, 212u8,
-                            61u8,
+                            236u8, 197u8, 213u8, 110u8, 238u8, 96u8, 103u8, 223u8, 24u8, 25u8,
+                            148u8, 241u8, 99u8, 170u8, 141u8, 130u8, 84u8, 28u8, 162u8, 234u8,
+                            73u8, 25u8, 137u8, 136u8, 92u8, 242u8, 39u8, 178u8, 29u8, 30u8, 208u8,
+                            146u8,
                         ],
                     )
                 }
@@ -2805,10 +2805,9 @@ pub mod api {
                         "query_weight_to_fee",
                         types::QueryWeightToFee { weight },
                         [
-                            88u8, 171u8, 36u8, 225u8, 227u8, 44u8, 19u8, 249u8, 142u8, 183u8,
-                            164u8, 31u8, 32u8, 26u8, 157u8, 81u8, 128u8, 24u8, 163u8, 191u8, 228u8,
-                            17u8, 217u8, 197u8, 135u8, 10u8, 178u8, 253u8, 155u8, 209u8, 136u8,
-                            253u8,
+                            117u8, 91u8, 94u8, 22u8, 248u8, 212u8, 15u8, 23u8, 97u8, 116u8, 64u8,
+                            228u8, 83u8, 123u8, 87u8, 77u8, 97u8, 7u8, 98u8, 181u8, 6u8, 165u8,
+                            114u8, 141u8, 164u8, 113u8, 126u8, 88u8, 174u8, 171u8, 224u8, 35u8,
                         ],
                     )
                 }
@@ -3324,9 +3323,9 @@ pub mod api {
             .hash();
         runtime_metadata_hash
             == [
-                80u8, 125u8, 154u8, 186u8, 171u8, 231u8, 42u8, 230u8, 79u8, 19u8, 171u8, 33u8,
-                197u8, 210u8, 229u8, 209u8, 209u8, 153u8, 119u8, 91u8, 12u8, 56u8, 208u8, 175u8,
-                102u8, 70u8, 20u8, 182u8, 102u8, 109u8, 97u8, 108u8,
+                204u8, 158u8, 238u8, 144u8, 220u8, 96u8, 96u8, 35u8, 147u8, 66u8, 177u8, 19u8,
+                58u8, 106u8, 24u8, 55u8, 42u8, 156u8, 131u8, 153u8, 182u8, 103u8, 67u8, 242u8,
+                32u8, 199u8, 203u8, 120u8, 169u8, 2u8, 171u8, 125u8,
             ]
     }
     pub mod system {
@@ -3566,9 +3565,10 @@ pub mod api {
                         "set_storage",
                         types::SetStorage { items },
                         [
-                            184u8, 169u8, 248u8, 68u8, 40u8, 193u8, 190u8, 151u8, 96u8, 159u8,
-                            19u8, 237u8, 241u8, 156u8, 5u8, 158u8, 191u8, 237u8, 9u8, 13u8, 86u8,
-                            213u8, 77u8, 58u8, 48u8, 139u8, 1u8, 85u8, 220u8, 233u8, 139u8, 164u8,
+                            141u8, 216u8, 52u8, 222u8, 223u8, 136u8, 123u8, 181u8, 19u8, 75u8,
+                            163u8, 102u8, 229u8, 189u8, 158u8, 142u8, 95u8, 235u8, 240u8, 49u8,
+                            150u8, 76u8, 78u8, 137u8, 126u8, 88u8, 183u8, 88u8, 231u8, 146u8,
+                            234u8, 43u8,
                         ],
                     )
                 }
@@ -3743,53 +3743,53 @@ pub mod api {
             pub struct StorageApi;
             impl StorageApi {
                 #[doc = " The full account information for a particular account ID."]
-                pub fn account(
+                pub fn account_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::frame_system::AccountInfo<
                         ::core::primitive::u32,
                         runtime_types::pallet_balances::types::AccountData<::core::primitive::u128>,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "System",
                         "Account",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            234u8, 12u8, 167u8, 96u8, 2u8, 244u8, 235u8, 62u8, 153u8, 200u8, 96u8,
-                            74u8, 135u8, 8u8, 35u8, 188u8, 146u8, 249u8, 246u8, 40u8, 224u8, 22u8,
-                            15u8, 99u8, 150u8, 222u8, 82u8, 85u8, 123u8, 123u8, 19u8, 110u8,
+                            14u8, 233u8, 115u8, 214u8, 0u8, 109u8, 222u8, 121u8, 162u8, 65u8, 60u8,
+                            175u8, 209u8, 79u8, 222u8, 124u8, 22u8, 235u8, 138u8, 176u8, 133u8,
+                            124u8, 90u8, 158u8, 85u8, 45u8, 37u8, 174u8, 47u8, 79u8, 47u8, 166u8,
                         ],
                     )
                 }
                 #[doc = " The full account information for a particular account ID."]
-                pub fn account_root(
+                pub fn account(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::frame_system::AccountInfo<
                         ::core::primitive::u32,
                         runtime_types::pallet_balances::types::AccountData<::core::primitive::u128>,
                     >,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "System",
                         "Account",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            234u8, 12u8, 167u8, 96u8, 2u8, 244u8, 235u8, 62u8, 153u8, 200u8, 96u8,
-                            74u8, 135u8, 8u8, 35u8, 188u8, 146u8, 249u8, 246u8, 40u8, 224u8, 22u8,
-                            15u8, 99u8, 150u8, 222u8, 82u8, 85u8, 123u8, 123u8, 19u8, 110u8,
+                            14u8, 233u8, 115u8, 214u8, 0u8, 109u8, 222u8, 121u8, 162u8, 65u8, 60u8,
+                            175u8, 209u8, 79u8, 222u8, 124u8, 22u8, 235u8, 138u8, 176u8, 133u8,
+                            124u8, 90u8, 158u8, 85u8, 45u8, 37u8, 174u8, 47u8, 79u8, 47u8, 166u8,
                         ],
                     )
                 }
@@ -3832,10 +3832,9 @@ pub mod api {
                         "BlockWeight",
                         vec![],
                         [
-                            52u8, 191u8, 212u8, 137u8, 26u8, 39u8, 239u8, 35u8, 182u8, 32u8, 39u8,
-                            103u8, 56u8, 184u8, 60u8, 159u8, 167u8, 232u8, 193u8, 116u8, 105u8,
-                            56u8, 98u8, 127u8, 124u8, 188u8, 214u8, 154u8, 160u8, 41u8, 20u8,
-                            162u8,
+                            158u8, 46u8, 228u8, 89u8, 210u8, 214u8, 84u8, 154u8, 50u8, 68u8, 63u8,
+                            62u8, 43u8, 42u8, 99u8, 27u8, 54u8, 42u8, 146u8, 44u8, 241u8, 216u8,
+                            229u8, 30u8, 216u8, 255u8, 165u8, 238u8, 181u8, 130u8, 36u8, 102u8,
                         ],
                     )
                 }
@@ -3862,22 +3861,19 @@ pub mod api {
                     )
                 }
                 #[doc = " Map of block numbers to block hashes."]
-                pub fn block_hash(
+                pub fn block_hash_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::subxt::utils::H256,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "System",
                         "BlockHash",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             217u8, 32u8, 215u8, 253u8, 24u8, 182u8, 207u8, 178u8, 157u8, 24u8,
                             103u8, 100u8, 195u8, 165u8, 69u8, 152u8, 112u8, 181u8, 56u8, 192u8,
@@ -3887,19 +3883,22 @@ pub mod api {
                     )
                 }
                 #[doc = " Map of block numbers to block hashes."]
-                pub fn block_hash_root(
+                pub fn block_hash(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::subxt::utils::H256,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "System",
                         "BlockHash",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             217u8, 32u8, 215u8, 253u8, 24u8, 182u8, 207u8, 178u8, 157u8, 24u8,
                             103u8, 100u8, 195u8, 165u8, 69u8, 152u8, 112u8, 181u8, 56u8, 192u8,
@@ -3909,22 +3908,19 @@ pub mod api {
                     )
                 }
                 #[doc = " Extrinsics data for the current block (maps an extrinsic's index to its data)."]
-                pub fn extrinsic_data(
+                pub fn extrinsic_data_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::std::vec::Vec<::core::primitive::u8>,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "System",
                         "ExtrinsicData",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             160u8, 180u8, 122u8, 18u8, 196u8, 26u8, 2u8, 37u8, 115u8, 232u8, 133u8,
                             220u8, 106u8, 245u8, 4u8, 129u8, 42u8, 84u8, 241u8, 45u8, 199u8, 179u8,
@@ -3933,19 +3929,22 @@ pub mod api {
                     )
                 }
                 #[doc = " Extrinsics data for the current block (maps an extrinsic's index to its data)."]
-                pub fn extrinsic_data_root(
+                pub fn extrinsic_data(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::std::vec::Vec<::core::primitive::u8>,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "System",
                         "ExtrinsicData",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             160u8, 180u8, 122u8, 18u8, 196u8, 26u8, 2u8, 37u8, 115u8, 232u8, 133u8,
                             220u8, 106u8, 245u8, 4u8, 129u8, 42u8, 84u8, 241u8, 45u8, 199u8, 179u8,
@@ -4010,10 +4009,9 @@ pub mod api {
                         "Digest",
                         vec![],
                         [
-                            70u8, 156u8, 127u8, 89u8, 115u8, 250u8, 103u8, 62u8, 185u8, 153u8,
-                            26u8, 72u8, 39u8, 226u8, 181u8, 97u8, 137u8, 225u8, 45u8, 158u8, 212u8,
-                            254u8, 142u8, 136u8, 90u8, 22u8, 243u8, 125u8, 226u8, 49u8, 235u8,
-                            215u8,
+                            61u8, 64u8, 237u8, 91u8, 145u8, 232u8, 17u8, 254u8, 181u8, 16u8, 234u8,
+                            91u8, 51u8, 140u8, 254u8, 131u8, 98u8, 135u8, 21u8, 37u8, 251u8, 20u8,
+                            58u8, 92u8, 123u8, 141u8, 14u8, 227u8, 146u8, 46u8, 222u8, 117u8,
                         ],
                     )
                 }
@@ -4043,9 +4041,9 @@ pub mod api {
                         "Events",
                         vec![],
                         [
-                            148u8, 20u8, 105u8, 64u8, 150u8, 198u8, 189u8, 131u8, 76u8, 21u8,
-                            216u8, 82u8, 49u8, 183u8, 86u8, 192u8, 110u8, 228u8, 1u8, 219u8, 222u8,
-                            216u8, 71u8, 86u8, 23u8, 199u8, 98u8, 73u8, 105u8, 52u8, 229u8, 9u8,
+                            210u8, 42u8, 79u8, 147u8, 133u8, 39u8, 183u8, 74u8, 10u8, 160u8, 71u8,
+                            241u8, 200u8, 12u8, 112u8, 165u8, 245u8, 59u8, 116u8, 151u8, 217u8,
+                            160u8, 19u8, 82u8, 237u8, 230u8, 66u8, 250u8, 71u8, 165u8, 187u8, 41u8,
                         ],
                     )
                 }
@@ -4081,26 +4079,23 @@ pub mod api {
                 #[doc = " The value has the type `(T::BlockNumber, EventIndex)` because if we used only just"]
                 #[doc = " the `EventIndex` then in case if the topic has the same contents on the next block"]
                 #[doc = " no notification will be triggered thus the event might be lost."]
-                pub fn event_topics(
+                pub fn event_topics_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::H256>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::std::vec::Vec<(::core::primitive::u32, ::core::primitive::u32)>,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "System",
                         "EventTopics",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            154u8, 29u8, 31u8, 148u8, 254u8, 7u8, 124u8, 251u8, 241u8, 77u8, 24u8,
-                            37u8, 28u8, 75u8, 205u8, 17u8, 159u8, 79u8, 239u8, 62u8, 67u8, 60u8,
-                            252u8, 112u8, 215u8, 145u8, 103u8, 170u8, 110u8, 186u8, 221u8, 76u8,
+                            40u8, 225u8, 14u8, 75u8, 44u8, 176u8, 76u8, 34u8, 143u8, 107u8, 69u8,
+                            133u8, 114u8, 13u8, 172u8, 250u8, 141u8, 73u8, 12u8, 65u8, 217u8, 63u8,
+                            120u8, 241u8, 48u8, 106u8, 143u8, 161u8, 128u8, 100u8, 166u8, 59u8,
                         ],
                     )
                 }
@@ -4114,23 +4109,26 @@ pub mod api {
                 #[doc = " The value has the type `(T::BlockNumber, EventIndex)` because if we used only just"]
                 #[doc = " the `EventIndex` then in case if the topic has the same contents on the next block"]
                 #[doc = " no notification will be triggered thus the event might be lost."]
-                pub fn event_topics_root(
+                pub fn event_topics(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::H256>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::std::vec::Vec<(::core::primitive::u32, ::core::primitive::u32)>,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "System",
                         "EventTopics",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            154u8, 29u8, 31u8, 148u8, 254u8, 7u8, 124u8, 251u8, 241u8, 77u8, 24u8,
-                            37u8, 28u8, 75u8, 205u8, 17u8, 159u8, 79u8, 239u8, 62u8, 67u8, 60u8,
-                            252u8, 112u8, 215u8, 145u8, 103u8, 170u8, 110u8, 186u8, 221u8, 76u8,
+                            40u8, 225u8, 14u8, 75u8, 44u8, 176u8, 76u8, 34u8, 143u8, 107u8, 69u8,
+                            133u8, 114u8, 13u8, 172u8, 250u8, 141u8, 73u8, 12u8, 65u8, 217u8, 63u8,
+                            120u8, 241u8, 48u8, 106u8, 143u8, 161u8, 128u8, 100u8, 166u8, 59u8,
                         ],
                     )
                 }
@@ -4235,9 +4233,9 @@ pub mod api {
                         "System",
                         "BlockWeights",
                         [
-                            238u8, 20u8, 221u8, 11u8, 146u8, 236u8, 47u8, 103u8, 8u8, 239u8, 13u8,
-                            176u8, 202u8, 10u8, 151u8, 68u8, 110u8, 162u8, 99u8, 40u8, 211u8,
-                            136u8, 71u8, 82u8, 50u8, 80u8, 244u8, 211u8, 231u8, 198u8, 36u8, 152u8,
+                            176u8, 124u8, 225u8, 136u8, 25u8, 73u8, 247u8, 33u8, 82u8, 206u8, 85u8,
+                            190u8, 127u8, 102u8, 71u8, 11u8, 185u8, 8u8, 58u8, 0u8, 94u8, 55u8,
+                            163u8, 177u8, 104u8, 59u8, 60u8, 136u8, 246u8, 116u8, 0u8, 239u8,
                         ],
                     )
                 }
@@ -4250,10 +4248,9 @@ pub mod api {
                         "System",
                         "BlockLength",
                         [
-                            117u8, 144u8, 154u8, 125u8, 106u8, 34u8, 224u8, 228u8, 80u8, 76u8,
-                            126u8, 0u8, 177u8, 223u8, 116u8, 244u8, 167u8, 23u8, 253u8, 44u8,
-                            128u8, 116u8, 155u8, 245u8, 163u8, 20u8, 21u8, 222u8, 174u8, 237u8,
-                            162u8, 240u8,
+                            23u8, 242u8, 225u8, 39u8, 225u8, 67u8, 152u8, 41u8, 155u8, 104u8, 68u8,
+                            229u8, 185u8, 133u8, 10u8, 143u8, 184u8, 152u8, 234u8, 44u8, 140u8,
+                            96u8, 166u8, 235u8, 162u8, 160u8, 72u8, 7u8, 35u8, 194u8, 3u8, 37u8,
                         ],
                     )
                 }
@@ -4281,9 +4278,10 @@ pub mod api {
                         "System",
                         "DbWeight",
                         [
-                            206u8, 53u8, 134u8, 247u8, 42u8, 38u8, 197u8, 59u8, 191u8, 83u8, 160u8,
-                            9u8, 207u8, 133u8, 108u8, 152u8, 150u8, 103u8, 109u8, 228u8, 218u8,
-                            24u8, 27u8, 210u8, 106u8, 252u8, 74u8, 93u8, 27u8, 63u8, 109u8, 252u8,
+                            42u8, 43u8, 178u8, 142u8, 243u8, 203u8, 60u8, 173u8, 118u8, 111u8,
+                            200u8, 170u8, 102u8, 70u8, 237u8, 187u8, 198u8, 120u8, 153u8, 232u8,
+                            183u8, 76u8, 74u8, 10u8, 70u8, 243u8, 14u8, 218u8, 213u8, 126u8, 29u8,
+                            177u8,
                         ],
                     )
                 }
@@ -4296,10 +4294,10 @@ pub mod api {
                         "System",
                         "Version",
                         [
-                            134u8, 0u8, 23u8, 0u8, 199u8, 213u8, 89u8, 240u8, 194u8, 186u8, 239u8,
-                            157u8, 168u8, 211u8, 223u8, 156u8, 138u8, 140u8, 194u8, 23u8, 167u8,
-                            158u8, 195u8, 233u8, 25u8, 165u8, 27u8, 237u8, 198u8, 206u8, 233u8,
-                            28u8,
+                            219u8, 45u8, 162u8, 245u8, 177u8, 246u8, 48u8, 126u8, 191u8, 157u8,
+                            228u8, 83u8, 111u8, 133u8, 183u8, 13u8, 148u8, 108u8, 92u8, 102u8,
+                            72u8, 205u8, 74u8, 242u8, 233u8, 79u8, 20u8, 170u8, 72u8, 202u8, 158u8,
+                            165u8,
                         ],
                     )
                 }
@@ -4480,10 +4478,9 @@ pub mod api {
                             call: ::std::boxed::Box::new(call),
                         },
                         [
-                            223u8, 106u8, 140u8, 197u8, 207u8, 197u8, 88u8, 231u8, 138u8, 226u8,
-                            212u8, 83u8, 231u8, 81u8, 145u8, 192u8, 16u8, 141u8, 58u8, 125u8,
-                            161u8, 216u8, 105u8, 181u8, 103u8, 165u8, 185u8, 184u8, 250u8, 113u8,
-                            81u8, 88u8,
+                            92u8, 46u8, 52u8, 78u8, 196u8, 242u8, 244u8, 47u8, 156u8, 9u8, 196u8,
+                            80u8, 247u8, 6u8, 211u8, 137u8, 24u8, 65u8, 148u8, 11u8, 137u8, 34u8,
+                            151u8, 180u8, 180u8, 80u8, 45u8, 35u8, 217u8, 229u8, 58u8, 189u8,
                         ],
                     )
                 }
@@ -4498,10 +4495,10 @@ pub mod api {
                         "cancel",
                         types::Cancel { when, index },
                         [
-                            32u8, 107u8, 14u8, 102u8, 56u8, 200u8, 68u8, 186u8, 192u8, 100u8,
-                            152u8, 124u8, 171u8, 154u8, 230u8, 115u8, 62u8, 140u8, 88u8, 178u8,
-                            119u8, 210u8, 222u8, 31u8, 134u8, 225u8, 133u8, 241u8, 42u8, 110u8,
-                            147u8, 47u8,
+                            183u8, 204u8, 143u8, 86u8, 17u8, 130u8, 132u8, 91u8, 133u8, 168u8,
+                            103u8, 129u8, 114u8, 56u8, 123u8, 42u8, 123u8, 120u8, 221u8, 211u8,
+                            26u8, 85u8, 82u8, 246u8, 192u8, 39u8, 254u8, 45u8, 147u8, 56u8, 178u8,
+                            133u8,
                         ],
                     )
                 }
@@ -4528,10 +4525,9 @@ pub mod api {
                             call: ::std::boxed::Box::new(call),
                         },
                         [
-                            146u8, 113u8, 28u8, 221u8, 67u8, 198u8, 215u8, 187u8, 217u8, 81u8,
-                            119u8, 41u8, 99u8, 182u8, 79u8, 222u8, 249u8, 116u8, 75u8, 103u8, 62u8,
-                            147u8, 145u8, 104u8, 74u8, 214u8, 193u8, 158u8, 119u8, 102u8, 249u8,
-                            53u8,
+                            64u8, 134u8, 161u8, 186u8, 121u8, 202u8, 68u8, 221u8, 62u8, 87u8, 15u8,
+                            15u8, 229u8, 123u8, 173u8, 45u8, 13u8, 193u8, 185u8, 156u8, 141u8,
+                            208u8, 147u8, 72u8, 212u8, 82u8, 54u8, 73u8, 87u8, 13u8, 139u8, 201u8,
                         ],
                     )
                 }
@@ -4572,9 +4568,9 @@ pub mod api {
                             call: ::std::boxed::Box::new(call),
                         },
                         [
-                            215u8, 163u8, 5u8, 200u8, 192u8, 189u8, 157u8, 143u8, 141u8, 134u8,
-                            163u8, 0u8, 86u8, 31u8, 196u8, 206u8, 48u8, 162u8, 54u8, 252u8, 24u8,
-                            119u8, 62u8, 25u8, 1u8, 27u8, 44u8, 115u8, 48u8, 70u8, 136u8, 103u8,
+                            135u8, 194u8, 167u8, 15u8, 118u8, 34u8, 13u8, 0u8, 235u8, 218u8, 99u8,
+                            7u8, 147u8, 64u8, 250u8, 222u8, 16u8, 175u8, 35u8, 159u8, 223u8, 168u8,
+                            158u8, 109u8, 93u8, 165u8, 24u8, 143u8, 59u8, 164u8, 116u8, 136u8,
                         ],
                     )
                 }
@@ -4601,10 +4597,9 @@ pub mod api {
                             call: ::std::boxed::Box::new(call),
                         },
                         [
-                            45u8, 227u8, 228u8, 121u8, 89u8, 64u8, 235u8, 180u8, 113u8, 232u8,
-                            225u8, 66u8, 211u8, 234u8, 137u8, 122u8, 248u8, 183u8, 192u8, 187u8,
-                            26u8, 128u8, 69u8, 54u8, 90u8, 103u8, 209u8, 185u8, 213u8, 158u8,
-                            224u8, 92u8,
+                            66u8, 174u8, 223u8, 142u8, 132u8, 198u8, 68u8, 104u8, 186u8, 93u8,
+                            36u8, 11u8, 130u8, 199u8, 43u8, 42u8, 232u8, 79u8, 61u8, 98u8, 177u8,
+                            224u8, 148u8, 53u8, 146u8, 96u8, 104u8, 198u8, 126u8, 83u8, 155u8, 7u8,
                         ],
                     )
                 }
@@ -4755,9 +4750,8 @@ pub mod api {
                     )
                 }
                 #[doc = " Items to be executed, indexed by the block number that they should be executed on."]
-                pub fn agenda(
+                pub fn agenda_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<
@@ -4773,26 +4767,26 @@ pub mod api {
                             >,
                         >,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Scheduler",
                         "Agenda",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            209u8, 79u8, 142u8, 79u8, 230u8, 98u8, 182u8, 113u8, 13u8, 147u8,
-                            144u8, 21u8, 255u8, 211u8, 76u8, 71u8, 3u8, 104u8, 97u8, 108u8, 137u8,
-                            63u8, 32u8, 239u8, 90u8, 143u8, 3u8, 61u8, 57u8, 20u8, 17u8, 30u8,
+                            251u8, 39u8, 160u8, 19u8, 63u8, 135u8, 130u8, 64u8, 254u8, 182u8,
+                            210u8, 143u8, 162u8, 252u8, 114u8, 186u8, 94u8, 180u8, 155u8, 251u8,
+                            4u8, 194u8, 207u8, 194u8, 165u8, 164u8, 164u8, 162u8, 223u8, 50u8,
+                            221u8, 69u8,
                         ],
                     )
                 }
                 #[doc = " Items to be executed, indexed by the block number that they should be executed on."]
-                pub fn agenda_root(
+                pub fn agenda(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<
@@ -4808,18 +4802,21 @@ pub mod api {
                             >,
                         >,
                     >,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Scheduler",
                         "Agenda",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            209u8, 79u8, 142u8, 79u8, 230u8, 98u8, 182u8, 113u8, 13u8, 147u8,
-                            144u8, 21u8, 255u8, 211u8, 76u8, 71u8, 3u8, 104u8, 97u8, 108u8, 137u8,
-                            63u8, 32u8, 239u8, 90u8, 143u8, 3u8, 61u8, 57u8, 20u8, 17u8, 30u8,
+                            251u8, 39u8, 160u8, 19u8, 63u8, 135u8, 130u8, 64u8, 254u8, 182u8,
+                            210u8, 143u8, 162u8, 252u8, 114u8, 186u8, 94u8, 180u8, 155u8, 251u8,
+                            4u8, 194u8, 207u8, 194u8, 165u8, 164u8, 164u8, 162u8, 223u8, 50u8,
+                            221u8, 69u8,
                         ],
                     )
                 }
@@ -4827,27 +4824,23 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " For v3 -> v4 the previously unbounded identities are Blake2-256 hashed to form the v4"]
                 #[doc = " identities."]
-                pub fn lookup(
+                pub fn lookup_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<[::core::primitive::u8; 32usize]>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     (::core::primitive::u32, ::core::primitive::u32),
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Scheduler",
                         "Lookup",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            157u8, 102u8, 210u8, 65u8, 190u8, 48u8, 168u8, 20u8, 197u8, 184u8,
-                            74u8, 119u8, 176u8, 22u8, 244u8, 186u8, 231u8, 239u8, 97u8, 175u8,
-                            34u8, 133u8, 165u8, 73u8, 223u8, 113u8, 78u8, 150u8, 83u8, 127u8,
-                            126u8, 204u8,
+                            24u8, 87u8, 96u8, 127u8, 136u8, 205u8, 238u8, 174u8, 71u8, 110u8, 65u8,
+                            98u8, 228u8, 167u8, 99u8, 71u8, 171u8, 186u8, 12u8, 218u8, 137u8, 70u8,
+                            70u8, 228u8, 153u8, 111u8, 165u8, 114u8, 229u8, 136u8, 118u8, 131u8,
                         ],
                     )
                 }
@@ -4855,24 +4848,26 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " For v3 -> v4 the previously unbounded identities are Blake2-256 hashed to form the v4"]
                 #[doc = " identities."]
-                pub fn lookup_root(
+                pub fn lookup(
                     &self,
+                    _0: impl ::std::borrow::Borrow<[::core::primitive::u8; 32usize]>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     (::core::primitive::u32, ::core::primitive::u32),
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Scheduler",
                         "Lookup",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            157u8, 102u8, 210u8, 65u8, 190u8, 48u8, 168u8, 20u8, 197u8, 184u8,
-                            74u8, 119u8, 176u8, 22u8, 244u8, 186u8, 231u8, 239u8, 97u8, 175u8,
-                            34u8, 133u8, 165u8, 73u8, 223u8, 113u8, 78u8, 150u8, 83u8, 127u8,
-                            126u8, 204u8,
+                            24u8, 87u8, 96u8, 127u8, 136u8, 205u8, 238u8, 174u8, 71u8, 110u8, 65u8,
+                            98u8, 228u8, 167u8, 99u8, 71u8, 171u8, 186u8, 12u8, 218u8, 137u8, 70u8,
+                            70u8, 228u8, 153u8, 111u8, 165u8, 114u8, 229u8, 136u8, 118u8, 131u8,
                         ],
                     )
                 }
@@ -4891,9 +4886,10 @@ pub mod api {
                         "Scheduler",
                         "MaximumWeight",
                         [
-                            222u8, 183u8, 203u8, 169u8, 31u8, 134u8, 28u8, 12u8, 47u8, 140u8, 71u8,
-                            74u8, 61u8, 55u8, 71u8, 236u8, 215u8, 83u8, 28u8, 70u8, 45u8, 128u8,
-                            184u8, 57u8, 101u8, 83u8, 42u8, 165u8, 34u8, 155u8, 64u8, 145u8,
+                            149u8, 252u8, 129u8, 80u8, 169u8, 36u8, 79u8, 127u8, 240u8, 156u8,
+                            56u8, 202u8, 219u8, 86u8, 5u8, 65u8, 245u8, 148u8, 138u8, 243u8, 210u8,
+                            128u8, 234u8, 216u8, 240u8, 219u8, 123u8, 235u8, 21u8, 158u8, 237u8,
+                            112u8,
                         ],
                     )
                 }
@@ -5134,6 +5130,31 @@ pub mod api {
             use super::runtime_types;
             pub struct StorageApi;
             impl StorageApi {
+                #[doc = " The request status of a given hash."]
+                pub fn status_for_iter(
+                    &self,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    runtime_types::pallet_preimage::RequestStatus<
+                        ::subxt::utils::AccountId32,
+                        ::core::primitive::u128,
+                    >,
+                    (),
+                    (),
+                    ::subxt::storage::address::Yes,
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "Preimage",
+                        "StatusFor",
+                        vec![],
+                        [
+                            187u8, 100u8, 54u8, 112u8, 96u8, 129u8, 36u8, 149u8, 127u8, 226u8,
+                            126u8, 171u8, 72u8, 189u8, 59u8, 126u8, 204u8, 125u8, 67u8, 204u8,
+                            231u8, 6u8, 212u8, 135u8, 166u8, 252u8, 5u8, 46u8, 111u8, 120u8, 54u8,
+                            209u8,
+                        ],
+                    )
+                }
                 #[doc = " The request status of a given hash."]
                 pub fn status_for(
                     &self,
@@ -5146,7 +5167,7 @@ pub mod api {
                     >,
                     ::subxt::storage::address::Yes,
                     (),
-                    ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Preimage",
@@ -5155,21 +5176,19 @@ pub mod api {
                             _0.borrow(),
                         )],
                         [
-                            176u8, 174u8, 255u8, 131u8, 156u8, 64u8, 181u8, 119u8, 81u8, 243u8,
-                            144u8, 55u8, 19u8, 140u8, 119u8, 30u8, 210u8, 112u8, 201u8, 247u8,
-                            13u8, 19u8, 120u8, 190u8, 253u8, 89u8, 4u8, 109u8, 122u8, 62u8, 87u8,
-                            186u8,
+                            187u8, 100u8, 54u8, 112u8, 96u8, 129u8, 36u8, 149u8, 127u8, 226u8,
+                            126u8, 171u8, 72u8, 189u8, 59u8, 126u8, 204u8, 125u8, 67u8, 204u8,
+                            231u8, 6u8, 212u8, 135u8, 166u8, 252u8, 5u8, 46u8, 111u8, 120u8, 54u8,
+                            209u8,
                         ],
                     )
                 }
-                #[doc = " The request status of a given hash."]
-                pub fn status_for_root(
+                pub fn preimage_for_iter(
                     &self,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
-                    runtime_types::pallet_preimage::RequestStatus<
-                        ::subxt::utils::AccountId32,
-                        ::core::primitive::u128,
+                    runtime_types::bounded_collections::bounded_vec::BoundedVec<
+                        ::core::primitive::u8,
                     >,
                     (),
                     (),
@@ -5177,62 +5196,67 @@ pub mod api {
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Preimage",
-                        "StatusFor",
-                        Vec::new(),
+                        "PreimageFor",
+                        vec![],
                         [
-                            176u8, 174u8, 255u8, 131u8, 156u8, 64u8, 181u8, 119u8, 81u8, 243u8,
-                            144u8, 55u8, 19u8, 140u8, 119u8, 30u8, 210u8, 112u8, 201u8, 247u8,
-                            13u8, 19u8, 120u8, 190u8, 253u8, 89u8, 4u8, 109u8, 122u8, 62u8, 87u8,
-                            186u8,
+                            106u8, 5u8, 17u8, 46u8, 6u8, 184u8, 177u8, 113u8, 169u8, 34u8, 119u8,
+                            141u8, 117u8, 40u8, 30u8, 94u8, 187u8, 35u8, 206u8, 216u8, 143u8,
+                            208u8, 49u8, 156u8, 200u8, 255u8, 109u8, 200u8, 210u8, 134u8, 24u8,
+                            139u8,
                         ],
                     )
                 }
-                pub fn preimage_for(
+                pub fn preimage_for_iter1(
                     &self,
                     _0: impl ::std::borrow::Borrow<::subxt::utils::H256>,
-                    _1: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<
                         ::core::primitive::u8,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Preimage",
                         "PreimageFor",
-                        vec![
-                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
-                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
-                        ],
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            20u8, 5u8, 33u8, 71u8, 153u8, 129u8, 98u8, 23u8, 214u8, 138u8, 96u8,
-                            113u8, 245u8, 128u8, 51u8, 55u8, 123u8, 218u8, 165u8, 247u8, 14u8,
-                            104u8, 119u8, 87u8, 71u8, 222u8, 200u8, 103u8, 58u8, 10u8, 97u8, 134u8,
+                            106u8, 5u8, 17u8, 46u8, 6u8, 184u8, 177u8, 113u8, 169u8, 34u8, 119u8,
+                            141u8, 117u8, 40u8, 30u8, 94u8, 187u8, 35u8, 206u8, 216u8, 143u8,
+                            208u8, 49u8, 156u8, 200u8, 255u8, 109u8, 200u8, 210u8, 134u8, 24u8,
+                            139u8,
                         ],
                     )
                 }
-                pub fn preimage_for_root(
+                pub fn preimage_for(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::H256>,
+                    _1: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<
                         ::core::primitive::u8,
                     >,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Preimage",
                         "PreimageFor",
-                        Vec::new(),
+                        vec![
+                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
+                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
+                        ],
                         [
-                            20u8, 5u8, 33u8, 71u8, 153u8, 129u8, 98u8, 23u8, 214u8, 138u8, 96u8,
-                            113u8, 245u8, 128u8, 51u8, 55u8, 123u8, 218u8, 165u8, 247u8, 14u8,
-                            104u8, 119u8, 87u8, 71u8, 222u8, 200u8, 103u8, 58u8, 10u8, 97u8, 134u8,
+                            106u8, 5u8, 17u8, 46u8, 6u8, 184u8, 177u8, 113u8, 169u8, 34u8, 119u8,
+                            141u8, 117u8, 40u8, 30u8, 94u8, 187u8, 35u8, 206u8, 216u8, 143u8,
+                            208u8, 49u8, 156u8, 200u8, 255u8, 109u8, 200u8, 210u8, 134u8, 24u8,
+                            139u8,
                         ],
                     )
                 }
@@ -5344,9 +5368,10 @@ pub mod api {
                             key_owner_proof,
                         },
                         [
-                            112u8, 178u8, 160u8, 11u8, 51u8, 221u8, 60u8, 95u8, 15u8, 167u8, 168u8,
-                            70u8, 155u8, 189u8, 58u8, 243u8, 79u8, 173u8, 99u8, 82u8, 251u8, 179u8,
-                            132u8, 84u8, 12u8, 32u8, 191u8, 217u8, 116u8, 65u8, 86u8, 123u8,
+                            37u8, 70u8, 151u8, 149u8, 231u8, 197u8, 226u8, 88u8, 38u8, 138u8,
+                            147u8, 164u8, 250u8, 117u8, 156u8, 178u8, 44u8, 20u8, 123u8, 33u8,
+                            11u8, 106u8, 56u8, 122u8, 90u8, 11u8, 15u8, 219u8, 245u8, 18u8, 171u8,
+                            90u8,
                         ],
                     )
                 }
@@ -5370,10 +5395,9 @@ pub mod api {
                             key_owner_proof,
                         },
                         [
-                            155u8, 41u8, 95u8, 173u8, 63u8, 104u8, 36u8, 189u8, 159u8, 197u8,
-                            201u8, 219u8, 89u8, 137u8, 114u8, 123u8, 200u8, 209u8, 69u8, 124u8,
-                            253u8, 170u8, 159u8, 144u8, 12u8, 166u8, 159u8, 231u8, 223u8, 243u8,
-                            103u8, 121u8,
+                            179u8, 248u8, 80u8, 171u8, 220u8, 8u8, 75u8, 215u8, 121u8, 151u8,
+                            255u8, 4u8, 6u8, 54u8, 141u8, 244u8, 111u8, 156u8, 183u8, 19u8, 192u8,
+                            195u8, 79u8, 53u8, 0u8, 170u8, 120u8, 227u8, 186u8, 45u8, 48u8, 57u8,
                         ],
                     )
                 }
@@ -5387,10 +5411,10 @@ pub mod api {
                         "plan_config_change",
                         types::PlanConfigChange { config },
                         [
-                            165u8, 26u8, 134u8, 130u8, 137u8, 42u8, 127u8, 161u8, 117u8, 251u8,
-                            215u8, 241u8, 69u8, 224u8, 134u8, 1u8, 187u8, 203u8, 168u8, 139u8,
-                            121u8, 243u8, 235u8, 223u8, 135u8, 128u8, 227u8, 129u8, 183u8, 51u8,
-                            135u8, 79u8,
+                            227u8, 155u8, 182u8, 231u8, 240u8, 107u8, 30u8, 22u8, 15u8, 52u8,
+                            172u8, 203u8, 115u8, 47u8, 6u8, 66u8, 170u8, 231u8, 186u8, 77u8, 19u8,
+                            235u8, 91u8, 136u8, 95u8, 149u8, 188u8, 163u8, 161u8, 109u8, 164u8,
+                            179u8,
                         ],
                     )
                 }
@@ -5538,10 +5562,9 @@ pub mod api {
                         "PendingEpochConfigChange",
                         vec![],
                         [
-                            71u8, 143u8, 197u8, 44u8, 242u8, 120u8, 71u8, 244u8, 41u8, 201u8,
-                            132u8, 103u8, 96u8, 23u8, 111u8, 232u8, 30u8, 35u8, 154u8, 251u8,
-                            183u8, 23u8, 144u8, 80u8, 101u8, 117u8, 43u8, 228u8, 174u8, 221u8,
-                            183u8, 165u8,
+                            79u8, 216u8, 84u8, 210u8, 83u8, 149u8, 122u8, 160u8, 159u8, 164u8,
+                            16u8, 134u8, 154u8, 104u8, 77u8, 254u8, 139u8, 18u8, 163u8, 59u8, 92u8,
+                            9u8, 135u8, 141u8, 147u8, 86u8, 44u8, 95u8, 183u8, 101u8, 11u8, 58u8,
                         ],
                     )
                 }
@@ -5622,24 +5645,21 @@ pub mod api {
                     )
                 }
                 #[doc = " TWOX-NOTE: `SegmentIndex` is an increasing integer, so this is okay."]
-                pub fn under_construction(
+                pub fn under_construction_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<
                         [::core::primitive::u8; 32usize],
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Babe",
                         "UnderConstruction",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             120u8, 120u8, 59u8, 247u8, 50u8, 6u8, 220u8, 14u8, 2u8, 76u8, 203u8,
                             244u8, 232u8, 144u8, 253u8, 191u8, 101u8, 35u8, 99u8, 85u8, 111u8,
@@ -5648,21 +5668,24 @@ pub mod api {
                     )
                 }
                 #[doc = " TWOX-NOTE: `SegmentIndex` is an increasing integer, so this is okay."]
-                pub fn under_construction_root(
+                pub fn under_construction(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<
                         [::core::primitive::u8; 32usize],
                     >,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Babe",
                         "UnderConstruction",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             120u8, 120u8, 59u8, 247u8, 50u8, 6u8, 220u8, 14u8, 2u8, 76u8, 203u8,
                             244u8, 232u8, 144u8, 253u8, 191u8, 101u8, 35u8, 99u8, 85u8, 111u8,
@@ -5686,9 +5709,9 @@ pub mod api {
                         "Initialized",
                         vec![],
                         [
-                            61u8, 100u8, 12u8, 43u8, 50u8, 166u8, 173u8, 130u8, 86u8, 36u8, 92u8,
-                            221u8, 44u8, 235u8, 241u8, 150u8, 231u8, 108u8, 15u8, 134u8, 12u8, 6u8,
-                            198u8, 102u8, 63u8, 69u8, 201u8, 171u8, 14u8, 135u8, 254u8, 239u8,
+                            137u8, 31u8, 4u8, 130u8, 35u8, 232u8, 67u8, 108u8, 17u8, 123u8, 26u8,
+                            96u8, 238u8, 95u8, 138u8, 208u8, 163u8, 83u8, 218u8, 143u8, 8u8, 119u8,
+                            138u8, 130u8, 9u8, 194u8, 92u8, 40u8, 7u8, 89u8, 53u8, 237u8,
                         ],
                     )
                 }
@@ -5736,10 +5759,10 @@ pub mod api {
                         "EpochStart",
                         vec![],
                         [
-                            246u8, 69u8, 165u8, 217u8, 181u8, 138u8, 201u8, 64u8, 251u8, 121u8,
-                            50u8, 231u8, 221u8, 144u8, 225u8, 249u8, 42u8, 135u8, 31u8, 136u8,
-                            21u8, 160u8, 186u8, 148u8, 139u8, 232u8, 182u8, 121u8, 82u8, 110u8,
-                            14u8, 160u8,
+                            144u8, 133u8, 140u8, 56u8, 241u8, 203u8, 199u8, 123u8, 244u8, 126u8,
+                            196u8, 151u8, 214u8, 204u8, 243u8, 244u8, 210u8, 198u8, 174u8, 126u8,
+                            200u8, 236u8, 248u8, 190u8, 181u8, 152u8, 113u8, 224u8, 95u8, 234u8,
+                            169u8, 14u8,
                         ],
                     )
                 }
@@ -5785,10 +5808,10 @@ pub mod api {
                         "EpochConfig",
                         vec![],
                         [
-                            23u8, 188u8, 70u8, 119u8, 36u8, 199u8, 230u8, 191u8, 131u8, 219u8,
-                            85u8, 201u8, 237u8, 70u8, 214u8, 149u8, 212u8, 94u8, 87u8, 87u8, 62u8,
-                            16u8, 46u8, 143u8, 73u8, 169u8, 42u8, 139u8, 157u8, 139u8, 190u8,
-                            166u8,
+                            151u8, 58u8, 93u8, 2u8, 19u8, 98u8, 41u8, 144u8, 241u8, 70u8, 195u8,
+                            37u8, 126u8, 241u8, 111u8, 65u8, 16u8, 228u8, 111u8, 220u8, 241u8,
+                            215u8, 179u8, 235u8, 122u8, 88u8, 92u8, 95u8, 131u8, 252u8, 236u8,
+                            46u8,
                         ],
                     )
                 }
@@ -5808,9 +5831,10 @@ pub mod api {
                         "NextEpochConfig",
                         vec![],
                         [
-                            35u8, 132u8, 198u8, 33u8, 167u8, 69u8, 180u8, 215u8, 207u8, 40u8, 35u8,
-                            78u8, 167u8, 22u8, 32u8, 246u8, 111u8, 207u8, 88u8, 13u8, 28u8, 86u8,
-                            220u8, 102u8, 35u8, 105u8, 160u8, 163u8, 13u8, 99u8, 142u8, 69u8,
+                            65u8, 54u8, 74u8, 141u8, 193u8, 124u8, 130u8, 238u8, 106u8, 27u8,
+                            221u8, 189u8, 103u8, 53u8, 39u8, 243u8, 212u8, 216u8, 75u8, 185u8,
+                            104u8, 220u8, 70u8, 108u8, 87u8, 172u8, 201u8, 185u8, 39u8, 55u8,
+                            145u8, 6u8,
                         ],
                     )
                 }
@@ -6160,9 +6184,10 @@ pub mod api {
                         "transfer",
                         types::Transfer { new, index },
                         [
-                            177u8, 21u8, 139u8, 124u8, 88u8, 41u8, 95u8, 240u8, 196u8, 208u8, 48u8,
-                            105u8, 251u8, 100u8, 207u8, 144u8, 101u8, 101u8, 2u8, 161u8, 134u8,
-                            91u8, 194u8, 8u8, 254u8, 110u8, 58u8, 21u8, 57u8, 112u8, 11u8, 217u8,
+                            121u8, 156u8, 174u8, 248u8, 72u8, 126u8, 99u8, 188u8, 71u8, 134u8,
+                            107u8, 147u8, 139u8, 139u8, 57u8, 198u8, 17u8, 241u8, 142u8, 64u8,
+                            16u8, 121u8, 249u8, 146u8, 24u8, 86u8, 78u8, 187u8, 38u8, 146u8, 96u8,
+                            218u8,
                         ],
                     )
                 }
@@ -6195,10 +6220,10 @@ pub mod api {
                         "force_transfer",
                         types::ForceTransfer { new, index, freeze },
                         [
-                            155u8, 118u8, 154u8, 203u8, 130u8, 145u8, 83u8, 132u8, 42u8, 145u8,
-                            210u8, 241u8, 217u8, 31u8, 126u8, 114u8, 2u8, 31u8, 210u8, 5u8, 93u8,
-                            57u8, 122u8, 238u8, 151u8, 244u8, 234u8, 251u8, 5u8, 153u8, 217u8,
-                            204u8,
+                            137u8, 128u8, 43u8, 135u8, 129u8, 169u8, 162u8, 136u8, 175u8, 31u8,
+                            161u8, 120u8, 15u8, 176u8, 203u8, 23u8, 107u8, 31u8, 135u8, 200u8,
+                            221u8, 186u8, 162u8, 229u8, 238u8, 82u8, 192u8, 122u8, 136u8, 6u8,
+                            176u8, 42u8,
                         ],
                     )
                 }
@@ -6288,9 +6313,8 @@ pub mod api {
             pub struct StorageApi;
             impl StorageApi {
                 #[doc = " The lookup from index to account."]
-                pub fn accounts(
+                pub fn accounts_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     (
@@ -6298,16 +6322,14 @@ pub mod api {
                         ::core::primitive::u128,
                         ::core::primitive::bool,
                     ),
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Indices",
                         "Accounts",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             48u8, 189u8, 43u8, 119u8, 32u8, 168u8, 28u8, 12u8, 245u8, 81u8, 119u8,
                             182u8, 23u8, 201u8, 33u8, 147u8, 128u8, 171u8, 155u8, 134u8, 71u8,
@@ -6317,8 +6339,9 @@ pub mod api {
                     )
                 }
                 #[doc = " The lookup from index to account."]
-                pub fn accounts_root(
+                pub fn accounts(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     (
@@ -6326,14 +6349,16 @@ pub mod api {
                         ::core::primitive::u128,
                         ::core::primitive::bool,
                     ),
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Indices",
                         "Accounts",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             48u8, 189u8, 43u8, 119u8, 32u8, 168u8, 28u8, 12u8, 245u8, 81u8, 119u8,
                             182u8, 23u8, 201u8, 33u8, 147u8, 128u8, 171u8, 155u8, 134u8, 71u8,
@@ -6560,9 +6585,10 @@ pub mod api {
                         "transfer_allow_death",
                         types::TransferAllowDeath { dest, value },
                         [
-                            113u8, 146u8, 7u8, 108u8, 132u8, 222u8, 204u8, 107u8, 142u8, 47u8,
-                            46u8, 72u8, 140u8, 22u8, 128u8, 135u8, 132u8, 10u8, 116u8, 41u8, 253u8,
-                            65u8, 140u8, 1u8, 50u8, 153u8, 47u8, 243u8, 210u8, 62u8, 23u8, 181u8,
+                            51u8, 166u8, 195u8, 10u8, 139u8, 218u8, 55u8, 130u8, 6u8, 194u8, 35u8,
+                            140u8, 27u8, 205u8, 214u8, 222u8, 102u8, 43u8, 143u8, 145u8, 86u8,
+                            219u8, 210u8, 147u8, 13u8, 39u8, 51u8, 21u8, 237u8, 179u8, 132u8,
+                            130u8,
                         ],
                     )
                 }
@@ -6582,9 +6608,9 @@ pub mod api {
                             old_reserved,
                         },
                         [
-                            43u8, 86u8, 149u8, 26u8, 133u8, 41u8, 43u8, 16u8, 98u8, 65u8, 244u8,
-                            123u8, 233u8, 146u8, 76u8, 116u8, 48u8, 164u8, 23u8, 211u8, 42u8,
-                            111u8, 245u8, 16u8, 54u8, 92u8, 163u8, 66u8, 193u8, 58u8, 58u8, 185u8,
+                            125u8, 171u8, 21u8, 186u8, 108u8, 185u8, 241u8, 145u8, 125u8, 8u8,
+                            12u8, 42u8, 96u8, 114u8, 80u8, 80u8, 227u8, 76u8, 20u8, 208u8, 93u8,
+                            219u8, 36u8, 50u8, 209u8, 155u8, 70u8, 45u8, 6u8, 57u8, 156u8, 77u8,
                         ],
                     )
                 }
@@ -6604,10 +6630,9 @@ pub mod api {
                             value,
                         },
                         [
-                            105u8, 201u8, 253u8, 250u8, 151u8, 193u8, 29u8, 188u8, 132u8, 138u8,
-                            84u8, 243u8, 170u8, 22u8, 169u8, 161u8, 202u8, 233u8, 79u8, 122u8,
-                            77u8, 198u8, 84u8, 149u8, 151u8, 238u8, 174u8, 179u8, 201u8, 150u8,
-                            184u8, 20u8,
+                            154u8, 93u8, 222u8, 27u8, 12u8, 248u8, 63u8, 213u8, 224u8, 86u8, 250u8,
+                            153u8, 249u8, 102u8, 83u8, 160u8, 79u8, 125u8, 105u8, 222u8, 77u8,
+                            180u8, 90u8, 105u8, 81u8, 217u8, 60u8, 25u8, 213u8, 51u8, 185u8, 96u8,
                         ],
                     )
                 }
@@ -6622,10 +6647,9 @@ pub mod api {
                         "transfer_keep_alive",
                         types::TransferKeepAlive { dest, value },
                         [
-                            31u8, 197u8, 106u8, 219u8, 164u8, 234u8, 37u8, 214u8, 112u8, 211u8,
-                            149u8, 238u8, 162u8, 234u8, 226u8, 11u8, 182u8, 178u8, 182u8, 19u8,
-                            43u8, 172u8, 122u8, 175u8, 16u8, 253u8, 193u8, 116u8, 199u8, 158u8,
-                            255u8, 188u8,
+                            245u8, 14u8, 190u8, 193u8, 32u8, 210u8, 74u8, 92u8, 25u8, 182u8, 76u8,
+                            55u8, 247u8, 83u8, 114u8, 75u8, 143u8, 236u8, 117u8, 25u8, 54u8, 157u8,
+                            208u8, 207u8, 233u8, 89u8, 70u8, 161u8, 235u8, 242u8, 222u8, 59u8,
                         ],
                     )
                 }
@@ -6640,9 +6664,9 @@ pub mod api {
                         "transfer_all",
                         types::TransferAll { dest, keep_alive },
                         [
-                            167u8, 120u8, 58u8, 200u8, 65u8, 248u8, 240u8, 141u8, 208u8, 240u8,
-                            89u8, 13u8, 62u8, 169u8, 228u8, 29u8, 219u8, 56u8, 137u8, 224u8, 16u8,
-                            111u8, 13u8, 65u8, 65u8, 84u8, 123u8, 173u8, 12u8, 82u8, 101u8, 226u8,
+                            105u8, 132u8, 49u8, 144u8, 195u8, 250u8, 34u8, 46u8, 213u8, 248u8,
+                            112u8, 188u8, 81u8, 228u8, 136u8, 18u8, 67u8, 172u8, 37u8, 38u8, 238u8,
+                            9u8, 34u8, 15u8, 67u8, 34u8, 148u8, 195u8, 223u8, 29u8, 154u8, 6u8,
                         ],
                     )
                 }
@@ -6657,9 +6681,10 @@ pub mod api {
                         "force_unreserve",
                         types::ForceUnreserve { who, amount },
                         [
-                            244u8, 207u8, 86u8, 147u8, 199u8, 152u8, 130u8, 38u8, 248u8, 32u8,
-                            97u8, 0u8, 243u8, 58u8, 74u8, 238u8, 68u8, 144u8, 213u8, 168u8, 21u8,
-                            151u8, 62u8, 78u8, 8u8, 159u8, 89u8, 1u8, 255u8, 23u8, 83u8, 18u8,
+                            142u8, 151u8, 64u8, 205u8, 46u8, 64u8, 62u8, 122u8, 108u8, 49u8, 223u8,
+                            140u8, 120u8, 153u8, 35u8, 165u8, 187u8, 38u8, 157u8, 200u8, 123u8,
+                            199u8, 198u8, 168u8, 208u8, 159u8, 39u8, 134u8, 92u8, 103u8, 84u8,
+                            171u8,
                         ],
                     )
                 }
@@ -6690,9 +6715,10 @@ pub mod api {
                         "transfer",
                         types::Transfer { dest, value },
                         [
-                            155u8, 139u8, 211u8, 134u8, 163u8, 226u8, 249u8, 125u8, 15u8, 236u8,
-                            254u8, 100u8, 49u8, 104u8, 68u8, 71u8, 121u8, 120u8, 66u8, 159u8, 49u8,
-                            1u8, 125u8, 223u8, 43u8, 174u8, 19u8, 186u8, 110u8, 190u8, 87u8, 6u8,
+                            154u8, 145u8, 140u8, 54u8, 50u8, 123u8, 225u8, 249u8, 200u8, 217u8,
+                            172u8, 110u8, 233u8, 198u8, 77u8, 198u8, 211u8, 89u8, 8u8, 13u8, 240u8,
+                            94u8, 28u8, 13u8, 242u8, 217u8, 168u8, 23u8, 106u8, 254u8, 249u8,
+                            120u8,
                         ],
                     )
                 }
@@ -6707,9 +6733,9 @@ pub mod api {
                         "force_set_balance",
                         types::ForceSetBalance { who, new_free },
                         [
-                            22u8, 6u8, 147u8, 252u8, 116u8, 39u8, 228u8, 198u8, 229u8, 92u8, 141u8,
-                            236u8, 192u8, 108u8, 45u8, 242u8, 100u8, 148u8, 47u8, 5u8, 249u8, 49u8,
-                            81u8, 156u8, 81u8, 79u8, 216u8, 6u8, 15u8, 192u8, 97u8, 65u8,
+                            114u8, 229u8, 59u8, 204u8, 180u8, 83u8, 17u8, 4u8, 59u8, 4u8, 55u8,
+                            39u8, 151u8, 196u8, 124u8, 60u8, 209u8, 65u8, 193u8, 11u8, 44u8, 164u8,
+                            116u8, 93u8, 169u8, 30u8, 199u8, 165u8, 55u8, 231u8, 223u8, 43u8,
                         ],
                     )
                 }
@@ -7195,27 +7221,23 @@ pub mod api {
                 #[doc = " `frame_system` data alongside the account data contrary to storing account balances in the"]
                 #[doc = " `Balances` pallet, which uses a `StorageMap` to store balances data only."]
                 #[doc = " NOTE: This is only used in the case that this pallet is used to store balances."]
-                pub fn account(
+                pub fn account_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_balances::types::AccountData<::core::primitive::u128>,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Balances",
                         "Account",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            47u8, 253u8, 83u8, 165u8, 18u8, 176u8, 62u8, 239u8, 78u8, 85u8, 231u8,
-                            235u8, 157u8, 145u8, 251u8, 35u8, 225u8, 171u8, 82u8, 167u8, 68u8,
-                            206u8, 28u8, 169u8, 8u8, 93u8, 169u8, 101u8, 180u8, 206u8, 231u8,
-                            143u8,
+                            213u8, 38u8, 200u8, 69u8, 218u8, 0u8, 112u8, 181u8, 160u8, 23u8, 96u8,
+                            90u8, 3u8, 88u8, 126u8, 22u8, 103u8, 74u8, 64u8, 69u8, 29u8, 247u8,
+                            18u8, 17u8, 234u8, 143u8, 189u8, 22u8, 247u8, 194u8, 154u8, 249u8,
                         ],
                     )
                 }
@@ -7243,82 +7265,83 @@ pub mod api {
                 #[doc = " `frame_system` data alongside the account data contrary to storing account balances in the"]
                 #[doc = " `Balances` pallet, which uses a `StorageMap` to store balances data only."]
                 #[doc = " NOTE: This is only used in the case that this pallet is used to store balances."]
-                pub fn account_root(
+                pub fn account(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_balances::types::AccountData<::core::primitive::u128>,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Balances",
                         "Account",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            47u8, 253u8, 83u8, 165u8, 18u8, 176u8, 62u8, 239u8, 78u8, 85u8, 231u8,
-                            235u8, 157u8, 145u8, 251u8, 35u8, 225u8, 171u8, 82u8, 167u8, 68u8,
-                            206u8, 28u8, 169u8, 8u8, 93u8, 169u8, 101u8, 180u8, 206u8, 231u8,
-                            143u8,
+                            213u8, 38u8, 200u8, 69u8, 218u8, 0u8, 112u8, 181u8, 160u8, 23u8, 96u8,
+                            90u8, 3u8, 88u8, 126u8, 22u8, 103u8, 74u8, 64u8, 69u8, 29u8, 247u8,
+                            18u8, 17u8, 234u8, 143u8, 189u8, 22u8, 247u8, 194u8, 154u8, 249u8,
                         ],
                     )
                 }
                 #[doc = " Any liquidity locks on some account balances."]
                 #[doc = " NOTE: Should only be accessed when setting, changing and freeing a lock."]
-                pub fn locks(
+                pub fn locks_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::weak_bounded_vec::WeakBoundedVec<
                         runtime_types::pallet_balances::types::BalanceLock<::core::primitive::u128>,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Balances",
                         "Locks",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            44u8, 44u8, 48u8, 20u8, 121u8, 168u8, 200u8, 87u8, 205u8, 172u8, 111u8,
-                            208u8, 62u8, 243u8, 225u8, 223u8, 181u8, 36u8, 197u8, 9u8, 52u8, 182u8,
-                            113u8, 55u8, 126u8, 164u8, 82u8, 209u8, 151u8, 126u8, 186u8, 85u8,
+                            10u8, 223u8, 55u8, 0u8, 249u8, 69u8, 168u8, 41u8, 75u8, 35u8, 120u8,
+                            167u8, 18u8, 132u8, 9u8, 20u8, 91u8, 51u8, 27u8, 69u8, 136u8, 187u8,
+                            13u8, 220u8, 163u8, 122u8, 26u8, 141u8, 174u8, 249u8, 85u8, 37u8,
                         ],
                     )
                 }
                 #[doc = " Any liquidity locks on some account balances."]
                 #[doc = " NOTE: Should only be accessed when setting, changing and freeing a lock."]
-                pub fn locks_root(
+                pub fn locks(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::weak_bounded_vec::WeakBoundedVec<
                         runtime_types::pallet_balances::types::BalanceLock<::core::primitive::u128>,
                     >,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Balances",
                         "Locks",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            44u8, 44u8, 48u8, 20u8, 121u8, 168u8, 200u8, 87u8, 205u8, 172u8, 111u8,
-                            208u8, 62u8, 243u8, 225u8, 223u8, 181u8, 36u8, 197u8, 9u8, 52u8, 182u8,
-                            113u8, 55u8, 126u8, 164u8, 82u8, 209u8, 151u8, 126u8, 186u8, 85u8,
+                            10u8, 223u8, 55u8, 0u8, 249u8, 69u8, 168u8, 41u8, 75u8, 35u8, 120u8,
+                            167u8, 18u8, 132u8, 9u8, 20u8, 91u8, 51u8, 27u8, 69u8, 136u8, 187u8,
+                            13u8, 220u8, 163u8, 122u8, 26u8, 141u8, 174u8, 249u8, 85u8, 37u8,
                         ],
                     )
                 }
                 #[doc = " Named reserves on some account balances."]
-                pub fn reserves(
+                pub fn reserves_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<
@@ -7327,27 +7350,25 @@ pub mod api {
                             ::core::primitive::u128,
                         >,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Balances",
                         "Reserves",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            192u8, 99u8, 91u8, 129u8, 195u8, 73u8, 153u8, 126u8, 82u8, 52u8, 56u8,
-                            85u8, 105u8, 178u8, 113u8, 101u8, 229u8, 37u8, 242u8, 174u8, 166u8,
-                            244u8, 68u8, 173u8, 14u8, 225u8, 172u8, 70u8, 181u8, 211u8, 165u8,
-                            134u8,
+                            112u8, 10u8, 241u8, 77u8, 64u8, 187u8, 106u8, 159u8, 13u8, 153u8,
+                            140u8, 178u8, 182u8, 50u8, 1u8, 55u8, 149u8, 92u8, 196u8, 229u8, 170u8,
+                            106u8, 193u8, 88u8, 255u8, 244u8, 2u8, 193u8, 62u8, 235u8, 204u8, 91u8,
                         ],
                     )
                 }
                 #[doc = " Named reserves on some account balances."]
-                pub fn reserves_root(
+                pub fn reserves(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<
@@ -7356,26 +7377,26 @@ pub mod api {
                             ::core::primitive::u128,
                         >,
                     >,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Balances",
                         "Reserves",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            192u8, 99u8, 91u8, 129u8, 195u8, 73u8, 153u8, 126u8, 82u8, 52u8, 56u8,
-                            85u8, 105u8, 178u8, 113u8, 101u8, 229u8, 37u8, 242u8, 174u8, 166u8,
-                            244u8, 68u8, 173u8, 14u8, 225u8, 172u8, 70u8, 181u8, 211u8, 165u8,
-                            134u8,
+                            112u8, 10u8, 241u8, 77u8, 64u8, 187u8, 106u8, 159u8, 13u8, 153u8,
+                            140u8, 178u8, 182u8, 50u8, 1u8, 55u8, 149u8, 92u8, 196u8, 229u8, 170u8,
+                            106u8, 193u8, 88u8, 255u8, 244u8, 2u8, 193u8, 62u8, 235u8, 204u8, 91u8,
                         ],
                     )
                 }
                 #[doc = " Holds on account balances."]
-                pub fn holds(
+                pub fn holds_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<
@@ -7384,16 +7405,14 @@ pub mod api {
                             ::core::primitive::u128,
                         >,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Balances",
                         "Holds",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             37u8, 176u8, 2u8, 18u8, 109u8, 26u8, 66u8, 81u8, 28u8, 104u8, 149u8,
                             117u8, 119u8, 114u8, 196u8, 35u8, 172u8, 155u8, 66u8, 195u8, 98u8,
@@ -7402,8 +7421,9 @@ pub mod api {
                     )
                 }
                 #[doc = " Holds on account balances."]
-                pub fn holds_root(
+                pub fn holds(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<
@@ -7412,14 +7432,16 @@ pub mod api {
                             ::core::primitive::u128,
                         >,
                     >,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Balances",
                         "Holds",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             37u8, 176u8, 2u8, 18u8, 109u8, 26u8, 66u8, 81u8, 28u8, 104u8, 149u8,
                             117u8, 119u8, 114u8, 196u8, 35u8, 172u8, 155u8, 66u8, 195u8, 98u8,
@@ -7428,9 +7450,8 @@ pub mod api {
                     )
                 }
                 #[doc = " Freeze locks on account balances."]
-                pub fn freezes(
+                pub fn freezes_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<
@@ -7439,16 +7460,14 @@ pub mod api {
                             ::core::primitive::u128,
                         >,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Balances",
                         "Freezes",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             69u8, 49u8, 165u8, 76u8, 135u8, 142u8, 179u8, 118u8, 50u8, 109u8, 53u8,
                             112u8, 110u8, 94u8, 30u8, 93u8, 173u8, 38u8, 27u8, 142u8, 19u8, 5u8,
@@ -7457,8 +7476,9 @@ pub mod api {
                     )
                 }
                 #[doc = " Freeze locks on account balances."]
-                pub fn freezes_root(
+                pub fn freezes(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<
@@ -7467,14 +7487,16 @@ pub mod api {
                             ::core::primitive::u128,
                         >,
                     >,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Balances",
                         "Freezes",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             69u8, 49u8, 165u8, 76u8, 135u8, 142u8, 179u8, 118u8, 50u8, 109u8, 53u8,
                             112u8, 110u8, 94u8, 30u8, 93u8, 173u8, 38u8, 27u8, 142u8, 19u8, 5u8,
@@ -8299,10 +8321,10 @@ pub mod api {
                         "nominate",
                         types::Nominate { targets },
                         [
-                            149u8, 155u8, 120u8, 232u8, 57u8, 168u8, 218u8, 230u8, 97u8, 234u8,
-                            38u8, 247u8, 103u8, 88u8, 243u8, 182u8, 97u8, 77u8, 192u8, 4u8, 147u8,
-                            11u8, 52u8, 45u8, 108u8, 73u8, 183u8, 106u8, 198u8, 157u8, 246u8,
-                            145u8,
+                            14u8, 209u8, 112u8, 222u8, 40u8, 211u8, 118u8, 188u8, 26u8, 88u8,
+                            135u8, 233u8, 36u8, 99u8, 68u8, 189u8, 184u8, 169u8, 146u8, 217u8,
+                            87u8, 198u8, 89u8, 32u8, 193u8, 135u8, 251u8, 88u8, 241u8, 151u8,
+                            205u8, 138u8,
                         ],
                     )
                 }
@@ -8492,10 +8514,10 @@ pub mod api {
                         "cancel_deferred_slash",
                         types::CancelDeferredSlash { era, slash_indices },
                         [
-                            65u8, 90u8, 54u8, 7u8, 89u8, 238u8, 254u8, 76u8, 219u8, 26u8, 137u8,
-                            181u8, 154u8, 49u8, 35u8, 99u8, 181u8, 193u8, 209u8, 181u8, 212u8,
-                            153u8, 49u8, 83u8, 77u8, 170u8, 175u8, 142u8, 63u8, 187u8, 183u8,
-                            199u8,
+                            49u8, 208u8, 248u8, 109u8, 25u8, 132u8, 73u8, 172u8, 232u8, 194u8,
+                            114u8, 23u8, 114u8, 4u8, 64u8, 156u8, 70u8, 41u8, 207u8, 208u8, 78u8,
+                            199u8, 81u8, 125u8, 101u8, 31u8, 17u8, 140u8, 190u8, 254u8, 64u8,
+                            101u8,
                         ],
                     )
                 }
@@ -8567,9 +8589,9 @@ pub mod api {
                         "kick",
                         types::Kick { who },
                         [
-                            78u8, 76u8, 77u8, 41u8, 59u8, 131u8, 44u8, 252u8, 69u8, 34u8, 206u8,
-                            104u8, 178u8, 193u8, 79u8, 110u8, 103u8, 132u8, 183u8, 100u8, 228u8,
-                            248u8, 102u8, 228u8, 76u8, 69u8, 11u8, 35u8, 108u8, 188u8, 96u8, 72u8,
+                            27u8, 64u8, 10u8, 21u8, 174u8, 6u8, 40u8, 249u8, 144u8, 247u8, 5u8,
+                            123u8, 225u8, 172u8, 143u8, 50u8, 192u8, 248u8, 160u8, 179u8, 119u8,
+                            122u8, 147u8, 92u8, 248u8, 123u8, 3u8, 154u8, 205u8, 199u8, 6u8, 126u8,
                         ],
                     )
                 }
@@ -8607,10 +8629,9 @@ pub mod api {
                             min_commission,
                         },
                         [
-                            198u8, 212u8, 176u8, 138u8, 79u8, 177u8, 241u8, 104u8, 72u8, 170u8,
-                            35u8, 178u8, 205u8, 167u8, 218u8, 118u8, 42u8, 226u8, 180u8, 17u8,
-                            112u8, 175u8, 55u8, 248u8, 64u8, 127u8, 51u8, 65u8, 132u8, 210u8, 88u8,
-                            213u8,
+                            99u8, 61u8, 196u8, 68u8, 226u8, 64u8, 104u8, 70u8, 173u8, 108u8, 29u8,
+                            39u8, 61u8, 202u8, 72u8, 227u8, 190u8, 6u8, 138u8, 137u8, 207u8, 11u8,
+                            190u8, 79u8, 73u8, 7u8, 108u8, 131u8, 19u8, 7u8, 173u8, 60u8,
                         ],
                     )
                 }
@@ -9030,51 +9051,51 @@ pub mod api {
                 #[doc = " Map from all locked \"stash\" accounts to the controller account."]
                 #[doc = ""]
                 #[doc = " TWOX-NOTE: SAFE since `AccountId` is a secure hash."]
-                pub fn bonded(
+                pub fn bonded_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::subxt::utils::AccountId32,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "Bonded",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            146u8, 230u8, 48u8, 190u8, 166u8, 127u8, 237u8, 216u8, 71u8, 33u8,
-                            108u8, 121u8, 204u8, 211u8, 133u8, 123u8, 52u8, 164u8, 201u8, 209u8,
-                            236u8, 35u8, 190u8, 77u8, 126u8, 150u8, 79u8, 244u8, 15u8, 247u8,
-                            161u8, 107u8,
+                            99u8, 128u8, 108u8, 100u8, 235u8, 102u8, 243u8, 95u8, 61u8, 206u8,
+                            220u8, 49u8, 155u8, 85u8, 236u8, 110u8, 99u8, 21u8, 117u8, 127u8,
+                            157u8, 226u8, 108u8, 80u8, 126u8, 93u8, 203u8, 0u8, 160u8, 253u8, 56u8,
+                            101u8,
                         ],
                     )
                 }
                 #[doc = " Map from all locked \"stash\" accounts to the controller account."]
                 #[doc = ""]
                 #[doc = " TWOX-NOTE: SAFE since `AccountId` is a secure hash."]
-                pub fn bonded_root(
+                pub fn bonded(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::subxt::utils::AccountId32,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "Bonded",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            146u8, 230u8, 48u8, 190u8, 166u8, 127u8, 237u8, 216u8, 71u8, 33u8,
-                            108u8, 121u8, 204u8, 211u8, 133u8, 123u8, 52u8, 164u8, 201u8, 209u8,
-                            236u8, 35u8, 190u8, 77u8, 126u8, 150u8, 79u8, 244u8, 15u8, 247u8,
-                            161u8, 107u8,
+                            99u8, 128u8, 108u8, 100u8, 235u8, 102u8, 243u8, 95u8, 61u8, 206u8,
+                            220u8, 49u8, 155u8, 85u8, 236u8, 110u8, 99u8, 21u8, 117u8, 127u8,
+                            157u8, 226u8, 108u8, 80u8, 126u8, 93u8, 203u8, 0u8, 160u8, 253u8, 56u8,
+                            101u8,
                         ],
                     )
                 }
@@ -9167,120 +9188,117 @@ pub mod api {
                     )
                 }
                 #[doc = " Map from all (unlocked) \"controller\" accounts to the info regarding the staking."]
-                pub fn ledger(
+                pub fn ledger_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_staking::StakingLedger,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "Ledger",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            77u8, 39u8, 230u8, 122u8, 108u8, 191u8, 251u8, 28u8, 233u8, 225u8,
-                            195u8, 224u8, 234u8, 90u8, 173u8, 170u8, 143u8, 246u8, 246u8, 21u8,
-                            38u8, 187u8, 112u8, 111u8, 206u8, 181u8, 183u8, 186u8, 96u8, 8u8,
-                            225u8, 224u8,
+                            210u8, 236u8, 6u8, 49u8, 200u8, 118u8, 116u8, 25u8, 66u8, 60u8, 18u8,
+                            75u8, 240u8, 156u8, 58u8, 48u8, 176u8, 10u8, 175u8, 0u8, 86u8, 7u8,
+                            16u8, 134u8, 64u8, 41u8, 46u8, 128u8, 33u8, 40u8, 10u8, 129u8,
                         ],
                     )
                 }
                 #[doc = " Map from all (unlocked) \"controller\" accounts to the info regarding the staking."]
-                pub fn ledger_root(
+                pub fn ledger(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_staking::StakingLedger,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "Ledger",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            77u8, 39u8, 230u8, 122u8, 108u8, 191u8, 251u8, 28u8, 233u8, 225u8,
-                            195u8, 224u8, 234u8, 90u8, 173u8, 170u8, 143u8, 246u8, 246u8, 21u8,
-                            38u8, 187u8, 112u8, 111u8, 206u8, 181u8, 183u8, 186u8, 96u8, 8u8,
-                            225u8, 224u8,
+                            210u8, 236u8, 6u8, 49u8, 200u8, 118u8, 116u8, 25u8, 66u8, 60u8, 18u8,
+                            75u8, 240u8, 156u8, 58u8, 48u8, 176u8, 10u8, 175u8, 0u8, 86u8, 7u8,
+                            16u8, 134u8, 64u8, 41u8, 46u8, 128u8, 33u8, 40u8, 10u8, 129u8,
                         ],
                     )
                 }
                 #[doc = " Where the reward payment should be made. Keyed by stash."]
                 #[doc = ""]
                 #[doc = " TWOX-NOTE: SAFE since `AccountId` is a secure hash."]
-                pub fn payee(
+                pub fn payee_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_staking::RewardDestination<::subxt::utils::AccountId32>,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "Payee",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            198u8, 238u8, 10u8, 104u8, 204u8, 7u8, 193u8, 254u8, 169u8, 18u8,
-                            187u8, 212u8, 90u8, 243u8, 73u8, 29u8, 216u8, 144u8, 93u8, 140u8, 11u8,
-                            124u8, 4u8, 191u8, 107u8, 61u8, 15u8, 152u8, 70u8, 82u8, 60u8, 75u8,
+                            141u8, 225u8, 44u8, 134u8, 50u8, 229u8, 64u8, 186u8, 166u8, 88u8,
+                            213u8, 118u8, 32u8, 154u8, 151u8, 204u8, 104u8, 216u8, 198u8, 66u8,
+                            123u8, 143u8, 206u8, 245u8, 53u8, 67u8, 78u8, 82u8, 115u8, 31u8, 39u8,
+                            76u8,
                         ],
                     )
                 }
                 #[doc = " Where the reward payment should be made. Keyed by stash."]
                 #[doc = ""]
                 #[doc = " TWOX-NOTE: SAFE since `AccountId` is a secure hash."]
-                pub fn payee_root(
+                pub fn payee(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_staking::RewardDestination<::subxt::utils::AccountId32>,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "Payee",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            198u8, 238u8, 10u8, 104u8, 204u8, 7u8, 193u8, 254u8, 169u8, 18u8,
-                            187u8, 212u8, 90u8, 243u8, 73u8, 29u8, 216u8, 144u8, 93u8, 140u8, 11u8,
-                            124u8, 4u8, 191u8, 107u8, 61u8, 15u8, 152u8, 70u8, 82u8, 60u8, 75u8,
+                            141u8, 225u8, 44u8, 134u8, 50u8, 229u8, 64u8, 186u8, 166u8, 88u8,
+                            213u8, 118u8, 32u8, 154u8, 151u8, 204u8, 104u8, 216u8, 198u8, 66u8,
+                            123u8, 143u8, 206u8, 245u8, 53u8, 67u8, 78u8, 82u8, 115u8, 31u8, 39u8,
+                            76u8,
                         ],
                     )
                 }
                 #[doc = " The map from (wannabe) validator stash key to the preferences of that validator."]
                 #[doc = ""]
                 #[doc = " TWOX-NOTE: SAFE since `AccountId` is a secure hash."]
-                pub fn validators(
+                pub fn validators_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_staking::ValidatorPrefs,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "Validators",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             149u8, 207u8, 68u8, 38u8, 24u8, 220u8, 207u8, 84u8, 236u8, 33u8, 210u8,
                             124u8, 200u8, 99u8, 98u8, 29u8, 235u8, 46u8, 124u8, 4u8, 203u8, 6u8,
@@ -9291,19 +9309,22 @@ pub mod api {
                 #[doc = " The map from (wannabe) validator stash key to the preferences of that validator."]
                 #[doc = ""]
                 #[doc = " TWOX-NOTE: SAFE since `AccountId` is a secure hash."]
-                pub fn validators_root(
+                pub fn validators(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_staking::ValidatorPrefs,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "Validators",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             149u8, 207u8, 68u8, 38u8, 24u8, 220u8, 207u8, 84u8, 236u8, 33u8, 210u8,
                             124u8, 200u8, 99u8, 98u8, 29u8, 235u8, 46u8, 124u8, 4u8, 203u8, 6u8,
@@ -9375,26 +9396,23 @@ pub mod api {
                 #[doc = " [`Call::chill_other`] dispatchable by anyone."]
                 #[doc = ""]
                 #[doc = " TWOX-NOTE: SAFE since `AccountId` is a secure hash."]
-                pub fn nominators(
+                pub fn nominators_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_staking::Nominations,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "Nominators",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            114u8, 45u8, 86u8, 23u8, 12u8, 98u8, 114u8, 3u8, 170u8, 11u8, 100u8,
-                            17u8, 122u8, 158u8, 192u8, 21u8, 160u8, 87u8, 85u8, 142u8, 241u8,
-                            232u8, 25u8, 6u8, 36u8, 85u8, 155u8, 79u8, 124u8, 173u8, 0u8, 252u8,
+                            244u8, 174u8, 214u8, 105u8, 215u8, 218u8, 241u8, 145u8, 155u8, 54u8,
+                            219u8, 34u8, 158u8, 224u8, 251u8, 17u8, 245u8, 9u8, 150u8, 36u8, 2u8,
+                            233u8, 222u8, 218u8, 136u8, 86u8, 37u8, 244u8, 18u8, 50u8, 91u8, 120u8,
                         ],
                     )
                 }
@@ -9416,23 +9434,26 @@ pub mod api {
                 #[doc = " [`Call::chill_other`] dispatchable by anyone."]
                 #[doc = ""]
                 #[doc = " TWOX-NOTE: SAFE since `AccountId` is a secure hash."]
-                pub fn nominators_root(
+                pub fn nominators(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_staking::Nominations,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "Nominators",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            114u8, 45u8, 86u8, 23u8, 12u8, 98u8, 114u8, 3u8, 170u8, 11u8, 100u8,
-                            17u8, 122u8, 158u8, 192u8, 21u8, 160u8, 87u8, 85u8, 142u8, 241u8,
-                            232u8, 25u8, 6u8, 36u8, 85u8, 155u8, 79u8, 124u8, 173u8, 0u8, 252u8,
+                            244u8, 174u8, 214u8, 105u8, 215u8, 218u8, 241u8, 145u8, 155u8, 54u8,
+                            219u8, 34u8, 158u8, 224u8, 251u8, 17u8, 245u8, 9u8, 150u8, 36u8, 2u8,
+                            233u8, 222u8, 218u8, 136u8, 86u8, 37u8, 244u8, 18u8, 50u8, 91u8, 120u8,
                         ],
                     )
                 }
@@ -9534,6 +9555,30 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " Note: This tracks the starting session (i.e. session index when era start being active)"]
                 #[doc = " for the eras in `[CurrentEra - HISTORY_DEPTH, CurrentEra]`."]
+                pub fn eras_start_session_index_iter(
+                    &self,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    ::core::primitive::u32,
+                    (),
+                    (),
+                    ::subxt::storage::address::Yes,
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "Staking",
+                        "ErasStartSessionIndex",
+                        vec![],
+                        [
+                            104u8, 76u8, 102u8, 20u8, 9u8, 146u8, 55u8, 204u8, 12u8, 15u8, 117u8,
+                            22u8, 54u8, 230u8, 98u8, 105u8, 191u8, 136u8, 140u8, 65u8, 48u8, 29u8,
+                            19u8, 144u8, 159u8, 241u8, 158u8, 77u8, 4u8, 230u8, 216u8, 52u8,
+                        ],
+                    )
+                }
+                #[doc = " The session index at which the era start for the last `HISTORY_DEPTH` eras."]
+                #[doc = ""]
+                #[doc = " Note: This tracks the starting session (i.e. session index when era start being active)"]
+                #[doc = " for the eras in `[CurrentEra - HISTORY_DEPTH, CurrentEra]`."]
                 pub fn eras_start_session_index(
                     &self,
                     _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
@@ -9542,7 +9587,7 @@ pub mod api {
                     ::core::primitive::u32,
                     ::subxt::storage::address::Yes,
                     (),
-                    ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
@@ -9551,35 +9596,72 @@ pub mod api {
                             _0.borrow(),
                         )],
                         [
-                            72u8, 185u8, 246u8, 202u8, 79u8, 127u8, 173u8, 74u8, 216u8, 238u8,
-                            58u8, 82u8, 235u8, 222u8, 76u8, 144u8, 97u8, 84u8, 17u8, 164u8, 132u8,
-                            167u8, 24u8, 195u8, 175u8, 132u8, 156u8, 87u8, 234u8, 147u8, 103u8,
-                            58u8,
+                            104u8, 76u8, 102u8, 20u8, 9u8, 146u8, 55u8, 204u8, 12u8, 15u8, 117u8,
+                            22u8, 54u8, 230u8, 98u8, 105u8, 191u8, 136u8, 140u8, 65u8, 48u8, 29u8,
+                            19u8, 144u8, 159u8, 241u8, 158u8, 77u8, 4u8, 230u8, 216u8, 52u8,
                         ],
                     )
                 }
-                #[doc = " The session index at which the era start for the last `HISTORY_DEPTH` eras."]
+                #[doc = " Exposure of validator at era."]
                 #[doc = ""]
-                #[doc = " Note: This tracks the starting session (i.e. session index when era start being active)"]
-                #[doc = " for the eras in `[CurrentEra - HISTORY_DEPTH, CurrentEra]`."]
-                pub fn eras_start_session_index_root(
+                #[doc = " This is keyed first by the era index to allow bulk deletion and then the stash account."]
+                #[doc = ""]
+                #[doc = " Is it removed after `HISTORY_DEPTH` eras."]
+                #[doc = " If stakers hasn't been set or has been removed then empty exposure is returned."]
+                pub fn eras_stakers_iter(
                     &self,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
-                    ::core::primitive::u32,
+                    runtime_types::pallet_staking::Exposure<
+                        ::subxt::utils::AccountId32,
+                        ::core::primitive::u128,
+                    >,
                     (),
+                    ::subxt::storage::address::Yes,
+                    ::subxt::storage::address::Yes,
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "Staking",
+                        "ErasStakers",
+                        vec![],
+                        [
+                            120u8, 64u8, 232u8, 134u8, 109u8, 212u8, 242u8, 64u8, 68u8, 196u8,
+                            108u8, 91u8, 255u8, 123u8, 245u8, 27u8, 55u8, 254u8, 60u8, 74u8, 183u8,
+                            183u8, 226u8, 159u8, 244u8, 56u8, 139u8, 34u8, 228u8, 176u8, 241u8,
+                            76u8,
+                        ],
+                    )
+                }
+                #[doc = " Exposure of validator at era."]
+                #[doc = ""]
+                #[doc = " This is keyed first by the era index to allow bulk deletion and then the stash account."]
+                #[doc = ""]
+                #[doc = " Is it removed after `HISTORY_DEPTH` eras."]
+                #[doc = " If stakers hasn't been set or has been removed then empty exposure is returned."]
+                pub fn eras_stakers_iter1(
+                    &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    runtime_types::pallet_staking::Exposure<
+                        ::subxt::utils::AccountId32,
+                        ::core::primitive::u128,
+                    >,
                     (),
                     ::subxt::storage::address::Yes,
+                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
-                        "ErasStartSessionIndex",
-                        Vec::new(),
+                        "ErasStakers",
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            72u8, 185u8, 246u8, 202u8, 79u8, 127u8, 173u8, 74u8, 216u8, 238u8,
-                            58u8, 82u8, 235u8, 222u8, 76u8, 144u8, 97u8, 84u8, 17u8, 164u8, 132u8,
-                            167u8, 24u8, 195u8, 175u8, 132u8, 156u8, 87u8, 234u8, 147u8, 103u8,
-                            58u8,
+                            120u8, 64u8, 232u8, 134u8, 109u8, 212u8, 242u8, 64u8, 68u8, 196u8,
+                            108u8, 91u8, 255u8, 123u8, 245u8, 27u8, 55u8, 254u8, 60u8, 74u8, 183u8,
+                            183u8, 226u8, 159u8, 244u8, 56u8, 139u8, 34u8, 228u8, 176u8, 241u8,
+                            76u8,
                         ],
                     )
                 }
@@ -9601,7 +9683,7 @@ pub mod api {
                     >,
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
-                    ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
@@ -9611,19 +9693,25 @@ pub mod api {
                             ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
                         ],
                         [
-                            103u8, 38u8, 198u8, 91u8, 133u8, 9u8, 10u8, 201u8, 103u8, 169u8, 159u8,
-                            172u8, 59u8, 238u8, 21u8, 30u8, 140u8, 183u8, 160u8, 61u8, 36u8, 162u8,
-                            244u8, 61u8, 78u8, 33u8, 134u8, 176u8, 112u8, 153u8, 192u8, 252u8,
+                            120u8, 64u8, 232u8, 134u8, 109u8, 212u8, 242u8, 64u8, 68u8, 196u8,
+                            108u8, 91u8, 255u8, 123u8, 245u8, 27u8, 55u8, 254u8, 60u8, 74u8, 183u8,
+                            183u8, 226u8, 159u8, 244u8, 56u8, 139u8, 34u8, 228u8, 176u8, 241u8,
+                            76u8,
                         ],
                     )
                 }
-                #[doc = " Exposure of validator at era."]
+                #[doc = " Clipped Exposure of validator at era."]
                 #[doc = ""]
-                #[doc = " This is keyed first by the era index to allow bulk deletion and then the stash account."]
+                #[doc = " This is similar to [`ErasStakers`] but number of nominators exposed is reduced to the"]
+                #[doc = " `T::MaxNominatorRewardedPerValidator` biggest stakers."]
+                #[doc = " (Note: the field `total` and `own` of the exposure remains unchanged)."]
+                #[doc = " This is used to limit the i/o cost for the nominator payout."]
+                #[doc = ""]
+                #[doc = " This is keyed fist by the era index to allow bulk deletion and then the stash account."]
                 #[doc = ""]
                 #[doc = " Is it removed after `HISTORY_DEPTH` eras."]
                 #[doc = " If stakers hasn't been set or has been removed then empty exposure is returned."]
-                pub fn eras_stakers_root(
+                pub fn eras_stakers_clipped_iter(
                     &self,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
@@ -9637,12 +9725,13 @@ pub mod api {
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
-                        "ErasStakers",
-                        Vec::new(),
+                        "ErasStakersClipped",
+                        vec![],
                         [
-                            103u8, 38u8, 198u8, 91u8, 133u8, 9u8, 10u8, 201u8, 103u8, 169u8, 159u8,
-                            172u8, 59u8, 238u8, 21u8, 30u8, 140u8, 183u8, 160u8, 61u8, 36u8, 162u8,
-                            244u8, 61u8, 78u8, 33u8, 134u8, 176u8, 112u8, 153u8, 192u8, 252u8,
+                            85u8, 192u8, 164u8, 53u8, 181u8, 61u8, 132u8, 255u8, 144u8, 41u8, 44u8,
+                            199u8, 34u8, 11u8, 248u8, 81u8, 203u8, 204u8, 152u8, 138u8, 112u8,
+                            229u8, 145u8, 253u8, 111u8, 111u8, 38u8, 74u8, 199u8, 164u8, 16u8,
+                            45u8,
                         ],
                     )
                 }
@@ -9657,32 +9746,30 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " Is it removed after `HISTORY_DEPTH` eras."]
                 #[doc = " If stakers hasn't been set or has been removed then empty exposure is returned."]
-                pub fn eras_stakers_clipped(
+                pub fn eras_stakers_clipped_iter1(
                     &self,
                     _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
-                    _1: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_staking::Exposure<
                         ::subxt::utils::AccountId32,
                         ::core::primitive::u128,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "ErasStakersClipped",
-                        vec![
-                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
-                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
-                        ],
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            119u8, 253u8, 51u8, 32u8, 173u8, 173u8, 49u8, 121u8, 141u8, 128u8,
-                            219u8, 112u8, 173u8, 42u8, 145u8, 37u8, 8u8, 12u8, 27u8, 37u8, 232u8,
-                            187u8, 130u8, 227u8, 113u8, 111u8, 185u8, 197u8, 157u8, 136u8, 205u8,
-                            32u8,
+                            85u8, 192u8, 164u8, 53u8, 181u8, 61u8, 132u8, 255u8, 144u8, 41u8, 44u8,
+                            199u8, 34u8, 11u8, 248u8, 81u8, 203u8, 204u8, 152u8, 138u8, 112u8,
+                            229u8, 145u8, 253u8, 111u8, 111u8, 38u8, 74u8, 199u8, 164u8, 16u8,
+                            45u8,
                         ],
                     )
                 }
@@ -9697,27 +9784,32 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " Is it removed after `HISTORY_DEPTH` eras."]
                 #[doc = " If stakers hasn't been set or has been removed then empty exposure is returned."]
-                pub fn eras_stakers_clipped_root(
+                pub fn eras_stakers_clipped(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
+                    _1: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_staking::Exposure<
                         ::subxt::utils::AccountId32,
                         ::core::primitive::u128,
                     >,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "ErasStakersClipped",
-                        Vec::new(),
+                        vec![
+                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
+                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
+                        ],
                         [
-                            119u8, 253u8, 51u8, 32u8, 173u8, 173u8, 49u8, 121u8, 141u8, 128u8,
-                            219u8, 112u8, 173u8, 42u8, 145u8, 37u8, 8u8, 12u8, 27u8, 37u8, 232u8,
-                            187u8, 130u8, 227u8, 113u8, 111u8, 185u8, 197u8, 157u8, 136u8, 205u8,
-                            32u8,
+                            85u8, 192u8, 164u8, 53u8, 181u8, 61u8, 132u8, 255u8, 144u8, 41u8, 44u8,
+                            199u8, 34u8, 11u8, 248u8, 81u8, 203u8, 204u8, 152u8, 138u8, 112u8,
+                            229u8, 145u8, 253u8, 111u8, 111u8, 38u8, 74u8, 199u8, 164u8, 16u8,
+                            45u8,
                         ],
                     )
                 }
@@ -9726,29 +9818,23 @@ pub mod api {
                 #[doc = " This is keyed first by the era index to allow bulk deletion and then the stash account."]
                 #[doc = ""]
                 #[doc = " Is it removed after `HISTORY_DEPTH` eras."]
-                pub fn eras_validator_prefs(
+                pub fn eras_validator_prefs_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
-                    _1: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_staking::ValidatorPrefs,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "ErasValidatorPrefs",
-                        vec![
-                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
-                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
-                        ],
+                        vec![],
                         [
-                            201u8, 204u8, 230u8, 197u8, 37u8, 83u8, 124u8, 26u8, 10u8, 75u8, 164u8,
-                            102u8, 83u8, 24u8, 158u8, 127u8, 27u8, 173u8, 125u8, 63u8, 251u8,
-                            128u8, 239u8, 182u8, 115u8, 109u8, 13u8, 97u8, 211u8, 104u8, 189u8,
-                            127u8,
+                            134u8, 250u8, 229u8, 21u8, 44u8, 119u8, 43u8, 99u8, 69u8, 94u8, 177u8,
+                            180u8, 174u8, 134u8, 54u8, 25u8, 56u8, 144u8, 194u8, 149u8, 56u8,
+                            234u8, 78u8, 238u8, 78u8, 247u8, 205u8, 43u8, 16u8, 159u8, 92u8, 169u8,
                         ],
                     )
                 }
@@ -9757,8 +9843,9 @@ pub mod api {
                 #[doc = " This is keyed first by the era index to allow bulk deletion and then the stash account."]
                 #[doc = ""]
                 #[doc = " Is it removed after `HISTORY_DEPTH` eras."]
-                pub fn eras_validator_prefs_root(
+                pub fn eras_validator_prefs_iter1(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_staking::ValidatorPrefs,
@@ -9769,34 +9856,62 @@ pub mod api {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "ErasValidatorPrefs",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            201u8, 204u8, 230u8, 197u8, 37u8, 83u8, 124u8, 26u8, 10u8, 75u8, 164u8,
-                            102u8, 83u8, 24u8, 158u8, 127u8, 27u8, 173u8, 125u8, 63u8, 251u8,
-                            128u8, 239u8, 182u8, 115u8, 109u8, 13u8, 97u8, 211u8, 104u8, 189u8,
-                            127u8,
+                            134u8, 250u8, 229u8, 21u8, 44u8, 119u8, 43u8, 99u8, 69u8, 94u8, 177u8,
+                            180u8, 174u8, 134u8, 54u8, 25u8, 56u8, 144u8, 194u8, 149u8, 56u8,
+                            234u8, 78u8, 238u8, 78u8, 247u8, 205u8, 43u8, 16u8, 159u8, 92u8, 169u8,
+                        ],
+                    )
+                }
+                #[doc = " Similar to `ErasStakers`, this holds the preferences of validators."]
+                #[doc = ""]
+                #[doc = " This is keyed first by the era index to allow bulk deletion and then the stash account."]
+                #[doc = ""]
+                #[doc = " Is it removed after `HISTORY_DEPTH` eras."]
+                pub fn eras_validator_prefs(
+                    &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
+                    _1: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    runtime_types::pallet_staking::ValidatorPrefs,
+                    ::subxt::storage::address::Yes,
+                    ::subxt::storage::address::Yes,
+                    (),
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "Staking",
+                        "ErasValidatorPrefs",
+                        vec![
+                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
+                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
+                        ],
+                        [
+                            134u8, 250u8, 229u8, 21u8, 44u8, 119u8, 43u8, 99u8, 69u8, 94u8, 177u8,
+                            180u8, 174u8, 134u8, 54u8, 25u8, 56u8, 144u8, 194u8, 149u8, 56u8,
+                            234u8, 78u8, 238u8, 78u8, 247u8, 205u8, 43u8, 16u8, 159u8, 92u8, 169u8,
                         ],
                     )
                 }
                 #[doc = " The total validator era payout for the last `HISTORY_DEPTH` eras."]
                 #[doc = ""]
                 #[doc = " Eras that haven't finished yet or has been removed doesn't have reward."]
-                pub fn eras_validator_reward(
+                pub fn eras_validator_reward_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u128,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "ErasValidatorReward",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             185u8, 85u8, 179u8, 163u8, 178u8, 168u8, 141u8, 200u8, 59u8, 77u8, 2u8,
                             197u8, 36u8, 188u8, 133u8, 117u8, 2u8, 25u8, 105u8, 132u8, 44u8, 75u8,
@@ -9807,19 +9922,22 @@ pub mod api {
                 #[doc = " The total validator era payout for the last `HISTORY_DEPTH` eras."]
                 #[doc = ""]
                 #[doc = " Eras that haven't finished yet or has been removed doesn't have reward."]
-                pub fn eras_validator_reward_root(
+                pub fn eras_validator_reward(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u128,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "ErasValidatorReward",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             185u8, 85u8, 179u8, 163u8, 178u8, 168u8, 141u8, 200u8, 59u8, 77u8, 2u8,
                             197u8, 36u8, 188u8, 133u8, 117u8, 2u8, 25u8, 105u8, 132u8, 44u8, 75u8,
@@ -9829,69 +9947,66 @@ pub mod api {
                 }
                 #[doc = " Rewards for the last `HISTORY_DEPTH` eras."]
                 #[doc = " If reward hasn't been set or has been removed then 0 reward is returned."]
-                pub fn eras_reward_points(
+                pub fn eras_reward_points_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_staking::EraRewardPoints<::subxt::utils::AccountId32>,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "ErasRewardPoints",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            237u8, 135u8, 146u8, 156u8, 172u8, 48u8, 147u8, 207u8, 15u8, 86u8,
-                            55u8, 38u8, 29u8, 253u8, 198u8, 192u8, 99u8, 213u8, 80u8, 72u8, 212u8,
-                            60u8, 60u8, 180u8, 33u8, 17u8, 77u8, 0u8, 165u8, 225u8, 60u8, 213u8,
+                            135u8, 0u8, 85u8, 241u8, 213u8, 133u8, 30u8, 192u8, 251u8, 191u8, 41u8,
+                            38u8, 233u8, 236u8, 218u8, 246u8, 166u8, 93u8, 46u8, 37u8, 48u8, 187u8,
+                            172u8, 48u8, 251u8, 178u8, 75u8, 203u8, 60u8, 188u8, 204u8, 207u8,
                         ],
                     )
                 }
                 #[doc = " Rewards for the last `HISTORY_DEPTH` eras."]
                 #[doc = " If reward hasn't been set or has been removed then 0 reward is returned."]
-                pub fn eras_reward_points_root(
+                pub fn eras_reward_points(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_staking::EraRewardPoints<::subxt::utils::AccountId32>,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "ErasRewardPoints",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            237u8, 135u8, 146u8, 156u8, 172u8, 48u8, 147u8, 207u8, 15u8, 86u8,
-                            55u8, 38u8, 29u8, 253u8, 198u8, 192u8, 99u8, 213u8, 80u8, 72u8, 212u8,
-                            60u8, 60u8, 180u8, 33u8, 17u8, 77u8, 0u8, 165u8, 225u8, 60u8, 213u8,
+                            135u8, 0u8, 85u8, 241u8, 213u8, 133u8, 30u8, 192u8, 251u8, 191u8, 41u8,
+                            38u8, 233u8, 236u8, 218u8, 246u8, 166u8, 93u8, 46u8, 37u8, 48u8, 187u8,
+                            172u8, 48u8, 251u8, 178u8, 75u8, 203u8, 60u8, 188u8, 204u8, 207u8,
                         ],
                     )
                 }
                 #[doc = " The total amount staked for the last `HISTORY_DEPTH` eras."]
                 #[doc = " If total hasn't been set or has been removed then 0 stake is returned."]
-                pub fn eras_total_stake(
+                pub fn eras_total_stake_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u128,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "ErasTotalStake",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             8u8, 78u8, 101u8, 62u8, 124u8, 126u8, 66u8, 26u8, 47u8, 126u8, 239u8,
                             204u8, 222u8, 104u8, 19u8, 108u8, 238u8, 160u8, 112u8, 242u8, 56u8,
@@ -9902,19 +10017,22 @@ pub mod api {
                 }
                 #[doc = " The total amount staked for the last `HISTORY_DEPTH` eras."]
                 #[doc = " If total hasn't been set or has been removed then 0 stake is returned."]
-                pub fn eras_total_stake_root(
+                pub fn eras_total_stake(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u128,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "ErasTotalStake",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             8u8, 78u8, 101u8, 62u8, 124u8, 126u8, 66u8, 26u8, 47u8, 126u8, 239u8,
                             204u8, 222u8, 104u8, 19u8, 108u8, 238u8, 160u8, 112u8, 242u8, 56u8,
@@ -9993,9 +10111,8 @@ pub mod api {
                     )
                 }
                 #[doc = " All unapplied slashes that are queued for later."]
-                pub fn unapplied_slashes(
+                pub fn unapplied_slashes_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::std::vec::Vec<
@@ -10004,27 +10121,26 @@ pub mod api {
                             ::core::primitive::u128,
                         >,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "UnappliedSlashes",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            121u8, 1u8, 135u8, 243u8, 99u8, 254u8, 238u8, 207u8, 145u8, 172u8,
-                            186u8, 131u8, 181u8, 109u8, 199u8, 93u8, 129u8, 65u8, 106u8, 118u8,
-                            197u8, 83u8, 65u8, 45u8, 149u8, 1u8, 85u8, 99u8, 239u8, 148u8, 40u8,
-                            177u8,
+                            158u8, 134u8, 7u8, 21u8, 200u8, 222u8, 197u8, 166u8, 199u8, 39u8, 1u8,
+                            167u8, 164u8, 154u8, 165u8, 118u8, 92u8, 223u8, 219u8, 136u8, 196u8,
+                            155u8, 243u8, 20u8, 198u8, 92u8, 198u8, 61u8, 252u8, 176u8, 175u8,
+                            172u8,
                         ],
                     )
                 }
                 #[doc = " All unapplied slashes that are queued for later."]
-                pub fn unapplied_slashes_root(
+                pub fn unapplied_slashes(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::std::vec::Vec<
@@ -10033,19 +10149,21 @@ pub mod api {
                             ::core::primitive::u128,
                         >,
                     >,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "UnappliedSlashes",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            121u8, 1u8, 135u8, 243u8, 99u8, 254u8, 238u8, 207u8, 145u8, 172u8,
-                            186u8, 131u8, 181u8, 109u8, 199u8, 93u8, 129u8, 65u8, 106u8, 118u8,
-                            197u8, 83u8, 65u8, 45u8, 149u8, 1u8, 85u8, 99u8, 239u8, 148u8, 40u8,
-                            177u8,
+                            158u8, 134u8, 7u8, 21u8, 200u8, 222u8, 197u8, 166u8, 199u8, 39u8, 1u8,
+                            167u8, 164u8, 154u8, 165u8, 118u8, 92u8, 223u8, 219u8, 136u8, 196u8,
+                            155u8, 243u8, 20u8, 198u8, 92u8, 198u8, 61u8, 252u8, 176u8, 175u8,
+                            172u8,
                         ],
                     )
                 }
@@ -10067,47 +10185,43 @@ pub mod api {
                         "BondedEras",
                         vec![],
                         [
-                            187u8, 216u8, 245u8, 253u8, 194u8, 182u8, 60u8, 244u8, 203u8, 84u8,
-                            228u8, 163u8, 149u8, 205u8, 57u8, 176u8, 203u8, 156u8, 20u8, 29u8,
-                            52u8, 234u8, 200u8, 63u8, 88u8, 49u8, 89u8, 117u8, 252u8, 75u8, 172u8,
-                            53u8,
+                            20u8, 0u8, 164u8, 169u8, 183u8, 130u8, 242u8, 167u8, 92u8, 254u8,
+                            191u8, 206u8, 177u8, 182u8, 219u8, 162u8, 7u8, 116u8, 223u8, 166u8,
+                            239u8, 216u8, 140u8, 42u8, 174u8, 237u8, 134u8, 186u8, 180u8, 62u8,
+                            175u8, 239u8,
                         ],
                     )
                 }
                 #[doc = " All slashing events on validators, mapped by era to the highest slash proportion"]
                 #[doc = " and slash value of the era."]
-                pub fn validator_slash_in_era(
+                pub fn validator_slash_in_era_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
-                    _1: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     (
                         runtime_types::sp_arithmetic::per_things::Perbill,
                         ::core::primitive::u128,
                     ),
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "ValidatorSlashInEra",
-                        vec![
-                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
-                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
-                        ],
+                        vec![],
                         [
-                            224u8, 141u8, 93u8, 44u8, 47u8, 157u8, 205u8, 12u8, 68u8, 41u8, 221u8,
-                            210u8, 141u8, 225u8, 253u8, 22u8, 175u8, 11u8, 92u8, 76u8, 180u8, 4u8,
-                            106u8, 135u8, 166u8, 47u8, 201u8, 43u8, 165u8, 42u8, 232u8, 219u8,
+                            245u8, 72u8, 52u8, 22u8, 10u8, 177u8, 127u8, 83u8, 180u8, 246u8, 17u8,
+                            82u8, 6u8, 231u8, 131u8, 68u8, 73u8, 92u8, 241u8, 251u8, 32u8, 97u8,
+                            121u8, 137u8, 190u8, 227u8, 162u8, 16u8, 224u8, 207u8, 63u8, 184u8,
                         ],
                     )
                 }
                 #[doc = " All slashing events on validators, mapped by era to the highest slash proportion"]
                 #[doc = " and slash value of the era."]
-                pub fn validator_slash_in_era_root(
+                pub fn validator_slash_in_era_iter1(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     (
@@ -10121,33 +10235,60 @@ pub mod api {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "ValidatorSlashInEra",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            224u8, 141u8, 93u8, 44u8, 47u8, 157u8, 205u8, 12u8, 68u8, 41u8, 221u8,
-                            210u8, 141u8, 225u8, 253u8, 22u8, 175u8, 11u8, 92u8, 76u8, 180u8, 4u8,
-                            106u8, 135u8, 166u8, 47u8, 201u8, 43u8, 165u8, 42u8, 232u8, 219u8,
+                            245u8, 72u8, 52u8, 22u8, 10u8, 177u8, 127u8, 83u8, 180u8, 246u8, 17u8,
+                            82u8, 6u8, 231u8, 131u8, 68u8, 73u8, 92u8, 241u8, 251u8, 32u8, 97u8,
+                            121u8, 137u8, 190u8, 227u8, 162u8, 16u8, 224u8, 207u8, 63u8, 184u8,
                         ],
                     )
                 }
-                #[doc = " All slashing events on nominators, mapped by era to the highest slash value of the era."]
-                pub fn nominator_slash_in_era(
+                #[doc = " All slashing events on validators, mapped by era to the highest slash proportion"]
+                #[doc = " and slash value of the era."]
+                pub fn validator_slash_in_era(
                     &self,
                     _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                     _1: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
-                    ::core::primitive::u128,
+                    (
+                        runtime_types::sp_arithmetic::per_things::Perbill,
+                        ::core::primitive::u128,
+                    ),
                     ::subxt::storage::address::Yes,
                     (),
-                    ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
-                        "NominatorSlashInEra",
+                        "ValidatorSlashInEra",
                         vec![
                             ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
                             ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
                         ],
+                        [
+                            245u8, 72u8, 52u8, 22u8, 10u8, 177u8, 127u8, 83u8, 180u8, 246u8, 17u8,
+                            82u8, 6u8, 231u8, 131u8, 68u8, 73u8, 92u8, 241u8, 251u8, 32u8, 97u8,
+                            121u8, 137u8, 190u8, 227u8, 162u8, 16u8, 224u8, 207u8, 63u8, 184u8,
+                        ],
+                    )
+                }
+                #[doc = " All slashing events on nominators, mapped by era to the highest slash value of the era."]
+                pub fn nominator_slash_in_era_iter(
+                    &self,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    ::core::primitive::u128,
+                    (),
+                    (),
+                    ::subxt::storage::address::Yes,
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "Staking",
+                        "NominatorSlashInEra",
+                        vec![],
                         [
                             8u8, 89u8, 171u8, 183u8, 64u8, 29u8, 44u8, 185u8, 11u8, 204u8, 67u8,
                             60u8, 208u8, 132u8, 9u8, 214u8, 13u8, 148u8, 205u8, 26u8, 5u8, 7u8,
@@ -10156,8 +10297,9 @@ pub mod api {
                     )
                 }
                 #[doc = " All slashing events on nominators, mapped by era to the highest slash value of the era."]
-                pub fn nominator_slash_in_era_root(
+                pub fn nominator_slash_in_era_iter1(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u128,
@@ -10168,7 +10310,35 @@ pub mod api {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "NominatorSlashInEra",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
+                        [
+                            8u8, 89u8, 171u8, 183u8, 64u8, 29u8, 44u8, 185u8, 11u8, 204u8, 67u8,
+                            60u8, 208u8, 132u8, 9u8, 214u8, 13u8, 148u8, 205u8, 26u8, 5u8, 7u8,
+                            250u8, 191u8, 83u8, 118u8, 95u8, 17u8, 40u8, 126u8, 16u8, 135u8,
+                        ],
+                    )
+                }
+                #[doc = " All slashing events on nominators, mapped by era to the highest slash value of the era."]
+                pub fn nominator_slash_in_era(
+                    &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
+                    _1: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    ::core::primitive::u128,
+                    ::subxt::storage::address::Yes,
+                    (),
+                    (),
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "Staking",
+                        "NominatorSlashInEra",
+                        vec![
+                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
+                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
+                        ],
                         [
                             8u8, 89u8, 171u8, 183u8, 64u8, 29u8, 44u8, 185u8, 11u8, 204u8, 67u8,
                             60u8, 208u8, 132u8, 9u8, 214u8, 13u8, 148u8, 205u8, 26u8, 5u8, 7u8,
@@ -10177,6 +10347,28 @@ pub mod api {
                     )
                 }
                 #[doc = " Slashing spans for stash accounts."]
+                pub fn slashing_spans_iter(
+                    &self,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    runtime_types::pallet_staking::slashing::SlashingSpans,
+                    (),
+                    (),
+                    ::subxt::storage::address::Yes,
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "Staking",
+                        "SlashingSpans",
+                        vec![],
+                        [
+                            74u8, 169u8, 189u8, 252u8, 193u8, 191u8, 114u8, 107u8, 158u8, 125u8,
+                            252u8, 35u8, 177u8, 129u8, 99u8, 24u8, 77u8, 223u8, 238u8, 24u8, 237u8,
+                            225u8, 5u8, 117u8, 163u8, 180u8, 139u8, 22u8, 169u8, 185u8, 60u8,
+                            217u8,
+                        ],
+                    )
+                }
+                #[doc = " Slashing spans for stash accounts."]
                 pub fn slashing_spans(
                     &self,
                     _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
@@ -10185,7 +10377,7 @@ pub mod api {
                     runtime_types::pallet_staking::slashing::SlashingSpans,
                     ::subxt::storage::address::Yes,
                     (),
-                    ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
@@ -10194,81 +10386,84 @@ pub mod api {
                             _0.borrow(),
                         )],
                         [
-                            160u8, 190u8, 57u8, 128u8, 105u8, 73u8, 194u8, 75u8, 12u8, 120u8,
-                            141u8, 190u8, 235u8, 250u8, 221u8, 200u8, 141u8, 162u8, 31u8, 85u8,
-                            239u8, 108u8, 200u8, 148u8, 155u8, 48u8, 44u8, 89u8, 5u8, 177u8, 236u8,
-                            182u8,
+                            74u8, 169u8, 189u8, 252u8, 193u8, 191u8, 114u8, 107u8, 158u8, 125u8,
+                            252u8, 35u8, 177u8, 129u8, 99u8, 24u8, 77u8, 223u8, 238u8, 24u8, 237u8,
+                            225u8, 5u8, 117u8, 163u8, 180u8, 139u8, 22u8, 169u8, 185u8, 60u8,
+                            217u8,
                         ],
                     )
                 }
-                #[doc = " Slashing spans for stash accounts."]
-                pub fn slashing_spans_root(
+                #[doc = " Records information about the maximum slash of a stash within a slashing span,"]
+                #[doc = " as well as how much reward has been paid out."]
+                pub fn span_slash_iter(
                     &self,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
-                    runtime_types::pallet_staking::slashing::SlashingSpans,
-                    (),
+                    runtime_types::pallet_staking::slashing::SpanRecord<::core::primitive::u128>,
                     (),
                     ::subxt::storage::address::Yes,
+                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
-                        "SlashingSpans",
-                        Vec::new(),
+                        "SpanSlash",
+                        vec![],
                         [
-                            160u8, 190u8, 57u8, 128u8, 105u8, 73u8, 194u8, 75u8, 12u8, 120u8,
-                            141u8, 190u8, 235u8, 250u8, 221u8, 200u8, 141u8, 162u8, 31u8, 85u8,
-                            239u8, 108u8, 200u8, 148u8, 155u8, 48u8, 44u8, 89u8, 5u8, 177u8, 236u8,
-                            182u8,
+                            158u8, 168u8, 151u8, 108u8, 4u8, 168u8, 253u8, 28u8, 69u8, 111u8, 99u8,
+                            235u8, 175u8, 72u8, 48u8, 238u8, 239u8, 142u8, 40u8, 142u8, 97u8, 77u8,
+                            72u8, 123u8, 210u8, 157u8, 119u8, 180u8, 205u8, 98u8, 110u8, 215u8,
                         ],
                     )
                 }
                 #[doc = " Records information about the maximum slash of a stash within a slashing span,"]
                 #[doc = " as well as how much reward has been paid out."]
-                pub fn span_slash(
+                pub fn span_slash_iter1(
                     &self,
                     _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
-                    _1: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_staking::slashing::SpanRecord<::core::primitive::u128>,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "SpanSlash",
-                        vec![
-                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
-                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
-                        ],
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            6u8, 241u8, 205u8, 89u8, 62u8, 181u8, 211u8, 216u8, 190u8, 41u8, 81u8,
-                            136u8, 136u8, 139u8, 57u8, 243u8, 174u8, 150u8, 132u8, 211u8, 79u8,
-                            138u8, 108u8, 218u8, 19u8, 225u8, 60u8, 26u8, 135u8, 6u8, 21u8, 116u8,
+                            158u8, 168u8, 151u8, 108u8, 4u8, 168u8, 253u8, 28u8, 69u8, 111u8, 99u8,
+                            235u8, 175u8, 72u8, 48u8, 238u8, 239u8, 142u8, 40u8, 142u8, 97u8, 77u8,
+                            72u8, 123u8, 210u8, 157u8, 119u8, 180u8, 205u8, 98u8, 110u8, 215u8,
                         ],
                     )
                 }
                 #[doc = " Records information about the maximum slash of a stash within a slashing span,"]
                 #[doc = " as well as how much reward has been paid out."]
-                pub fn span_slash_root(
+                pub fn span_slash(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
+                    _1: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_staking::slashing::SpanRecord<::core::primitive::u128>,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Staking",
                         "SpanSlash",
-                        Vec::new(),
+                        vec![
+                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
+                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
+                        ],
                         [
-                            6u8, 241u8, 205u8, 89u8, 62u8, 181u8, 211u8, 216u8, 190u8, 41u8, 81u8,
-                            136u8, 136u8, 139u8, 57u8, 243u8, 174u8, 150u8, 132u8, 211u8, 79u8,
-                            138u8, 108u8, 218u8, 19u8, 225u8, 60u8, 26u8, 135u8, 6u8, 21u8, 116u8,
+                            158u8, 168u8, 151u8, 108u8, 4u8, 168u8, 253u8, 28u8, 69u8, 111u8, 99u8,
+                            235u8, 175u8, 72u8, 48u8, 238u8, 239u8, 142u8, 40u8, 142u8, 97u8, 77u8,
+                            72u8, 123u8, 210u8, 157u8, 119u8, 180u8, 205u8, 98u8, 110u8, 215u8,
                         ],
                     )
                 }
@@ -10528,9 +10723,8 @@ pub mod api {
             pub struct StorageApi;
             impl StorageApi {
                 #[doc = " The primary structure that holds all offence records keyed by report identifiers."]
-                pub fn reports(
+                pub fn reports_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::H256>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::sp_staking::offence::OffenceDetails<
@@ -10543,27 +10737,25 @@ pub mod api {
                             >,
                         ),
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Offences",
                         "Reports",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            242u8, 69u8, 20u8, 130u8, 250u8, 223u8, 68u8, 121u8, 187u8, 215u8,
-                            62u8, 204u8, 100u8, 51u8, 76u8, 164u8, 188u8, 182u8, 215u8, 93u8,
-                            161u8, 100u8, 187u8, 205u8, 73u8, 158u8, 57u8, 198u8, 239u8, 66u8,
-                            42u8, 65u8,
+                            140u8, 14u8, 199u8, 180u8, 83u8, 5u8, 23u8, 57u8, 241u8, 41u8, 240u8,
+                            35u8, 80u8, 12u8, 115u8, 16u8, 2u8, 15u8, 22u8, 77u8, 25u8, 92u8,
+                            100u8, 39u8, 226u8, 55u8, 240u8, 80u8, 190u8, 196u8, 234u8, 177u8,
                         ],
                     )
                 }
                 #[doc = " The primary structure that holds all offence records keyed by report identifiers."]
-                pub fn reports_root(
+                pub fn reports(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::H256>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::sp_staking::offence::OffenceDetails<
@@ -10576,52 +10768,49 @@ pub mod api {
                             >,
                         ),
                     >,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Offences",
                         "Reports",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            242u8, 69u8, 20u8, 130u8, 250u8, 223u8, 68u8, 121u8, 187u8, 215u8,
-                            62u8, 204u8, 100u8, 51u8, 76u8, 164u8, 188u8, 182u8, 215u8, 93u8,
-                            161u8, 100u8, 187u8, 205u8, 73u8, 158u8, 57u8, 198u8, 239u8, 66u8,
-                            42u8, 65u8,
+                            140u8, 14u8, 199u8, 180u8, 83u8, 5u8, 23u8, 57u8, 241u8, 41u8, 240u8,
+                            35u8, 80u8, 12u8, 115u8, 16u8, 2u8, 15u8, 22u8, 77u8, 25u8, 92u8,
+                            100u8, 39u8, 226u8, 55u8, 240u8, 80u8, 190u8, 196u8, 234u8, 177u8,
                         ],
                     )
                 }
                 #[doc = " A vector of reports of the same kind that happened at the same time slot."]
-                pub fn concurrent_reports_index(
+                pub fn concurrent_reports_index_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<[::core::primitive::u8; 16usize]>,
-                    _1: impl ::std::borrow::Borrow<[::core::primitive::u8]>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::std::vec::Vec<::subxt::utils::H256>,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Offences",
                         "ConcurrentReportsIndex",
-                        vec![
-                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
-                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
-                        ],
+                        vec![],
                         [
-                            125u8, 222u8, 9u8, 162u8, 38u8, 89u8, 77u8, 187u8, 129u8, 103u8, 21u8,
-                            31u8, 117u8, 101u8, 43u8, 115u8, 170u8, 205u8, 142u8, 26u8, 27u8,
-                            184u8, 152u8, 133u8, 76u8, 203u8, 78u8, 113u8, 51u8, 141u8, 118u8,
-                            171u8,
+                            170u8, 186u8, 72u8, 29u8, 251u8, 38u8, 193u8, 195u8, 109u8, 86u8, 0u8,
+                            241u8, 20u8, 235u8, 108u8, 126u8, 215u8, 82u8, 73u8, 113u8, 199u8,
+                            138u8, 24u8, 58u8, 216u8, 72u8, 221u8, 232u8, 252u8, 244u8, 96u8,
+                            247u8,
                         ],
                     )
                 }
                 #[doc = " A vector of reports of the same kind that happened at the same time slot."]
-                pub fn concurrent_reports_index_root(
+                pub fn concurrent_reports_index_iter1(
                     &self,
+                    _0: impl ::std::borrow::Borrow<[::core::primitive::u8; 16usize]>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::std::vec::Vec<::subxt::utils::H256>,
@@ -10632,12 +10821,41 @@ pub mod api {
                     ::subxt::storage::address::Address::new_static(
                         "Offences",
                         "ConcurrentReportsIndex",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            125u8, 222u8, 9u8, 162u8, 38u8, 89u8, 77u8, 187u8, 129u8, 103u8, 21u8,
-                            31u8, 117u8, 101u8, 43u8, 115u8, 170u8, 205u8, 142u8, 26u8, 27u8,
-                            184u8, 152u8, 133u8, 76u8, 203u8, 78u8, 113u8, 51u8, 141u8, 118u8,
-                            171u8,
+                            170u8, 186u8, 72u8, 29u8, 251u8, 38u8, 193u8, 195u8, 109u8, 86u8, 0u8,
+                            241u8, 20u8, 235u8, 108u8, 126u8, 215u8, 82u8, 73u8, 113u8, 199u8,
+                            138u8, 24u8, 58u8, 216u8, 72u8, 221u8, 232u8, 252u8, 244u8, 96u8,
+                            247u8,
+                        ],
+                    )
+                }
+                #[doc = " A vector of reports of the same kind that happened at the same time slot."]
+                pub fn concurrent_reports_index(
+                    &self,
+                    _0: impl ::std::borrow::Borrow<[::core::primitive::u8; 16usize]>,
+                    _1: impl ::std::borrow::Borrow<[::core::primitive::u8]>,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    ::std::vec::Vec<::subxt::utils::H256>,
+                    ::subxt::storage::address::Yes,
+                    ::subxt::storage::address::Yes,
+                    (),
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "Offences",
+                        "ConcurrentReportsIndex",
+                        vec![
+                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
+                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
+                        ],
+                        [
+                            170u8, 186u8, 72u8, 29u8, 251u8, 38u8, 193u8, 195u8, 109u8, 86u8, 0u8,
+                            241u8, 20u8, 235u8, 108u8, 126u8, 215u8, 82u8, 73u8, 113u8, 199u8,
+                            138u8, 24u8, 58u8, 216u8, 72u8, 221u8, 232u8, 252u8, 244u8, 96u8,
+                            247u8,
                         ],
                     )
                 }
@@ -10708,9 +10926,9 @@ pub mod api {
                         "set_keys",
                         types::SetKeys { keys, proof },
                         [
-                            196u8, 19u8, 135u8, 231u8, 6u8, 18u8, 193u8, 169u8, 221u8, 1u8, 11u8,
-                            230u8, 158u8, 75u8, 179u8, 84u8, 128u8, 236u8, 95u8, 156u8, 219u8, 5u8,
-                            240u8, 82u8, 65u8, 73u8, 134u8, 239u8, 164u8, 233u8, 109u8, 51u8,
+                            34u8, 174u8, 125u8, 16u8, 173u8, 107u8, 253u8, 141u8, 27u8, 177u8,
+                            211u8, 118u8, 29u8, 108u8, 84u8, 116u8, 138u8, 212u8, 123u8, 27u8,
+                            87u8, 60u8, 198u8, 48u8, 4u8, 150u8, 230u8, 8u8, 36u8, 1u8, 74u8, 13u8,
                         ],
                     )
                 }
@@ -10845,10 +11063,10 @@ pub mod api {
                         "QueuedKeys",
                         vec![],
                         [
-                            252u8, 177u8, 138u8, 47u8, 254u8, 168u8, 165u8, 96u8, 182u8, 36u8,
-                            23u8, 235u8, 10u8, 134u8, 96u8, 248u8, 167u8, 117u8, 188u8, 170u8,
-                            143u8, 184u8, 115u8, 6u8, 138u8, 118u8, 192u8, 171u8, 64u8, 205u8,
-                            185u8, 189u8,
+                            112u8, 98u8, 60u8, 1u8, 187u8, 198u8, 207u8, 148u8, 164u8, 235u8,
+                            211u8, 169u8, 230u8, 39u8, 145u8, 166u8, 131u8, 53u8, 85u8, 171u8,
+                            223u8, 147u8, 137u8, 135u8, 42u8, 203u8, 37u8, 27u8, 67u8, 129u8,
+                            103u8, 129u8,
                         ],
                     )
                 }
@@ -10878,6 +11096,27 @@ pub mod api {
                     )
                 }
                 #[doc = " The next session keys for a validator."]
+                pub fn next_keys_iter(
+                    &self,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    runtime_types::polkadot_runtime::SessionKeys,
+                    (),
+                    (),
+                    ::subxt::storage::address::Yes,
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "Session",
+                        "NextKeys",
+                        vec![],
+                        [
+                            204u8, 75u8, 94u8, 239u8, 45u8, 174u8, 177u8, 27u8, 185u8, 143u8, 4u8,
+                            2u8, 157u8, 212u8, 9u8, 103u8, 51u8, 160u8, 35u8, 61u8, 118u8, 144u8,
+                            32u8, 217u8, 9u8, 159u8, 15u8, 177u8, 91u8, 108u8, 0u8, 219u8,
+                        ],
+                    )
+                }
+                #[doc = " The next session keys for a validator."]
                 pub fn next_keys(
                     &self,
                     _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
@@ -10886,7 +11125,7 @@ pub mod api {
                     runtime_types::polkadot_runtime::SessionKeys,
                     ::subxt::storage::address::Yes,
                     (),
-                    ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Session",
@@ -10895,77 +11134,83 @@ pub mod api {
                             _0.borrow(),
                         )],
                         [
-                            241u8, 163u8, 41u8, 123u8, 225u8, 80u8, 136u8, 229u8, 85u8, 122u8,
-                            31u8, 187u8, 249u8, 216u8, 182u8, 218u8, 66u8, 62u8, 95u8, 35u8, 91u8,
-                            0u8, 143u8, 113u8, 151u8, 63u8, 241u8, 176u8, 99u8, 246u8, 239u8, 35u8,
+                            204u8, 75u8, 94u8, 239u8, 45u8, 174u8, 177u8, 27u8, 185u8, 143u8, 4u8,
+                            2u8, 157u8, 212u8, 9u8, 103u8, 51u8, 160u8, 35u8, 61u8, 118u8, 144u8,
+                            32u8, 217u8, 9u8, 159u8, 15u8, 177u8, 91u8, 108u8, 0u8, 219u8,
                         ],
                     )
                 }
-                #[doc = " The next session keys for a validator."]
-                pub fn next_keys_root(
+                #[doc = " The owner of a key. The key is the `KeyTypeId` + the encoded key."]
+                pub fn key_owner_iter(
                     &self,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
-                    runtime_types::polkadot_runtime::SessionKeys,
+                    ::subxt::utils::AccountId32,
                     (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Session",
-                        "NextKeys",
-                        Vec::new(),
+                        "KeyOwner",
+                        vec![],
                         [
-                            241u8, 163u8, 41u8, 123u8, 225u8, 80u8, 136u8, 229u8, 85u8, 122u8,
-                            31u8, 187u8, 249u8, 216u8, 182u8, 218u8, 66u8, 62u8, 95u8, 35u8, 91u8,
-                            0u8, 143u8, 113u8, 151u8, 63u8, 241u8, 176u8, 99u8, 246u8, 239u8, 35u8,
+                            217u8, 204u8, 21u8, 114u8, 247u8, 129u8, 32u8, 242u8, 93u8, 91u8,
+                            253u8, 253u8, 248u8, 90u8, 12u8, 202u8, 195u8, 25u8, 18u8, 100u8,
+                            253u8, 109u8, 88u8, 77u8, 217u8, 140u8, 51u8, 40u8, 118u8, 35u8, 107u8,
+                            206u8,
                         ],
                     )
                 }
                 #[doc = " The owner of a key. The key is the `KeyTypeId` + the encoded key."]
-                pub fn key_owner(
+                pub fn key_owner_iter1(
                     &self,
                     _0: impl ::std::borrow::Borrow<runtime_types::sp_core::crypto::KeyTypeId>,
-                    _1: impl ::std::borrow::Borrow<[::core::primitive::u8]>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::subxt::utils::AccountId32,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Session",
                         "KeyOwner",
-                        vec![
-                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
-                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
-                        ],
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            177u8, 90u8, 148u8, 24u8, 251u8, 26u8, 65u8, 235u8, 46u8, 25u8, 109u8,
-                            212u8, 208u8, 218u8, 58u8, 196u8, 29u8, 73u8, 145u8, 41u8, 30u8, 251u8,
-                            185u8, 26u8, 205u8, 50u8, 32u8, 200u8, 206u8, 178u8, 255u8, 146u8,
+                            217u8, 204u8, 21u8, 114u8, 247u8, 129u8, 32u8, 242u8, 93u8, 91u8,
+                            253u8, 253u8, 248u8, 90u8, 12u8, 202u8, 195u8, 25u8, 18u8, 100u8,
+                            253u8, 109u8, 88u8, 77u8, 217u8, 140u8, 51u8, 40u8, 118u8, 35u8, 107u8,
+                            206u8,
                         ],
                     )
                 }
                 #[doc = " The owner of a key. The key is the `KeyTypeId` + the encoded key."]
-                pub fn key_owner_root(
+                pub fn key_owner(
                     &self,
+                    _0: impl ::std::borrow::Borrow<runtime_types::sp_core::crypto::KeyTypeId>,
+                    _1: impl ::std::borrow::Borrow<[::core::primitive::u8]>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::subxt::utils::AccountId32,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Session",
                         "KeyOwner",
-                        Vec::new(),
+                        vec![
+                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
+                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
+                        ],
                         [
-                            177u8, 90u8, 148u8, 24u8, 251u8, 26u8, 65u8, 235u8, 46u8, 25u8, 109u8,
-                            212u8, 208u8, 218u8, 58u8, 196u8, 29u8, 73u8, 145u8, 41u8, 30u8, 251u8,
-                            185u8, 26u8, 205u8, 50u8, 32u8, 200u8, 206u8, 178u8, 255u8, 146u8,
+                            217u8, 204u8, 21u8, 114u8, 247u8, 129u8, 32u8, 242u8, 93u8, 91u8,
+                            253u8, 253u8, 248u8, 90u8, 12u8, 202u8, 195u8, 25u8, 18u8, 100u8,
+                            253u8, 109u8, 88u8, 77u8, 217u8, 140u8, 51u8, 40u8, 118u8, 35u8, 107u8,
+                            206u8,
                         ],
                     )
                 }
@@ -11069,10 +11314,9 @@ pub mod api {
                             key_owner_proof,
                         },
                         [
-                            239u8, 120u8, 210u8, 103u8, 106u8, 180u8, 41u8, 20u8, 164u8, 142u8,
-                            156u8, 209u8, 183u8, 254u8, 192u8, 178u8, 22u8, 64u8, 91u8, 4u8, 222u8,
-                            103u8, 37u8, 184u8, 252u8, 181u8, 65u8, 136u8, 103u8, 199u8, 250u8,
-                            66u8,
+                            11u8, 183u8, 81u8, 93u8, 41u8, 7u8, 70u8, 155u8, 8u8, 57u8, 177u8,
+                            245u8, 131u8, 79u8, 236u8, 118u8, 147u8, 114u8, 40u8, 204u8, 177u8,
+                            2u8, 43u8, 42u8, 2u8, 201u8, 202u8, 120u8, 150u8, 109u8, 108u8, 156u8,
                         ],
                     )
                 }
@@ -11093,9 +11337,9 @@ pub mod api {
                             key_owner_proof,
                         },
                         [
-                            238u8, 22u8, 92u8, 27u8, 26u8, 218u8, 114u8, 129u8, 133u8, 211u8, 34u8,
-                            239u8, 8u8, 11u8, 62u8, 201u8, 29u8, 38u8, 231u8, 63u8, 204u8, 13u8,
-                            82u8, 164u8, 83u8, 149u8, 0u8, 0u8, 102u8, 113u8, 106u8, 156u8,
+                            141u8, 133u8, 227u8, 65u8, 22u8, 181u8, 108u8, 9u8, 157u8, 27u8, 124u8,
+                            53u8, 177u8, 27u8, 5u8, 16u8, 193u8, 66u8, 59u8, 87u8, 143u8, 238u8,
+                            251u8, 167u8, 117u8, 138u8, 246u8, 236u8, 65u8, 148u8, 20u8, 131u8,
                         ],
                     )
                 }
@@ -11113,10 +11357,9 @@ pub mod api {
                             best_finalized_block_number,
                         },
                         [
-                            232u8, 162u8, 42u8, 199u8, 101u8, 116u8, 38u8, 27u8, 147u8, 15u8,
-                            224u8, 76u8, 229u8, 244u8, 13u8, 49u8, 218u8, 232u8, 253u8, 37u8, 7u8,
-                            222u8, 97u8, 158u8, 201u8, 199u8, 169u8, 218u8, 201u8, 136u8, 192u8,
-                            128u8,
+                            158u8, 25u8, 64u8, 114u8, 131u8, 139u8, 227u8, 132u8, 42u8, 107u8,
+                            40u8, 249u8, 18u8, 93u8, 254u8, 86u8, 37u8, 67u8, 250u8, 35u8, 241u8,
+                            194u8, 209u8, 20u8, 39u8, 75u8, 186u8, 21u8, 48u8, 124u8, 151u8, 31u8,
                         ],
                     )
                 }
@@ -11199,9 +11442,9 @@ pub mod api {
                         "State",
                         vec![],
                         [
-                            254u8, 81u8, 54u8, 203u8, 26u8, 74u8, 162u8, 215u8, 165u8, 247u8,
-                            143u8, 139u8, 242u8, 164u8, 67u8, 27u8, 97u8, 172u8, 66u8, 98u8, 28u8,
-                            151u8, 32u8, 38u8, 209u8, 82u8, 41u8, 209u8, 72u8, 3u8, 167u8, 42u8,
+                            73u8, 71u8, 112u8, 83u8, 238u8, 75u8, 44u8, 9u8, 180u8, 33u8, 30u8,
+                            121u8, 98u8, 96u8, 61u8, 133u8, 16u8, 70u8, 30u8, 249u8, 34u8, 148u8,
+                            15u8, 239u8, 164u8, 157u8, 52u8, 27u8, 144u8, 52u8, 223u8, 109u8,
                         ],
                     )
                 }
@@ -11220,9 +11463,10 @@ pub mod api {
                         "PendingChange",
                         vec![],
                         [
-                            207u8, 134u8, 15u8, 77u8, 9u8, 253u8, 20u8, 132u8, 226u8, 115u8, 150u8,
-                            184u8, 18u8, 15u8, 143u8, 172u8, 71u8, 114u8, 221u8, 162u8, 174u8,
-                            205u8, 46u8, 144u8, 70u8, 116u8, 18u8, 105u8, 250u8, 44u8, 75u8, 27u8,
+                            150u8, 194u8, 185u8, 248u8, 239u8, 43u8, 141u8, 253u8, 61u8, 106u8,
+                            74u8, 164u8, 209u8, 204u8, 206u8, 200u8, 32u8, 38u8, 11u8, 78u8, 84u8,
+                            243u8, 181u8, 142u8, 179u8, 151u8, 81u8, 204u8, 244u8, 150u8, 137u8,
+                            250u8,
                         ],
                     )
                 }
@@ -11262,9 +11506,9 @@ pub mod api {
                         "Stalled",
                         vec![],
                         [
-                            146u8, 18u8, 59u8, 59u8, 21u8, 246u8, 5u8, 167u8, 221u8, 8u8, 230u8,
-                            74u8, 81u8, 217u8, 67u8, 158u8, 136u8, 36u8, 23u8, 106u8, 136u8, 89u8,
-                            110u8, 217u8, 31u8, 138u8, 107u8, 251u8, 164u8, 10u8, 119u8, 18u8,
+                            6u8, 81u8, 205u8, 142u8, 195u8, 48u8, 0u8, 247u8, 108u8, 170u8, 10u8,
+                            249u8, 72u8, 206u8, 32u8, 103u8, 109u8, 57u8, 51u8, 21u8, 144u8, 204u8,
+                            79u8, 8u8, 191u8, 185u8, 38u8, 34u8, 118u8, 223u8, 75u8, 241u8,
                         ],
                     )
                 }
@@ -11301,22 +11545,19 @@ pub mod api {
                 #[doc = " during that session."]
                 #[doc = ""]
                 #[doc = " TWOX-NOTE: `SetId` is not under user control."]
-                pub fn set_id_session(
+                pub fn set_id_session_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u64>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u32,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Grandpa",
                         "SetIdSession",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             47u8, 0u8, 239u8, 121u8, 187u8, 213u8, 254u8, 50u8, 238u8, 10u8, 162u8,
                             65u8, 189u8, 166u8, 37u8, 74u8, 82u8, 81u8, 160u8, 20u8, 180u8, 253u8,
@@ -11334,19 +11575,22 @@ pub mod api {
                 #[doc = " during that session."]
                 #[doc = ""]
                 #[doc = " TWOX-NOTE: `SetId` is not under user control."]
-                pub fn set_id_session_root(
+                pub fn set_id_session(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u64>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u32,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Grandpa",
                         "SetIdSession",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             47u8, 0u8, 239u8, 121u8, 187u8, 213u8, 254u8, 50u8, 238u8, 10u8, 162u8,
                             65u8, 189u8, 166u8, 37u8, 74u8, 82u8, 81u8, 160u8, 20u8, 180u8, 253u8,
@@ -11447,10 +11691,9 @@ pub mod api {
                             signature,
                         },
                         [
-                            145u8, 227u8, 53u8, 178u8, 195u8, 173u8, 7u8, 209u8, 148u8, 82u8,
-                            125u8, 236u8, 128u8, 10u8, 134u8, 114u8, 95u8, 104u8, 111u8, 202u8,
-                            59u8, 192u8, 178u8, 182u8, 102u8, 86u8, 88u8, 50u8, 92u8, 66u8, 144u8,
-                            131u8,
+                            41u8, 78u8, 115u8, 250u8, 94u8, 34u8, 215u8, 28u8, 33u8, 175u8, 203u8,
+                            205u8, 14u8, 40u8, 197u8, 51u8, 24u8, 198u8, 173u8, 32u8, 119u8, 154u8,
+                            213u8, 125u8, 219u8, 3u8, 128u8, 52u8, 166u8, 223u8, 241u8, 129u8,
                         ],
                     )
                 }
@@ -11579,6 +11822,51 @@ pub mod api {
                     )
                 }
                 #[doc = " For each session index, we keep a mapping of `SessionIndex` and `AuthIndex`."]
+                pub fn received_heartbeats_iter(
+                    &self,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    ::core::primitive::bool,
+                    (),
+                    (),
+                    ::subxt::storage::address::Yes,
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "ImOnline",
+                        "ReceivedHeartbeats",
+                        vec![],
+                        [
+                            30u8, 155u8, 42u8, 200u8, 223u8, 48u8, 127u8, 31u8, 253u8, 195u8,
+                            234u8, 108u8, 64u8, 27u8, 247u8, 17u8, 187u8, 199u8, 41u8, 138u8, 55u8,
+                            163u8, 94u8, 226u8, 10u8, 3u8, 132u8, 129u8, 8u8, 138u8, 137u8, 171u8,
+                        ],
+                    )
+                }
+                #[doc = " For each session index, we keep a mapping of `SessionIndex` and `AuthIndex`."]
+                pub fn received_heartbeats_iter1(
+                    &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    ::core::primitive::bool,
+                    (),
+                    (),
+                    ::subxt::storage::address::Yes,
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "ImOnline",
+                        "ReceivedHeartbeats",
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
+                        [
+                            30u8, 155u8, 42u8, 200u8, 223u8, 48u8, 127u8, 31u8, 253u8, 195u8,
+                            234u8, 108u8, 64u8, 27u8, 247u8, 17u8, 187u8, 199u8, 41u8, 138u8, 55u8,
+                            163u8, 94u8, 226u8, 10u8, 3u8, 132u8, 129u8, 8u8, 138u8, 137u8, 171u8,
+                        ],
+                    )
+                }
+                #[doc = " For each session index, we keep a mapping of `SessionIndex` and `AuthIndex`."]
                 pub fn received_heartbeats(
                     &self,
                     _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
@@ -11588,7 +11876,7 @@ pub mod api {
                     ::core::primitive::bool,
                     ::subxt::storage::address::Yes,
                     (),
-                    ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ImOnline",
@@ -11598,81 +11886,86 @@ pub mod api {
                             ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
                         ],
                         [
-                            123u8, 182u8, 145u8, 49u8, 90u8, 110u8, 80u8, 53u8, 62u8, 45u8, 173u8,
-                            252u8, 126u8, 163u8, 229u8, 173u8, 54u8, 169u8, 61u8, 128u8, 10u8,
-                            33u8, 254u8, 78u8, 145u8, 134u8, 235u8, 26u8, 177u8, 55u8, 7u8, 75u8,
+                            30u8, 155u8, 42u8, 200u8, 223u8, 48u8, 127u8, 31u8, 253u8, 195u8,
+                            234u8, 108u8, 64u8, 27u8, 247u8, 17u8, 187u8, 199u8, 41u8, 138u8, 55u8,
+                            163u8, 94u8, 226u8, 10u8, 3u8, 132u8, 129u8, 8u8, 138u8, 137u8, 171u8,
                         ],
                     )
                 }
-                #[doc = " For each session index, we keep a mapping of `SessionIndex` and `AuthIndex`."]
-                pub fn received_heartbeats_root(
+                #[doc = " For each session index, we keep a mapping of `ValidatorId<T>` to the"]
+                #[doc = " number of blocks authored by the given authority."]
+                pub fn authored_blocks_iter(
                     &self,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
-                    ::core::primitive::bool,
-                    (),
+                    ::core::primitive::u32,
                     (),
                     ::subxt::storage::address::Yes,
+                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ImOnline",
-                        "ReceivedHeartbeats",
-                        Vec::new(),
+                        "AuthoredBlocks",
+                        vec![],
                         [
-                            123u8, 182u8, 145u8, 49u8, 90u8, 110u8, 80u8, 53u8, 62u8, 45u8, 173u8,
-                            252u8, 126u8, 163u8, 229u8, 173u8, 54u8, 169u8, 61u8, 128u8, 10u8,
-                            33u8, 254u8, 78u8, 145u8, 134u8, 235u8, 26u8, 177u8, 55u8, 7u8, 75u8,
+                            123u8, 76u8, 230u8, 113u8, 65u8, 255u8, 99u8, 79u8, 131u8, 139u8,
+                            218u8, 20u8, 174u8, 191u8, 224u8, 67u8, 137u8, 48u8, 146u8, 209u8,
+                            148u8, 69u8, 130u8, 9u8, 173u8, 253u8, 206u8, 196u8, 68u8, 160u8,
+                            233u8, 126u8,
                         ],
                     )
                 }
                 #[doc = " For each session index, we keep a mapping of `ValidatorId<T>` to the"]
                 #[doc = " number of blocks authored by the given authority."]
-                pub fn authored_blocks(
+                pub fn authored_blocks_iter1(
                     &self,
                     _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
-                    _1: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u32,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ImOnline",
                         "AuthoredBlocks",
-                        vec![
-                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
-                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
-                        ],
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            121u8, 246u8, 100u8, 191u8, 5u8, 211u8, 190u8, 244u8, 61u8, 73u8,
-                            169u8, 127u8, 116u8, 80u8, 118u8, 139u8, 115u8, 58u8, 125u8, 81u8,
-                            75u8, 20u8, 194u8, 74u8, 97u8, 188u8, 55u8, 160u8, 33u8, 155u8, 186u8,
-                            74u8,
+                            123u8, 76u8, 230u8, 113u8, 65u8, 255u8, 99u8, 79u8, 131u8, 139u8,
+                            218u8, 20u8, 174u8, 191u8, 224u8, 67u8, 137u8, 48u8, 146u8, 209u8,
+                            148u8, 69u8, 130u8, 9u8, 173u8, 253u8, 206u8, 196u8, 68u8, 160u8,
+                            233u8, 126u8,
                         ],
                     )
                 }
                 #[doc = " For each session index, we keep a mapping of `ValidatorId<T>` to the"]
                 #[doc = " number of blocks authored by the given authority."]
-                pub fn authored_blocks_root(
+                pub fn authored_blocks(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
+                    _1: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u32,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ImOnline",
                         "AuthoredBlocks",
-                        Vec::new(),
+                        vec![
+                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
+                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
+                        ],
                         [
-                            121u8, 246u8, 100u8, 191u8, 5u8, 211u8, 190u8, 244u8, 61u8, 73u8,
-                            169u8, 127u8, 116u8, 80u8, 118u8, 139u8, 115u8, 58u8, 125u8, 81u8,
-                            75u8, 20u8, 194u8, 74u8, 97u8, 188u8, 55u8, 160u8, 33u8, 155u8, 186u8,
-                            74u8,
+                            123u8, 76u8, 230u8, 113u8, 65u8, 255u8, 99u8, 79u8, 131u8, 139u8,
+                            218u8, 20u8, 174u8, 191u8, 224u8, 67u8, 137u8, 48u8, 146u8, 209u8,
+                            148u8, 69u8, 130u8, 9u8, 173u8, 253u8, 206u8, 196u8, 68u8, 160u8,
+                            233u8, 126u8,
                         ],
                     )
                 }
@@ -12080,10 +12373,10 @@ pub mod api {
                         "propose",
                         types::Propose { proposal, value },
                         [
-                            230u8, 248u8, 57u8, 131u8, 96u8, 178u8, 225u8, 150u8, 97u8, 77u8,
-                            246u8, 143u8, 151u8, 204u8, 201u8, 252u8, 133u8, 53u8, 34u8, 27u8,
-                            156u8, 2u8, 242u8, 170u8, 198u8, 157u8, 166u8, 84u8, 246u8, 86u8, 78u8,
-                            128u8,
+                            164u8, 45u8, 183u8, 137u8, 222u8, 27u8, 138u8, 45u8, 20u8, 18u8, 234u8,
+                            211u8, 52u8, 184u8, 234u8, 222u8, 193u8, 9u8, 160u8, 58u8, 198u8,
+                            106u8, 236u8, 210u8, 172u8, 34u8, 194u8, 107u8, 135u8, 83u8, 22u8,
+                            238u8,
                         ],
                     )
                 }
@@ -12117,10 +12410,9 @@ pub mod api {
                         "vote",
                         types::Vote { ref_index, vote },
                         [
-                            39u8, 113u8, 23u8, 175u8, 197u8, 225u8, 225u8, 129u8, 66u8, 50u8,
-                            236u8, 220u8, 50u8, 49u8, 98u8, 163u8, 176u8, 96u8, 17u8, 91u8, 28u8,
-                            187u8, 139u8, 148u8, 108u8, 110u8, 78u8, 253u8, 229u8, 3u8, 244u8,
-                            126u8,
+                            106u8, 195u8, 229u8, 44u8, 217u8, 214u8, 8u8, 234u8, 175u8, 62u8, 97u8,
+                            83u8, 193u8, 180u8, 103u8, 26u8, 174u8, 8u8, 2u8, 158u8, 25u8, 122u8,
+                            203u8, 122u8, 32u8, 14u8, 107u8, 169u8, 43u8, 240u8, 143u8, 103u8,
                         ],
                     )
                 }
@@ -12152,10 +12444,9 @@ pub mod api {
                         "external_propose",
                         types::ExternalPropose { proposal },
                         [
-                            247u8, 47u8, 180u8, 40u8, 205u8, 53u8, 99u8, 158u8, 4u8, 45u8, 157u8,
-                            247u8, 32u8, 117u8, 153u8, 170u8, 226u8, 250u8, 142u8, 38u8, 237u8,
-                            238u8, 75u8, 245u8, 184u8, 27u8, 157u8, 255u8, 213u8, 163u8, 92u8,
-                            251u8,
+                            99u8, 120u8, 61u8, 124u8, 244u8, 68u8, 12u8, 240u8, 11u8, 168u8, 4u8,
+                            50u8, 19u8, 152u8, 255u8, 97u8, 20u8, 195u8, 141u8, 199u8, 31u8, 250u8,
+                            222u8, 136u8, 47u8, 162u8, 0u8, 32u8, 215u8, 110u8, 94u8, 109u8,
                         ],
                     )
                 }
@@ -12171,10 +12462,9 @@ pub mod api {
                         "external_propose_majority",
                         types::ExternalProposeMajority { proposal },
                         [
-                            107u8, 81u8, 160u8, 130u8, 242u8, 208u8, 22u8, 70u8, 237u8, 235u8,
-                            236u8, 60u8, 206u8, 172u8, 251u8, 138u8, 168u8, 124u8, 136u8, 95u8,
-                            3u8, 184u8, 12u8, 55u8, 125u8, 233u8, 20u8, 148u8, 36u8, 189u8, 16u8,
-                            245u8,
+                            35u8, 61u8, 130u8, 81u8, 81u8, 180u8, 127u8, 202u8, 67u8, 84u8, 105u8,
+                            113u8, 112u8, 210u8, 1u8, 191u8, 10u8, 39u8, 157u8, 164u8, 9u8, 231u8,
+                            75u8, 25u8, 17u8, 175u8, 128u8, 180u8, 238u8, 58u8, 236u8, 214u8,
                         ],
                     )
                 }
@@ -12190,10 +12480,9 @@ pub mod api {
                         "external_propose_default",
                         types::ExternalProposeDefault { proposal },
                         [
-                            238u8, 247u8, 252u8, 35u8, 78u8, 158u8, 221u8, 87u8, 252u8, 98u8, 67u8,
-                            44u8, 200u8, 206u8, 28u8, 19u8, 204u8, 13u8, 253u8, 133u8, 229u8,
-                            195u8, 166u8, 218u8, 114u8, 69u8, 23u8, 169u8, 67u8, 168u8, 46u8,
-                            176u8,
+                            136u8, 199u8, 244u8, 69u8, 5u8, 174u8, 166u8, 251u8, 102u8, 196u8,
+                            25u8, 6u8, 33u8, 216u8, 141u8, 78u8, 118u8, 125u8, 128u8, 218u8, 120u8,
+                            170u8, 166u8, 15u8, 124u8, 216u8, 128u8, 178u8, 5u8, 74u8, 170u8, 25u8,
                         ],
                     )
                 }
@@ -12213,10 +12502,9 @@ pub mod api {
                             delay,
                         },
                         [
-                            147u8, 226u8, 166u8, 105u8, 149u8, 171u8, 86u8, 165u8, 168u8, 78u8,
-                            233u8, 182u8, 118u8, 36u8, 82u8, 155u8, 209u8, 55u8, 153u8, 141u8,
-                            120u8, 223u8, 46u8, 170u8, 48u8, 94u8, 32u8, 144u8, 84u8, 203u8, 68u8,
-                            62u8,
+                            96u8, 201u8, 216u8, 109u8, 4u8, 244u8, 52u8, 237u8, 120u8, 234u8, 30u8,
+                            102u8, 186u8, 132u8, 214u8, 22u8, 40u8, 75u8, 118u8, 23u8, 56u8, 68u8,
+                            192u8, 129u8, 74u8, 61u8, 247u8, 98u8, 103u8, 127u8, 200u8, 171u8,
                         ],
                     )
                 }
@@ -12270,9 +12558,10 @@ pub mod api {
                             balance,
                         },
                         [
-                            88u8, 58u8, 42u8, 172u8, 33u8, 212u8, 13u8, 24u8, 172u8, 217u8, 147u8,
-                            144u8, 62u8, 28u8, 38u8, 65u8, 90u8, 94u8, 212u8, 217u8, 74u8, 38u8,
-                            133u8, 168u8, 136u8, 43u8, 46u8, 136u8, 149u8, 22u8, 200u8, 217u8,
+                            98u8, 120u8, 223u8, 48u8, 181u8, 91u8, 232u8, 157u8, 124u8, 249u8,
+                            137u8, 195u8, 211u8, 199u8, 173u8, 118u8, 164u8, 196u8, 253u8, 53u8,
+                            214u8, 120u8, 138u8, 7u8, 129u8, 85u8, 217u8, 172u8, 98u8, 78u8, 165u8,
+                            37u8,
                         ],
                     )
                 }
@@ -12316,9 +12605,10 @@ pub mod api {
                         "unlock",
                         types::Unlock { target },
                         [
-                            158u8, 211u8, 121u8, 157u8, 250u8, 194u8, 139u8, 166u8, 111u8, 66u8,
-                            114u8, 82u8, 190u8, 51u8, 40u8, 78u8, 35u8, 217u8, 91u8, 204u8, 85u8,
-                            253u8, 175u8, 14u8, 205u8, 37u8, 22u8, 118u8, 0u8, 6u8, 235u8, 143u8,
+                            168u8, 111u8, 199u8, 137u8, 136u8, 162u8, 69u8, 122u8, 130u8, 226u8,
+                            234u8, 79u8, 214u8, 164u8, 127u8, 217u8, 140u8, 10u8, 116u8, 94u8, 5u8,
+                            58u8, 208u8, 255u8, 136u8, 147u8, 148u8, 133u8, 136u8, 206u8, 219u8,
+                            94u8,
                         ],
                     )
                 }
@@ -12350,9 +12640,10 @@ pub mod api {
                         "remove_other_vote",
                         types::RemoveOtherVote { target, index },
                         [
-                            130u8, 92u8, 224u8, 67u8, 200u8, 201u8, 9u8, 178u8, 138u8, 81u8, 37u8,
-                            130u8, 216u8, 75u8, 233u8, 119u8, 141u8, 89u8, 188u8, 61u8, 162u8,
-                            43u8, 136u8, 92u8, 227u8, 1u8, 160u8, 240u8, 26u8, 77u8, 222u8, 245u8,
+                            144u8, 81u8, 115u8, 108u8, 30u8, 235u8, 166u8, 115u8, 147u8, 56u8,
+                            144u8, 196u8, 252u8, 166u8, 201u8, 131u8, 0u8, 193u8, 21u8, 234u8,
+                            55u8, 253u8, 165u8, 149u8, 38u8, 47u8, 241u8, 140u8, 186u8, 139u8,
+                            227u8, 165u8,
                         ],
                     )
                 }
@@ -12404,10 +12695,9 @@ pub mod api {
                         "set_metadata",
                         types::SetMetadata { owner, maybe_hash },
                         [
-                            192u8, 174u8, 122u8, 229u8, 149u8, 49u8, 155u8, 209u8, 226u8, 255u8,
-                            46u8, 43u8, 77u8, 164u8, 226u8, 254u8, 207u8, 110u8, 222u8, 131u8,
-                            220u8, 53u8, 95u8, 170u8, 128u8, 212u8, 236u8, 168u8, 156u8, 29u8,
-                            151u8, 40u8,
+                            191u8, 200u8, 139u8, 27u8, 167u8, 250u8, 72u8, 78u8, 18u8, 98u8, 108u8,
+                            1u8, 122u8, 120u8, 47u8, 77u8, 174u8, 60u8, 247u8, 69u8, 228u8, 196u8,
+                            149u8, 107u8, 239u8, 45u8, 47u8, 118u8, 87u8, 233u8, 79u8, 29u8,
                         ],
                     )
                 }
@@ -12787,18 +13077,17 @@ pub mod api {
                         "PublicProps",
                         vec![],
                         [
-                            156u8, 21u8, 84u8, 229u8, 193u8, 34u8, 28u8, 230u8, 11u8, 108u8, 2u8,
-                            84u8, 188u8, 11u8, 25u8, 55u8, 130u8, 80u8, 164u8, 239u8, 150u8, 77u8,
-                            4u8, 246u8, 174u8, 16u8, 232u8, 23u8, 9u8, 194u8, 177u8, 73u8,
+                            174u8, 85u8, 209u8, 117u8, 29u8, 193u8, 230u8, 16u8, 94u8, 219u8, 69u8,
+                            29u8, 116u8, 35u8, 252u8, 43u8, 127u8, 0u8, 43u8, 218u8, 240u8, 176u8,
+                            73u8, 81u8, 207u8, 131u8, 227u8, 132u8, 242u8, 45u8, 172u8, 50u8,
                         ],
                     )
                 }
                 #[doc = " Those who have locked a deposit."]
                 #[doc = ""]
                 #[doc = " TWOX-NOTE: Safe, as increasing integer keys are safe."]
-                pub fn deposit_of(
+                pub fn deposit_of_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     (
@@ -12807,16 +13096,14 @@ pub mod api {
                         >,
                         ::core::primitive::u128,
                     ),
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Democracy",
                         "DepositOf",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             115u8, 12u8, 250u8, 191u8, 201u8, 165u8, 90u8, 140u8, 101u8, 47u8,
                             46u8, 3u8, 78u8, 30u8, 180u8, 22u8, 28u8, 154u8, 36u8, 99u8, 255u8,
@@ -12827,8 +13114,9 @@ pub mod api {
                 #[doc = " Those who have locked a deposit."]
                 #[doc = ""]
                 #[doc = " TWOX-NOTE: Safe, as increasing integer keys are safe."]
-                pub fn deposit_of_root(
+                pub fn deposit_of(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     (
@@ -12837,14 +13125,16 @@ pub mod api {
                         >,
                         ::core::primitive::u128,
                     ),
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Democracy",
                         "DepositOf",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             115u8, 12u8, 250u8, 191u8, 201u8, 165u8, 90u8, 140u8, 101u8, 47u8,
                             46u8, 3u8, 78u8, 30u8, 180u8, 22u8, 28u8, 154u8, 36u8, 99u8, 255u8,
@@ -12899,9 +13189,8 @@ pub mod api {
                 #[doc = " Information concerning any given referendum."]
                 #[doc = ""]
                 #[doc = " TWOX-NOTE: SAFE as indexes are not under an attacker’s control."]
-                pub fn referendum_info_of(
+                pub fn referendum_info_of_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_democracy::types::ReferendumInfo<
@@ -12911,29 +13200,28 @@ pub mod api {
                         >,
                         ::core::primitive::u128,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Democracy",
                         "ReferendumInfoOf",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            250u8, 201u8, 144u8, 220u8, 13u8, 14u8, 69u8, 171u8, 240u8, 119u8,
-                            158u8, 200u8, 86u8, 77u8, 115u8, 156u8, 156u8, 101u8, 215u8, 233u8,
-                            165u8, 96u8, 62u8, 201u8, 83u8, 203u8, 58u8, 67u8, 49u8, 174u8, 86u8,
-                            242u8,
+                            245u8, 152u8, 149u8, 236u8, 59u8, 164u8, 120u8, 142u8, 130u8, 25u8,
+                            119u8, 158u8, 103u8, 140u8, 203u8, 213u8, 110u8, 151u8, 137u8, 226u8,
+                            186u8, 130u8, 233u8, 245u8, 145u8, 145u8, 140u8, 54u8, 222u8, 219u8,
+                            234u8, 206u8,
                         ],
                     )
                 }
                 #[doc = " Information concerning any given referendum."]
                 #[doc = ""]
                 #[doc = " TWOX-NOTE: SAFE as indexes are not under an attacker’s control."]
-                pub fn referendum_info_of_root(
+                pub fn referendum_info_of(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_democracy::types::ReferendumInfo<
@@ -12943,19 +13231,21 @@ pub mod api {
                         >,
                         ::core::primitive::u128,
                     >,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Democracy",
                         "ReferendumInfoOf",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            250u8, 201u8, 144u8, 220u8, 13u8, 14u8, 69u8, 171u8, 240u8, 119u8,
-                            158u8, 200u8, 86u8, 77u8, 115u8, 156u8, 156u8, 101u8, 215u8, 233u8,
-                            165u8, 96u8, 62u8, 201u8, 83u8, 203u8, 58u8, 67u8, 49u8, 174u8, 86u8,
-                            242u8,
+                            245u8, 152u8, 149u8, 236u8, 59u8, 164u8, 120u8, 142u8, 130u8, 25u8,
+                            119u8, 158u8, 103u8, 140u8, 203u8, 213u8, 110u8, 151u8, 137u8, 226u8,
+                            186u8, 130u8, 233u8, 245u8, 145u8, 145u8, 140u8, 54u8, 222u8, 219u8,
+                            234u8, 206u8,
                         ],
                     )
                 }
@@ -12963,9 +13253,8 @@ pub mod api {
                 #[doc = " have recorded. The second item is the total amount of delegations, that will be added."]
                 #[doc = ""]
                 #[doc = " TWOX-NOTE: SAFE as `AccountId`s are crypto hashes anyway."]
-                pub fn voting_of(
+                pub fn voting_of_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_democracy::vote::Voting<
@@ -12973,21 +13262,18 @@ pub mod api {
                         ::subxt::utils::AccountId32,
                         ::core::primitive::u32,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Democracy",
                         "VotingOf",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            170u8, 234u8, 179u8, 190u8, 153u8, 172u8, 83u8, 105u8, 57u8, 88u8,
-                            183u8, 54u8, 172u8, 149u8, 222u8, 240u8, 128u8, 46u8, 25u8, 10u8,
-                            205u8, 69u8, 164u8, 173u8, 55u8, 188u8, 196u8, 51u8, 129u8, 206u8,
-                            87u8, 249u8,
+                            234u8, 35u8, 206u8, 197u8, 17u8, 251u8, 1u8, 230u8, 80u8, 235u8, 108u8,
+                            126u8, 82u8, 145u8, 39u8, 104u8, 209u8, 16u8, 209u8, 52u8, 165u8,
+                            231u8, 110u8, 92u8, 113u8, 212u8, 72u8, 57u8, 60u8, 73u8, 107u8, 118u8,
                         ],
                     )
                 }
@@ -12995,8 +13281,9 @@ pub mod api {
                 #[doc = " have recorded. The second item is the total amount of delegations, that will be added."]
                 #[doc = ""]
                 #[doc = " TWOX-NOTE: SAFE as `AccountId`s are crypto hashes anyway."]
-                pub fn voting_of_root(
+                pub fn voting_of(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_democracy::vote::Voting<
@@ -13004,19 +13291,20 @@ pub mod api {
                         ::subxt::utils::AccountId32,
                         ::core::primitive::u32,
                     >,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Democracy",
                         "VotingOf",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            170u8, 234u8, 179u8, 190u8, 153u8, 172u8, 83u8, 105u8, 57u8, 88u8,
-                            183u8, 54u8, 172u8, 149u8, 222u8, 240u8, 128u8, 46u8, 25u8, 10u8,
-                            205u8, 69u8, 164u8, 173u8, 55u8, 188u8, 196u8, 51u8, 129u8, 206u8,
-                            87u8, 249u8,
+                            234u8, 35u8, 206u8, 197u8, 17u8, 251u8, 1u8, 230u8, 80u8, 235u8, 108u8,
+                            126u8, 82u8, 145u8, 39u8, 104u8, 209u8, 16u8, 209u8, 52u8, 165u8,
+                            231u8, 110u8, 92u8, 113u8, 212u8, 72u8, 57u8, 60u8, 73u8, 107u8, 118u8,
                         ],
                     )
                 }
@@ -13065,17 +13353,17 @@ pub mod api {
                         "NextExternal",
                         vec![],
                         [
-                            130u8, 253u8, 139u8, 228u8, 253u8, 181u8, 172u8, 14u8, 214u8, 128u8,
-                            17u8, 195u8, 104u8, 64u8, 64u8, 132u8, 40u8, 212u8, 80u8, 47u8, 225u8,
-                            224u8, 9u8, 186u8, 80u8, 118u8, 120u8, 174u8, 174u8, 20u8, 150u8, 13u8,
+                            240u8, 58u8, 238u8, 86u8, 35u8, 48u8, 192u8, 51u8, 91u8, 4u8, 47u8,
+                            202u8, 21u8, 74u8, 158u8, 64u8, 107u8, 247u8, 248u8, 240u8, 122u8,
+                            109u8, 204u8, 180u8, 103u8, 239u8, 156u8, 68u8, 141u8, 253u8, 131u8,
+                            239u8,
                         ],
                     )
                 }
                 #[doc = " A record of who vetoed what. Maps proposal hash to a possible existent block number"]
                 #[doc = " (until when it may not be resubmitted) and who vetoed it."]
-                pub fn blacklist(
+                pub fn blacklist_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::H256>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     (
@@ -13084,27 +13372,26 @@ pub mod api {
                             ::subxt::utils::AccountId32,
                         >,
                     ),
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Democracy",
                         "Blacklist",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            238u8, 119u8, 98u8, 220u8, 11u8, 209u8, 90u8, 9u8, 69u8, 51u8, 59u8,
-                            177u8, 169u8, 113u8, 138u8, 13u8, 134u8, 14u8, 184u8, 6u8, 80u8, 182u8,
-                            154u8, 10u8, 100u8, 71u8, 117u8, 2u8, 150u8, 170u8, 154u8, 255u8,
+                            12u8, 231u8, 204u8, 151u8, 57u8, 182u8, 5u8, 74u8, 231u8, 100u8, 165u8,
+                            28u8, 147u8, 109u8, 119u8, 37u8, 138u8, 159u8, 7u8, 175u8, 41u8, 110u8,
+                            205u8, 69u8, 17u8, 9u8, 39u8, 102u8, 90u8, 244u8, 165u8, 141u8,
                         ],
                     )
                 }
                 #[doc = " A record of who vetoed what. Maps proposal hash to a possible existent block number"]
                 #[doc = " (until when it may not be resubmitted) and who vetoed it."]
-                pub fn blacklist_root(
+                pub fn blacklist(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::H256>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     (
@@ -13113,38 +13400,37 @@ pub mod api {
                             ::subxt::utils::AccountId32,
                         >,
                     ),
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Democracy",
                         "Blacklist",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            238u8, 119u8, 98u8, 220u8, 11u8, 209u8, 90u8, 9u8, 69u8, 51u8, 59u8,
-                            177u8, 169u8, 113u8, 138u8, 13u8, 134u8, 14u8, 184u8, 6u8, 80u8, 182u8,
-                            154u8, 10u8, 100u8, 71u8, 117u8, 2u8, 150u8, 170u8, 154u8, 255u8,
+                            12u8, 231u8, 204u8, 151u8, 57u8, 182u8, 5u8, 74u8, 231u8, 100u8, 165u8,
+                            28u8, 147u8, 109u8, 119u8, 37u8, 138u8, 159u8, 7u8, 175u8, 41u8, 110u8,
+                            205u8, 69u8, 17u8, 9u8, 39u8, 102u8, 90u8, 244u8, 165u8, 141u8,
                         ],
                     )
                 }
                 #[doc = " Record of all proposals that have been subject to emergency cancellation."]
-                pub fn cancellations(
+                pub fn cancellations_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::H256>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::bool,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Democracy",
                         "Cancellations",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             80u8, 190u8, 98u8, 105u8, 129u8, 25u8, 167u8, 180u8, 74u8, 128u8,
                             232u8, 29u8, 193u8, 209u8, 185u8, 60u8, 18u8, 180u8, 59u8, 192u8,
@@ -13154,19 +13440,22 @@ pub mod api {
                     )
                 }
                 #[doc = " Record of all proposals that have been subject to emergency cancellation."]
-                pub fn cancellations_root(
+                pub fn cancellations(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::H256>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::bool,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Democracy",
                         "Cancellations",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             80u8, 190u8, 98u8, 105u8, 129u8, 25u8, 167u8, 180u8, 74u8, 128u8,
                             232u8, 29u8, 193u8, 209u8, 185u8, 60u8, 18u8, 180u8, 59u8, 192u8,
@@ -13181,29 +13470,24 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " Consider a garbage collection for a metadata of finished referendums to `unrequest` (remove)"]
                 #[doc = " large preimages."]
-                pub fn metadata_of(
+                pub fn metadata_of_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<
-                        runtime_types::pallet_democracy::types::MetadataOwner,
-                    >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::subxt::utils::H256,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Democracy",
                         "MetadataOf",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            241u8, 106u8, 118u8, 66u8, 219u8, 192u8, 185u8, 117u8, 144u8, 174u8,
-                            171u8, 207u8, 181u8, 32u8, 133u8, 127u8, 160u8, 218u8, 113u8, 153u8,
-                            160u8, 7u8, 72u8, 58u8, 187u8, 96u8, 51u8, 236u8, 64u8, 80u8, 123u8,
-                            254u8,
+                            52u8, 151u8, 124u8, 110u8, 85u8, 173u8, 181u8, 86u8, 174u8, 183u8,
+                            102u8, 22u8, 8u8, 36u8, 224u8, 114u8, 98u8, 0u8, 220u8, 215u8, 19u8,
+                            147u8, 32u8, 238u8, 242u8, 187u8, 235u8, 163u8, 183u8, 235u8, 9u8,
+                            180u8,
                         ],
                     )
                 }
@@ -13213,24 +13497,29 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " Consider a garbage collection for a metadata of finished referendums to `unrequest` (remove)"]
                 #[doc = " large preimages."]
-                pub fn metadata_of_root(
+                pub fn metadata_of(
                     &self,
+                    _0: impl ::std::borrow::Borrow<
+                        runtime_types::pallet_democracy::types::MetadataOwner,
+                    >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::subxt::utils::H256,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Democracy",
                         "MetadataOf",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            241u8, 106u8, 118u8, 66u8, 219u8, 192u8, 185u8, 117u8, 144u8, 174u8,
-                            171u8, 207u8, 181u8, 32u8, 133u8, 127u8, 160u8, 218u8, 113u8, 153u8,
-                            160u8, 7u8, 72u8, 58u8, 187u8, 96u8, 51u8, 236u8, 64u8, 80u8, 123u8,
-                            254u8,
+                            52u8, 151u8, 124u8, 110u8, 85u8, 173u8, 181u8, 86u8, 174u8, 183u8,
+                            102u8, 22u8, 8u8, 36u8, 224u8, 114u8, 98u8, 0u8, 220u8, 215u8, 19u8,
+                            147u8, 32u8, 238u8, 242u8, 187u8, 235u8, 163u8, 183u8, 235u8, 9u8,
+                            180u8,
                         ],
                     )
                 }
@@ -13573,10 +13862,10 @@ pub mod api {
                             old_count,
                         },
                         [
-                            141u8, 113u8, 137u8, 46u8, 75u8, 22u8, 143u8, 204u8, 50u8, 24u8, 137u8,
-                            25u8, 226u8, 166u8, 121u8, 161u8, 54u8, 144u8, 12u8, 145u8, 157u8,
-                            153u8, 47u8, 144u8, 94u8, 34u8, 217u8, 115u8, 125u8, 152u8, 110u8,
-                            28u8,
+                            66u8, 224u8, 186u8, 178u8, 41u8, 208u8, 67u8, 192u8, 57u8, 242u8,
+                            141u8, 31u8, 216u8, 118u8, 192u8, 43u8, 125u8, 213u8, 226u8, 85u8,
+                            142u8, 225u8, 131u8, 45u8, 172u8, 142u8, 12u8, 9u8, 73u8, 7u8, 218u8,
+                            61u8,
                         ],
                     )
                 }
@@ -13594,10 +13883,10 @@ pub mod api {
                             length_bound,
                         },
                         [
-                            216u8, 185u8, 245u8, 220u8, 244u8, 26u8, 114u8, 10u8, 254u8, 75u8,
-                            64u8, 229u8, 195u8, 48u8, 61u8, 16u8, 185u8, 129u8, 188u8, 228u8,
-                            166u8, 252u8, 206u8, 236u8, 92u8, 0u8, 113u8, 196u8, 225u8, 148u8, 5u8,
-                            22u8,
+                            57u8, 78u8, 135u8, 149u8, 15u8, 44u8, 123u8, 161u8, 121u8, 152u8, 73u8,
+                            76u8, 23u8, 178u8, 128u8, 134u8, 229u8, 116u8, 220u8, 209u8, 124u8,
+                            175u8, 9u8, 173u8, 123u8, 76u8, 137u8, 124u8, 232u8, 100u8, 217u8,
+                            233u8,
                         ],
                     )
                 }
@@ -13617,10 +13906,9 @@ pub mod api {
                             length_bound,
                         },
                         [
-                            95u8, 215u8, 116u8, 248u8, 230u8, 207u8, 176u8, 74u8, 234u8, 82u8,
-                            78u8, 234u8, 167u8, 233u8, 93u8, 88u8, 94u8, 144u8, 59u8, 3u8, 88u8,
-                            139u8, 175u8, 111u8, 255u8, 193u8, 97u8, 43u8, 197u8, 143u8, 68u8,
-                            217u8,
+                            92u8, 0u8, 105u8, 179u8, 198u8, 127u8, 109u8, 59u8, 52u8, 164u8, 49u8,
+                            190u8, 20u8, 241u8, 90u8, 62u8, 104u8, 148u8, 58u8, 135u8, 184u8, 51u8,
+                            119u8, 48u8, 219u8, 241u8, 173u8, 77u8, 233u8, 109u8, 237u8, 25u8,
                         ],
                     )
                 }
@@ -13681,9 +13969,9 @@ pub mod api {
                             length_bound,
                         },
                         [
-                            189u8, 149u8, 125u8, 63u8, 39u8, 201u8, 247u8, 4u8, 220u8, 74u8, 78u8,
-                            14u8, 113u8, 163u8, 1u8, 159u8, 81u8, 248u8, 141u8, 111u8, 34u8, 243u8,
-                            67u8, 70u8, 60u8, 92u8, 47u8, 70u8, 66u8, 246u8, 236u8, 153u8,
+                            136u8, 48u8, 243u8, 34u8, 60u8, 109u8, 186u8, 158u8, 72u8, 48u8, 62u8,
+                            34u8, 167u8, 46u8, 33u8, 142u8, 239u8, 43u8, 238u8, 125u8, 94u8, 80u8,
+                            157u8, 245u8, 220u8, 126u8, 58u8, 244u8, 186u8, 195u8, 30u8, 127u8,
                         ],
                     )
                 }
@@ -13861,100 +14149,100 @@ pub mod api {
                     )
                 }
                 #[doc = " Actual proposal for a given hash, if it's current."]
-                pub fn proposal_of(
+                pub fn proposal_of_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::H256>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_runtime::RuntimeCall,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Council",
                         "ProposalOf",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            1u8, 24u8, 41u8, 101u8, 123u8, 154u8, 94u8, 31u8, 199u8, 5u8, 126u8,
-                            198u8, 32u8, 45u8, 176u8, 214u8, 29u8, 47u8, 226u8, 226u8, 232u8,
-                            138u8, 155u8, 128u8, 113u8, 171u8, 248u8, 244u8, 59u8, 212u8, 167u8,
-                            50u8,
+                            195u8, 20u8, 2u8, 141u8, 194u8, 2u8, 242u8, 114u8, 171u8, 16u8, 47u8,
+                            26u8, 11u8, 186u8, 159u8, 123u8, 59u8, 163u8, 129u8, 101u8, 0u8, 132u8,
+                            45u8, 116u8, 249u8, 72u8, 247u8, 143u8, 35u8, 163u8, 132u8, 246u8,
                         ],
                     )
                 }
                 #[doc = " Actual proposal for a given hash, if it's current."]
-                pub fn proposal_of_root(
+                pub fn proposal_of(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::H256>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_runtime::RuntimeCall,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Council",
                         "ProposalOf",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            1u8, 24u8, 41u8, 101u8, 123u8, 154u8, 94u8, 31u8, 199u8, 5u8, 126u8,
-                            198u8, 32u8, 45u8, 176u8, 214u8, 29u8, 47u8, 226u8, 226u8, 232u8,
-                            138u8, 155u8, 128u8, 113u8, 171u8, 248u8, 244u8, 59u8, 212u8, 167u8,
-                            50u8,
+                            195u8, 20u8, 2u8, 141u8, 194u8, 2u8, 242u8, 114u8, 171u8, 16u8, 47u8,
+                            26u8, 11u8, 186u8, 159u8, 123u8, 59u8, 163u8, 129u8, 101u8, 0u8, 132u8,
+                            45u8, 116u8, 249u8, 72u8, 247u8, 143u8, 35u8, 163u8, 132u8, 246u8,
                         ],
                     )
                 }
                 #[doc = " Votes on a given proposal, if it is ongoing."]
-                pub fn voting(
+                pub fn voting_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::H256>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_collective::Votes<
                         ::subxt::utils::AccountId32,
                         ::core::primitive::u32,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Council",
                         "Voting",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            56u8, 192u8, 111u8, 180u8, 253u8, 5u8, 232u8, 126u8, 177u8, 48u8,
-                            135u8, 39u8, 89u8, 71u8, 62u8, 239u8, 216u8, 17u8, 64u8, 82u8, 130u8,
-                            236u8, 96u8, 89u8, 167u8, 2u8, 118u8, 113u8, 63u8, 176u8, 124u8, 73u8,
+                            109u8, 198u8, 2u8, 13u8, 29u8, 14u8, 241u8, 217u8, 55u8, 147u8, 147u8,
+                            4u8, 176u8, 69u8, 132u8, 228u8, 158u8, 203u8, 110u8, 239u8, 158u8,
+                            137u8, 97u8, 46u8, 228u8, 118u8, 251u8, 201u8, 88u8, 208u8, 94u8,
+                            132u8,
                         ],
                     )
                 }
                 #[doc = " Votes on a given proposal, if it is ongoing."]
-                pub fn voting_root(
+                pub fn voting(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::H256>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_collective::Votes<
                         ::subxt::utils::AccountId32,
                         ::core::primitive::u32,
                     >,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Council",
                         "Voting",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            56u8, 192u8, 111u8, 180u8, 253u8, 5u8, 232u8, 126u8, 177u8, 48u8,
-                            135u8, 39u8, 89u8, 71u8, 62u8, 239u8, 216u8, 17u8, 64u8, 82u8, 130u8,
-                            236u8, 96u8, 89u8, 167u8, 2u8, 118u8, 113u8, 63u8, 176u8, 124u8, 73u8,
+                            109u8, 198u8, 2u8, 13u8, 29u8, 14u8, 241u8, 217u8, 55u8, 147u8, 147u8,
+                            4u8, 176u8, 69u8, 132u8, 228u8, 158u8, 203u8, 110u8, 239u8, 158u8,
+                            137u8, 97u8, 46u8, 228u8, 118u8, 251u8, 201u8, 88u8, 208u8, 94u8,
+                            132u8,
                         ],
                     )
                 }
@@ -14036,9 +14324,10 @@ pub mod api {
                         "Council",
                         "MaxProposalWeight",
                         [
-                            222u8, 183u8, 203u8, 169u8, 31u8, 134u8, 28u8, 12u8, 47u8, 140u8, 71u8,
-                            74u8, 61u8, 55u8, 71u8, 236u8, 215u8, 83u8, 28u8, 70u8, 45u8, 128u8,
-                            184u8, 57u8, 101u8, 83u8, 42u8, 165u8, 34u8, 155u8, 64u8, 145u8,
+                            149u8, 252u8, 129u8, 80u8, 169u8, 36u8, 79u8, 127u8, 240u8, 156u8,
+                            56u8, 202u8, 219u8, 86u8, 5u8, 65u8, 245u8, 148u8, 138u8, 243u8, 210u8,
+                            128u8, 234u8, 216u8, 240u8, 219u8, 123u8, 235u8, 21u8, 158u8, 237u8,
+                            112u8,
                         ],
                     )
                 }
@@ -14195,10 +14484,10 @@ pub mod api {
                             old_count,
                         },
                         [
-                            141u8, 113u8, 137u8, 46u8, 75u8, 22u8, 143u8, 204u8, 50u8, 24u8, 137u8,
-                            25u8, 226u8, 166u8, 121u8, 161u8, 54u8, 144u8, 12u8, 145u8, 157u8,
-                            153u8, 47u8, 144u8, 94u8, 34u8, 217u8, 115u8, 125u8, 152u8, 110u8,
-                            28u8,
+                            66u8, 224u8, 186u8, 178u8, 41u8, 208u8, 67u8, 192u8, 57u8, 242u8,
+                            141u8, 31u8, 216u8, 118u8, 192u8, 43u8, 125u8, 213u8, 226u8, 85u8,
+                            142u8, 225u8, 131u8, 45u8, 172u8, 142u8, 12u8, 9u8, 73u8, 7u8, 218u8,
+                            61u8,
                         ],
                     )
                 }
@@ -14216,10 +14505,10 @@ pub mod api {
                             length_bound,
                         },
                         [
-                            216u8, 185u8, 245u8, 220u8, 244u8, 26u8, 114u8, 10u8, 254u8, 75u8,
-                            64u8, 229u8, 195u8, 48u8, 61u8, 16u8, 185u8, 129u8, 188u8, 228u8,
-                            166u8, 252u8, 206u8, 236u8, 92u8, 0u8, 113u8, 196u8, 225u8, 148u8, 5u8,
-                            22u8,
+                            57u8, 78u8, 135u8, 149u8, 15u8, 44u8, 123u8, 161u8, 121u8, 152u8, 73u8,
+                            76u8, 23u8, 178u8, 128u8, 134u8, 229u8, 116u8, 220u8, 209u8, 124u8,
+                            175u8, 9u8, 173u8, 123u8, 76u8, 137u8, 124u8, 232u8, 100u8, 217u8,
+                            233u8,
                         ],
                     )
                 }
@@ -14239,10 +14528,9 @@ pub mod api {
                             length_bound,
                         },
                         [
-                            95u8, 215u8, 116u8, 248u8, 230u8, 207u8, 176u8, 74u8, 234u8, 82u8,
-                            78u8, 234u8, 167u8, 233u8, 93u8, 88u8, 94u8, 144u8, 59u8, 3u8, 88u8,
-                            139u8, 175u8, 111u8, 255u8, 193u8, 97u8, 43u8, 197u8, 143u8, 68u8,
-                            217u8,
+                            92u8, 0u8, 105u8, 179u8, 198u8, 127u8, 109u8, 59u8, 52u8, 164u8, 49u8,
+                            190u8, 20u8, 241u8, 90u8, 62u8, 104u8, 148u8, 58u8, 135u8, 184u8, 51u8,
+                            119u8, 48u8, 219u8, 241u8, 173u8, 77u8, 233u8, 109u8, 237u8, 25u8,
                         ],
                     )
                 }
@@ -14303,9 +14591,9 @@ pub mod api {
                             length_bound,
                         },
                         [
-                            189u8, 149u8, 125u8, 63u8, 39u8, 201u8, 247u8, 4u8, 220u8, 74u8, 78u8,
-                            14u8, 113u8, 163u8, 1u8, 159u8, 81u8, 248u8, 141u8, 111u8, 34u8, 243u8,
-                            67u8, 70u8, 60u8, 92u8, 47u8, 70u8, 66u8, 246u8, 236u8, 153u8,
+                            136u8, 48u8, 243u8, 34u8, 60u8, 109u8, 186u8, 158u8, 72u8, 48u8, 62u8,
+                            34u8, 167u8, 46u8, 33u8, 142u8, 239u8, 43u8, 238u8, 125u8, 94u8, 80u8,
+                            157u8, 245u8, 220u8, 126u8, 58u8, 244u8, 186u8, 195u8, 30u8, 127u8,
                         ],
                     )
                 }
@@ -14483,100 +14771,100 @@ pub mod api {
                     )
                 }
                 #[doc = " Actual proposal for a given hash, if it's current."]
-                pub fn proposal_of(
+                pub fn proposal_of_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::H256>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_runtime::RuntimeCall,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "TechnicalCommittee",
                         "ProposalOf",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            1u8, 24u8, 41u8, 101u8, 123u8, 154u8, 94u8, 31u8, 199u8, 5u8, 126u8,
-                            198u8, 32u8, 45u8, 176u8, 214u8, 29u8, 47u8, 226u8, 226u8, 232u8,
-                            138u8, 155u8, 128u8, 113u8, 171u8, 248u8, 244u8, 59u8, 212u8, 167u8,
-                            50u8,
+                            195u8, 20u8, 2u8, 141u8, 194u8, 2u8, 242u8, 114u8, 171u8, 16u8, 47u8,
+                            26u8, 11u8, 186u8, 159u8, 123u8, 59u8, 163u8, 129u8, 101u8, 0u8, 132u8,
+                            45u8, 116u8, 249u8, 72u8, 247u8, 143u8, 35u8, 163u8, 132u8, 246u8,
                         ],
                     )
                 }
                 #[doc = " Actual proposal for a given hash, if it's current."]
-                pub fn proposal_of_root(
+                pub fn proposal_of(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::H256>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_runtime::RuntimeCall,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "TechnicalCommittee",
                         "ProposalOf",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            1u8, 24u8, 41u8, 101u8, 123u8, 154u8, 94u8, 31u8, 199u8, 5u8, 126u8,
-                            198u8, 32u8, 45u8, 176u8, 214u8, 29u8, 47u8, 226u8, 226u8, 232u8,
-                            138u8, 155u8, 128u8, 113u8, 171u8, 248u8, 244u8, 59u8, 212u8, 167u8,
-                            50u8,
+                            195u8, 20u8, 2u8, 141u8, 194u8, 2u8, 242u8, 114u8, 171u8, 16u8, 47u8,
+                            26u8, 11u8, 186u8, 159u8, 123u8, 59u8, 163u8, 129u8, 101u8, 0u8, 132u8,
+                            45u8, 116u8, 249u8, 72u8, 247u8, 143u8, 35u8, 163u8, 132u8, 246u8,
                         ],
                     )
                 }
                 #[doc = " Votes on a given proposal, if it is ongoing."]
-                pub fn voting(
+                pub fn voting_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::H256>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_collective::Votes<
                         ::subxt::utils::AccountId32,
                         ::core::primitive::u32,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "TechnicalCommittee",
                         "Voting",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            56u8, 192u8, 111u8, 180u8, 253u8, 5u8, 232u8, 126u8, 177u8, 48u8,
-                            135u8, 39u8, 89u8, 71u8, 62u8, 239u8, 216u8, 17u8, 64u8, 82u8, 130u8,
-                            236u8, 96u8, 89u8, 167u8, 2u8, 118u8, 113u8, 63u8, 176u8, 124u8, 73u8,
+                            109u8, 198u8, 2u8, 13u8, 29u8, 14u8, 241u8, 217u8, 55u8, 147u8, 147u8,
+                            4u8, 176u8, 69u8, 132u8, 228u8, 158u8, 203u8, 110u8, 239u8, 158u8,
+                            137u8, 97u8, 46u8, 228u8, 118u8, 251u8, 201u8, 88u8, 208u8, 94u8,
+                            132u8,
                         ],
                     )
                 }
                 #[doc = " Votes on a given proposal, if it is ongoing."]
-                pub fn voting_root(
+                pub fn voting(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::H256>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_collective::Votes<
                         ::subxt::utils::AccountId32,
                         ::core::primitive::u32,
                     >,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "TechnicalCommittee",
                         "Voting",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            56u8, 192u8, 111u8, 180u8, 253u8, 5u8, 232u8, 126u8, 177u8, 48u8,
-                            135u8, 39u8, 89u8, 71u8, 62u8, 239u8, 216u8, 17u8, 64u8, 82u8, 130u8,
-                            236u8, 96u8, 89u8, 167u8, 2u8, 118u8, 113u8, 63u8, 176u8, 124u8, 73u8,
+                            109u8, 198u8, 2u8, 13u8, 29u8, 14u8, 241u8, 217u8, 55u8, 147u8, 147u8,
+                            4u8, 176u8, 69u8, 132u8, 228u8, 158u8, 203u8, 110u8, 239u8, 158u8,
+                            137u8, 97u8, 46u8, 228u8, 118u8, 251u8, 201u8, 88u8, 208u8, 94u8,
+                            132u8,
                         ],
                     )
                 }
@@ -14658,9 +14946,10 @@ pub mod api {
                         "TechnicalCommittee",
                         "MaxProposalWeight",
                         [
-                            222u8, 183u8, 203u8, 169u8, 31u8, 134u8, 28u8, 12u8, 47u8, 140u8, 71u8,
-                            74u8, 61u8, 55u8, 71u8, 236u8, 215u8, 83u8, 28u8, 70u8, 45u8, 128u8,
-                            184u8, 57u8, 101u8, 83u8, 42u8, 165u8, 34u8, 155u8, 64u8, 145u8,
+                            149u8, 252u8, 129u8, 80u8, 169u8, 36u8, 79u8, 127u8, 240u8, 156u8,
+                            56u8, 202u8, 219u8, 86u8, 5u8, 65u8, 245u8, 148u8, 138u8, 243u8, 210u8,
+                            128u8, 234u8, 216u8, 240u8, 219u8, 123u8, 235u8, 21u8, 158u8, 237u8,
+                            112u8,
                         ],
                     )
                 }
@@ -14870,9 +15159,9 @@ pub mod api {
                             rerun_election,
                         },
                         [
-                            33u8, 195u8, 242u8, 73u8, 130u8, 196u8, 55u8, 38u8, 18u8, 190u8, 235u8,
-                            86u8, 10u8, 69u8, 3u8, 203u8, 11u8, 164u8, 35u8, 51u8, 20u8, 163u8,
-                            28u8, 226u8, 234u8, 113u8, 98u8, 155u8, 224u8, 190u8, 255u8, 138u8,
+                            230u8, 64u8, 250u8, 74u8, 77u8, 87u8, 67u8, 109u8, 160u8, 123u8, 236u8,
+                            144u8, 158u8, 95u8, 32u8, 80u8, 151u8, 10u8, 217u8, 128u8, 233u8,
+                            254u8, 255u8, 229u8, 57u8, 191u8, 56u8, 29u8, 23u8, 11u8, 45u8, 194u8,
                         ],
                     )
                 }
@@ -14890,10 +15179,9 @@ pub mod api {
                             num_defunct,
                         },
                         [
-                            103u8, 241u8, 66u8, 156u8, 118u8, 36u8, 101u8, 148u8, 76u8, 162u8,
-                            240u8, 31u8, 114u8, 10u8, 247u8, 68u8, 163u8, 187u8, 117u8, 47u8, 14u8,
-                            16u8, 103u8, 211u8, 243u8, 44u8, 235u8, 200u8, 127u8, 113u8, 98u8,
-                            83u8,
+                            99u8, 129u8, 198u8, 141u8, 41u8, 90u8, 151u8, 167u8, 50u8, 236u8, 88u8,
+                            57u8, 25u8, 26u8, 130u8, 61u8, 123u8, 177u8, 98u8, 57u8, 39u8, 204u8,
+                            29u8, 24u8, 191u8, 229u8, 224u8, 110u8, 223u8, 248u8, 191u8, 177u8,
                         ],
                     )
                 }
@@ -15064,10 +15352,10 @@ pub mod api {
                         "Members",
                         vec![],
                         [
-                            210u8, 86u8, 209u8, 114u8, 170u8, 238u8, 106u8, 102u8, 0u8, 140u8,
-                            113u8, 238u8, 36u8, 115u8, 162u8, 167u8, 194u8, 3u8, 57u8, 171u8, 41u8,
-                            219u8, 39u8, 120u8, 192u8, 208u8, 155u8, 163u8, 26u8, 209u8, 42u8,
-                            73u8,
+                            121u8, 128u8, 120u8, 242u8, 54u8, 127u8, 90u8, 113u8, 74u8, 54u8,
+                            181u8, 207u8, 213u8, 130u8, 123u8, 238u8, 66u8, 247u8, 177u8, 209u8,
+                            47u8, 106u8, 3u8, 130u8, 57u8, 217u8, 190u8, 164u8, 92u8, 223u8, 53u8,
+                            8u8,
                         ],
                     )
                 }
@@ -15094,10 +15382,9 @@ pub mod api {
                         "RunnersUp",
                         vec![],
                         [
-                            102u8, 255u8, 105u8, 141u8, 24u8, 140u8, 180u8, 249u8, 19u8, 52u8,
-                            144u8, 157u8, 139u8, 156u8, 5u8, 30u8, 148u8, 36u8, 67u8, 25u8, 238u8,
-                            196u8, 163u8, 165u8, 11u8, 1u8, 162u8, 131u8, 65u8, 207u8, 140u8,
-                            171u8,
+                            252u8, 213u8, 152u8, 58u8, 93u8, 84u8, 170u8, 162u8, 180u8, 51u8, 52u8,
+                            156u8, 18u8, 58u8, 210u8, 150u8, 76u8, 159u8, 75u8, 43u8, 103u8, 21u8,
+                            181u8, 184u8, 155u8, 198u8, 236u8, 173u8, 245u8, 49u8, 134u8, 153u8,
                         ],
                     )
                 }
@@ -15151,55 +15438,55 @@ pub mod api {
                 #[doc = " Votes and locked stake of a particular voter."]
                 #[doc = ""]
                 #[doc = " TWOX-NOTE: SAFE as `AccountId` is a crypto hash."]
-                pub fn voting(
+                pub fn voting_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_elections_phragmen::Voter<
                         ::subxt::utils::AccountId32,
                         ::core::primitive::u128,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "PhragmenElection",
                         "Voting",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            18u8, 65u8, 68u8, 10u8, 123u8, 174u8, 185u8, 95u8, 75u8, 37u8, 201u8,
-                            31u8, 93u8, 189u8, 184u8, 76u8, 199u8, 168u8, 74u8, 199u8, 75u8, 78u8,
-                            55u8, 222u8, 234u8, 48u8, 81u8, 52u8, 187u8, 64u8, 41u8, 93u8,
+                            37u8, 74u8, 221u8, 188u8, 168u8, 43u8, 125u8, 246u8, 191u8, 21u8, 85u8,
+                            87u8, 124u8, 180u8, 218u8, 43u8, 186u8, 170u8, 140u8, 186u8, 88u8,
+                            71u8, 111u8, 22u8, 46u8, 207u8, 178u8, 96u8, 55u8, 203u8, 21u8, 92u8,
                         ],
                     )
                 }
                 #[doc = " Votes and locked stake of a particular voter."]
                 #[doc = ""]
                 #[doc = " TWOX-NOTE: SAFE as `AccountId` is a crypto hash."]
-                pub fn voting_root(
+                pub fn voting(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_elections_phragmen::Voter<
                         ::subxt::utils::AccountId32,
                         ::core::primitive::u128,
                     >,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "PhragmenElection",
                         "Voting",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            18u8, 65u8, 68u8, 10u8, 123u8, 174u8, 185u8, 95u8, 75u8, 37u8, 201u8,
-                            31u8, 93u8, 189u8, 184u8, 76u8, 199u8, 168u8, 74u8, 199u8, 75u8, 78u8,
-                            55u8, 222u8, 234u8, 48u8, 81u8, 52u8, 187u8, 64u8, 41u8, 93u8,
+                            37u8, 74u8, 221u8, 188u8, 168u8, 43u8, 125u8, 246u8, 191u8, 21u8, 85u8,
+                            87u8, 124u8, 180u8, 218u8, 43u8, 186u8, 170u8, 140u8, 186u8, 88u8,
+                            71u8, 111u8, 22u8, 46u8, 207u8, 178u8, 96u8, 55u8, 203u8, 21u8, 92u8,
                         ],
                     )
                 }
@@ -15516,10 +15803,9 @@ pub mod api {
                         "add_member",
                         types::AddMember { who },
                         [
-                            37u8, 124u8, 242u8, 135u8, 3u8, 22u8, 117u8, 212u8, 153u8, 90u8, 101u8,
-                            140u8, 35u8, 239u8, 233u8, 242u8, 55u8, 95u8, 104u8, 178u8, 215u8,
-                            109u8, 67u8, 190u8, 175u8, 246u8, 132u8, 98u8, 80u8, 82u8, 209u8,
-                            198u8,
+                            2u8, 131u8, 37u8, 217u8, 112u8, 46u8, 86u8, 165u8, 248u8, 244u8, 33u8,
+                            236u8, 155u8, 28u8, 163u8, 169u8, 213u8, 32u8, 70u8, 217u8, 97u8,
+                            194u8, 138u8, 77u8, 133u8, 97u8, 188u8, 49u8, 49u8, 31u8, 177u8, 206u8,
                         ],
                     )
                 }
@@ -15533,9 +15819,10 @@ pub mod api {
                         "remove_member",
                         types::RemoveMember { who },
                         [
-                            224u8, 141u8, 97u8, 0u8, 111u8, 196u8, 47u8, 15u8, 234u8, 111u8, 130u8,
-                            51u8, 162u8, 60u8, 47u8, 105u8, 96u8, 98u8, 128u8, 109u8, 99u8, 23u8,
-                            80u8, 207u8, 147u8, 32u8, 71u8, 152u8, 43u8, 253u8, 152u8, 146u8,
+                            78u8, 153u8, 97u8, 110u8, 121u8, 242u8, 112u8, 56u8, 195u8, 217u8,
+                            10u8, 202u8, 114u8, 134u8, 220u8, 237u8, 198u8, 109u8, 247u8, 85u8,
+                            156u8, 88u8, 138u8, 79u8, 189u8, 37u8, 230u8, 55u8, 1u8, 27u8, 89u8,
+                            80u8,
                         ],
                     )
                 }
@@ -15550,9 +15837,10 @@ pub mod api {
                         "swap_member",
                         types::SwapMember { remove, add },
                         [
-                            198u8, 53u8, 206u8, 187u8, 15u8, 43u8, 96u8, 5u8, 220u8, 99u8, 145u8,
-                            138u8, 151u8, 194u8, 188u8, 17u8, 11u8, 131u8, 95u8, 85u8, 95u8, 17u8,
-                            209u8, 207u8, 135u8, 197u8, 196u8, 182u8, 156u8, 161u8, 58u8, 208u8,
+                            170u8, 68u8, 212u8, 185u8, 186u8, 38u8, 222u8, 227u8, 255u8, 119u8,
+                            187u8, 170u8, 247u8, 101u8, 138u8, 167u8, 232u8, 33u8, 116u8, 1u8,
+                            229u8, 171u8, 94u8, 150u8, 193u8, 51u8, 254u8, 106u8, 44u8, 96u8, 28u8,
+                            88u8,
                         ],
                     )
                 }
@@ -15582,10 +15870,10 @@ pub mod api {
                         "change_key",
                         types::ChangeKey { new },
                         [
-                            79u8, 102u8, 49u8, 223u8, 182u8, 153u8, 183u8, 19u8, 154u8, 254u8,
-                            64u8, 75u8, 42u8, 235u8, 130u8, 78u8, 16u8, 132u8, 152u8, 215u8, 73u8,
-                            75u8, 129u8, 189u8, 218u8, 129u8, 127u8, 32u8, 134u8, 25u8, 55u8,
-                            152u8,
+                            129u8, 233u8, 205u8, 107u8, 5u8, 50u8, 160u8, 60u8, 161u8, 248u8, 44u8,
+                            53u8, 50u8, 141u8, 169u8, 36u8, 182u8, 195u8, 173u8, 142u8, 121u8,
+                            153u8, 249u8, 234u8, 253u8, 64u8, 110u8, 51u8, 207u8, 127u8, 166u8,
+                            108u8,
                         ],
                     )
                 }
@@ -15599,10 +15887,10 @@ pub mod api {
                         "set_prime",
                         types::SetPrime { who },
                         [
-                            149u8, 62u8, 210u8, 85u8, 246u8, 206u8, 43u8, 214u8, 160u8, 153u8,
-                            134u8, 140u8, 145u8, 214u8, 65u8, 60u8, 26u8, 167u8, 248u8, 4u8, 96u8,
-                            237u8, 198u8, 97u8, 118u8, 41u8, 102u8, 20u8, 138u8, 67u8, 201u8,
-                            192u8,
+                            213u8, 60u8, 220u8, 4u8, 28u8, 111u8, 6u8, 128u8, 228u8, 150u8, 14u8,
+                            182u8, 183u8, 94u8, 120u8, 238u8, 15u8, 241u8, 107u8, 152u8, 182u8,
+                            33u8, 154u8, 203u8, 172u8, 217u8, 31u8, 212u8, 112u8, 158u8, 17u8,
+                            188u8,
                         ],
                     )
                 }
@@ -15893,10 +16181,9 @@ pub mod api {
                         "propose_spend",
                         types::ProposeSpend { value, beneficiary },
                         [
-                            36u8, 227u8, 126u8, 190u8, 233u8, 70u8, 167u8, 246u8, 56u8, 238u8,
-                            67u8, 181u8, 166u8, 108u8, 129u8, 28u8, 55u8, 177u8, 94u8, 166u8,
-                            125u8, 198u8, 225u8, 38u8, 91u8, 248u8, 19u8, 177u8, 135u8, 62u8,
-                            236u8, 114u8,
+                            250u8, 230u8, 64u8, 10u8, 93u8, 132u8, 194u8, 69u8, 91u8, 50u8, 98u8,
+                            212u8, 72u8, 218u8, 29u8, 149u8, 2u8, 190u8, 219u8, 4u8, 25u8, 110u8,
+                            5u8, 199u8, 196u8, 37u8, 64u8, 57u8, 207u8, 235u8, 164u8, 226u8,
                         ],
                     )
                 }
@@ -15946,10 +16233,9 @@ pub mod api {
                             beneficiary,
                         },
                         [
-                            57u8, 32u8, 140u8, 106u8, 181u8, 124u8, 122u8, 61u8, 130u8, 130u8,
-                            165u8, 131u8, 46u8, 249u8, 119u8, 102u8, 225u8, 174u8, 101u8, 161u8,
-                            76u8, 173u8, 253u8, 23u8, 173u8, 229u8, 135u8, 183u8, 168u8, 159u8,
-                            112u8, 88u8,
+                            67u8, 164u8, 134u8, 175u8, 103u8, 211u8, 117u8, 233u8, 164u8, 176u8,
+                            180u8, 84u8, 147u8, 120u8, 81u8, 75u8, 167u8, 98u8, 218u8, 173u8, 67u8,
+                            0u8, 21u8, 190u8, 134u8, 18u8, 183u8, 6u8, 161u8, 43u8, 50u8, 83u8,
                         ],
                     )
                 }
@@ -16176,53 +16462,55 @@ pub mod api {
                     )
                 }
                 #[doc = " Proposals that have been made."]
-                pub fn proposals(
+                pub fn proposals_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_treasury::Proposal<
                         ::subxt::utils::AccountId32,
                         ::core::primitive::u128,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Treasury",
                         "Proposals",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            182u8, 12u8, 98u8, 64u8, 117u8, 17u8, 90u8, 245u8, 80u8, 99u8, 161u8,
-                            17u8, 59u8, 80u8, 64u8, 139u8, 89u8, 179u8, 254u8, 239u8, 143u8, 114u8,
-                            77u8, 79u8, 75u8, 126u8, 52u8, 227u8, 1u8, 138u8, 35u8, 62u8,
+                            207u8, 135u8, 145u8, 146u8, 48u8, 10u8, 252u8, 40u8, 20u8, 115u8,
+                            205u8, 41u8, 173u8, 83u8, 115u8, 46u8, 106u8, 40u8, 130u8, 157u8,
+                            213u8, 87u8, 45u8, 23u8, 14u8, 167u8, 99u8, 208u8, 153u8, 163u8, 141u8,
+                            55u8,
                         ],
                     )
                 }
                 #[doc = " Proposals that have been made."]
-                pub fn proposals_root(
+                pub fn proposals(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_treasury::Proposal<
                         ::subxt::utils::AccountId32,
                         ::core::primitive::u128,
                     >,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Treasury",
                         "Proposals",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            182u8, 12u8, 98u8, 64u8, 117u8, 17u8, 90u8, 245u8, 80u8, 99u8, 161u8,
-                            17u8, 59u8, 80u8, 64u8, 139u8, 89u8, 179u8, 254u8, 239u8, 143u8, 114u8,
-                            77u8, 79u8, 75u8, 126u8, 52u8, 227u8, 1u8, 138u8, 35u8, 62u8,
+                            207u8, 135u8, 145u8, 146u8, 48u8, 10u8, 252u8, 40u8, 20u8, 115u8,
+                            205u8, 41u8, 173u8, 83u8, 115u8, 46u8, 106u8, 40u8, 130u8, 157u8,
+                            213u8, 87u8, 45u8, 23u8, 14u8, 167u8, 99u8, 208u8, 153u8, 163u8, 141u8,
+                            55u8,
                         ],
                     )
                 }
@@ -16527,9 +16815,10 @@ pub mod api {
                         "vote",
                         types::Vote { poll_index, vote },
                         [
-                            83u8, 161u8, 37u8, 200u8, 183u8, 70u8, 26u8, 196u8, 131u8, 173u8,
-                            165u8, 3u8, 77u8, 144u8, 17u8, 78u8, 115u8, 118u8, 209u8, 112u8, 250u8,
-                            48u8, 75u8, 0u8, 1u8, 57u8, 34u8, 137u8, 136u8, 98u8, 120u8, 224u8,
+                            57u8, 170u8, 177u8, 168u8, 158u8, 43u8, 87u8, 242u8, 176u8, 85u8,
+                            230u8, 64u8, 103u8, 239u8, 190u8, 6u8, 228u8, 165u8, 248u8, 77u8,
+                            231u8, 221u8, 186u8, 107u8, 249u8, 201u8, 226u8, 52u8, 129u8, 90u8,
+                            142u8, 159u8,
                         ],
                     )
                 }
@@ -16551,9 +16840,9 @@ pub mod api {
                             balance,
                         },
                         [
-                            126u8, 116u8, 4u8, 84u8, 189u8, 250u8, 216u8, 17u8, 113u8, 34u8, 92u8,
-                            7u8, 113u8, 74u8, 122u8, 202u8, 63u8, 223u8, 174u8, 200u8, 84u8, 31u8,
-                            207u8, 25u8, 161u8, 185u8, 31u8, 241u8, 43u8, 93u8, 48u8, 186u8,
+                            223u8, 143u8, 33u8, 94u8, 32u8, 156u8, 43u8, 40u8, 142u8, 134u8, 209u8,
+                            134u8, 255u8, 179u8, 97u8, 46u8, 8u8, 140u8, 5u8, 29u8, 76u8, 22u8,
+                            36u8, 7u8, 108u8, 190u8, 220u8, 151u8, 10u8, 47u8, 89u8, 55u8,
                         ],
                     )
                 }
@@ -16585,9 +16874,10 @@ pub mod api {
                         "unlock",
                         types::Unlock { class, target },
                         [
-                            54u8, 193u8, 94u8, 255u8, 130u8, 55u8, 88u8, 65u8, 58u8, 101u8, 150u8,
-                            82u8, 135u8, 26u8, 49u8, 102u8, 245u8, 253u8, 200u8, 38u8, 151u8, 44u8,
-                            138u8, 116u8, 92u8, 202u8, 55u8, 243u8, 126u8, 60u8, 182u8, 157u8,
+                            79u8, 5u8, 252u8, 237u8, 109u8, 238u8, 157u8, 237u8, 125u8, 171u8,
+                            65u8, 160u8, 102u8, 192u8, 5u8, 141u8, 179u8, 249u8, 253u8, 213u8,
+                            105u8, 251u8, 241u8, 145u8, 186u8, 177u8, 244u8, 139u8, 71u8, 140u8,
+                            173u8, 108u8,
                         ],
                     )
                 }
@@ -16625,10 +16915,9 @@ pub mod api {
                             index,
                         },
                         [
-                            211u8, 69u8, 54u8, 243u8, 241u8, 50u8, 231u8, 13u8, 157u8, 180u8, 17u8,
-                            245u8, 85u8, 92u8, 207u8, 184u8, 224u8, 163u8, 15u8, 222u8, 41u8,
-                            179u8, 174u8, 170u8, 192u8, 241u8, 202u8, 127u8, 213u8, 0u8, 91u8,
-                            45u8,
+                            165u8, 26u8, 166u8, 37u8, 10u8, 174u8, 243u8, 10u8, 73u8, 93u8, 213u8,
+                            69u8, 200u8, 16u8, 48u8, 146u8, 160u8, 92u8, 28u8, 26u8, 158u8, 55u8,
+                            6u8, 251u8, 36u8, 132u8, 46u8, 195u8, 107u8, 34u8, 0u8, 100u8,
                         ],
                     )
                 }
@@ -16680,10 +16969,8 @@ pub mod api {
             impl StorageApi {
                 #[doc = " All voting for a particular voter in a particular voting class. We store the balance for the"]
                 #[doc = " number of votes that we have recorded."]
-                pub fn voting_for(
+                pub fn voting_for_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
-                    _1: impl ::std::borrow::Borrow<::core::primitive::u16>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_conviction_voting::vote::Voting<
@@ -16692,28 +16979,26 @@ pub mod api {
                         ::core::primitive::u32,
                         ::core::primitive::u32,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ConvictionVoting",
                         "VotingFor",
-                        vec![
-                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
-                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
-                        ],
+                        vec![],
                         [
-                            84u8, 208u8, 38u8, 249u8, 230u8, 78u8, 135u8, 30u8, 99u8, 20u8, 152u8,
-                            104u8, 61u8, 29u8, 146u8, 195u8, 67u8, 83u8, 246u8, 251u8, 47u8, 147u8,
-                            83u8, 154u8, 36u8, 63u8, 34u8, 209u8, 134u8, 71u8, 210u8, 250u8,
+                            76u8, 63u8, 153u8, 193u8, 39u8, 137u8, 186u8, 29u8, 202u8, 56u8, 169u8,
+                            56u8, 103u8, 138u8, 192u8, 18u8, 179u8, 114u8, 56u8, 121u8, 197u8,
+                            12u8, 29u8, 239u8, 220u8, 231u8, 24u8, 46u8, 134u8, 99u8, 53u8, 206u8,
                         ],
                     )
                 }
                 #[doc = " All voting for a particular voter in a particular voting class. We store the balance for the"]
                 #[doc = " number of votes that we have recorded."]
-                pub fn voting_for_root(
+                pub fn voting_for_iter1(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_conviction_voting::vote::Voting<
@@ -16729,36 +17014,67 @@ pub mod api {
                     ::subxt::storage::address::Address::new_static(
                         "ConvictionVoting",
                         "VotingFor",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
+                        [
+                            76u8, 63u8, 153u8, 193u8, 39u8, 137u8, 186u8, 29u8, 202u8, 56u8, 169u8,
+                            56u8, 103u8, 138u8, 192u8, 18u8, 179u8, 114u8, 56u8, 121u8, 197u8,
+                            12u8, 29u8, 239u8, 220u8, 231u8, 24u8, 46u8, 134u8, 99u8, 53u8, 206u8,
+                        ],
+                    )
+                }
+                #[doc = " All voting for a particular voter in a particular voting class. We store the balance for the"]
+                #[doc = " number of votes that we have recorded."]
+                pub fn voting_for(
+                    &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
+                    _1: impl ::std::borrow::Borrow<::core::primitive::u16>,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    runtime_types::pallet_conviction_voting::vote::Voting<
+                        ::core::primitive::u128,
+                        ::subxt::utils::AccountId32,
+                        ::core::primitive::u32,
+                        ::core::primitive::u32,
+                    >,
+                    ::subxt::storage::address::Yes,
+                    ::subxt::storage::address::Yes,
+                    (),
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "ConvictionVoting",
+                        "VotingFor",
+                        vec![
+                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
+                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
+                        ],
                         [
-                            84u8, 208u8, 38u8, 249u8, 230u8, 78u8, 135u8, 30u8, 99u8, 20u8, 152u8,
-                            104u8, 61u8, 29u8, 146u8, 195u8, 67u8, 83u8, 246u8, 251u8, 47u8, 147u8,
-                            83u8, 154u8, 36u8, 63u8, 34u8, 209u8, 134u8, 71u8, 210u8, 250u8,
+                            76u8, 63u8, 153u8, 193u8, 39u8, 137u8, 186u8, 29u8, 202u8, 56u8, 169u8,
+                            56u8, 103u8, 138u8, 192u8, 18u8, 179u8, 114u8, 56u8, 121u8, 197u8,
+                            12u8, 29u8, 239u8, 220u8, 231u8, 24u8, 46u8, 134u8, 99u8, 53u8, 206u8,
                         ],
                     )
                 }
                 #[doc = " The voting classes which have a non-zero lock requirement and the lock amounts which they"]
                 #[doc = " require. The actual amount locked on behalf of this pallet should always be the maximum of"]
                 #[doc = " this list."]
-                pub fn class_locks_for(
+                pub fn class_locks_for_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<(
                         ::core::primitive::u16,
                         ::core::primitive::u128,
                     )>,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ConvictionVoting",
                         "ClassLocksFor",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             74u8, 74u8, 8u8, 82u8, 215u8, 61u8, 13u8, 9u8, 44u8, 222u8, 33u8,
                             245u8, 195u8, 124u8, 6u8, 174u8, 65u8, 245u8, 71u8, 42u8, 47u8, 46u8,
@@ -16769,22 +17085,25 @@ pub mod api {
                 #[doc = " The voting classes which have a non-zero lock requirement and the lock amounts which they"]
                 #[doc = " require. The actual amount locked on behalf of this pallet should always be the maximum of"]
                 #[doc = " this list."]
-                pub fn class_locks_for_root(
+                pub fn class_locks_for(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<(
                         ::core::primitive::u16,
                         ::core::primitive::u128,
                     )>,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ConvictionVoting",
                         "ClassLocksFor",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             74u8, 74u8, 8u8, 82u8, 215u8, 61u8, 13u8, 9u8, 44u8, 222u8, 33u8,
                             245u8, 195u8, 124u8, 6u8, 174u8, 65u8, 245u8, 71u8, 42u8, 47u8, 46u8,
@@ -17040,10 +17359,10 @@ pub mod api {
                             enactment_moment,
                         },
                         [
-                            59u8, 231u8, 190u8, 146u8, 252u8, 214u8, 34u8, 221u8, 11u8, 165u8,
-                            38u8, 37u8, 117u8, 188u8, 250u8, 138u8, 114u8, 135u8, 234u8, 177u8,
-                            72u8, 34u8, 192u8, 254u8, 70u8, 69u8, 217u8, 104u8, 103u8, 196u8,
-                            111u8, 230u8,
+                            27u8, 68u8, 3u8, 170u8, 74u8, 43u8, 11u8, 147u8, 35u8, 174u8, 234u8,
+                            118u8, 27u8, 235u8, 186u8, 21u8, 31u8, 242u8, 224u8, 26u8, 179u8,
+                            169u8, 177u8, 186u8, 16u8, 147u8, 222u8, 159u8, 249u8, 70u8, 7u8,
+                            248u8,
                         ],
                     )
                 }
@@ -17533,9 +17852,8 @@ pub mod api {
                     )
                 }
                 #[doc = " Information concerning any given referendum."]
-                pub fn referendum_info_for(
+                pub fn referendum_info_for_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_referenda::types::ReferendumInfo<
@@ -17552,26 +17870,26 @@ pub mod api {
                         ::subxt::utils::AccountId32,
                         (::core::primitive::u32, ::core::primitive::u32),
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Referenda",
                         "ReferendumInfoFor",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            4u8, 176u8, 130u8, 171u8, 233u8, 114u8, 73u8, 10u8, 99u8, 89u8, 34u8,
-                            91u8, 255u8, 21u8, 145u8, 5u8, 228u8, 56u8, 203u8, 233u8, 60u8, 236u8,
-                            58u8, 208u8, 163u8, 206u8, 122u8, 50u8, 208u8, 203u8, 220u8, 38u8,
+                            213u8, 12u8, 72u8, 151u8, 25u8, 196u8, 73u8, 199u8, 83u8, 109u8, 28u8,
+                            164u8, 121u8, 236u8, 136u8, 242u8, 124u8, 45u8, 112u8, 158u8, 132u8,
+                            152u8, 217u8, 84u8, 241u8, 115u8, 146u8, 203u8, 225u8, 186u8, 116u8,
+                            80u8,
                         ],
                     )
                 }
                 #[doc = " Information concerning any given referendum."]
-                pub fn referendum_info_for_root(
+                pub fn referendum_info_for(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_referenda::types::ReferendumInfo<
@@ -17588,18 +17906,21 @@ pub mod api {
                         ::subxt::utils::AccountId32,
                         (::core::primitive::u32, ::core::primitive::u32),
                     >,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Referenda",
                         "ReferendumInfoFor",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            4u8, 176u8, 130u8, 171u8, 233u8, 114u8, 73u8, 10u8, 99u8, 89u8, 34u8,
-                            91u8, 255u8, 21u8, 145u8, 5u8, 228u8, 56u8, 203u8, 233u8, 60u8, 236u8,
-                            58u8, 208u8, 163u8, 206u8, 122u8, 50u8, 208u8, 203u8, 220u8, 38u8,
+                            213u8, 12u8, 72u8, 151u8, 25u8, 196u8, 73u8, 199u8, 83u8, 109u8, 28u8,
+                            164u8, 121u8, 236u8, 136u8, 242u8, 124u8, 45u8, 112u8, 158u8, 132u8,
+                            152u8, 217u8, 84u8, 241u8, 115u8, 146u8, 203u8, 225u8, 186u8, 116u8,
+                            80u8,
                         ],
                     )
                 }
@@ -17607,25 +17928,22 @@ pub mod api {
                 #[doc = " conviction-weighted approvals."]
                 #[doc = ""]
                 #[doc = " This should be empty if `DecidingCount` is less than `TrackInfo::max_deciding`."]
-                pub fn track_queue(
+                pub fn track_queue_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u16>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<(
                         ::core::primitive::u32,
                         ::core::primitive::u128,
                     )>,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Referenda",
                         "TrackQueue",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             125u8, 59u8, 111u8, 68u8, 27u8, 236u8, 82u8, 55u8, 83u8, 159u8, 105u8,
                             20u8, 241u8, 118u8, 58u8, 141u8, 103u8, 60u8, 246u8, 49u8, 121u8,
@@ -17637,22 +17955,25 @@ pub mod api {
                 #[doc = " conviction-weighted approvals."]
                 #[doc = ""]
                 #[doc = " This should be empty if `DecidingCount` is less than `TrackInfo::max_deciding`."]
-                pub fn track_queue_root(
+                pub fn track_queue(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u16>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<(
                         ::core::primitive::u32,
                         ::core::primitive::u128,
                     )>,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Referenda",
                         "TrackQueue",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             125u8, 59u8, 111u8, 68u8, 27u8, 236u8, 82u8, 55u8, 83u8, 159u8, 105u8,
                             20u8, 241u8, 118u8, 58u8, 141u8, 103u8, 60u8, 246u8, 49u8, 121u8,
@@ -17661,22 +17982,19 @@ pub mod api {
                     )
                 }
                 #[doc = " The number of referenda being decided currently."]
-                pub fn deciding_count(
+                pub fn deciding_count_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u16>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u32,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Referenda",
                         "DecidingCount",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             203u8, 89u8, 158u8, 179u8, 194u8, 82u8, 248u8, 162u8, 93u8, 140u8,
                             146u8, 51u8, 110u8, 232u8, 51u8, 1u8, 128u8, 212u8, 199u8, 14u8, 182u8,
@@ -17686,19 +18004,22 @@ pub mod api {
                     )
                 }
                 #[doc = " The number of referenda being decided currently."]
-                pub fn deciding_count_root(
+                pub fn deciding_count(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u16>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u32,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Referenda",
                         "DecidingCount",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             203u8, 89u8, 158u8, 179u8, 194u8, 82u8, 248u8, 162u8, 93u8, 140u8,
                             146u8, 51u8, 110u8, 232u8, 51u8, 1u8, 128u8, 212u8, 199u8, 14u8, 182u8,
@@ -17713,22 +18034,19 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " Consider a garbage collection for a metadata of finished referendums to `unrequest` (remove)"]
                 #[doc = " large preimages."]
-                pub fn metadata_of(
+                pub fn metadata_of_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::subxt::utils::H256,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Referenda",
                         "MetadataOf",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             159u8, 250u8, 56u8, 189u8, 247u8, 165u8, 206u8, 166u8, 91u8, 139u8,
                             124u8, 164u8, 25u8, 246u8, 199u8, 36u8, 159u8, 56u8, 227u8, 136u8, 4u8,
@@ -17743,19 +18061,22 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " Consider a garbage collection for a metadata of finished referendums to `unrequest` (remove)"]
                 #[doc = " large preimages."]
-                pub fn metadata_of_root(
+                pub fn metadata_of(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::subxt::utils::H256,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Referenda",
                         "MetadataOf",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             159u8, 250u8, 56u8, 189u8, 247u8, 165u8, 206u8, 166u8, 91u8, 139u8,
                             124u8, 164u8, 25u8, 246u8, 199u8, 36u8, 159u8, 56u8, 227u8, 136u8, 4u8,
@@ -17846,10 +18167,10 @@ pub mod api {
                         "Referenda",
                         "Tracks",
                         [
-                            230u8, 179u8, 170u8, 9u8, 42u8, 168u8, 158u8, 174u8, 177u8, 159u8,
-                            93u8, 152u8, 63u8, 111u8, 23u8, 80u8, 133u8, 232u8, 101u8, 2u8, 206u8,
-                            230u8, 248u8, 62u8, 145u8, 15u8, 147u8, 251u8, 196u8, 182u8, 95u8,
-                            33u8,
+                            35u8, 226u8, 207u8, 234u8, 184u8, 139u8, 187u8, 184u8, 128u8, 199u8,
+                            227u8, 15u8, 31u8, 196u8, 5u8, 207u8, 138u8, 174u8, 130u8, 201u8,
+                            200u8, 113u8, 86u8, 93u8, 221u8, 243u8, 229u8, 24u8, 18u8, 150u8, 56u8,
+                            159u8,
                         ],
                     )
                 }
@@ -17992,10 +18313,10 @@ pub mod api {
                             call_weight_witness,
                         },
                         [
-                            10u8, 3u8, 194u8, 156u8, 211u8, 102u8, 188u8, 53u8, 232u8, 129u8,
-                            199u8, 113u8, 190u8, 88u8, 202u8, 126u8, 210u8, 144u8, 185u8, 169u8,
-                            233u8, 114u8, 237u8, 99u8, 244u8, 41u8, 35u8, 198u8, 93u8, 234u8,
-                            200u8, 20u8,
+                            112u8, 67u8, 72u8, 26u8, 3u8, 214u8, 86u8, 102u8, 29u8, 96u8, 222u8,
+                            24u8, 115u8, 15u8, 124u8, 160u8, 148u8, 184u8, 56u8, 162u8, 188u8,
+                            123u8, 213u8, 234u8, 208u8, 123u8, 133u8, 253u8, 43u8, 226u8, 66u8,
+                            116u8,
                         ],
                     )
                 }
@@ -18012,10 +18333,10 @@ pub mod api {
                             call: ::std::boxed::Box::new(call),
                         },
                         [
-                            67u8, 177u8, 224u8, 225u8, 229u8, 76u8, 167u8, 239u8, 201u8, 47u8, 1u8,
-                            73u8, 248u8, 123u8, 100u8, 220u8, 49u8, 190u8, 10u8, 116u8, 81u8,
-                            209u8, 1u8, 207u8, 206u8, 190u8, 168u8, 180u8, 171u8, 238u8, 132u8,
-                            145u8,
+                            89u8, 130u8, 130u8, 37u8, 20u8, 229u8, 91u8, 200u8, 190u8, 63u8, 19u8,
+                            65u8, 27u8, 165u8, 215u8, 147u8, 124u8, 61u8, 48u8, 197u8, 185u8,
+                            174u8, 153u8, 124u8, 154u8, 91u8, 222u8, 11u8, 161u8, 208u8, 48u8,
+                            95u8,
                         ],
                     )
                 }
@@ -18087,22 +18408,19 @@ pub mod api {
             use super::runtime_types;
             pub struct StorageApi;
             impl StorageApi {
-                pub fn whitelisted_call(
+                pub fn whitelisted_call_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::H256>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     (),
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Whitelist",
                         "WhitelistedCall",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             82u8, 208u8, 214u8, 72u8, 225u8, 35u8, 51u8, 212u8, 25u8, 138u8, 30u8,
                             87u8, 54u8, 232u8, 72u8, 132u8, 4u8, 9u8, 28u8, 143u8, 251u8, 106u8,
@@ -18110,19 +18428,22 @@ pub mod api {
                         ],
                     )
                 }
-                pub fn whitelisted_call_root(
+                pub fn whitelisted_call(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::H256>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     (),
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Whitelist",
                         "WhitelistedCall",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             82u8, 208u8, 214u8, 72u8, 225u8, 35u8, 51u8, 212u8, 25u8, 138u8, 30u8,
                             87u8, 54u8, 232u8, 72u8, 132u8, 4u8, 9u8, 28u8, 143u8, 251u8, 106u8,
@@ -18264,10 +18585,10 @@ pub mod api {
                             ethereum_signature,
                         },
                         [
-                            83u8, 166u8, 82u8, 164u8, 185u8, 116u8, 35u8, 29u8, 60u8, 10u8, 92u8,
-                            61u8, 212u8, 63u8, 236u8, 107u8, 19u8, 110u8, 100u8, 58u8, 154u8,
-                            143u8, 188u8, 153u8, 34u8, 237u8, 60u8, 140u8, 194u8, 135u8, 227u8,
-                            8u8,
+                            218u8, 236u8, 60u8, 12u8, 231u8, 72u8, 155u8, 30u8, 116u8, 126u8,
+                            145u8, 166u8, 135u8, 118u8, 22u8, 112u8, 212u8, 140u8, 129u8, 97u8,
+                            9u8, 241u8, 159u8, 140u8, 252u8, 128u8, 4u8, 175u8, 180u8, 133u8, 70u8,
+                            55u8,
                         ],
                     )
                 }
@@ -18295,9 +18616,9 @@ pub mod api {
                             statement,
                         },
                         [
-                            254u8, 174u8, 70u8, 0u8, 70u8, 79u8, 195u8, 176u8, 196u8, 52u8, 204u8,
-                            219u8, 158u8, 73u8, 158u8, 126u8, 14u8, 37u8, 45u8, 29u8, 249u8, 246u8,
-                            3u8, 40u8, 72u8, 111u8, 213u8, 180u8, 201u8, 139u8, 175u8, 194u8,
+                            59u8, 71u8, 27u8, 16u8, 177u8, 189u8, 53u8, 54u8, 86u8, 157u8, 122u8,
+                            182u8, 246u8, 113u8, 225u8, 10u8, 31u8, 253u8, 15u8, 48u8, 182u8,
+                            198u8, 38u8, 211u8, 90u8, 75u8, 10u8, 68u8, 70u8, 152u8, 141u8, 222u8,
                         ],
                     )
                 }
@@ -18317,9 +18638,9 @@ pub mod api {
                             statement,
                         },
                         [
-                            18u8, 79u8, 43u8, 28u8, 88u8, 151u8, 46u8, 15u8, 28u8, 146u8, 210u8,
-                            235u8, 158u8, 64u8, 236u8, 204u8, 89u8, 174u8, 250u8, 114u8, 45u8, 3u8,
-                            17u8, 129u8, 147u8, 69u8, 232u8, 181u8, 71u8, 98u8, 5u8, 244u8,
+                            61u8, 16u8, 39u8, 50u8, 23u8, 249u8, 217u8, 155u8, 138u8, 128u8, 247u8,
+                            214u8, 185u8, 7u8, 87u8, 108u8, 15u8, 43u8, 44u8, 224u8, 204u8, 39u8,
+                            219u8, 188u8, 197u8, 104u8, 120u8, 144u8, 152u8, 161u8, 244u8, 37u8,
                         ],
                     )
                 }
@@ -18356,9 +18677,10 @@ pub mod api {
                             maybe_preclaim,
                         },
                         [
-                            82u8, 63u8, 8u8, 178u8, 205u8, 16u8, 182u8, 216u8, 80u8, 254u8, 48u8,
-                            10u8, 52u8, 159u8, 198u8, 116u8, 164u8, 108u8, 209u8, 193u8, 60u8,
-                            139u8, 241u8, 135u8, 92u8, 103u8, 241u8, 52u8, 103u8, 52u8, 243u8, 0u8,
+                            187u8, 200u8, 222u8, 83u8, 110u8, 49u8, 60u8, 134u8, 91u8, 215u8, 67u8,
+                            18u8, 187u8, 241u8, 191u8, 127u8, 222u8, 171u8, 151u8, 245u8, 161u8,
+                            196u8, 123u8, 99u8, 206u8, 110u8, 55u8, 82u8, 210u8, 151u8, 116u8,
+                            230u8,
                         ],
                     )
                 }
@@ -18394,24 +18716,19 @@ pub mod api {
             use super::runtime_types;
             pub struct StorageApi;
             impl StorageApi {
-                pub fn claims(
+                pub fn claims_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<
-                        runtime_types::polkadot_runtime_common::claims::EthereumAddress,
-                    >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u128,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Claims",
                         "Claims",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             148u8, 115u8, 159u8, 169u8, 36u8, 116u8, 15u8, 108u8, 57u8, 195u8,
                             226u8, 180u8, 187u8, 112u8, 114u8, 63u8, 3u8, 205u8, 113u8, 141u8,
@@ -18420,19 +18737,24 @@ pub mod api {
                         ],
                     )
                 }
-                pub fn claims_root(
+                pub fn claims(
                     &self,
+                    _0: impl ::std::borrow::Borrow<
+                        runtime_types::polkadot_runtime_common::claims::EthereumAddress,
+                    >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u128,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Claims",
                         "Claims",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             148u8, 115u8, 159u8, 169u8, 36u8, 116u8, 15u8, 108u8, 57u8, 195u8,
                             226u8, 180u8, 187u8, 112u8, 114u8, 63u8, 3u8, 205u8, 113u8, 141u8,
@@ -18466,11 +18788,8 @@ pub mod api {
                 #[doc = " First balance is the total amount that should be held for vesting."]
                 #[doc = " Second balance is how much should be unlocked per block."]
                 #[doc = " The block number is when the vesting should start."]
-                pub fn vesting(
+                pub fn vesting_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<
-                        runtime_types::polkadot_runtime_common::claims::EthereumAddress,
-                    >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     (
@@ -18478,21 +18797,19 @@ pub mod api {
                         ::core::primitive::u128,
                         ::core::primitive::u32,
                     ),
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Claims",
                         "Vesting",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            16u8, 107u8, 69u8, 162u8, 210u8, 200u8, 188u8, 185u8, 69u8, 90u8,
-                            209u8, 238u8, 167u8, 173u8, 193u8, 118u8, 58u8, 17u8, 68u8, 136u8,
-                            163u8, 207u8, 34u8, 226u8, 174u8, 199u8, 127u8, 4u8, 225u8, 198u8,
-                            143u8, 180u8,
+                            206u8, 106u8, 195u8, 101u8, 55u8, 137u8, 50u8, 105u8, 137u8, 87u8,
+                            230u8, 34u8, 255u8, 94u8, 210u8, 186u8, 179u8, 72u8, 24u8, 194u8,
+                            209u8, 173u8, 115u8, 65u8, 227u8, 224u8, 58u8, 113u8, 200u8, 166u8,
+                            108u8, 198u8,
                         ],
                     )
                 }
@@ -18500,8 +18817,11 @@ pub mod api {
                 #[doc = " First balance is the total amount that should be held for vesting."]
                 #[doc = " Second balance is how much should be unlocked per block."]
                 #[doc = " The block number is when the vesting should start."]
-                pub fn vesting_root(
+                pub fn vesting(
                     &self,
+                    _0: impl ::std::borrow::Borrow<
+                        runtime_types::polkadot_runtime_common::claims::EthereumAddress,
+                    >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     (
@@ -18509,41 +18829,38 @@ pub mod api {
                         ::core::primitive::u128,
                         ::core::primitive::u32,
                     ),
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Claims",
                         "Vesting",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            16u8, 107u8, 69u8, 162u8, 210u8, 200u8, 188u8, 185u8, 69u8, 90u8,
-                            209u8, 238u8, 167u8, 173u8, 193u8, 118u8, 58u8, 17u8, 68u8, 136u8,
-                            163u8, 207u8, 34u8, 226u8, 174u8, 199u8, 127u8, 4u8, 225u8, 198u8,
-                            143u8, 180u8,
+                            206u8, 106u8, 195u8, 101u8, 55u8, 137u8, 50u8, 105u8, 137u8, 87u8,
+                            230u8, 34u8, 255u8, 94u8, 210u8, 186u8, 179u8, 72u8, 24u8, 194u8,
+                            209u8, 173u8, 115u8, 65u8, 227u8, 224u8, 58u8, 113u8, 200u8, 166u8,
+                            108u8, 198u8,
                         ],
                     )
                 }
                 #[doc = " The statement kind that must be signed, if any."]
-                pub fn signing(
+                pub fn signing_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<
-                        runtime_types::polkadot_runtime_common::claims::EthereumAddress,
-                    >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_runtime_common::claims::StatementKind,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Claims",
                         "Signing",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             111u8, 90u8, 178u8, 121u8, 241u8, 28u8, 169u8, 231u8, 61u8, 189u8,
                             113u8, 207u8, 26u8, 153u8, 189u8, 15u8, 192u8, 25u8, 22u8, 22u8, 124u8,
@@ -18552,19 +18869,24 @@ pub mod api {
                     )
                 }
                 #[doc = " The statement kind that must be signed, if any."]
-                pub fn signing_root(
+                pub fn signing(
                     &self,
+                    _0: impl ::std::borrow::Borrow<
+                        runtime_types::polkadot_runtime_common::claims::EthereumAddress,
+                    >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_runtime_common::claims::StatementKind,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Claims",
                         "Signing",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             111u8, 90u8, 178u8, 121u8, 241u8, 28u8, 169u8, 231u8, 61u8, 189u8,
                             113u8, 207u8, 26u8, 153u8, 189u8, 15u8, 192u8, 25u8, 22u8, 22u8, 124u8,
@@ -18573,47 +18895,49 @@ pub mod api {
                     )
                 }
                 #[doc = " Pre-claimed Ethereum accounts, by the Account ID that they are claimed to."]
-                pub fn preclaims(
+                pub fn preclaims_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_runtime_common::claims::EthereumAddress,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Claims",
                         "Preclaims",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            154u8, 182u8, 178u8, 76u8, 81u8, 63u8, 87u8, 179u8, 243u8, 104u8,
-                            206u8, 75u8, 114u8, 83u8, 16u8, 233u8, 22u8, 132u8, 207u8, 36u8, 151u8,
-                            179u8, 94u8, 208u8, 210u8, 202u8, 149u8, 248u8, 9u8, 49u8, 140u8, 94u8,
+                            197u8, 114u8, 147u8, 235u8, 203u8, 255u8, 94u8, 113u8, 151u8, 119u8,
+                            224u8, 147u8, 48u8, 246u8, 124u8, 38u8, 190u8, 237u8, 226u8, 65u8,
+                            91u8, 163u8, 129u8, 40u8, 71u8, 137u8, 220u8, 242u8, 51u8, 75u8, 3u8,
+                            204u8,
                         ],
                     )
                 }
                 #[doc = " Pre-claimed Ethereum accounts, by the Account ID that they are claimed to."]
-                pub fn preclaims_root(
+                pub fn preclaims(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_runtime_common::claims::EthereumAddress,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Claims",
                         "Preclaims",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            154u8, 182u8, 178u8, 76u8, 81u8, 63u8, 87u8, 179u8, 243u8, 104u8,
-                            206u8, 75u8, 114u8, 83u8, 16u8, 233u8, 22u8, 132u8, 207u8, 36u8, 151u8,
-                            179u8, 94u8, 208u8, 210u8, 202u8, 149u8, 248u8, 9u8, 49u8, 140u8, 94u8,
+                            197u8, 114u8, 147u8, 235u8, 203u8, 255u8, 94u8, 113u8, 151u8, 119u8,
+                            224u8, 147u8, 48u8, 246u8, 124u8, 38u8, 190u8, 237u8, 226u8, 65u8,
+                            91u8, 163u8, 129u8, 40u8, 71u8, 137u8, 220u8, 242u8, 51u8, 75u8, 3u8,
+                            204u8,
                         ],
                     )
                 }
@@ -18774,10 +19098,9 @@ pub mod api {
                         "vest_other",
                         types::VestOther { target },
                         [
-                            110u8, 68u8, 150u8, 149u8, 107u8, 90u8, 168u8, 177u8, 73u8, 114u8,
-                            18u8, 18u8, 5u8, 75u8, 23u8, 149u8, 236u8, 123u8, 221u8, 240u8, 139u8,
-                            238u8, 208u8, 0u8, 218u8, 209u8, 53u8, 193u8, 180u8, 245u8, 48u8,
-                            229u8,
+                            238u8, 92u8, 25u8, 149u8, 27u8, 211u8, 196u8, 31u8, 211u8, 28u8, 241u8,
+                            30u8, 128u8, 35u8, 0u8, 227u8, 202u8, 215u8, 186u8, 69u8, 216u8, 110u8,
+                            199u8, 120u8, 134u8, 141u8, 176u8, 224u8, 234u8, 42u8, 152u8, 128u8,
                         ],
                     )
                 }
@@ -18795,10 +19118,9 @@ pub mod api {
                         "vested_transfer",
                         types::VestedTransfer { target, schedule },
                         [
-                            6u8, 238u8, 73u8, 156u8, 65u8, 39u8, 135u8, 115u8, 26u8, 55u8, 41u8,
-                            171u8, 227u8, 86u8, 94u8, 157u8, 199u8, 151u8, 133u8, 253u8, 173u8,
-                            59u8, 140u8, 239u8, 130u8, 248u8, 250u8, 253u8, 240u8, 30u8, 73u8,
-                            217u8,
+                            198u8, 133u8, 254u8, 5u8, 22u8, 170u8, 205u8, 79u8, 218u8, 30u8, 81u8,
+                            207u8, 227u8, 121u8, 132u8, 14u8, 217u8, 43u8, 66u8, 206u8, 15u8, 80u8,
+                            173u8, 208u8, 128u8, 72u8, 223u8, 175u8, 93u8, 69u8, 128u8, 88u8,
                         ],
                     )
                 }
@@ -18821,9 +19143,10 @@ pub mod api {
                             schedule,
                         },
                         [
-                            69u8, 51u8, 162u8, 29u8, 192u8, 237u8, 135u8, 167u8, 176u8, 48u8, 33u8,
-                            216u8, 195u8, 213u8, 176u8, 49u8, 202u8, 238u8, 197u8, 210u8, 8u8,
-                            35u8, 77u8, 69u8, 30u8, 15u8, 145u8, 19u8, 28u8, 193u8, 197u8, 16u8,
+                            112u8, 17u8, 176u8, 133u8, 169u8, 192u8, 155u8, 217u8, 153u8, 36u8,
+                            230u8, 45u8, 9u8, 192u8, 2u8, 201u8, 165u8, 60u8, 206u8, 226u8, 95u8,
+                            86u8, 239u8, 196u8, 109u8, 62u8, 224u8, 237u8, 88u8, 74u8, 209u8,
+                            251u8,
                         ],
                     )
                 }
@@ -18841,9 +19164,9 @@ pub mod api {
                             schedule2_index,
                         },
                         [
-                            135u8, 49u8, 137u8, 222u8, 134u8, 94u8, 197u8, 182u8, 171u8, 57u8,
-                            161u8, 6u8, 185u8, 130u8, 45u8, 30u8, 79u8, 77u8, 157u8, 118u8, 35u8,
-                            249u8, 39u8, 10u8, 103u8, 160u8, 198u8, 75u8, 26u8, 50u8, 64u8, 26u8,
+                            45u8, 24u8, 13u8, 108u8, 26u8, 99u8, 61u8, 117u8, 195u8, 218u8, 182u8,
+                            23u8, 188u8, 157u8, 181u8, 81u8, 38u8, 136u8, 31u8, 226u8, 8u8, 190u8,
+                            33u8, 81u8, 86u8, 185u8, 156u8, 77u8, 157u8, 197u8, 41u8, 58u8,
                         ],
                     )
                 }
@@ -18897,9 +19220,8 @@ pub mod api {
             pub struct StorageApi;
             impl StorageApi {
                 #[doc = " Information regarding the vesting of a given account."]
-                pub fn vesting(
+                pub fn vesting_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<
@@ -18908,27 +19230,26 @@ pub mod api {
                             ::core::primitive::u32,
                         >,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Vesting",
                         "Vesting",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            10u8, 98u8, 73u8, 242u8, 215u8, 4u8, 45u8, 227u8, 73u8, 203u8, 33u8,
-                            105u8, 228u8, 247u8, 125u8, 99u8, 98u8, 38u8, 176u8, 123u8, 233u8,
-                            219u8, 174u8, 118u8, 49u8, 172u8, 58u8, 162u8, 186u8, 110u8, 147u8,
-                            122u8,
+                            95u8, 168u8, 217u8, 248u8, 149u8, 86u8, 195u8, 93u8, 73u8, 206u8,
+                            105u8, 165u8, 33u8, 173u8, 232u8, 81u8, 147u8, 254u8, 50u8, 228u8,
+                            156u8, 92u8, 242u8, 149u8, 42u8, 91u8, 58u8, 209u8, 142u8, 221u8,
+                            230u8, 112u8,
                         ],
                     )
                 }
                 #[doc = " Information regarding the vesting of a given account."]
-                pub fn vesting_root(
+                pub fn vesting(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<
@@ -18937,19 +19258,21 @@ pub mod api {
                             ::core::primitive::u32,
                         >,
                     >,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Vesting",
                         "Vesting",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            10u8, 98u8, 73u8, 242u8, 215u8, 4u8, 45u8, 227u8, 73u8, 203u8, 33u8,
-                            105u8, 228u8, 247u8, 125u8, 99u8, 98u8, 38u8, 176u8, 123u8, 233u8,
-                            219u8, 174u8, 118u8, 49u8, 172u8, 58u8, 162u8, 186u8, 110u8, 147u8,
-                            122u8,
+                            95u8, 168u8, 217u8, 248u8, 149u8, 86u8, 195u8, 93u8, 73u8, 206u8,
+                            105u8, 165u8, 33u8, 173u8, 232u8, 81u8, 147u8, 254u8, 50u8, 228u8,
+                            156u8, 92u8, 242u8, 149u8, 42u8, 91u8, 58u8, 209u8, 142u8, 221u8,
+                            230u8, 112u8,
                         ],
                     )
                 }
@@ -19144,9 +19467,9 @@ pub mod api {
                         "batch",
                         types::Batch { calls },
                         [
-                            77u8, 176u8, 65u8, 208u8, 62u8, 46u8, 243u8, 25u8, 21u8, 163u8, 136u8,
-                            35u8, 237u8, 84u8, 7u8, 246u8, 18u8, 145u8, 88u8, 23u8, 26u8, 138u8,
-                            101u8, 206u8, 245u8, 95u8, 167u8, 53u8, 206u8, 47u8, 196u8, 120u8,
+                            182u8, 167u8, 83u8, 183u8, 115u8, 20u8, 90u8, 60u8, 18u8, 8u8, 78u8,
+                            51u8, 122u8, 27u8, 88u8, 130u8, 186u8, 66u8, 26u8, 13u8, 185u8, 206u8,
+                            16u8, 243u8, 130u8, 87u8, 242u8, 255u8, 110u8, 216u8, 117u8, 99u8,
                         ],
                     )
                 }
@@ -19164,10 +19487,10 @@ pub mod api {
                             call: ::std::boxed::Box::new(call),
                         },
                         [
-                            167u8, 253u8, 240u8, 160u8, 45u8, 115u8, 192u8, 78u8, 43u8, 14u8,
-                            164u8, 226u8, 46u8, 222u8, 226u8, 203u8, 97u8, 166u8, 230u8, 168u8,
-                            210u8, 196u8, 133u8, 37u8, 213u8, 247u8, 230u8, 143u8, 98u8, 88u8,
-                            246u8, 207u8,
+                            162u8, 98u8, 19u8, 183u8, 155u8, 194u8, 169u8, 46u8, 67u8, 134u8,
+                            119u8, 147u8, 198u8, 59u8, 188u8, 212u8, 2u8, 177u8, 151u8, 122u8,
+                            24u8, 157u8, 132u8, 84u8, 15u8, 4u8, 169u8, 171u8, 84u8, 36u8, 149u8,
+                            66u8,
                         ],
                     )
                 }
@@ -19181,9 +19504,9 @@ pub mod api {
                         "batch_all",
                         types::BatchAll { calls },
                         [
-                            60u8, 32u8, 11u8, 20u8, 78u8, 183u8, 127u8, 35u8, 234u8, 221u8, 81u8,
-                            6u8, 234u8, 90u8, 114u8, 47u8, 160u8, 78u8, 241u8, 45u8, 200u8, 71u8,
-                            216u8, 135u8, 185u8, 227u8, 60u8, 215u8, 119u8, 131u8, 105u8, 168u8,
+                            108u8, 114u8, 118u8, 9u8, 102u8, 178u8, 77u8, 32u8, 118u8, 36u8, 19u8,
+                            32u8, 135u8, 140u8, 165u8, 72u8, 254u8, 20u8, 69u8, 240u8, 76u8, 173u8,
+                            146u8, 199u8, 62u8, 14u8, 54u8, 161u8, 13u8, 162u8, 176u8, 138u8,
                         ],
                     )
                 }
@@ -19201,9 +19524,10 @@ pub mod api {
                             call: ::std::boxed::Box::new(call),
                         },
                         [
-                            215u8, 96u8, 253u8, 135u8, 162u8, 215u8, 57u8, 11u8, 29u8, 252u8, 69u8,
-                            209u8, 113u8, 29u8, 127u8, 248u8, 254u8, 187u8, 107u8, 191u8, 174u8,
-                            100u8, 25u8, 114u8, 126u8, 17u8, 73u8, 44u8, 43u8, 202u8, 76u8, 250u8,
+                            183u8, 200u8, 46u8, 162u8, 103u8, 250u8, 167u8, 160u8, 2u8, 135u8,
+                            221u8, 42u8, 132u8, 255u8, 217u8, 49u8, 235u8, 180u8, 104u8, 89u8,
+                            161u8, 112u8, 106u8, 61u8, 216u8, 69u8, 67u8, 113u8, 178u8, 2u8, 240u8,
+                            74u8,
                         ],
                     )
                 }
@@ -19217,9 +19541,9 @@ pub mod api {
                         "force_batch",
                         types::ForceBatch { calls },
                         [
-                            59u8, 36u8, 137u8, 152u8, 227u8, 218u8, 8u8, 223u8, 44u8, 44u8, 149u8,
-                            31u8, 249u8, 124u8, 170u8, 185u8, 9u8, 166u8, 147u8, 238u8, 10u8, 58u8,
-                            229u8, 10u8, 236u8, 171u8, 114u8, 242u8, 255u8, 107u8, 138u8, 59u8,
+                            175u8, 214u8, 12u8, 39u8, 47u8, 227u8, 43u8, 157u8, 243u8, 132u8,
+                            225u8, 222u8, 17u8, 40u8, 162u8, 175u8, 56u8, 67u8, 29u8, 130u8, 253u8,
+                            60u8, 63u8, 46u8, 130u8, 52u8, 149u8, 144u8, 150u8, 164u8, 30u8, 153u8,
                         ],
                     )
                 }
@@ -19237,9 +19561,10 @@ pub mod api {
                             weight,
                         },
                         [
-                            18u8, 188u8, 157u8, 217u8, 79u8, 197u8, 24u8, 199u8, 167u8, 6u8, 194u8,
-                            8u8, 54u8, 41u8, 74u8, 47u8, 111u8, 200u8, 76u8, 210u8, 23u8, 125u8,
-                            14u8, 162u8, 193u8, 217u8, 200u8, 99u8, 57u8, 235u8, 128u8, 244u8,
+                            234u8, 55u8, 4u8, 177u8, 174u8, 244u8, 173u8, 247u8, 186u8, 137u8,
+                            132u8, 35u8, 201u8, 235u8, 18u8, 186u8, 85u8, 247u8, 187u8, 103u8,
+                            68u8, 44u8, 100u8, 200u8, 172u8, 82u8, 224u8, 90u8, 190u8, 186u8,
+                            136u8, 209u8,
                         ],
                     )
                 }
@@ -19677,10 +20002,9 @@ pub mod api {
                         "add_registrar",
                         types::AddRegistrar { account },
                         [
-                            151u8, 254u8, 116u8, 168u8, 124u8, 236u8, 0u8, 15u8, 49u8, 117u8,
-                            191u8, 181u8, 254u8, 152u8, 163u8, 69u8, 139u8, 157u8, 38u8, 231u8,
-                            87u8, 4u8, 227u8, 0u8, 79u8, 188u8, 41u8, 31u8, 120u8, 28u8, 214u8,
-                            31u8,
+                            6u8, 131u8, 82u8, 191u8, 37u8, 240u8, 158u8, 187u8, 247u8, 98u8, 175u8,
+                            200u8, 147u8, 78u8, 88u8, 176u8, 227u8, 179u8, 184u8, 194u8, 91u8, 1u8,
+                            1u8, 20u8, 121u8, 4u8, 96u8, 94u8, 103u8, 140u8, 247u8, 253u8,
                         ],
                     )
                 }
@@ -19696,9 +20020,10 @@ pub mod api {
                             info: ::std::boxed::Box::new(info),
                         },
                         [
-                            205u8, 7u8, 54u8, 226u8, 123u8, 160u8, 173u8, 25u8, 179u8, 93u8, 172u8,
-                            37u8, 222u8, 143u8, 209u8, 1u8, 230u8, 32u8, 84u8, 80u8, 110u8, 195u8,
-                            87u8, 185u8, 27u8, 31u8, 185u8, 161u8, 154u8, 166u8, 177u8, 190u8,
+                            18u8, 86u8, 67u8, 10u8, 116u8, 254u8, 94u8, 95u8, 166u8, 30u8, 204u8,
+                            189u8, 174u8, 70u8, 191u8, 255u8, 149u8, 93u8, 156u8, 120u8, 105u8,
+                            138u8, 199u8, 181u8, 43u8, 150u8, 143u8, 254u8, 182u8, 81u8, 86u8,
+                            45u8,
                         ],
                     )
                 }
@@ -19715,10 +20040,10 @@ pub mod api {
                         "set_subs",
                         types::SetSubs { subs },
                         [
-                            76u8, 193u8, 92u8, 120u8, 9u8, 99u8, 102u8, 220u8, 177u8, 29u8, 65u8,
-                            14u8, 250u8, 101u8, 118u8, 59u8, 251u8, 153u8, 136u8, 141u8, 89u8,
-                            250u8, 74u8, 254u8, 111u8, 220u8, 132u8, 228u8, 248u8, 132u8, 177u8,
-                            128u8,
+                            34u8, 184u8, 18u8, 155u8, 112u8, 247u8, 235u8, 75u8, 209u8, 236u8,
+                            21u8, 238u8, 43u8, 237u8, 223u8, 147u8, 48u8, 6u8, 39u8, 231u8, 174u8,
+                            164u8, 243u8, 184u8, 220u8, 151u8, 165u8, 69u8, 219u8, 122u8, 234u8,
+                            100u8,
                         ],
                     )
                 }
@@ -19799,9 +20124,10 @@ pub mod api {
                         "set_account_id",
                         types::SetAccountId { index, new },
                         [
-                            7u8, 72u8, 255u8, 4u8, 182u8, 226u8, 22u8, 255u8, 181u8, 64u8, 165u8,
-                            247u8, 102u8, 190u8, 42u8, 236u8, 196u8, 201u8, 26u8, 6u8, 91u8, 113u8,
-                            223u8, 237u8, 250u8, 182u8, 40u8, 184u8, 45u8, 255u8, 64u8, 137u8,
+                            68u8, 57u8, 39u8, 134u8, 39u8, 82u8, 156u8, 107u8, 113u8, 99u8, 9u8,
+                            163u8, 58u8, 249u8, 247u8, 208u8, 38u8, 203u8, 54u8, 153u8, 116u8,
+                            143u8, 81u8, 46u8, 228u8, 149u8, 127u8, 115u8, 252u8, 83u8, 33u8,
+                            101u8,
                         ],
                     )
                 }
@@ -19844,9 +20170,10 @@ pub mod api {
                             identity,
                         },
                         [
-                            84u8, 65u8, 119u8, 246u8, 52u8, 71u8, 44u8, 213u8, 173u8, 21u8, 198u8,
-                            91u8, 234u8, 186u8, 176u8, 168u8, 158u8, 232u8, 10u8, 230u8, 15u8,
-                            34u8, 27u8, 241u8, 200u8, 58u8, 17u8, 112u8, 211u8, 88u8, 162u8, 228u8,
+                            145u8, 188u8, 61u8, 236u8, 183u8, 49u8, 49u8, 149u8, 240u8, 184u8,
+                            202u8, 75u8, 69u8, 0u8, 95u8, 103u8, 132u8, 24u8, 107u8, 221u8, 236u8,
+                            75u8, 231u8, 125u8, 39u8, 189u8, 45u8, 202u8, 116u8, 123u8, 236u8,
+                            96u8,
                         ],
                     )
                 }
@@ -19860,9 +20187,10 @@ pub mod api {
                         "kill_identity",
                         types::KillIdentity { target },
                         [
-                            154u8, 203u8, 22u8, 126u8, 241u8, 51u8, 109u8, 221u8, 79u8, 203u8,
-                            12u8, 113u8, 234u8, 162u8, 125u8, 39u8, 69u8, 105u8, 194u8, 7u8, 254u8,
-                            196u8, 66u8, 104u8, 15u8, 41u8, 164u8, 11u8, 55u8, 98u8, 160u8, 175u8,
+                            114u8, 249u8, 102u8, 62u8, 118u8, 105u8, 185u8, 61u8, 173u8, 52u8,
+                            57u8, 190u8, 102u8, 74u8, 108u8, 239u8, 142u8, 176u8, 116u8, 51u8,
+                            49u8, 197u8, 6u8, 183u8, 248u8, 202u8, 202u8, 140u8, 134u8, 59u8,
+                            103u8, 182u8,
                         ],
                     )
                 }
@@ -19877,10 +20205,9 @@ pub mod api {
                         "add_sub",
                         types::AddSub { sub, data },
                         [
-                            157u8, 159u8, 194u8, 77u8, 105u8, 29u8, 238u8, 209u8, 145u8, 64u8,
-                            24u8, 130u8, 102u8, 41u8, 124u8, 74u8, 190u8, 29u8, 142u8, 123u8,
-                            131u8, 126u8, 58u8, 129u8, 46u8, 54u8, 160u8, 17u8, 178u8, 72u8, 15u8,
-                            145u8,
+                            3u8, 65u8, 137u8, 35u8, 238u8, 133u8, 56u8, 233u8, 37u8, 125u8, 221u8,
+                            186u8, 153u8, 74u8, 69u8, 196u8, 244u8, 82u8, 51u8, 7u8, 216u8, 29u8,
+                            18u8, 16u8, 198u8, 184u8, 0u8, 181u8, 71u8, 227u8, 144u8, 33u8,
                         ],
                     )
                 }
@@ -19895,9 +20222,10 @@ pub mod api {
                         "rename_sub",
                         types::RenameSub { sub, data },
                         [
-                            100u8, 82u8, 99u8, 104u8, 4u8, 129u8, 166u8, 128u8, 187u8, 80u8, 73u8,
-                            57u8, 167u8, 74u8, 155u8, 125u8, 171u8, 229u8, 201u8, 246u8, 145u8,
-                            190u8, 222u8, 1u8, 129u8, 139u8, 205u8, 96u8, 186u8, 221u8, 15u8, 35u8,
+                            252u8, 50u8, 201u8, 112u8, 49u8, 248u8, 223u8, 239u8, 219u8, 226u8,
+                            64u8, 68u8, 227u8, 20u8, 30u8, 24u8, 36u8, 77u8, 26u8, 235u8, 144u8,
+                            240u8, 11u8, 111u8, 145u8, 167u8, 184u8, 207u8, 173u8, 58u8, 152u8,
+                            202u8,
                         ],
                     )
                 }
@@ -19911,10 +20239,9 @@ pub mod api {
                         "remove_sub",
                         types::RemoveSub { sub },
                         [
-                            209u8, 217u8, 16u8, 99u8, 152u8, 250u8, 236u8, 172u8, 139u8, 229u8,
-                            246u8, 165u8, 188u8, 59u8, 66u8, 31u8, 105u8, 237u8, 51u8, 218u8,
-                            177u8, 108u8, 101u8, 115u8, 190u8, 105u8, 208u8, 241u8, 133u8, 224u8,
-                            2u8, 38u8,
+                            95u8, 249u8, 171u8, 27u8, 100u8, 186u8, 67u8, 214u8, 226u8, 6u8, 118u8,
+                            39u8, 91u8, 122u8, 1u8, 87u8, 1u8, 226u8, 101u8, 9u8, 199u8, 167u8,
+                            84u8, 202u8, 141u8, 196u8, 80u8, 195u8, 15u8, 114u8, 140u8, 144u8,
                         ],
                     )
                 }
@@ -20139,102 +20466,102 @@ pub mod api {
                 #[doc = " Information that is pertinent to identify the entity behind an account."]
                 #[doc = ""]
                 #[doc = " TWOX-NOTE: OK ― `AccountId` is a secure hash."]
-                pub fn identity_of(
+                pub fn identity_of_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_identity::types::Registration<::core::primitive::u128>,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Identity",
                         "IdentityOf",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            239u8, 55u8, 5u8, 97u8, 227u8, 243u8, 118u8, 13u8, 98u8, 30u8, 141u8,
-                            84u8, 170u8, 90u8, 166u8, 116u8, 17u8, 122u8, 190u8, 76u8, 34u8, 51u8,
-                            239u8, 41u8, 14u8, 135u8, 11u8, 164u8, 106u8, 228u8, 48u8, 26u8,
+                            112u8, 2u8, 209u8, 123u8, 138u8, 171u8, 80u8, 243u8, 226u8, 88u8, 81u8,
+                            49u8, 59u8, 172u8, 88u8, 180u8, 255u8, 119u8, 57u8, 16u8, 169u8, 149u8,
+                            77u8, 239u8, 73u8, 182u8, 28u8, 112u8, 150u8, 110u8, 65u8, 139u8,
                         ],
                     )
                 }
                 #[doc = " Information that is pertinent to identify the entity behind an account."]
                 #[doc = ""]
                 #[doc = " TWOX-NOTE: OK ― `AccountId` is a secure hash."]
-                pub fn identity_of_root(
+                pub fn identity_of(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_identity::types::Registration<::core::primitive::u128>,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Identity",
                         "IdentityOf",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            239u8, 55u8, 5u8, 97u8, 227u8, 243u8, 118u8, 13u8, 98u8, 30u8, 141u8,
-                            84u8, 170u8, 90u8, 166u8, 116u8, 17u8, 122u8, 190u8, 76u8, 34u8, 51u8,
-                            239u8, 41u8, 14u8, 135u8, 11u8, 164u8, 106u8, 228u8, 48u8, 26u8,
+                            112u8, 2u8, 209u8, 123u8, 138u8, 171u8, 80u8, 243u8, 226u8, 88u8, 81u8,
+                            49u8, 59u8, 172u8, 88u8, 180u8, 255u8, 119u8, 57u8, 16u8, 169u8, 149u8,
+                            77u8, 239u8, 73u8, 182u8, 28u8, 112u8, 150u8, 110u8, 65u8, 139u8,
                         ],
                     )
                 }
                 #[doc = " The super-identity of an alternative \"sub\" identity together with its name, within that"]
                 #[doc = " context. If the account is not some other account's sub-identity, then just `None`."]
-                pub fn super_of(
+                pub fn super_of_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     (
                         ::subxt::utils::AccountId32,
                         runtime_types::pallet_identity::types::Data,
                     ),
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Identity",
                         "SuperOf",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            51u8, 225u8, 21u8, 92u8, 85u8, 14u8, 14u8, 211u8, 61u8, 99u8, 176u8,
-                            236u8, 212u8, 156u8, 103u8, 175u8, 208u8, 105u8, 94u8, 226u8, 136u8,
-                            69u8, 162u8, 170u8, 11u8, 116u8, 72u8, 242u8, 119u8, 14u8, 14u8, 142u8,
+                            84u8, 72u8, 64u8, 14u8, 56u8, 9u8, 143u8, 100u8, 141u8, 163u8, 36u8,
+                            55u8, 38u8, 254u8, 164u8, 17u8, 3u8, 110u8, 88u8, 175u8, 161u8, 65u8,
+                            159u8, 40u8, 46u8, 8u8, 177u8, 81u8, 130u8, 38u8, 193u8, 28u8,
                         ],
                     )
                 }
                 #[doc = " The super-identity of an alternative \"sub\" identity together with its name, within that"]
                 #[doc = " context. If the account is not some other account's sub-identity, then just `None`."]
-                pub fn super_of_root(
+                pub fn super_of(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     (
                         ::subxt::utils::AccountId32,
                         runtime_types::pallet_identity::types::Data,
                     ),
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Identity",
                         "SuperOf",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            51u8, 225u8, 21u8, 92u8, 85u8, 14u8, 14u8, 211u8, 61u8, 99u8, 176u8,
-                            236u8, 212u8, 156u8, 103u8, 175u8, 208u8, 105u8, 94u8, 226u8, 136u8,
-                            69u8, 162u8, 170u8, 11u8, 116u8, 72u8, 242u8, 119u8, 14u8, 14u8, 142u8,
+                            84u8, 72u8, 64u8, 14u8, 56u8, 9u8, 143u8, 100u8, 141u8, 163u8, 36u8,
+                            55u8, 38u8, 254u8, 164u8, 17u8, 3u8, 110u8, 88u8, 175u8, 161u8, 65u8,
+                            159u8, 40u8, 46u8, 8u8, 177u8, 81u8, 130u8, 38u8, 193u8, 28u8,
                         ],
                     )
                 }
@@ -20243,9 +20570,8 @@ pub mod api {
                 #[doc = " The first item is the deposit, the second is a vector of the accounts."]
                 #[doc = ""]
                 #[doc = " TWOX-NOTE: OK ― `AccountId` is a secure hash."]
-                pub fn subs_of(
+                pub fn subs_of_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     (
@@ -20254,21 +20580,19 @@ pub mod api {
                             ::subxt::utils::AccountId32,
                         >,
                     ),
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Identity",
                         "SubsOf",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            93u8, 124u8, 154u8, 157u8, 159u8, 103u8, 233u8, 225u8, 59u8, 20u8,
-                            201u8, 239u8, 128u8, 209u8, 207u8, 38u8, 123u8, 48u8, 119u8, 102u8,
-                            88u8, 42u8, 245u8, 187u8, 244u8, 206u8, 124u8, 216u8, 185u8, 155u8,
-                            207u8, 0u8,
+                            164u8, 140u8, 52u8, 123u8, 220u8, 118u8, 147u8, 3u8, 67u8, 22u8, 191u8,
+                            18u8, 186u8, 21u8, 154u8, 8u8, 205u8, 224u8, 163u8, 173u8, 174u8,
+                            107u8, 144u8, 215u8, 116u8, 64u8, 159u8, 115u8, 159u8, 205u8, 91u8,
+                            28u8,
                         ],
                     )
                 }
@@ -20277,8 +20601,9 @@ pub mod api {
                 #[doc = " The first item is the deposit, the second is a vector of the accounts."]
                 #[doc = ""]
                 #[doc = " TWOX-NOTE: OK ― `AccountId` is a secure hash."]
-                pub fn subs_of_root(
+                pub fn subs_of(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     (
@@ -20287,19 +20612,21 @@ pub mod api {
                             ::subxt::utils::AccountId32,
                         >,
                     ),
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Identity",
                         "SubsOf",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            93u8, 124u8, 154u8, 157u8, 159u8, 103u8, 233u8, 225u8, 59u8, 20u8,
-                            201u8, 239u8, 128u8, 209u8, 207u8, 38u8, 123u8, 48u8, 119u8, 102u8,
-                            88u8, 42u8, 245u8, 187u8, 244u8, 206u8, 124u8, 216u8, 185u8, 155u8,
-                            207u8, 0u8,
+                            164u8, 140u8, 52u8, 123u8, 220u8, 118u8, 147u8, 3u8, 67u8, 22u8, 191u8,
+                            18u8, 186u8, 21u8, 154u8, 8u8, 205u8, 224u8, 163u8, 173u8, 174u8,
+                            107u8, 144u8, 215u8, 116u8, 64u8, 159u8, 115u8, 159u8, 205u8, 91u8,
+                            28u8,
                         ],
                     )
                 }
@@ -20659,9 +20986,9 @@ pub mod api {
                             call: ::std::boxed::Box::new(call),
                         },
                         [
-                            171u8, 10u8, 194u8, 30u8, 89u8, 182u8, 54u8, 142u8, 107u8, 66u8, 194u8,
-                            115u8, 67u8, 5u8, 103u8, 93u8, 51u8, 7u8, 252u8, 55u8, 128u8, 197u8,
-                            17u8, 156u8, 74u8, 48u8, 223u8, 40u8, 51u8, 55u8, 39u8, 240u8,
+                            92u8, 163u8, 235u8, 83u8, 4u8, 39u8, 157u8, 63u8, 186u8, 151u8, 191u8,
+                            133u8, 126u8, 197u8, 169u8, 88u8, 188u8, 127u8, 31u8, 160u8, 135u8,
+                            7u8, 221u8, 157u8, 224u8, 76u8, 158u8, 179u8, 24u8, 130u8, 241u8, 88u8,
                         ],
                     )
                 }
@@ -20681,9 +21008,10 @@ pub mod api {
                             delay,
                         },
                         [
-                            98u8, 241u8, 149u8, 52u8, 147u8, 196u8, 144u8, 174u8, 150u8, 34u8,
-                            14u8, 55u8, 169u8, 79u8, 24u8, 245u8, 170u8, 19u8, 48u8, 74u8, 52u8,
-                            65u8, 136u8, 164u8, 180u8, 68u8, 40u8, 56u8, 14u8, 146u8, 252u8, 54u8,
+                            220u8, 202u8, 219u8, 231u8, 191u8, 245u8, 104u8, 50u8, 183u8, 248u8,
+                            174u8, 8u8, 129u8, 7u8, 220u8, 203u8, 147u8, 224u8, 127u8, 243u8, 46u8,
+                            234u8, 204u8, 92u8, 112u8, 77u8, 143u8, 83u8, 218u8, 183u8, 131u8,
+                            194u8,
                         ],
                     )
                 }
@@ -20703,9 +21031,10 @@ pub mod api {
                             delay,
                         },
                         [
-                            240u8, 43u8, 125u8, 111u8, 174u8, 178u8, 34u8, 121u8, 149u8, 35u8,
-                            114u8, 77u8, 235u8, 34u8, 193u8, 7u8, 40u8, 159u8, 54u8, 186u8, 37u8,
-                            240u8, 42u8, 32u8, 44u8, 207u8, 55u8, 3u8, 117u8, 208u8, 3u8, 129u8,
+                            123u8, 71u8, 234u8, 46u8, 239u8, 132u8, 115u8, 20u8, 33u8, 31u8, 75u8,
+                            172u8, 152u8, 129u8, 51u8, 240u8, 164u8, 153u8, 120u8, 2u8, 120u8,
+                            151u8, 182u8, 92u8, 222u8, 213u8, 105u8, 21u8, 126u8, 182u8, 117u8,
+                            133u8,
                         ],
                     )
                 }
@@ -20765,9 +21094,9 @@ pub mod api {
                             ext_index,
                         },
                         [
-                            221u8, 143u8, 132u8, 8u8, 33u8, 255u8, 123u8, 72u8, 4u8, 125u8, 28u8,
-                            71u8, 218u8, 55u8, 59u8, 149u8, 15u8, 92u8, 149u8, 73u8, 6u8, 40u8,
-                            4u8, 132u8, 128u8, 215u8, 84u8, 88u8, 210u8, 172u8, 129u8, 168u8,
+                            156u8, 57u8, 67u8, 93u8, 148u8, 239u8, 31u8, 189u8, 52u8, 190u8, 74u8,
+                            215u8, 82u8, 207u8, 85u8, 160u8, 215u8, 24u8, 36u8, 136u8, 79u8, 108u8,
+                            50u8, 226u8, 138u8, 101u8, 158u8, 120u8, 225u8, 46u8, 228u8, 150u8,
                         ],
                     )
                 }
@@ -20782,9 +21111,10 @@ pub mod api {
                         "announce",
                         types::Announce { real, call_hash },
                         [
-                            206u8, 1u8, 22u8, 172u8, 246u8, 31u8, 240u8, 30u8, 76u8, 122u8, 234u8,
-                            175u8, 20u8, 134u8, 193u8, 101u8, 77u8, 87u8, 201u8, 226u8, 121u8,
-                            67u8, 151u8, 55u8, 86u8, 16u8, 16u8, 144u8, 95u8, 69u8, 92u8, 255u8,
+                            105u8, 218u8, 232u8, 82u8, 80u8, 10u8, 11u8, 1u8, 93u8, 241u8, 121u8,
+                            198u8, 167u8, 218u8, 95u8, 15u8, 75u8, 122u8, 155u8, 233u8, 10u8,
+                            175u8, 145u8, 73u8, 214u8, 230u8, 67u8, 107u8, 23u8, 239u8, 69u8,
+                            240u8,
                         ],
                     )
                 }
@@ -20799,10 +21129,9 @@ pub mod api {
                         "remove_announcement",
                         types::RemoveAnnouncement { real, call_hash },
                         [
-                            144u8, 72u8, 202u8, 26u8, 128u8, 116u8, 108u8, 243u8, 63u8, 227u8,
-                            251u8, 207u8, 211u8, 35u8, 126u8, 30u8, 243u8, 199u8, 167u8, 209u8,
-                            68u8, 44u8, 212u8, 139u8, 215u8, 230u8, 92u8, 42u8, 132u8, 48u8, 172u8,
-                            176u8,
+                            40u8, 237u8, 179u8, 128u8, 201u8, 183u8, 20u8, 47u8, 99u8, 182u8, 81u8,
+                            31u8, 27u8, 212u8, 133u8, 36u8, 8u8, 248u8, 57u8, 230u8, 138u8, 80u8,
+                            241u8, 147u8, 69u8, 236u8, 156u8, 167u8, 205u8, 49u8, 60u8, 16u8,
                         ],
                     )
                 }
@@ -20820,10 +21149,9 @@ pub mod api {
                             call_hash,
                         },
                         [
-                            152u8, 133u8, 113u8, 234u8, 80u8, 247u8, 67u8, 136u8, 204u8, 144u8,
-                            220u8, 36u8, 25u8, 44u8, 245u8, 206u8, 101u8, 104u8, 155u8, 214u8,
-                            140u8, 233u8, 188u8, 37u8, 183u8, 212u8, 246u8, 42u8, 13u8, 207u8,
-                            187u8, 58u8,
+                            150u8, 178u8, 49u8, 160u8, 211u8, 75u8, 58u8, 228u8, 121u8, 253u8,
+                            167u8, 72u8, 68u8, 105u8, 159u8, 52u8, 41u8, 155u8, 92u8, 26u8, 169u8,
+                            177u8, 102u8, 36u8, 1u8, 47u8, 87u8, 189u8, 223u8, 238u8, 244u8, 110u8,
                         ],
                     )
                 }
@@ -20847,10 +21175,10 @@ pub mod api {
                             call: ::std::boxed::Box::new(call),
                         },
                         [
-                            92u8, 39u8, 178u8, 161u8, 128u8, 239u8, 29u8, 145u8, 200u8, 189u8,
-                            89u8, 198u8, 22u8, 244u8, 222u8, 227u8, 145u8, 146u8, 34u8, 181u8,
-                            118u8, 140u8, 99u8, 3u8, 102u8, 195u8, 214u8, 126u8, 178u8, 193u8,
-                            190u8, 13u8,
+                            6u8, 182u8, 30u8, 45u8, 151u8, 58u8, 244u8, 241u8, 161u8, 174u8, 47u8,
+                            100u8, 105u8, 214u8, 136u8, 245u8, 250u8, 13u8, 246u8, 47u8, 251u8,
+                            182u8, 12u8, 150u8, 220u8, 18u8, 250u8, 178u8, 62u8, 15u8, 212u8,
+                            175u8,
                         ],
                     )
                 }
@@ -20969,9 +21297,8 @@ pub mod api {
             impl StorageApi {
                 #[doc = " The set of account proxies. Maps the account which has delegated to the accounts"]
                 #[doc = " which are being delegated to, together with the amount held on deposit."]
-                pub fn proxies(
+                pub fn proxies_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     (
@@ -20984,27 +21311,27 @@ pub mod api {
                         >,
                         ::core::primitive::u128,
                     ),
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Proxy",
                         "Proxies",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            60u8, 50u8, 235u8, 231u8, 242u8, 45u8, 51u8, 138u8, 135u8, 226u8,
-                            224u8, 76u8, 4u8, 0u8, 210u8, 137u8, 173u8, 56u8, 178u8, 95u8, 172u8,
-                            43u8, 58u8, 120u8, 124u8, 13u8, 141u8, 68u8, 91u8, 171u8, 59u8, 101u8,
+                            248u8, 226u8, 176u8, 230u8, 10u8, 37u8, 135u8, 74u8, 122u8, 169u8,
+                            107u8, 114u8, 64u8, 12u8, 171u8, 126u8, 3u8, 11u8, 197u8, 216u8, 36u8,
+                            239u8, 150u8, 88u8, 37u8, 171u8, 84u8, 200u8, 241u8, 32u8, 238u8,
+                            157u8,
                         ],
                     )
                 }
                 #[doc = " The set of account proxies. Maps the account which has delegated to the accounts"]
                 #[doc = " which are being delegated to, together with the amount held on deposit."]
-                pub fn proxies_root(
+                pub fn proxies(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     (
@@ -21017,25 +21344,27 @@ pub mod api {
                         >,
                         ::core::primitive::u128,
                     ),
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Proxy",
                         "Proxies",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            60u8, 50u8, 235u8, 231u8, 242u8, 45u8, 51u8, 138u8, 135u8, 226u8,
-                            224u8, 76u8, 4u8, 0u8, 210u8, 137u8, 173u8, 56u8, 178u8, 95u8, 172u8,
-                            43u8, 58u8, 120u8, 124u8, 13u8, 141u8, 68u8, 91u8, 171u8, 59u8, 101u8,
+                            248u8, 226u8, 176u8, 230u8, 10u8, 37u8, 135u8, 74u8, 122u8, 169u8,
+                            107u8, 114u8, 64u8, 12u8, 171u8, 126u8, 3u8, 11u8, 197u8, 216u8, 36u8,
+                            239u8, 150u8, 88u8, 37u8, 171u8, 84u8, 200u8, 241u8, 32u8, 238u8,
+                            157u8,
                         ],
                     )
                 }
                 #[doc = " The announcements made by the proxy (key)."]
-                pub fn announcements(
+                pub fn announcements_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     (
@@ -21048,26 +21377,26 @@ pub mod api {
                         >,
                         ::core::primitive::u128,
                     ),
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Proxy",
                         "Announcements",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            195u8, 103u8, 36u8, 115u8, 220u8, 178u8, 159u8, 50u8, 133u8, 198u8,
-                            14u8, 54u8, 122u8, 123u8, 35u8, 134u8, 152u8, 84u8, 103u8, 52u8, 31u8,
-                            78u8, 136u8, 206u8, 9u8, 83u8, 155u8, 94u8, 2u8, 135u8, 159u8, 72u8,
+                            129u8, 228u8, 198u8, 210u8, 90u8, 69u8, 151u8, 198u8, 206u8, 174u8,
+                            148u8, 58u8, 134u8, 14u8, 53u8, 56u8, 234u8, 71u8, 84u8, 247u8, 246u8,
+                            207u8, 117u8, 221u8, 84u8, 72u8, 254u8, 215u8, 102u8, 49u8, 21u8,
+                            173u8,
                         ],
                     )
                 }
                 #[doc = " The announcements made by the proxy (key)."]
-                pub fn announcements_root(
+                pub fn announcements(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     (
@@ -21080,18 +21409,21 @@ pub mod api {
                         >,
                         ::core::primitive::u128,
                     ),
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Proxy",
                         "Announcements",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            195u8, 103u8, 36u8, 115u8, 220u8, 178u8, 159u8, 50u8, 133u8, 198u8,
-                            14u8, 54u8, 122u8, 123u8, 35u8, 134u8, 152u8, 84u8, 103u8, 52u8, 31u8,
-                            78u8, 136u8, 206u8, 9u8, 83u8, 155u8, 94u8, 2u8, 135u8, 159u8, 72u8,
+                            129u8, 228u8, 198u8, 210u8, 90u8, 69u8, 151u8, 198u8, 206u8, 174u8,
+                            148u8, 58u8, 134u8, 14u8, 53u8, 56u8, 234u8, 71u8, 84u8, 247u8, 246u8,
+                            207u8, 117u8, 221u8, 84u8, 72u8, 254u8, 215u8, 102u8, 49u8, 21u8,
+                            173u8,
                         ],
                     )
                 }
@@ -21314,9 +21646,10 @@ pub mod api {
                             call: ::std::boxed::Box::new(call),
                         },
                         [
-                            226u8, 172u8, 123u8, 77u8, 159u8, 140u8, 46u8, 141u8, 46u8, 45u8, 98u8,
-                            81u8, 191u8, 89u8, 131u8, 13u8, 79u8, 171u8, 163u8, 218u8, 146u8, 38u8,
-                            178u8, 88u8, 155u8, 239u8, 247u8, 241u8, 80u8, 230u8, 254u8, 17u8,
+                            112u8, 171u8, 188u8, 11u8, 158u8, 162u8, 231u8, 139u8, 220u8, 148u8,
+                            180u8, 153u8, 92u8, 205u8, 21u8, 42u8, 180u8, 212u8, 11u8, 5u8, 35u8,
+                            168u8, 252u8, 182u8, 44u8, 247u8, 205u8, 168u8, 159u8, 133u8, 193u8,
+                            156u8,
                         ],
                     )
                 }
@@ -21342,10 +21675,10 @@ pub mod api {
                             max_weight,
                         },
                         [
-                            66u8, 36u8, 54u8, 163u8, 207u8, 134u8, 214u8, 214u8, 241u8, 81u8,
-                            199u8, 26u8, 57u8, 248u8, 207u8, 249u8, 249u8, 45u8, 212u8, 2u8, 59u8,
-                            132u8, 114u8, 193u8, 62u8, 66u8, 183u8, 201u8, 5u8, 210u8, 221u8,
-                            111u8,
+                            111u8, 65u8, 139u8, 159u8, 7u8, 244u8, 225u8, 156u8, 184u8, 239u8,
+                            214u8, 67u8, 176u8, 36u8, 219u8, 230u8, 206u8, 81u8, 233u8, 98u8, 38u8,
+                            182u8, 117u8, 66u8, 114u8, 209u8, 135u8, 149u8, 20u8, 225u8, 162u8,
+                            127u8,
                         ],
                     )
                 }
@@ -21371,9 +21704,9 @@ pub mod api {
                             max_weight,
                         },
                         [
-                            240u8, 17u8, 138u8, 10u8, 165u8, 3u8, 88u8, 240u8, 11u8, 208u8, 9u8,
-                            123u8, 95u8, 53u8, 142u8, 8u8, 30u8, 5u8, 130u8, 205u8, 102u8, 95u8,
-                            71u8, 92u8, 184u8, 92u8, 218u8, 224u8, 146u8, 87u8, 93u8, 224u8,
+                            248u8, 46u8, 131u8, 35u8, 204u8, 12u8, 218u8, 150u8, 88u8, 131u8, 89u8,
+                            13u8, 95u8, 122u8, 87u8, 107u8, 136u8, 154u8, 92u8, 199u8, 108u8, 92u8,
+                            207u8, 171u8, 113u8, 8u8, 47u8, 248u8, 65u8, 26u8, 203u8, 135u8,
                         ],
                     )
                 }
@@ -21395,10 +21728,9 @@ pub mod api {
                             call_hash,
                         },
                         [
-                            14u8, 123u8, 126u8, 239u8, 174u8, 101u8, 28u8, 221u8, 117u8, 75u8,
-                            82u8, 249u8, 151u8, 59u8, 224u8, 239u8, 54u8, 196u8, 244u8, 46u8, 31u8,
-                            218u8, 224u8, 58u8, 146u8, 165u8, 135u8, 101u8, 189u8, 93u8, 149u8,
-                            130u8,
+                            212u8, 179u8, 123u8, 40u8, 209u8, 228u8, 181u8, 0u8, 109u8, 28u8, 27u8,
+                            48u8, 15u8, 47u8, 203u8, 54u8, 106u8, 114u8, 28u8, 118u8, 101u8, 201u8,
+                            95u8, 187u8, 46u8, 182u8, 4u8, 30u8, 227u8, 105u8, 14u8, 81u8,
                         ],
                     )
                 }
@@ -21498,10 +21830,8 @@ pub mod api {
             pub struct StorageApi;
             impl StorageApi {
                 #[doc = " The set of open multisig operations."]
-                pub fn multisigs(
+                pub fn multisigs_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
-                    _1: impl ::std::borrow::Borrow<[::core::primitive::u8; 32usize]>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_multisig::Multisig<
@@ -21509,27 +21839,25 @@ pub mod api {
                         ::core::primitive::u128,
                         ::subxt::utils::AccountId32,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Multisig",
                         "Multisigs",
-                        vec![
-                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
-                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
-                        ],
+                        vec![],
                         [
-                            22u8, 46u8, 92u8, 90u8, 193u8, 51u8, 12u8, 187u8, 247u8, 141u8, 101u8,
-                            133u8, 220u8, 5u8, 124u8, 197u8, 149u8, 81u8, 51u8, 194u8, 194u8, 72u8,
-                            63u8, 249u8, 227u8, 208u8, 58u8, 253u8, 33u8, 107u8, 10u8, 44u8,
+                            154u8, 109u8, 45u8, 18u8, 155u8, 151u8, 81u8, 28u8, 86u8, 127u8, 189u8,
+                            151u8, 49u8, 61u8, 12u8, 149u8, 84u8, 61u8, 110u8, 197u8, 200u8, 140u8,
+                            37u8, 100u8, 14u8, 162u8, 158u8, 161u8, 48u8, 117u8, 102u8, 61u8,
                         ],
                     )
                 }
                 #[doc = " The set of open multisig operations."]
-                pub fn multisigs_root(
+                pub fn multisigs_iter1(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_multisig::Multisig<
@@ -21544,11 +21872,43 @@ pub mod api {
                     ::subxt::storage::address::Address::new_static(
                         "Multisig",
                         "Multisigs",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
+                        [
+                            154u8, 109u8, 45u8, 18u8, 155u8, 151u8, 81u8, 28u8, 86u8, 127u8, 189u8,
+                            151u8, 49u8, 61u8, 12u8, 149u8, 84u8, 61u8, 110u8, 197u8, 200u8, 140u8,
+                            37u8, 100u8, 14u8, 162u8, 158u8, 161u8, 48u8, 117u8, 102u8, 61u8,
+                        ],
+                    )
+                }
+                #[doc = " The set of open multisig operations."]
+                pub fn multisigs(
+                    &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
+                    _1: impl ::std::borrow::Borrow<[::core::primitive::u8; 32usize]>,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    runtime_types::pallet_multisig::Multisig<
+                        ::core::primitive::u32,
+                        ::core::primitive::u128,
+                        ::subxt::utils::AccountId32,
+                    >,
+                    ::subxt::storage::address::Yes,
+                    (),
+                    (),
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "Multisig",
+                        "Multisigs",
+                        vec![
+                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
+                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
+                        ],
                         [
-                            22u8, 46u8, 92u8, 90u8, 193u8, 51u8, 12u8, 187u8, 247u8, 141u8, 101u8,
-                            133u8, 220u8, 5u8, 124u8, 197u8, 149u8, 81u8, 51u8, 194u8, 194u8, 72u8,
-                            63u8, 249u8, 227u8, 208u8, 58u8, 253u8, 33u8, 107u8, 10u8, 44u8,
+                            154u8, 109u8, 45u8, 18u8, 155u8, 151u8, 81u8, 28u8, 86u8, 127u8, 189u8,
+                            151u8, 49u8, 61u8, 12u8, 149u8, 84u8, 61u8, 110u8, 197u8, 200u8, 140u8,
+                            37u8, 100u8, 14u8, 162u8, 158u8, 161u8, 48u8, 117u8, 102u8, 61u8,
                         ],
                     )
                 }
@@ -21843,10 +22203,9 @@ pub mod api {
                             fee,
                         },
                         [
-                            76u8, 227u8, 186u8, 154u8, 152u8, 178u8, 20u8, 230u8, 100u8, 120u8,
-                            205u8, 166u8, 252u8, 53u8, 181u8, 42u8, 209u8, 80u8, 21u8, 190u8,
-                            253u8, 141u8, 169u8, 210u8, 164u8, 205u8, 55u8, 47u8, 222u8, 218u8,
-                            23u8, 184u8,
+                            238u8, 102u8, 86u8, 97u8, 169u8, 16u8, 133u8, 41u8, 24u8, 247u8, 149u8,
+                            200u8, 95u8, 213u8, 45u8, 62u8, 41u8, 247u8, 170u8, 62u8, 211u8, 194u8,
+                            5u8, 108u8, 129u8, 145u8, 108u8, 67u8, 84u8, 97u8, 237u8, 54u8,
                         ],
                     )
                 }
@@ -21897,10 +22256,9 @@ pub mod api {
                             beneficiary,
                         },
                         [
-                            63u8, 149u8, 201u8, 185u8, 220u8, 212u8, 27u8, 98u8, 198u8, 147u8,
-                            153u8, 226u8, 189u8, 151u8, 8u8, 102u8, 88u8, 206u8, 225u8, 108u8,
-                            111u8, 153u8, 196u8, 40u8, 144u8, 238u8, 136u8, 70u8, 168u8, 82u8,
-                            220u8, 53u8,
+                            231u8, 248u8, 65u8, 2u8, 199u8, 19u8, 126u8, 23u8, 206u8, 206u8, 230u8,
+                            77u8, 53u8, 152u8, 230u8, 234u8, 211u8, 153u8, 82u8, 149u8, 93u8, 91u8,
+                            19u8, 72u8, 214u8, 92u8, 65u8, 207u8, 142u8, 168u8, 133u8, 87u8,
                         ],
                     )
                 }
@@ -22124,9 +22482,8 @@ pub mod api {
                     )
                 }
                 #[doc = " Bounties that have been made."]
-                pub fn bounties(
+                pub fn bounties_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_bounties::Bounty<
@@ -22134,27 +22491,26 @@ pub mod api {
                         ::core::primitive::u128,
                         ::core::primitive::u32,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Bounties",
                         "Bounties",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            197u8, 26u8, 141u8, 98u8, 53u8, 123u8, 87u8, 219u8, 248u8, 200u8,
-                            207u8, 196u8, 211u8, 159u8, 124u8, 173u8, 143u8, 144u8, 85u8, 180u8,
-                            227u8, 24u8, 7u8, 52u8, 130u8, 98u8, 107u8, 145u8, 162u8, 55u8, 64u8,
-                            199u8,
+                            183u8, 96u8, 172u8, 86u8, 167u8, 129u8, 51u8, 179u8, 238u8, 155u8,
+                            196u8, 77u8, 158u8, 102u8, 188u8, 19u8, 79u8, 178u8, 145u8, 189u8,
+                            44u8, 117u8, 47u8, 97u8, 30u8, 149u8, 239u8, 212u8, 167u8, 127u8,
+                            108u8, 55u8,
                         ],
                     )
                 }
                 #[doc = " Bounties that have been made."]
-                pub fn bounties_root(
+                pub fn bounties(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_bounties::Bounty<
@@ -22162,41 +22518,40 @@ pub mod api {
                         ::core::primitive::u128,
                         ::core::primitive::u32,
                     >,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Bounties",
                         "Bounties",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            197u8, 26u8, 141u8, 98u8, 53u8, 123u8, 87u8, 219u8, 248u8, 200u8,
-                            207u8, 196u8, 211u8, 159u8, 124u8, 173u8, 143u8, 144u8, 85u8, 180u8,
-                            227u8, 24u8, 7u8, 52u8, 130u8, 98u8, 107u8, 145u8, 162u8, 55u8, 64u8,
-                            199u8,
+                            183u8, 96u8, 172u8, 86u8, 167u8, 129u8, 51u8, 179u8, 238u8, 155u8,
+                            196u8, 77u8, 158u8, 102u8, 188u8, 19u8, 79u8, 178u8, 145u8, 189u8,
+                            44u8, 117u8, 47u8, 97u8, 30u8, 149u8, 239u8, 212u8, 167u8, 127u8,
+                            108u8, 55u8,
                         ],
                     )
                 }
                 #[doc = " The description of each bounty."]
-                pub fn bounty_descriptions(
+                pub fn bounty_descriptions_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<
                         ::core::primitive::u8,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Bounties",
                         "BountyDescriptions",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             71u8, 40u8, 133u8, 84u8, 55u8, 207u8, 169u8, 189u8, 160u8, 51u8, 202u8,
                             144u8, 15u8, 226u8, 97u8, 114u8, 54u8, 247u8, 53u8, 26u8, 36u8, 54u8,
@@ -22205,21 +22560,24 @@ pub mod api {
                     )
                 }
                 #[doc = " The description of each bounty."]
-                pub fn bounty_descriptions_root(
+                pub fn bounty_descriptions(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<
                         ::core::primitive::u8,
                     >,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Bounties",
                         "BountyDescriptions",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             71u8, 40u8, 133u8, 84u8, 55u8, 207u8, 169u8, 189u8, 160u8, 51u8, 202u8,
                             144u8, 15u8, 226u8, 97u8, 114u8, 54u8, 247u8, 53u8, 26u8, 36u8, 54u8,
@@ -22600,9 +22958,9 @@ pub mod api {
                             fee,
                         },
                         [
-                            116u8, 56u8, 236u8, 218u8, 2u8, 75u8, 84u8, 32u8, 154u8, 92u8, 189u8,
-                            138u8, 10u8, 84u8, 121u8, 152u8, 48u8, 229u8, 169u8, 29u8, 129u8, 87u8,
-                            47u8, 16u8, 193u8, 21u8, 146u8, 143u8, 5u8, 210u8, 24u8, 31u8,
+                            30u8, 186u8, 200u8, 181u8, 73u8, 219u8, 129u8, 195u8, 100u8, 30u8,
+                            36u8, 9u8, 131u8, 110u8, 136u8, 145u8, 146u8, 44u8, 96u8, 207u8, 74u8,
+                            59u8, 61u8, 94u8, 186u8, 184u8, 89u8, 170u8, 126u8, 64u8, 234u8, 177u8,
                         ],
                     )
                 }
@@ -22620,9 +22978,10 @@ pub mod api {
                             child_bounty_id,
                         },
                         [
-                            167u8, 196u8, 221u8, 73u8, 86u8, 83u8, 173u8, 219u8, 241u8, 116u8,
-                            28u8, 109u8, 21u8, 209u8, 62u8, 131u8, 182u8, 252u8, 54u8, 114u8, 9u8,
-                            51u8, 225u8, 37u8, 4u8, 127u8, 110u8, 80u8, 172u8, 97u8, 11u8, 78u8,
+                            80u8, 117u8, 237u8, 83u8, 230u8, 230u8, 159u8, 136u8, 87u8, 17u8,
+                            239u8, 110u8, 190u8, 12u8, 52u8, 63u8, 171u8, 118u8, 82u8, 168u8,
+                            190u8, 255u8, 91u8, 85u8, 117u8, 226u8, 51u8, 28u8, 116u8, 230u8,
+                            137u8, 123u8,
                         ],
                     )
                 }
@@ -22640,10 +22999,10 @@ pub mod api {
                             child_bounty_id,
                         },
                         [
-                            217u8, 24u8, 147u8, 239u8, 116u8, 226u8, 244u8, 189u8, 62u8, 141u8,
-                            173u8, 70u8, 213u8, 147u8, 68u8, 51u8, 200u8, 66u8, 200u8, 174u8,
-                            243u8, 49u8, 54u8, 219u8, 243u8, 255u8, 250u8, 215u8, 216u8, 248u8,
-                            32u8, 90u8,
+                            120u8, 208u8, 75u8, 141u8, 220u8, 153u8, 79u8, 28u8, 255u8, 227u8,
+                            239u8, 10u8, 243u8, 116u8, 0u8, 226u8, 205u8, 208u8, 91u8, 193u8,
+                            154u8, 81u8, 169u8, 240u8, 120u8, 48u8, 102u8, 35u8, 25u8, 136u8, 92u8,
+                            141u8,
                         ],
                     )
                 }
@@ -22663,10 +23022,9 @@ pub mod api {
                             beneficiary,
                         },
                         [
-                            76u8, 85u8, 36u8, 192u8, 231u8, 112u8, 236u8, 167u8, 84u8, 172u8,
-                            239u8, 171u8, 49u8, 199u8, 102u8, 147u8, 176u8, 66u8, 31u8, 56u8,
-                            104u8, 50u8, 163u8, 252u8, 213u8, 22u8, 115u8, 44u8, 249u8, 34u8,
-                            198u8, 133u8,
+                            45u8, 172u8, 88u8, 8u8, 142u8, 34u8, 30u8, 132u8, 61u8, 31u8, 187u8,
+                            174u8, 21u8, 5u8, 248u8, 185u8, 142u8, 193u8, 29u8, 83u8, 225u8, 213u8,
+                            153u8, 247u8, 67u8, 219u8, 58u8, 206u8, 102u8, 55u8, 218u8, 154u8,
                         ],
                     )
                 }
@@ -22684,9 +23042,9 @@ pub mod api {
                             child_bounty_id,
                         },
                         [
-                            72u8, 55u8, 100u8, 52u8, 218u8, 49u8, 63u8, 107u8, 45u8, 43u8, 34u8,
-                            6u8, 48u8, 56u8, 240u8, 3u8, 96u8, 128u8, 202u8, 30u8, 233u8, 116u8,
-                            86u8, 141u8, 36u8, 184u8, 217u8, 48u8, 20u8, 54u8, 45u8, 65u8,
+                            114u8, 134u8, 242u8, 240u8, 103u8, 141u8, 181u8, 214u8, 193u8, 222u8,
+                            23u8, 19u8, 68u8, 174u8, 190u8, 60u8, 94u8, 235u8, 14u8, 115u8, 155u8,
+                            199u8, 0u8, 106u8, 37u8, 144u8, 92u8, 188u8, 2u8, 149u8, 235u8, 244u8,
                         ],
                     )
                 }
@@ -22704,9 +23062,9 @@ pub mod api {
                             child_bounty_id,
                         },
                         [
-                            127u8, 210u8, 46u8, 3u8, 33u8, 232u8, 159u8, 245u8, 249u8, 217u8, 51u8,
-                            254u8, 167u8, 10u8, 30u8, 195u8, 30u8, 0u8, 204u8, 251u8, 113u8, 1u8,
-                            104u8, 215u8, 88u8, 10u8, 200u8, 144u8, 62u8, 93u8, 223u8, 106u8,
+                            121u8, 20u8, 81u8, 13u8, 102u8, 102u8, 162u8, 24u8, 133u8, 35u8, 203u8,
+                            58u8, 28u8, 195u8, 114u8, 31u8, 254u8, 252u8, 118u8, 57u8, 30u8, 211u8,
+                            217u8, 124u8, 148u8, 244u8, 144u8, 224u8, 39u8, 155u8, 162u8, 91u8,
                         ],
                     )
                 }
@@ -22823,6 +23181,28 @@ pub mod api {
                 }
                 #[doc = " Number of child bounties per parent bounty."]
                 #[doc = " Map of parent bounty index to number of child bounties."]
+                pub fn parent_child_bounties_iter(
+                    &self,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    ::core::primitive::u32,
+                    (),
+                    ::subxt::storage::address::Yes,
+                    ::subxt::storage::address::Yes,
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "ChildBounties",
+                        "ParentChildBounties",
+                        vec![],
+                        [
+                            52u8, 179u8, 242u8, 212u8, 91u8, 185u8, 176u8, 52u8, 100u8, 200u8, 1u8,
+                            41u8, 184u8, 234u8, 234u8, 8u8, 123u8, 252u8, 131u8, 55u8, 109u8,
+                            123u8, 89u8, 75u8, 101u8, 165u8, 117u8, 175u8, 92u8, 71u8, 62u8, 67u8,
+                        ],
+                    )
+                }
+                #[doc = " Number of child bounties per parent bounty."]
+                #[doc = " Map of parent bounty index to number of child bounties."]
                 pub fn parent_child_bounties(
                     &self,
                     _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
@@ -22831,7 +23211,7 @@ pub mod api {
                     ::core::primitive::u32,
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
-                    ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ChildBounties",
@@ -22840,41 +23220,42 @@ pub mod api {
                             _0.borrow(),
                         )],
                         [
-                            12u8, 238u8, 185u8, 135u8, 158u8, 191u8, 208u8, 104u8, 37u8, 235u8,
-                            101u8, 15u8, 89u8, 20u8, 191u8, 191u8, 78u8, 206u8, 9u8, 19u8, 169u8,
-                            17u8, 13u8, 213u8, 238u8, 220u8, 189u8, 100u8, 194u8, 62u8, 85u8,
-                            150u8,
+                            52u8, 179u8, 242u8, 212u8, 91u8, 185u8, 176u8, 52u8, 100u8, 200u8, 1u8,
+                            41u8, 184u8, 234u8, 234u8, 8u8, 123u8, 252u8, 131u8, 55u8, 109u8,
+                            123u8, 89u8, 75u8, 101u8, 165u8, 117u8, 175u8, 92u8, 71u8, 62u8, 67u8,
                         ],
                     )
                 }
-                #[doc = " Number of child bounties per parent bounty."]
-                #[doc = " Map of parent bounty index to number of child bounties."]
-                pub fn parent_child_bounties_root(
+                #[doc = " Child bounties that have been added."]
+                pub fn child_bounties_iter(
                     &self,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
-                    ::core::primitive::u32,
+                    runtime_types::pallet_child_bounties::ChildBounty<
+                        ::subxt::utils::AccountId32,
+                        ::core::primitive::u128,
+                        ::core::primitive::u32,
+                    >,
+                    (),
                     (),
-                    ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ChildBounties",
-                        "ParentChildBounties",
-                        Vec::new(),
+                        "ChildBounties",
+                        vec![],
                         [
-                            12u8, 238u8, 185u8, 135u8, 158u8, 191u8, 208u8, 104u8, 37u8, 235u8,
-                            101u8, 15u8, 89u8, 20u8, 191u8, 191u8, 78u8, 206u8, 9u8, 19u8, 169u8,
-                            17u8, 13u8, 213u8, 238u8, 220u8, 189u8, 100u8, 194u8, 62u8, 85u8,
-                            150u8,
+                            165u8, 240u8, 158u8, 204u8, 183u8, 190u8, 129u8, 65u8, 226u8, 8u8,
+                            182u8, 103u8, 46u8, 162u8, 35u8, 155u8, 131u8, 45u8, 163u8, 64u8,
+                            154u8, 137u8, 126u8, 249u8, 238u8, 156u8, 233u8, 78u8, 28u8, 95u8,
+                            242u8, 147u8,
                         ],
                     )
                 }
                 #[doc = " Child bounties that have been added."]
-                pub fn child_bounties(
+                pub fn child_bounties_iter1(
                     &self,
                     _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
-                    _1: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_child_bounties::ChildBounty<
@@ -22882,28 +23263,29 @@ pub mod api {
                         ::core::primitive::u128,
                         ::core::primitive::u32,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ChildBounties",
                         "ChildBounties",
-                        vec![
-                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
-                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
-                        ],
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            236u8, 41u8, 10u8, 227u8, 176u8, 177u8, 196u8, 79u8, 112u8, 117u8,
-                            171u8, 175u8, 84u8, 180u8, 69u8, 146u8, 252u8, 228u8, 32u8, 113u8,
-                            226u8, 136u8, 175u8, 129u8, 1u8, 161u8, 145u8, 60u8, 142u8, 25u8,
-                            162u8, 42u8,
+                            165u8, 240u8, 158u8, 204u8, 183u8, 190u8, 129u8, 65u8, 226u8, 8u8,
+                            182u8, 103u8, 46u8, 162u8, 35u8, 155u8, 131u8, 45u8, 163u8, 64u8,
+                            154u8, 137u8, 126u8, 249u8, 238u8, 156u8, 233u8, 78u8, 28u8, 95u8,
+                            242u8, 147u8,
                         ],
                     )
                 }
                 #[doc = " Child bounties that have been added."]
-                pub fn child_bounties_root(
+                pub fn child_bounties(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
+                    _1: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_child_bounties::ChildBounty<
@@ -22911,41 +23293,41 @@ pub mod api {
                         ::core::primitive::u128,
                         ::core::primitive::u32,
                     >,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ChildBounties",
                         "ChildBounties",
-                        Vec::new(),
+                        vec![
+                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
+                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
+                        ],
                         [
-                            236u8, 41u8, 10u8, 227u8, 176u8, 177u8, 196u8, 79u8, 112u8, 117u8,
-                            171u8, 175u8, 84u8, 180u8, 69u8, 146u8, 252u8, 228u8, 32u8, 113u8,
-                            226u8, 136u8, 175u8, 129u8, 1u8, 161u8, 145u8, 60u8, 142u8, 25u8,
-                            162u8, 42u8,
+                            165u8, 240u8, 158u8, 204u8, 183u8, 190u8, 129u8, 65u8, 226u8, 8u8,
+                            182u8, 103u8, 46u8, 162u8, 35u8, 155u8, 131u8, 45u8, 163u8, 64u8,
+                            154u8, 137u8, 126u8, 249u8, 238u8, 156u8, 233u8, 78u8, 28u8, 95u8,
+                            242u8, 147u8,
                         ],
                     )
                 }
                 #[doc = " The description of each child-bounty."]
-                pub fn child_bounty_descriptions(
+                pub fn child_bounty_descriptions_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<
                         ::core::primitive::u8,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ChildBounties",
                         "ChildBountyDescriptions",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             192u8, 0u8, 220u8, 156u8, 109u8, 65u8, 113u8, 102u8, 119u8, 0u8, 109u8,
                             141u8, 211u8, 128u8, 237u8, 61u8, 28u8, 56u8, 206u8, 93u8, 183u8, 74u8,
@@ -22954,21 +23336,24 @@ pub mod api {
                     )
                 }
                 #[doc = " The description of each child-bounty."]
-                pub fn child_bounty_descriptions_root(
+                pub fn child_bounty_descriptions(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<
                         ::core::primitive::u8,
                     >,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ChildBounties",
                         "ChildBountyDescriptions",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             192u8, 0u8, 220u8, 156u8, 109u8, 65u8, 113u8, 102u8, 119u8, 0u8, 109u8,
                             141u8, 211u8, 128u8, 237u8, 61u8, 28u8, 56u8, 206u8, 93u8, 183u8, 74u8,
@@ -22977,22 +23362,19 @@ pub mod api {
                     )
                 }
                 #[doc = " The cumulative child-bounty curator fee for each parent bounty."]
-                pub fn children_curator_fees(
+                pub fn children_curator_fees_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u128,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ChildBounties",
                         "ChildrenCuratorFees",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             32u8, 16u8, 190u8, 193u8, 6u8, 80u8, 163u8, 16u8, 85u8, 111u8, 39u8,
                             141u8, 209u8, 70u8, 213u8, 167u8, 22u8, 12u8, 93u8, 17u8, 104u8, 94u8,
@@ -23001,19 +23383,22 @@ pub mod api {
                     )
                 }
                 #[doc = " The cumulative child-bounty curator fee for each parent bounty."]
-                pub fn children_curator_fees_root(
+                pub fn children_curator_fees(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u128,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ChildBounties",
                         "ChildrenCuratorFees",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             32u8, 16u8, 190u8, 193u8, 6u8, 80u8, 163u8, 16u8, 85u8, 111u8, 39u8,
                             141u8, 209u8, 70u8, 213u8, 167u8, 22u8, 12u8, 93u8, 17u8, 104u8, 94u8,
@@ -23194,9 +23579,10 @@ pub mod api {
                         "report_awesome",
                         types::ReportAwesome { reason, who },
                         [
-                            88u8, 73u8, 244u8, 114u8, 223u8, 87u8, 16u8, 90u8, 73u8, 203u8, 236u8,
-                            87u8, 89u8, 89u8, 200u8, 188u8, 17u8, 179u8, 22u8, 185u8, 102u8, 114u8,
-                            227u8, 208u8, 93u8, 137u8, 184u8, 153u8, 88u8, 36u8, 46u8, 148u8,
+                            184u8, 245u8, 162u8, 155u8, 89u8, 108u8, 138u8, 43u8, 1u8, 178u8,
+                            186u8, 173u8, 193u8, 197u8, 201u8, 118u8, 3u8, 154u8, 224u8, 6u8,
+                            162u8, 6u8, 74u8, 153u8, 90u8, 215u8, 52u8, 254u8, 114u8, 184u8, 39u8,
+                            123u8,
                         ],
                     )
                 }
@@ -23233,10 +23619,9 @@ pub mod api {
                             tip_value,
                         },
                         [
-                            182u8, 65u8, 198u8, 63u8, 79u8, 227u8, 237u8, 30u8, 180u8, 102u8,
-                            246u8, 47u8, 50u8, 208u8, 17u8, 102u8, 239u8, 93u8, 90u8, 139u8, 170u8,
-                            101u8, 203u8, 101u8, 246u8, 127u8, 252u8, 92u8, 169u8, 23u8, 155u8,
-                            8u8,
+                            4u8, 118u8, 48u8, 220u8, 210u8, 247u8, 11u8, 205u8, 114u8, 31u8, 237u8,
+                            252u8, 172u8, 228u8, 209u8, 0u8, 0u8, 33u8, 188u8, 86u8, 151u8, 206u8,
+                            59u8, 13u8, 230u8, 4u8, 90u8, 242u8, 145u8, 216u8, 133u8, 85u8,
                         ],
                     )
                 }
@@ -23400,9 +23785,8 @@ pub mod api {
                 #[doc = " TipsMap that are not yet completed. Keyed by the hash of `(reason, who)` from the value."]
                 #[doc = " This has the insecure enumerable hash function since the key itself is already"]
                 #[doc = " guaranteed to be a secure hash."]
-                pub fn tips(
+                pub fn tips_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::H256>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_tips::OpenTip<
@@ -23411,28 +23795,28 @@ pub mod api {
                         ::core::primitive::u32,
                         ::subxt::utils::H256,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Tips",
                         "Tips",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            173u8, 172u8, 116u8, 247u8, 202u8, 228u8, 47u8, 222u8, 67u8, 146u8,
-                            225u8, 0u8, 74u8, 189u8, 226u8, 206u8, 245u8, 209u8, 26u8, 49u8, 189u8,
-                            73u8, 20u8, 117u8, 30u8, 41u8, 129u8, 170u8, 5u8, 226u8, 92u8, 140u8,
+                            25u8, 31u8, 187u8, 85u8, 122u8, 104u8, 176u8, 120u8, 135u8, 32u8,
+                            135u8, 148u8, 193u8, 43u8, 143u8, 235u8, 82u8, 96u8, 162u8, 200u8,
+                            125u8, 117u8, 170u8, 70u8, 47u8, 248u8, 153u8, 70u8, 22u8, 194u8, 31u8,
+                            150u8,
                         ],
                     )
                 }
                 #[doc = " TipsMap that are not yet completed. Keyed by the hash of `(reason, who)` from the value."]
                 #[doc = " This has the insecure enumerable hash function since the key itself is already"]
                 #[doc = " guaranteed to be a secure hash."]
-                pub fn tips_root(
+                pub fn tips(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::H256>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_tips::OpenTip<
@@ -23441,67 +23825,68 @@ pub mod api {
                         ::core::primitive::u32,
                         ::subxt::utils::H256,
                     >,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Tips",
                         "Tips",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            173u8, 172u8, 116u8, 247u8, 202u8, 228u8, 47u8, 222u8, 67u8, 146u8,
-                            225u8, 0u8, 74u8, 189u8, 226u8, 206u8, 245u8, 209u8, 26u8, 49u8, 189u8,
-                            73u8, 20u8, 117u8, 30u8, 41u8, 129u8, 170u8, 5u8, 226u8, 92u8, 140u8,
+                            25u8, 31u8, 187u8, 85u8, 122u8, 104u8, 176u8, 120u8, 135u8, 32u8,
+                            135u8, 148u8, 193u8, 43u8, 143u8, 235u8, 82u8, 96u8, 162u8, 200u8,
+                            125u8, 117u8, 170u8, 70u8, 47u8, 248u8, 153u8, 70u8, 22u8, 194u8, 31u8,
+                            150u8,
                         ],
                     )
                 }
                 #[doc = " Simple preimage lookup from the reason's hash to the original data. Again, has an"]
                 #[doc = " insecure enumerable hash since the key is guaranteed to be the result of a secure hash."]
-                pub fn reasons(
+                pub fn reasons_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::H256>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::std::vec::Vec<::core::primitive::u8>,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Tips",
                         "Reasons",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            212u8, 224u8, 153u8, 133u8, 234u8, 213u8, 134u8, 255u8, 59u8, 61u8,
-                            200u8, 47u8, 186u8, 177u8, 35u8, 108u8, 85u8, 144u8, 185u8, 69u8,
-                            159u8, 38u8, 83u8, 166u8, 200u8, 20u8, 220u8, 234u8, 59u8, 61u8, 223u8,
-                            167u8,
+                            99u8, 184u8, 64u8, 230u8, 54u8, 162u8, 73u8, 188u8, 49u8, 219u8, 170u8,
+                            2u8, 72u8, 75u8, 239u8, 136u8, 114u8, 93u8, 94u8, 195u8, 229u8, 55u8,
+                            188u8, 121u8, 214u8, 250u8, 115u8, 61u8, 221u8, 173u8, 14u8, 68u8,
                         ],
                     )
                 }
                 #[doc = " Simple preimage lookup from the reason's hash to the original data. Again, has an"]
                 #[doc = " insecure enumerable hash since the key is guaranteed to be the result of a secure hash."]
-                pub fn reasons_root(
+                pub fn reasons(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::H256>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::std::vec::Vec<::core::primitive::u8>,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Tips",
                         "Reasons",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            212u8, 224u8, 153u8, 133u8, 234u8, 213u8, 134u8, 255u8, 59u8, 61u8,
-                            200u8, 47u8, 186u8, 177u8, 35u8, 108u8, 85u8, 144u8, 185u8, 69u8,
-                            159u8, 38u8, 83u8, 166u8, 200u8, 20u8, 220u8, 234u8, 59u8, 61u8, 223u8,
-                            167u8,
+                            99u8, 184u8, 64u8, 230u8, 54u8, 162u8, 73u8, 188u8, 49u8, 219u8, 170u8,
+                            2u8, 72u8, 75u8, 239u8, 136u8, 114u8, 93u8, 94u8, 195u8, 229u8, 55u8,
+                            188u8, 121u8, 214u8, 250u8, 115u8, 61u8, 221u8, 173u8, 14u8, 68u8,
                         ],
                     )
                 }
@@ -23720,9 +24105,9 @@ pub mod api {
                             witness,
                         },
                         [
-                            34u8, 115u8, 43u8, 180u8, 202u8, 212u8, 42u8, 17u8, 187u8, 233u8, 54u8,
-                            206u8, 238u8, 239u8, 35u8, 240u8, 136u8, 197u8, 117u8, 113u8, 213u8,
-                            46u8, 94u8, 47u8, 84u8, 186u8, 177u8, 61u8, 3u8, 202u8, 2u8, 186u8,
+                            237u8, 199u8, 102u8, 43u8, 103u8, 215u8, 145u8, 93u8, 71u8, 191u8,
+                            61u8, 144u8, 21u8, 58u8, 30u8, 51u8, 190u8, 219u8, 45u8, 66u8, 216u8,
+                            19u8, 62u8, 123u8, 197u8, 53u8, 249u8, 205u8, 117u8, 35u8, 32u8, 13u8,
                         ],
                     )
                 }
@@ -23738,10 +24123,10 @@ pub mod api {
                         "set_minimum_untrusted_score",
                         types::SetMinimumUntrustedScore { maybe_next_score },
                         [
-                            36u8, 32u8, 197u8, 96u8, 189u8, 98u8, 96u8, 138u8, 84u8, 99u8, 235u8,
-                            44u8, 103u8, 25u8, 118u8, 194u8, 166u8, 158u8, 212u8, 36u8, 243u8,
-                            86u8, 202u8, 231u8, 189u8, 226u8, 21u8, 112u8, 20u8, 163u8, 229u8,
-                            240u8,
+                            244u8, 246u8, 85u8, 56u8, 156u8, 145u8, 169u8, 106u8, 16u8, 206u8,
+                            102u8, 216u8, 150u8, 180u8, 87u8, 153u8, 75u8, 177u8, 185u8, 55u8,
+                            37u8, 252u8, 214u8, 127u8, 103u8, 169u8, 198u8, 55u8, 10u8, 179u8,
+                            121u8, 219u8,
                         ],
                     )
                 }
@@ -23758,9 +24143,10 @@ pub mod api {
                         "set_emergency_election_result",
                         types::SetEmergencyElectionResult { supports },
                         [
-                            158u8, 35u8, 6u8, 145u8, 37u8, 239u8, 101u8, 90u8, 121u8, 123u8, 240u8,
-                            131u8, 154u8, 13u8, 111u8, 120u8, 146u8, 151u8, 203u8, 125u8, 115u8,
-                            255u8, 58u8, 154u8, 177u8, 204u8, 140u8, 87u8, 9u8, 63u8, 146u8, 209u8,
+                            6u8, 170u8, 228u8, 255u8, 61u8, 131u8, 137u8, 36u8, 135u8, 91u8, 183u8,
+                            94u8, 172u8, 205u8, 113u8, 69u8, 191u8, 255u8, 223u8, 152u8, 255u8,
+                            160u8, 205u8, 51u8, 140u8, 183u8, 101u8, 38u8, 185u8, 100u8, 92u8,
+                            87u8,
                         ],
                     )
                 }
@@ -23778,9 +24164,9 @@ pub mod api {
                             raw_solution: ::std::boxed::Box::new(raw_solution),
                         },
                         [
-                            55u8, 153u8, 215u8, 21u8, 19u8, 192u8, 199u8, 19u8, 145u8, 27u8, 54u8,
-                            128u8, 23u8, 3u8, 255u8, 87u8, 27u8, 75u8, 248u8, 145u8, 238u8, 75u8,
-                            204u8, 173u8, 71u8, 252u8, 29u8, 71u8, 45u8, 143u8, 179u8, 154u8,
+                            55u8, 254u8, 53u8, 183u8, 136u8, 93u8, 56u8, 39u8, 98u8, 132u8, 8u8,
+                            38u8, 92u8, 38u8, 199u8, 43u8, 20u8, 86u8, 114u8, 240u8, 31u8, 72u8,
+                            141u8, 39u8, 73u8, 116u8, 250u8, 249u8, 119u8, 36u8, 244u8, 137u8,
                         ],
                     )
                 }
@@ -23798,10 +24184,9 @@ pub mod api {
                             maybe_max_targets,
                         },
                         [
-                            168u8, 109u8, 243u8, 125u8, 188u8, 177u8, 251u8, 179u8, 158u8, 246u8,
-                            179u8, 247u8, 87u8, 217u8, 190u8, 107u8, 207u8, 249u8, 204u8, 27u8,
-                            166u8, 49u8, 135u8, 71u8, 88u8, 142u8, 58u8, 206u8, 137u8, 142u8, 75u8,
-                            127u8,
+                            10u8, 56u8, 159u8, 48u8, 56u8, 246u8, 49u8, 9u8, 132u8, 156u8, 86u8,
+                            162u8, 52u8, 58u8, 175u8, 128u8, 12u8, 185u8, 203u8, 18u8, 99u8, 219u8,
+                            75u8, 13u8, 52u8, 40u8, 125u8, 212u8, 84u8, 147u8, 222u8, 17u8,
                         ],
                     )
                 }
@@ -24007,10 +24392,10 @@ pub mod api {
                         "QueuedSolution",
                         vec![],
                         [
-                            64u8, 237u8, 221u8, 29u8, 144u8, 141u8, 147u8, 4u8, 46u8, 239u8, 34u8,
-                            242u8, 164u8, 69u8, 108u8, 145u8, 95u8, 167u8, 34u8, 211u8, 103u8,
-                            165u8, 183u8, 193u8, 245u8, 226u8, 140u8, 50u8, 176u8, 127u8, 108u8,
-                            171u8,
+                            70u8, 22u8, 249u8, 41u8, 72u8, 8u8, 99u8, 121u8, 102u8, 128u8, 244u8,
+                            104u8, 208u8, 244u8, 113u8, 122u8, 118u8, 17u8, 65u8, 78u8, 165u8,
+                            129u8, 117u8, 36u8, 244u8, 243u8, 153u8, 87u8, 46u8, 116u8, 103u8,
+                            43u8,
                         ],
                     )
                 }
@@ -24040,10 +24425,9 @@ pub mod api {
                         "Snapshot",
                         vec![],
                         [
-                            180u8, 77u8, 217u8, 249u8, 212u8, 99u8, 36u8, 26u8, 237u8, 4u8, 94u8,
-                            80u8, 160u8, 6u8, 194u8, 98u8, 174u8, 153u8, 127u8, 124u8, 109u8,
-                            188u8, 143u8, 151u8, 51u8, 200u8, 133u8, 66u8, 68u8, 226u8, 124u8,
-                            158u8,
+                            103u8, 204u8, 76u8, 156u8, 154u8, 95u8, 115u8, 109u8, 135u8, 17u8, 9u8,
+                            137u8, 3u8, 184u8, 111u8, 198u8, 216u8, 3u8, 78u8, 115u8, 101u8, 235u8,
+                            52u8, 235u8, 245u8, 58u8, 191u8, 144u8, 61u8, 204u8, 159u8, 55u8,
                         ],
                     )
                 }
@@ -24087,10 +24471,9 @@ pub mod api {
                         "SnapshotMetadata",
                         vec![],
                         [
-                            14u8, 189u8, 135u8, 84u8, 238u8, 133u8, 76u8, 176u8, 181u8, 185u8,
-                            111u8, 102u8, 181u8, 14u8, 172u8, 86u8, 188u8, 139u8, 73u8, 192u8,
-                            203u8, 117u8, 39u8, 119u8, 108u8, 225u8, 163u8, 36u8, 91u8, 30u8, 0u8,
-                            196u8,
+                            48u8, 121u8, 12u8, 130u8, 174u8, 100u8, 114u8, 183u8, 83u8, 63u8, 44u8,
+                            147u8, 242u8, 223u8, 22u8, 107u8, 175u8, 182u8, 178u8, 254u8, 12u8,
+                            189u8, 37u8, 117u8, 95u8, 21u8, 19u8, 167u8, 56u8, 205u8, 49u8, 100u8,
                         ],
                     )
                 }
@@ -24147,9 +24530,10 @@ pub mod api {
                         "SignedSubmissionIndices",
                         vec![],
                         [
-                            203u8, 96u8, 121u8, 1u8, 24u8, 150u8, 185u8, 93u8, 129u8, 63u8, 52u8,
-                            163u8, 67u8, 45u8, 100u8, 11u8, 254u8, 224u8, 18u8, 1u8, 133u8, 246u8,
-                            125u8, 211u8, 93u8, 99u8, 194u8, 105u8, 176u8, 162u8, 238u8, 181u8,
+                            245u8, 24u8, 83u8, 165u8, 229u8, 167u8, 35u8, 107u8, 255u8, 77u8, 34u8,
+                            0u8, 188u8, 159u8, 175u8, 68u8, 232u8, 114u8, 238u8, 231u8, 252u8,
+                            169u8, 127u8, 232u8, 206u8, 183u8, 191u8, 227u8, 176u8, 46u8, 51u8,
+                            147u8,
                         ],
                     )
                 }
@@ -24160,9 +24544,8 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " Twox note: the key of the map is an auto-incrementing index which users cannot inspect or"]
                 #[doc = " affect; we shouldn't need a cryptographically secure hasher."]
-                pub fn signed_submissions_map(
+                pub fn signed_submissions_map_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_election_provider_multi_phase::signed::SignedSubmission<
@@ -24170,21 +24553,18 @@ pub mod api {
                         ::core::primitive::u128,
                         runtime_types::polkadot_runtime::NposCompactSolution16,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ElectionProviderMultiPhase",
                         "SignedSubmissionsMap",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            79u8, 183u8, 109u8, 221u8, 2u8, 64u8, 197u8, 162u8, 221u8, 170u8,
-                            140u8, 136u8, 205u8, 111u8, 8u8, 179u8, 166u8, 104u8, 74u8, 219u8,
-                            202u8, 123u8, 31u8, 129u8, 207u8, 58u8, 241u8, 91u8, 147u8, 112u8,
-                            162u8, 105u8,
+                            118u8, 12u8, 234u8, 73u8, 238u8, 134u8, 20u8, 105u8, 248u8, 39u8, 23u8,
+                            96u8, 157u8, 187u8, 14u8, 143u8, 135u8, 121u8, 77u8, 90u8, 154u8,
+                            221u8, 139u8, 28u8, 34u8, 8u8, 19u8, 246u8, 65u8, 155u8, 84u8, 53u8,
                         ],
                     )
                 }
@@ -24195,8 +24575,9 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " Twox note: the key of the map is an auto-incrementing index which users cannot inspect or"]
                 #[doc = " affect; we shouldn't need a cryptographically secure hasher."]
-                pub fn signed_submissions_map_root(
+                pub fn signed_submissions_map(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_election_provider_multi_phase::signed::SignedSubmission<
@@ -24204,19 +24585,20 @@ pub mod api {
                         ::core::primitive::u128,
                         runtime_types::polkadot_runtime::NposCompactSolution16,
                     >,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ElectionProviderMultiPhase",
                         "SignedSubmissionsMap",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            79u8, 183u8, 109u8, 221u8, 2u8, 64u8, 197u8, 162u8, 221u8, 170u8,
-                            140u8, 136u8, 205u8, 111u8, 8u8, 179u8, 166u8, 104u8, 74u8, 219u8,
-                            202u8, 123u8, 31u8, 129u8, 207u8, 58u8, 241u8, 91u8, 147u8, 112u8,
-                            162u8, 105u8,
+                            118u8, 12u8, 234u8, 73u8, 238u8, 134u8, 20u8, 105u8, 248u8, 39u8, 23u8,
+                            96u8, 157u8, 187u8, 14u8, 143u8, 135u8, 121u8, 77u8, 90u8, 154u8,
+                            221u8, 139u8, 28u8, 34u8, 8u8, 19u8, 246u8, 65u8, 155u8, 84u8, 53u8,
                         ],
                     )
                 }
@@ -24238,9 +24620,9 @@ pub mod api {
                         "MinimumUntrustedScore",
                         vec![],
                         [
-                            105u8, 218u8, 96u8, 38u8, 82u8, 115u8, 30u8, 178u8, 21u8, 89u8, 59u8,
-                            7u8, 203u8, 240u8, 224u8, 209u8, 78u8, 28u8, 198u8, 236u8, 252u8,
-                            122u8, 72u8, 59u8, 156u8, 242u8, 26u8, 160u8, 145u8, 40u8, 6u8, 101u8,
+                            22u8, 253u8, 11u8, 17u8, 171u8, 145u8, 175u8, 97u8, 137u8, 148u8, 36u8,
+                            232u8, 55u8, 174u8, 75u8, 173u8, 133u8, 5u8, 227u8, 161u8, 28u8, 62u8,
+                            188u8, 249u8, 123u8, 102u8, 186u8, 180u8, 226u8, 216u8, 71u8, 249u8,
                         ],
                     )
                 }
@@ -24377,9 +24759,10 @@ pub mod api {
                         "ElectionProviderMultiPhase",
                         "SignedMaxWeight",
                         [
-                            222u8, 183u8, 203u8, 169u8, 31u8, 134u8, 28u8, 12u8, 47u8, 140u8, 71u8,
-                            74u8, 61u8, 55u8, 71u8, 236u8, 215u8, 83u8, 28u8, 70u8, 45u8, 128u8,
-                            184u8, 57u8, 101u8, 83u8, 42u8, 165u8, 34u8, 155u8, 64u8, 145u8,
+                            149u8, 252u8, 129u8, 80u8, 169u8, 36u8, 79u8, 127u8, 240u8, 156u8,
+                            56u8, 202u8, 219u8, 86u8, 5u8, 65u8, 245u8, 148u8, 138u8, 243u8, 210u8,
+                            128u8, 234u8, 216u8, 240u8, 219u8, 123u8, 235u8, 21u8, 158u8, 237u8,
+                            112u8,
                         ],
                     )
                 }
@@ -24523,9 +24906,10 @@ pub mod api {
                         "ElectionProviderMultiPhase",
                         "MinerMaxWeight",
                         [
-                            222u8, 183u8, 203u8, 169u8, 31u8, 134u8, 28u8, 12u8, 47u8, 140u8, 71u8,
-                            74u8, 61u8, 55u8, 71u8, 236u8, 215u8, 83u8, 28u8, 70u8, 45u8, 128u8,
-                            184u8, 57u8, 101u8, 83u8, 42u8, 165u8, 34u8, 155u8, 64u8, 145u8,
+                            149u8, 252u8, 129u8, 80u8, 169u8, 36u8, 79u8, 127u8, 240u8, 156u8,
+                            56u8, 202u8, 219u8, 86u8, 5u8, 65u8, 245u8, 148u8, 138u8, 243u8, 210u8,
+                            128u8, 234u8, 216u8, 240u8, 219u8, 123u8, 235u8, 21u8, 158u8, 237u8,
+                            112u8,
                         ],
                     )
                 }
@@ -24620,10 +25004,9 @@ pub mod api {
                         "rebag",
                         types::Rebag { dislocated },
                         [
-                            247u8, 169u8, 213u8, 238u8, 186u8, 147u8, 81u8, 96u8, 24u8, 105u8,
-                            162u8, 211u8, 90u8, 176u8, 26u8, 186u8, 163u8, 125u8, 103u8, 57u8,
-                            236u8, 17u8, 69u8, 186u8, 56u8, 101u8, 146u8, 56u8, 39u8, 129u8, 227u8,
-                            24u8,
+                            9u8, 111u8, 68u8, 237u8, 32u8, 21u8, 214u8, 84u8, 11u8, 39u8, 94u8,
+                            43u8, 198u8, 46u8, 91u8, 147u8, 194u8, 3u8, 35u8, 171u8, 95u8, 248u8,
+                            78u8, 0u8, 7u8, 99u8, 2u8, 124u8, 139u8, 42u8, 109u8, 226u8,
                         ],
                     )
                 }
@@ -24637,10 +25020,9 @@ pub mod api {
                         "put_in_front_of",
                         types::PutInFrontOf { lighter },
                         [
-                            137u8, 248u8, 163u8, 62u8, 1u8, 5u8, 112u8, 62u8, 13u8, 66u8, 44u8,
-                            72u8, 129u8, 185u8, 166u8, 35u8, 171u8, 105u8, 77u8, 248u8, 254u8,
-                            56u8, 13u8, 196u8, 228u8, 141u8, 187u8, 237u8, 82u8, 195u8, 158u8,
-                            18u8,
+                            61u8, 76u8, 164u8, 177u8, 140u8, 44u8, 127u8, 198u8, 195u8, 241u8,
+                            36u8, 80u8, 32u8, 85u8, 183u8, 130u8, 137u8, 128u8, 16u8, 203u8, 184u8,
+                            19u8, 151u8, 55u8, 10u8, 194u8, 162u8, 8u8, 211u8, 110u8, 126u8, 75u8,
                         ],
                     )
                 }
@@ -24697,51 +25079,49 @@ pub mod api {
                 #[doc = " A single node, within some bag."]
                 #[doc = ""]
                 #[doc = " Nodes store links forward and back within their respective bags."]
-                pub fn list_nodes(
+                pub fn list_nodes_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_bags_list::list::Node,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "VoterList",
                         "ListNodes",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            252u8, 218u8, 186u8, 230u8, 86u8, 177u8, 112u8, 218u8, 9u8, 62u8,
-                            217u8, 5u8, 39u8, 70u8, 15u8, 104u8, 157u8, 19u8, 175u8, 136u8, 71u8,
-                            237u8, 254u8, 254u8, 119u8, 107u8, 84u8, 10u8, 104u8, 142u8, 135u8,
-                            35u8,
+                            240u8, 139u8, 78u8, 185u8, 159u8, 185u8, 33u8, 229u8, 171u8, 222u8,
+                            54u8, 81u8, 104u8, 170u8, 49u8, 232u8, 29u8, 117u8, 193u8, 68u8, 225u8,
+                            180u8, 46u8, 199u8, 100u8, 26u8, 99u8, 216u8, 74u8, 248u8, 73u8, 144u8,
                         ],
                     )
                 }
                 #[doc = " A single node, within some bag."]
                 #[doc = ""]
                 #[doc = " Nodes store links forward and back within their respective bags."]
-                pub fn list_nodes_root(
+                pub fn list_nodes(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_bags_list::list::Node,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "VoterList",
                         "ListNodes",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            252u8, 218u8, 186u8, 230u8, 86u8, 177u8, 112u8, 218u8, 9u8, 62u8,
-                            217u8, 5u8, 39u8, 70u8, 15u8, 104u8, 157u8, 19u8, 175u8, 136u8, 71u8,
-                            237u8, 254u8, 254u8, 119u8, 107u8, 84u8, 10u8, 104u8, 142u8, 135u8,
-                            35u8,
+                            240u8, 139u8, 78u8, 185u8, 159u8, 185u8, 33u8, 229u8, 171u8, 222u8,
+                            54u8, 81u8, 104u8, 170u8, 49u8, 232u8, 29u8, 117u8, 193u8, 68u8, 225u8,
+                            180u8, 46u8, 199u8, 100u8, 26u8, 99u8, 216u8, 74u8, 248u8, 73u8, 144u8,
                         ],
                     )
                 }
@@ -24770,49 +25150,49 @@ pub mod api {
                 #[doc = " A bag stored in storage."]
                 #[doc = ""]
                 #[doc = " Stores a `Bag` struct, which stores head and tail pointers to itself."]
-                pub fn list_bags(
+                pub fn list_bags_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u64>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_bags_list::list::Bag,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "VoterList",
                         "ListBags",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            157u8, 147u8, 94u8, 26u8, 37u8, 89u8, 114u8, 210u8, 158u8, 36u8, 155u8,
-                            0u8, 137u8, 78u8, 65u8, 165u8, 226u8, 192u8, 65u8, 13u8, 244u8, 159u8,
-                            245u8, 15u8, 210u8, 101u8, 61u8, 111u8, 217u8, 225u8, 197u8, 158u8,
+                            98u8, 52u8, 177u8, 147u8, 244u8, 169u8, 45u8, 213u8, 76u8, 163u8, 47u8,
+                            96u8, 197u8, 245u8, 17u8, 208u8, 86u8, 15u8, 233u8, 156u8, 165u8, 44u8,
+                            164u8, 202u8, 117u8, 167u8, 209u8, 193u8, 218u8, 235u8, 140u8, 158u8,
                         ],
                     )
                 }
                 #[doc = " A bag stored in storage."]
                 #[doc = ""]
                 #[doc = " Stores a `Bag` struct, which stores head and tail pointers to itself."]
-                pub fn list_bags_root(
+                pub fn list_bags(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u64>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_bags_list::list::Bag,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "VoterList",
                         "ListBags",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            157u8, 147u8, 94u8, 26u8, 37u8, 89u8, 114u8, 210u8, 158u8, 36u8, 155u8,
-                            0u8, 137u8, 78u8, 65u8, 165u8, 226u8, 192u8, 65u8, 13u8, 244u8, 159u8,
-                            245u8, 15u8, 210u8, 101u8, 61u8, 111u8, 217u8, 225u8, 197u8, 158u8,
+                            98u8, 52u8, 177u8, 147u8, 244u8, 169u8, 45u8, 213u8, 76u8, 163u8, 47u8,
+                            96u8, 197u8, 245u8, 17u8, 208u8, 86u8, 15u8, 233u8, 156u8, 165u8, 44u8,
+                            164u8, 202u8, 117u8, 167u8, 209u8, 193u8, 218u8, 235u8, 140u8, 158u8,
                         ],
                     )
                 }
@@ -25370,9 +25750,9 @@ pub mod api {
                             unbonding_points,
                         },
                         [
-                            178u8, 232u8, 24u8, 199u8, 57u8, 76u8, 252u8, 68u8, 39u8, 118u8, 16u8,
-                            74u8, 55u8, 191u8, 142u8, 188u8, 80u8, 67u8, 168u8, 40u8, 9u8, 99u8,
-                            214u8, 43u8, 44u8, 57u8, 177u8, 66u8, 238u8, 104u8, 52u8, 220u8,
+                            7u8, 80u8, 46u8, 120u8, 249u8, 148u8, 126u8, 232u8, 3u8, 130u8, 61u8,
+                            94u8, 174u8, 151u8, 235u8, 206u8, 120u8, 48u8, 201u8, 128u8, 78u8,
+                            13u8, 148u8, 39u8, 70u8, 65u8, 79u8, 232u8, 204u8, 125u8, 182u8, 33u8,
                         ],
                     )
                 }
@@ -25390,9 +25770,10 @@ pub mod api {
                             num_slashing_spans,
                         },
                         [
-                            234u8, 49u8, 43u8, 199u8, 55u8, 2u8, 252u8, 39u8, 147u8, 136u8, 34u8,
-                            239u8, 116u8, 155u8, 129u8, 72u8, 83u8, 161u8, 90u8, 207u8, 1u8, 193u8,
-                            254u8, 47u8, 40u8, 185u8, 67u8, 55u8, 238u8, 122u8, 140u8, 230u8,
+                            145u8, 39u8, 154u8, 109u8, 24u8, 233u8, 144u8, 66u8, 28u8, 252u8,
+                            180u8, 5u8, 54u8, 123u8, 28u8, 182u8, 26u8, 156u8, 69u8, 105u8, 226u8,
+                            208u8, 154u8, 34u8, 22u8, 201u8, 139u8, 104u8, 198u8, 195u8, 247u8,
+                            49u8,
                         ],
                     )
                 }
@@ -25410,9 +25791,10 @@ pub mod api {
                             num_slashing_spans,
                         },
                         [
-                            153u8, 110u8, 206u8, 15u8, 152u8, 12u8, 113u8, 210u8, 94u8, 95u8, 14u8,
-                            244u8, 38u8, 29u8, 140u8, 121u8, 40u8, 6u8, 125u8, 228u8, 46u8, 110u8,
-                            240u8, 149u8, 188u8, 176u8, 232u8, 187u8, 231u8, 152u8, 192u8, 180u8,
+                            69u8, 9u8, 243u8, 218u8, 41u8, 80u8, 5u8, 112u8, 23u8, 90u8, 208u8,
+                            120u8, 91u8, 181u8, 37u8, 159u8, 183u8, 41u8, 187u8, 212u8, 39u8,
+                            175u8, 90u8, 245u8, 242u8, 18u8, 220u8, 40u8, 160u8, 46u8, 214u8,
+                            239u8,
                         ],
                     )
                 }
@@ -25434,9 +25816,9 @@ pub mod api {
                             bouncer,
                         },
                         [
-                            158u8, 136u8, 58u8, 88u8, 26u8, 188u8, 179u8, 22u8, 217u8, 3u8, 184u8,
-                            93u8, 76u8, 124u8, 24u8, 169u8, 133u8, 18u8, 229u8, 230u8, 210u8,
-                            194u8, 10u8, 88u8, 33u8, 72u8, 113u8, 65u8, 200u8, 98u8, 55u8, 220u8,
+                            75u8, 103u8, 67u8, 204u8, 44u8, 28u8, 143u8, 33u8, 194u8, 100u8, 71u8,
+                            143u8, 211u8, 193u8, 229u8, 119u8, 237u8, 212u8, 65u8, 62u8, 19u8,
+                            52u8, 14u8, 4u8, 205u8, 88u8, 156u8, 238u8, 143u8, 158u8, 144u8, 108u8,
                         ],
                     )
                 }
@@ -25460,10 +25842,10 @@ pub mod api {
                             pool_id,
                         },
                         [
-                            3u8, 118u8, 189u8, 234u8, 136u8, 26u8, 170u8, 124u8, 187u8, 6u8, 53u8,
-                            190u8, 66u8, 225u8, 221u8, 136u8, 162u8, 189u8, 212u8, 12u8, 174u8,
-                            240u8, 86u8, 50u8, 110u8, 135u8, 106u8, 70u8, 243u8, 147u8, 125u8,
-                            99u8,
+                            41u8, 12u8, 98u8, 131u8, 99u8, 176u8, 30u8, 4u8, 227u8, 7u8, 42u8,
+                            158u8, 27u8, 233u8, 227u8, 230u8, 34u8, 16u8, 117u8, 203u8, 110u8,
+                            160u8, 68u8, 153u8, 78u8, 116u8, 191u8, 96u8, 156u8, 207u8, 223u8,
+                            80u8,
                         ],
                     )
                 }
@@ -25555,9 +25937,10 @@ pub mod api {
                             global_max_commission,
                         },
                         [
-                            60u8, 29u8, 13u8, 45u8, 37u8, 171u8, 129u8, 133u8, 127u8, 42u8, 104u8,
-                            45u8, 29u8, 58u8, 209u8, 48u8, 119u8, 255u8, 86u8, 13u8, 243u8, 124u8,
-                            57u8, 250u8, 156u8, 189u8, 59u8, 88u8, 64u8, 109u8, 219u8, 68u8,
+                            151u8, 222u8, 184u8, 213u8, 161u8, 89u8, 162u8, 112u8, 198u8, 87u8,
+                            186u8, 55u8, 99u8, 197u8, 164u8, 156u8, 185u8, 199u8, 202u8, 19u8,
+                            44u8, 34u8, 35u8, 39u8, 129u8, 22u8, 41u8, 32u8, 27u8, 37u8, 176u8,
+                            107u8,
                         ],
                     )
                 }
@@ -25585,9 +25968,10 @@ pub mod api {
                             new_bouncer,
                         },
                         [
-                            58u8, 51u8, 136u8, 162u8, 218u8, 195u8, 121u8, 6u8, 243u8, 69u8, 19u8,
-                            130u8, 152u8, 180u8, 226u8, 28u8, 0u8, 218u8, 237u8, 56u8, 52u8, 139u8,
-                            198u8, 155u8, 112u8, 165u8, 142u8, 44u8, 111u8, 197u8, 123u8, 246u8,
+                            48u8, 253u8, 39u8, 205u8, 196u8, 231u8, 254u8, 76u8, 238u8, 70u8, 2u8,
+                            192u8, 188u8, 240u8, 206u8, 91u8, 213u8, 98u8, 226u8, 51u8, 167u8,
+                            205u8, 120u8, 128u8, 40u8, 175u8, 238u8, 57u8, 147u8, 96u8, 116u8,
+                            133u8,
                         ],
                     )
                 }
@@ -25620,10 +26004,9 @@ pub mod api {
                         "bond_extra_other",
                         types::BondExtraOther { member, extra },
                         [
-                            210u8, 156u8, 196u8, 34u8, 245u8, 145u8, 2u8, 255u8, 36u8, 220u8,
-                            101u8, 235u8, 200u8, 43u8, 237u8, 70u8, 15u8, 231u8, 177u8, 37u8,
-                            215u8, 157u8, 165u8, 16u8, 183u8, 67u8, 182u8, 52u8, 26u8, 244u8,
-                            210u8, 135u8,
+                            32u8, 200u8, 198u8, 128u8, 30u8, 21u8, 39u8, 98u8, 49u8, 4u8, 96u8,
+                            146u8, 169u8, 179u8, 109u8, 253u8, 168u8, 212u8, 206u8, 161u8, 116u8,
+                            191u8, 110u8, 189u8, 63u8, 252u8, 39u8, 107u8, 98u8, 25u8, 137u8, 0u8,
                         ],
                     )
                 }
@@ -25677,10 +26060,9 @@ pub mod api {
                             new_commission,
                         },
                         [
-                            144u8, 94u8, 73u8, 69u8, 224u8, 158u8, 244u8, 77u8, 169u8, 219u8,
-                            101u8, 41u8, 37u8, 211u8, 198u8, 32u8, 92u8, 108u8, 7u8, 27u8, 153u8,
-                            37u8, 82u8, 174u8, 196u8, 176u8, 196u8, 181u8, 45u8, 81u8, 134u8,
-                            162u8,
+                            77u8, 139u8, 221u8, 210u8, 51u8, 57u8, 243u8, 96u8, 25u8, 0u8, 42u8,
+                            81u8, 80u8, 7u8, 145u8, 28u8, 17u8, 44u8, 123u8, 28u8, 130u8, 194u8,
+                            153u8, 139u8, 222u8, 166u8, 169u8, 184u8, 46u8, 178u8, 236u8, 246u8,
                         ],
                     )
                 }
@@ -25698,9 +26080,10 @@ pub mod api {
                             max_commission,
                         },
                         [
-                            180u8, 80u8, 204u8, 129u8, 141u8, 86u8, 45u8, 76u8, 224u8, 123u8,
-                            212u8, 38u8, 224u8, 79u8, 41u8, 143u8, 237u8, 174u8, 126u8, 1u8, 215u8,
-                            105u8, 50u8, 46u8, 151u8, 11u8, 118u8, 198u8, 183u8, 95u8, 47u8, 71u8,
+                            198u8, 127u8, 255u8, 230u8, 96u8, 142u8, 9u8, 220u8, 204u8, 82u8,
+                            192u8, 76u8, 140u8, 52u8, 94u8, 80u8, 153u8, 30u8, 162u8, 21u8, 71u8,
+                            31u8, 218u8, 160u8, 254u8, 180u8, 160u8, 219u8, 163u8, 30u8, 193u8,
+                            6u8,
                         ],
                     )
                 }
@@ -25720,10 +26103,9 @@ pub mod api {
                             change_rate,
                         },
                         [
-                            138u8, 30u8, 155u8, 127u8, 181u8, 99u8, 89u8, 138u8, 130u8, 53u8,
-                            224u8, 96u8, 190u8, 14u8, 76u8, 244u8, 142u8, 50u8, 39u8, 245u8, 144u8,
-                            87u8, 64u8, 206u8, 246u8, 225u8, 111u8, 197u8, 245u8, 182u8, 121u8,
-                            56u8,
+                            20u8, 200u8, 249u8, 176u8, 168u8, 210u8, 180u8, 77u8, 93u8, 28u8, 0u8,
+                            79u8, 29u8, 172u8, 176u8, 38u8, 178u8, 13u8, 99u8, 240u8, 210u8, 108u8,
+                            245u8, 95u8, 197u8, 235u8, 143u8, 239u8, 190u8, 245u8, 63u8, 108u8,
                         ],
                     )
                 }
@@ -26216,49 +26598,51 @@ pub mod api {
                 #[doc = " Active members."]
                 #[doc = ""]
                 #[doc = " TWOX-NOTE: SAFE since `AccountId` is a secure hash."]
-                pub fn pool_members(
+                pub fn pool_members_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_nomination_pools::PoolMember,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "NominationPools",
                         "PoolMembers",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            116u8, 41u8, 89u8, 74u8, 35u8, 243u8, 213u8, 178u8, 41u8, 249u8, 62u8,
-                            119u8, 72u8, 34u8, 197u8, 168u8, 147u8, 178u8, 159u8, 10u8, 181u8,
-                            255u8, 40u8, 211u8, 206u8, 32u8, 130u8, 25u8, 201u8, 54u8, 212u8, 25u8,
+                            71u8, 14u8, 198u8, 220u8, 13u8, 117u8, 189u8, 187u8, 123u8, 105u8,
+                            247u8, 41u8, 154u8, 176u8, 134u8, 226u8, 195u8, 136u8, 193u8, 6u8,
+                            134u8, 131u8, 105u8, 80u8, 140u8, 160u8, 20u8, 80u8, 179u8, 187u8,
+                            151u8, 47u8,
                         ],
                     )
                 }
                 #[doc = " Active members."]
                 #[doc = ""]
                 #[doc = " TWOX-NOTE: SAFE since `AccountId` is a secure hash."]
-                pub fn pool_members_root(
+                pub fn pool_members(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_nomination_pools::PoolMember,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "NominationPools",
                         "PoolMembers",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            116u8, 41u8, 89u8, 74u8, 35u8, 243u8, 213u8, 178u8, 41u8, 249u8, 62u8,
-                            119u8, 72u8, 34u8, 197u8, 168u8, 147u8, 178u8, 159u8, 10u8, 181u8,
-                            255u8, 40u8, 211u8, 206u8, 32u8, 130u8, 25u8, 201u8, 54u8, 212u8, 25u8,
+                            71u8, 14u8, 198u8, 220u8, 13u8, 117u8, 189u8, 187u8, 123u8, 105u8,
+                            247u8, 41u8, 154u8, 176u8, 134u8, 226u8, 195u8, 136u8, 193u8, 6u8,
+                            134u8, 131u8, 105u8, 80u8, 140u8, 160u8, 20u8, 80u8, 179u8, 187u8,
+                            151u8, 47u8,
                         ],
                     )
                 }
@@ -26285,49 +26669,47 @@ pub mod api {
                     )
                 }
                 #[doc = " Storage for bonded pools."]
-                pub fn bonded_pools(
+                pub fn bonded_pools_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_nomination_pools::BondedPoolInner,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "NominationPools",
                         "BondedPools",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            171u8, 143u8, 96u8, 95u8, 196u8, 228u8, 116u8, 22u8, 63u8, 105u8,
-                            193u8, 77u8, 171u8, 99u8, 144u8, 70u8, 166u8, 55u8, 14u8, 191u8, 156u8,
-                            17u8, 237u8, 193u8, 228u8, 243u8, 164u8, 187u8, 127u8, 245u8, 117u8,
-                            238u8,
+                            1u8, 3u8, 32u8, 159u8, 147u8, 134u8, 43u8, 51u8, 61u8, 157u8, 15u8,
+                            216u8, 170u8, 1u8, 170u8, 75u8, 243u8, 25u8, 103u8, 237u8, 89u8, 90u8,
+                            20u8, 233u8, 67u8, 3u8, 116u8, 6u8, 184u8, 112u8, 118u8, 232u8,
                         ],
                     )
                 }
                 #[doc = " Storage for bonded pools."]
-                pub fn bonded_pools_root(
+                pub fn bonded_pools(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_nomination_pools::BondedPoolInner,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "NominationPools",
                         "BondedPools",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            171u8, 143u8, 96u8, 95u8, 196u8, 228u8, 116u8, 22u8, 63u8, 105u8,
-                            193u8, 77u8, 171u8, 99u8, 144u8, 70u8, 166u8, 55u8, 14u8, 191u8, 156u8,
-                            17u8, 237u8, 193u8, 228u8, 243u8, 164u8, 187u8, 127u8, 245u8, 117u8,
-                            238u8,
+                            1u8, 3u8, 32u8, 159u8, 147u8, 134u8, 43u8, 51u8, 61u8, 157u8, 15u8,
+                            216u8, 170u8, 1u8, 170u8, 75u8, 243u8, 25u8, 103u8, 237u8, 89u8, 90u8,
+                            20u8, 233u8, 67u8, 3u8, 116u8, 6u8, 184u8, 112u8, 118u8, 232u8,
                         ],
                     )
                 }
@@ -26354,50 +26736,50 @@ pub mod api {
                 }
                 #[doc = " Reward pools. This is where there rewards for each pool accumulate. When a members payout is"]
                 #[doc = " claimed, the balance comes out fo the reward pool. Keyed by the bonded pools account."]
-                pub fn reward_pools(
+                pub fn reward_pools_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_nomination_pools::RewardPool,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "NominationPools",
                         "RewardPools",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            150u8, 53u8, 204u8, 26u8, 187u8, 118u8, 80u8, 133u8, 94u8, 127u8,
-                            155u8, 78u8, 71u8, 72u8, 0u8, 220u8, 174u8, 174u8, 109u8, 238u8, 13u8,
-                            120u8, 193u8, 102u8, 219u8, 22u8, 89u8, 117u8, 169u8, 212u8, 64u8,
-                            204u8,
+                            9u8, 12u8, 53u8, 236u8, 133u8, 154u8, 71u8, 150u8, 220u8, 31u8, 130u8,
+                            126u8, 208u8, 240u8, 214u8, 66u8, 16u8, 43u8, 202u8, 222u8, 94u8,
+                            136u8, 76u8, 60u8, 174u8, 197u8, 130u8, 138u8, 253u8, 239u8, 89u8,
+                            46u8,
                         ],
                     )
                 }
                 #[doc = " Reward pools. This is where there rewards for each pool accumulate. When a members payout is"]
                 #[doc = " claimed, the balance comes out fo the reward pool. Keyed by the bonded pools account."]
-                pub fn reward_pools_root(
+                pub fn reward_pools(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_nomination_pools::RewardPool,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "NominationPools",
                         "RewardPools",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            150u8, 53u8, 204u8, 26u8, 187u8, 118u8, 80u8, 133u8, 94u8, 127u8,
-                            155u8, 78u8, 71u8, 72u8, 0u8, 220u8, 174u8, 174u8, 109u8, 238u8, 13u8,
-                            120u8, 193u8, 102u8, 219u8, 22u8, 89u8, 117u8, 169u8, 212u8, 64u8,
-                            204u8,
+                            9u8, 12u8, 53u8, 236u8, 133u8, 154u8, 71u8, 150u8, 220u8, 31u8, 130u8,
+                            126u8, 208u8, 240u8, 214u8, 66u8, 16u8, 43u8, 202u8, 222u8, 94u8,
+                            136u8, 76u8, 60u8, 174u8, 197u8, 130u8, 138u8, 253u8, 239u8, 89u8,
+                            46u8,
                         ],
                     )
                 }
@@ -26425,48 +26807,48 @@ pub mod api {
                 }
                 #[doc = " Groups of unbonding pools. Each group of unbonding pools belongs to a"]
                 #[doc = " bonded pool, hence the name sub-pools. Keyed by the bonded pools account."]
-                pub fn sub_pools_storage(
+                pub fn sub_pools_storage_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_nomination_pools::SubPools,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "NominationPools",
                         "SubPoolsStorage",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            248u8, 37u8, 232u8, 231u8, 14u8, 140u8, 12u8, 27u8, 61u8, 222u8, 185u8,
-                            128u8, 158u8, 30u8, 57u8, 121u8, 35u8, 11u8, 42u8, 242u8, 56u8, 1u8,
-                            61u8, 0u8, 67u8, 140u8, 55u8, 62u8, 165u8, 134u8, 136u8, 4u8,
+                            43u8, 35u8, 94u8, 197u8, 201u8, 86u8, 21u8, 118u8, 230u8, 10u8, 66u8,
+                            180u8, 104u8, 146u8, 250u8, 207u8, 159u8, 153u8, 203u8, 58u8, 20u8,
+                            247u8, 102u8, 155u8, 47u8, 58u8, 136u8, 150u8, 167u8, 83u8, 81u8, 44u8,
                         ],
                     )
                 }
                 #[doc = " Groups of unbonding pools. Each group of unbonding pools belongs to a"]
                 #[doc = " bonded pool, hence the name sub-pools. Keyed by the bonded pools account."]
-                pub fn sub_pools_storage_root(
+                pub fn sub_pools_storage(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_nomination_pools::SubPools,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "NominationPools",
                         "SubPoolsStorage",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            248u8, 37u8, 232u8, 231u8, 14u8, 140u8, 12u8, 27u8, 61u8, 222u8, 185u8,
-                            128u8, 158u8, 30u8, 57u8, 121u8, 35u8, 11u8, 42u8, 242u8, 56u8, 1u8,
-                            61u8, 0u8, 67u8, 140u8, 55u8, 62u8, 165u8, 134u8, 136u8, 4u8,
+                            43u8, 35u8, 94u8, 197u8, 201u8, 86u8, 21u8, 118u8, 230u8, 10u8, 66u8,
+                            180u8, 104u8, 146u8, 250u8, 207u8, 159u8, 153u8, 203u8, 58u8, 20u8,
+                            247u8, 102u8, 155u8, 47u8, 58u8, 136u8, 150u8, 167u8, 83u8, 81u8, 44u8,
                         ],
                     )
                 }
@@ -26493,24 +26875,21 @@ pub mod api {
                     )
                 }
                 #[doc = " Metadata for the pool."]
-                pub fn metadata(
+                pub fn metadata_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<
                         ::core::primitive::u8,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "NominationPools",
                         "Metadata",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             10u8, 171u8, 251u8, 5u8, 72u8, 74u8, 86u8, 144u8, 59u8, 67u8, 92u8,
                             111u8, 217u8, 111u8, 175u8, 107u8, 119u8, 206u8, 199u8, 78u8, 182u8,
@@ -26519,21 +26898,24 @@ pub mod api {
                     )
                 }
                 #[doc = " Metadata for the pool."]
-                pub fn metadata_root(
+                pub fn metadata(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<
                         ::core::primitive::u8,
                     >,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "NominationPools",
                         "Metadata",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             10u8, 171u8, 251u8, 5u8, 72u8, 74u8, 86u8, 144u8, 59u8, 67u8, 92u8,
                             111u8, 217u8, 111u8, 175u8, 107u8, 119u8, 206u8, 199u8, 78u8, 182u8,
@@ -26589,22 +26971,19 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " This is only used for slashing. In all other instances, the pool id is used, and the"]
                 #[doc = " accounts are deterministically derived from it."]
-                pub fn reverse_pool_id_lookup(
+                pub fn reverse_pool_id_lookup_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u32,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "NominationPools",
                         "ReversePoolIdLookup",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             76u8, 76u8, 150u8, 33u8, 64u8, 81u8, 90u8, 75u8, 212u8, 221u8, 59u8,
                             83u8, 178u8, 45u8, 86u8, 206u8, 196u8, 221u8, 117u8, 94u8, 229u8,
@@ -26616,19 +26995,22 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " This is only used for slashing. In all other instances, the pool id is used, and the"]
                 #[doc = " accounts are deterministically derived from it."]
-                pub fn reverse_pool_id_lookup_root(
+                pub fn reverse_pool_id_lookup(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u32,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "NominationPools",
                         "ReversePoolIdLookup",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             76u8, 76u8, 150u8, 33u8, 64u8, 81u8, 90u8, 75u8, 212u8, 221u8, 59u8,
                             83u8, 178u8, 45u8, 86u8, 206u8, 196u8, 221u8, 117u8, 94u8, 229u8,
@@ -26659,22 +27041,19 @@ pub mod api {
                     )
                 }
                 #[doc = " Map from a pool member account to their opted claim permission."]
-                pub fn claim_permissions(
+                pub fn claim_permissions_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_nomination_pools::ClaimPermission,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "NominationPools",
                         "ClaimPermissions",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             98u8, 241u8, 185u8, 102u8, 61u8, 53u8, 215u8, 105u8, 2u8, 148u8, 197u8,
                             17u8, 107u8, 253u8, 74u8, 159u8, 14u8, 30u8, 213u8, 38u8, 35u8, 163u8,
@@ -26683,19 +27062,22 @@ pub mod api {
                     )
                 }
                 #[doc = " Map from a pool member account to their opted claim permission."]
-                pub fn claim_permissions_root(
+                pub fn claim_permissions(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_nomination_pools::ClaimPermission,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "NominationPools",
                         "ClaimPermissions",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             98u8, 241u8, 185u8, 102u8, 61u8, 53u8, 215u8, 105u8, 2u8, 148u8, 197u8,
                             17u8, 107u8, 253u8, 74u8, 159u8, 14u8, 30u8, 213u8, 38u8, 35u8, 163u8,
@@ -26992,22 +27374,19 @@ pub mod api {
                 #[doc = " The map of all accounts wishing to be unstaked."]
                 #[doc = ""]
                 #[doc = " Keeps track of `AccountId` wishing to unstake and it's corresponding deposit."]
-                pub fn queue(
+                pub fn queue_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u128,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "FastUnstake",
                         "Queue",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             72u8, 219u8, 212u8, 99u8, 189u8, 234u8, 57u8, 32u8, 80u8, 130u8, 178u8,
                             101u8, 71u8, 186u8, 106u8, 129u8, 135u8, 165u8, 225u8, 112u8, 82u8,
@@ -27019,19 +27398,22 @@ pub mod api {
                 #[doc = " The map of all accounts wishing to be unstaked."]
                 #[doc = ""]
                 #[doc = " Keeps track of `AccountId` wishing to unstake and it's corresponding deposit."]
-                pub fn queue_root(
+                pub fn queue(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u128,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "FastUnstake",
                         "Queue",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             72u8, 219u8, 212u8, 99u8, 189u8, 234u8, 57u8, 32u8, 80u8, 130u8, 178u8,
                             101u8, 71u8, 186u8, 106u8, 129u8, 135u8, 165u8, 225u8, 112u8, 82u8,
@@ -28599,10 +28981,10 @@ pub mod api {
                         "set_async_backing_params",
                         types::SetAsyncBackingParams { new },
                         [
-                            123u8, 190u8, 245u8, 105u8, 240u8, 176u8, 32u8, 173u8, 108u8, 170u8,
-                            163u8, 87u8, 1u8, 27u8, 100u8, 109u8, 5u8, 67u8, 74u8, 2u8, 97u8,
-                            177u8, 207u8, 143u8, 49u8, 155u8, 23u8, 53u8, 80u8, 205u8, 127u8,
-                            193u8,
+                            28u8, 148u8, 243u8, 41u8, 68u8, 91u8, 113u8, 162u8, 126u8, 115u8,
+                            122u8, 220u8, 126u8, 19u8, 119u8, 236u8, 20u8, 112u8, 181u8, 76u8,
+                            191u8, 225u8, 44u8, 207u8, 85u8, 246u8, 10u8, 167u8, 132u8, 211u8,
+                            14u8, 83u8,
                         ],
                     )
                 }
@@ -28616,9 +28998,9 @@ pub mod api {
                         "set_executor_params",
                         types::SetExecutorParams { new },
                         [
-                            1u8, 66u8, 51u8, 137u8, 57u8, 108u8, 112u8, 243u8, 255u8, 189u8, 8u8,
-                            218u8, 183u8, 205u8, 242u8, 95u8, 193u8, 190u8, 108u8, 34u8, 133u8,
-                            13u8, 63u8, 73u8, 174u8, 243u8, 244u8, 175u8, 90u8, 148u8, 69u8, 117u8,
+                            219u8, 27u8, 25u8, 162u8, 61u8, 189u8, 61u8, 32u8, 101u8, 139u8, 89u8,
+                            51u8, 191u8, 223u8, 94u8, 145u8, 109u8, 247u8, 22u8, 64u8, 178u8, 97u8,
+                            239u8, 0u8, 125u8, 20u8, 62u8, 210u8, 110u8, 79u8, 225u8, 43u8,
                         ],
                     )
                 }
@@ -28645,9 +29027,10 @@ pub mod api {
                         "ActiveConfig",
                         vec![],
                         [
-                            89u8, 95u8, 12u8, 140u8, 199u8, 69u8, 117u8, 230u8, 44u8, 83u8, 251u8,
-                            153u8, 0u8, 172u8, 66u8, 55u8, 233u8, 90u8, 135u8, 33u8, 35u8, 23u8,
-                            36u8, 91u8, 3u8, 212u8, 213u8, 181u8, 37u8, 171u8, 100u8, 170u8,
+                            205u8, 102u8, 42u8, 9u8, 144u8, 0u8, 31u8, 85u8, 111u8, 44u8, 145u8,
+                            123u8, 200u8, 195u8, 163u8, 59u8, 202u8, 66u8, 156u8, 196u8, 32u8,
+                            204u8, 209u8, 201u8, 133u8, 103u8, 66u8, 179u8, 28u8, 41u8, 196u8,
+                            154u8,
                         ],
                     )
                 }
@@ -28663,10 +29046,9 @@ pub mod api {
                         "PendingConfigs",
                         vec![],
                         [
-                            132u8, 122u8, 170u8, 26u8, 208u8, 3u8, 156u8, 114u8, 149u8, 231u8,
-                            177u8, 142u8, 254u8, 142u8, 172u8, 209u8, 43u8, 233u8, 218u8, 142u8,
-                            249u8, 25u8, 39u8, 89u8, 97u8, 165u8, 210u8, 23u8, 170u8, 114u8, 12u8,
-                            222u8,
+                            18u8, 179u8, 253u8, 26u8, 153u8, 33u8, 99u8, 167u8, 90u8, 57u8, 97u8,
+                            114u8, 99u8, 71u8, 69u8, 76u8, 176u8, 90u8, 240u8, 137u8, 231u8, 24u8,
+                            75u8, 138u8, 149u8, 176u8, 197u8, 96u8, 90u8, 154u8, 109u8, 218u8,
                         ],
                     )
                 }
@@ -28892,106 +29274,104 @@ pub mod api {
             use super::runtime_types;
             pub struct StorageApi;
             impl StorageApi {
-                #[doc = " The latest bitfield for each validator, referred to by their index in the validator set."]                pub fn availability_bitfields (& self , _0 : impl :: std :: borrow :: Borrow < runtime_types :: polkadot_primitives :: v5 :: ValidatorIndex > ,) -> :: subxt :: storage :: address :: Address :: < :: subxt :: storage :: address :: StaticStorageMapKey , runtime_types :: polkadot_runtime_parachains :: inclusion :: AvailabilityBitfieldRecord < :: core :: primitive :: u32 > , :: subxt :: storage :: address :: Yes , () , :: subxt :: storage :: address :: Yes >{
+                #[doc = " The latest bitfield for each validator, referred to by their index in the validator set."]                pub fn availability_bitfields_iter (& self ,) -> :: subxt :: storage :: address :: Address :: < :: subxt :: storage :: address :: StaticStorageMapKey , runtime_types :: polkadot_runtime_parachains :: inclusion :: AvailabilityBitfieldRecord < :: core :: primitive :: u32 > , () , () , :: subxt :: storage :: address :: Yes >{
                     ::subxt::storage::address::Address::new_static(
                         "ParaInclusion",
                         "AvailabilityBitfields",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            145u8, 39u8, 130u8, 153u8, 84u8, 60u8, 125u8, 109u8, 207u8, 184u8, 3u8,
-                            33u8, 121u8, 244u8, 135u8, 70u8, 25u8, 129u8, 208u8, 253u8, 214u8,
-                            139u8, 174u8, 212u8, 146u8, 108u8, 171u8, 234u8, 190u8, 250u8, 31u8,
-                            44u8,
+                            163u8, 169u8, 217u8, 160u8, 147u8, 165u8, 186u8, 21u8, 171u8, 177u8,
+                            74u8, 69u8, 55u8, 205u8, 46u8, 13u8, 253u8, 83u8, 55u8, 190u8, 22u8,
+                            61u8, 32u8, 209u8, 54u8, 120u8, 187u8, 39u8, 114u8, 70u8, 212u8, 170u8,
                         ],
                     )
                 }
-                #[doc = " The latest bitfield for each validator, referred to by their index in the validator set."]                pub fn availability_bitfields_root (& self ,) -> :: subxt :: storage :: address :: Address :: < :: subxt :: storage :: address :: StaticStorageMapKey , runtime_types :: polkadot_runtime_parachains :: inclusion :: AvailabilityBitfieldRecord < :: core :: primitive :: u32 > , () , () , :: subxt :: storage :: address :: Yes >{
+                #[doc = " The latest bitfield for each validator, referred to by their index in the validator set."]                pub fn availability_bitfields (& self , _0 : impl :: std :: borrow :: Borrow < runtime_types :: polkadot_primitives :: v5 :: ValidatorIndex > ,) -> :: subxt :: storage :: address :: Address :: < :: subxt :: storage :: address :: StaticStorageMapKey , runtime_types :: polkadot_runtime_parachains :: inclusion :: AvailabilityBitfieldRecord < :: core :: primitive :: u32 > , :: subxt :: storage :: address :: Yes , () , () >{
                     ::subxt::storage::address::Address::new_static(
                         "ParaInclusion",
                         "AvailabilityBitfields",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            145u8, 39u8, 130u8, 153u8, 84u8, 60u8, 125u8, 109u8, 207u8, 184u8, 3u8,
-                            33u8, 121u8, 244u8, 135u8, 70u8, 25u8, 129u8, 208u8, 253u8, 214u8,
-                            139u8, 174u8, 212u8, 146u8, 108u8, 171u8, 234u8, 190u8, 250u8, 31u8,
-                            44u8,
+                            163u8, 169u8, 217u8, 160u8, 147u8, 165u8, 186u8, 21u8, 171u8, 177u8,
+                            74u8, 69u8, 55u8, 205u8, 46u8, 13u8, 253u8, 83u8, 55u8, 190u8, 22u8,
+                            61u8, 32u8, 209u8, 54u8, 120u8, 187u8, 39u8, 114u8, 70u8, 212u8, 170u8,
                         ],
                     )
                 }
-                #[doc = " Candidates pending availability by `ParaId`."]                pub fn pending_availability (& self , _0 : impl :: std :: borrow :: Borrow < runtime_types :: polkadot_parachain :: primitives :: Id > ,) -> :: subxt :: storage :: address :: Address :: < :: subxt :: storage :: address :: StaticStorageMapKey , runtime_types :: polkadot_runtime_parachains :: inclusion :: CandidatePendingAvailability < :: subxt :: utils :: H256 , :: core :: primitive :: u32 > , :: subxt :: storage :: address :: Yes , () , :: subxt :: storage :: address :: Yes >{
+                #[doc = " Candidates pending availability by `ParaId`."]                pub fn pending_availability_iter (& self ,) -> :: subxt :: storage :: address :: Address :: < :: subxt :: storage :: address :: StaticStorageMapKey , runtime_types :: polkadot_runtime_parachains :: inclusion :: CandidatePendingAvailability < :: subxt :: utils :: H256 , :: core :: primitive :: u32 > , () , () , :: subxt :: storage :: address :: Yes >{
                     ::subxt::storage::address::Address::new_static(
                         "ParaInclusion",
                         "PendingAvailability",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            73u8, 173u8, 235u8, 69u8, 85u8, 97u8, 46u8, 238u8, 233u8, 27u8, 232u8,
-                            222u8, 164u8, 233u8, 76u8, 100u8, 18u8, 13u8, 97u8, 84u8, 42u8, 28u8,
-                            76u8, 0u8, 109u8, 134u8, 97u8, 149u8, 74u8, 224u8, 212u8, 31u8,
+                            164u8, 175u8, 34u8, 182u8, 190u8, 147u8, 42u8, 185u8, 162u8, 130u8,
+                            33u8, 159u8, 234u8, 242u8, 90u8, 119u8, 2u8, 195u8, 48u8, 150u8, 135u8,
+                            87u8, 8u8, 142u8, 243u8, 142u8, 57u8, 121u8, 225u8, 218u8, 22u8, 132u8,
                         ],
                     )
                 }
-                #[doc = " Candidates pending availability by `ParaId`."]                pub fn pending_availability_root (& self ,) -> :: subxt :: storage :: address :: Address :: < :: subxt :: storage :: address :: StaticStorageMapKey , runtime_types :: polkadot_runtime_parachains :: inclusion :: CandidatePendingAvailability < :: subxt :: utils :: H256 , :: core :: primitive :: u32 > , () , () , :: subxt :: storage :: address :: Yes >{
+                #[doc = " Candidates pending availability by `ParaId`."]                pub fn pending_availability (& self , _0 : impl :: std :: borrow :: Borrow < runtime_types :: polkadot_parachain :: primitives :: Id > ,) -> :: subxt :: storage :: address :: Address :: < :: subxt :: storage :: address :: StaticStorageMapKey , runtime_types :: polkadot_runtime_parachains :: inclusion :: CandidatePendingAvailability < :: subxt :: utils :: H256 , :: core :: primitive :: u32 > , :: subxt :: storage :: address :: Yes , () , () >{
                     ::subxt::storage::address::Address::new_static(
                         "ParaInclusion",
                         "PendingAvailability",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            73u8, 173u8, 235u8, 69u8, 85u8, 97u8, 46u8, 238u8, 233u8, 27u8, 232u8,
-                            222u8, 164u8, 233u8, 76u8, 100u8, 18u8, 13u8, 97u8, 84u8, 42u8, 28u8,
-                            76u8, 0u8, 109u8, 134u8, 97u8, 149u8, 74u8, 224u8, 212u8, 31u8,
+                            164u8, 175u8, 34u8, 182u8, 190u8, 147u8, 42u8, 185u8, 162u8, 130u8,
+                            33u8, 159u8, 234u8, 242u8, 90u8, 119u8, 2u8, 195u8, 48u8, 150u8, 135u8,
+                            87u8, 8u8, 142u8, 243u8, 142u8, 57u8, 121u8, 225u8, 218u8, 22u8, 132u8,
                         ],
                     )
                 }
                 #[doc = " The commitments of candidates pending availability, by `ParaId`."]
-                pub fn pending_availability_commitments(
+                pub fn pending_availability_commitments_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_primitives::v5::CandidateCommitments<
                         ::core::primitive::u32,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ParaInclusion",
                         "PendingAvailabilityCommitments",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            57u8, 162u8, 255u8, 73u8, 60u8, 230u8, 180u8, 58u8, 74u8, 165u8, 39u8,
-                            155u8, 242u8, 73u8, 30u8, 238u8, 83u8, 97u8, 205u8, 223u8, 81u8, 11u8,
-                            190u8, 59u8, 75u8, 218u8, 225u8, 114u8, 66u8, 160u8, 66u8, 55u8,
+                            196u8, 210u8, 210u8, 16u8, 246u8, 105u8, 121u8, 178u8, 5u8, 48u8, 40u8,
+                            183u8, 63u8, 147u8, 48u8, 74u8, 20u8, 83u8, 76u8, 84u8, 41u8, 30u8,
+                            182u8, 246u8, 164u8, 108u8, 113u8, 16u8, 169u8, 64u8, 97u8, 202u8,
                         ],
                     )
                 }
                 #[doc = " The commitments of candidates pending availability, by `ParaId`."]
-                pub fn pending_availability_commitments_root(
+                pub fn pending_availability_commitments(
                     &self,
+                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_primitives::v5::CandidateCommitments<
                         ::core::primitive::u32,
                     >,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ParaInclusion",
                         "PendingAvailabilityCommitments",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            57u8, 162u8, 255u8, 73u8, 60u8, 230u8, 180u8, 58u8, 74u8, 165u8, 39u8,
-                            155u8, 242u8, 73u8, 30u8, 238u8, 83u8, 97u8, 205u8, 223u8, 81u8, 11u8,
-                            190u8, 59u8, 75u8, 218u8, 225u8, 114u8, 66u8, 160u8, 66u8, 55u8,
+                            196u8, 210u8, 210u8, 16u8, 246u8, 105u8, 121u8, 178u8, 5u8, 48u8, 40u8,
+                            183u8, 63u8, 147u8, 48u8, 74u8, 20u8, 83u8, 76u8, 84u8, 41u8, 30u8,
+                            182u8, 246u8, 164u8, 108u8, 113u8, 16u8, 169u8, 64u8, 97u8, 202u8,
                         ],
                     )
                 }
@@ -29051,9 +29431,9 @@ pub mod api {
                         "enter",
                         types::Enter { data },
                         [
-                            190u8, 180u8, 43u8, 119u8, 55u8, 134u8, 122u8, 249u8, 40u8, 254u8,
-                            17u8, 195u8, 84u8, 130u8, 91u8, 161u8, 89u8, 42u8, 48u8, 12u8, 117u8,
-                            52u8, 249u8, 166u8, 78u8, 241u8, 136u8, 129u8, 176u8, 44u8, 1u8, 170u8,
+                            145u8, 120u8, 158u8, 39u8, 139u8, 223u8, 236u8, 209u8, 253u8, 108u8,
+                            188u8, 21u8, 23u8, 61u8, 25u8, 171u8, 30u8, 203u8, 161u8, 117u8, 90u8,
+                            55u8, 50u8, 107u8, 26u8, 52u8, 26u8, 158u8, 56u8, 218u8, 186u8, 142u8,
                         ],
                     )
                 }
@@ -29106,9 +29486,10 @@ pub mod api {
                         "OnChainVotes",
                         vec![],
                         [
-                            124u8, 87u8, 65u8, 59u8, 160u8, 188u8, 81u8, 253u8, 179u8, 236u8,
-                            121u8, 233u8, 26u8, 151u8, 195u8, 180u8, 3u8, 31u8, 62u8, 173u8, 250u8,
-                            94u8, 70u8, 126u8, 82u8, 231u8, 160u8, 44u8, 129u8, 232u8, 160u8, 28u8,
+                            200u8, 210u8, 42u8, 153u8, 85u8, 71u8, 171u8, 108u8, 148u8, 212u8,
+                            108u8, 61u8, 178u8, 77u8, 129u8, 90u8, 120u8, 218u8, 228u8, 152u8,
+                            120u8, 226u8, 29u8, 82u8, 239u8, 146u8, 41u8, 164u8, 193u8, 207u8,
+                            246u8, 115u8,
                         ],
                     )
                 }
@@ -29168,10 +29549,9 @@ pub mod api {
                         "ParathreadQueue",
                         vec![],
                         [
-                            41u8, 73u8, 199u8, 28u8, 66u8, 245u8, 137u8, 101u8, 103u8, 65u8, 85u8,
-                            241u8, 41u8, 174u8, 206u8, 113u8, 201u8, 219u8, 212u8, 205u8, 112u8,
-                            65u8, 158u8, 33u8, 181u8, 174u8, 220u8, 191u8, 201u8, 233u8, 205u8,
-                            41u8,
+                            66u8, 237u8, 244u8, 120u8, 58u8, 185u8, 225u8, 198u8, 83u8, 7u8, 254u8,
+                            95u8, 104u8, 128u8, 105u8, 225u8, 117u8, 35u8, 231u8, 64u8, 46u8,
+                            169u8, 9u8, 35u8, 89u8, 199u8, 239u8, 51u8, 165u8, 115u8, 226u8, 60u8,
                         ],
                     )
                 }
@@ -29201,9 +29581,10 @@ pub mod api {
                         "AvailabilityCores",
                         vec![],
                         [
-                            68u8, 46u8, 55u8, 213u8, 234u8, 41u8, 228u8, 136u8, 169u8, 38u8, 123u8,
-                            201u8, 149u8, 92u8, 10u8, 184u8, 196u8, 165u8, 61u8, 23u8, 215u8, 30u8,
-                            5u8, 43u8, 172u8, 80u8, 168u8, 139u8, 140u8, 207u8, 64u8, 4u8,
+                            22u8, 238u8, 81u8, 4u8, 74u8, 143u8, 125u8, 245u8, 54u8, 117u8, 128u8,
+                            142u8, 214u8, 162u8, 106u8, 86u8, 151u8, 45u8, 33u8, 153u8, 164u8,
+                            182u8, 223u8, 19u8, 44u8, 211u8, 206u8, 95u8, 249u8, 36u8, 188u8,
+                            129u8,
                         ],
                     )
                 }
@@ -29280,10 +29661,9 @@ pub mod api {
                         "Scheduled",
                         vec![],
                         [
-                            207u8, 104u8, 113u8, 254u8, 53u8, 114u8, 141u8, 104u8, 29u8, 237u8,
-                            240u8, 203u8, 101u8, 219u8, 2u8, 201u8, 16u8, 137u8, 99u8, 55u8, 222u8,
-                            61u8, 234u8, 126u8, 254u8, 93u8, 104u8, 107u8, 246u8, 214u8, 124u8,
-                            212u8,
+                            180u8, 21u8, 56u8, 68u8, 56u8, 82u8, 50u8, 7u8, 71u8, 167u8, 6u8, 2u8,
+                            235u8, 39u8, 78u8, 23u8, 173u8, 129u8, 112u8, 131u8, 35u8, 147u8, 80u8,
+                            173u8, 47u8, 108u8, 170u8, 247u8, 213u8, 71u8, 247u8, 151u8,
                         ],
                     )
                 }
@@ -29502,9 +29882,10 @@ pub mod api {
                             relay_parent_number,
                         },
                         [
-                            91u8, 48u8, 207u8, 223u8, 125u8, 162u8, 82u8, 25u8, 255u8, 183u8,
-                            129u8, 240u8, 58u8, 21u8, 154u8, 96u8, 128u8, 147u8, 125u8, 22u8, 32u8,
-                            65u8, 224u8, 82u8, 208u8, 3u8, 32u8, 35u8, 127u8, 89u8, 84u8, 192u8,
+                            131u8, 179u8, 138u8, 151u8, 167u8, 191u8, 2u8, 68u8, 85u8, 111u8,
+                            166u8, 65u8, 67u8, 52u8, 201u8, 41u8, 132u8, 128u8, 35u8, 177u8, 91u8,
+                            185u8, 114u8, 2u8, 123u8, 133u8, 164u8, 121u8, 170u8, 243u8, 223u8,
+                            61u8,
                         ],
                     )
                 }
@@ -29588,9 +29969,10 @@ pub mod api {
                         "include_pvf_check_statement",
                         types::IncludePvfCheckStatement { stmt, signature },
                         [
-                            238u8, 72u8, 169u8, 99u8, 181u8, 16u8, 14u8, 101u8, 70u8, 230u8, 38u8,
-                            129u8, 114u8, 180u8, 69u8, 178u8, 153u8, 57u8, 55u8, 208u8, 176u8,
-                            17u8, 22u8, 30u8, 227u8, 52u8, 132u8, 80u8, 158u8, 249u8, 8u8, 125u8,
+                            104u8, 113u8, 121u8, 186u8, 41u8, 70u8, 254u8, 44u8, 207u8, 94u8, 61u8,
+                            148u8, 106u8, 240u8, 165u8, 223u8, 231u8, 190u8, 157u8, 97u8, 55u8,
+                            90u8, 229u8, 112u8, 129u8, 224u8, 29u8, 180u8, 242u8, 203u8, 195u8,
+                            19u8,
                         ],
                     )
                 }
@@ -29752,31 +30134,26 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " Invariant:"]
                 #[doc = " - There are no PVF pre-checking votes that exists in list but not in the set and vice versa."]
-                pub fn pvf_active_vote_map(
+                pub fn pvf_active_vote_map_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<
-                        runtime_types::polkadot_parachain::primitives::ValidationCodeHash,
-                    >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_runtime_parachains::paras::PvfCheckActiveVoteState<
                         ::core::primitive::u32,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "PvfActiveVoteMap",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            105u8, 71u8, 12u8, 198u8, 22u8, 238u8, 140u8, 152u8, 99u8, 226u8,
-                            118u8, 92u8, 44u8, 112u8, 28u8, 111u8, 128u8, 111u8, 142u8, 161u8,
-                            58u8, 243u8, 124u8, 53u8, 180u8, 35u8, 150u8, 162u8, 30u8, 163u8,
-                            164u8, 80u8,
+                            216u8, 212u8, 234u8, 214u8, 209u8, 164u8, 99u8, 74u8, 18u8, 189u8,
+                            61u8, 178u8, 189u8, 246u8, 208u8, 50u8, 53u8, 183u8, 200u8, 146u8,
+                            19u8, 120u8, 209u8, 118u8, 129u8, 115u8, 248u8, 7u8, 188u8, 78u8,
+                            186u8, 181u8,
                         ],
                     )
                 }
@@ -29784,26 +30161,31 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " Invariant:"]
                 #[doc = " - There are no PVF pre-checking votes that exists in list but not in the set and vice versa."]
-                pub fn pvf_active_vote_map_root(
+                pub fn pvf_active_vote_map(
                     &self,
+                    _0: impl ::std::borrow::Borrow<
+                        runtime_types::polkadot_parachain::primitives::ValidationCodeHash,
+                    >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_runtime_parachains::paras::PvfCheckActiveVoteState<
                         ::core::primitive::u32,
                     >,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "PvfActiveVoteMap",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            105u8, 71u8, 12u8, 198u8, 22u8, 238u8, 140u8, 152u8, 99u8, 226u8,
-                            118u8, 92u8, 44u8, 112u8, 28u8, 111u8, 128u8, 111u8, 142u8, 161u8,
-                            58u8, 243u8, 124u8, 53u8, 180u8, 35u8, 150u8, 162u8, 30u8, 163u8,
-                            164u8, 80u8,
+                            216u8, 212u8, 234u8, 214u8, 209u8, 164u8, 99u8, 74u8, 18u8, 189u8,
+                            61u8, 178u8, 189u8, 246u8, 208u8, 50u8, 53u8, 183u8, 200u8, 146u8,
+                            19u8, 120u8, 209u8, 118u8, 129u8, 115u8, 248u8, 7u8, 188u8, 78u8,
+                            186u8, 181u8,
                         ],
                     )
                 }
@@ -29855,22 +30237,19 @@ pub mod api {
                     )
                 }
                 #[doc = " The current lifecycle of a all known Para IDs."]
-                pub fn para_lifecycles(
+                pub fn para_lifecycles_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_runtime_parachains::paras::ParaLifecycle,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "ParaLifecycles",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             2u8, 203u8, 32u8, 194u8, 76u8, 227u8, 250u8, 9u8, 168u8, 201u8, 171u8,
                             180u8, 18u8, 169u8, 206u8, 183u8, 48u8, 189u8, 204u8, 192u8, 237u8,
@@ -29880,19 +30259,22 @@ pub mod api {
                     )
                 }
                 #[doc = " The current lifecycle of a all known Para IDs."]
-                pub fn para_lifecycles_root(
+                pub fn para_lifecycles(
                     &self,
+                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_runtime_parachains::paras::ParaLifecycle,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "ParaLifecycles",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             2u8, 203u8, 32u8, 194u8, 76u8, 227u8, 250u8, 9u8, 168u8, 201u8, 171u8,
                             180u8, 18u8, 169u8, 206u8, 183u8, 48u8, 189u8, 204u8, 192u8, 237u8,
@@ -29902,22 +30284,19 @@ pub mod api {
                     )
                 }
                 #[doc = " The head-data of every registered para."]
-                pub fn heads(
+                pub fn heads_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_parachain::primitives::HeadData,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "Heads",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             222u8, 116u8, 180u8, 190u8, 172u8, 192u8, 174u8, 132u8, 225u8, 180u8,
                             119u8, 90u8, 5u8, 39u8, 92u8, 230u8, 116u8, 202u8, 92u8, 99u8, 135u8,
@@ -29926,19 +30305,22 @@ pub mod api {
                     )
                 }
                 #[doc = " The head-data of every registered para."]
-                pub fn heads_root(
+                pub fn heads(
                     &self,
+                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_parachain::primitives::HeadData,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "Heads",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             222u8, 116u8, 180u8, 190u8, 172u8, 192u8, 174u8, 132u8, 225u8, 180u8,
                             119u8, 90u8, 5u8, 39u8, 92u8, 230u8, 116u8, 202u8, 92u8, 99u8, 135u8,
@@ -29949,22 +30331,19 @@ pub mod api {
                 #[doc = " The validation code hash of every live para."]
                 #[doc = ""]
                 #[doc = " Corresponding code can be retrieved with [`CodeByHash`]."]
-                pub fn current_code_hash(
+                pub fn current_code_hash_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_parachain::primitives::ValidationCodeHash,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "CurrentCodeHash",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             251u8, 100u8, 30u8, 46u8, 191u8, 60u8, 45u8, 221u8, 218u8, 20u8, 154u8,
                             233u8, 211u8, 198u8, 151u8, 195u8, 99u8, 210u8, 126u8, 165u8, 240u8,
@@ -29976,19 +30355,22 @@ pub mod api {
                 #[doc = " The validation code hash of every live para."]
                 #[doc = ""]
                 #[doc = " Corresponding code can be retrieved with [`CodeByHash`]."]
-                pub fn current_code_hash_root(
+                pub fn current_code_hash(
                     &self,
+                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_parachain::primitives::ValidationCodeHash,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "CurrentCodeHash",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             251u8, 100u8, 30u8, 46u8, 191u8, 60u8, 45u8, 221u8, 218u8, 20u8, 154u8,
                             233u8, 211u8, 198u8, 151u8, 195u8, 99u8, 210u8, 126u8, 165u8, 240u8,
@@ -30001,28 +30383,23 @@ pub mod api {
                 #[doc = " became outdated."]
                 #[doc = ""]
                 #[doc = " Corresponding code can be retrieved with [`CodeByHash`]."]
-                pub fn past_code_hash(
+                pub fn past_code_hash_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
-                    _1: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_parachain::primitives::ValidationCodeHash,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "PastCodeHash",
-                        vec![
-                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
-                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
-                        ],
+                        vec![],
                         [
-                            48u8, 123u8, 195u8, 75u8, 54u8, 236u8, 154u8, 107u8, 32u8, 98u8, 228u8,
-                            233u8, 178u8, 217u8, 226u8, 17u8, 104u8, 124u8, 57u8, 96u8, 23u8, 61u8,
-                            79u8, 5u8, 108u8, 16u8, 142u8, 180u8, 154u8, 121u8, 6u8, 163u8,
+                            73u8, 209u8, 188u8, 36u8, 127u8, 42u8, 171u8, 136u8, 29u8, 126u8,
+                            220u8, 209u8, 230u8, 22u8, 12u8, 63u8, 8u8, 102u8, 45u8, 158u8, 178u8,
+                            232u8, 8u8, 6u8, 71u8, 188u8, 140u8, 41u8, 10u8, 215u8, 22u8, 153u8,
                         ],
                     )
                 }
@@ -30030,8 +30407,9 @@ pub mod api {
                 #[doc = " became outdated."]
                 #[doc = ""]
                 #[doc = " Corresponding code can be retrieved with [`CodeByHash`]."]
-                pub fn past_code_hash_root(
+                pub fn past_code_hash_iter1(
                     &self,
+                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_parachain::primitives::ValidationCodeHash,
@@ -30042,64 +30420,95 @@ pub mod api {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "PastCodeHash",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            48u8, 123u8, 195u8, 75u8, 54u8, 236u8, 154u8, 107u8, 32u8, 98u8, 228u8,
-                            233u8, 178u8, 217u8, 226u8, 17u8, 104u8, 124u8, 57u8, 96u8, 23u8, 61u8,
-                            79u8, 5u8, 108u8, 16u8, 142u8, 180u8, 154u8, 121u8, 6u8, 163u8,
+                            73u8, 209u8, 188u8, 36u8, 127u8, 42u8, 171u8, 136u8, 29u8, 126u8,
+                            220u8, 209u8, 230u8, 22u8, 12u8, 63u8, 8u8, 102u8, 45u8, 158u8, 178u8,
+                            232u8, 8u8, 6u8, 71u8, 188u8, 140u8, 41u8, 10u8, 215u8, 22u8, 153u8,
+                        ],
+                    )
+                }
+                #[doc = " Actual past code hash, indicated by the para id as well as the block number at which it"]
+                #[doc = " became outdated."]
+                #[doc = ""]
+                #[doc = " Corresponding code can be retrieved with [`CodeByHash`]."]
+                pub fn past_code_hash(
+                    &self,
+                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
+                    _1: impl ::std::borrow::Borrow<::core::primitive::u32>,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    runtime_types::polkadot_parachain::primitives::ValidationCodeHash,
+                    ::subxt::storage::address::Yes,
+                    (),
+                    (),
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "Paras",
+                        "PastCodeHash",
+                        vec![
+                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
+                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
+                        ],
+                        [
+                            73u8, 209u8, 188u8, 36u8, 127u8, 42u8, 171u8, 136u8, 29u8, 126u8,
+                            220u8, 209u8, 230u8, 22u8, 12u8, 63u8, 8u8, 102u8, 45u8, 158u8, 178u8,
+                            232u8, 8u8, 6u8, 71u8, 188u8, 140u8, 41u8, 10u8, 215u8, 22u8, 153u8,
                         ],
                     )
                 }
                 #[doc = " Past code of parachains. The parachains themselves may not be registered anymore,"]
                 #[doc = " but we also keep their code on-chain for the same amount of time as outdated code"]
                 #[doc = " to keep it available for approval checkers."]
-                pub fn past_code_meta(
+                pub fn past_code_meta_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_runtime_parachains::paras::ParaPastCodeMeta<
                         ::core::primitive::u32,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "PastCodeMeta",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            22u8, 241u8, 113u8, 138u8, 217u8, 92u8, 78u8, 87u8, 80u8, 70u8, 195u8,
-                            30u8, 109u8, 44u8, 254u8, 49u8, 168u8, 199u8, 185u8, 82u8, 243u8, 81u8,
-                            33u8, 206u8, 254u8, 172u8, 234u8, 111u8, 248u8, 96u8, 242u8, 209u8,
+                            233u8, 47u8, 137u8, 174u8, 98u8, 64u8, 11u8, 75u8, 93u8, 222u8, 78u8,
+                            58u8, 66u8, 245u8, 151u8, 39u8, 144u8, 36u8, 84u8, 176u8, 239u8, 183u8,
+                            197u8, 176u8, 158u8, 139u8, 121u8, 189u8, 29u8, 244u8, 229u8, 73u8,
                         ],
                     )
                 }
                 #[doc = " Past code of parachains. The parachains themselves may not be registered anymore,"]
                 #[doc = " but we also keep their code on-chain for the same amount of time as outdated code"]
                 #[doc = " to keep it available for approval checkers."]
-                pub fn past_code_meta_root(
+                pub fn past_code_meta(
                     &self,
+                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_runtime_parachains::paras::ParaPastCodeMeta<
                         ::core::primitive::u32,
                     >,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "PastCodeMeta",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            22u8, 241u8, 113u8, 138u8, 217u8, 92u8, 78u8, 87u8, 80u8, 70u8, 195u8,
-                            30u8, 109u8, 44u8, 254u8, 49u8, 168u8, 199u8, 185u8, 82u8, 243u8, 81u8,
-                            33u8, 206u8, 254u8, 172u8, 234u8, 111u8, 248u8, 96u8, 242u8, 209u8,
+                            233u8, 47u8, 137u8, 174u8, 98u8, 64u8, 11u8, 75u8, 93u8, 222u8, 78u8,
+                            58u8, 66u8, 245u8, 151u8, 39u8, 144u8, 36u8, 84u8, 176u8, 239u8, 183u8,
+                            197u8, 176u8, 158u8, 139u8, 121u8, 189u8, 29u8, 244u8, 229u8, 73u8,
                         ],
                     )
                 }
@@ -30126,82 +30535,77 @@ pub mod api {
                         "PastCodePruning",
                         vec![],
                         [
-                            233u8, 75u8, 218u8, 58u8, 230u8, 96u8, 238u8, 79u8, 188u8, 124u8, 75u8,
-                            41u8, 189u8, 188u8, 164u8, 34u8, 228u8, 231u8, 8u8, 74u8, 76u8, 4u8,
-                            17u8, 226u8, 236u8, 19u8, 241u8, 54u8, 198u8, 17u8, 172u8, 150u8,
+                            67u8, 190u8, 51u8, 133u8, 173u8, 24u8, 151u8, 111u8, 108u8, 152u8,
+                            106u8, 18u8, 29u8, 80u8, 104u8, 120u8, 91u8, 138u8, 209u8, 49u8, 255u8,
+                            211u8, 53u8, 195u8, 61u8, 188u8, 183u8, 53u8, 37u8, 230u8, 53u8, 183u8,
                         ],
                     )
                 }
                 #[doc = " The block number at which the planned code change is expected for a para."]
                 #[doc = " The change will be applied after the first parablock for this ID included which executes"]
                 #[doc = " in the context of a relay chain block with a number >= `expected_at`."]
-                pub fn future_code_upgrades(
+                pub fn future_code_upgrades_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u32,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "FutureCodeUpgrades",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            74u8, 158u8, 213u8, 211u8, 240u8, 184u8, 91u8, 207u8, 242u8, 49u8,
-                            211u8, 128u8, 106u8, 115u8, 32u8, 195u8, 186u8, 168u8, 207u8, 174u8,
-                            150u8, 120u8, 161u8, 123u8, 80u8, 123u8, 120u8, 109u8, 239u8, 97u8,
-                            177u8, 206u8,
+                            163u8, 168u8, 23u8, 138u8, 198u8, 70u8, 135u8, 221u8, 167u8, 187u8,
+                            15u8, 144u8, 228u8, 8u8, 138u8, 125u8, 101u8, 154u8, 11u8, 74u8, 173u8,
+                            167u8, 17u8, 97u8, 240u8, 6u8, 20u8, 161u8, 25u8, 111u8, 242u8, 9u8,
                         ],
                     )
                 }
                 #[doc = " The block number at which the planned code change is expected for a para."]
                 #[doc = " The change will be applied after the first parablock for this ID included which executes"]
                 #[doc = " in the context of a relay chain block with a number >= `expected_at`."]
-                pub fn future_code_upgrades_root(
+                pub fn future_code_upgrades(
                     &self,
+                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u32,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "FutureCodeUpgrades",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            74u8, 158u8, 213u8, 211u8, 240u8, 184u8, 91u8, 207u8, 242u8, 49u8,
-                            211u8, 128u8, 106u8, 115u8, 32u8, 195u8, 186u8, 168u8, 207u8, 174u8,
-                            150u8, 120u8, 161u8, 123u8, 80u8, 123u8, 120u8, 109u8, 239u8, 97u8,
-                            177u8, 206u8,
+                            163u8, 168u8, 23u8, 138u8, 198u8, 70u8, 135u8, 221u8, 167u8, 187u8,
+                            15u8, 144u8, 228u8, 8u8, 138u8, 125u8, 101u8, 154u8, 11u8, 74u8, 173u8,
+                            167u8, 17u8, 97u8, 240u8, 6u8, 20u8, 161u8, 25u8, 111u8, 242u8, 9u8,
                         ],
                     )
                 }
                 #[doc = " The actual future code hash of a para."]
                 #[doc = ""]
                 #[doc = " Corresponding code can be retrieved with [`CodeByHash`]."]
-                pub fn future_code_hash(
+                pub fn future_code_hash_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_parachain::primitives::ValidationCodeHash,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "FutureCodeHash",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             62u8, 238u8, 183u8, 12u8, 197u8, 119u8, 163u8, 239u8, 192u8, 228u8,
                             110u8, 58u8, 128u8, 223u8, 32u8, 137u8, 109u8, 127u8, 41u8, 83u8, 91u8,
@@ -30212,19 +30616,22 @@ pub mod api {
                 #[doc = " The actual future code hash of a para."]
                 #[doc = ""]
                 #[doc = " Corresponding code can be retrieved with [`CodeByHash`]."]
-                pub fn future_code_hash_root(
+                pub fn future_code_hash(
                     &self,
+                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_parachain::primitives::ValidationCodeHash,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "FutureCodeHash",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             62u8, 238u8, 183u8, 12u8, 197u8, 119u8, 163u8, 239u8, 192u8, 228u8,
                             110u8, 58u8, 128u8, 223u8, 32u8, 137u8, 109u8, 127u8, 41u8, 83u8, 91u8,
@@ -30241,22 +30648,19 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " NOTE that this field is used by parachains via merkle storage proofs, therefore changing"]
                 #[doc = " the format will require migration of parachains."]
-                pub fn upgrade_go_ahead_signal(
+                pub fn upgrade_go_ahead_signal_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_primitives::v5::UpgradeGoAhead,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "UpgradeGoAheadSignal",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             41u8, 80u8, 120u8, 6u8, 98u8, 85u8, 36u8, 37u8, 170u8, 189u8, 56u8,
                             127u8, 155u8, 180u8, 112u8, 195u8, 135u8, 214u8, 235u8, 87u8, 197u8,
@@ -30274,19 +30678,22 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " NOTE that this field is used by parachains via merkle storage proofs, therefore changing"]
                 #[doc = " the format will require migration of parachains."]
-                pub fn upgrade_go_ahead_signal_root(
+                pub fn upgrade_go_ahead_signal(
                     &self,
+                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_primitives::v5::UpgradeGoAhead,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "UpgradeGoAheadSignal",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             41u8, 80u8, 120u8, 6u8, 98u8, 85u8, 36u8, 37u8, 170u8, 189u8, 56u8,
                             127u8, 155u8, 180u8, 112u8, 195u8, 135u8, 214u8, 235u8, 87u8, 197u8,
@@ -30304,22 +30711,19 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " NOTE that this field is used by parachains via merkle storage proofs, therefore changing"]
                 #[doc = " the format will require migration of parachains."]
-                pub fn upgrade_restriction_signal(
+                pub fn upgrade_restriction_signal_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_primitives::v5::UpgradeRestriction,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "UpgradeRestrictionSignal",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             158u8, 105u8, 62u8, 252u8, 149u8, 145u8, 34u8, 92u8, 119u8, 204u8,
                             46u8, 96u8, 117u8, 183u8, 134u8, 20u8, 172u8, 243u8, 145u8, 113u8,
@@ -30337,19 +30741,22 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " NOTE that this field is used by parachains via merkle storage proofs, therefore changing"]
                 #[doc = " the format will require migration of parachains."]
-                pub fn upgrade_restriction_signal_root(
+                pub fn upgrade_restriction_signal(
                     &self,
+                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_primitives::v5::UpgradeRestriction,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "UpgradeRestrictionSignal",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             158u8, 105u8, 62u8, 252u8, 149u8, 145u8, 34u8, 92u8, 119u8, 204u8,
                             46u8, 96u8, 117u8, 183u8, 134u8, 20u8, 172u8, 243u8, 145u8, 113u8,
@@ -30378,10 +30785,10 @@ pub mod api {
                         "UpgradeCooldowns",
                         vec![],
                         [
-                            172u8, 3u8, 71u8, 137u8, 150u8, 36u8, 119u8, 181u8, 252u8, 204u8,
-                            172u8, 28u8, 107u8, 38u8, 182u8, 165u8, 151u8, 55u8, 1u8, 174u8, 89u8,
-                            203u8, 232u8, 91u8, 219u8, 167u8, 110u8, 108u8, 146u8, 235u8, 11u8,
-                            14u8,
+                            180u8, 197u8, 115u8, 209u8, 126u8, 120u8, 133u8, 54u8, 232u8, 192u8,
+                            47u8, 17u8, 21u8, 8u8, 231u8, 67u8, 1u8, 89u8, 127u8, 38u8, 179u8,
+                            190u8, 169u8, 110u8, 20u8, 92u8, 139u8, 227u8, 26u8, 59u8, 245u8,
+                            174u8,
                         ],
                     )
                 }
@@ -30406,57 +30813,54 @@ pub mod api {
                         "UpcomingUpgrades",
                         vec![],
                         [
-                            28u8, 180u8, 64u8, 56u8, 215u8, 181u8, 35u8, 86u8, 225u8, 193u8, 58u8,
-                            246u8, 178u8, 110u8, 175u8, 173u8, 130u8, 14u8, 7u8, 131u8, 195u8,
-                            10u8, 251u8, 105u8, 56u8, 110u8, 46u8, 162u8, 156u8, 198u8, 125u8,
-                            45u8,
+                            38u8, 195u8, 15u8, 56u8, 225u8, 199u8, 105u8, 84u8, 128u8, 51u8, 44u8,
+                            248u8, 237u8, 32u8, 36u8, 72u8, 77u8, 137u8, 124u8, 88u8, 242u8, 185u8,
+                            50u8, 148u8, 216u8, 156u8, 209u8, 101u8, 207u8, 127u8, 66u8, 95u8,
                         ],
                     )
                 }
                 #[doc = " The actions to perform during the start of a specific session index."]
-                pub fn actions_queue(
+                pub fn actions_queue_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::std::vec::Vec<runtime_types::polkadot_parachain::primitives::Id>,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "ActionsQueue",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            85u8, 212u8, 98u8, 204u8, 36u8, 203u8, 119u8, 90u8, 107u8, 212u8,
-                            182u8, 147u8, 162u8, 111u8, 226u8, 47u8, 178u8, 129u8, 74u8, 219u8,
-                            62u8, 67u8, 213u8, 134u8, 140u8, 51u8, 232u8, 211u8, 171u8, 103u8,
-                            172u8, 165u8,
+                            13u8, 25u8, 129u8, 203u8, 95u8, 206u8, 254u8, 240u8, 170u8, 209u8,
+                            55u8, 117u8, 70u8, 220u8, 139u8, 102u8, 9u8, 229u8, 139u8, 120u8, 67u8,
+                            246u8, 214u8, 59u8, 81u8, 116u8, 54u8, 67u8, 129u8, 32u8, 67u8, 92u8,
                         ],
                     )
                 }
                 #[doc = " The actions to perform during the start of a specific session index."]
-                pub fn actions_queue_root(
+                pub fn actions_queue(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::std::vec::Vec<runtime_types::polkadot_parachain::primitives::Id>,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "ActionsQueue",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            85u8, 212u8, 98u8, 204u8, 36u8, 203u8, 119u8, 90u8, 107u8, 212u8,
-                            182u8, 147u8, 162u8, 111u8, 226u8, 47u8, 178u8, 129u8, 74u8, 219u8,
-                            62u8, 67u8, 213u8, 134u8, 140u8, 51u8, 232u8, 211u8, 171u8, 103u8,
-                            172u8, 165u8,
+                            13u8, 25u8, 129u8, 203u8, 95u8, 206u8, 254u8, 240u8, 170u8, 209u8,
+                            55u8, 117u8, 70u8, 220u8, 139u8, 102u8, 9u8, 229u8, 139u8, 120u8, 67u8,
+                            246u8, 214u8, 59u8, 81u8, 116u8, 54u8, 67u8, 129u8, 32u8, 67u8, 92u8,
                         ],
                     )
                 }
@@ -30464,26 +30868,24 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " NOTE that after PVF pre-checking is enabled the para genesis arg will have it's code set"]
                 #[doc = " to empty. Instead, the code will be saved into the storage right away via `CodeByHash`."]
-                pub fn upcoming_paras_genesis(
+                pub fn upcoming_paras_genesis_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_runtime_parachains::paras::ParaGenesisArgs,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "UpcomingParasGenesis",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            205u8, 192u8, 117u8, 77u8, 22u8, 165u8, 45u8, 181u8, 8u8, 109u8, 109u8,
-                            203u8, 182u8, 214u8, 200u8, 31u8, 24u8, 148u8, 51u8, 240u8, 231u8,
-                            152u8, 7u8, 151u8, 22u8, 188u8, 150u8, 168u8, 109u8, 158u8, 3u8, 189u8,
+                            215u8, 121u8, 106u8, 13u8, 102u8, 47u8, 129u8, 221u8, 153u8, 91u8,
+                            23u8, 94u8, 11u8, 39u8, 19u8, 180u8, 136u8, 136u8, 254u8, 152u8, 250u8,
+                            150u8, 40u8, 87u8, 135u8, 121u8, 219u8, 151u8, 111u8, 35u8, 43u8,
+                            195u8,
                         ],
                     )
                 }
@@ -30491,45 +30893,44 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " NOTE that after PVF pre-checking is enabled the para genesis arg will have it's code set"]
                 #[doc = " to empty. Instead, the code will be saved into the storage right away via `CodeByHash`."]
-                pub fn upcoming_paras_genesis_root(
+                pub fn upcoming_paras_genesis(
                     &self,
+                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_runtime_parachains::paras::ParaGenesisArgs,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "UpcomingParasGenesis",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            205u8, 192u8, 117u8, 77u8, 22u8, 165u8, 45u8, 181u8, 8u8, 109u8, 109u8,
-                            203u8, 182u8, 214u8, 200u8, 31u8, 24u8, 148u8, 51u8, 240u8, 231u8,
-                            152u8, 7u8, 151u8, 22u8, 188u8, 150u8, 168u8, 109u8, 158u8, 3u8, 189u8,
+                            215u8, 121u8, 106u8, 13u8, 102u8, 47u8, 129u8, 221u8, 153u8, 91u8,
+                            23u8, 94u8, 11u8, 39u8, 19u8, 180u8, 136u8, 136u8, 254u8, 152u8, 250u8,
+                            150u8, 40u8, 87u8, 135u8, 121u8, 219u8, 151u8, 111u8, 35u8, 43u8,
+                            195u8,
                         ],
                     )
                 }
                 #[doc = " The number of reference on the validation code in [`CodeByHash`] storage."]
-                pub fn code_by_hash_refs(
+                pub fn code_by_hash_refs_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<
-                        runtime_types::polkadot_parachain::primitives::ValidationCodeHash,
-                    >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u32,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "CodeByHashRefs",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             47u8, 50u8, 103u8, 161u8, 130u8, 252u8, 157u8, 35u8, 174u8, 37u8,
                             102u8, 60u8, 195u8, 30u8, 164u8, 203u8, 67u8, 129u8, 107u8, 181u8,
@@ -30539,19 +30940,24 @@ pub mod api {
                     )
                 }
                 #[doc = " The number of reference on the validation code in [`CodeByHash`] storage."]
-                pub fn code_by_hash_refs_root(
+                pub fn code_by_hash_refs(
                     &self,
+                    _0: impl ::std::borrow::Borrow<
+                        runtime_types::polkadot_parachain::primitives::ValidationCodeHash,
+                    >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u32,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "CodeByHashRefs",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             47u8, 50u8, 103u8, 161u8, 130u8, 252u8, 157u8, 35u8, 174u8, 37u8,
                             102u8, 60u8, 195u8, 30u8, 164u8, 203u8, 67u8, 129u8, 107u8, 181u8,
@@ -30564,28 +30970,23 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " This storage is consistent with [`FutureCodeHash`], [`CurrentCodeHash`] and"]
                 #[doc = " [`PastCodeHash`]."]
-                pub fn code_by_hash(
+                pub fn code_by_hash_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<
-                        runtime_types::polkadot_parachain::primitives::ValidationCodeHash,
-                    >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_parachain::primitives::ValidationCode,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "CodeByHash",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            207u8, 173u8, 182u8, 146u8, 179u8, 77u8, 30u8, 80u8, 62u8, 17u8, 87u8,
-                            97u8, 105u8, 156u8, 71u8, 80u8, 190u8, 81u8, 88u8, 8u8, 159u8, 142u8,
-                            106u8, 73u8, 220u8, 11u8, 53u8, 151u8, 234u8, 205u8, 190u8, 187u8,
+                            155u8, 102u8, 73u8, 180u8, 127u8, 211u8, 181u8, 44u8, 56u8, 235u8,
+                            49u8, 4u8, 25u8, 213u8, 116u8, 200u8, 232u8, 203u8, 190u8, 90u8, 93u8,
+                            6u8, 57u8, 227u8, 240u8, 92u8, 157u8, 129u8, 3u8, 148u8, 45u8, 143u8,
                         ],
                     )
                 }
@@ -30593,23 +30994,28 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " This storage is consistent with [`FutureCodeHash`], [`CurrentCodeHash`] and"]
                 #[doc = " [`PastCodeHash`]."]
-                pub fn code_by_hash_root(
+                pub fn code_by_hash(
                     &self,
+                    _0: impl ::std::borrow::Borrow<
+                        runtime_types::polkadot_parachain::primitives::ValidationCodeHash,
+                    >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_parachain::primitives::ValidationCode,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Paras",
                         "CodeByHash",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            207u8, 173u8, 182u8, 146u8, 179u8, 77u8, 30u8, 80u8, 62u8, 17u8, 87u8,
-                            97u8, 105u8, 156u8, 71u8, 80u8, 190u8, 81u8, 88u8, 8u8, 159u8, 142u8,
-                            106u8, 73u8, 220u8, 11u8, 53u8, 151u8, 234u8, 205u8, 190u8, 187u8,
+                            155u8, 102u8, 73u8, 180u8, 127u8, 211u8, 181u8, 44u8, 56u8, 235u8,
+                            49u8, 4u8, 25u8, 213u8, 116u8, 200u8, 232u8, 203u8, 190u8, 90u8, 93u8,
+                            6u8, 57u8, 227u8, 240u8, 92u8, 157u8, 129u8, 3u8, 148u8, 45u8, 143u8,
                         ],
                     )
                 }
@@ -30731,9 +31137,9 @@ pub mod api {
                         "BufferedSessionChanges",
                         vec![],
                         [
-                            96u8, 139u8, 32u8, 156u8, 180u8, 12u8, 6u8, 63u8, 221u8, 11u8, 123u8,
-                            196u8, 31u8, 210u8, 45u8, 21u8, 117u8, 69u8, 139u8, 230u8, 33u8, 144u8,
-                            65u8, 254u8, 2u8, 161u8, 173u8, 194u8, 30u8, 67u8, 192u8, 82u8,
+                            99u8, 153u8, 100u8, 11u8, 28u8, 62u8, 163u8, 239u8, 177u8, 55u8, 151u8,
+                            242u8, 227u8, 59u8, 176u8, 10u8, 227u8, 51u8, 252u8, 191u8, 233u8,
+                            36u8, 1u8, 131u8, 255u8, 56u8, 6u8, 65u8, 5u8, 185u8, 114u8, 139u8,
                         ],
                     )
                 }
@@ -30748,9 +31154,8 @@ pub mod api {
             pub struct StorageApi;
             impl StorageApi {
                 #[doc = " The downward messages addressed for a certain para."]
-                pub fn downward_message_queues(
+                pub fn downward_message_queues_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::std::vec::Vec<
@@ -30758,26 +31163,26 @@ pub mod api {
                             ::core::primitive::u32,
                         >,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Dmp",
                         "DownwardMessageQueues",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            135u8, 63u8, 55u8, 101u8, 38u8, 53u8, 188u8, 5u8, 228u8, 49u8, 163u8,
-                            99u8, 129u8, 95u8, 93u8, 205u8, 13u8, 226u8, 22u8, 106u8, 30u8, 187u8,
-                            127u8, 20u8, 164u8, 168u8, 0u8, 25u8, 26u8, 250u8, 13u8, 140u8,
+                            38u8, 183u8, 133u8, 200u8, 199u8, 135u8, 68u8, 232u8, 189u8, 168u8,
+                            3u8, 219u8, 201u8, 180u8, 156u8, 79u8, 134u8, 164u8, 94u8, 114u8,
+                            102u8, 25u8, 108u8, 53u8, 219u8, 155u8, 102u8, 100u8, 58u8, 28u8,
+                            246u8, 20u8,
                         ],
                     )
                 }
                 #[doc = " The downward messages addressed for a certain para."]
-                pub fn downward_message_queues_root(
+                pub fn downward_message_queues(
                     &self,
+                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::std::vec::Vec<
@@ -30785,48 +31190,21 @@ pub mod api {
                             ::core::primitive::u32,
                         >,
                     >,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Dmp",
                         "DownwardMessageQueues",
-                        Vec::new(),
-                        [
-                            135u8, 63u8, 55u8, 101u8, 38u8, 53u8, 188u8, 5u8, 228u8, 49u8, 163u8,
-                            99u8, 129u8, 95u8, 93u8, 205u8, 13u8, 226u8, 22u8, 106u8, 30u8, 187u8,
-                            127u8, 20u8, 164u8, 168u8, 0u8, 25u8, 26u8, 250u8, 13u8, 140u8,
-                        ],
-                    )
-                }
-                #[doc = " A mapping that stores the downward message queue MQC head for each para."]
-                #[doc = ""]
-                #[doc = " Each link in this chain has a form:"]
-                #[doc = " `(prev_head, B, H(M))`, where"]
-                #[doc = " - `prev_head`: is the previous head hash or zero if none."]
-                #[doc = " - `B`: is the relay-chain block number in which a message was appended."]
-                #[doc = " - `H(M)`: is the hash of the message being appended."]
-                pub fn downward_message_queue_heads(
-                    &self,
-                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
-                ) -> ::subxt::storage::address::Address<
-                    ::subxt::storage::address::StaticStorageMapKey,
-                    ::subxt::utils::H256,
-                    ::subxt::storage::address::Yes,
-                    ::subxt::storage::address::Yes,
-                    ::subxt::storage::address::Yes,
-                > {
-                    ::subxt::storage::address::Address::new_static(
-                        "Dmp",
-                        "DownwardMessageQueueHeads",
                         vec![::subxt::storage::address::make_static_storage_map_key(
                             _0.borrow(),
                         )],
                         [
-                            135u8, 165u8, 240u8, 0u8, 25u8, 110u8, 9u8, 108u8, 251u8, 225u8, 109u8,
-                            184u8, 90u8, 132u8, 9u8, 151u8, 12u8, 118u8, 153u8, 212u8, 140u8,
-                            205u8, 94u8, 98u8, 110u8, 167u8, 155u8, 43u8, 61u8, 35u8, 52u8, 56u8,
+                            38u8, 183u8, 133u8, 200u8, 199u8, 135u8, 68u8, 232u8, 189u8, 168u8,
+                            3u8, 219u8, 201u8, 180u8, 156u8, 79u8, 134u8, 164u8, 94u8, 114u8,
+                            102u8, 25u8, 108u8, 53u8, 219u8, 155u8, 102u8, 100u8, 58u8, 28u8,
+                            246u8, 20u8,
                         ],
                     )
                 }
@@ -30837,7 +31215,7 @@ pub mod api {
                 #[doc = " - `prev_head`: is the previous head hash or zero if none."]
                 #[doc = " - `B`: is the relay-chain block number in which a message was appended."]
                 #[doc = " - `H(M)`: is the hash of the message being appended."]
-                pub fn downward_message_queue_heads_root(
+                pub fn downward_message_queue_heads_iter(
                     &self,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
@@ -30849,7 +31227,7 @@ pub mod api {
                     ::subxt::storage::address::Address::new_static(
                         "Dmp",
                         "DownwardMessageQueueHeads",
-                        Vec::new(),
+                        vec![],
                         [
                             135u8, 165u8, 240u8, 0u8, 25u8, 110u8, 9u8, 108u8, 251u8, 225u8, 109u8,
                             184u8, 90u8, 132u8, 9u8, 151u8, 12u8, 118u8, 153u8, 212u8, 140u8,
@@ -30857,23 +31235,50 @@ pub mod api {
                         ],
                     )
                 }
-                #[doc = " The number to multiply the base delivery fee by."]
-                pub fn delivery_fee_factor(
+                #[doc = " A mapping that stores the downward message queue MQC head for each para."]
+                #[doc = ""]
+                #[doc = " Each link in this chain has a form:"]
+                #[doc = " `(prev_head, B, H(M))`, where"]
+                #[doc = " - `prev_head`: is the previous head hash or zero if none."]
+                #[doc = " - `B`: is the relay-chain block number in which a message was appended."]
+                #[doc = " - `H(M)`: is the hash of the message being appended."]
+                pub fn downward_message_queue_heads(
                     &self,
                     _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
-                    runtime_types::sp_arithmetic::fixed_point::FixedU128,
-                    ::subxt::storage::address::Yes,
+                    ::subxt::utils::H256,
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Dmp",
-                        "DeliveryFeeFactor",
+                        "DownwardMessageQueueHeads",
                         vec![::subxt::storage::address::make_static_storage_map_key(
                             _0.borrow(),
                         )],
+                        [
+                            135u8, 165u8, 240u8, 0u8, 25u8, 110u8, 9u8, 108u8, 251u8, 225u8, 109u8,
+                            184u8, 90u8, 132u8, 9u8, 151u8, 12u8, 118u8, 153u8, 212u8, 140u8,
+                            205u8, 94u8, 98u8, 110u8, 167u8, 155u8, 43u8, 61u8, 35u8, 52u8, 56u8,
+                        ],
+                    )
+                }
+                #[doc = " The number to multiply the base delivery fee by."]
+                pub fn delivery_fee_factor_iter(
+                    &self,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    runtime_types::sp_arithmetic::fixed_point::FixedU128,
+                    (),
+                    ::subxt::storage::address::Yes,
+                    ::subxt::storage::address::Yes,
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "Dmp",
+                        "DeliveryFeeFactor",
+                        vec![],
                         [
                             43u8, 5u8, 63u8, 235u8, 115u8, 155u8, 130u8, 27u8, 75u8, 216u8, 177u8,
                             135u8, 203u8, 147u8, 167u8, 95u8, 208u8, 188u8, 25u8, 14u8, 84u8, 63u8,
@@ -30882,19 +31287,22 @@ pub mod api {
                     )
                 }
                 #[doc = " The number to multiply the base delivery fee by."]
-                pub fn delivery_fee_factor_root(
+                pub fn delivery_fee_factor(
                     &self,
+                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::sp_arithmetic::fixed_point::FixedU128,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Dmp",
                         "DeliveryFeeFactor",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             43u8, 5u8, 63u8, 235u8, 115u8, 155u8, 130u8, 27u8, 75u8, 216u8, 177u8,
                             135u8, 203u8, 147u8, 167u8, 95u8, 208u8, 188u8, 25u8, 14u8, 84u8, 63u8,
@@ -31083,10 +31491,10 @@ pub mod api {
                             proposed_max_message_size,
                         },
                         [
-                            195u8, 189u8, 253u8, 88u8, 118u8, 9u8, 223u8, 44u8, 211u8, 203u8,
-                            182u8, 218u8, 31u8, 97u8, 93u8, 87u8, 186u8, 174u8, 179u8, 80u8, 33u8,
-                            16u8, 214u8, 36u8, 12u8, 208u8, 151u8, 201u8, 208u8, 250u8, 167u8,
-                            147u8,
+                            89u8, 39u8, 43u8, 191u8, 235u8, 40u8, 253u8, 129u8, 174u8, 108u8, 26u8,
+                            206u8, 7u8, 146u8, 206u8, 56u8, 53u8, 104u8, 138u8, 203u8, 108u8,
+                            195u8, 190u8, 231u8, 223u8, 33u8, 32u8, 157u8, 148u8, 235u8, 67u8,
+                            82u8,
                         ],
                     )
                 }
@@ -31116,9 +31524,10 @@ pub mod api {
                         "hrmp_close_channel",
                         types::HrmpCloseChannel { channel_id },
                         [
-                            133u8, 95u8, 182u8, 90u8, 179u8, 212u8, 120u8, 118u8, 153u8, 96u8,
-                            213u8, 165u8, 22u8, 20u8, 230u8, 122u8, 215u8, 181u8, 48u8, 23u8, 25u8,
-                            122u8, 27u8, 85u8, 62u8, 87u8, 214u8, 218u8, 20u8, 105u8, 77u8, 96u8,
+                            174u8, 225u8, 93u8, 69u8, 133u8, 145u8, 156u8, 94u8, 185u8, 254u8,
+                            60u8, 209u8, 232u8, 79u8, 237u8, 173u8, 180u8, 45u8, 117u8, 165u8,
+                            202u8, 195u8, 84u8, 68u8, 241u8, 164u8, 151u8, 216u8, 96u8, 20u8, 7u8,
+                            45u8,
                         ],
                     )
                 }
@@ -31138,10 +31547,9 @@ pub mod api {
                             outbound,
                         },
                         [
-                            174u8, 160u8, 170u8, 127u8, 154u8, 188u8, 39u8, 54u8, 68u8, 253u8,
-                            107u8, 99u8, 223u8, 162u8, 140u8, 64u8, 221u8, 217u8, 106u8, 43u8,
-                            217u8, 25u8, 48u8, 38u8, 213u8, 228u8, 24u8, 94u8, 116u8, 236u8, 108u8,
-                            77u8,
+                            0u8, 31u8, 178u8, 86u8, 30u8, 161u8, 50u8, 113u8, 51u8, 212u8, 175u8,
+                            144u8, 43u8, 127u8, 10u8, 168u8, 127u8, 39u8, 101u8, 67u8, 96u8, 29u8,
+                            117u8, 79u8, 184u8, 228u8, 182u8, 53u8, 55u8, 142u8, 225u8, 212u8,
                         ],
                     )
                 }
@@ -31193,10 +31601,9 @@ pub mod api {
                             open_requests,
                         },
                         [
-                            59u8, 112u8, 18u8, 146u8, 252u8, 96u8, 198u8, 185u8, 100u8, 158u8,
-                            16u8, 198u8, 251u8, 12u8, 205u8, 87u8, 231u8, 97u8, 121u8, 249u8,
-                            202u8, 199u8, 49u8, 166u8, 118u8, 60u8, 1u8, 8u8, 49u8, 4u8, 61u8,
-                            216u8,
+                            10u8, 192u8, 79u8, 120u8, 6u8, 88u8, 139u8, 75u8, 87u8, 32u8, 125u8,
+                            47u8, 178u8, 132u8, 156u8, 232u8, 28u8, 123u8, 74u8, 10u8, 180u8, 90u8,
+                            145u8, 123u8, 40u8, 89u8, 235u8, 25u8, 237u8, 137u8, 114u8, 173u8,
                         ],
                     )
                 }
@@ -31218,9 +31625,9 @@ pub mod api {
                             max_message_size,
                         },
                         [
-                            73u8, 48u8, 219u8, 182u8, 93u8, 232u8, 94u8, 210u8, 17u8, 170u8, 42u8,
-                            96u8, 88u8, 124u8, 106u8, 25u8, 22u8, 142u8, 77u8, 154u8, 139u8, 15u8,
-                            1u8, 171u8, 155u8, 200u8, 213u8, 92u8, 50u8, 193u8, 63u8, 184u8,
+                            37u8, 251u8, 1u8, 201u8, 129u8, 217u8, 193u8, 179u8, 98u8, 153u8,
+                            226u8, 139u8, 107u8, 222u8, 3u8, 76u8, 104u8, 248u8, 31u8, 241u8, 90u8,
+                            189u8, 56u8, 92u8, 118u8, 68u8, 177u8, 70u8, 5u8, 44u8, 234u8, 27u8,
                         ],
                     )
                 }
@@ -31343,28 +31750,24 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " Invariant:"]
                 #[doc = " - There are no channels that exists in list but not in the set and vice versa."]
-                pub fn hrmp_open_channel_requests(
+                pub fn hrmp_open_channel_requests_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<
-                        runtime_types::polkadot_parachain::primitives::HrmpChannelId,
-                    >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_runtime_parachains::hrmp::HrmpOpenChannelRequest,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Hrmp",
                         "HrmpOpenChannelRequests",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            22u8, 147u8, 166u8, 47u8, 14u8, 226u8, 175u8, 227u8, 89u8, 8u8, 211u8,
-                            246u8, 149u8, 18u8, 179u8, 53u8, 197u8, 61u8, 110u8, 51u8, 37u8, 216u8,
-                            127u8, 255u8, 255u8, 182u8, 194u8, 77u8, 103u8, 171u8, 142u8, 128u8,
+                            164u8, 97u8, 52u8, 242u8, 255u8, 67u8, 248u8, 170u8, 204u8, 92u8, 81u8,
+                            144u8, 11u8, 63u8, 145u8, 167u8, 8u8, 174u8, 221u8, 147u8, 125u8,
+                            144u8, 243u8, 33u8, 235u8, 104u8, 240u8, 99u8, 96u8, 211u8, 163u8,
+                            121u8,
                         ],
                     )
                 }
@@ -31374,23 +31777,29 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " Invariant:"]
                 #[doc = " - There are no channels that exists in list but not in the set and vice versa."]
-                pub fn hrmp_open_channel_requests_root(
+                pub fn hrmp_open_channel_requests(
                     &self,
+                    _0: impl ::std::borrow::Borrow<
+                        runtime_types::polkadot_parachain::primitives::HrmpChannelId,
+                    >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_runtime_parachains::hrmp::HrmpOpenChannelRequest,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Hrmp",
                         "HrmpOpenChannelRequests",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            22u8, 147u8, 166u8, 47u8, 14u8, 226u8, 175u8, 227u8, 89u8, 8u8, 211u8,
-                            246u8, 149u8, 18u8, 179u8, 53u8, 197u8, 61u8, 110u8, 51u8, 37u8, 216u8,
-                            127u8, 255u8, 255u8, 182u8, 194u8, 77u8, 103u8, 171u8, 142u8, 128u8,
+                            164u8, 97u8, 52u8, 242u8, 255u8, 67u8, 248u8, 170u8, 204u8, 92u8, 81u8,
+                            144u8, 11u8, 63u8, 145u8, 167u8, 8u8, 174u8, 221u8, 147u8, 125u8,
+                            144u8, 243u8, 33u8, 235u8, 104u8, 240u8, 99u8, 96u8, 211u8, 163u8,
+                            121u8,
                         ],
                     )
                 }
@@ -31408,108 +31817,112 @@ pub mod api {
                         "HrmpOpenChannelRequestsList",
                         vec![],
                         [
-                            170u8, 61u8, 26u8, 132u8, 103u8, 8u8, 166u8, 104u8, 45u8, 181u8, 0u8,
-                            218u8, 30u8, 142u8, 225u8, 17u8, 46u8, 182u8, 152u8, 202u8, 203u8,
-                            168u8, 58u8, 57u8, 186u8, 105u8, 251u8, 227u8, 232u8, 51u8, 78u8,
-                            187u8,
+                            45u8, 190u8, 124u8, 26u8, 37u8, 249u8, 140u8, 254u8, 101u8, 249u8,
+                            27u8, 117u8, 218u8, 3u8, 126u8, 114u8, 143u8, 65u8, 122u8, 246u8,
+                            237u8, 173u8, 145u8, 175u8, 133u8, 119u8, 127u8, 81u8, 59u8, 206u8,
+                            159u8, 39u8,
                         ],
                     )
                 }
                 #[doc = " This mapping tracks how many open channel requests are initiated by a given sender para."]
                 #[doc = " Invariant: `HrmpOpenChannelRequests` should contain the same number of items that has"]
                 #[doc = " `(X, _)` as the number of `HrmpOpenChannelRequestCount` for `X`."]
-                pub fn hrmp_open_channel_request_count(
+                pub fn hrmp_open_channel_request_count_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u32,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Hrmp",
                         "HrmpOpenChannelRequestCount",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            153u8, 224u8, 69u8, 67u8, 106u8, 221u8, 28u8, 12u8, 246u8, 135u8,
-                            150u8, 198u8, 255u8, 11u8, 24u8, 74u8, 109u8, 118u8, 40u8, 151u8, 62u8,
-                            131u8, 235u8, 43u8, 89u8, 20u8, 211u8, 153u8, 34u8, 48u8, 81u8, 30u8,
+                            136u8, 72u8, 56u8, 31u8, 229u8, 99u8, 241u8, 14u8, 159u8, 243u8, 179u8,
+                            222u8, 252u8, 56u8, 63u8, 24u8, 204u8, 130u8, 47u8, 161u8, 133u8,
+                            227u8, 237u8, 146u8, 239u8, 46u8, 127u8, 113u8, 190u8, 230u8, 61u8,
+                            182u8,
                         ],
                     )
                 }
                 #[doc = " This mapping tracks how many open channel requests are initiated by a given sender para."]
                 #[doc = " Invariant: `HrmpOpenChannelRequests` should contain the same number of items that has"]
                 #[doc = " `(X, _)` as the number of `HrmpOpenChannelRequestCount` for `X`."]
-                pub fn hrmp_open_channel_request_count_root(
+                pub fn hrmp_open_channel_request_count(
                     &self,
+                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u32,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Hrmp",
                         "HrmpOpenChannelRequestCount",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            153u8, 224u8, 69u8, 67u8, 106u8, 221u8, 28u8, 12u8, 246u8, 135u8,
-                            150u8, 198u8, 255u8, 11u8, 24u8, 74u8, 109u8, 118u8, 40u8, 151u8, 62u8,
-                            131u8, 235u8, 43u8, 89u8, 20u8, 211u8, 153u8, 34u8, 48u8, 81u8, 30u8,
+                            136u8, 72u8, 56u8, 31u8, 229u8, 99u8, 241u8, 14u8, 159u8, 243u8, 179u8,
+                            222u8, 252u8, 56u8, 63u8, 24u8, 204u8, 130u8, 47u8, 161u8, 133u8,
+                            227u8, 237u8, 146u8, 239u8, 46u8, 127u8, 113u8, 190u8, 230u8, 61u8,
+                            182u8,
                         ],
                     )
                 }
                 #[doc = " This mapping tracks how many open channel requests were accepted by a given recipient para."]
                 #[doc = " Invariant: `HrmpOpenChannelRequests` should contain the same number of items `(_, X)` with"]
                 #[doc = " `confirmed` set to true, as the number of `HrmpAcceptedChannelRequestCount` for `X`."]
-                pub fn hrmp_accepted_channel_request_count(
+                pub fn hrmp_accepted_channel_request_count_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u32,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Hrmp",
                         "HrmpAcceptedChannelRequestCount",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            110u8, 50u8, 32u8, 98u8, 172u8, 143u8, 249u8, 151u8, 162u8, 5u8, 111u8,
-                            157u8, 248u8, 233u8, 192u8, 38u8, 42u8, 206u8, 107u8, 233u8, 73u8,
-                            108u8, 24u8, 78u8, 72u8, 119u8, 98u8, 126u8, 60u8, 132u8, 157u8, 38u8,
+                            29u8, 100u8, 52u8, 28u8, 180u8, 84u8, 132u8, 120u8, 117u8, 172u8,
+                            169u8, 40u8, 237u8, 92u8, 89u8, 87u8, 230u8, 148u8, 140u8, 226u8, 60u8,
+                            169u8, 100u8, 162u8, 139u8, 205u8, 180u8, 92u8, 0u8, 110u8, 55u8,
+                            158u8,
                         ],
                     )
                 }
                 #[doc = " This mapping tracks how many open channel requests were accepted by a given recipient para."]
                 #[doc = " Invariant: `HrmpOpenChannelRequests` should contain the same number of items `(_, X)` with"]
                 #[doc = " `confirmed` set to true, as the number of `HrmpAcceptedChannelRequestCount` for `X`."]
-                pub fn hrmp_accepted_channel_request_count_root(
+                pub fn hrmp_accepted_channel_request_count(
                     &self,
+                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u32,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Hrmp",
                         "HrmpAcceptedChannelRequestCount",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            110u8, 50u8, 32u8, 98u8, 172u8, 143u8, 249u8, 151u8, 162u8, 5u8, 111u8,
-                            157u8, 248u8, 233u8, 192u8, 38u8, 42u8, 206u8, 107u8, 233u8, 73u8,
-                            108u8, 24u8, 78u8, 72u8, 119u8, 98u8, 126u8, 60u8, 132u8, 157u8, 38u8,
+                            29u8, 100u8, 52u8, 28u8, 180u8, 84u8, 132u8, 120u8, 117u8, 172u8,
+                            169u8, 40u8, 237u8, 92u8, 89u8, 87u8, 230u8, 148u8, 140u8, 226u8, 60u8,
+                            169u8, 100u8, 162u8, 139u8, 205u8, 180u8, 92u8, 0u8, 110u8, 55u8,
+                            158u8,
                         ],
                     )
                 }
@@ -31520,28 +31933,24 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " Invariant:"]
                 #[doc = " - There are no channels that exists in list but not in the set and vice versa."]
-                pub fn hrmp_close_channel_requests(
+                pub fn hrmp_close_channel_requests_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<
-                        runtime_types::polkadot_parachain::primitives::HrmpChannelId,
-                    >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     (),
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Hrmp",
                         "HrmpCloseChannelRequests",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            222u8, 21u8, 62u8, 212u8, 4u8, 55u8, 189u8, 139u8, 18u8, 149u8, 225u8,
-                            39u8, 240u8, 220u8, 114u8, 154u8, 147u8, 90u8, 221u8, 126u8, 97u8,
-                            89u8, 167u8, 249u8, 121u8, 28u8, 211u8, 162u8, 0u8, 81u8, 110u8, 92u8,
+                            155u8, 13u8, 73u8, 166u8, 58u8, 67u8, 138u8, 58u8, 215u8, 172u8, 241u8,
+                            168u8, 57u8, 4u8, 230u8, 248u8, 31u8, 183u8, 227u8, 224u8, 139u8,
+                            172u8, 229u8, 228u8, 16u8, 120u8, 124u8, 81u8, 213u8, 253u8, 102u8,
+                            226u8,
                         ],
                     )
                 }
@@ -31552,23 +31961,29 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " Invariant:"]
                 #[doc = " - There are no channels that exists in list but not in the set and vice versa."]
-                pub fn hrmp_close_channel_requests_root(
+                pub fn hrmp_close_channel_requests(
                     &self,
+                    _0: impl ::std::borrow::Borrow<
+                        runtime_types::polkadot_parachain::primitives::HrmpChannelId,
+                    >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     (),
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Hrmp",
                         "HrmpCloseChannelRequests",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            222u8, 21u8, 62u8, 212u8, 4u8, 55u8, 189u8, 139u8, 18u8, 149u8, 225u8,
-                            39u8, 240u8, 220u8, 114u8, 154u8, 147u8, 90u8, 221u8, 126u8, 97u8,
-                            89u8, 167u8, 249u8, 121u8, 28u8, 211u8, 162u8, 0u8, 81u8, 110u8, 92u8,
+                            155u8, 13u8, 73u8, 166u8, 58u8, 67u8, 138u8, 58u8, 215u8, 172u8, 241u8,
+                            168u8, 57u8, 4u8, 230u8, 248u8, 31u8, 183u8, 227u8, 224u8, 139u8,
+                            172u8, 229u8, 228u8, 16u8, 120u8, 124u8, 81u8, 213u8, 253u8, 102u8,
+                            226u8,
                         ],
                     )
                 }
@@ -31586,111 +32001,111 @@ pub mod api {
                         "HrmpCloseChannelRequestsList",
                         vec![],
                         [
-                            2u8, 178u8, 121u8, 142u8, 49u8, 53u8, 187u8, 3u8, 175u8, 222u8, 199u8,
-                            112u8, 176u8, 131u8, 181u8, 184u8, 137u8, 89u8, 75u8, 90u8, 58u8, 18u8,
-                            244u8, 117u8, 106u8, 212u8, 16u8, 177u8, 9u8, 191u8, 109u8, 8u8,
+                            78u8, 194u8, 214u8, 232u8, 91u8, 72u8, 109u8, 113u8, 88u8, 86u8, 136u8,
+                            26u8, 226u8, 30u8, 11u8, 188u8, 57u8, 77u8, 169u8, 64u8, 14u8, 187u8,
+                            27u8, 127u8, 76u8, 99u8, 114u8, 73u8, 221u8, 23u8, 208u8, 69u8,
                         ],
                     )
                 }
                 #[doc = " The HRMP watermark associated with each para."]
                 #[doc = " Invariant:"]
                 #[doc = " - each para `P` used here as a key should satisfy `Paras::is_valid_para(P)` within a session."]
-                pub fn hrmp_watermarks(
+                pub fn hrmp_watermarks_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u32,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Hrmp",
                         "HrmpWatermarks",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            113u8, 182u8, 65u8, 193u8, 220u8, 173u8, 226u8, 222u8, 55u8, 149u8,
-                            141u8, 123u8, 120u8, 9u8, 181u8, 84u8, 169u8, 144u8, 51u8, 13u8, 56u8,
-                            217u8, 129u8, 37u8, 8u8, 57u8, 238u8, 168u8, 96u8, 98u8, 244u8, 84u8,
+                            245u8, 104u8, 137u8, 120u8, 131u8, 7u8, 178u8, 85u8, 96u8, 124u8,
+                            241u8, 2u8, 86u8, 63u8, 116u8, 77u8, 217u8, 235u8, 162u8, 38u8, 104u8,
+                            248u8, 121u8, 1u8, 111u8, 191u8, 191u8, 115u8, 65u8, 67u8, 2u8, 238u8,
                         ],
                     )
                 }
                 #[doc = " The HRMP watermark associated with each para."]
                 #[doc = " Invariant:"]
                 #[doc = " - each para `P` used here as a key should satisfy `Paras::is_valid_para(P)` within a session."]
-                pub fn hrmp_watermarks_root(
+                pub fn hrmp_watermarks(
                     &self,
+                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u32,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Hrmp",
                         "HrmpWatermarks",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            113u8, 182u8, 65u8, 193u8, 220u8, 173u8, 226u8, 222u8, 55u8, 149u8,
-                            141u8, 123u8, 120u8, 9u8, 181u8, 84u8, 169u8, 144u8, 51u8, 13u8, 56u8,
-                            217u8, 129u8, 37u8, 8u8, 57u8, 238u8, 168u8, 96u8, 98u8, 244u8, 84u8,
+                            245u8, 104u8, 137u8, 120u8, 131u8, 7u8, 178u8, 85u8, 96u8, 124u8,
+                            241u8, 2u8, 86u8, 63u8, 116u8, 77u8, 217u8, 235u8, 162u8, 38u8, 104u8,
+                            248u8, 121u8, 1u8, 111u8, 191u8, 191u8, 115u8, 65u8, 67u8, 2u8, 238u8,
                         ],
                     )
                 }
                 #[doc = " HRMP channel data associated with each para."]
                 #[doc = " Invariant:"]
                 #[doc = " - each participant in the channel should satisfy `Paras::is_valid_para(P)` within a session."]
-                pub fn hrmp_channels(
+                pub fn hrmp_channels_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<
-                        runtime_types::polkadot_parachain::primitives::HrmpChannelId,
-                    >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_runtime_parachains::hrmp::HrmpChannel,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Hrmp",
                         "HrmpChannels",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            84u8, 208u8, 8u8, 151u8, 246u8, 31u8, 147u8, 139u8, 85u8, 187u8, 58u8,
-                            179u8, 101u8, 191u8, 72u8, 231u8, 99u8, 160u8, 247u8, 243u8, 114u8,
-                            170u8, 179u8, 82u8, 84u8, 130u8, 165u8, 57u8, 236u8, 156u8, 170u8,
-                            228u8,
+                            174u8, 90u8, 72u8, 93u8, 43u8, 140u8, 181u8, 170u8, 138u8, 171u8,
+                            179u8, 156u8, 33u8, 87u8, 63u8, 1u8, 131u8, 59u8, 230u8, 14u8, 40u8,
+                            240u8, 186u8, 66u8, 191u8, 130u8, 48u8, 218u8, 225u8, 22u8, 33u8,
+                            122u8,
                         ],
                     )
                 }
                 #[doc = " HRMP channel data associated with each para."]
                 #[doc = " Invariant:"]
                 #[doc = " - each participant in the channel should satisfy `Paras::is_valid_para(P)` within a session."]
-                pub fn hrmp_channels_root(
+                pub fn hrmp_channels(
                     &self,
+                    _0: impl ::std::borrow::Borrow<
+                        runtime_types::polkadot_parachain::primitives::HrmpChannelId,
+                    >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_runtime_parachains::hrmp::HrmpChannel,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Hrmp",
                         "HrmpChannels",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            84u8, 208u8, 8u8, 151u8, 246u8, 31u8, 147u8, 139u8, 85u8, 187u8, 58u8,
-                            179u8, 101u8, 191u8, 72u8, 231u8, 99u8, 160u8, 247u8, 243u8, 114u8,
-                            170u8, 179u8, 82u8, 84u8, 130u8, 165u8, 57u8, 236u8, 156u8, 170u8,
-                            228u8,
+                            174u8, 90u8, 72u8, 93u8, 43u8, 140u8, 181u8, 170u8, 138u8, 171u8,
+                            179u8, 156u8, 33u8, 87u8, 63u8, 1u8, 131u8, 59u8, 230u8, 14u8, 40u8,
+                            240u8, 186u8, 66u8, 191u8, 130u8, 48u8, 218u8, 225u8, 22u8, 33u8,
+                            122u8,
                         ],
                     )
                 }
@@ -31707,27 +32122,24 @@ pub mod api {
                 #[doc = "   `HrmpChannels` as `(P, E)`."]
                 #[doc = " - there should be no other dangling channels in `HrmpChannels`."]
                 #[doc = " - the vectors are sorted."]
-                pub fn hrmp_ingress_channels_index(
+                pub fn hrmp_ingress_channels_index_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::std::vec::Vec<runtime_types::polkadot_parachain::primitives::Id>,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Hrmp",
                         "HrmpIngressChannelsIndex",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            214u8, 227u8, 150u8, 67u8, 44u8, 17u8, 184u8, 156u8, 126u8, 112u8,
-                            22u8, 254u8, 174u8, 133u8, 110u8, 126u8, 189u8, 169u8, 191u8, 236u8,
-                            139u8, 57u8, 236u8, 84u8, 102u8, 171u8, 167u8, 26u8, 42u8, 16u8, 29u8,
-                            203u8,
+                            125u8, 229u8, 102u8, 230u8, 74u8, 109u8, 173u8, 67u8, 176u8, 169u8,
+                            57u8, 24u8, 75u8, 129u8, 246u8, 198u8, 63u8, 49u8, 56u8, 102u8, 149u8,
+                            139u8, 138u8, 207u8, 150u8, 220u8, 29u8, 208u8, 203u8, 0u8, 93u8,
+                            105u8,
                         ],
                     )
                 }
@@ -31744,79 +32156,77 @@ pub mod api {
                 #[doc = "   `HrmpChannels` as `(P, E)`."]
                 #[doc = " - there should be no other dangling channels in `HrmpChannels`."]
                 #[doc = " - the vectors are sorted."]
-                pub fn hrmp_ingress_channels_index_root(
+                pub fn hrmp_ingress_channels_index(
                     &self,
+                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::std::vec::Vec<runtime_types::polkadot_parachain::primitives::Id>,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Hrmp",
                         "HrmpIngressChannelsIndex",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            214u8, 227u8, 150u8, 67u8, 44u8, 17u8, 184u8, 156u8, 126u8, 112u8,
-                            22u8, 254u8, 174u8, 133u8, 110u8, 126u8, 189u8, 169u8, 191u8, 236u8,
-                            139u8, 57u8, 236u8, 84u8, 102u8, 171u8, 167u8, 26u8, 42u8, 16u8, 29u8,
-                            203u8,
+                            125u8, 229u8, 102u8, 230u8, 74u8, 109u8, 173u8, 67u8, 176u8, 169u8,
+                            57u8, 24u8, 75u8, 129u8, 246u8, 198u8, 63u8, 49u8, 56u8, 102u8, 149u8,
+                            139u8, 138u8, 207u8, 150u8, 220u8, 29u8, 208u8, 203u8, 0u8, 93u8,
+                            105u8,
                         ],
                     )
                 }
-                pub fn hrmp_egress_channels_index(
+                pub fn hrmp_egress_channels_index_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::std::vec::Vec<runtime_types::polkadot_parachain::primitives::Id>,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Hrmp",
                         "HrmpEgressChannelsIndex",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            170u8, 166u8, 34u8, 79u8, 110u8, 228u8, 62u8, 128u8, 3u8, 69u8, 212u8,
-                            42u8, 9u8, 145u8, 161u8, 232u8, 103u8, 182u8, 165u8, 103u8, 228u8,
-                            178u8, 122u8, 140u8, 255u8, 255u8, 246u8, 61u8, 220u8, 210u8, 101u8,
-                            46u8,
+                            237u8, 183u8, 188u8, 57u8, 20u8, 238u8, 166u8, 7u8, 94u8, 155u8, 22u8,
+                            9u8, 173u8, 209u8, 210u8, 17u8, 160u8, 79u8, 243u8, 4u8, 245u8, 240u8,
+                            65u8, 195u8, 116u8, 98u8, 206u8, 104u8, 53u8, 64u8, 241u8, 41u8,
                         ],
                     )
                 }
-                pub fn hrmp_egress_channels_index_root(
+                pub fn hrmp_egress_channels_index(
                     &self,
+                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::std::vec::Vec<runtime_types::polkadot_parachain::primitives::Id>,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Hrmp",
                         "HrmpEgressChannelsIndex",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            170u8, 166u8, 34u8, 79u8, 110u8, 228u8, 62u8, 128u8, 3u8, 69u8, 212u8,
-                            42u8, 9u8, 145u8, 161u8, 232u8, 103u8, 182u8, 165u8, 103u8, 228u8,
-                            178u8, 122u8, 140u8, 255u8, 255u8, 246u8, 61u8, 220u8, 210u8, 101u8,
-                            46u8,
+                            237u8, 183u8, 188u8, 57u8, 20u8, 238u8, 166u8, 7u8, 94u8, 155u8, 22u8,
+                            9u8, 173u8, 209u8, 210u8, 17u8, 160u8, 79u8, 243u8, 4u8, 245u8, 240u8,
+                            65u8, 195u8, 116u8, 98u8, 206u8, 104u8, 53u8, 64u8, 241u8, 41u8,
                         ],
                     )
                 }
                 #[doc = " Storage for the messages for each channel."]
                 #[doc = " Invariant: cannot be non-empty if the corresponding channel in `HrmpChannels` is `None`."]
-                pub fn hrmp_channel_contents(
+                pub fn hrmp_channel_contents_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<
-                        runtime_types::polkadot_parachain::primitives::HrmpChannelId,
-                    >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::std::vec::Vec<
@@ -31824,27 +32234,29 @@ pub mod api {
                             ::core::primitive::u32,
                         >,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Hrmp",
                         "HrmpChannelContents",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            255u8, 161u8, 150u8, 115u8, 50u8, 192u8, 25u8, 120u8, 56u8, 166u8,
-                            131u8, 174u8, 58u8, 200u8, 45u8, 80u8, 9u8, 99u8, 238u8, 49u8, 27u8,
-                            139u8, 95u8, 246u8, 203u8, 3u8, 22u8, 152u8, 30u8, 243u8, 41u8, 90u8,
+                            55u8, 16u8, 135u8, 69u8, 54u8, 180u8, 246u8, 124u8, 104u8, 92u8, 45u8,
+                            18u8, 223u8, 145u8, 43u8, 190u8, 121u8, 59u8, 35u8, 195u8, 234u8,
+                            219u8, 30u8, 246u8, 168u8, 187u8, 45u8, 171u8, 254u8, 204u8, 60u8,
+                            121u8,
                         ],
                     )
                 }
                 #[doc = " Storage for the messages for each channel."]
                 #[doc = " Invariant: cannot be non-empty if the corresponding channel in `HrmpChannels` is `None`."]
-                pub fn hrmp_channel_contents_root(
+                pub fn hrmp_channel_contents(
                     &self,
+                    _0: impl ::std::borrow::Borrow<
+                        runtime_types::polkadot_parachain::primitives::HrmpChannelId,
+                    >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::std::vec::Vec<
@@ -31852,18 +32264,21 @@ pub mod api {
                             ::core::primitive::u32,
                         >,
                     >,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Hrmp",
                         "HrmpChannelContents",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            255u8, 161u8, 150u8, 115u8, 50u8, 192u8, 25u8, 120u8, 56u8, 166u8,
-                            131u8, 174u8, 58u8, 200u8, 45u8, 80u8, 9u8, 99u8, 238u8, 49u8, 27u8,
-                            139u8, 95u8, 246u8, 203u8, 3u8, 22u8, 152u8, 30u8, 243u8, 41u8, 90u8,
+                            55u8, 16u8, 135u8, 69u8, 54u8, 180u8, 246u8, 124u8, 104u8, 92u8, 45u8,
+                            18u8, 223u8, 145u8, 43u8, 190u8, 121u8, 59u8, 35u8, 195u8, 234u8,
+                            219u8, 30u8, 246u8, 168u8, 187u8, 45u8, 171u8, 254u8, 204u8, 60u8,
+                            121u8,
                         ],
                     )
                 }
@@ -31873,29 +32288,26 @@ pub mod api {
                 #[doc = " - The inner `Vec<ParaId>` cannot store two same `ParaId`."]
                 #[doc = " - The outer vector is sorted ascending by block number and cannot store two items with the"]
                 #[doc = "   same block number."]
-                pub fn hrmp_channel_digests(
+                pub fn hrmp_channel_digests_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::std::vec::Vec<(
                         ::core::primitive::u32,
                         ::std::vec::Vec<runtime_types::polkadot_parachain::primitives::Id>,
                     )>,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Hrmp",
                         "HrmpChannelDigests",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            87u8, 180u8, 240u8, 237u8, 245u8, 101u8, 209u8, 126u8, 57u8, 116u8,
-                            158u8, 38u8, 139u8, 76u8, 172u8, 94u8, 232u8, 149u8, 68u8, 67u8, 25u8,
-                            131u8, 18u8, 202u8, 159u8, 143u8, 222u8, 243u8, 4u8, 84u8, 24u8, 8u8,
+                            90u8, 90u8, 139u8, 78u8, 47u8, 2u8, 104u8, 211u8, 42u8, 246u8, 193u8,
+                            210u8, 142u8, 223u8, 17u8, 136u8, 3u8, 182u8, 25u8, 56u8, 72u8, 72u8,
+                            162u8, 131u8, 36u8, 34u8, 162u8, 176u8, 159u8, 113u8, 7u8, 207u8,
                         ],
                     )
                 }
@@ -31905,26 +32317,29 @@ pub mod api {
                 #[doc = " - The inner `Vec<ParaId>` cannot store two same `ParaId`."]
                 #[doc = " - The outer vector is sorted ascending by block number and cannot store two items with the"]
                 #[doc = "   same block number."]
-                pub fn hrmp_channel_digests_root(
+                pub fn hrmp_channel_digests(
                     &self,
+                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::std::vec::Vec<(
                         ::core::primitive::u32,
                         ::std::vec::Vec<runtime_types::polkadot_parachain::primitives::Id>,
                     )>,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Hrmp",
                         "HrmpChannelDigests",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            87u8, 180u8, 240u8, 237u8, 245u8, 101u8, 209u8, 126u8, 57u8, 116u8,
-                            158u8, 38u8, 139u8, 76u8, 172u8, 94u8, 232u8, 149u8, 68u8, 67u8, 25u8,
-                            131u8, 18u8, 202u8, 159u8, 143u8, 222u8, 243u8, 4u8, 84u8, 24u8, 8u8,
+                            90u8, 90u8, 139u8, 78u8, 47u8, 2u8, 104u8, 211u8, 42u8, 246u8, 193u8,
+                            210u8, 142u8, 223u8, 17u8, 136u8, 3u8, 182u8, 25u8, 56u8, 72u8, 72u8,
+                            162u8, 131u8, 36u8, 34u8, 162u8, 176u8, 159u8, 113u8, 7u8, 207u8,
                         ],
                     )
                 }
@@ -31985,69 +32400,68 @@ pub mod api {
                 #[doc = " Session information in a rolling window."]
                 #[doc = " Should have an entry in range `EarliestStoredSession..=CurrentSessionIndex`."]
                 #[doc = " Does not have any entries before the session index in the first session change notification."]
-                pub fn sessions(
+                pub fn sessions_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_primitives::v5::SessionInfo,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ParaSessionInfo",
                         "Sessions",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            81u8, 113u8, 231u8, 59u8, 121u8, 0u8, 152u8, 106u8, 38u8, 173u8, 219u8,
-                            186u8, 98u8, 164u8, 31u8, 64u8, 156u8, 185u8, 33u8, 249u8, 193u8,
-                            185u8, 120u8, 67u8, 146u8, 33u8, 16u8, 29u8, 50u8, 158u8, 75u8, 106u8,
+                            254u8, 40u8, 169u8, 18u8, 252u8, 203u8, 49u8, 182u8, 123u8, 19u8,
+                            241u8, 150u8, 227u8, 153u8, 108u8, 109u8, 66u8, 129u8, 157u8, 27u8,
+                            130u8, 215u8, 105u8, 18u8, 163u8, 72u8, 182u8, 243u8, 31u8, 157u8,
+                            103u8, 111u8,
                         ],
                     )
                 }
                 #[doc = " Session information in a rolling window."]
                 #[doc = " Should have an entry in range `EarliestStoredSession..=CurrentSessionIndex`."]
                 #[doc = " Does not have any entries before the session index in the first session change notification."]
-                pub fn sessions_root(
+                pub fn sessions(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_primitives::v5::SessionInfo,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ParaSessionInfo",
                         "Sessions",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            81u8, 113u8, 231u8, 59u8, 121u8, 0u8, 152u8, 106u8, 38u8, 173u8, 219u8,
-                            186u8, 98u8, 164u8, 31u8, 64u8, 156u8, 185u8, 33u8, 249u8, 193u8,
-                            185u8, 120u8, 67u8, 146u8, 33u8, 16u8, 29u8, 50u8, 158u8, 75u8, 106u8,
+                            254u8, 40u8, 169u8, 18u8, 252u8, 203u8, 49u8, 182u8, 123u8, 19u8,
+                            241u8, 150u8, 227u8, 153u8, 108u8, 109u8, 66u8, 129u8, 157u8, 27u8,
+                            130u8, 215u8, 105u8, 18u8, 163u8, 72u8, 182u8, 243u8, 31u8, 157u8,
+                            103u8, 111u8,
                         ],
                     )
                 }
                 #[doc = " The validator account keys of the validators actively participating in parachain consensus."]
-                pub fn account_keys(
+                pub fn account_keys_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::std::vec::Vec<::subxt::utils::AccountId32>,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ParaSessionInfo",
                         "AccountKeys",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             30u8, 98u8, 58u8, 140u8, 96u8, 231u8, 205u8, 111u8, 194u8, 100u8,
                             185u8, 242u8, 210u8, 143u8, 110u8, 144u8, 170u8, 187u8, 62u8, 196u8,
@@ -32057,19 +32471,22 @@ pub mod api {
                     )
                 }
                 #[doc = " The validator account keys of the validators actively participating in parachain consensus."]
-                pub fn account_keys_root(
+                pub fn account_keys(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::std::vec::Vec<::subxt::utils::AccountId32>,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ParaSessionInfo",
                         "AccountKeys",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             30u8, 98u8, 58u8, 140u8, 96u8, 231u8, 205u8, 111u8, 194u8, 100u8,
                             185u8, 242u8, 210u8, 143u8, 110u8, 144u8, 170u8, 187u8, 62u8, 196u8,
@@ -32079,47 +32496,49 @@ pub mod api {
                     )
                 }
                 #[doc = " Executor parameter set for a given session index"]
-                pub fn session_executor_params(
+                pub fn session_executor_params_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_primitives::v5::executor_params::ExecutorParams,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ParaSessionInfo",
                         "SessionExecutorParams",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            157u8, 157u8, 106u8, 251u8, 26u8, 102u8, 210u8, 194u8, 203u8, 167u8,
-                            231u8, 176u8, 93u8, 83u8, 214u8, 57u8, 15u8, 235u8, 74u8, 191u8, 131u8,
-                            143u8, 243u8, 171u8, 54u8, 16u8, 137u8, 185u8, 96u8, 46u8, 123u8, 57u8,
+                            102u8, 51u8, 28u8, 199u8, 238u8, 229u8, 99u8, 38u8, 116u8, 154u8,
+                            250u8, 136u8, 240u8, 122u8, 82u8, 13u8, 139u8, 160u8, 149u8, 218u8,
+                            162u8, 130u8, 109u8, 251u8, 10u8, 109u8, 200u8, 158u8, 32u8, 157u8,
+                            84u8, 234u8,
                         ],
                     )
                 }
                 #[doc = " Executor parameter set for a given session index"]
-                pub fn session_executor_params_root(
+                pub fn session_executor_params(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_primitives::v5::executor_params::ExecutorParams,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ParaSessionInfo",
                         "SessionExecutorParams",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            157u8, 157u8, 106u8, 251u8, 26u8, 102u8, 210u8, 194u8, 203u8, 167u8,
-                            231u8, 176u8, 93u8, 83u8, 214u8, 57u8, 15u8, 235u8, 74u8, 191u8, 131u8,
-                            143u8, 243u8, 171u8, 54u8, 16u8, 137u8, 185u8, 96u8, 46u8, 123u8, 57u8,
+                            102u8, 51u8, 28u8, 199u8, 238u8, 229u8, 99u8, 38u8, 116u8, 154u8,
+                            250u8, 136u8, 240u8, 122u8, 82u8, 13u8, 139u8, 160u8, 149u8, 218u8,
+                            162u8, 130u8, 109u8, 251u8, 10u8, 109u8, 200u8, 158u8, 32u8, 157u8,
+                            84u8, 234u8,
                         ],
                     )
                 }
@@ -32264,6 +32683,53 @@ pub mod api {
                     )
                 }
                 #[doc = " All ongoing or concluded disputes for the last several sessions."]
+                pub fn disputes_iter(
+                    &self,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    runtime_types::polkadot_primitives::v5::DisputeState<::core::primitive::u32>,
+                    (),
+                    (),
+                    ::subxt::storage::address::Yes,
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "ParasDisputes",
+                        "Disputes",
+                        vec![],
+                        [
+                            38u8, 237u8, 141u8, 222u8, 135u8, 82u8, 210u8, 166u8, 192u8, 122u8,
+                            175u8, 96u8, 91u8, 1u8, 225u8, 182u8, 128u8, 4u8, 159u8, 56u8, 180u8,
+                            176u8, 157u8, 20u8, 105u8, 202u8, 192u8, 213u8, 164u8, 24u8, 227u8,
+                            15u8,
+                        ],
+                    )
+                }
+                #[doc = " All ongoing or concluded disputes for the last several sessions."]
+                pub fn disputes_iter1(
+                    &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    runtime_types::polkadot_primitives::v5::DisputeState<::core::primitive::u32>,
+                    (),
+                    (),
+                    ::subxt::storage::address::Yes,
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "ParasDisputes",
+                        "Disputes",
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
+                        [
+                            38u8, 237u8, 141u8, 222u8, 135u8, 82u8, 210u8, 166u8, 192u8, 122u8,
+                            175u8, 96u8, 91u8, 1u8, 225u8, 182u8, 128u8, 4u8, 159u8, 56u8, 180u8,
+                            176u8, 157u8, 20u8, 105u8, 202u8, 192u8, 213u8, 164u8, 24u8, 227u8,
+                            15u8,
+                        ],
+                    )
+                }
+                #[doc = " All ongoing or concluded disputes for the last several sessions."]
                 pub fn disputes(
                     &self,
                     _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
@@ -32275,7 +32741,7 @@ pub mod api {
                     runtime_types::polkadot_primitives::v5::DisputeState<::core::primitive::u32>,
                     ::subxt::storage::address::Yes,
                     (),
-                    ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ParasDisputes",
@@ -32285,32 +32751,59 @@ pub mod api {
                             ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
                         ],
                         [
-                            238u8, 133u8, 13u8, 247u8, 199u8, 82u8, 60u8, 30u8, 124u8, 64u8, 52u8,
-                            136u8, 173u8, 44u8, 147u8, 10u8, 188u8, 12u8, 50u8, 141u8, 126u8,
-                            112u8, 177u8, 75u8, 78u8, 102u8, 189u8, 234u8, 142u8, 210u8, 6u8,
-                            129u8,
+                            38u8, 237u8, 141u8, 222u8, 135u8, 82u8, 210u8, 166u8, 192u8, 122u8,
+                            175u8, 96u8, 91u8, 1u8, 225u8, 182u8, 128u8, 4u8, 159u8, 56u8, 180u8,
+                            176u8, 157u8, 20u8, 105u8, 202u8, 192u8, 213u8, 164u8, 24u8, 227u8,
+                            15u8,
                         ],
                     )
                 }
-                #[doc = " All ongoing or concluded disputes for the last several sessions."]
-                pub fn disputes_root(
+                #[doc = " Backing votes stored for each dispute."]
+                #[doc = " This storage is used for slashing."]
+                pub fn backers_on_disputes_iter(
                     &self,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
-                    runtime_types::polkadot_primitives::v5::DisputeState<::core::primitive::u32>,
+                    ::std::vec::Vec<runtime_types::polkadot_primitives::v5::ValidatorIndex>,
                     (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ParasDisputes",
-                        "Disputes",
-                        Vec::new(),
+                        "BackersOnDisputes",
+                        vec![],
                         [
-                            238u8, 133u8, 13u8, 247u8, 199u8, 82u8, 60u8, 30u8, 124u8, 64u8, 52u8,
-                            136u8, 173u8, 44u8, 147u8, 10u8, 188u8, 12u8, 50u8, 141u8, 126u8,
-                            112u8, 177u8, 75u8, 78u8, 102u8, 189u8, 234u8, 142u8, 210u8, 6u8,
-                            129u8,
+                            136u8, 171u8, 20u8, 204u8, 135u8, 153u8, 144u8, 241u8, 46u8, 193u8,
+                            65u8, 22u8, 116u8, 161u8, 144u8, 186u8, 31u8, 194u8, 202u8, 225u8,
+                            14u8, 137u8, 240u8, 243u8, 119u8, 144u8, 102u8, 245u8, 133u8, 126u8,
+                            103u8, 32u8,
+                        ],
+                    )
+                }
+                #[doc = " Backing votes stored for each dispute."]
+                #[doc = " This storage is used for slashing."]
+                pub fn backers_on_disputes_iter1(
+                    &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    ::std::vec::Vec<runtime_types::polkadot_primitives::v5::ValidatorIndex>,
+                    (),
+                    (),
+                    ::subxt::storage::address::Yes,
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "ParasDisputes",
+                        "BackersOnDisputes",
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
+                        [
+                            136u8, 171u8, 20u8, 204u8, 135u8, 153u8, 144u8, 241u8, 46u8, 193u8,
+                            65u8, 22u8, 116u8, 161u8, 144u8, 186u8, 31u8, 194u8, 202u8, 225u8,
+                            14u8, 137u8, 240u8, 243u8, 119u8, 144u8, 102u8, 245u8, 133u8, 126u8,
+                            103u8, 32u8,
                         ],
                     )
                 }
@@ -32327,7 +32820,7 @@ pub mod api {
                     ::std::vec::Vec<runtime_types::polkadot_primitives::v5::ValidatorIndex>,
                     ::subxt::storage::address::Yes,
                     (),
-                    ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ParasDisputes",
@@ -32337,86 +32830,89 @@ pub mod api {
                             ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
                         ],
                         [
-                            39u8, 198u8, 10u8, 24u8, 189u8, 43u8, 44u8, 58u8, 52u8, 40u8, 112u8,
-                            131u8, 69u8, 142u8, 12u8, 136u8, 111u8, 160u8, 177u8, 89u8, 150u8,
-                            246u8, 10u8, 174u8, 103u8, 192u8, 19u8, 72u8, 152u8, 246u8, 125u8,
-                            184u8,
+                            136u8, 171u8, 20u8, 204u8, 135u8, 153u8, 144u8, 241u8, 46u8, 193u8,
+                            65u8, 22u8, 116u8, 161u8, 144u8, 186u8, 31u8, 194u8, 202u8, 225u8,
+                            14u8, 137u8, 240u8, 243u8, 119u8, 144u8, 102u8, 245u8, 133u8, 126u8,
+                            103u8, 32u8,
                         ],
                     )
                 }
-                #[doc = " Backing votes stored for each dispute."]
-                #[doc = " This storage is used for slashing."]
-                pub fn backers_on_disputes_root(
+                #[doc = " All included blocks on the chain, as well as the block number in this chain that"]
+                #[doc = " should be reverted back to if the candidate is disputed and determined to be invalid."]
+                pub fn included_iter(
                     &self,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
-                    ::std::vec::Vec<runtime_types::polkadot_primitives::v5::ValidatorIndex>,
+                    ::core::primitive::u32,
                     (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ParasDisputes",
-                        "BackersOnDisputes",
-                        Vec::new(),
+                        "Included",
+                        vec![],
                         [
-                            39u8, 198u8, 10u8, 24u8, 189u8, 43u8, 44u8, 58u8, 52u8, 40u8, 112u8,
-                            131u8, 69u8, 142u8, 12u8, 136u8, 111u8, 160u8, 177u8, 89u8, 150u8,
-                            246u8, 10u8, 174u8, 103u8, 192u8, 19u8, 72u8, 152u8, 246u8, 125u8,
-                            184u8,
+                            47u8, 105u8, 189u8, 233u8, 206u8, 153u8, 162u8, 217u8, 141u8, 118u8,
+                            31u8, 85u8, 87u8, 53u8, 100u8, 187u8, 31u8, 245u8, 50u8, 171u8, 4u8,
+                            203u8, 163u8, 109u8, 212u8, 162u8, 86u8, 124u8, 172u8, 157u8, 165u8,
+                            21u8,
                         ],
                     )
                 }
                 #[doc = " All included blocks on the chain, as well as the block number in this chain that"]
                 #[doc = " should be reverted back to if the candidate is disputed and determined to be invalid."]
-                pub fn included(
+                pub fn included_iter1(
                     &self,
                     _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
-                    _1: impl ::std::borrow::Borrow<
-                        runtime_types::polkadot_core_primitives::CandidateHash,
-                    >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u32,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ParasDisputes",
                         "Included",
-                        vec![
-                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
-                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
-                        ],
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            25u8, 214u8, 24u8, 25u8, 177u8, 63u8, 232u8, 169u8, 137u8, 37u8, 254u8,
-                            237u8, 164u8, 181u8, 71u8, 233u8, 36u8, 250u8, 184u8, 121u8, 31u8,
-                            143u8, 199u8, 57u8, 164u8, 190u8, 24u8, 30u8, 178u8, 232u8, 207u8,
-                            248u8,
+                            47u8, 105u8, 189u8, 233u8, 206u8, 153u8, 162u8, 217u8, 141u8, 118u8,
+                            31u8, 85u8, 87u8, 53u8, 100u8, 187u8, 31u8, 245u8, 50u8, 171u8, 4u8,
+                            203u8, 163u8, 109u8, 212u8, 162u8, 86u8, 124u8, 172u8, 157u8, 165u8,
+                            21u8,
                         ],
                     )
                 }
                 #[doc = " All included blocks on the chain, as well as the block number in this chain that"]
                 #[doc = " should be reverted back to if the candidate is disputed and determined to be invalid."]
-                pub fn included_root(
+                pub fn included(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
+                    _1: impl ::std::borrow::Borrow<
+                        runtime_types::polkadot_core_primitives::CandidateHash,
+                    >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u32,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ParasDisputes",
                         "Included",
-                        Vec::new(),
+                        vec![
+                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
+                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
+                        ],
                         [
-                            25u8, 214u8, 24u8, 25u8, 177u8, 63u8, 232u8, 169u8, 137u8, 37u8, 254u8,
-                            237u8, 164u8, 181u8, 71u8, 233u8, 36u8, 250u8, 184u8, 121u8, 31u8,
-                            143u8, 199u8, 57u8, 164u8, 190u8, 24u8, 30u8, 178u8, 232u8, 207u8,
-                            248u8,
+                            47u8, 105u8, 189u8, 233u8, 206u8, 153u8, 162u8, 217u8, 141u8, 118u8,
+                            31u8, 85u8, 87u8, 53u8, 100u8, 187u8, 31u8, 245u8, 50u8, 171u8, 4u8,
+                            203u8, 163u8, 109u8, 212u8, 162u8, 86u8, 124u8, 172u8, 157u8, 165u8,
+                            21u8,
                         ],
                     )
                 }
@@ -32499,10 +32995,10 @@ pub mod api {
                             key_owner_proof,
                         },
                         [
-                            141u8, 19u8, 126u8, 209u8, 239u8, 179u8, 5u8, 160u8, 152u8, 138u8,
-                            71u8, 100u8, 191u8, 96u8, 188u8, 50u8, 231u8, 175u8, 6u8, 222u8, 231u8,
-                            75u8, 186u8, 217u8, 143u8, 140u8, 31u8, 220u8, 120u8, 21u8, 82u8,
-                            227u8,
+                            57u8, 99u8, 246u8, 126u8, 203u8, 239u8, 64u8, 182u8, 167u8, 204u8,
+                            96u8, 221u8, 126u8, 94u8, 254u8, 210u8, 18u8, 182u8, 207u8, 32u8,
+                            250u8, 249u8, 116u8, 156u8, 210u8, 63u8, 254u8, 74u8, 86u8, 101u8,
+                            28u8, 229u8,
                         ],
                     )
                 }
@@ -32513,37 +33009,31 @@ pub mod api {
             pub struct StorageApi;
             impl StorageApi {
                 #[doc = " Validators pending dispute slashes."]
-                pub fn unapplied_slashes(
+                pub fn unapplied_slashes_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
-                    _1: impl ::std::borrow::Borrow<
-                        runtime_types::polkadot_core_primitives::CandidateHash,
-                    >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_primitives::v5::slashing::PendingSlashes,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ParasSlashing",
                         "UnappliedSlashes",
-                        vec![
-                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
-                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
-                        ],
+                        vec![],
                         [
-                            40u8, 98u8, 183u8, 200u8, 117u8, 36u8, 247u8, 120u8, 56u8, 127u8,
-                            121u8, 166u8, 176u8, 146u8, 247u8, 90u8, 143u8, 49u8, 144u8, 10u8,
-                            103u8, 49u8, 222u8, 206u8, 230u8, 84u8, 116u8, 72u8, 191u8, 86u8,
-                            243u8, 51u8,
+                            114u8, 171u8, 137u8, 142u8, 180u8, 125u8, 226u8, 240u8, 99u8, 181u8,
+                            68u8, 221u8, 91u8, 124u8, 172u8, 93u8, 103u8, 12u8, 95u8, 43u8, 67u8,
+                            59u8, 29u8, 133u8, 140u8, 17u8, 141u8, 228u8, 145u8, 201u8, 82u8,
+                            126u8,
                         ],
                     )
                 }
                 #[doc = " Validators pending dispute slashes."]
-                pub fn unapplied_slashes_root(
+                pub fn unapplied_slashes_iter1(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_primitives::v5::slashing::PendingSlashes,
@@ -32554,57 +33044,88 @@ pub mod api {
                     ::subxt::storage::address::Address::new_static(
                         "ParasSlashing",
                         "UnappliedSlashes",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            40u8, 98u8, 183u8, 200u8, 117u8, 36u8, 247u8, 120u8, 56u8, 127u8,
-                            121u8, 166u8, 176u8, 146u8, 247u8, 90u8, 143u8, 49u8, 144u8, 10u8,
-                            103u8, 49u8, 222u8, 206u8, 230u8, 84u8, 116u8, 72u8, 191u8, 86u8,
-                            243u8, 51u8,
+                            114u8, 171u8, 137u8, 142u8, 180u8, 125u8, 226u8, 240u8, 99u8, 181u8,
+                            68u8, 221u8, 91u8, 124u8, 172u8, 93u8, 103u8, 12u8, 95u8, 43u8, 67u8,
+                            59u8, 29u8, 133u8, 140u8, 17u8, 141u8, 228u8, 145u8, 201u8, 82u8,
+                            126u8,
                         ],
                     )
                 }
-                #[doc = " `ValidatorSetCount` per session."]
-                pub fn validator_set_counts(
+                #[doc = " Validators pending dispute slashes."]
+                pub fn unapplied_slashes(
                     &self,
                     _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
+                    _1: impl ::std::borrow::Borrow<
+                        runtime_types::polkadot_core_primitives::CandidateHash,
+                    >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
-                    ::core::primitive::u32,
+                    runtime_types::polkadot_primitives::v5::slashing::PendingSlashes,
                     ::subxt::storage::address::Yes,
                     (),
+                    (),
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "ParasSlashing",
+                        "UnappliedSlashes",
+                        vec![
+                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
+                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
+                        ],
+                        [
+                            114u8, 171u8, 137u8, 142u8, 180u8, 125u8, 226u8, 240u8, 99u8, 181u8,
+                            68u8, 221u8, 91u8, 124u8, 172u8, 93u8, 103u8, 12u8, 95u8, 43u8, 67u8,
+                            59u8, 29u8, 133u8, 140u8, 17u8, 141u8, 228u8, 145u8, 201u8, 82u8,
+                            126u8,
+                        ],
+                    )
+                }
+                #[doc = " `ValidatorSetCount` per session."]
+                pub fn validator_set_counts_iter(
+                    &self,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    ::core::primitive::u32,
+                    (),
+                    (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ParasSlashing",
                         "ValidatorSetCounts",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            126u8, 203u8, 18u8, 78u8, 43u8, 170u8, 59u8, 232u8, 218u8, 64u8, 142u8,
-                            73u8, 236u8, 71u8, 248u8, 113u8, 109u8, 1u8, 66u8, 114u8, 200u8, 233u8,
-                            227u8, 174u8, 20u8, 14u8, 217u8, 78u8, 103u8, 119u8, 78u8, 125u8,
+                            195u8, 220u8, 79u8, 140u8, 114u8, 80u8, 241u8, 103u8, 4u8, 7u8, 53u8,
+                            100u8, 16u8, 78u8, 104u8, 171u8, 134u8, 110u8, 158u8, 191u8, 37u8,
+                            94u8, 211u8, 26u8, 17u8, 70u8, 50u8, 34u8, 70u8, 234u8, 186u8, 69u8,
                         ],
                     )
                 }
                 #[doc = " `ValidatorSetCount` per session."]
-                pub fn validator_set_counts_root(
+                pub fn validator_set_counts(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u32,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "ParasSlashing",
                         "ValidatorSetCounts",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            126u8, 203u8, 18u8, 78u8, 43u8, 170u8, 59u8, 232u8, 218u8, 64u8, 142u8,
-                            73u8, 236u8, 71u8, 248u8, 113u8, 109u8, 1u8, 66u8, 114u8, 200u8, 233u8,
-                            227u8, 174u8, 20u8, 14u8, 217u8, 78u8, 103u8, 119u8, 78u8, 125u8,
+                            195u8, 220u8, 79u8, 140u8, 114u8, 80u8, 241u8, 103u8, 4u8, 7u8, 53u8,
+                            100u8, 16u8, 78u8, 104u8, 171u8, 134u8, 110u8, 158u8, 191u8, 37u8,
+                            94u8, 211u8, 26u8, 17u8, 70u8, 50u8, 34u8, 70u8, 234u8, 186u8, 69u8,
                         ],
                     )
                 }
@@ -32805,9 +33326,9 @@ pub mod api {
                             validation_code,
                         },
                         [
-                            65u8, 80u8, 86u8, 147u8, 121u8, 86u8, 48u8, 255u8, 59u8, 10u8, 61u8,
-                            20u8, 89u8, 146u8, 7u8, 25u8, 64u8, 18u8, 102u8, 147u8, 207u8, 203u8,
-                            45u8, 113u8, 219u8, 251u8, 188u8, 159u8, 244u8, 27u8, 90u8, 243u8,
+                            208u8, 1u8, 38u8, 95u8, 53u8, 67u8, 148u8, 138u8, 189u8, 212u8, 250u8,
+                            160u8, 99u8, 220u8, 231u8, 55u8, 220u8, 21u8, 188u8, 81u8, 162u8,
+                            219u8, 93u8, 136u8, 255u8, 22u8, 5u8, 147u8, 40u8, 46u8, 141u8, 77u8,
                         ],
                     )
                 }
@@ -32831,9 +33352,10 @@ pub mod api {
                             validation_code,
                         },
                         [
-                            75u8, 101u8, 38u8, 63u8, 231u8, 89u8, 241u8, 165u8, 151u8, 93u8, 187u8,
-                            66u8, 156u8, 181u8, 5u8, 204u8, 116u8, 63u8, 176u8, 215u8, 156u8,
-                            152u8, 254u8, 80u8, 196u8, 171u8, 57u8, 121u8, 92u8, 14u8, 61u8, 9u8,
+                            73u8, 118u8, 161u8, 95u8, 234u8, 106u8, 174u8, 143u8, 34u8, 235u8,
+                            140u8, 166u8, 210u8, 101u8, 53u8, 191u8, 194u8, 17u8, 189u8, 187u8,
+                            86u8, 91u8, 112u8, 248u8, 109u8, 208u8, 37u8, 70u8, 26u8, 195u8, 90u8,
+                            207u8,
                         ],
                     )
                 }
@@ -32864,10 +33386,10 @@ pub mod api {
                         "swap",
                         types::Swap { id, other },
                         [
-                            38u8, 63u8, 41u8, 127u8, 128u8, 141u8, 233u8, 3u8, 94u8, 21u8, 143u8,
-                            30u8, 223u8, 120u8, 140u8, 204u8, 199u8, 237u8, 71u8, 227u8, 173u8,
-                            105u8, 121u8, 94u8, 231u8, 117u8, 51u8, 228u8, 14u8, 227u8, 80u8,
-                            162u8,
+                            235u8, 169u8, 16u8, 199u8, 107u8, 54u8, 35u8, 160u8, 219u8, 156u8,
+                            177u8, 205u8, 83u8, 45u8, 30u8, 233u8, 8u8, 143u8, 27u8, 123u8, 156u8,
+                            65u8, 128u8, 233u8, 218u8, 230u8, 98u8, 206u8, 231u8, 95u8, 224u8,
+                            35u8,
                         ],
                     )
                 }
@@ -33035,47 +33557,49 @@ pub mod api {
             pub struct StorageApi;
             impl StorageApi {
                 #[doc = " Pending swap operations."]
-                pub fn pending_swap(
+                pub fn pending_swap_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_parachain::primitives::Id,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Registrar",
                         "PendingSwap",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            0u8, 222u8, 4u8, 88u8, 174u8, 146u8, 239u8, 193u8, 205u8, 49u8, 21u8,
-                            147u8, 143u8, 4u8, 148u8, 102u8, 100u8, 205u8, 27u8, 108u8, 19u8,
-                            209u8, 98u8, 218u8, 72u8, 220u8, 213u8, 91u8, 16u8, 96u8, 128u8, 58u8,
+                            75u8, 6u8, 68u8, 43u8, 108u8, 147u8, 220u8, 90u8, 190u8, 86u8, 209u8,
+                            141u8, 9u8, 254u8, 103u8, 10u8, 94u8, 187u8, 155u8, 249u8, 140u8,
+                            167u8, 248u8, 196u8, 67u8, 169u8, 186u8, 192u8, 139u8, 188u8, 48u8,
+                            221u8,
                         ],
                     )
                 }
                 #[doc = " Pending swap operations."]
-                pub fn pending_swap_root(
+                pub fn pending_swap(
                     &self,
+                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_parachain::primitives::Id,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Registrar",
                         "PendingSwap",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            0u8, 222u8, 4u8, 88u8, 174u8, 146u8, 239u8, 193u8, 205u8, 49u8, 21u8,
-                            147u8, 143u8, 4u8, 148u8, 102u8, 100u8, 205u8, 27u8, 108u8, 19u8,
-                            209u8, 98u8, 218u8, 72u8, 220u8, 213u8, 91u8, 16u8, 96u8, 128u8, 58u8,
+                            75u8, 6u8, 68u8, 43u8, 108u8, 147u8, 220u8, 90u8, 190u8, 86u8, 209u8,
+                            141u8, 9u8, 254u8, 103u8, 10u8, 94u8, 187u8, 155u8, 249u8, 140u8,
+                            167u8, 248u8, 196u8, 67u8, 169u8, 186u8, 192u8, 139u8, 188u8, 48u8,
+                            221u8,
                         ],
                     )
                 }
@@ -33083,25 +33607,22 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " The given account ID is responsible for registering the code and initial head data, but may only do"]
                 #[doc = " so if it isn't yet registered. (After that, it's up to governance to do so.)"]
-                pub fn paras(
+                pub fn paras_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_runtime_common::paras_registrar::ParaInfo<
                         ::subxt::utils::AccountId32,
                         ::core::primitive::u128,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Registrar",
                         "Paras",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             187u8, 63u8, 130u8, 102u8, 222u8, 144u8, 126u8, 130u8, 82u8, 22u8,
                             64u8, 237u8, 229u8, 91u8, 66u8, 52u8, 9u8, 40u8, 254u8, 60u8, 55u8,
@@ -33113,22 +33634,25 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " The given account ID is responsible for registering the code and initial head data, but may only do"]
                 #[doc = " so if it isn't yet registered. (After that, it's up to governance to do so.)"]
-                pub fn paras_root(
+                pub fn paras(
                     &self,
+                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_runtime_common::paras_registrar::ParaInfo<
                         ::subxt::utils::AccountId32,
                         ::core::primitive::u128,
                     >,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Registrar",
                         "Paras",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             187u8, 63u8, 130u8, 102u8, 222u8, 144u8, 126u8, 130u8, 82u8, 22u8,
                             64u8, 237u8, 229u8, 91u8, 66u8, 52u8, 9u8, 40u8, 254u8, 60u8, 55u8,
@@ -33285,10 +33809,10 @@ pub mod api {
                             period_count,
                         },
                         [
-                            113u8, 172u8, 189u8, 121u8, 219u8, 25u8, 52u8, 96u8, 146u8, 77u8,
-                            184u8, 237u8, 173u8, 143u8, 234u8, 177u8, 178u8, 74u8, 91u8, 102u8,
-                            154u8, 195u8, 55u8, 192u8, 57u8, 177u8, 122u8, 100u8, 42u8, 116u8,
-                            83u8, 29u8,
+                            27u8, 203u8, 227u8, 16u8, 65u8, 135u8, 140u8, 244u8, 218u8, 231u8,
+                            78u8, 190u8, 169u8, 156u8, 233u8, 31u8, 20u8, 119u8, 158u8, 34u8,
+                            130u8, 51u8, 38u8, 176u8, 142u8, 139u8, 152u8, 139u8, 26u8, 184u8,
+                            238u8, 227u8,
                         ],
                     )
                 }
@@ -33395,9 +33919,8 @@ pub mod api {
                 #[doc = " deposit for the non-existent chain currently, but is held at some point in the future."]
                 #[doc = ""]
                 #[doc = " It is illegal for a `None` value to trail in the list."]
-                pub fn leases(
+                pub fn leases_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::std::vec::Vec<
@@ -33406,16 +33929,14 @@ pub mod api {
                             ::core::primitive::u128,
                         )>,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Slots",
                         "Leases",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             233u8, 226u8, 181u8, 160u8, 216u8, 86u8, 238u8, 229u8, 31u8, 67u8,
                             200u8, 188u8, 134u8, 22u8, 88u8, 147u8, 204u8, 11u8, 34u8, 244u8,
@@ -33440,8 +33961,9 @@ pub mod api {
                 #[doc = " deposit for the non-existent chain currently, but is held at some point in the future."]
                 #[doc = ""]
                 #[doc = " It is illegal for a `None` value to trail in the list."]
-                pub fn leases_root(
+                pub fn leases(
                     &self,
+                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::std::vec::Vec<
@@ -33450,14 +33972,16 @@ pub mod api {
                             ::core::primitive::u128,
                         )>,
                     >,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Slots",
                         "Leases",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             233u8, 226u8, 181u8, 160u8, 216u8, 86u8, 238u8, 229u8, 31u8, 67u8,
                             200u8, 188u8, 134u8, 22u8, 88u8, 147u8, 204u8, 11u8, 34u8, 244u8,
@@ -33592,10 +34116,10 @@ pub mod api {
                             lease_period_index,
                         },
                         [
-                            117u8, 195u8, 187u8, 250u8, 169u8, 118u8, 184u8, 93u8, 121u8, 101u8,
-                            137u8, 252u8, 6u8, 188u8, 174u8, 224u8, 140u8, 38u8, 167u8, 160u8,
-                            132u8, 249u8, 253u8, 29u8, 206u8, 240u8, 208u8, 107u8, 15u8, 135u8,
-                            10u8, 202u8,
+                            116u8, 2u8, 215u8, 191u8, 69u8, 99u8, 218u8, 198u8, 71u8, 228u8, 88u8,
+                            144u8, 139u8, 206u8, 214u8, 58u8, 106u8, 117u8, 138u8, 115u8, 109u8,
+                            253u8, 210u8, 135u8, 189u8, 190u8, 86u8, 189u8, 8u8, 168u8, 142u8,
+                            181u8,
                         ],
                     )
                 }
@@ -33619,10 +34143,9 @@ pub mod api {
                             amount,
                         },
                         [
-                            33u8, 214u8, 217u8, 212u8, 76u8, 156u8, 74u8, 252u8, 126u8, 140u8,
-                            209u8, 227u8, 220u8, 235u8, 86u8, 84u8, 46u8, 165u8, 149u8, 173u8,
-                            153u8, 225u8, 146u8, 17u8, 79u8, 78u8, 80u8, 172u8, 140u8, 210u8, 87u8,
-                            154u8,
+                            203u8, 71u8, 160u8, 55u8, 95u8, 152u8, 111u8, 30u8, 86u8, 113u8, 213u8,
+                            217u8, 140u8, 9u8, 138u8, 150u8, 90u8, 229u8, 17u8, 95u8, 141u8, 150u8,
+                            183u8, 171u8, 45u8, 110u8, 47u8, 91u8, 159u8, 91u8, 214u8, 132u8,
                         ],
                     )
                 }
@@ -33832,32 +34355,27 @@ pub mod api {
                         "AuctionInfo",
                         vec![],
                         [
-                            90u8, 219u8, 72u8, 126u8, 65u8, 18u8, 134u8, 169u8, 249u8, 18u8, 95u8,
-                            142u8, 91u8, 37u8, 237u8, 184u8, 185u8, 42u8, 66u8, 73u8, 101u8, 13u8,
-                            16u8, 165u8, 58u8, 179u8, 95u8, 212u8, 171u8, 1u8, 4u8, 108u8,
+                            116u8, 81u8, 223u8, 26u8, 151u8, 103u8, 209u8, 182u8, 169u8, 173u8,
+                            220u8, 234u8, 88u8, 191u8, 255u8, 75u8, 148u8, 75u8, 167u8, 37u8, 6u8,
+                            14u8, 224u8, 193u8, 92u8, 82u8, 205u8, 172u8, 209u8, 83u8, 3u8, 77u8,
                         ],
                     )
                 }
                 #[doc = " Amounts currently reserved in the accounts of the bidders currently winning"]
                 #[doc = " (sub-)ranges."]
-                pub fn reserved_amounts(
+                pub fn reserved_amounts_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
-                    _1: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u128,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Auctions",
                         "ReservedAmounts",
-                        vec![
-                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
-                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
-                        ],
+                        vec![],
                         [
                             77u8, 44u8, 116u8, 36u8, 189u8, 213u8, 126u8, 32u8, 42u8, 131u8, 108u8,
                             41u8, 147u8, 40u8, 247u8, 245u8, 161u8, 42u8, 152u8, 195u8, 28u8,
@@ -33868,8 +34386,9 @@ pub mod api {
                 }
                 #[doc = " Amounts currently reserved in the accounts of the bidders currently winning"]
                 #[doc = " (sub-)ranges."]
-                pub fn reserved_amounts_root(
+                pub fn reserved_amounts_iter1(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u128,
@@ -33880,7 +34399,37 @@ pub mod api {
                     ::subxt::storage::address::Address::new_static(
                         "Auctions",
                         "ReservedAmounts",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
+                        [
+                            77u8, 44u8, 116u8, 36u8, 189u8, 213u8, 126u8, 32u8, 42u8, 131u8, 108u8,
+                            41u8, 147u8, 40u8, 247u8, 245u8, 161u8, 42u8, 152u8, 195u8, 28u8,
+                            142u8, 231u8, 209u8, 113u8, 11u8, 240u8, 37u8, 112u8, 38u8, 239u8,
+                            245u8,
+                        ],
+                    )
+                }
+                #[doc = " Amounts currently reserved in the accounts of the bidders currently winning"]
+                #[doc = " (sub-)ranges."]
+                pub fn reserved_amounts(
+                    &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
+                    _1: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    ::core::primitive::u128,
+                    ::subxt::storage::address::Yes,
+                    (),
+                    (),
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "Auctions",
+                        "ReservedAmounts",
+                        vec![
+                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
+                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
+                        ],
                         [
                             77u8, 44u8, 116u8, 36u8, 189u8, 213u8, 126u8, 32u8, 42u8, 131u8, 108u8,
                             41u8, 147u8, 40u8, 247u8, 245u8, 161u8, 42u8, 152u8, 195u8, 28u8,
@@ -33892,9 +34441,8 @@ pub mod api {
                 #[doc = " The winning bids for each of the 10 ranges at each sample in the final Ending Period of"]
                 #[doc = " the current auction. The map's key is the 0-based index into the Sample Size. The"]
                 #[doc = " first sample of the ending period is 0; the last is `Sample Size - 1`."]
-                pub fn winning(
+                pub fn winning_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     [::core::option::Option<(
@@ -33902,28 +34450,27 @@ pub mod api {
                         runtime_types::polkadot_parachain::primitives::Id,
                         ::core::primitive::u128,
                     )>; 36usize],
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Auctions",
                         "Winning",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            127u8, 44u8, 33u8, 0u8, 119u8, 91u8, 8u8, 60u8, 171u8, 16u8, 85u8,
-                            98u8, 157u8, 16u8, 182u8, 39u8, 219u8, 77u8, 172u8, 222u8, 46u8, 0u8,
-                            239u8, 211u8, 164u8, 200u8, 103u8, 98u8, 175u8, 46u8, 127u8, 32u8,
+                            8u8, 136u8, 174u8, 152u8, 223u8, 1u8, 143u8, 45u8, 213u8, 5u8, 239u8,
+                            163u8, 152u8, 99u8, 197u8, 109u8, 194u8, 140u8, 246u8, 10u8, 40u8,
+                            22u8, 0u8, 122u8, 20u8, 132u8, 141u8, 157u8, 56u8, 211u8, 5u8, 104u8,
                         ],
                     )
                 }
                 #[doc = " The winning bids for each of the 10 ranges at each sample in the final Ending Period of"]
                 #[doc = " the current auction. The map's key is the 0-based index into the Sample Size. The"]
                 #[doc = " first sample of the ending period is 0; the last is `Sample Size - 1`."]
-                pub fn winning_root(
+                pub fn winning(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     [::core::option::Option<(
@@ -33931,18 +34478,20 @@ pub mod api {
                         runtime_types::polkadot_parachain::primitives::Id,
                         ::core::primitive::u128,
                     )>; 36usize],
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Auctions",
                         "Winning",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            127u8, 44u8, 33u8, 0u8, 119u8, 91u8, 8u8, 60u8, 171u8, 16u8, 85u8,
-                            98u8, 157u8, 16u8, 182u8, 39u8, 219u8, 77u8, 172u8, 222u8, 46u8, 0u8,
-                            239u8, 211u8, 164u8, 200u8, 103u8, 98u8, 175u8, 46u8, 127u8, 32u8,
+                            8u8, 136u8, 174u8, 152u8, 223u8, 1u8, 143u8, 45u8, 213u8, 5u8, 239u8,
+                            163u8, 152u8, 99u8, 197u8, 109u8, 194u8, 140u8, 246u8, 10u8, 40u8,
+                            22u8, 0u8, 122u8, 20u8, 132u8, 141u8, 157u8, 56u8, 211u8, 5u8, 104u8,
                         ],
                     )
                 }
@@ -34235,9 +34784,9 @@ pub mod api {
                             verifier,
                         },
                         [
-                            136u8, 111u8, 157u8, 203u8, 90u8, 134u8, 252u8, 254u8, 80u8, 250u8,
-                            10u8, 16u8, 26u8, 87u8, 225u8, 44u8, 188u8, 19u8, 138u8, 39u8, 109u8,
-                            30u8, 164u8, 136u8, 90u8, 175u8, 75u8, 165u8, 15u8, 208u8, 169u8, 5u8,
+                            236u8, 3u8, 248u8, 168u8, 136u8, 216u8, 20u8, 58u8, 179u8, 13u8, 184u8,
+                            73u8, 105u8, 35u8, 167u8, 66u8, 117u8, 195u8, 41u8, 41u8, 117u8, 176u8,
+                            65u8, 18u8, 225u8, 66u8, 2u8, 61u8, 212u8, 92u8, 117u8, 90u8,
                         ],
                     )
                 }
@@ -34257,9 +34806,10 @@ pub mod api {
                             signature,
                         },
                         [
-                            221u8, 45u8, 121u8, 39u8, 113u8, 160u8, 94u8, 51u8, 214u8, 93u8, 178u8,
-                            227u8, 234u8, 126u8, 135u8, 127u8, 14u8, 115u8, 206u8, 64u8, 199u8,
-                            91u8, 17u8, 209u8, 169u8, 238u8, 224u8, 193u8, 8u8, 97u8, 183u8, 47u8,
+                            186u8, 247u8, 240u8, 7u8, 12u8, 239u8, 39u8, 191u8, 150u8, 219u8,
+                            137u8, 122u8, 214u8, 61u8, 62u8, 180u8, 229u8, 181u8, 105u8, 190u8,
+                            228u8, 55u8, 242u8, 70u8, 91u8, 118u8, 143u8, 233u8, 186u8, 231u8,
+                            207u8, 106u8,
                         ],
                     )
                 }
@@ -34336,9 +34886,10 @@ pub mod api {
                             verifier,
                         },
                         [
-                            92u8, 12u8, 155u8, 42u8, 38u8, 165u8, 137u8, 179u8, 130u8, 218u8, 84u8,
-                            114u8, 130u8, 104u8, 38u8, 162u8, 243u8, 155u8, 122u8, 207u8, 250u8,
-                            18u8, 238u8, 69u8, 52u8, 113u8, 179u8, 6u8, 226u8, 36u8, 4u8, 166u8,
+                            126u8, 29u8, 232u8, 93u8, 94u8, 23u8, 47u8, 217u8, 62u8, 2u8, 161u8,
+                            31u8, 156u8, 229u8, 109u8, 45u8, 97u8, 101u8, 189u8, 139u8, 40u8,
+                            238u8, 150u8, 94u8, 145u8, 77u8, 26u8, 153u8, 217u8, 171u8, 48u8,
+                            195u8,
                         ],
                     )
                 }
@@ -34388,10 +34939,9 @@ pub mod api {
                         "contribute_all",
                         types::ContributeAll { index, signature },
                         [
-                            218u8, 230u8, 158u8, 9u8, 57u8, 53u8, 155u8, 255u8, 177u8, 169u8,
-                            143u8, 126u8, 165u8, 216u8, 85u8, 231u8, 170u8, 124u8, 175u8, 93u8,
-                            121u8, 166u8, 48u8, 239u8, 98u8, 208u8, 86u8, 178u8, 130u8, 60u8, 84u8,
-                            206u8,
+                            233u8, 62u8, 129u8, 168u8, 161u8, 163u8, 78u8, 92u8, 191u8, 239u8,
+                            61u8, 2u8, 198u8, 246u8, 246u8, 81u8, 32u8, 131u8, 118u8, 170u8, 72u8,
+                            87u8, 17u8, 26u8, 55u8, 10u8, 146u8, 184u8, 213u8, 200u8, 252u8, 50u8,
                         ],
                     )
                 }
@@ -34595,9 +35145,8 @@ pub mod api {
             pub struct StorageApi;
             impl StorageApi {
                 #[doc = " Info on all of the funds."]
-                pub fn funds(
+                pub fn funds_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_runtime_common::crowdloan::FundInfo<
@@ -34606,27 +35155,26 @@ pub mod api {
                         ::core::primitive::u32,
                         ::core::primitive::u32,
                     >,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Crowdloan",
                         "Funds",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            179u8, 120u8, 62u8, 42u8, 236u8, 181u8, 225u8, 216u8, 210u8, 74u8,
-                            168u8, 21u8, 215u8, 239u8, 185u8, 247u8, 72u8, 152u8, 117u8, 195u8,
-                            41u8, 102u8, 174u8, 242u8, 127u8, 32u8, 145u8, 74u8, 245u8, 57u8,
-                            220u8, 116u8,
+                            191u8, 255u8, 37u8, 49u8, 246u8, 246u8, 168u8, 178u8, 73u8, 238u8,
+                            49u8, 76u8, 66u8, 246u8, 207u8, 12u8, 76u8, 233u8, 31u8, 218u8, 132u8,
+                            236u8, 237u8, 210u8, 116u8, 159u8, 191u8, 89u8, 212u8, 167u8, 61u8,
+                            41u8,
                         ],
                     )
                 }
                 #[doc = " Info on all of the funds."]
-                pub fn funds_root(
+                pub fn funds(
                     &self,
+                    _0: impl ::std::borrow::Borrow<runtime_types::polkadot_parachain::primitives::Id>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::polkadot_runtime_common::crowdloan::FundInfo<
@@ -34635,19 +35183,21 @@ pub mod api {
                         ::core::primitive::u32,
                         ::core::primitive::u32,
                     >,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "Crowdloan",
                         "Funds",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            179u8, 120u8, 62u8, 42u8, 236u8, 181u8, 225u8, 216u8, 210u8, 74u8,
-                            168u8, 21u8, 215u8, 239u8, 185u8, 247u8, 72u8, 152u8, 117u8, 195u8,
-                            41u8, 102u8, 174u8, 242u8, 127u8, 32u8, 145u8, 74u8, 245u8, 57u8,
-                            220u8, 116u8,
+                            191u8, 255u8, 37u8, 49u8, 246u8, 246u8, 168u8, 178u8, 73u8, 238u8,
+                            49u8, 76u8, 66u8, 246u8, 207u8, 12u8, 76u8, 233u8, 31u8, 218u8, 132u8,
+                            236u8, 237u8, 210u8, 116u8, 159u8, 191u8, 89u8, 212u8, 167u8, 61u8,
+                            41u8,
                         ],
                     )
                 }
@@ -35006,9 +35556,9 @@ pub mod api {
                             message: ::std::boxed::Box::new(message),
                         },
                         [
-                            179u8, 0u8, 46u8, 230u8, 210u8, 183u8, 91u8, 129u8, 120u8, 45u8, 156u8,
-                            37u8, 100u8, 175u8, 147u8, 10u8, 24u8, 70u8, 80u8, 8u8, 253u8, 107u8,
-                            168u8, 10u8, 46u8, 192u8, 226u8, 208u8, 102u8, 217u8, 25u8, 154u8,
+                            147u8, 255u8, 86u8, 82u8, 17u8, 159u8, 225u8, 145u8, 220u8, 89u8, 71u8,
+                            23u8, 193u8, 249u8, 12u8, 70u8, 19u8, 140u8, 232u8, 97u8, 12u8, 220u8,
+                            113u8, 65u8, 4u8, 255u8, 138u8, 10u8, 231u8, 122u8, 67u8, 105u8,
                         ],
                     )
                 }
@@ -35030,9 +35580,9 @@ pub mod api {
                             fee_asset_item,
                         },
                         [
-                            55u8, 134u8, 79u8, 159u8, 98u8, 83u8, 169u8, 45u8, 116u8, 191u8, 166u8,
-                            51u8, 27u8, 109u8, 114u8, 146u8, 82u8, 240u8, 159u8, 63u8, 35u8, 227u8,
-                            206u8, 69u8, 133u8, 194u8, 181u8, 110u8, 77u8, 30u8, 241u8, 210u8,
+                            56u8, 144u8, 237u8, 60u8, 157u8, 5u8, 7u8, 129u8, 41u8, 149u8, 160u8,
+                            100u8, 233u8, 102u8, 181u8, 140u8, 115u8, 213u8, 29u8, 132u8, 16u8,
+                            30u8, 23u8, 82u8, 140u8, 134u8, 37u8, 87u8, 3u8, 99u8, 172u8, 42u8,
                         ],
                     )
                 }
@@ -35054,9 +35604,9 @@ pub mod api {
                             fee_asset_item,
                         },
                         [
-                            12u8, 232u8, 11u8, 188u8, 202u8, 160u8, 42u8, 194u8, 91u8, 84u8, 167u8,
-                            83u8, 193u8, 198u8, 121u8, 60u8, 83u8, 34u8, 10u8, 1u8, 19u8, 9u8,
-                            115u8, 71u8, 242u8, 65u8, 139u8, 58u8, 35u8, 103u8, 241u8, 196u8,
+                            21u8, 167u8, 44u8, 22u8, 210u8, 73u8, 148u8, 7u8, 91u8, 108u8, 148u8,
+                            205u8, 170u8, 243u8, 142u8, 224u8, 205u8, 119u8, 252u8, 22u8, 203u8,
+                            32u8, 73u8, 200u8, 178u8, 14u8, 167u8, 147u8, 166u8, 55u8, 14u8, 231u8,
                         ],
                     )
                 }
@@ -35074,9 +35624,9 @@ pub mod api {
                             max_weight,
                         },
                         [
-                            162u8, 211u8, 166u8, 126u8, 220u8, 232u8, 242u8, 251u8, 44u8, 206u8,
-                            7u8, 198u8, 89u8, 27u8, 26u8, 87u8, 151u8, 79u8, 38u8, 164u8, 141u8,
-                            81u8, 218u8, 162u8, 52u8, 238u8, 46u8, 207u8, 235u8, 124u8, 165u8, 8u8,
+                            15u8, 97u8, 86u8, 111u8, 105u8, 116u8, 109u8, 206u8, 70u8, 8u8, 57u8,
+                            232u8, 133u8, 132u8, 30u8, 219u8, 34u8, 69u8, 0u8, 213u8, 98u8, 241u8,
+                            186u8, 93u8, 216u8, 39u8, 73u8, 24u8, 193u8, 87u8, 92u8, 31u8,
                         ],
                     )
                 }
@@ -35094,10 +35644,9 @@ pub mod api {
                             version,
                         },
                         [
-                            152u8, 107u8, 91u8, 62u8, 69u8, 11u8, 101u8, 87u8, 34u8, 11u8, 184u8,
-                            34u8, 179u8, 114u8, 190u8, 93u8, 47u8, 161u8, 177u8, 121u8, 219u8,
-                            155u8, 203u8, 253u8, 207u8, 217u8, 134u8, 101u8, 170u8, 31u8, 76u8,
-                            240u8,
+                            110u8, 11u8, 78u8, 255u8, 66u8, 2u8, 55u8, 108u8, 92u8, 151u8, 231u8,
+                            175u8, 75u8, 156u8, 34u8, 191u8, 0u8, 56u8, 104u8, 197u8, 70u8, 204u8,
+                            73u8, 234u8, 173u8, 251u8, 88u8, 226u8, 3u8, 136u8, 228u8, 136u8,
                         ],
                     )
                 }
@@ -35130,9 +35679,9 @@ pub mod api {
                             location: ::std::boxed::Box::new(location),
                         },
                         [
-                            47u8, 23u8, 248u8, 170u8, 109u8, 130u8, 223u8, 240u8, 219u8, 162u8,
-                            206u8, 216u8, 76u8, 17u8, 57u8, 145u8, 124u8, 40u8, 49u8, 226u8, 40u8,
-                            102u8, 163u8, 66u8, 42u8, 78u8, 15u8, 4u8, 169u8, 40u8, 247u8, 40u8,
+                            112u8, 254u8, 138u8, 12u8, 203u8, 176u8, 251u8, 167u8, 223u8, 0u8,
+                            71u8, 148u8, 19u8, 179u8, 47u8, 96u8, 188u8, 189u8, 14u8, 172u8, 1u8,
+                            1u8, 192u8, 107u8, 137u8, 158u8, 22u8, 9u8, 138u8, 241u8, 32u8, 47u8,
                         ],
                     )
                 }
@@ -35148,9 +35697,10 @@ pub mod api {
                             location: ::std::boxed::Box::new(location),
                         },
                         [
-                            240u8, 140u8, 37u8, 245u8, 15u8, 214u8, 120u8, 250u8, 98u8, 219u8,
-                            199u8, 22u8, 244u8, 191u8, 74u8, 59u8, 86u8, 221u8, 20u8, 75u8, 20u8,
-                            97u8, 139u8, 71u8, 77u8, 157u8, 114u8, 198u8, 98u8, 72u8, 40u8, 227u8,
+                            205u8, 143u8, 230u8, 143u8, 166u8, 184u8, 53u8, 252u8, 118u8, 184u8,
+                            209u8, 227u8, 225u8, 184u8, 254u8, 244u8, 101u8, 56u8, 27u8, 128u8,
+                            40u8, 159u8, 178u8, 62u8, 63u8, 164u8, 59u8, 236u8, 1u8, 168u8, 202u8,
+                            42u8,
                         ],
                     )
                 }
@@ -35174,10 +35724,10 @@ pub mod api {
                             weight_limit,
                         },
                         [
-                            212u8, 29u8, 239u8, 236u8, 39u8, 49u8, 85u8, 129u8, 164u8, 143u8,
-                            214u8, 84u8, 181u8, 63u8, 47u8, 244u8, 77u8, 149u8, 76u8, 247u8, 207u8,
-                            222u8, 216u8, 16u8, 191u8, 249u8, 165u8, 17u8, 56u8, 49u8, 165u8,
-                            137u8,
+                            10u8, 139u8, 165u8, 239u8, 92u8, 178u8, 169u8, 62u8, 166u8, 236u8,
+                            50u8, 12u8, 196u8, 3u8, 233u8, 209u8, 3u8, 159u8, 184u8, 234u8, 171u8,
+                            46u8, 145u8, 134u8, 241u8, 155u8, 221u8, 173u8, 166u8, 94u8, 147u8,
+                            88u8,
                         ],
                     )
                 }
@@ -35201,10 +35751,10 @@ pub mod api {
                             weight_limit,
                         },
                         [
-                            185u8, 108u8, 229u8, 144u8, 189u8, 81u8, 240u8, 175u8, 141u8, 24u8,
-                            153u8, 172u8, 220u8, 233u8, 25u8, 173u8, 158u8, 15u8, 150u8, 74u8,
-                            133u8, 5u8, 8u8, 227u8, 194u8, 62u8, 93u8, 166u8, 34u8, 67u8, 64u8,
-                            10u8,
+                            156u8, 205u8, 105u8, 18u8, 120u8, 130u8, 144u8, 67u8, 152u8, 188u8,
+                            109u8, 121u8, 4u8, 240u8, 123u8, 112u8, 72u8, 153u8, 2u8, 111u8, 183u8,
+                            170u8, 199u8, 82u8, 33u8, 117u8, 43u8, 133u8, 208u8, 44u8, 118u8,
+                            107u8,
                         ],
                     )
                 }
@@ -35746,49 +36296,47 @@ pub mod api {
                     )
                 }
                 #[doc = " The ongoing queries."]
-                pub fn queries(
+                pub fn queries_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::core::primitive::u64>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_xcm::pallet::QueryStatus<::core::primitive::u32>,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "XcmPallet",
                         "Queries",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            177u8, 138u8, 131u8, 91u8, 46u8, 151u8, 115u8, 184u8, 120u8, 158u8,
-                            241u8, 43u8, 56u8, 121u8, 102u8, 204u8, 197u8, 31u8, 241u8, 131u8,
-                            199u8, 217u8, 129u8, 147u8, 255u8, 157u8, 71u8, 97u8, 153u8, 34u8,
-                            178u8, 223u8,
+                            119u8, 5u8, 12u8, 91u8, 117u8, 240u8, 52u8, 192u8, 135u8, 139u8, 220u8,
+                            78u8, 207u8, 199u8, 71u8, 163u8, 100u8, 17u8, 6u8, 65u8, 200u8, 245u8,
+                            191u8, 82u8, 232u8, 128u8, 126u8, 70u8, 39u8, 63u8, 148u8, 219u8,
                         ],
                     )
                 }
                 #[doc = " The ongoing queries."]
-                pub fn queries_root(
+                pub fn queries(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u64>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_xcm::pallet::QueryStatus<::core::primitive::u32>,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "XcmPallet",
                         "Queries",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            177u8, 138u8, 131u8, 91u8, 46u8, 151u8, 115u8, 184u8, 120u8, 158u8,
-                            241u8, 43u8, 56u8, 121u8, 102u8, 204u8, 197u8, 31u8, 241u8, 131u8,
-                            199u8, 217u8, 129u8, 147u8, 255u8, 157u8, 71u8, 97u8, 153u8, 34u8,
-                            178u8, 223u8,
+                            119u8, 5u8, 12u8, 91u8, 117u8, 240u8, 52u8, 192u8, 135u8, 139u8, 220u8,
+                            78u8, 207u8, 199u8, 71u8, 163u8, 100u8, 17u8, 6u8, 65u8, 200u8, 245u8,
+                            191u8, 82u8, 232u8, 128u8, 126u8, 70u8, 39u8, 63u8, 148u8, 219u8,
                         ],
                     )
                 }
@@ -35796,22 +36344,19 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " Key is the blake2 256 hash of (origin, versioned `MultiAssets`) pair. Value is the number of"]
                 #[doc = " times this pair has been trapped (usually just 1 if it exists at all)."]
-                pub fn asset_traps(
+                pub fn asset_traps_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::H256>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u32,
-                    ::subxt::storage::address::Yes,
+                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "XcmPallet",
                         "AssetTraps",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
                             148u8, 41u8, 254u8, 134u8, 61u8, 172u8, 126u8, 146u8, 78u8, 178u8,
                             50u8, 77u8, 226u8, 8u8, 200u8, 78u8, 77u8, 91u8, 26u8, 133u8, 104u8,
@@ -35823,19 +36368,22 @@ pub mod api {
                 #[doc = ""]
                 #[doc = " Key is the blake2 256 hash of (origin, versioned `MultiAssets`) pair. Value is the number of"]
                 #[doc = " times this pair has been trapped (usually just 1 if it exists at all)."]
-                pub fn asset_traps_root(
+                pub fn asset_traps(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::H256>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     ::core::primitive::u32,
-                    (),
                     ::subxt::storage::address::Yes,
                     ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "XcmPallet",
                         "AssetTraps",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
                             148u8, 41u8, 254u8, 134u8, 61u8, 172u8, 126u8, 146u8, 78u8, 178u8,
                             50u8, 77u8, 226u8, 8u8, 200u8, 78u8, 77u8, 91u8, 26u8, 133u8, 104u8,
@@ -35867,6 +36415,51 @@ pub mod api {
                     )
                 }
                 #[doc = " The Latest versions that we know various locations support."]
+                pub fn supported_version_iter(
+                    &self,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    ::core::primitive::u32,
+                    (),
+                    (),
+                    ::subxt::storage::address::Yes,
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "XcmPallet",
+                        "SupportedVersion",
+                        vec![],
+                        [
+                            144u8, 22u8, 91u8, 30u8, 139u8, 164u8, 95u8, 149u8, 97u8, 247u8, 12u8,
+                            212u8, 96u8, 16u8, 134u8, 236u8, 74u8, 57u8, 244u8, 169u8, 68u8, 63u8,
+                            111u8, 86u8, 65u8, 229u8, 104u8, 51u8, 44u8, 100u8, 47u8, 191u8,
+                        ],
+                    )
+                }
+                #[doc = " The Latest versions that we know various locations support."]
+                pub fn supported_version_iter1(
+                    &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    ::core::primitive::u32,
+                    (),
+                    (),
+                    ::subxt::storage::address::Yes,
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "XcmPallet",
+                        "SupportedVersion",
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
+                        [
+                            144u8, 22u8, 91u8, 30u8, 139u8, 164u8, 95u8, 149u8, 97u8, 247u8, 12u8,
+                            212u8, 96u8, 16u8, 134u8, 236u8, 74u8, 57u8, 244u8, 169u8, 68u8, 63u8,
+                            111u8, 86u8, 65u8, 229u8, 104u8, 51u8, 44u8, 100u8, 47u8, 191u8,
+                        ],
+                    )
+                }
+                #[doc = " The Latest versions that we know various locations support."]
                 pub fn supported_version(
                     &self,
                     _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
@@ -35876,7 +36469,7 @@ pub mod api {
                     ::core::primitive::u32,
                     ::subxt::storage::address::Yes,
                     (),
-                    ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "XcmPallet",
@@ -35886,32 +36479,54 @@ pub mod api {
                             ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
                         ],
                         [
-                            184u8, 189u8, 75u8, 46u8, 146u8, 183u8, 140u8, 180u8, 228u8, 216u8,
-                            220u8, 210u8, 194u8, 138u8, 57u8, 248u8, 112u8, 110u8, 236u8, 113u8,
-                            9u8, 109u8, 112u8, 86u8, 37u8, 21u8, 133u8, 127u8, 86u8, 192u8, 107u8,
-                            161u8,
+                            144u8, 22u8, 91u8, 30u8, 139u8, 164u8, 95u8, 149u8, 97u8, 247u8, 12u8,
+                            212u8, 96u8, 16u8, 134u8, 236u8, 74u8, 57u8, 244u8, 169u8, 68u8, 63u8,
+                            111u8, 86u8, 65u8, 229u8, 104u8, 51u8, 44u8, 100u8, 47u8, 191u8,
                         ],
                     )
                 }
-                #[doc = " The Latest versions that we know various locations support."]
-                pub fn supported_version_root(
+                #[doc = " All locations that we have requested version notifications from."]
+                pub fn version_notifiers_iter(
                     &self,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
-                    ::core::primitive::u32,
+                    ::core::primitive::u64,
                     (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "XcmPallet",
-                        "SupportedVersion",
-                        Vec::new(),
+                        "VersionNotifiers",
+                        vec![],
+                        [
+                            49u8, 190u8, 73u8, 67u8, 91u8, 69u8, 121u8, 206u8, 25u8, 82u8, 29u8,
+                            170u8, 157u8, 201u8, 168u8, 93u8, 181u8, 55u8, 226u8, 142u8, 136u8,
+                            46u8, 117u8, 208u8, 130u8, 90u8, 129u8, 39u8, 151u8, 92u8, 118u8, 75u8,
+                        ],
+                    )
+                }
+                #[doc = " All locations that we have requested version notifications from."]
+                pub fn version_notifiers_iter1(
+                    &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    ::core::primitive::u64,
+                    (),
+                    (),
+                    ::subxt::storage::address::Yes,
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "XcmPallet",
+                        "VersionNotifiers",
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            184u8, 189u8, 75u8, 46u8, 146u8, 183u8, 140u8, 180u8, 228u8, 216u8,
-                            220u8, 210u8, 194u8, 138u8, 57u8, 248u8, 112u8, 110u8, 236u8, 113u8,
-                            9u8, 109u8, 112u8, 86u8, 37u8, 21u8, 133u8, 127u8, 86u8, 192u8, 107u8,
-                            161u8,
+                            49u8, 190u8, 73u8, 67u8, 91u8, 69u8, 121u8, 206u8, 25u8, 82u8, 29u8,
+                            170u8, 157u8, 201u8, 168u8, 93u8, 181u8, 55u8, 226u8, 142u8, 136u8,
+                            46u8, 117u8, 208u8, 130u8, 90u8, 129u8, 39u8, 151u8, 92u8, 118u8, 75u8,
                         ],
                     )
                 }
@@ -35925,7 +36540,7 @@ pub mod api {
                     ::core::primitive::u64,
                     ::subxt::storage::address::Yes,
                     (),
-                    ::subxt::storage::address::Yes,
+                    (),
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "XcmPallet",
@@ -35935,39 +36550,44 @@ pub mod api {
                             ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
                         ],
                         [
-                            239u8, 151u8, 74u8, 252u8, 104u8, 241u8, 152u8, 244u8, 122u8, 1u8,
-                            144u8, 59u8, 172u8, 3u8, 96u8, 233u8, 233u8, 183u8, 152u8, 118u8, 82u8,
-                            57u8, 122u8, 86u8, 82u8, 99u8, 218u8, 82u8, 37u8, 236u8, 15u8, 212u8,
+                            49u8, 190u8, 73u8, 67u8, 91u8, 69u8, 121u8, 206u8, 25u8, 82u8, 29u8,
+                            170u8, 157u8, 201u8, 168u8, 93u8, 181u8, 55u8, 226u8, 142u8, 136u8,
+                            46u8, 117u8, 208u8, 130u8, 90u8, 129u8, 39u8, 151u8, 92u8, 118u8, 75u8,
                         ],
                     )
                 }
-                #[doc = " All locations that we have requested version notifications from."]
-                pub fn version_notifiers_root(
+                #[doc = " The target locations that are subscribed to our version changes, as well as the most recent"]
+                #[doc = " of our versions we informed them of."]
+                pub fn version_notify_targets_iter(
                     &self,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
-                    ::core::primitive::u64,
+                    (
+                        ::core::primitive::u64,
+                        runtime_types::sp_weights::weight_v2::Weight,
+                        ::core::primitive::u32,
+                    ),
                     (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "XcmPallet",
-                        "VersionNotifiers",
-                        Vec::new(),
+                        "VersionNotifyTargets",
+                        vec![],
                         [
-                            239u8, 151u8, 74u8, 252u8, 104u8, 241u8, 152u8, 244u8, 122u8, 1u8,
-                            144u8, 59u8, 172u8, 3u8, 96u8, 233u8, 233u8, 183u8, 152u8, 118u8, 82u8,
-                            57u8, 122u8, 86u8, 82u8, 99u8, 218u8, 82u8, 37u8, 236u8, 15u8, 212u8,
+                            1u8, 195u8, 40u8, 83u8, 216u8, 175u8, 241u8, 95u8, 42u8, 7u8, 85u8,
+                            253u8, 223u8, 241u8, 195u8, 41u8, 41u8, 21u8, 17u8, 171u8, 216u8,
+                            150u8, 39u8, 165u8, 215u8, 194u8, 201u8, 225u8, 179u8, 12u8, 52u8,
+                            173u8,
                         ],
                     )
                 }
                 #[doc = " The target locations that are subscribed to our version changes, as well as the most recent"]
                 #[doc = " of our versions we informed them of."]
-                pub fn version_notify_targets(
+                pub fn version_notify_targets_iter1(
                     &self,
                     _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
-                    _1: impl ::std::borrow::Borrow<runtime_types::xcm::VersionedMultiLocation>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     (
@@ -35975,28 +36595,30 @@ pub mod api {
                         runtime_types::sp_weights::weight_v2::Weight,
                         ::core::primitive::u32,
                     ),
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "XcmPallet",
                         "VersionNotifyTargets",
-                        vec![
-                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
-                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
-                        ],
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            86u8, 209u8, 212u8, 169u8, 60u8, 250u8, 121u8, 19u8, 190u8, 58u8,
-                            111u8, 103u8, 157u8, 186u8, 211u8, 46u8, 9u8, 111u8, 17u8, 73u8, 221u8,
-                            180u8, 230u8, 156u8, 4u8, 75u8, 114u8, 123u8, 3u8, 147u8, 237u8, 102u8,
+                            1u8, 195u8, 40u8, 83u8, 216u8, 175u8, 241u8, 95u8, 42u8, 7u8, 85u8,
+                            253u8, 223u8, 241u8, 195u8, 41u8, 41u8, 21u8, 17u8, 171u8, 216u8,
+                            150u8, 39u8, 165u8, 215u8, 194u8, 201u8, 225u8, 179u8, 12u8, 52u8,
+                            173u8,
                         ],
                     )
                 }
                 #[doc = " The target locations that are subscribed to our version changes, as well as the most recent"]
                 #[doc = " of our versions we informed them of."]
-                pub fn version_notify_targets_root(
+                pub fn version_notify_targets(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
+                    _1: impl ::std::borrow::Borrow<runtime_types::xcm::VersionedMultiLocation>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     (
@@ -36004,18 +36626,22 @@ pub mod api {
                         runtime_types::sp_weights::weight_v2::Weight,
                         ::core::primitive::u32,
                     ),
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "XcmPallet",
                         "VersionNotifyTargets",
-                        Vec::new(),
+                        vec![
+                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
+                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
+                        ],
                         [
-                            86u8, 209u8, 212u8, 169u8, 60u8, 250u8, 121u8, 19u8, 190u8, 58u8,
-                            111u8, 103u8, 157u8, 186u8, 211u8, 46u8, 9u8, 111u8, 17u8, 73u8, 221u8,
-                            180u8, 230u8, 156u8, 4u8, 75u8, 114u8, 123u8, 3u8, 147u8, 237u8, 102u8,
+                            1u8, 195u8, 40u8, 83u8, 216u8, 175u8, 241u8, 95u8, 42u8, 7u8, 85u8,
+                            253u8, 223u8, 241u8, 195u8, 41u8, 41u8, 21u8, 17u8, 171u8, 216u8,
+                            150u8, 39u8, 165u8, 215u8, 194u8, 201u8, 225u8, 179u8, 12u8, 52u8,
+                            173u8,
                         ],
                     )
                 }
@@ -36039,10 +36665,9 @@ pub mod api {
                         "VersionDiscoveryQueue",
                         vec![],
                         [
-                            229u8, 127u8, 178u8, 181u8, 65u8, 123u8, 36u8, 101u8, 245u8, 168u8,
-                            192u8, 243u8, 57u8, 242u8, 169u8, 89u8, 80u8, 16u8, 28u8, 143u8, 124u8,
-                            224u8, 11u8, 153u8, 237u8, 58u8, 209u8, 186u8, 94u8, 135u8, 105u8,
-                            79u8,
+                            110u8, 87u8, 102u8, 193u8, 125u8, 129u8, 0u8, 221u8, 218u8, 229u8,
+                            101u8, 94u8, 74u8, 229u8, 246u8, 180u8, 113u8, 11u8, 15u8, 159u8, 98u8,
+                            90u8, 30u8, 112u8, 164u8, 236u8, 151u8, 220u8, 19u8, 83u8, 67u8, 248u8,
                         ],
                     )
                 }
@@ -36068,15 +36693,59 @@ pub mod api {
                     )
                 }
                 #[doc = " Fungible assets which we know are locked on a remote chain."]
-                pub fn remote_locked_fungibles(
+                pub fn remote_locked_fungibles_iter(
+                    &self,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    runtime_types::pallet_xcm::pallet::RemoteLockedFungibleRecord<()>,
+                    (),
+                    (),
+                    ::subxt::storage::address::Yes,
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "XcmPallet",
+                        "RemoteLockedFungibles",
+                        vec![],
+                        [
+                            74u8, 249u8, 83u8, 245u8, 44u8, 230u8, 152u8, 82u8, 4u8, 163u8, 230u8,
+                            121u8, 87u8, 143u8, 184u8, 12u8, 117u8, 112u8, 131u8, 160u8, 232u8,
+                            62u8, 175u8, 15u8, 81u8, 198u8, 182u8, 255u8, 37u8, 81u8, 6u8, 57u8,
+                        ],
+                    )
+                }
+                #[doc = " Fungible assets which we know are locked on a remote chain."]
+                pub fn remote_locked_fungibles_iter1(
                     &self,
                     _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
-                    _1: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
-                    _2: impl ::std::borrow::Borrow<runtime_types::xcm::VersionedAssetId>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_xcm::pallet::RemoteLockedFungibleRecord<()>,
+                    (),
+                    (),
                     ::subxt::storage::address::Yes,
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "XcmPallet",
+                        "RemoteLockedFungibles",
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
+                        [
+                            74u8, 249u8, 83u8, 245u8, 44u8, 230u8, 152u8, 82u8, 4u8, 163u8, 230u8,
+                            121u8, 87u8, 143u8, 184u8, 12u8, 117u8, 112u8, 131u8, 160u8, 232u8,
+                            62u8, 175u8, 15u8, 81u8, 198u8, 182u8, 255u8, 37u8, 81u8, 6u8, 57u8,
+                        ],
+                    )
+                }
+                #[doc = " Fungible assets which we know are locked on a remote chain."]
+                pub fn remote_locked_fungibles_iter2(
+                    &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
+                    _1: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    runtime_types::pallet_xcm::pallet::RemoteLockedFungibleRecord<()>,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
@@ -36086,88 +36755,92 @@ pub mod api {
                         vec![
                             ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
                             ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
-                            ::subxt::storage::address::make_static_storage_map_key(_2.borrow()),
                         ],
                         [
-                            100u8, 88u8, 111u8, 249u8, 153u8, 101u8, 193u8, 52u8, 201u8, 73u8,
-                            121u8, 226u8, 175u8, 108u8, 169u8, 225u8, 10u8, 105u8, 27u8, 5u8,
-                            174u8, 129u8, 53u8, 59u8, 80u8, 171u8, 133u8, 99u8, 102u8, 148u8,
-                            206u8, 159u8,
+                            74u8, 249u8, 83u8, 245u8, 44u8, 230u8, 152u8, 82u8, 4u8, 163u8, 230u8,
+                            121u8, 87u8, 143u8, 184u8, 12u8, 117u8, 112u8, 131u8, 160u8, 232u8,
+                            62u8, 175u8, 15u8, 81u8, 198u8, 182u8, 255u8, 37u8, 81u8, 6u8, 57u8,
                         ],
                     )
                 }
                 #[doc = " Fungible assets which we know are locked on a remote chain."]
-                pub fn remote_locked_fungibles_root(
+                pub fn remote_locked_fungibles(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::core::primitive::u32>,
+                    _1: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
+                    _2: impl ::std::borrow::Borrow<runtime_types::xcm::VersionedAssetId>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_xcm::pallet::RemoteLockedFungibleRecord<()>,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "XcmPallet",
                         "RemoteLockedFungibles",
-                        Vec::new(),
+                        vec![
+                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
+                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
+                            ::subxt::storage::address::make_static_storage_map_key(_2.borrow()),
+                        ],
                         [
-                            100u8, 88u8, 111u8, 249u8, 153u8, 101u8, 193u8, 52u8, 201u8, 73u8,
-                            121u8, 226u8, 175u8, 108u8, 169u8, 225u8, 10u8, 105u8, 27u8, 5u8,
-                            174u8, 129u8, 53u8, 59u8, 80u8, 171u8, 133u8, 99u8, 102u8, 148u8,
-                            206u8, 159u8,
+                            74u8, 249u8, 83u8, 245u8, 44u8, 230u8, 152u8, 82u8, 4u8, 163u8, 230u8,
+                            121u8, 87u8, 143u8, 184u8, 12u8, 117u8, 112u8, 131u8, 160u8, 232u8,
+                            62u8, 175u8, 15u8, 81u8, 198u8, 182u8, 255u8, 37u8, 81u8, 6u8, 57u8,
                         ],
                     )
                 }
                 #[doc = " Fungible assets which we know are locked on this chain."]
-                pub fn locked_fungibles(
+                pub fn locked_fungibles_iter(
                     &self,
-                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<(
                         ::core::primitive::u128,
                         runtime_types::xcm::VersionedMultiLocation,
                     )>,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "XcmPallet",
                         "LockedFungibles",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            240u8, 80u8, 205u8, 136u8, 21u8, 85u8, 0u8, 172u8, 9u8, 12u8, 36u8,
-                            16u8, 64u8, 213u8, 52u8, 227u8, 41u8, 150u8, 183u8, 135u8, 224u8,
-                            203u8, 66u8, 166u8, 115u8, 230u8, 245u8, 178u8, 194u8, 81u8, 35u8,
-                            245u8,
+                            110u8, 220u8, 127u8, 176u8, 219u8, 23u8, 132u8, 36u8, 224u8, 187u8,
+                            25u8, 103u8, 126u8, 99u8, 34u8, 105u8, 57u8, 182u8, 162u8, 69u8, 24u8,
+                            67u8, 221u8, 103u8, 79u8, 139u8, 187u8, 162u8, 113u8, 109u8, 163u8,
+                            35u8,
                         ],
                     )
                 }
                 #[doc = " Fungible assets which we know are locked on this chain."]
-                pub fn locked_fungibles_root(
+                pub fn locked_fungibles(
                     &self,
+                    _0: impl ::std::borrow::Borrow<::subxt::utils::AccountId32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::bounded_collections::bounded_vec::BoundedVec<(
                         ::core::primitive::u128,
                         runtime_types::xcm::VersionedMultiLocation,
                     )>,
+                    ::subxt::storage::address::Yes,
                     (),
                     (),
-                    ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "XcmPallet",
                         "LockedFungibles",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            240u8, 80u8, 205u8, 136u8, 21u8, 85u8, 0u8, 172u8, 9u8, 12u8, 36u8,
-                            16u8, 64u8, 213u8, 52u8, 227u8, 41u8, 150u8, 183u8, 135u8, 224u8,
-                            203u8, 66u8, 166u8, 115u8, 230u8, 245u8, 178u8, 194u8, 81u8, 35u8,
-                            245u8,
+                            110u8, 220u8, 127u8, 176u8, 219u8, 23u8, 132u8, 36u8, 224u8, 187u8,
+                            25u8, 103u8, 126u8, 99u8, 34u8, 105u8, 57u8, 182u8, 162u8, 69u8, 24u8,
+                            67u8, 221u8, 103u8, 79u8, 139u8, 187u8, 162u8, 113u8, 109u8, 163u8,
+                            35u8,
                         ],
                     )
                 }
@@ -36255,10 +36928,9 @@ pub mod api {
                             page_index,
                         },
                         [
-                            249u8, 194u8, 53u8, 213u8, 95u8, 100u8, 212u8, 239u8, 81u8, 202u8,
-                            106u8, 81u8, 201u8, 156u8, 154u8, 28u8, 222u8, 45u8, 25u8, 233u8,
-                            166u8, 127u8, 62u8, 64u8, 46u8, 159u8, 202u8, 208u8, 90u8, 12u8, 60u8,
-                            215u8,
+                            217u8, 3u8, 106u8, 158u8, 151u8, 194u8, 234u8, 4u8, 254u8, 4u8, 200u8,
+                            201u8, 107u8, 140u8, 220u8, 201u8, 245u8, 14u8, 23u8, 156u8, 41u8,
+                            106u8, 39u8, 90u8, 214u8, 1u8, 183u8, 45u8, 3u8, 83u8, 242u8, 30u8,
                         ],
                     )
                 }
@@ -36280,9 +36952,10 @@ pub mod api {
                             weight_limit,
                         },
                         [
-                            228u8, 182u8, 171u8, 224u8, 60u8, 224u8, 190u8, 13u8, 132u8, 62u8,
-                            212u8, 117u8, 103u8, 23u8, 74u8, 45u8, 173u8, 26u8, 43u8, 95u8, 84u8,
-                            168u8, 113u8, 63u8, 198u8, 24u8, 161u8, 5u8, 217u8, 68u8, 88u8, 129u8,
+                            101u8, 2u8, 86u8, 225u8, 217u8, 229u8, 143u8, 214u8, 146u8, 190u8,
+                            182u8, 102u8, 251u8, 18u8, 179u8, 187u8, 113u8, 29u8, 182u8, 24u8,
+                            34u8, 179u8, 64u8, 249u8, 139u8, 76u8, 50u8, 238u8, 132u8, 167u8,
+                            115u8, 141u8,
                         ],
                     )
                 }
@@ -36382,29 +37055,31 @@ pub mod api {
             use super::runtime_types;
             pub struct StorageApi;
             impl StorageApi {
-                #[doc = " The index of the first and last (non-empty) pages."]                pub fn book_state_for (& self , _0 : impl :: std :: borrow :: Borrow < runtime_types :: polkadot_runtime_parachains :: inclusion :: AggregateMessageOrigin > ,) -> :: subxt :: storage :: address :: Address :: < :: subxt :: storage :: address :: StaticStorageMapKey , runtime_types :: pallet_message_queue :: BookState < runtime_types :: polkadot_runtime_parachains :: inclusion :: AggregateMessageOrigin > , :: subxt :: storage :: address :: Yes , :: subxt :: storage :: address :: Yes , :: subxt :: storage :: address :: Yes >{
+                #[doc = " The index of the first and last (non-empty) pages."]                pub fn book_state_for_iter (& self ,) -> :: subxt :: storage :: address :: Address :: < :: subxt :: storage :: address :: StaticStorageMapKey , runtime_types :: pallet_message_queue :: BookState < runtime_types :: polkadot_runtime_parachains :: inclusion :: AggregateMessageOrigin > , () , :: subxt :: storage :: address :: Yes , :: subxt :: storage :: address :: Yes >{
                     ::subxt::storage::address::Address::new_static(
                         "MessageQueue",
                         "BookStateFor",
-                        vec![::subxt::storage::address::make_static_storage_map_key(
-                            _0.borrow(),
-                        )],
+                        vec![],
                         [
-                            101u8, 219u8, 156u8, 174u8, 20u8, 72u8, 40u8, 71u8, 155u8, 127u8,
-                            201u8, 72u8, 65u8, 29u8, 95u8, 70u8, 6u8, 97u8, 22u8, 129u8, 165u8,
-                            66u8, 70u8, 89u8, 170u8, 75u8, 148u8, 121u8, 139u8, 230u8, 20u8, 128u8,
+                            32u8, 61u8, 161u8, 81u8, 134u8, 136u8, 252u8, 113u8, 204u8, 115u8,
+                            206u8, 180u8, 33u8, 185u8, 137u8, 155u8, 178u8, 189u8, 234u8, 201u8,
+                            31u8, 230u8, 156u8, 72u8, 37u8, 56u8, 152u8, 91u8, 50u8, 82u8, 191u8,
+                            2u8,
                         ],
                     )
                 }
-                #[doc = " The index of the first and last (non-empty) pages."]                pub fn book_state_for_root (& self ,) -> :: subxt :: storage :: address :: Address :: < :: subxt :: storage :: address :: StaticStorageMapKey , runtime_types :: pallet_message_queue :: BookState < runtime_types :: polkadot_runtime_parachains :: inclusion :: AggregateMessageOrigin > , () , :: subxt :: storage :: address :: Yes , :: subxt :: storage :: address :: Yes >{
+                #[doc = " The index of the first and last (non-empty) pages."]                pub fn book_state_for (& self , _0 : impl :: std :: borrow :: Borrow < runtime_types :: polkadot_runtime_parachains :: inclusion :: AggregateMessageOrigin > ,) -> :: subxt :: storage :: address :: Address :: < :: subxt :: storage :: address :: StaticStorageMapKey , runtime_types :: pallet_message_queue :: BookState < runtime_types :: polkadot_runtime_parachains :: inclusion :: AggregateMessageOrigin > , :: subxt :: storage :: address :: Yes , :: subxt :: storage :: address :: Yes , () >{
                     ::subxt::storage::address::Address::new_static(
                         "MessageQueue",
                         "BookStateFor",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
                         [
-                            101u8, 219u8, 156u8, 174u8, 20u8, 72u8, 40u8, 71u8, 155u8, 127u8,
-                            201u8, 72u8, 65u8, 29u8, 95u8, 70u8, 6u8, 97u8, 22u8, 129u8, 165u8,
-                            66u8, 70u8, 89u8, 170u8, 75u8, 148u8, 121u8, 139u8, 230u8, 20u8, 128u8,
+                            32u8, 61u8, 161u8, 81u8, 134u8, 136u8, 252u8, 113u8, 204u8, 115u8,
+                            206u8, 180u8, 33u8, 185u8, 137u8, 155u8, 178u8, 189u8, 234u8, 201u8,
+                            31u8, 230u8, 156u8, 72u8, 37u8, 56u8, 152u8, 91u8, 50u8, 82u8, 191u8,
+                            2u8,
                         ],
                     )
                 }
@@ -36431,35 +37106,31 @@ pub mod api {
                     )
                 }
                 #[doc = " The map of page indices to pages."]
-                pub fn pages(
+                pub fn pages_iter(
                     &self,
-                    _0 : impl :: std :: borrow :: Borrow < runtime_types :: polkadot_runtime_parachains :: inclusion :: AggregateMessageOrigin >,
-                    _1: impl ::std::borrow::Borrow<::core::primitive::u32>,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_message_queue::Page<::core::primitive::u32>,
-                    ::subxt::storage::address::Yes,
+                    (),
                     (),
                     ::subxt::storage::address::Yes,
                 > {
                     ::subxt::storage::address::Address::new_static(
                         "MessageQueue",
                         "Pages",
-                        vec![
-                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
-                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
-                        ],
+                        vec![],
                         [
-                            134u8, 234u8, 133u8, 236u8, 120u8, 91u8, 243u8, 213u8, 115u8, 249u8,
-                            242u8, 242u8, 118u8, 114u8, 113u8, 106u8, 2u8, 32u8, 18u8, 197u8, 57u8,
-                            105u8, 49u8, 161u8, 171u8, 254u8, 155u8, 34u8, 82u8, 73u8, 126u8,
-                            210u8,
+                            56u8, 181u8, 157u8, 16u8, 157u8, 123u8, 106u8, 93u8, 199u8, 208u8,
+                            153u8, 53u8, 168u8, 188u8, 124u8, 77u8, 140u8, 163u8, 113u8, 16u8,
+                            232u8, 47u8, 10u8, 185u8, 113u8, 230u8, 47u8, 91u8, 253u8, 196u8, 95u8,
+                            102u8,
                         ],
                     )
                 }
                 #[doc = " The map of page indices to pages."]
-                pub fn pages_root(
+                pub fn pages_iter1(
                     &self,
+                    _0 : impl :: std :: borrow :: Borrow < runtime_types :: polkadot_runtime_parachains :: inclusion :: AggregateMessageOrigin >,
                 ) -> ::subxt::storage::address::Address<
                     ::subxt::storage::address::StaticStorageMapKey,
                     runtime_types::pallet_message_queue::Page<::core::primitive::u32>,
@@ -36470,12 +37141,41 @@ pub mod api {
                     ::subxt::storage::address::Address::new_static(
                         "MessageQueue",
                         "Pages",
-                        Vec::new(),
+                        vec![::subxt::storage::address::make_static_storage_map_key(
+                            _0.borrow(),
+                        )],
+                        [
+                            56u8, 181u8, 157u8, 16u8, 157u8, 123u8, 106u8, 93u8, 199u8, 208u8,
+                            153u8, 53u8, 168u8, 188u8, 124u8, 77u8, 140u8, 163u8, 113u8, 16u8,
+                            232u8, 47u8, 10u8, 185u8, 113u8, 230u8, 47u8, 91u8, 253u8, 196u8, 95u8,
+                            102u8,
+                        ],
+                    )
+                }
+                #[doc = " The map of page indices to pages."]
+                pub fn pages(
+                    &self,
+                    _0 : impl :: std :: borrow :: Borrow < runtime_types :: polkadot_runtime_parachains :: inclusion :: AggregateMessageOrigin >,
+                    _1: impl ::std::borrow::Borrow<::core::primitive::u32>,
+                ) -> ::subxt::storage::address::Address<
+                    ::subxt::storage::address::StaticStorageMapKey,
+                    runtime_types::pallet_message_queue::Page<::core::primitive::u32>,
+                    ::subxt::storage::address::Yes,
+                    (),
+                    (),
+                > {
+                    ::subxt::storage::address::Address::new_static(
+                        "MessageQueue",
+                        "Pages",
+                        vec![
+                            ::subxt::storage::address::make_static_storage_map_key(_0.borrow()),
+                            ::subxt::storage::address::make_static_storage_map_key(_1.borrow()),
+                        ],
                         [
-                            134u8, 234u8, 133u8, 236u8, 120u8, 91u8, 243u8, 213u8, 115u8, 249u8,
-                            242u8, 242u8, 118u8, 114u8, 113u8, 106u8, 2u8, 32u8, 18u8, 197u8, 57u8,
-                            105u8, 49u8, 161u8, 171u8, 254u8, 155u8, 34u8, 82u8, 73u8, 126u8,
-                            210u8,
+                            56u8, 181u8, 157u8, 16u8, 157u8, 123u8, 106u8, 93u8, 199u8, 208u8,
+                            153u8, 53u8, 168u8, 188u8, 124u8, 77u8, 140u8, 163u8, 113u8, 16u8,
+                            232u8, 47u8, 10u8, 185u8, 113u8, 230u8, 47u8, 91u8, 253u8, 196u8, 95u8,
+                            102u8,
                         ],
                     )
                 }
@@ -36531,10 +37231,9 @@ pub mod api {
                         "MessageQueue",
                         "ServiceWeight",
                         [
-                            194u8, 157u8, 162u8, 120u8, 24u8, 204u8, 63u8, 167u8, 187u8, 244u8,
-                            45u8, 182u8, 177u8, 32u8, 34u8, 72u8, 204u8, 252u8, 202u8, 221u8,
-                            201u8, 158u8, 136u8, 75u8, 213u8, 102u8, 145u8, 143u8, 88u8, 141u8,
-                            83u8, 195u8,
+                            204u8, 140u8, 63u8, 167u8, 49u8, 8u8, 148u8, 163u8, 190u8, 224u8, 15u8,
+                            103u8, 86u8, 153u8, 248u8, 117u8, 223u8, 117u8, 210u8, 80u8, 205u8,
+                            155u8, 40u8, 11u8, 59u8, 63u8, 129u8, 156u8, 17u8, 83u8, 177u8, 250u8,
                         ],
                     )
                 }