fix: ensure composite inners are resolved to known types (#45)

* fix: ensure composite inners are resolved to known types

* fix: fix clippy

* chore: use dojoengine patch until new account API is supported

Cargo.toml

@@ -54,9 +54,9 @@ url.workspace = true
 tokio = { version = "1.15.0", features = ["full"], optional = true }
 
 [patch.crates-io]
-# Remove this patch once the following PR is merged: <https://github.com/xJonathanLEI/starknet-rs/pull/615>
-# To enable std feature on `starknet-types-core`.
-starknet-core = { git = "https://github.com/kariy/starknet-rs", rev = "fffe8e9" }
+# Remove this patch once starknet-rs and types-core new revs in
+# <https://github.com/cartridge-gg/cainome/pull/44> are supported by Dojo.
+starknet-core = { git = "https://github.com/dojoengine/starknet-rs", branch = "fix/include-patch" }
 
 [features]
 default = []

crates/parser/src/abi/parser.rs

@@ -347,6 +347,31 @@ impl AbiParser {
             }
         }
 
+        // Can be a very huge copy here. Need an other way to do that in the loop
+        // above here.
+        let filtered = tokens_filtered.clone();
+
+        // So now once it's filtered, we may actually iterate again on the tokens
+        // to resolve all structs/enums inners that may reference existing types.
+        for (name, tokens) in tokens_filtered.iter_mut() {
+            if let Token::Composite(ref mut composite) = tokens {
+                for inner in &mut composite.inners {
+                    if let Token::Composite(ref mut inner_composite) = inner.token {
+                        if inner_composite.r#type == CompositeType::Unknown {
+                            inner.token = filtered
+                                .get(&inner.token.type_path())
+                                .unwrap_or_else(|| panic!("In composite {} the inner token type for {} is expected to exist: {}",
+                                    name,
+                                    inner.name,
+                                    inner.token.type_path()
+                                ))
+                                .clone();
+                        }
+                    }
+                }
+            }
+        }
+
         tokens_filtered
     }
 }