prediction-market-agent-tooling 0.64.0__py3-none-any.whl → 0.64.1__py3-none-any.whl

prediction_market_agent_tooling/markets/omen/data_models.py

@@ -418,7 +418,9 @@ class OmenMarket(BaseModel):
         )
 
     def get_resolution_enum_from_answer(self, answer: HexBytes) -> Resolution:
-        if self.boolean_outcome_from_answer(answer):
+        if answer == INVALID_ANSWER_HEX_BYTES:
+            return Resolution.CANCEL
+        elif self.boolean_outcome_from_answer(answer):
             return Resolution.YES
         else:
             return Resolution.NO

prediction_market_agent_tooling/markets/seer/seer.py

@@ -114,7 +114,8 @@ class SeerAgentMarket(AgentMarket):
     ) -> OutcomeToken | None:
         """Returns number of outcome tokens returned for a given bet expressed in collateral units."""
 
-        outcome_token = self.get_wrapped_token_for_outcome(direction)
+        outcome_str = self.get_outcome_str_from_bool(direction)
+        outcome_token = self.get_wrapped_token_for_outcome(outcome_str)
         bet_amount_in_tokens = self.get_in_token(bet_amount)
 
         p = PriceManager.build(market_id=HexBytes(HexStr(self.id)))
@@ -168,7 +169,8 @@ class SeerAgentMarket(AgentMarket):
         amounts_ot: dict[OutcomeStr, OutcomeToken] = {}
 
         for outcome in [True, False]:
-            wrapped_token = self.get_wrapped_token_for_outcome(outcome)
+            outcome_str = self.get_outcome_str_from_bool(outcome)
+            wrapped_token = self.get_wrapped_token_for_outcome(outcome_str)
 
             outcome_token_balance_wei = OutcomeWei.from_wei(
                 ContractERC20OnGnosisChain(address=wrapped_token).balanceOf(
@@ -192,6 +194,76 @@ class SeerAgentMarket(AgentMarket):
             amounts_ot=amounts_ot,
         )
 
+    def get_outcome_str_from_idx(self, outcome_index: int) -> OutcomeStr:
+        return self.outcomes[outcome_index]
+
+    def get_liquidity_for_outcome(
+        self, outcome: OutcomeStr, web3: Web3 | None = None
+    ) -> CollateralToken:
+        """Liquidity per outcome is comprised of the balance of outcomeToken + collateralToken held by the pool itself (see https://github.com/seer-pm/demo/blob/7bfd0a062780ed6567f65714c4fc4f6e6cdf1c4f/web/netlify/functions/utils/fetchPools.ts#L35-L42)."""
+
+        outcome_token = self.get_wrapped_token_for_outcome(outcome)
+        pool = SeerSubgraphHandler().get_pool_by_token(
+            token_address=outcome_token,
+            collateral_address=self.collateral_token_contract_address_checksummed,
+        )
+        if not pool:
+            logger.info(
+                f"Could not fetch pool for token {outcome_token}, no liquidity available for outcome."
+            )
+            return CollateralToken(0)
+        p = PriceManager.build(HexBytes(HexStr(self.id)))
+        total = CollateralToken(0)
+
+        for token_address in [pool.token0.id, pool.token1.id]:
+            token_address_checksummed = Web3.to_checksum_address(token_address)
+            token_contract = ContractERC20OnGnosisChain(
+                address=token_address_checksummed
+            )
+
+            token_balance = token_contract.balance_of_in_tokens(
+                for_address=Web3.to_checksum_address(pool.id.hex()),
+                web3=web3,
+            )
+
+            # get price
+            token_price_in_sdai = (
+                p.get_token_price_from_pools(token=token_address_checksummed)
+                if token_address_checksummed
+                != self.collateral_token_contract_address_checksummed
+                else CollateralToken(1.0)
+            )
+
+            # We ignore the liquidity in outcome tokens if price unknown.
+            if token_price_in_sdai:
+                sdai_balance = token_balance * token_price_in_sdai
+                total += sdai_balance
+
+        return total
+
+    def get_liquidity(self) -> CollateralToken:
+        liquidity_in_collateral = CollateralToken(0)
+        # We ignore the invalid outcome
+        for outcome in self.outcomes[:-1]:
+            liquidity_for_outcome = self.get_liquidity_for_outcome(outcome)
+            liquidity_in_collateral += liquidity_for_outcome
+
+        return liquidity_in_collateral
+
+    def has_liquidity_for_outcome(self, outcome: OutcomeStr) -> bool:
+        liquidity = self.get_liquidity_for_outcome(outcome)
+        return liquidity > CollateralToken(0)
+
+    def has_liquidity(self) -> bool:
+        # We define a market as having liquidity if it has liquidity for all outcomes except for the invalid (index -1)
+        return all(
+            [self.has_liquidity_for_outcome(outcome) for outcome in self.outcomes[:-1]]
+        )
+
+    def get_wrapped_token_for_outcome(self, outcome: OutcomeStr) -> ChecksumAddress:
+        outcome_idx = self.outcomes.index(outcome)
+        return self.wrapped_tokens[outcome_idx]
+
     def get_position(
         self, user_id: str, web3: Web3 | None = None
     ) -> ExistingPosition | None:
@@ -331,26 +403,6 @@ class SeerAgentMarket(AgentMarket):
             is not None
         ]
 
-    def has_liquidity_for_outcome(self, outcome: bool) -> bool:
-        outcome_token = self.get_wrapped_token_for_outcome(outcome)
-        pool = SeerSubgraphHandler().get_pool_by_token(
-            token_address=outcome_token,
-            collateral_address=self.collateral_token_contract_address_checksummed,
-        )
-        return pool is not None and pool.liquidity > 0
-
-    def has_liquidity(self) -> bool:
-        # We conservatively define a market as having liquidity if it has liquidity for the `True` outcome token AND the `False` outcome token.
-        return self.has_liquidity_for_outcome(True) and self.has_liquidity_for_outcome(
-            False
-        )
-
-    def get_wrapped_token_for_outcome(self, outcome: bool) -> ChecksumAddress:
-        outcome_from_enum = SeerOutcomeEnum.from_bool(outcome)
-        outcome_idx = self.seer_outcomes[outcome_from_enum]
-        outcome_token = self.wrapped_tokens[outcome_idx]
-        return outcome_token
-
     def place_bet(
         self,
         outcome: bool,
@@ -380,7 +432,8 @@ class SeerAgentMarket(AgentMarket):
                 f"Balance {collateral_balance} not enough for bet size {amount}"
             )
 
-        outcome_token = self.get_wrapped_token_for_outcome(outcome)
+        outcome_str = self.get_outcome_str_from_bool(outcome)
+        outcome_token = self.get_wrapped_token_for_outcome(outcome_str)
 
         #  Sell sDAI using token address
         order_metadata = swap_tokens_waiting(
@@ -407,7 +460,8 @@ class SeerAgentMarket(AgentMarket):
         """
         Sells the given number of shares for the given outcome in the given market.
         """
-        outcome_token = self.get_wrapped_token_for_outcome(outcome)
+        outcome_str = self.get_outcome_str_from_bool(outcome)
+        outcome_token = self.get_wrapped_token_for_outcome(outcome_str)
         api_keys = api_keys if api_keys is not None else APIKeys()
 
         token_amount = (

prediction_market_agent_tooling/tools/contract.py

@@ -212,11 +212,11 @@ class ContractERC20BaseClass(ContractBaseClass):
         owner: ChecksumAddress,
         for_address: ChecksumAddress,
         web3: Web3 | None = None,
-    ) -> int:
+    ) -> Wei:
         allowance_for_user: int = self.call(
             "allowance", function_params=[owner, for_address], web3=web3
         )
-        return allowance_for_user
+        return Wei(allowance_for_user)
 
     def approve(
         self,

prediction_market_agent_tooling/tools/cow/cow_order.py

@@ -3,7 +3,6 @@ from datetime import timedelta
 
 import httpx
 import tenacity
-from cowdao_cowpy import swap_tokens
 from cowdao_cowpy.common.api.errors import UnexpectedResponseError
 from cowdao_cowpy.common.chains import Chain
 from cowdao_cowpy.common.config import SupportedChainId
@@ -166,13 +165,20 @@ def swap_tokens_waiting(
     env: Envs = "prod",
     web3: Web3 | None = None,
 ) -> OrderMetaData:
-    # Approve the CoW Swap Vault Relayer to get the sell token.
-    ContractERC20OnGnosisChain(address=sell_token).approve(
-        api_keys,
-        Web3.to_checksum_address(CowContractAddress.VAULT_RELAYER.value),
-        amount_wei=amount_wei,
+    # Approve the CoW Swap Vault Relayer to get the sell token only if allowance not sufficient.
+    for_address = Web3.to_checksum_address(CowContractAddress.VAULT_RELAYER.value)
+    current_allowance = ContractERC20OnGnosisChain(address=sell_token).allowance(
+        owner=api_keys.bet_from_address,
+        for_address=for_address,
         web3=web3,
     )
+    if current_allowance < amount_wei:
+        ContractERC20OnGnosisChain(address=sell_token).approve(
+            api_keys,
+            for_address=for_address,
+            amount_wei=amount_wei,
+            web3=web3,
+        )
 
     # CoW library uses async, so we need to wrap the call in asyncio.run for us to use it.
     return asyncio.run(

{prediction_market_agent_tooling-0.64.0.dist-info → prediction_market_agent_tooling-0.64.1.dist-info}/METADATA

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

{prediction_market_agent_tooling-0.64.0.dist-info → prediction_market_agent_tooling-0.64.1.dist-info}/RECORD

@@ -53,7 +53,7 @@ prediction_market_agent_tooling/markets/metaculus/data_models.py,sha256=FaBCTPPe
 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/data_models.py,sha256=I0vS9AMhWlulPQJYgvKq41TbrFVwbk-c89SIPolAtXM,30307
 prediction_market_agent_tooling/markets/omen/omen.py,sha256=BvTFQ9MZqo9q0wEaE2TzsZ8Q_yPGIZQehehnDIJ3id0,51987
 prediction_market_agent_tooling/markets/omen/omen_constants.py,sha256=D9oflYKafLQiHYtB5sScMHqmXyzM8JP8J0yATmc4SQQ,233
 prediction_market_agent_tooling/markets/omen/omen_contracts.py,sha256=H7jFVLcdbxq6gxWS77YzBFHLnfaItU6MXXVzPzDCkwM,29236
@@ -66,7 +66,7 @@ prediction_market_agent_tooling/markets/polymarket/polymarket.py,sha256=6rc9qulP
 prediction_market_agent_tooling/markets/polymarket/utils.py,sha256=8kTeVjXPcXC6DkDvWYsZQLY7x8DS6CEp_yznSEazsNU,2037
 prediction_market_agent_tooling/markets/seer/data_models.py,sha256=TcsDgbk2id1JJ_XT9bnvO4M75dTvOtbzQX67918OQ8E,7442
 prediction_market_agent_tooling/markets/seer/price_manager.py,sha256=EuOe6zCmEEWXz1loXaQQOYC7ZNQ0cDJn0rZadK1dBlc,5460
-prediction_market_agent_tooling/markets/seer/seer.py,sha256=1LTCf_9hQ4LQ_0G0f0Y1HVNT0_lUgUKuVMOYWMLWsN4,18265
+prediction_market_agent_tooling/markets/seer/seer.py,sha256=fx2daHPKRXXNsQYFKI8S0x879WX4FM7uSFAmf2AGWXI,20608
 prediction_market_agent_tooling/markets/seer/seer_contracts.py,sha256=kH9nPXsx6UM5er42g2f3fLvy36sY5JM2f_beXeuNgUc,3790
 prediction_market_agent_tooling/markets/seer/seer_subgraph_handler.py,sha256=KKRI493VNNAY9tR1AjzNraeH76MvDsBV6GsiLZas0_Y,9859
 prediction_market_agent_tooling/markets/seer/subgraph_data_models.py,sha256=0izxS8Mtzonfdl9UqvFVXrdj0hVzieroekXhogfZKCw,1817
@@ -89,9 +89,9 @@ prediction_market_agent_tooling/tools/betting_strategies/utils.py,sha256=68zFWUj
 prediction_market_agent_tooling/tools/caches/db_cache.py,sha256=dB8LNs2JvVRaFCeAKRmIQRwiirsMgtL31he8051wM-g,11431
 prediction_market_agent_tooling/tools/caches/inmemory_cache.py,sha256=ZW5iI5rmjqeAebu5T7ftRnlkxiL02IC-MxCfDB80x7w,1506
 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/contract.py,sha256=Fxat3JkddtMkeN1HqQoFNB-OEk9YJQczm2LvT2p-Hms,21337
 prediction_market_agent_tooling/tools/costs.py,sha256=EaAJ7v9laD4VEV3d8B44M4u3_oEO_H16jRVCdoZ93Uw,954
-prediction_market_agent_tooling/tools/cow/cow_order.py,sha256=gakwBMVD287v4FrgJC-qwpc5zZHu9yLfTzcmhht-BXA,8797
+prediction_market_agent_tooling/tools/cow/cow_order.py,sha256=nZafUa5d23mFnEL2arm3jLdqdA9zl-z_fN39ceovwg4,9079
 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
@@ -124,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.64.0.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
-prediction_market_agent_tooling-0.64.0.dist-info/METADATA,sha256=KnjNTkpA-CeHrfoyRAXM5nEXMLYvXa-H24R0hBeV1Gk,8690
-prediction_market_agent_tooling-0.64.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-prediction_market_agent_tooling-0.64.0.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
-prediction_market_agent_tooling-0.64.0.dist-info/RECORD,,
+prediction_market_agent_tooling-0.64.1.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
+prediction_market_agent_tooling-0.64.1.dist-info/METADATA,sha256=L0XcbQLiO1NfuALzKYRovd6l7Vptuu9kqxQ077z9mDY,8690
+prediction_market_agent_tooling-0.64.1.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+prediction_market_agent_tooling-0.64.1.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
+prediction_market_agent_tooling-0.64.1.dist-info/RECORD,,