prediction-market-agent-tooling 0.63.9__py3-none-any.whl → 0.63.10.dev566__py3-none-any.whl

prediction_market_agent_tooling/abis/gvp2_settlement.abi.json

@@ -0,0 +1,89 @@
+[
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "owner",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "contract IERC20",
+        "name": "sellToken",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "contract IERC20",
+        "name": "buyToken",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "sellAmount",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "buyAmount",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "feeAmount",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "bytes",
+        "name": "orderUid",
+        "type": "bytes"
+      }
+    ],
+    "name": "Trade",
+    "type": "event"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes",
+        "name": "orderUid",
+        "type": "bytes"
+      },
+      {
+        "internalType": "bool",
+        "name": "signed",
+        "type": "bool"
+      }
+    ],
+    "name": "setPreSignature",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes",
+        "name": "orderUid",
+        "type": "bytes"
+      }
+    ],
+    "name": "invalidateOrder",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "domainSeparator",
+    "outputs": [{ "name": "", "type": "bytes32" }],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]

prediction_market_agent_tooling/config.py

@@ -3,6 +3,7 @@ import typing as t
 from copy import deepcopy
 
 from eth_account.signers.local import LocalAccount
+from eth_typing import URI
 from pydantic import Field, model_validator
 from pydantic.types import SecretStr
 from pydantic.v1.types import SecretStr as SecretStrV1
@@ -277,11 +278,11 @@ class RPCConfig(BaseSettings):
         env_file=".env", env_file_encoding="utf-8", extra="ignore"
     )
 
-    GNOSIS_RPC_URL: str = Field(default="https://rpc.gnosischain.com")
+    GNOSIS_RPC_URL: URI = Field(default=URI("https://rpc.gnosischain.com"))
     CHAIN_ID: ChainID = Field(default=ChainID(100))
 
     @property
-    def gnosis_rpc_url(self) -> str:
+    def gnosis_rpc_url(self) -> URI:
         return check_not_none(
             self.GNOSIS_RPC_URL, "GNOSIS_RPC_URL missing in the environment."
         )

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/tools/cow/cow_order.py

@@ -8,7 +8,7 @@ from cowdao_cowpy.common.api.errors import UnexpectedResponseError
 from cowdao_cowpy.common.chains import Chain
 from cowdao_cowpy.common.config import SupportedChainId
 from cowdao_cowpy.common.constants import CowContractAddress
-from cowdao_cowpy.cow.swap import get_order_quote
+from cowdao_cowpy.cow.swap import CompletedOrder, get_order_quote, swap_tokens
 from cowdao_cowpy.order_book.api import OrderBookApi
 from cowdao_cowpy.order_book.config import Envs, OrderBookAPIConfigFactory
 from cowdao_cowpy.order_book.generated.model import (
@@ -24,15 +24,17 @@ from cowdao_cowpy.order_book.generated.model import (
     TokenAmount,
 )
 from cowdao_cowpy.subgraph.client import BaseModel
-from eth_account.signers.local import LocalAccount
 from tenacity import retry_if_not_exception_type, stop_after_attempt, wait_fixed
 from web3 import Web3
 
 from prediction_market_agent_tooling.config import APIKeys
-from prediction_market_agent_tooling.gtypes import ChecksumAddress, Wei
+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.cow_contracts import (
+    CowGPv2SettlementContract,
+)
 from prediction_market_agent_tooling.tools.contract import ContractERC20OnGnosisChain
-from prediction_market_agent_tooling.tools.utils import utcnow
+from prediction_market_agent_tooling.tools.utils import check_not_none, utcnow
 
 
 class MinimalisticToken(BaseModel):
@@ -164,8 +166,6 @@ def swap_tokens_waiting(
     env: Envs = "prod",
     web3: Web3 | None = None,
 ) -> OrderMetaData:
-    account = api_keys.get_account()
-
     # Approve the CoW Swap Vault Relayer to get the sell token.
     ContractERC20OnGnosisChain(address=sell_token).approve(
         api_keys,
@@ -177,7 +177,7 @@ def swap_tokens_waiting(
     # CoW library uses async, so we need to wrap the call in asyncio.run for us to use it.
     return asyncio.run(
         swap_tokens_waiting_async(
-            amount_wei, sell_token, buy_token, account, chain, env
+            amount_wei, sell_token, buy_token, api_keys, chain, env
         )
     )
 
@@ -186,20 +186,31 @@ async def swap_tokens_waiting_async(
     amount_wei: Wei,
     sell_token: ChecksumAddress,
     buy_token: ChecksumAddress,
-    account: LocalAccount,
+    api_keys: APIKeys,
     chain: Chain,
     env: Envs,
-    timeout: timedelta = timedelta(seconds=60),
+    timeout: timedelta = timedelta(seconds=120),
+    slippage_tolerance: float = 0.01,
 ) -> OrderMetaData:
+    account = api_keys.get_account()
+    safe_address = api_keys.safe_address_checksum
+
     order = await swap_tokens(
         amount=amount_wei.value,
         sell_token=sell_token,
         buy_token=buy_token,
         account=account,
+        safe_address=safe_address,
         chain=chain,
         env=env,
+        slippage_tolerance=slippage_tolerance,
     )
     logger.info(f"Order created: {order}")
+
+    if safe_address is not None:
+        logger.info(f"Safe is used. Signing the order after its creation.")
+        await sign_safe_cow_swap(api_keys, order, chain, env)
+
     start_time = utcnow()
 
     while True:
@@ -229,6 +240,30 @@ async def swap_tokens_waiting_async(
         await asyncio.sleep(3.14)
 
 
+@tenacity.retry(
+    stop=tenacity.stop_after_attempt(3),
+    wait=tenacity.wait_fixed(1),
+    after=lambda x: logger.debug(f"sign_safe_cow_swap failed, {x.attempt_number=}."),
+)
+async def sign_safe_cow_swap(
+    api_keys: APIKeys,
+    order: CompletedOrder,
+    chain: Chain,
+    env: Envs,
+) -> None:
+    order_book_api = get_order_book_api(env, chain)
+    posted_order = await order_book_api.get_order_by_uid(order.uid)
+    CowGPv2SettlementContract(
+        address=Web3.to_checksum_address(
+            check_not_none(posted_order.settlementContract).root
+        )
+    ).setPreSignature(
+        api_keys,
+        HexBytes(posted_order.uid.root),
+        True,
+    )
+
+
 @tenacity.retry(
     stop=stop_after_attempt(3),
     wait=wait_fixed(1),

{prediction_market_agent_tooling-0.63.9.dist-info → prediction_market_agent_tooling-0.63.10.dev566.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: prediction-market-agent-tooling
-Version: 0.63.9
+Version: 0.63.10.dev566
 Summary: Tools to benchmark, deploy and monitor prediction market agents.
 Author: Gnosis
 Requires-Python: >=3.10,<3.13
@@ -14,7 +14,7 @@ Provides-Extra: openai
 Provides-Extra: optuna
 Requires-Dist: autoflake (>=2.2.1,<3.0.0)
 Requires-Dist: base58 (>=1.0.2,<2.0)
-Requires-Dist: cowdao-cowpy (>=1.0.0rc1,<2.0.0)
+Requires-Dist: cowdao-cowpy-kongzii (==1.0.0rc2)
 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)

{prediction_market_agent_tooling-0.63.9.dist-info → prediction_market_agent_tooling-0.63.10.dev566.dist-info}/RECORD

@@ -3,6 +3,7 @@ prediction_market_agent_tooling/abis/depositablewrapper_erc20.abi.json,sha256=m0
 prediction_market_agent_tooling/abis/erc20.abi.json,sha256=b8t6tPUhjBo5dHFq8ipsK-ih_g29dOTbWI0GBZiEWL8,3685
 prediction_market_agent_tooling/abis/erc4626.abi.json,sha256=qvmonhj3tJU5flR4pJjXCSSwB8tgEiJcx4Sc5ilQ5VY,17801
 prediction_market_agent_tooling/abis/erc721.abi.json,sha256=sslrlTfLAkHA7cAJAaAHmGBSsY8_3K6jNK-2OoPUTPs,5396
+prediction_market_agent_tooling/abis/gvp2_settlement.abi.json,sha256=J-OqsRqeqIo81RaT4btCGmwqBv6s7mYuTI9vWLr6Eu4,1790
 prediction_market_agent_tooling/abis/omen_agentresultmapping.abi.json,sha256=TVWP5J6RO8mb1YpI-RA2iCgeCqGfrIw0OfbHngekTSs,5769
 prediction_market_agent_tooling/abis/omen_dxdao.abi.json,sha256=Z1kD1QfgYfGwsZEI2UFDNEGZ4hMOix3HGICk8xlO4Ds,9578
 prediction_market_agent_tooling/abis/omen_fpmm.abi.json,sha256=CDib_b5PVj4m0JBVCB20cTshiVx8st1Be-7E460qFoY,11406
@@ -21,7 +22,7 @@ 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=So5l8KbgmzcCpxzzf13TNrEJPu_4iQnUDhzus6XRvSc,10151
+prediction_market_agent_tooling/config.py,sha256=QWybGq-DfjlRKG2G4l_4kJEyH3pmUvmcw4n2d2-z3eQ,10183
 prediction_market_agent_tooling/deploy/agent.py,sha256=tEYX133rSsZ6b9kx-RtZSHxkdN8LZvn0P6CVz6KOJlc,26531
 prediction_market_agent_tooling/deploy/agent_example.py,sha256=dIIdZashExWk9tOdyDjw87AuUcGyM7jYxNChYrVK2dM,1001
 prediction_market_agent_tooling/deploy/betting_strategy.py,sha256=p25t7VU7I4hSkSl6SpzI_W55kLbYEySQdBqeschmARY,12918
@@ -51,6 +52,7 @@ prediction_market_agent_tooling/markets/metaculus/api.py,sha256=4TRPGytQQbSdf42D
 prediction_market_agent_tooling/markets/metaculus/data_models.py,sha256=FaBCTPPezXbBwZ9p791CiVgQ4vB696xnMbz9XVXmiVI,3267
 prediction_market_agent_tooling/markets/metaculus/metaculus.py,sha256=86TIx6cavEWc8Cv4KpZxSvwiSw9oFybXE3YB49pg-CA,4377
 prediction_market_agent_tooling/markets/omen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+prediction_market_agent_tooling/markets/omen/cow_contracts.py,sha256=sl1L4cK5nAJwZ2wdhLzqh8p7h_IEValNvLwKUlInKxw,957
 prediction_market_agent_tooling/markets/omen/data_models.py,sha256=dtWbRy9tpasssQP80ZFYxAc_9pnVD-zUpVjenBqurnA,30221
 prediction_market_agent_tooling/markets/omen/omen.py,sha256=Jf2qSJJn0UUISpi24xYRwoVycGuYE42kZ2z1HRGl43w,51927
 prediction_market_agent_tooling/markets/omen/omen_constants.py,sha256=D9oflYKafLQiHYtB5sScMHqmXyzM8JP8J0yATmc4SQQ,233
@@ -89,7 +91,7 @@ prediction_market_agent_tooling/tools/caches/inmemory_cache.py,sha256=ZW5iI5rmjq
 prediction_market_agent_tooling/tools/caches/serializers.py,sha256=vFDx4fsPxclXp2q0sv27j4al_M_Tj9aR2JJP-xNHQXA,2151
 prediction_market_agent_tooling/tools/contract.py,sha256=1ZFp_VoqTjM8cqOfAhco2Ht0DTqakjhZpuZUrAXr28Q,21332
 prediction_market_agent_tooling/tools/costs.py,sha256=EaAJ7v9laD4VEV3d8B44M4u3_oEO_H16jRVCdoZ93Uw,954
-prediction_market_agent_tooling/tools/cow/cow_order.py,sha256=EC3xzYaY5cEh2cMBBzmNim6WYY1bRKYJNh_4wMccwU0,7671
+prediction_market_agent_tooling/tools/cow/cow_order.py,sha256=gakwBMVD287v4FrgJC-qwpc5zZHu9yLfTzcmhht-BXA,8797
 prediction_market_agent_tooling/tools/custom_exceptions.py,sha256=Fh8z1fbwONvP4-j7AmV_PuEcoqb6-QXa9PJ9m7guMcM,93
 prediction_market_agent_tooling/tools/datetime_utc.py,sha256=8_WackjtjC8zHXrhQFTGQ6e6Fz_6llWoKR4CSFvIv9I,2766
 prediction_market_agent_tooling/tools/db/db_manager.py,sha256=GtzHH1NLl8HwqC8Z7s6eTlIQXuV0blxfaV2PeQrBnfQ,3013
@@ -122,8 +124,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.63.9.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
-prediction_market_agent_tooling-0.63.9.dist-info/METADATA,sha256=8GI888jIBmKnNzupIIL7Pem4RTVhl8-QO4J8-drwdJ4,8689
-prediction_market_agent_tooling-0.63.9.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-prediction_market_agent_tooling-0.63.9.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
-prediction_market_agent_tooling-0.63.9.dist-info/RECORD,,
+prediction_market_agent_tooling-0.63.10.dev566.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
+prediction_market_agent_tooling-0.63.10.dev566.dist-info/METADATA,sha256=g4ONjybn7fFmipE1kk65OoW16MeIhsy8l3GmKOubu5U,8698
+prediction_market_agent_tooling-0.63.10.dev566.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+prediction_market_agent_tooling-0.63.10.dev566.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
+prediction_market_agent_tooling-0.63.10.dev566.dist-info/RECORD,,