fix: populate with fallback handler abi

banteg · Jun 28, 2023 · f9a8a59 · f9a8a59
1 parent 2c74f5f
commit f9a8a59
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/ape_safe/accounts.py b/ape_safe/accounts.py
@@ -74,12 +74,15 @@ def address(self) -> AddressType:
     @cached_property
     def contract(self) -> ContractInstance:
         safe_contract = self.chain_manager.contracts.instance_at(self.address)
-        if fallback_abi := self.fallback_handler and self.fallback_handler.contract_type.dict()["abi"]:
-            contract_type = safe_contract.contract_type.dict()
-            if set(fallback_abi) in set(contract_type["abi"]):
-                return safe_contract
+        if self.fallback_handler:
+            contract_signatures = {x.signature for x in safe_contract.contract_type.abi}
+            fallback_signatures = {x.signature for x in self.fallback_handler.contract_type.abi}
+            if fallback_signatures < contract_signatures:
+                return safe_contract  # for some reason this never gets hit
 
-            contract_type["abi"].extend(fallback_abi)
+            contract_type = safe_contract.contract_type.dict()
+            fallback_type = self.fallback_handler.contract_type.dict()
+            contract_type["abi"].extend(fallback_type["abi"])
             return self.chain_manager.contracts.instance_at(
                 self.address, contract_type=ContractType.parse_obj(contract_type)
             )