refactor: use contract loader first

ApeWorX · Jul 13, 2023 · 8326ce4 · 8326ce4
1 parent ef1f46f
commit 8326ce4
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/apepay/__init__.py b/apepay/__init__.py
@@ -58,9 +58,10 @@ def normalize_address(cls, value: Any) -> AddressType:
 
     @property
     def contract(self) -> ContractInstance:
-        # TODO: Fix this
-        return self.project_manager.StreamManager.at(self.address)
-        # return self.chain_manager.contracts.instance_at(self.address)
+        try:
+            return self.chain_manager.contracts.instance_at(self.address)
+        except Exception:
+            return self.project_manager.StreamManager.at(self.address)
 
     def __repr__(self) -> str:
         return f"<apepay_sdk.StreamManager address={self.address}>"