prediction-market-agent-tooling 0.64.11.dev657__py3-none-any.whl → 0.64.12__py3-none-any.whl

prediction_market_agent_tooling/chains.py

@@ -0,0 +1,4 @@
+from prediction_market_agent_tooling.gtypes import ChainID
+
+ETHEREUM_ID = ChainID(1)
+GNOSIS_CHAIN_ID = ChainID(100)

prediction_market_agent_tooling/config.py

@@ -12,6 +12,7 @@ from safe_eth.eth import EthereumClient
 from safe_eth.safe.safe import SafeV141
 from web3 import Account, Web3
 
+from prediction_market_agent_tooling.chains import ETHEREUM_ID, GNOSIS_CHAIN_ID
 from prediction_market_agent_tooling.deploy.gcp.utils import gcp_get_secret_value
 from prediction_market_agent_tooling.gtypes import (
     ChainID,
@@ -280,7 +281,7 @@ class RPCConfig(BaseSettings):
 
     ETHEREUM_RPC_URL: URI = Field(default=URI("https://rpc.eth.gateway.fm"))
     GNOSIS_RPC_URL: URI = Field(default=URI("https://rpc.gnosis.gateway.fm"))
-    CHAIN_ID: ChainID = Field(default=ChainID(100))
+    CHAIN_ID: ChainID = Field(default=GNOSIS_CHAIN_ID)
 
     @property
     def ethereum_rpc_url(self) -> URI:
@@ -299,9 +300,9 @@ class RPCConfig(BaseSettings):
         return check_not_none(self.CHAIN_ID, "CHAIN_ID missing in the environment.")
 
     def chain_id_to_rpc_url(self, chain_id: ChainID) -> URI:
-        if chain_id == ChainID(1):
+        if chain_id == ETHEREUM_ID:
             return self.ethereum_rpc_url
-        elif chain_id == ChainID(100):
+        elif chain_id == GNOSIS_CHAIN_ID:
             return self.gnosis_rpc_url
         else:
             raise ValueError(f"Unsupported chain ID: {chain_id}")

prediction_market_agent_tooling/markets/omen/omen_contracts.py

@@ -431,6 +431,12 @@ class OmenFixedProductMarketMakerContract(ContractOnGnosisChain):
         )
 
 
+class MetriSuperGroup(ContractERC20OnGnosisChain):
+    address: ChecksumAddress = Web3.to_checksum_address(
+        "0x7147A7405fCFe5CFa30c6d5363f9f357a317d082"
+    )
+
+
 class GNOContract(ContractERC20OnGnosisChain):
     address: ChecksumAddress = Web3.to_checksum_address(
         "0x9c58bacc331c9aa871afd802db6379a98e80cedb"
@@ -923,10 +929,12 @@ class CollateralTokenChoice(str, Enum):
     wxdai = "wxdai"
     sdai = "sdai"
     gno = "gno"
+    metri_super_user = "metri_super_user"
 
 
 COLLATERAL_TOKEN_CHOICE_TO_ADDRESS = {
     CollateralTokenChoice.wxdai: WrappedxDaiContract().address,
     CollateralTokenChoice.sdai: sDaiContract().address,
     CollateralTokenChoice.gno: GNOContract().address,
+    CollateralTokenChoice.metri_super_user: MetriSuperGroup().address,
 }

prediction_market_agent_tooling/tools/contract.py

@@ -4,6 +4,8 @@ import time
 import typing as t
 from contextlib import contextmanager
 
+import eth_abi
+from eth_abi.exceptions import DecodingError
 from pydantic import BaseModel, field_validator
 from web3 import Web3
 from web3.constants import CHECKSUM_ADDRESSS_ZERO
@@ -20,6 +22,7 @@ from prediction_market_agent_tooling.gtypes import (
     TxReceipt,
     Wei,
 )
+from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.tools.utils import DatetimeUTC
 from prediction_market_agent_tooling.tools.web3_utils import (
     call_function_on_contract,
@@ -591,27 +594,64 @@ def contract_implements_function(
     look_for_proxy_contract: bool = True,
 ) -> bool:
     function_signature = f"{function_name}({','.join(function_arg_types or [])})"
-    function_hash = web3.keccak(text=function_signature)[0:4].hex()[2:]
+    function_selector = web3.keccak(text=function_signature)[0:4].hex()[2:]
+    # 1. Check directly in bytecode
+    bytecode = web3.eth.get_code(contract_address).hex()
+    if function_selector in bytecode:
+        return True
     contract_code = web3.eth.get_code(contract_address).hex()
-    implements = function_hash in contract_code
-    if (
-        not implements
-        and look_for_proxy_contract
-        and contract_implements_function(
+    implements = function_selector in contract_code
+
+    # If not found directly and we should check proxies
+    if not implements and look_for_proxy_contract:
+        # Case 1: Check if it's a standard proxy (has implementation() function)
+        if contract_implements_function(
             contract_address, "implementation", web3, look_for_proxy_contract=False
-        )
-    ):
-        implementation_address = ContractProxyOnGnosisChain(
-            address=contract_address
-        ).implementation()
-        implements = contract_implements_function(
-            implementation_address,
+        ):
+            # Get the implementation address and check the function there
+            implementation_address = ContractProxyOnGnosisChain(
+                address=contract_address
+            ).implementation()
+            implements = contract_implements_function(
+                implementation_address,
+                function_name=function_name,
+                web3=web3,
+                function_arg_types=function_arg_types,
+                look_for_proxy_contract=False,
+            )
+        else:
+            # Case 2: Check if it's a minimal proxy contract
+            implements = minimal_proxy_implements_function(
+                contract_address=contract_address,
+                function_name=function_name,
+                web3=web3,
+                function_arg_types=function_arg_types,
+            )
+
+    return implements
+
+
+def minimal_proxy_implements_function(
+    contract_address: ChecksumAddress,
+    function_name: str,
+    web3: Web3,
+    function_arg_types: list[str] | None = None,
+) -> bool:
+    try:
+        # Read storage slot 0 which should contain the implementation address in minimal proxies
+        raw_slot_0 = web3.eth.get_storage_at(contract_address, 0)
+        singleton_address = eth_abi.decode(["address"], raw_slot_0)[0]
+        # Recurse into singleton
+        return contract_implements_function(
+            Web3.to_checksum_address(singleton_address),
             function_name=function_name,
             web3=web3,
             function_arg_types=function_arg_types,
             look_for_proxy_contract=False,
         )
-    return implements
+    except DecodingError:
+        logger.info(f"Error decoding contract address for singleton")
+        return False
 
 
 def init_collateral_token_contract(

{prediction_market_agent_tooling-0.64.11.dev657.dist-info → prediction_market_agent_tooling-0.64.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: prediction-market-agent-tooling
-Version: 0.64.11.dev657
+Version: 0.64.12
 Summary: Tools to benchmark, deploy and monitor prediction market agents.
 Author: Gnosis
 Requires-Python: >=3.10,<3.13

{prediction_market_agent_tooling-0.64.11.dev657.dist-info → prediction_market_agent_tooling-0.64.12.dist-info}/RECORD

@@ -22,7 +22,8 @@ prediction_market_agent_tooling/benchmark/__init__.py,sha256=47DEQpj8HBSa-_TImW-
 prediction_market_agent_tooling/benchmark/agents.py,sha256=B1-uWdyeN4GGKMWGK_-CcAFJg1m9Y_XuaeIHPB29QR8,3971
 prediction_market_agent_tooling/benchmark/benchmark.py,sha256=MqTiaaJ3cYiOLUVR7OyImLWxcEya3Rl5JyFYW-K0lwM,17097
 prediction_market_agent_tooling/benchmark/utils.py,sha256=D0MfUkVZllmvcU0VOurk9tcKT7JTtwwOp-63zuCBVuc,2880
-prediction_market_agent_tooling/config.py,sha256=4nhDV_IkGl2-tK_yif4P3sTZm7cIvx2dWUlraSRtMwQ,10735
+prediction_market_agent_tooling/chains.py,sha256=1qQstoqXMwqwM7k-KH7MjMz8Ei-D83KZByvDbCZpAxs,116
+prediction_market_agent_tooling/config.py,sha256=rdpRHZyoTvRIDn7Qu6eViOjPBkR9Z0MOdEMFsQOuAIE,10822
 prediction_market_agent_tooling/deploy/agent.py,sha256=dobqPUQkaDPhsvMmXwibNKu4hSSTXTvmfa3F46ylLBc,26560
 prediction_market_agent_tooling/deploy/agent_example.py,sha256=dIIdZashExWk9tOdyDjw87AuUcGyM7jYxNChYrVK2dM,1001
 prediction_market_agent_tooling/deploy/betting_strategy.py,sha256=p25t7VU7I4hSkSl6SpzI_W55kLbYEySQdBqeschmARY,12918
@@ -57,7 +58,7 @@ prediction_market_agent_tooling/markets/omen/cow_contracts.py,sha256=sl1L4cK5nAJ
 prediction_market_agent_tooling/markets/omen/data_models.py,sha256=4YEOpU-ypq8IBxlEr_qgrKKWwE7wKG6VE_Dq-UKVdOE,30513
 prediction_market_agent_tooling/markets/omen/omen.py,sha256=NKeTT2gU6uZ9a4gGpa9Dxy6msFQp_41Ug85hIdCmQy4,51733
 prediction_market_agent_tooling/markets/omen/omen_constants.py,sha256=D9oflYKafLQiHYtB5sScMHqmXyzM8JP8J0yATmc4SQQ,233
-prediction_market_agent_tooling/markets/omen/omen_contracts.py,sha256=dnefjlqw03x7nr9TAmC4NSfAL6GtBn72_Qkmy8fQPCk,29552
+prediction_market_agent_tooling/markets/omen/omen_contracts.py,sha256=c6Z-hZzOybnmU-xRgzKElZmy_238Mf2mQ6dSUaYP_tY,29834
 prediction_market_agent_tooling/markets/omen/omen_resolving.py,sha256=Cyi9Ci-Z-K8WCZWVLs9oSuJC6qRobi_CpqDCno_5F-0,10238
 prediction_market_agent_tooling/markets/omen/omen_subgraph_handler.py,sha256=j-x_0Cm8IO-qynIXutu0iSPwrRDxdeCPYf5UHm6MJbs,39446
 prediction_market_agent_tooling/markets/polymarket/api.py,sha256=UZ4_TG8ceb9Y-qgsOKs8Qiv8zDt957QkT8IX2c83yqo,4800
@@ -90,7 +91,7 @@ prediction_market_agent_tooling/tools/betting_strategies/utils.py,sha256=68zFWUj
 prediction_market_agent_tooling/tools/caches/db_cache.py,sha256=rZIGhgijquwwPtp_qncSAPR1SDF2XxIVZL1ir0fgzWw,12127
 prediction_market_agent_tooling/tools/caches/inmemory_cache.py,sha256=ZW5iI5rmjqeAebu5T7ftRnlkxiL02IC-MxCfDB80x7w,1506
 prediction_market_agent_tooling/tools/caches/serializers.py,sha256=vFDx4fsPxclXp2q0sv27j4al_M_Tj9aR2JJP-xNHQXA,2151
-prediction_market_agent_tooling/tools/contract.py,sha256=Yex8MVYvdBTMZLESLqKpwEyT8EGAfkJRri5kCaPqrBM,21235
+prediction_market_agent_tooling/tools/contract.py,sha256=pdr9ZYmj4QVUfgVKdvOU6ucYdBpJGdha_FMR_LgtcEs,22912
 prediction_market_agent_tooling/tools/costs.py,sha256=EaAJ7v9laD4VEV3d8B44M4u3_oEO_H16jRVCdoZ93Uw,954
 prediction_market_agent_tooling/tools/cow/cow_order.py,sha256=nZafUa5d23mFnEL2arm3jLdqdA9zl-z_fN39ceovwg4,9079
 prediction_market_agent_tooling/tools/custom_exceptions.py,sha256=Fh8z1fbwONvP4-j7AmV_PuEcoqb6-QXa9PJ9m7guMcM,93
@@ -125,8 +126,8 @@ prediction_market_agent_tooling/tools/tokens/usd.py,sha256=yuW8iPPtcpP4eLH2nORMD
 prediction_market_agent_tooling/tools/transaction_cache.py,sha256=K5YKNL2_tR10Iw2TD9fuP-CTGpBbZtNdgbd0B_R7pjg,1814
 prediction_market_agent_tooling/tools/utils.py,sha256=AC2a68jwASMWuQi-w8twl8b_M52YwrEJ81abmuEaqMY,6661
 prediction_market_agent_tooling/tools/web3_utils.py,sha256=zRq-eeBGWt8uUGN9G_WfjmJ0eVvO8aWE9S0Pz_Y6AOA,12342
-prediction_market_agent_tooling-0.64.11.dev657.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
-prediction_market_agent_tooling-0.64.11.dev657.dist-info/METADATA,sha256=ttU6Mz9EhbftcOKumK1IJbT5LJB0gMAKtKejFPr-ImA,8749
-prediction_market_agent_tooling-0.64.11.dev657.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-prediction_market_agent_tooling-0.64.11.dev657.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
-prediction_market_agent_tooling-0.64.11.dev657.dist-info/RECORD,,
+prediction_market_agent_tooling-0.64.12.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
+prediction_market_agent_tooling-0.64.12.dist-info/METADATA,sha256=yt6lfStMOmUD_6GOSu-oeuwHIHEmXN7HAogInnoOPIU,8742
+prediction_market_agent_tooling-0.64.12.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+prediction_market_agent_tooling-0.64.12.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
+prediction_market_agent_tooling-0.64.12.dist-info/RECORD,,