Wrong handling of storage maps with tuple keys

[mateuszaaa]

Seems like subxt generates wrong static types in case of using (u32, u32) as a key to a substrate StorageMap

given 2 similiar StorageMaps where one is raw tuple

    #[pallet::storage]
    pub type TupleStorageMap<T: Config> =
        StorageMap<_, Blake2_128Concat, (u32, u32), Option<u32>, ValueQuery>;

and the other is wrapper type

    #[derive(
        Default, Eq, PartialEq, RuntimeDebug, Clone, Encode, Decode, TypeInfo, Serialize, Copy, MaxEncodedLen
    )]
    pub struct TupleWrapper(pub (u32, u32));

    #[pallet::storage]
    pub type TupleWrapperStorageMap<T: Config> =
        StorageMap<_, Blake2_128Concat, TupleWrapper, Option<u32>, ValueQuery>;

The raw tuple doesnt work well... First of all when queried it returns None while value is clearly there as data are inserted in genesis block(link to reproducible example below)

There are at least to problems:

• for raw tuple storage is recogniced to have 2 parameters of type u32 while it should be single parameter of type (u32,u32).

• for similiar case where TupleWrapper is used instead, it defines single query parameter

I created repository with minimal reproducible examples that includes minimal node runtime based on substrate minimal template that defines 2 storage maps(as described above) and inserts some data into the storage automatically. It also contains bindings generated from node metadata as well as example prooving that querying data from storage map doesnt work...

[mateuszaaa]

Im willing to contribute and help solving the issue but some guidance would be appreciated 🙏

[mateuszaaa]

btw i also tried dynamic query. According to polkadot spec tuple is encoded as concatenation of inner types. and integers are encoded using little endian representation. But somehow it doesnt work as well