prediction-market-agent-tooling 0.63.10.dev565__tar.gz → 0.64.0__tar.gz

{prediction_market_agent_tooling-0.63.10.dev565 → prediction_market_agent_tooling-0.64.0}/PKG-INFO

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

{prediction_market_agent_tooling-0.63.10.dev565 → prediction_market_agent_tooling-0.64.0}/prediction_market_agent_tooling/deploy/agent.py

@@ -577,7 +577,7 @@ class DeployableTraderAgent(DeployablePredictionAgent):
 
         if market.get_trade_balance(api_keys) < min_required_balance_to_trade:
             raise OutOfFundsError(
-                f"Minimum required balance {min_required_balance_to_trade} for agent is not met."
+                f"Minimum required balance {min_required_balance_to_trade} for agent {api_keys.bet_from_address=} is not met."
             )
 
     def get_betting_strategy(self, market: AgentMarket) -> BettingStrategy:

prediction_market_agent_tooling-0.64.0/prediction_market_agent_tooling/markets/omen/cow_contracts.py

@@ -0,0 +1,34 @@
+import os
+
+from web3 import Web3
+
+from prediction_market_agent_tooling.config import APIKeys
+from prediction_market_agent_tooling.gtypes import ABI, HexBytes
+from prediction_market_agent_tooling.tools.contract import (
+    ContractOnGnosisChain,
+    abi_field_validator,
+)
+
+
+class CowGPv2SettlementContract(ContractOnGnosisChain):
+    # Contract ABI taken from https://github.com/cowprotocol/cow-sdk/blob/main/abi/GPv2Settlement.json.
+    abi: ABI = abi_field_validator(
+        os.path.join(
+            os.path.dirname(os.path.realpath(__file__)),
+            "../../abis/gvp2_settlement.abi.json",
+        )
+    )
+
+    def setPreSignature(
+        self,
+        api_keys: APIKeys,
+        orderId: HexBytes,
+        signed: bool,
+        web3: Web3 | None = None,
+    ) -> None:
+        self.send(
+            api_keys=api_keys,
+            function_name="setPreSignature",
+            function_params=[orderId, signed],
+            web3=web3,
+        )

{prediction_market_agent_tooling-0.63.10.dev565 → prediction_market_agent_tooling-0.64.0}/prediction_market_agent_tooling/markets/omen/omen.py

@@ -1353,7 +1353,7 @@ def send_keeping_token_to_eoa_xdai(
 
     else:
         raise OutOfFundsError(
-            f"Current wxDai balance ({current_balances_eoa=}, {current_balances_betting=}) is less than the required minimum wxDai to withdraw {need_to_withdraw}."
+            f"Current wxDai balance ({current_balances_eoa=} for {api_keys.public_key=}, {current_balances_betting=} for {api_keys.bet_from_address=}) is less than the required minimum wxDai to withdraw {need_to_withdraw}."
         )
 
 

{prediction_market_agent_tooling-0.63.10.dev565 → prediction_market_agent_tooling-0.64.0}/prediction_market_agent_tooling/markets/omen/omen_contracts.py

@@ -435,6 +435,24 @@ class WETHContract(ContractERC20OnGnosisChain):
     )
 
 
+class EUReContract(ContractERC20OnGnosisChain):
+    address: ChecksumAddress = Web3.to_checksum_address(
+        "0xcB444e90D8198415266c6a2724b7900fb12FC56E"
+    )
+
+
+class SAFEContract(ContractERC20OnGnosisChain):
+    address: ChecksumAddress = Web3.to_checksum_address(
+        "0x4d18815D14fe5c3304e87B3FA18318baa5c23820"
+    )
+
+
+class COWContract(ContractERC20OnGnosisChain):
+    address: ChecksumAddress = Web3.to_checksum_address(
+        "0x177127622c4A00F3d409B75571e12cB3c8973d3c"
+    )
+
+
 class WrappedxDaiContract(ContractDepositableWrapperERC20OnGnosisChain):
     address: ChecksumAddress = WRAPPED_XDAI_CONTRACT_ADDRESS
 
@@ -893,30 +911,6 @@ class OmenThumbnailMapping(ContractOnGnosisChain):
         )
 
 
-class CowGPv2SettlementContract(ContractOnGnosisChain):
-    # Contract ABI taken from https://github.com/cowprotocol/cow-sdk/blob/main/abi/GPv2Settlement.json.
-    abi: ABI = abi_field_validator(
-        os.path.join(
-            os.path.dirname(os.path.realpath(__file__)),
-            "../../abis/gvp2_settlement.abi.json",
-        )
-    )
-
-    def setPreSignature(
-        self,
-        api_keys: APIKeys,
-        orderId: HexBytes,
-        signed: bool,
-        web3: Web3 | None = None,
-    ) -> None:
-        self.send(
-            api_keys=api_keys,
-            function_name="setPreSignature",
-            function_params=[orderId, signed],
-            web3=web3,
-        )
-
-
 class CollateralTokenChoice(str, Enum):
     wxdai = "wxdai"
     sdai = "sdai"

{prediction_market_agent_tooling-0.63.10.dev565 → prediction_market_agent_tooling-0.64.0}/prediction_market_agent_tooling/markets/omen/omen_subgraph_handler.py

@@ -30,7 +30,12 @@ from prediction_market_agent_tooling.markets.omen.data_models import (
     RealityResponse,
 )
 from prediction_market_agent_tooling.markets.omen.omen_contracts import (
+    COWContract,
+    EUReContract,
+    GNOContract,
     OmenThumbnailMapping,
+    SAFEContract,
+    WETHContract,
     WrappedxDaiContract,
     sDaiContract,
 )
@@ -51,6 +56,11 @@ from prediction_market_agent_tooling.tools.web3_utils import (
 SAFE_COLLATERAL_TOKENS = (
     WrappedxDaiContract(),
     sDaiContract(),
+    GNOContract(),
+    WETHContract(),
+    EUReContract(),
+    SAFEContract(),
+    COWContract(),
 )
 SAFE_COLLATERAL_TOKENS_ADDRESSES = tuple(
     contract.address for contract in SAFE_COLLATERAL_TOKENS

{prediction_market_agent_tooling-0.63.10.dev565 → prediction_market_agent_tooling-0.64.0}/prediction_market_agent_tooling/tools/cow/cow_order.py

@@ -30,7 +30,7 @@ from web3 import Web3
 from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.gtypes import ChecksumAddress, HexBytes, Wei
 from prediction_market_agent_tooling.loggers import logger
-from prediction_market_agent_tooling.markets.omen.omen_contracts import (
+from prediction_market_agent_tooling.markets.omen.cow_contracts import (
     CowGPv2SettlementContract,
 )
 from prediction_market_agent_tooling.tools.contract import ContractERC20OnGnosisChain

{prediction_market_agent_tooling-0.63.10.dev565 → prediction_market_agent_tooling-0.64.0}/pyproject.toml

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