prediction-market-agent-tooling 0.69.6.dev1094__tar.gz → 0.69.7.dev1098__tar.gz

{prediction_market_agent_tooling-0.69.6.dev1094 → prediction_market_agent_tooling-0.69.7.dev1098}/PKG-INFO

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

{prediction_market_agent_tooling-0.69.6.dev1094 → prediction_market_agent_tooling-0.69.7.dev1098}/prediction_market_agent_tooling/tools/contract.py

@@ -909,84 +909,77 @@ def contract_implements_function(
 
     # 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
-        ):
-            # Get the implementation address and check the function there
-            implementation_address = ContractProxyOnGnosisChain(
-                address=contract_address
-            ).implementation()
+        imp_address = uni_implementation_address(contract_address, web3)
+        if imp_address is not None:
             implements = contract_implements_function(
-                implementation_address,
+                imp_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,
-            ) or seer_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:
+def uni_implementation_address(
+    contract_address: ChecksumAddress, web3: Web3
+) -> ChecksumAddress | None:
+    """
+    There are multiple ways how proxies can be implemented.
+    This function enumerates them and returns the one that succeeds, or None.
+    """
+    address = implementation_proxy_address(contract_address, web3)
+    if address is not None:
+        return address
+
+    address = minimal_proxy_address(contract_address, web3)
+    if address is not None:
+        return address
+
+    address = seer_minimal_proxy_address(contract_address, web3)
+    if address is not None:
+        return address
+
+    return None
+
+
+def implementation_proxy_address(
+    contract_address: ChecksumAddress, web3: Web3
+) -> ChecksumAddress | None:
+    if not contract_implements_function(
+        contract_address, "implementation", web3, look_for_proxy_contract=False
+    ):
+        return None
+    return ContractProxyOnGnosisChain(address=contract_address).implementation()
+
+
+def minimal_proxy_address(
+    contract_address: ChecksumAddress, web3: Web3
+) -> ChecksumAddress | None:
     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 Web3.to_checksum_address(singleton_address)
     except DecodingError:
         logger.info(f"Error decoding contract address for singleton")
-        return False
+        return None
 
 
-def seer_minimal_proxy_implements_function(
-    contract_address: ChecksumAddress,
-    function_name: str,
-    web3: Web3,
-    function_arg_types: list[str] | None = None,
-) -> bool:
+def seer_minimal_proxy_address(
+    contract_address: ChecksumAddress, web3: Web3
+) -> ChecksumAddress | None:
     try:
         # Read address between specific indices to find logic contract
         bytecode = web3.eth.get_code(contract_address)
         logic_contract_address = bytecode[11:31]
         if not Web3.is_address(logic_contract_address):
-            return False
-
-        return contract_implements_function(
-            Web3.to_checksum_address(logic_contract_address),
-            function_name=function_name,
-            web3=web3,
-            function_arg_types=function_arg_types,
-            look_for_proxy_contract=False,
-        )
+            return None
+        return Web3.to_checksum_address(logic_contract_address)
     except DecodingError:
         logger.info("Error decoding contract address on seer minimal proxy")
-        return False
+        return None
 
 
 def init_collateral_token_contract(

prediction_market_agent_tooling-0.69.7.dev1098/prediction_market_agent_tooling/tools/contract_utils.py

@@ -0,0 +1,61 @@
+from web3 import Web3
+
+from prediction_market_agent_tooling.config import RPCConfig
+from prediction_market_agent_tooling.gtypes import ChecksumAddress
+from prediction_market_agent_tooling.tools.contract import contract_implements_function
+
+
+def is_erc20_contract(address: ChecksumAddress, web3: Web3 | None = None) -> bool:
+    """
+    Checks if the given address is an ERC20-compatible contract.
+
+    It estimates it by looking if it implements symbol, name, decimals, totalSupply, balanceOf.
+    """
+    web3 = web3 or RPCConfig().get_web3()
+    return (
+        contract_implements_function(address, "symbol", web3)
+        and contract_implements_function(address, "name", web3)
+        and contract_implements_function(address, "totalSupply", web3)
+        and contract_implements_function(
+            address, "balanceOf", web3, function_arg_types=["address"]
+        )
+    )
+
+
+def is_nft_contract(address: ChecksumAddress, web3: Web3 | None = None) -> bool:
+    """
+    Checks if the given address is an NFT-compatible contract (ERC721 or ERC1155).
+
+    For ERC721, checks for: ownerOf, balanceOf, transferFrom.
+    For ERC1155, checks for: balanceOf, safeTransferFrom.
+
+    Returns True if either ERC721 or ERC1155 interface is detected.
+    """
+    web3 = web3 or RPCConfig().get_web3()
+    is_erc721 = (
+        contract_implements_function(
+            address, "ownerOf", web3, function_arg_types=["uint256"]
+        )
+        and contract_implements_function(
+            address, "balanceOf", web3, function_arg_types=["address"]
+        )
+        and contract_implements_function(
+            address,
+            "transferFrom",
+            web3,
+            function_arg_types=["address", "address", "uint256"],
+        )
+    )
+    if is_erc721:
+        return True
+    is_erc1155 = contract_implements_function(
+        address, "balanceOf", web3, function_arg_types=["address", "uint256"]
+    ) and contract_implements_function(
+        address,
+        "safeTransferFrom",
+        web3,
+        function_arg_types=["address", "address", "uint256", "uint256", "bytes"],
+    )
+    if is_erc1155:
+        return True
+    return False

{prediction_market_agent_tooling-0.69.6.dev1094 → prediction_market_agent_tooling-0.69.7.dev1098}/prediction_market_agent_tooling/tools/web3_utils.py

@@ -18,7 +18,6 @@ from web3.constants import HASH_ZERO
 from web3.contract.contract import ContractFunction as Web3ContractFunction
 from web3.types import AccessList, AccessListEntry, Nonce, TxParams, TxReceipt
 
-from prediction_market_agent_tooling.config import RPCConfig
 from prediction_market_agent_tooling.gtypes import (
     ABI,
     ChecksumAddress,
@@ -34,7 +33,6 @@ from prediction_market_agent_tooling.gtypes import (
 )
 from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.tools._generic_value import _GenericValue
-from prediction_market_agent_tooling.tools.contract import contract_implements_function
 
 ONE_NONCE = Nonce(1)
 ONE_XDAI = xDai(1)
@@ -408,59 +406,3 @@ def get_receipt_block_timestamp(receipt_tx: TxReceipt, web3: Web3) -> int:
 
 def is_valid_wei(value: Web3Wei) -> bool:
     return MIN_WEI <= value <= MAX_WEI
-
-
-def is_erc20_contract(address: ChecksumAddress, web3: Web3 | None = None) -> bool:
-    """
-    Checks if the given address is an ERC20-compatible contract.
-
-    It estimates it by looking if it implements symbol, name, decimals, totalSupply, balanceOf.
-    """
-    web3 = web3 or RPCConfig().get_web3()
-    return (
-        contract_implements_function(address, "symbol", web3)
-        and contract_implements_function(address, "name", web3)
-        and contract_implements_function(address, "totalSupply", web3)
-        and contract_implements_function(
-            address, "balanceOf", web3, function_arg_types=["address"]
-        )
-    )
-
-
-def is_nft_contract(address: ChecksumAddress, web3: Web3 | None = None) -> bool:
-    """
-    Checks if the given address is an NFT-compatible contract (ERC721 or ERC1155).
-
-    For ERC721, checks for: ownerOf, balanceOf, transferFrom.
-    For ERC1155, checks for: balanceOf, safeTransferFrom.
-
-    Returns True if either ERC721 or ERC1155 interface is detected.
-    """
-    web3 = web3 or RPCConfig().get_web3()
-    is_erc721 = (
-        contract_implements_function(
-            address, "ownerOf", web3, function_arg_types=["uint256"]
-        )
-        and contract_implements_function(
-            address, "balanceOf", web3, function_arg_types=["address"]
-        )
-        and contract_implements_function(
-            address,
-            "transferFrom",
-            web3,
-            function_arg_types=["address", "address", "uint256"],
-        )
-    )
-    if is_erc721:
-        return True
-    is_erc1155 = contract_implements_function(
-        address, "balanceOf", web3, function_arg_types=["address", "uint256"]
-    ) and contract_implements_function(
-        address,
-        "safeTransferFrom",
-        web3,
-        function_arg_types=["address", "address", "uint256", "uint256", "bytes"],
-    )
-    if is_erc1155:
-        return True
-    return False

{prediction_market_agent_tooling-0.69.6.dev1094 → prediction_market_agent_tooling-0.69.7.dev1098}/pyproject.toml

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