fix(invariant): lookup fuzz interface abi by name or identifier

crates/common/src/contracts.rs

@@ -259,6 +259,15 @@ impl ContractsByArtifact {
         Ok(contracts.first().cloned())
     }
 
+    /// Finds abi for contract which has the same contract name or identifier as `id`.
+    pub fn find_abi_by_name_or_identifier(&self, id: &str) -> Option<JsonAbi> {
+        self.iter()
+            .find(|(artifact, _)| {
+                artifact.name.split(".").next().unwrap() == id || artifact.identifier() == id
+            })
+            .map(|(_, contract)| contract.abi.clone())
+    }
+
     /// Flattens the contracts into functions, events and errors.
     pub fn flatten(&self) -> (BTreeMap<Selector, Function>, BTreeMap<B256, Event>, JsonAbi) {
         let mut funcs = BTreeMap::new();

crates/evm/evm/src/executors/invariant/mod.rs

@@ -767,21 +767,18 @@ impl<'a> InvariantExecutor<'a> {
             // Identifiers are specified as an array, so we loop through them.
             for identifier in artifacts {
                 // Try to find the contract by name or identifier in the project's contracts.
-                if let Some((_, contract)) =
-                    self.project_contracts.find_by_name_or_identifier(identifier)?
+                if let Some(abi) = self.project_contracts.find_abi_by_name_or_identifier(identifier)
                 {
                     combined
                         // Check if there's an entry for the given key in the 'combined' map.
                         .entry(*addr)
                         // If the entry exists, extends its ABI with the function list.
                         .and_modify(|entry| {
                             // Extend the ABI's function list with the new functions.
-                            entry.abi.functions.extend(contract.abi.functions.clone());
+                            entry.abi.functions.extend(abi.functions.clone());
                         })
                         // Otherwise insert it into the map.
-                        .or_insert_with(|| {
-                            TargetedContract::new(identifier.to_string(), contract.abi.clone())
-                        });
+                        .or_insert_with(|| TargetedContract::new(identifier.to_string(), abi));
                 }
             }
         }