Merge pull request #35 from Alzymologist/more-signature-detectors

feat: detect multisignature as signature
Alzymologist · Oct 28, 2024 · 93a818c · 93a818c
2 parents b32ba7a + 8ea5244
commit 93a818c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/src/fill_prepare.rs b/src/fill_prepare.rs
@@ -19,7 +19,9 @@ use substrate_parser::{
     decoding_sci::{find_bit_order_ty, husk_type, FoundBitOrder, ResolvedTy, Ty},
     error::{ExtensionsError, RegistryError, RegistryInternalError},
     propagated::{Checker, Propagated, SpecialtySet},
-    special_indicators::{SpecialtyH256, SpecialtyTypeHinted, SpecialtyUnsignedInteger},
+    special_indicators::{
+        SignatureIndicator, SpecialtyH256, SpecialtyTypeHinted, SpecialtyUnsignedInteger,
+    },
     traits::ResolveType,
 };
 
@@ -657,12 +659,21 @@ impl TransactionToFill {
             let registry = metadata.types();
             for (i, variant) in variant_selector.available_variants.iter().enumerate() {
                 if variant.fields.len() == 1 {
-                    let ty = registry.resolve_ty(variant.fields[0].ty.id, ext_memory)?;
-                    if let SpecialtyTypeHinted::SignatureSr25519 =
-                        SpecialtyTypeHinted::from_type(&ty)
-                    {
+                    if let SignatureIndicator::Sr25519 = SignatureIndicator::from_field::<E, M>(
+                        &variant.fields[0],
+                        ext_memory,
+                        &registry,
+                    ) {
                         found_index = Some(i);
                         break;
+                    } else {
+                        let ty = registry.resolve_ty(variant.fields[0].ty.id, ext_memory)?;
+                        if let SpecialtyTypeHinted::SignatureSr25519 =
+                            SpecialtyTypeHinted::from_type(&ty)
+                        {
+                            found_index = Some(i);
+                            break;
+                        }
                     }
                 }
             }

diff --git a/src/storage_query.rs b/src/storage_query.rs
@@ -17,6 +17,7 @@ use crate::finalize::{Finalize, TypeContent};
 use crate::traits::{AsFillMetadata, AsPalletMetadata};
 
 #[derive(Clone, Debug)]
+#[allow(clippy::large_enum_variant)]
 pub enum EntrySelector {
     Empty,
     Functional(EntrySelectorFunctional),
@@ -140,6 +141,7 @@ pub struct StorageEntry {
 }
 
 #[derive(Clone, Debug)]
+#[allow(clippy::large_enum_variant)]
 pub enum StorageEntryTypeToFill {
     Plain(UntrackedSymbol<TypeId>),
     Map {
@@ -150,6 +152,7 @@ pub enum StorageEntryTypeToFill {
 }
 
 #[derive(Clone, Debug)]
+#[allow(clippy::large_enum_variant)]
 pub enum StorageSelector {
     Empty,
     Functional(StorageSelectorFunctional),

diff --git a/src/try_fill.rs b/src/try_fill.rs
@@ -68,6 +68,7 @@ impl UnsignedToFill {
             UnsignedToFill::U128(ref mut old) => unsigned!(U128, old, source),
         }
     }
+    #[allow(irrefutable_let_patterns)]
     pub fn upd_from_rpc_u32(&mut self, source: u32) {
         match self {
             UnsignedToFill::U8(ref mut old) => rpc_u32_fit!(u8, old, source),