prediction-market-agent-tooling 0.69.15.dev1135__tar.gz → 0.69.15.dev1137__tar.gz

{prediction_market_agent_tooling-0.69.15.dev1135 → prediction_market_agent_tooling-0.69.15.dev1137}/PKG-INFO

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

prediction_market_agent_tooling-0.69.15.dev1137/prediction_market_agent_tooling/abis/processor.abi.json

@@ -0,0 +1,16 @@
+[
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "processor",
+    "outputs": [
+      {
+        "name": "impl",
+        "type": "address"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  }
+]

{prediction_market_agent_tooling-0.69.15.dev1135 → prediction_market_agent_tooling-0.69.15.dev1137}/prediction_market_agent_tooling/tools/contract.py

@@ -12,6 +12,7 @@ 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 web3.types import BlockIdentifier
 
 from prediction_market_agent_tooling.chains import POLYGON_CHAIN_ID
 from prediction_market_agent_tooling.config import APIKeys, RPCConfig
@@ -97,6 +98,7 @@ class ContractBaseClass(BaseModel):
         function_name: str,
         function_params: t.Optional[list[t.Any] | dict[str, t.Any]] = None,
         web3: Web3 | None = None,
+        block_identifier: BlockIdentifier | None = None,
     ) -> t.Any:
         """
         Used for reading from the contract.
@@ -108,6 +110,7 @@ class ContractBaseClass(BaseModel):
             contract_abi=self.abi,
             function_name=function_name,
             function_params=function_params,
+            block_identifier=block_identifier,
         )
 
     def send(
@@ -196,6 +199,22 @@ class ContractProxyBaseClass(ContractBaseClass):
         return Web3.to_checksum_address(address)
 
 
+class ContractProcessorBaseClass(ContractBaseClass):
+    """
+    Contract base class for processor contracts.
+    """
+
+    abi: ABI = abi_field_validator(
+        os.path.join(
+            os.path.dirname(os.path.realpath(__file__)), "../abis/processor.abi.json"
+        )
+    )
+
+    def processor(self, web3: Web3 | None = None) -> ChecksumAddress:
+        address = self.call("processor", web3=web3)
+        return Web3.to_checksum_address(address)
+
+
 class ContractERC20BaseClass(ContractBaseClass):
     """
     Contract base class extended by ERC-20 standard methods.
@@ -274,8 +293,17 @@ class ContractERC20BaseClass(ContractBaseClass):
             web3=web3,
         )
 
-    def balanceOf(self, for_address: ChecksumAddress, web3: Web3 | None = None) -> Wei:
-        balance = Wei(self.call("balanceOf", [for_address], web3=web3))
+    def balanceOf(
+        self,
+        for_address: ChecksumAddress,
+        web3: Web3 | None = None,
+        block_identifier: BlockIdentifier | None = None,
+    ) -> Wei:
+        balance = Wei(
+            self.call(
+                "balanceOf", [for_address], web3=web3, block_identifier=block_identifier
+            )
+        )
         return balance
 
     def balance_of_in_tokens(
@@ -948,6 +976,7 @@ def uni_implementation_address(
     # TODO: Fix the above, and afterwards assert that only 1 imp address is returned from this function. Or prove that this could indeed happen (although we are very pretty sure it shouldn't).
     addresses = [
         implementation_proxy_address(contract_address, web3),
+        processor_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),
@@ -979,6 +1008,29 @@ def implementation_proxy_address(
         return None
 
 
+def processor_proxy_address(
+    contract_address: ChecksumAddress, web3: Web3
+) -> ChecksumAddress | None:
+    if not contract_implements_function(
+        contract_address, "processor", web3, look_for_proxy_contract=False
+    ):
+        return None
+    try:
+        return ContractProcessorBaseClass(address=contract_address).processor(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 processor method, but it's only for admins.
+        logger.warning(
+            f"Failed to get processor for {contract_address=} even though it has the method: {e}"
+        )
+        return None
+
+
 def minimal_proxy_address(
     contract_address: ChecksumAddress, web3: Web3
 ) -> ChecksumAddress | None:

{prediction_market_agent_tooling-0.69.15.dev1135 → prediction_market_agent_tooling-0.69.15.dev1137}/prediction_market_agent_tooling/tools/web3_utils.py

@@ -16,7 +16,14 @@ from safe_eth.safe.safe import SafeV141
 from web3 import Web3
 from web3.constants import HASH_ZERO
 from web3.contract.contract import ContractFunction as Web3ContractFunction
-from web3.types import AccessList, AccessListEntry, Nonce, TxParams, TxReceipt
+from web3.types import (
+    AccessList,
+    AccessListEntry,
+    BlockIdentifier,
+    Nonce,
+    TxParams,
+    TxReceipt,
+)
 
 from prediction_market_agent_tooling.gtypes import (
     ABI,
@@ -106,11 +113,12 @@ def call_function_on_contract(
     contract_abi: ABI,
     function_name: str,
     function_params: Optional[list[Any] | dict[str, Any]] = None,
+    block_identifier: Optional[BlockIdentifier] = None,
 ) -> Any:
     contract = web3.eth.contract(address=contract_address, abi=contract_abi)
     output = contract.functions[function_name](
         *parse_function_params(function_params)
-    ).call()
+    ).call(block_identifier=block_identifier)
     return output
 
 

{prediction_market_agent_tooling-0.69.15.dev1135 → prediction_market_agent_tooling-0.69.15.dev1137}/pyproject.toml

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