prediction-market-agent-tooling 0.69.11.dev1122__tar.gz → 0.69.13__tar.gz

{prediction_market_agent_tooling-0.69.11.dev1122 → prediction_market_agent_tooling-0.69.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prediction-market-agent-tooling
-Version: 0.69.11.dev1122
+Version: 0.69.13
 Summary: Tools to benchmark, deploy and monitor prediction market agents.
 License-File: LICENSE
 Author: Gnosis

{prediction_market_agent_tooling-0.69.11.dev1122 → prediction_market_agent_tooling-0.69.13}/prediction_market_agent_tooling/tools/contract.py

@@ -5,11 +5,13 @@ import typing as t
 from contextlib import contextmanager
 
 import eth_abi
+import tenacity
 from eth_abi.exceptions import DecodingError
 from pydantic import BaseModel, field_validator
 from web3 import Web3
 from web3.constants import CHECKSUM_ADDRESSS_ZERO, HASH_ZERO
 from web3.contract.contract import Contract as Web3Contract
+from web3.exceptions import ContractCustomError, ContractLogicError
 
 from prediction_market_agent_tooling.chains import POLYGON_CHAIN_ID
 from prediction_market_agent_tooling.config import APIKeys, RPCConfig
@@ -940,6 +942,8 @@ def uni_implementation_address(
         implementation_proxy_address(contract_address, web3),
         minimal_proxy_address(contract_address, web3),
         seer_minimal_proxy_address(contract_address, web3),
+        eip_1967_proxy_address(contract_address, web3),
+        zeppelinos_unstructured_storage_proxy_address(contract_address, web3),
     ]
     return [addr for addr in addresses if addr is not None]
 
@@ -951,7 +955,20 @@ def implementation_proxy_address(
         contract_address, "implementation", web3, look_for_proxy_contract=False
     ):
         return None
-    return ContractProxyOnGnosisChain(address=contract_address).implementation(web3)
+    try:
+        return ContractProxyOnGnosisChain(address=contract_address).implementation(web3)
+    except (ContractCustomError, ContractLogicError, tenacity.RetryError) as e:
+        if isinstance(e, tenacity.RetryError) and not isinstance(
+            e.last_attempt.exception(), (ContractCustomError, ContractLogicError)
+        ):
+            raise
+
+        # For example https://gnosisscan.io/address/0x3221a28ed2b2e955da64d1d299956f277562c95c#code,
+        # it has the implementation method, but it's only for admins.
+        logger.warning(
+            f"Failed to get implementation for {contract_address=} even though it has the method: {e}"
+        )
+        return None
 
 
 def minimal_proxy_address(
@@ -982,6 +999,34 @@ def seer_minimal_proxy_address(
         return None
 
 
+def eip_1967_proxy_address(
+    contract_address: ChecksumAddress, web3: Web3
+) -> ChecksumAddress | None:
+    try:
+        slot = HexBytes(Web3.keccak(text="eip1967.proxy.implementation")).as_int() - 1
+        raw_slot = web3.eth.get_storage_at(contract_address, slot)
+        address = eth_abi.decode(["address"], raw_slot)[0]
+        return Web3.to_checksum_address(address)
+    except DecodingError:
+        logger.info("Error decoding contract address for eip 1967 proxy")
+        return None
+
+
+def zeppelinos_unstructured_storage_proxy_address(
+    contract_address: ChecksumAddress, web3: Web3
+) -> ChecksumAddress | None:
+    try:
+        slot = HexBytes(
+            Web3.keccak(text="org.zeppelinos.proxy.implementation")
+        ).as_int()
+        raw_slot = web3.eth.get_storage_at(contract_address, slot)
+        address = eth_abi.decode(["address"], raw_slot)[0]
+        return Web3.to_checksum_address(address)
+    except DecodingError:
+        logger.info("Error decoding contract address for zeppelinos proxy")
+        return None
+
+
 def init_collateral_token_contract(
     address: ChecksumAddress, web3: Web3 | None
 ) -> ContractERC20BaseClass:

{prediction_market_agent_tooling-0.69.11.dev1122 → prediction_market_agent_tooling-0.69.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "prediction-market-agent-tooling"
-version = "0.69.11.dev1122"
+version = "0.69.13"
 description = "Tools to benchmark, deploy and monitor prediction market agents."
 authors = ["Gnosis"]
 readme = "README.md"