prediction-market-agent-tooling 0.69.11.dev1122__py3-none-any.whl → 0.69.13.dev1128__py3-none-any.whl

prediction_market_agent_tooling/tools/contract.py

@@ -10,6 +10,7 @@ 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
 
 from prediction_market_agent_tooling.chains import POLYGON_CHAIN_ID
 from prediction_market_agent_tooling.config import APIKeys, RPCConfig
@@ -940,6 +941,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_proxy_address(contract_address, web3),
     ]
     return [addr for addr in addresses if addr is not None]
 
@@ -951,7 +954,15 @@ 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 as e:
+        # 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 +993,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_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.dist-info → prediction_market_agent_tooling-0.69.13.dev1128.dist-info}/METADATA

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

{prediction_market_agent_tooling-0.69.11.dev1122.dist-info → prediction_market_agent_tooling-0.69.13.dev1128.dist-info}/RECORD

@@ -92,7 +92,7 @@ prediction_market_agent_tooling/tools/betting_strategies/utils.py,sha256=MpS3FOM
 prediction_market_agent_tooling/tools/caches/db_cache.py,sha256=V6o6UdesjkKzSJMhqkUtD76cJGPaNhuwA4OL2chIYSI,13801
 prediction_market_agent_tooling/tools/caches/inmemory_cache.py,sha256=ZW5iI5rmjqeAebu5T7ftRnlkxiL02IC-MxCfDB80x7w,1506
 prediction_market_agent_tooling/tools/caches/serializers.py,sha256=fwyIHUsL7u9NY7ZihTcUdqsvl2psatcbTfgWHTSez3U,2427
-prediction_market_agent_tooling/tools/contract.py,sha256=BzpAFcbKl_KqwgAlaXx63Fg8jzr0EO3qEeOs1K11CPA,33905
+prediction_market_agent_tooling/tools/contract.py,sha256=9fyyu4HoYyKkuLnIYtxTkruJVXMlVBxUm9BzeHwyKV8,35474
 prediction_market_agent_tooling/tools/contract_utils.py,sha256=9X9raICUZkPDShilt02aYzS_ILZ62u0vG5081uWLdqk,2152
 prediction_market_agent_tooling/tools/costs.py,sha256=EaAJ7v9laD4VEV3d8B44M4u3_oEO_H16jRVCdoZ93Uw,954
 prediction_market_agent_tooling/tools/cow/cow_order.py,sha256=DN_8cPrr4jWVpXdS4D0j1QB19nB8fxDoSheo2BFMc8M,14523
@@ -137,8 +137,8 @@ prediction_market_agent_tooling/tools/tokens/usd.py,sha256=DPO-4HBTy1-TZHKL_9CnH
 prediction_market_agent_tooling/tools/transaction_cache.py,sha256=K5YKNL2_tR10Iw2TD9fuP-CTGpBbZtNdgbd0B_R7pjg,1814
 prediction_market_agent_tooling/tools/utils.py,sha256=ruq6P5TFs8CBHxeBLj1Plpx7kuNFPpDgMsJGQgDiRNs,8785
 prediction_market_agent_tooling/tools/web3_utils.py,sha256=CDbaidlLeQ4VHzSg150L7QNfHfGveljSePGuDVFEYqc,13963
-prediction_market_agent_tooling-0.69.11.dev1122.dist-info/METADATA,sha256=--DwjAkzPXoeCKFir_GnmfydDWkx3NObybMpINRJrKE,8899
-prediction_market_agent_tooling-0.69.11.dev1122.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-prediction_market_agent_tooling-0.69.11.dev1122.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
-prediction_market_agent_tooling-0.69.11.dev1122.dist-info/licenses/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
-prediction_market_agent_tooling-0.69.11.dev1122.dist-info/RECORD,,
+prediction_market_agent_tooling-0.69.13.dev1128.dist-info/METADATA,sha256=tL05XGaBxpeMZSTLUoioFC1ZThkla2Kv82x1Wc3qCuA,8899
+prediction_market_agent_tooling-0.69.13.dev1128.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+prediction_market_agent_tooling-0.69.13.dev1128.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
+prediction_market_agent_tooling-0.69.13.dev1128.dist-info/licenses/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
+prediction_market_agent_tooling-0.69.13.dev1128.dist-info/RECORD,,