Merge pull request #378 from derekpierre/fix-proxy-check

Fix bug where proxy contract address was not correctly being determined

Author: derekpierre

deployment/params.py

@@ -153,9 +153,11 @@ def resolve(self) -> Any:
 
         if self.check_for_proxy_instances:
             # check if contract is proxied - if so return proxy contract instead
-            proxy_info = chain.contracts.get_proxy_info(contract_instance.address)
-            if proxy_info:
-                return proxy_info.address
+            proxy_info_keys = chain.contracts.proxy_infos.memory.keys()
+            for proxy_address in proxy_info_keys:
+                proxy_info = chain.contracts.get_proxy_info(proxy_address)
+                if proxy_info and proxy_info.target == contract_instance.address:
+                    return proxy_address
 
         return contract_instance.address
 
@@ -417,7 +419,7 @@ def from_config(cls, config: typing.Dict) -> "ProxyParameters":
                     contract_names=contract_names,
                     constants=constants,
                     contract_name=contract_name,
-                    check_for_proxy_instances=False,
+                    check_for_proxy_instances=True,
                 ),
             )
             contracts_proxy_info.update({contract_name: proxy_info})