prediction-market-agent-tooling 0.61.1.dev489__py3-none-any.whl → 0.62.0__py3-none-any.whl

prediction_market_agent_tooling/markets/seer/seer.py

@@ -4,16 +4,16 @@ from eth_typing import ChecksumAddress
 from web3 import Web3
 from web3.types import TxReceipt
 
-from prediction_market_agent_tooling.config import APIKeys
+from prediction_market_agent_tooling.config import APIKeys, RPCConfig
 from prediction_market_agent_tooling.gtypes import (
+    USD,
+    CollateralToken,
     HexAddress,
     HexBytes,
     OutcomeStr,
-    Wei,
-    wei_type,
+    OutcomeToken,
+    OutcomeWei,
     xDai,
-    xdai_type,
-    Probability,
 )
 from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.markets.agent_market import (
@@ -24,30 +24,20 @@ from prediction_market_agent_tooling.markets.agent_market import (
     SortBy,
 )
 from prediction_market_agent_tooling.markets.blockchain_utils import store_trades
-from prediction_market_agent_tooling.markets.data_models import (
-    BetAmount,
-    Currency,
-    Position,
-    TokenAmount,
-)
+from prediction_market_agent_tooling.markets.data_models import ExistingPosition
 from prediction_market_agent_tooling.markets.market_fees import MarketFees
 from prediction_market_agent_tooling.markets.omen.omen import OmenAgentMarket
-from prediction_market_agent_tooling.markets.omen.omen_contracts import sDaiContract
 from prediction_market_agent_tooling.markets.seer.data_models import (
+    NewMarketEvent,
     SeerMarket,
     SeerOutcomeEnum,
 )
-from prediction_market_agent_tooling.markets.seer.price_manager import PriceManager
 from prediction_market_agent_tooling.markets.seer.seer_contracts import (
     SeerMarketFactory,
 )
 from prediction_market_agent_tooling.markets.seer.seer_subgraph_handler import (
     SeerSubgraphHandler,
 )
-from prediction_market_agent_tooling.markets.seer.subgraph_data_models import (
-    NewMarketEvent,
-)
-from prediction_market_agent_tooling.tools.balances import get_balances
 from prediction_market_agent_tooling.tools.contract import (
     ContractERC20OnGnosisChain,
     init_collateral_token_contract,
@@ -61,14 +51,16 @@ from prediction_market_agent_tooling.tools.datetime_utc import DatetimeUTC
 from prediction_market_agent_tooling.tools.tokens.auto_deposit import (
     auto_deposit_collateral_token,
 )
-from prediction_market_agent_tooling.tools.web3_utils import wei_to_xdai, xdai_to_wei
+from prediction_market_agent_tooling.tools.tokens.usd import (
+    get_token_in_usd,
+    get_usd_in_token,
+)
 
 # We place a larger bet amount by default than Omen so that cow presents valid quotes.
-SEER_TINY_BET_AMOUNT = xdai_type(0.1)
+SEER_TINY_BET_AMOUNT = USD(0.1)
 
 
 class SeerAgentMarket(AgentMarket):
-    currency = Currency.sDai
     wrapped_tokens: list[ChecksumAddress]
     creator: HexAddress
     collateral_token_contract_address_checksummed: ChecksumAddress
@@ -78,6 +70,16 @@ class SeerAgentMarket(AgentMarket):
         None  # Seer markets don't have a description, so just default to None.
     )
 
+    def get_collateral_token_contract(
+        self, web3: Web3 | None = None
+    ) -> ContractERC20OnGnosisChain:
+        web3 = web3 or RPCConfig().get_web3()
+        return to_gnosis_chain_contract(
+            init_collateral_token_contract(
+                self.collateral_token_contract_address_checksummed, web3
+            )
+        )
+
     def store_prediction(
         self,
         processed_market: ProcessedMarket | None,
@@ -91,39 +93,36 @@ class SeerAgentMarket(AgentMarket):
         traded_market: ProcessedTradedMarket | None,
         keys: APIKeys,
         agent_name: str,
-        web3: Web3 | None = None,
-    ) -> TxReceipt:
+    ) -> None:
         return store_trades(
             market_id=self.id,
             traded_market=traded_market,
             keys=keys,
             agent_name=agent_name,
-            web3=web3,
         )
 
-    def _convert_bet_amount_into_wei(self, bet_amount: BetAmount) -> Wei:
-        if bet_amount.currency == self.currency:
-            return xdai_to_wei(xdai_type(bet_amount.amount))
-        raise ValueError(
-            f"Currencies don't match. Currency bet amount {bet_amount.currency} currency market: {self.currency}"
-        )
+    def get_token_in_usd(self, x: CollateralToken) -> USD:
+        return get_token_in_usd(x, self.collateral_token_contract_address_checksummed)
+
+    def get_usd_in_token(self, x: USD) -> CollateralToken:
+        return get_usd_in_token(x, self.collateral_token_contract_address_checksummed)
 
     def get_buy_token_amount(
-        self, bet_amount: BetAmount, direction: bool
-    ) -> TokenAmount:
+        self, bet_amount: USD | CollateralToken, direction: bool
+    ) -> OutcomeToken:
         """Returns number of outcome tokens returned for a given bet expressed in collateral units."""
 
         outcome_token = self.get_wrapped_token_for_outcome(direction)
-
-        bet_amount_in_wei = self._convert_bet_amount_into_wei(bet_amount=bet_amount)
+        bet_amount_in_tokens = self.get_in_token(bet_amount)
+        bet_amount_in_wei = bet_amount_in_tokens.as_wei
 
         quote = CowManager().get_quote(
             buy_token=outcome_token,
             sell_amount=bet_amount_in_wei,
             collateral_token=self.collateral_token_contract_address_checksummed,
         )
-        sell_amount = wei_to_xdai(wei_type(quote.quote.buyAmount.root))
-        return TokenAmount(amount=sell_amount, currency=bet_amount.currency)
+        sell_amount = OutcomeWei(quote.quote.buyAmount.root).as_outcome_token
+        return sell_amount
 
     def get_outcome_str_from_bool(self, outcome: bool) -> OutcomeStr:
         outcome_translated = SeerOutcomeEnum.from_bool(outcome)
@@ -131,33 +130,46 @@ class SeerAgentMarket(AgentMarket):
         return OutcomeStr(self.outcomes[idx])
 
     @staticmethod
-    def get_trade_balance(api_keys: APIKeys) -> float:
+    def get_trade_balance(api_keys: APIKeys) -> USD:
         return OmenAgentMarket.get_trade_balance(api_keys=api_keys)
 
-    @classmethod
-    def get_tiny_bet_amount(cls) -> BetAmount:
-        return BetAmount(amount=SEER_TINY_BET_AMOUNT, currency=cls.currency)
+    def get_tiny_bet_amount(self) -> CollateralToken:
+        return self.get_in_token(SEER_TINY_BET_AMOUNT)
 
-    def get_position(self, user_id: str, web3: Web3 | None = None) -> Position | None:
+    def get_position(
+        self, user_id: str, web3: Web3 | None = None
+    ) -> ExistingPosition | None:
         """
         Fetches position from the user in a given market.
         We ignore the INVALID balances since we are only interested in binary outcomes.
         """
 
-        amounts = {}
+        amounts_ot: dict[OutcomeStr, OutcomeToken] = {}
 
         for outcome in [True, False]:
             wrapped_token = self.get_wrapped_token_for_outcome(outcome)
 
-            outcome_token_balance = ContractERC20OnGnosisChain(
-                address=wrapped_token
-            ).balanceOf(for_address=Web3.to_checksum_address(user_id), web3=web3)
-            outcome_str = self.get_outcome_str_from_bool(outcome=outcome)
-            amounts[outcome_str] = TokenAmount(
-                amount=wei_to_xdai(outcome_token_balance), currency=self.currency
+            outcome_token_balance_wei = OutcomeWei.from_wei(
+                ContractERC20OnGnosisChain(address=wrapped_token).balanceOf(
+                    for_address=Web3.to_checksum_address(user_id), web3=web3
+                )
             )
-
-        return Position(market_id=self.id, amounts=amounts)
+            outcome_str = self.get_outcome_str_from_bool(outcome=outcome)
+            amounts_ot[outcome_str] = outcome_token_balance_wei.as_outcome_token
+
+        amounts_current = {
+            k: self.get_token_in_usd(self.get_sell_value_of_outcome_token(k, v))
+            for k, v in amounts_ot.items()
+        }
+        amounts_potential = {
+            k: self.get_token_in_usd(v.as_token) for k, v in amounts_ot.items()
+        }
+        return ExistingPosition(
+            market_id=self.id,
+            amounts_current=amounts_current,
+            amounts_potential=amounts_potential,
+            amounts_ot=amounts_ot,
+        )
 
     @staticmethod
     def get_user_id(api_keys: APIKeys) -> str:
@@ -172,33 +184,6 @@ class SeerAgentMarket(AgentMarket):
     def verify_operational_balance(api_keys: APIKeys) -> bool:
         return OmenAgentMarket.verify_operational_balance(api_keys=api_keys)
 
-    @staticmethod
-    def from_data_model_with_subgraph(
-        model: SeerMarket, seer_subgraph: SeerSubgraphHandler
-    ) -> "SeerAgentMarket":
-        p = PriceManager(seer_market=model, seer_subgraph=seer_subgraph)
-        current_p_yes = p.current_p_yes()
-
-        return SeerAgentMarket(
-            id=model.id.hex(),
-            question=model.title,
-            creator=model.creator,
-            created_time=model.created_time,
-            outcomes=model.outcomes,
-            collateral_token_contract_address_checksummed=model.collateral_token_contract_address_checksummed,
-            condition_id=model.condition_id,
-            url=model.url,
-            close_time=model.close_time,
-            wrapped_tokens=[Web3.to_checksum_address(i) for i in model.wrapped_tokens],
-            fees=MarketFees.get_zero_fees(),
-            outcome_token_pool=None,
-            resolution=model.get_resolution_enum(),
-            volume=None,
-            # current_p_yes=model.current_p_yes,
-            current_p_yes=current_p_yes,
-            seer_outcomes=model.outcome_as_enums,
-        )
-
     @staticmethod
     def from_data_model(model: SeerMarket) -> "SeerAgentMarket":
         return SeerAgentMarket(
@@ -216,7 +201,7 @@ class SeerAgentMarket(AgentMarket):
             outcome_token_pool=None,
             resolution=model.get_resolution_enum(),
             volume=None,
-            current_p_yes=Probability(123),  # ToDo dont use this method
+            current_p_yes=model.current_p_yes,
             seer_outcomes=model.outcome_as_enums,
         )
 
@@ -228,16 +213,13 @@ class SeerAgentMarket(AgentMarket):
         created_after: t.Optional[DatetimeUTC] = None,
         excluded_questions: set[str] | None = None,
     ) -> t.Sequence["SeerAgentMarket"]:
-        seer_subgraph = SeerSubgraphHandler()
-        markets = seer_subgraph.get_binary_markets(
-            limit=limit, sort_by=sort_by, filter_by=filter_by
-        )
-
         return [
-            SeerAgentMarket.from_data_model_with_subgraph(
-                model=m, seer_subgraph=seer_subgraph
+            SeerAgentMarket.from_data_model(m)
+            for m in SeerSubgraphHandler().get_binary_markets(
+                limit=limit,
+                sort_by=sort_by,
+                filter_by=filter_by,
             )
-            for m in markets
         ]
 
     def has_liquidity_for_outcome(self, outcome: bool) -> bool:
@@ -246,9 +228,9 @@ class SeerAgentMarket(AgentMarket):
             CowManager().get_quote(
                 collateral_token=self.collateral_token_contract_address_checksummed,
                 buy_token=outcome_token,
-                sell_amount=xdai_to_wei(
-                    xdai_type(1)
-                ),  # we take 1 xDai as a baseline value for common trades the agents take.
+                sell_amount=CollateralToken(
+                    1
+                ).as_wei,  # we take 1 as a baseline value for common trades the agents take.
             )
             return True
         except NoLiquidityAvailableOnCowException:
@@ -272,7 +254,7 @@ class SeerAgentMarket(AgentMarket):
     def place_bet(
         self,
         outcome: bool,
-        amount: BetAmount,
+        amount: USD,
         auto_deposit: bool = True,
         web3: Web3 | None = None,
         api_keys: APIKeys | None = None,
@@ -283,32 +265,27 @@ class SeerAgentMarket(AgentMarket):
                 f"Market {self.id} is not open for trading. Cannot place bet."
             )
 
-        if amount.currency != self.currency:
-            raise ValueError(f"Seer bets are made in xDai. Got {amount.currency}.")
+        amount_in_token = self.get_usd_in_token(amount)
+        amount_wei = amount_in_token.as_wei
+        collateral_contract = self.get_collateral_token_contract()
 
-        collateral_contract = sDaiContract()
         if auto_deposit:
-            # We convert the deposit amount (in sDai) to assets in order to convert.
-            asset_amount = collateral_contract.convertToAssets(
-                xdai_to_wei(xdai_type(amount.amount))
-            )
             auto_deposit_collateral_token(
-                collateral_contract, asset_amount, api_keys, web3
+                collateral_contract, amount_wei, api_keys, web3
             )
 
-        # We require that amount is given in sDAI.
-        collateral_balance = get_balances(address=api_keys.bet_from_address, web3=web3)
-        if collateral_balance.sdai < amount.amount:
+        collateral_balance = collateral_contract.balanceOf(api_keys.bet_from_address)
+        if collateral_balance < amount_wei:
             raise ValueError(
-                f"Balance {collateral_balance.sdai} not enough for bet size {amount.amount}"
+                f"Balance {collateral_balance} not enough for bet size {amount}"
             )
 
         outcome_token = self.get_wrapped_token_for_outcome(outcome)
-        #  Sell sDAI using token address
+        # Sell using token address
         order_metadata = CowManager().swap(
-            amount=xdai_type(amount.amount),
+            amount=amount_in_token,
             sell_token=collateral_contract.address,
-            buy_token=Web3.to_checksum_address(outcome_token),
+            buy_token=outcome_token,
             api_keys=api_keys,
             web3=web3,
         )
@@ -318,18 +295,17 @@ class SeerAgentMarket(AgentMarket):
 
 def seer_create_market_tx(
     api_keys: APIKeys,
-    initial_funds: xDai,
+    initial_funds: USD | CollateralToken,
     question: str,
     opening_time: DatetimeUTC,
     language: str,
-    outcomes: list[str],
+    outcomes: t.Sequence[OutcomeStr],
     auto_deposit: bool,
     category: str,
     min_bond_xdai: xDai,
     web3: Web3 | None = None,
 ) -> ChecksumAddress:
     web3 = web3 or SeerMarketFactory.get_web3()  # Default to Gnosis web3.
-    initial_funds_wei = xdai_to_wei(initial_funds)
 
     factory_contract = SeerMarketFactory()
     collateral_token_address = factory_contract.collateral_token(web3=web3)
@@ -337,24 +313,26 @@ def seer_create_market_tx(
         init_collateral_token_contract(collateral_token_address, web3)
     )
 
+    initial_funds_in_collateral = (
+        get_usd_in_token(initial_funds, collateral_token_address)
+        if isinstance(initial_funds, USD)
+        else initial_funds
+    )
+    initial_funds_in_collateral_wei = initial_funds_in_collateral.as_wei
+
     if auto_deposit:
         auto_deposit_collateral_token(
             collateral_token_contract=collateral_token_contract,
             api_keys=api_keys,
-            amount_wei=initial_funds_wei,
+            collateral_amount_wei_or_usd=initial_funds_in_collateral_wei,
             web3=web3,
         )
 
-    # In case of ERC4626, obtained (for example) sDai out of xDai could be lower than the `amount_wei`, so we need to handle it.
-    initial_funds_in_shares = collateral_token_contract.get_in_shares(
-        amount=initial_funds_wei, web3=web3
-    )
-
     # Approve the market maker to withdraw our collateral token.
     collateral_token_contract.approve(
         api_keys=api_keys,
         for_address=factory_contract.address,
-        amount_wei=initial_funds_in_shares,
+        amount_wei=initial_funds_in_collateral_wei,
         web3=web3,
     )
 
@@ -365,7 +343,7 @@ def seer_create_market_tx(
         opening_time=opening_time,
         language=language,
         category=category,
-        min_bond_xdai=min_bond_xdai,
+        min_bond=min_bond_xdai,
     )
     tx_receipt = factory_contract.create_categorical_market(
         api_keys=api_keys, params=params, web3=web3

prediction_market_agent_tooling/markets/seer/seer_contracts.py

@@ -1,11 +1,17 @@
 import os
+import typing as t
 
 from web3 import Web3
 from web3.types import TxReceipt
 
 from prediction_market_agent_tooling.config import APIKeys
-from prediction_market_agent_tooling.gtypes import ABI, ChecksumAddress, xDai
-from prediction_market_agent_tooling.markets.seer.subgraph_data_models import (
+from prediction_market_agent_tooling.gtypes import (
+    ABI,
+    ChecksumAddress,
+    OutcomeStr,
+    xDai,
+)
+from prediction_market_agent_tooling.markets.seer.data_models import (
     CreateCategoricalMarketsParams,
 )
 from prediction_market_agent_tooling.tools.contract import (
@@ -13,7 +19,6 @@ from prediction_market_agent_tooling.tools.contract import (
     abi_field_validator,
 )
 from prediction_market_agent_tooling.tools.datetime_utc import DatetimeUTC
-from prediction_market_agent_tooling.tools.web3_utils import xdai_to_wei
 
 
 class SeerMarketFactory(ContractOnGnosisChain):
@@ -31,9 +36,9 @@ class SeerMarketFactory(ContractOnGnosisChain):
     @staticmethod
     def build_market_params(
         market_question: str,
-        outcomes: list[str],
+        outcomes: t.Sequence[OutcomeStr],
         opening_time: DatetimeUTC,
-        min_bond_xdai: xDai,
+        min_bond: xDai,
         language: str = "en_US",
         category: str = "misc",
     ) -> CreateCategoricalMarketsParams:
@@ -42,7 +47,7 @@ class SeerMarketFactory(ContractOnGnosisChain):
             token_names=[
                 o.upper() for o in outcomes
             ],  # Following usual token names on Seer (YES,NO).
-            min_bond=xdai_to_wei(min_bond_xdai),
+            min_bond=min_bond.as_xdai_wei.value,
             opening_time=int(opening_time.timestamp()),
             outcomes=outcomes,
             lang=language,

prediction_market_agent_tooling/markets/seer/seer_subgraph_handler.py

@@ -5,17 +5,17 @@ from typing import Any
 from subgrounds import FieldPath
 from web3.constants import ADDRESS_ZERO
 
-from prediction_market_agent_tooling.gtypes import ChecksumAddress
 from prediction_market_agent_tooling.markets.agent_market import FilterBy, SortBy
 from prediction_market_agent_tooling.markets.base_subgraph_handler import (
     BaseSubgraphHandler,
 )
 from prediction_market_agent_tooling.markets.seer.data_models import (
     SeerMarket,
+    SeerPool,
 )
-from prediction_market_agent_tooling.markets.seer.subgraph_data_models import SeerPool
 from prediction_market_agent_tooling.tools.hexbytes_custom import HexBytes
 from prediction_market_agent_tooling.tools.utils import to_int_timestamp, utcnow
+from prediction_market_agent_tooling.tools.web3_utils import unwrap_generic_value
 
 
 class SeerSubgraphHandler(BaseSubgraphHandler):
@@ -50,7 +50,6 @@ class SeerSubgraphHandler(BaseSubgraphHandler):
             markets_field.creator,
             markets_field.conditionId,
             markets_field.marketName,
-            markets_field.outcomesSupply,
             markets_field.parentOutcome,
             markets_field.outcomes,
             markets_field.payoutReported,
@@ -122,16 +121,12 @@ class SeerSubgraphHandler(BaseSubgraphHandler):
         match sort_by:
             case SortBy.NEWEST:
                 sort_direction = "desc"
-                sort_by_field = self.seer_subgraph.Market.blockTimestamp
+                sort_by_field = self.seer_subgraph.Market.block_timestamp
             case SortBy.CLOSING_SOONEST:
                 sort_direction = "asc"
-                sort_by_field = self.seer_subgraph.Market.openingTs
-            case SortBy.HIGHEST_LIQUIDITY | SortBy.LOWEST_LIQUIDITY:
-                sort_direction = (
-                    "desc" if sort_by == SortBy.HIGHEST_LIQUIDITY else "asc"
-                )
-                sort_by_field = self.seer_subgraph.Market.outcomesSupply
-            case SortBy.NONE:
+                sort_by_field = self.seer_subgraph.Market.opening_ts
+            # ToDo - Implement liquidity conditions by looking up Swapr subgraph.
+            case SortBy.NONE | SortBy.HIGHEST_LIQUIDITY | SortBy.LOWEST_LIQUIDITY:
                 sort_direction = None
                 sort_by_field = None
             case _:
@@ -164,7 +159,7 @@ class SeerSubgraphHandler(BaseSubgraphHandler):
             first=(
                 limit if limit else sys.maxsize
             ),  # if not limit, we fetch all possible markets,
-            where=where_stms,
+            where=unwrap_generic_value(where_stms),
             **optional_params,
         )
         fields = self._get_fields_for_markets(markets_field)
@@ -206,9 +201,6 @@ class SeerSubgraphHandler(BaseSubgraphHandler):
         fields = [
             pools_field.id,
             pools_field.liquidity,
-            pools_field.sqrtPrice,
-            pools_field.token0Price,
-            pools_field.token1Price,
             pools_field.token0.id,
             pools_field.token0.name,
             pools_field.token0.symbol,
@@ -218,19 +210,19 @@ class SeerSubgraphHandler(BaseSubgraphHandler):
         ]
         return fields
 
-    def get_pool_by_token(self, token_address: ChecksumAddress) -> SeerPool | None:
+    def get_swapr_pools_for_market(self, market: SeerMarket) -> list[SeerPool]:
         # We iterate through the wrapped tokens and put them in a where clause so that we hit the subgraph endpoint just once.
         wheres = []
-        wheres.extend(
-            [
-                {"token0": token_address.lower()},
-                {"token1": token_address.lower()},
-            ]
+        for wrapped_token in market.wrapped_tokens:
+            wheres.extend(
+                [
+                    {"token0": wrapped_token.lower()},
+                    {"token1": wrapped_token.lower()},
+                ]
+            )
+        pools_field = self.swapr_algebra_subgraph.Query.pools(
+            where=unwrap_generic_value({"or": wheres})
         )
-        pools_field = self.swapr_algebra_subgraph.Query.pools(where={"or": wheres})
         fields = self._get_fields_for_pools(pools_field)
         pools = self.do_query(fields=fields, pydantic_model=SeerPool)
-        # We assume there is only one pool for outcomeToken/sDAI.
-        if pools:
-            return pools[0]
-        return None
+        return pools

prediction_market_agent_tooling/monitor/monitor.py

@@ -186,12 +186,12 @@ def monitor_agent(agent: DeployedAgent) -> None:
         return
     bets_info = {
         "Market Question": [bet.market_question for bet in agent_bets],
-        "Bet Amount": [bet.amount.amount for bet in agent_bets],
+        "Bet Amount": [bet.amount for bet in agent_bets],
         "Bet Outcome": [bet.outcome for bet in agent_bets],
         "Created Time": [bet.created_time for bet in agent_bets],
         "Resolved Time": [bet.resolved_time for bet in agent_bets],
         "Is Correct": [bet.is_correct for bet in agent_bets],
-        "Profit": [round(bet.profit.amount, 2) for bet in agent_bets],
+        "Profit": [round(bet.profit, 2) for bet in agent_bets],
     }
 
     # Time column to use for x-axes and sorting