prediction-market-agent-tooling 0.57.13.dev265__tar.gz → 0.57.15__tar.gz

{prediction_market_agent_tooling-0.57.13.dev265 → prediction_market_agent_tooling-0.57.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: prediction-market-agent-tooling
-Version: 0.57.13.dev265
+Version: 0.57.15
 Summary: Tools to benchmark, deploy and monitor prediction market agents.
 Author: Gnosis
 Requires-Python: >=3.10,<3.13
@@ -16,6 +16,7 @@ Requires-Dist: autoflake (>=2.2.1,<3.0.0)
 Requires-Dist: base58 (>=1.0.2,<2.0)
 Requires-Dist: cron-validator (>=1.0.8,<2.0.0)
 Requires-Dist: eth-account (>=0.8.0,<0.12.0)
+Requires-Dist: eth-keys (>=0.6.1,<0.7.0)
 Requires-Dist: eth-typing (>=3.0.0,<4.0.0)
 Requires-Dist: functions-framework (>=3.5.0,<4.0.0)
 Requires-Dist: google-api-python-client (==2.95.0) ; extra == "google"
@@ -192,5 +193,5 @@ This API can be built on top of to create your application. See [here](https://g
 
 See the [Issues](https://github.com/gnosis/prediction-market-agent-tooling/issues) for ideas of things that need fixing or implementing. The team is also receptive to new issues and PRs.
 
-We use `mypy` for static type checking, and `isort`, `black` and `autoflake` for linting. These all run as steps in CI.
+We use `mypy` for static type checking, and `isort`, `black` and `autoflake` for linting, and `pre-commit` to minimise unwanted pushes to the public repositories. These all run as steps in CI, but `pre-commit` also needs to be installed locally using the provided `install_hooks.sh` script.
 

{prediction_market_agent_tooling-0.57.13.dev265 → prediction_market_agent_tooling-0.57.15}/README.md

@@ -133,4 +133,4 @@ This API can be built on top of to create your application. See [here](https://g
 
 See the [Issues](https://github.com/gnosis/prediction-market-agent-tooling/issues) for ideas of things that need fixing or implementing. The team is also receptive to new issues and PRs.
 
-We use `mypy` for static type checking, and `isort`, `black` and `autoflake` for linting. These all run as steps in CI.
+We use `mypy` for static type checking, and `isort`, `black` and `autoflake` for linting, and `pre-commit` to minimise unwanted pushes to the public repositories. These all run as steps in CI, but `pre-commit` also needs to be installed locally using the provided `install_hooks.sh` script.

{prediction_market_agent_tooling-0.57.13.dev265 → prediction_market_agent_tooling-0.57.15}/prediction_market_agent_tooling/abis/agentcommunication.abi.json

@@ -15,29 +15,17 @@
     "stateMutability": "nonpayable",
     "type": "constructor"
   },
-  {
-    "inputs": [],
-    "name": "MessageNotSentByAgent",
-    "type": "error"
-  },
+  { "inputs": [], "name": "MessageNotSentByAgent", "type": "error" },
   {
     "inputs": [
-      {
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      }
+      { "internalType": "address", "name": "owner", "type": "address" }
     ],
     "name": "OwnableInvalidOwner",
     "type": "error"
   },
   {
     "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
+      { "internalType": "address", "name": "account", "type": "address" }
     ],
     "name": "OwnableUnauthorizedAccount",
     "type": "error"
@@ -94,11 +82,7 @@
   },
   {
     "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "newValue",
-        "type": "uint256"
-      }
+      { "internalType": "uint256", "name": "newValue", "type": "uint256" }
     ],
     "name": "adjustMinimumValueForSendingMessage",
     "outputs": [],
@@ -107,60 +91,26 @@
   },
   {
     "inputs": [
-      {
-        "internalType": "address",
-        "name": "agentAddress",
-        "type": "address"
-      }
+      { "internalType": "address", "name": "agentAddress", "type": "address" }
     ],
     "name": "countMessages",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
     "stateMutability": "view",
     "type": "function"
   },
   {
     "inputs": [
-      {
-        "internalType": "address",
-        "name": "agentAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "idx",
-        "type": "uint256"
-      }
+      { "internalType": "address", "name": "agentAddress", "type": "address" },
+      { "internalType": "uint256", "name": "idx", "type": "uint256" }
     ],
     "name": "getAtIndex",
     "outputs": [
       {
         "components": [
-          {
-            "internalType": "address",
-            "name": "sender",
-            "type": "address"
-          },
-          {
-            "internalType": "address",
-            "name": "recipient",
-            "type": "address"
-          },
-          {
-            "internalType": "bytes",
-            "name": "message",
-            "type": "bytes"
-          },
-          {
-            "internalType": "uint256",
-            "name": "value",
-            "type": "uint256"
-          }
+          { "internalType": "address", "name": "sender", "type": "address" },
+          { "internalType": "address", "name": "recipient", "type": "address" },
+          { "internalType": "bytes", "name": "message", "type": "bytes" },
+          { "internalType": "uint256", "name": "value", "type": "uint256" }
         ],
         "internalType": "struct DoubleEndedStructQueue.MessageContainer",
         "name": "",
@@ -173,74 +123,37 @@
   {
     "inputs": [],
     "name": "minimumValueForSendingMessageInWei",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
     "stateMutability": "view",
     "type": "function"
   },
   {
     "inputs": [],
     "name": "owner",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
+    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
     "stateMutability": "view",
     "type": "function"
   },
   {
     "inputs": [],
     "name": "pctToTreasuryInBasisPoints",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
     "stateMutability": "view",
     "type": "function"
   },
   {
     "inputs": [
-      {
-        "internalType": "address",
-        "name": "agentAddress",
-        "type": "address"
-      }
+      { "internalType": "address", "name": "agentAddress", "type": "address" },
+      { "internalType": "uint256", "name": "idx", "type": "uint256" }
     ],
-    "name": "popNextMessage",
+    "name": "popMessageAtIndex",
     "outputs": [
       {
         "components": [
-          {
-            "internalType": "address",
-            "name": "sender",
-            "type": "address"
-          },
-          {
-            "internalType": "address",
-            "name": "recipient",
-            "type": "address"
-          },
-          {
-            "internalType": "bytes",
-            "name": "message",
-            "type": "bytes"
-          },
-          {
-            "internalType": "uint256",
-            "name": "value",
-            "type": "uint256"
-          }
+          { "internalType": "address", "name": "sender", "type": "address" },
+          { "internalType": "address", "name": "recipient", "type": "address" },
+          { "internalType": "bytes", "name": "message", "type": "bytes" },
+          { "internalType": "uint256", "name": "value", "type": "uint256" }
         ],
         "internalType": "struct DoubleEndedStructQueue.MessageContainer",
         "name": "",
@@ -251,25 +164,11 @@
     "type": "function"
   },
   {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
+    "inputs": [{ "internalType": "address", "name": "", "type": "address" }],
     "name": "queues",
     "outputs": [
-      {
-        "internalType": "uint128",
-        "name": "_begin",
-        "type": "uint128"
-      },
-      {
-        "internalType": "uint128",
-        "name": "_end",
-        "type": "uint128"
-      }
+      { "internalType": "uint128", "name": "_begin", "type": "uint128" },
+      { "internalType": "uint128", "name": "_end", "type": "uint128" }
     ],
     "stateMutability": "view",
     "type": "function"
@@ -283,16 +182,8 @@
   },
   {
     "inputs": [
-      {
-        "internalType": "address",
-        "name": "agentAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "message",
-        "type": "bytes"
-      }
+      { "internalType": "address", "name": "agentAddress", "type": "address" },
+      { "internalType": "bytes", "name": "message", "type": "bytes" }
     ],
     "name": "sendMessage",
     "outputs": [],
@@ -314,11 +205,7 @@
   },
   {
     "inputs": [
-      {
-        "internalType": "address",
-        "name": "newOwner",
-        "type": "address"
-      }
+      { "internalType": "address", "name": "newOwner", "type": "address" }
     ],
     "name": "transferOwnership",
     "outputs": [],
@@ -329,13 +216,9 @@
     "inputs": [],
     "name": "treasury",
     "outputs": [
-      {
-        "internalType": "address payable",
-        "name": "",
-        "type": "address"
-      }
+      { "internalType": "address payable", "name": "", "type": "address" }
     ],
     "stateMutability": "view",
     "type": "function"
   }
-]
+]

{prediction_market_agent_tooling-0.57.13.dev265 → prediction_market_agent_tooling-0.57.15}/prediction_market_agent_tooling/gtypes.py

@@ -82,5 +82,5 @@ def secretstr_to_v1_secretstr(s: SecretStr | None) -> SecretStrV1 | None:
 
 
 def int_to_hexbytes(v: int) -> HexBytes:
-    # Example: 1 -> HexBytes("0x0000000000000000000000000000000000000000000000000000000000000001").
+    # Example: 1 -> HexBytes("0x0000000000000000000000000000000000000000000000000000000000000001"). # web3-private-key-ok
     return HexBytes.fromhex(format(v, "064x"))

{prediction_market_agent_tooling-0.57.13.dev265 → prediction_market_agent_tooling-0.57.15}/prediction_market_agent_tooling/markets/omen/data_models.py

@@ -28,6 +28,7 @@ from prediction_market_agent_tooling.tools.utils import (
     DatetimeUTC,
     check_not_none,
     should_not_happen,
+    utcnow,
 )
 from prediction_market_agent_tooling.tools.web3_utils import wei_to_xdai
 
@@ -245,7 +246,7 @@ class OmenMarket(BaseModel):
 
     @property
     def is_open(self) -> bool:
-        return self.currentAnswer is None
+        return self.close_time > utcnow()
 
     @property
     def is_resolved(self) -> bool:
@@ -584,7 +585,7 @@ class FixedProductMarketMakersResponse(BaseModel):
 
 
 class RealityQuestion(BaseModel):
-    # This `id` is in form of `0x79e32ae03fb27b07c89c0c568f80287c01ca2e57-0x2d362f435e7b5159794ff0b5457a900283fca41fe6301dc855a647595903db13`,
+    # This `id` is in form of `0x79e32ae03fb27b07c89c0c568f80287c01ca2e57-0x2d362f435e7b5159794ff0b5457a900283fca41fe6301dc855a647595903db13`, # web3-private-key-ok
     # which I couldn't find how it is created, but based on how it looks like I assume it's composed of `answerId-questionId`.
     # (Why is answer id as part of the question object? Because this question object is actually received from the answer object below).
     # And because all the contract methods so far needed bytes32 input, when asked for question id, `questionId` field was the correct one to use so far.

{prediction_market_agent_tooling-0.57.13.dev265 → prediction_market_agent_tooling-0.57.15}/prediction_market_agent_tooling/markets/omen/omen.py

@@ -1209,7 +1209,7 @@ def omen_remove_fund_market_tx(
     amount_per_index_set = get_conditional_tokens_balance_for_market(
         market, from_address, web3
     )
-    # We fetch the minimum balance of outcome token - for ex, in this tx (https://gnosisscan.io/tx/0xc31c4e9bc6a60cf7db9991a40ec2f2a06e3539f8cb8dd81b6af893cef6f40cd7#eventlog) - event #460, this should yield 9804940144070370149. This amount matches what is displayed in the Omen UI.
+    # We fetch the minimum balance of outcome token - for ex, in this tx (https://gnosisscan.io/tx/0xc31c4e9bc6a60cf7db9991a40ec2f2a06e3539f8cb8dd81b6af893cef6f40cd7#eventlog) - event #460, this should yield 9804940144070370149. This amount matches what is displayed in the Omen UI. # web3-private-key-ok
     # See similar logic from Olas
     # https://github.com/valory-xyz/market-creator/blob/4bc47f696fb5ecb61c3b7ec8c001ff2ab6c60fcf/packages/valory/skills/market_creation_manager_abci/behaviours.py#L1308
     amount_to_merge = min(amount_per_index_set.values())

{prediction_market_agent_tooling-0.57.13.dev265 → prediction_market_agent_tooling-0.57.15}/prediction_market_agent_tooling/tools/contract.py

@@ -629,7 +629,7 @@ class AgentCommunicationContract(ContractOnGnosisChain, OwnableContract):
     )
 
     address: ChecksumAddress = Web3.to_checksum_address(
-        "0xc566Cb829Ed7aC097D17a38011A40Ad2DC25Dd82"
+        "0xe9dd78FF297DbaAbe5D0E45aE554a4B561935DE9"
     )
 
     def minimum_message_value(self, web3: Web3 | None = None) -> xDai:
@@ -691,28 +691,29 @@ class AgentCommunicationContract(ContractOnGnosisChain, OwnableContract):
         self,
         api_keys: APIKeys,
         agent_address: ChecksumAddress,
+        index: int = 0,
         web3: Web3 | None = None,
     ) -> MessageContainer:
         """
-        Retrieves and removes the first message from the agent's message queue.
+        Retrieves and removes message at specified index from the agent's message queue.
 
         This method first retrieves the message at the front of the queue without removing it,
         allowing us to return the message content directly. The actual removal of the message
         from the queue is performed by sending a transaction to the contract, which executes
-        the `popNextMessage` function. The transaction receipt is not used to obtain the message
+        the `popMessageAtIndex` function. The transaction receipt is not used to obtain the message
         content, as it only contains event data, not the returned struct.
         """
 
-        # Peek first element before popping.
+        # Peek the element before popping.
         message_container = self.get_at_index(
-            agent_address=agent_address, idx=0, web3=web3
+            agent_address=agent_address, idx=index, web3=web3
         )
 
         # Next, pop that element and discard the transaction receipt.
         self.send(
             api_keys=api_keys,
-            function_name="popNextMessage",
-            function_params=[agent_address],
+            function_name="popMessageAtIndex",
+            function_params=[agent_address, index],
             web3=web3,
         )
 

{prediction_market_agent_tooling-0.57.13.dev265 → prediction_market_agent_tooling-0.57.15}/prediction_market_agent_tooling/tools/hexbytes_custom.py

@@ -23,7 +23,7 @@ class BaseHex:
         "0xd4e56740",
         "0xd4e56740f876aef8",
         "0xd4e56740f876aef8c010b86a40d5f567",
-        "0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3",
+        "0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3",  # web3-private-key-ok
     )
 
     @classmethod

{prediction_market_agent_tooling-0.57.13.dev265 → prediction_market_agent_tooling-0.57.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "prediction-market-agent-tooling"
-version = "0.57.13.dev265"
+version = "0.57.15"
 description = "Tools to benchmark, deploy and monitor prediction market agents."
 authors = ["Gnosis"]
 readme = "README.md"
@@ -54,6 +54,7 @@ pinatapy-vourhey = "^0.2.0"
 hishel = "^0.0.31"
 pytest-postgresql = "^6.1.1"
 optuna = { version = "^4.1.0", optional = true}
+eth-keys = "^0.6.1"
 
 [tool.poetry.extras]
 openai = ["openai"]