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

prediction_market_agent_tooling/markets/omen/omen_contracts.py

@@ -15,12 +15,12 @@ from prediction_market_agent_tooling.gtypes import (
     HexBytes,
     HexStr,
     IPFSCIDVersion0,
-    OmenOutcomeToken,
+    OutcomeWei,
     TxParams,
     TxReceipt,
     Wei,
     int_to_hexbytes,
-    wei_type,
+    xDaiWei,
 )
 from prediction_market_agent_tooling.markets.omen.data_models import (
     INVALID_ANSWER_HEX_BYTES,
@@ -128,8 +128,8 @@ class OmenConditionalTokenContract(ContractOnGnosisChain):
 
     def balanceOf(
         self, from_address: ChecksumAddress, position_id: int, web3: Web3 | None = None
-    ) -> Wei:
-        balance = wei_type(
+    ) -> OutcomeWei:
+        balance = OutcomeWei(
             self.call("balanceOf", [from_address, position_id], web3=web3)
         )
         return balance
@@ -169,7 +169,7 @@ class OmenConditionalTokenContract(ContractOnGnosisChain):
         collateral_token_address: ChecksumAddress,
         conditionId: HexBytes,
         index_sets: t.List[int],
-        amount: Wei,
+        amount: OutcomeWei,
         parent_collection_id: HexStr = build_parent_collection_id(),
         web3: Web3 | None = None,
     ) -> TxReceipt:
@@ -296,28 +296,28 @@ class OmenFixedProductMarketMakerContract(ContractOnGnosisChain):
     # Factory contract at https://gnosisscan.io/address/0x9083a2b699c0a4ad06f63580bde2635d26a3eef0.
 
     def balanceOf(self, for_address: ChecksumAddress, web3: Web3 | None = None) -> Wei:
-        balance: Wei = self.call("balanceOf", [for_address], web3=web3)
+        balance = Wei(self.call("balanceOf", [for_address], web3=web3))
         return balance
 
     def calcBuyAmount(
         self, investment_amount: Wei, outcome_index: int, web3: Web3 | None = None
-    ) -> OmenOutcomeToken:
+    ) -> OutcomeWei:
         """
         Returns amount of shares we will get for the given outcome_index for the given investment amount.
         """
-        calculated_shares: OmenOutcomeToken = self.call(
-            "calcBuyAmount", [investment_amount, outcome_index], web3=web3
+        calculated_shares = OutcomeWei(
+            self.call("calcBuyAmount", [investment_amount, outcome_index], web3=web3)
         )
         return calculated_shares
 
     def calcSellAmount(
         self, return_amount: Wei, outcome_index: int, web3: Web3 | None = None
-    ) -> OmenOutcomeToken:
+    ) -> OutcomeWei:
         """
         Returns amount of shares we will sell for the requested wei.
         """
-        calculated_shares: OmenOutcomeToken = self.call(
-            "calcSellAmount", [return_amount, outcome_index], web3=web3
+        calculated_shares = OutcomeWei(
+            self.call("calcSellAmount", [return_amount, outcome_index], web3=web3)
         )
         return calculated_shares
 
@@ -334,7 +334,7 @@ class OmenFixedProductMarketMakerContract(ContractOnGnosisChain):
         api_keys: APIKeys,
         amount_wei: Wei,
         outcome_index: int,
-        min_outcome_tokens_to_buy: OmenOutcomeToken,
+        min_outcome_tokens_to_buy: OutcomeWei,
         tx_params: t.Optional[TxParams] = None,
         web3: Web3 | None = None,
     ) -> TxReceipt:
@@ -355,7 +355,7 @@ class OmenFixedProductMarketMakerContract(ContractOnGnosisChain):
         api_keys: APIKeys,
         amount_wei: Wei,
         outcome_index: int,
-        max_outcome_tokens_to_sell: OmenOutcomeToken,
+        max_outcome_tokens_to_sell: OutcomeWei,
         tx_params: t.Optional[TxParams] = None,
         web3: Web3 | None = None,
     ) -> TxReceipt:
@@ -411,7 +411,7 @@ class OmenFixedProductMarketMakerContract(ContractOnGnosisChain):
 
     def totalSupply(self, web3: Web3 | None = None) -> Wei:
         # This is the liquidity you seen on the Omen website (but in Wei).
-        total_supply: Wei = self.call("totalSupply", web3=web3)
+        total_supply = Wei(self.call("totalSupply", web3=web3))
         return total_supply
 
     def get_collateral_token_contract(
@@ -466,7 +466,7 @@ class OmenFixedProductMarketMakerFactoryContract(ContractOnGnosisChain):
         initial_funds_wei: Wei,
         collateral_token_address: ChecksumAddress,
         fee: Wei,  # This is actually fee in %, 'where 100% == 1 xDai'.
-        distribution_hint: list[OmenOutcomeToken] | None = None,
+        distribution_hint: list[OutcomeWei] | None = None,
         tx_params: t.Optional[TxParams] = None,
         web3: Web3 | None = None,
     ) -> tuple[
@@ -585,7 +585,7 @@ class OmenRealitioContract(ContractOnGnosisChain):
         api_keys: APIKeys,
         question: str,
         category: str,
-        outcomes: list[str],
+        outcomes: t.Sequence[str],
         language: str,
         arbitrator: Arbitrator,
         opening: DatetimeUTC,
@@ -640,14 +640,14 @@ class OmenRealitioContract(ContractOnGnosisChain):
         api_keys: APIKeys,
         question_id: HexBytes,
         answer: HexBytes,
-        bond: Wei,
-        max_previous: Wei | None = None,
+        bond: xDaiWei,
+        max_previous: xDaiWei | None = None,
         web3: Web3 | None = None,
     ) -> TxReceipt:
         if max_previous is None:
             # If not provided, defaults to 0, which means no checking,
             # same as on Omen website: https://github.com/protofire/omen-exchange/blob/763d9c9d05ebf9edacbc1dbaa561aa5d08813c0f/app/src/services/realitio.ts#L363.
-            max_previous = Wei(0)
+            max_previous = xDaiWei(0)
 
         return self.send_with_value(
             api_keys=api_keys,
@@ -657,7 +657,7 @@ class OmenRealitioContract(ContractOnGnosisChain):
                 answer=answer,
                 max_previous=max_previous,
             ),
-            amount_wei=bond,
+            amount_wei=bond.as_wei,
             web3=web3,
         )
 
@@ -666,9 +666,9 @@ class OmenRealitioContract(ContractOnGnosisChain):
         api_keys: APIKeys,
         question_id: HexBytes,
         answer: str,
-        outcomes: list[str],
-        bond: Wei,
-        max_previous: Wei | None = None,
+        outcomes: t.Sequence[str],
+        bond: xDaiWei,
+        max_previous: xDaiWei | None = None,
         web3: Web3 | None = None,
     ) -> TxReceipt:
         # Normalise the answer to lowercase, to match Enum values as [YES, NO] against outcomes as ["Yes", "No"].
@@ -690,8 +690,8 @@ class OmenRealitioContract(ContractOnGnosisChain):
         self,
         api_keys: APIKeys,
         question_id: HexBytes,
-        bond: Wei,
-        max_previous: Wei | None = None,
+        bond: xDaiWei,
+        max_previous: xDaiWei | None = None,
         web3: Web3 | None = None,
     ) -> TxReceipt:
         return self.submitAnswer(
@@ -709,7 +709,7 @@ class OmenRealitioContract(ContractOnGnosisChain):
         question_id: HexBytes,
         history_hashes: list[HexBytes],
         addresses: list[ChecksumAddress],
-        bonds: list[Wei],
+        bonds: list[xDaiWei],
         answers: list[HexBytes],
         tx_params: t.Optional[TxParams] = None,
         web3: Web3 | None = None,
@@ -732,8 +732,8 @@ class OmenRealitioContract(ContractOnGnosisChain):
         self,
         from_address: ChecksumAddress,
         web3: Web3 | None = None,
-    ) -> Wei:
-        balance = wei_type(self.call("balanceOf", [from_address], web3=web3))
+    ) -> xDaiWei:
+        balance = xDaiWei(self.call("balanceOf", [from_address], web3=web3))
         return balance
 
     def withdraw(
@@ -826,10 +826,7 @@ class OmenAgentResultMappingContract(ContractOnGnosisChain):
         return self.send(
             api_keys=api_keys,
             function_name="addPrediction",
-            function_params=[
-                market_address,
-                prediction.model_dump(by_alias=True, exclude="publisher_checksummed"),
-            ],
+            function_params=[market_address, prediction.model_dump(by_alias=True)],
             web3=web3,
         )
 
@@ -899,9 +896,11 @@ class OmenThumbnailMapping(ContractOnGnosisChain):
 class CollateralTokenChoice(str, Enum):
     wxdai = "wxdai"
     sdai = "sdai"
+    gno = "gno"
 
 
 COLLATERAL_TOKEN_CHOICE_TO_ADDRESS = {
     CollateralTokenChoice.wxdai: WrappedxDaiContract().address,
     CollateralTokenChoice.sdai: sDaiContract().address,
+    CollateralTokenChoice.gno: GNOContract().address,
 }

prediction_market_agent_tooling/markets/omen/omen_resolving.py

@@ -5,8 +5,8 @@ from prediction_market_agent_tooling.gtypes import (
     ChecksumAddress,
     HexAddress,
     HexBytes,
-    Wei,
     xDai,
+    xDaiWei,
 )
 from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.markets.data_models import Resolution
@@ -32,12 +32,7 @@ from prediction_market_agent_tooling.tools.tokens.main_token import (
     MINIMUM_NATIVE_TOKEN_IN_EOA_FOR_FEES,
 )
 from prediction_market_agent_tooling.tools.utils import utcnow
-from prediction_market_agent_tooling.tools.web3_utils import (
-    ZERO_BYTES,
-    wei_to_xdai,
-    xdai_to_wei,
-    xdai_type,
-)
+from prediction_market_agent_tooling.tools.web3_utils import ZERO_BYTES
 
 
 def claim_bonds_on_realitio_questions(
@@ -93,7 +88,7 @@ def claim_bonds_on_realitio_question(
 
     history_hashes: list[HexBytes] = []
     addresses: list[ChecksumAddress] = []
-    bonds: list[Wei] = []
+    bonds: list[xDaiWei] = []
     answers: list[HexBytes] = []
 
     # Caller must provide the answer history, in reverse order.
@@ -128,7 +123,7 @@ def claim_bonds_on_realitio_question(
     # Keeping balance on Realitio is not useful, so it's recommended to just withdraw it.
     if current_balance > 0 and auto_withdraw:
         logger.info(
-            f"Withdrawing remaining balance {wei_to_xdai(current_balance)} xDai from Realitio."
+            f"Withdrawing remaining balance {current_balance.as_xdai} xDai from Realitio."
         )
         realitio_contract.withdraw(api_keys, web3=web3)
 
@@ -150,9 +145,7 @@ def finalize_markets(
         # If we don't have enough of xDai for bond, try to get it from the keeping token.
         send_keeping_token_to_eoa_xdai(
             api_keys=api_keys,
-            min_required_balance=xdai_type(
-                realitio_bond + MINIMUM_NATIVE_TOKEN_IN_EOA_FOR_FEES
-            ),
+            min_required_balance=realitio_bond + MINIMUM_NATIVE_TOKEN_IN_EOA_FOR_FEES,
             web3=web3,
         )
 
@@ -235,7 +228,7 @@ def omen_submit_answer_market_tx(
         question_id=market.question.id,
         answer=resolution.value,
         outcomes=market.question.outcomes,
-        bond=xdai_to_wei(bond),
+        bond=bond.as_xdai_wei,
         web3=web3,
     )
 
@@ -254,7 +247,7 @@ def omen_submit_invalid_answer_market_tx(
     realitio_contract.submit_answer_invalid(
         api_keys=api_keys,
         question_id=market.question.id,
-        bond=xdai_to_wei(bond),
+        bond=bond.as_xdai_wei,
         web3=web3,
     )
 

prediction_market_agent_tooling/markets/omen/omen_subgraph_handler.py

@@ -11,7 +11,6 @@ from prediction_market_agent_tooling.gtypes import (
     HexAddress,
     HexBytes,
     Wei,
-    wei_type,
 )
 from prediction_market_agent_tooling.markets.agent_market import FilterBy, SortBy
 from prediction_market_agent_tooling.markets.base_subgraph_handler import (
@@ -24,6 +23,8 @@ from prediction_market_agent_tooling.markets.omen.data_models import (
     OmenMarket,
     OmenPosition,
     OmenUserPosition,
+    OutcomeStr,
+    OutcomeWei,
     RealityAnswer,
     RealityQuestion,
     RealityResponse,
@@ -44,6 +45,7 @@ from prediction_market_agent_tooling.tools.utils import (
 from prediction_market_agent_tooling.tools.web3_utils import (
     ZERO_BYTES,
     byte32_to_ipfscidv0,
+    unwrap_generic_value,
 )
 
 SAFE_COLLATERAL_TOKENS = (
@@ -209,7 +211,7 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
         self,
         creator: HexAddress | None,
         creator_in: t.Sequence[HexAddress] | None,
-        outcomes: list[str],
+        outcomes: t.Sequence[OutcomeStr],
         created_after: DatetimeUTC | None,
         question_opened_before: DatetimeUTC | None,
         question_opened_after: DatetimeUTC | None,
@@ -347,7 +349,7 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
             # because even closed markets don't need to be resolved yet (e.g. if someone forgot to finalize the question on reality).
             opened_after = utcnow()
             # Even if the market isn't closed yet, liquidity can be withdrawn to 0, which essentially closes the market.
-            liquidity_bigger_than = wei_type(0)
+            liquidity_bigger_than = Wei(0)
         elif filter_by == FilterBy.NONE:
             pass
         else:
@@ -391,7 +393,7 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
         id_in: list[str] | None = None,
         sort_by_field: FieldPath | None = None,
         sort_direction: str | None = None,
-        outcomes: list[str] = OMEN_BINARY_MARKET_OUTCOMES,
+        outcomes: t.Sequence[OutcomeStr] = OMEN_BINARY_MARKET_OUTCOMES,
         collateral_token_address_in: (
             tuple[ChecksumAddress, ...] | None
         ) = SAFE_COLLATERAL_TOKENS_ADDRESSES,
@@ -434,7 +436,7 @@ class OmenSubgraphHandler(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,
         )
 
@@ -489,7 +491,7 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
             where_stms["conditionIds_contains"] = [condition_id.hex()]
 
         positions = self.conditional_tokens_subgraph.Query.positions(
-            first=sys.maxsize, where=where_stms
+            first=sys.maxsize, where=unwrap_generic_value(where_stms)
         )
         fields = self._get_fields_for_positions(positions)
         result = self.sg.query_json(fields)
@@ -500,7 +502,7 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
         self,
         better_address: ChecksumAddress,
         position_id_in: list[HexBytes] | None = None,
-        total_balance_bigger_than: Wei | None = None,
+        total_balance_bigger_than: OutcomeWei | None = None,
     ) -> list[OmenUserPosition]:
         where_stms: dict[str, t.Any] = {
             "user": better_address.lower(),
@@ -514,7 +516,7 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
             where_stms["position_"]["positionId_in"] = [x.hex() for x in position_id_in]
 
         positions = self.conditional_tokens_subgraph.Query.userPositions(
-            first=sys.maxsize, where=where_stms
+            first=sys.maxsize, where=unwrap_generic_value(where_stms)
         )
         fields = self._get_fields_for_user_positions(positions)
         result = self.sg.query_json(fields)
@@ -568,7 +570,9 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
                 < to_int_timestamp(market_resolved_before)
             )
         if collateral_amount_more_than is not None:
-            where_stms.append(trade.collateralAmount > collateral_amount_more_than)
+            where_stms.append(
+                trade.collateralAmount > collateral_amount_more_than.value
+            )
 
         # These values can not be set to `None`, but they can be omitted.
         optional_params = {}
@@ -579,7 +583,7 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
 
         trades = self.trades_subgraph.Query.fpmmTrades(
             first=limit if limit else sys.maxsize,
-            where=where_stms,
+            where=unwrap_generic_value(where_stms),
             **optional_params,
         )
         fields = self._get_fields_for_bets(trades)
@@ -818,7 +822,7 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
             first=(
                 limit if limit else sys.maxsize
             ),  # if not limit, we fetch all possible
-            where=where_stms,
+            where=unwrap_generic_value(where_stms),
         )
         fields = self._get_fields_for_reality_questions(questions)
         result = self.sg.query_json(fields)
@@ -832,7 +836,9 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
             answer.question.questionId == question_id.hex(),
         ]
 
-        answers = self.realityeth_subgraph.Query.answers(where=where_stms)
+        answers = self.realityeth_subgraph.Query.answers(
+            where=unwrap_generic_value(where_stms)
+        )
         fields = self._get_fields_for_answers(answers)
         result = self.sg.query_json(fields)
         items = self._parse_items_from_json(result)
@@ -879,7 +885,7 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
             first=(
                 limit if limit else sys.maxsize
             ),  # if not limit, we fetch all possible
-            where=where_stms,
+            where=unwrap_generic_value(where_stms),
         )
         fields = self._get_fields_for_responses(responses)
         result = self.sg.query_json(fields)
@@ -938,7 +944,7 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
 
         prediction_added = (
             self.omen_agent_result_mapping_subgraph.Query.predictionAddeds(
-                where=where_stms,
+                where=unwrap_generic_value(where_stms),
                 orderBy="blockNumber",
                 orderDirection="asc",
             )

prediction_market_agent_tooling/markets/polymarket/data_models.py

@@ -1,6 +1,6 @@
 from pydantic import BaseModel
 
-from prediction_market_agent_tooling.gtypes import USDC, Probability, usdc_type
+from prediction_market_agent_tooling.gtypes import USDC, OutcomeStr, Probability
 from prediction_market_agent_tooling.markets.data_models import Resolution
 from prediction_market_agent_tooling.markets.polymarket.data_models_web import (
     POLYMARKET_FALSE_OUTCOME,
@@ -22,7 +22,7 @@ class PolymarketRewards(BaseModel):
 
 class PolymarketToken(BaseModel):
     token_id: str
-    outcome: str
+    outcome: OutcomeStr
     winner: bool
 
 
@@ -111,7 +111,7 @@ class PolymarketPriceResponse(BaseModel):
 
     @property
     def price_dec(self) -> USDC:
-        return usdc_type(self.price)
+        return USDC(self.price)
 
 
 class Prices(BaseModel):

prediction_market_agent_tooling/markets/polymarket/data_models_web.py

@@ -1,5 +1,5 @@
 """
-Autogenerated using `datamodel-codegen` from a single Polymarket response. Then adjusted, fixed. 
+Autogenerated using `datamodel-codegen` from a single Polymarket response. Then adjusted, fixed.
 Keep in mind that not all fields were used so far, so there might be some bugs.
 
 These models are based on what Polymarket's website returns in the response, and `prediction_market_agent_tooling/markets/polymarket/data_models.py` are based on what their API returns.
@@ -11,7 +11,7 @@ import typing as t
 import requests
 from pydantic import BaseModel, field_validator
 
-from prediction_market_agent_tooling.gtypes import USDC, HexAddress
+from prediction_market_agent_tooling.gtypes import USDC, HexAddress, OutcomeStr
 from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.markets.data_models import Resolution
 from prediction_market_agent_tooling.tools.utils import DatetimeUTC
@@ -47,7 +47,7 @@ class Market1(BaseModel):
     question: str
     image: str
     volume: USDC | None = None
-    outcomes: list[str]
+    outcomes: t.Sequence[OutcomeStr]
     outcomePrices: list[USDC]
     active: bool
     archived: bool
@@ -92,7 +92,7 @@ class Market(BaseModel):
     fee: str | None = None
     lowerBound: t.Any | None = None
     upperBound: t.Any | None = None
-    outcomes: list[str]
+    outcomes: t.Sequence[OutcomeStr]
     image: str | None = None
     icon: str | None = None
     imageOptimized: t.Any | None = None

prediction_market_agent_tooling/markets/polymarket/polymarket.py

@@ -1,12 +1,12 @@
 import typing as t
 
+from prediction_market_agent_tooling.gtypes import USD, CollateralToken
 from prediction_market_agent_tooling.markets.agent_market import (
     AgentMarket,
     FilterBy,
     MarketFees,
     SortBy,
 )
-from prediction_market_agent_tooling.markets.data_models import BetAmount, Currency
 from prediction_market_agent_tooling.markets.polymarket.api import (
     get_polymarket_binary_markets,
 )
@@ -24,7 +24,6 @@ class PolymarketAgentMarket(AgentMarket):
     Polymarket's market class that can be used by agents to make predictions.
     """
 
-    currency: t.ClassVar[Currency] = Currency.USDC
     base_url: t.ClassVar[str] = POLYMARKET_BASE_URL
 
     # Based on https://docs.polymarket.com/#fees, there are currently no fees, except for transactions fees.
@@ -49,11 +48,10 @@ class PolymarketAgentMarket(AgentMarket):
             outcome_token_pool=None,
         )
 
-    @classmethod
-    def get_tiny_bet_amount(cls) -> BetAmount:
+    def get_tiny_bet_amount(self) -> CollateralToken:
         raise NotImplementedError("TODO: Implement to allow betting on Polymarket.")
 
-    def place_bet(self, outcome: bool, amount: BetAmount) -> str:
+    def place_bet(self, outcome: bool, amount: USD) -> str:
         raise NotImplementedError("TODO: Implement to allow betting on Polymarket.")
 
     @staticmethod

prediction_market_agent_tooling/markets/seer/data_models.py

@@ -5,20 +5,47 @@ from urllib.parse import urljoin
 
 from pydantic import BaseModel, ConfigDict, Field
 from web3 import Web3
+from web3.constants import ADDRESS_ZERO
 
 from prediction_market_agent_tooling.config import RPCConfig
 from prediction_market_agent_tooling.gtypes import (
     ChecksumAddress,
+    CollateralToken,
     HexAddress,
     HexBytes,
+    OutcomeStr,
+    Probability,
+    Web3Wei,
 )
+from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.markets.data_models import Resolution
-from prediction_market_agent_tooling.markets.seer.subgraph_data_models import (
-    SeerParentMarket,
-)
+from prediction_market_agent_tooling.tools.cow.cow_manager import CowManager
 from prediction_market_agent_tooling.tools.datetime_utc import DatetimeUTC
 
 
+class CreateCategoricalMarketsParams(BaseModel):
+    model_config = ConfigDict(populate_by_name=True)
+
+    market_name: str = Field(..., alias="marketName")
+    outcomes: t.Sequence[OutcomeStr]
+    # Only relevant for scalar markets
+    question_start: str = Field(alias="questionStart", default="")
+    question_end: str = Field(alias="questionEnd", default="")
+    outcome_type: str = Field(alias="outcomeType", default="")
+
+    # Not needed for non-conditional markets.
+    parent_outcome: int = Field(alias="parentOutcome", default=0)
+    parent_market: HexAddress = Field(alias="parentMarket", default=ADDRESS_ZERO)
+
+    category: str
+    lang: str
+    lower_bound: int = Field(alias="lowerBound", default=0)
+    upper_bound: int = Field(alias="upperBound", default=0)
+    min_bond: Web3Wei = Field(..., alias="minBond")
+    opening_time: int = Field(..., alias="openingTime")
+    token_names: list[str] = Field(..., alias="tokenNames")
+
+
 class SeerOutcomeEnum(str, Enum):
     YES = "yes"
     NO = "no"
@@ -57,6 +84,10 @@ class SeerOutcomeEnum(str, Enum):
             raise ValueError(f"Unknown outcome: {self}")
 
 
+class SeerParentMarket(BaseModel):
+    id: HexBytes
+
+
 SEER_BASE_URL = "https://app.seer.pm"
 
 
@@ -66,7 +97,7 @@ class SeerMarket(BaseModel):
     id: HexBytes
     creator: HexAddress
     title: str = Field(alias="marketName")
-    outcomes: list[str]
+    outcomes: t.Sequence[OutcomeStr]
     wrapped_tokens: list[HexAddress] = Field(alias="wrappedTokens")
     parent_outcome: int = Field(alias="parentOutcome")
     parent_market: t.Optional[SeerParentMarket] = Field(
@@ -79,7 +110,6 @@ class SeerMarket(BaseModel):
     has_answers: bool | None = Field(alias="hasAnswers")
     payout_reported: bool = Field(alias="payoutReported")
     payout_numerators: list[int] = Field(alias="payoutNumerators")
-    outcomes_supply: int = Field(alias="outcomesSupply")
 
     @property
     def has_valid_answer(self) -> bool:
@@ -156,7 +186,64 @@ class SeerMarket(BaseModel):
     def created_time(self) -> DatetimeUTC:
         return DatetimeUTC.to_datetime_utc(self.block_timestamp)
 
+    @property
+    def current_p_yes(self) -> Probability:
+        price_data = {}
+        for idx in range(len(self.outcomes)):
+            wrapped_token = self.wrapped_tokens[idx]
+            price = self._get_price_for_token(
+                token=Web3.to_checksum_address(wrapped_token)
+            )
+            price_data[idx] = price
+
+        if sum(price_data.values()) == 0:
+            logger.warning(
+                f"Could not get p_yes for market {self.id.hex()}, all price quotes are 0."
+            )
+            return Probability(0)
+
+        yes_idx = self.outcome_as_enums[SeerOutcomeEnum.YES]
+        price_yes = price_data[yes_idx] / sum(price_data.values())
+        return Probability(price_yes)
+
+    def _get_price_for_token(self, token: ChecksumAddress) -> float:
+        collateral_exchange_amount = CollateralToken(1).as_wei
+        try:
+            quote = CowManager().get_quote(
+                collateral_token=self.collateral_token_contract_address_checksummed,
+                buy_token=token,
+                sell_amount=collateral_exchange_amount,
+            )
+        except Exception as e:
+            logger.warning(f"Could not get quote for {token=}, returning price 0. {e=}")
+            return 0
+
+        return collateral_exchange_amount.value / float(quote.quote.buyAmount.root)
+
     @property
     def url(self) -> str:
         chain_id = RPCConfig().chain_id
         return urljoin(SEER_BASE_URL, f"markets/{chain_id}/{self.id.hex()}")
+
+
+class SeerToken(BaseModel):
+    id: HexBytes
+    name: str
+    symbol: str
+
+
+class SeerPool(BaseModel):
+    model_config = ConfigDict(populate_by_name=True)
+    id: HexBytes
+    liquidity: int
+    token0: SeerToken
+    token1: SeerToken
+
+
+class NewMarketEvent(BaseModel):
+    market: HexAddress
+    marketName: str
+    parentMarket: HexAddress
+    conditionId: HexBytes
+    questionId: HexBytes
+    questionsIds: list[HexBytes]