prediction-market-agent-tooling 0.65.5__py3-none-any.whl → 0.69.17.dev1149__py3-none-any.whl

prediction_market_agent_tooling/markets/omen/omen_contracts.py

@@ -5,7 +5,6 @@ from datetime import timedelta
 from enum import Enum
 
 from web3 import Web3
-from web3.constants import HASH_ZERO
 
 from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.gtypes import (
@@ -13,7 +12,6 @@ from prediction_market_agent_tooling.gtypes import (
     ChecksumAddress,
     HexAddress,
     HexBytes,
-    HexStr,
     IPFSCIDVersion0,
     OutcomeWei,
     TxParams,
@@ -24,19 +22,19 @@ from prediction_market_agent_tooling.gtypes import (
 )
 from prediction_market_agent_tooling.markets.omen.data_models import (
     INVALID_ANSWER_HEX_BYTES,
-    ConditionPreparationEvent,
     ContractPrediction,
     FPMMFundingAddedEvent,
     OmenFixedProductMarketMakerCreationEvent,
-    PayoutRedemptionEvent,
     RealitioLogNewQuestionEvent,
     format_realitio_question,
 )
 from prediction_market_agent_tooling.markets.omen.omen_constants import (
+    METRI_SUPER_GROUP_CONTRACT_ADDRESS,
     SDAI_CONTRACT_ADDRESS,
     WRAPPED_XDAI_CONTRACT_ADDRESS,
 )
 from prediction_market_agent_tooling.tools.contract import (
+    ConditionalTokenContract,
     ContractDepositableWrapperERC20OnGnosisChain,
     ContractERC20OnGnosisChain,
     ContractERC4626OnGnosisChain,
@@ -95,202 +93,11 @@ class OmenOracleContract(ContractOnGnosisChain):
         )
 
 
-def build_parent_collection_id() -> HexStr:
-    return HASH_ZERO  # Taken from Olas
-
-
-class OmenConditionalTokenContract(ContractOnGnosisChain):
-    # Contract ABI taken from https://gnosisscan.io/address/0xCeAfDD6bc0bEF976fdCd1112955828E00543c0Ce#code.
-    abi: ABI = abi_field_validator(
-        os.path.join(
-            os.path.dirname(os.path.realpath(__file__)),
-            "../../abis/omen_fpmm_conditionaltokens.abi.json",
-        )
-    )
+class OmenConditionalTokenContract(ConditionalTokenContract, ContractOnGnosisChain):
     address: ChecksumAddress = Web3.to_checksum_address(
         "0xCeAfDD6bc0bEF976fdCd1112955828E00543c0Ce"
     )
 
-    def getConditionId(
-        self,
-        question_id: HexBytes,
-        oracle_address: ChecksumAddress,
-        outcomes_slot_count: int,
-        web3: Web3 | None = None,
-    ) -> HexBytes:
-        id_ = HexBytes(
-            self.call(
-                "getConditionId",
-                [oracle_address, question_id, outcomes_slot_count],
-                web3=web3,
-            )
-        )
-        return id_
-
-    def balanceOf(
-        self, from_address: ChecksumAddress, position_id: int, web3: Web3 | None = None
-    ) -> OutcomeWei:
-        balance = OutcomeWei(
-            self.call("balanceOf", [from_address, position_id], web3=web3)
-        )
-        return balance
-
-    def getCollectionId(
-        self,
-        parent_collection_id: HexStr,
-        condition_id: HexBytes,
-        index_set: int,
-        web3: Web3 | None = None,
-    ) -> HexBytes:
-        collection_id = HexBytes(
-            self.call(
-                "getCollectionId",
-                [parent_collection_id, condition_id, index_set],
-                web3=web3,
-            )
-        )
-        return collection_id
-
-    def getPositionId(
-        self,
-        collateral_token_address: ChecksumAddress,
-        collection_id: HexBytes,
-        web3: Web3 | None = None,
-    ) -> int:
-        position_id: int = self.call(
-            "getPositionId",
-            [collateral_token_address, collection_id],
-            web3=web3,
-        )
-        return position_id
-
-    def mergePositions(
-        self,
-        api_keys: APIKeys,
-        collateral_token_address: ChecksumAddress,
-        conditionId: HexBytes,
-        index_sets: t.List[int],
-        amount: OutcomeWei,
-        parent_collection_id: HexStr = build_parent_collection_id(),
-        web3: Web3 | None = None,
-    ) -> TxReceipt:
-        return self.send(
-            api_keys=api_keys,
-            function_name="mergePositions",
-            function_params=[
-                collateral_token_address,
-                parent_collection_id,
-                conditionId,
-                index_sets,
-                amount,
-            ],
-            web3=web3,
-        )
-
-    def redeemPositions(
-        self,
-        api_keys: APIKeys,
-        collateral_token_address: HexAddress,
-        condition_id: HexBytes,
-        index_sets: t.List[int],
-        parent_collection_id: HexStr = build_parent_collection_id(),
-        web3: Web3 | None = None,
-    ) -> PayoutRedemptionEvent:
-        receipt_tx = self.send(
-            api_keys=api_keys,
-            function_name="redeemPositions",
-            function_params=[
-                collateral_token_address,
-                parent_collection_id,
-                condition_id,
-                index_sets,
-            ],
-            web3=web3,
-        )
-        redeem_event_logs = (
-            self.get_web3_contract(web3=web3)
-            .events.PayoutRedemption()
-            .process_receipt(receipt_tx)
-        )
-        redeem_event = PayoutRedemptionEvent(**redeem_event_logs[0]["args"])
-        return redeem_event
-
-    def getOutcomeSlotCount(
-        self, condition_id: HexBytes, web3: Web3 | None = None
-    ) -> int:
-        count: int = self.call("getOutcomeSlotCount", [condition_id], web3=web3)
-        return count
-
-    def does_condition_exists(
-        self, condition_id: HexBytes, web3: Web3 | None = None
-    ) -> bool:
-        return self.getOutcomeSlotCount(condition_id, web3=web3) > 0
-
-    def is_condition_resolved(
-        self, condition_id: HexBytes, web3: Web3 | None = None
-    ) -> bool:
-        # from ConditionalTokens.redeemPositions:
-        # uint den = payoutDenominator[conditionId]; require(den > 0, "result for condition not received yet");
-        payout_for_condition = self.payoutDenominator(condition_id, web3=web3)
-        return payout_for_condition > 0
-
-    def payoutDenominator(
-        self, condition_id: HexBytes, web3: Web3 | None = None
-    ) -> int:
-        payoutForCondition: int = self.call(
-            "payoutDenominator", [condition_id], web3=web3
-        )
-        return payoutForCondition
-
-    def setApprovalForAll(
-        self,
-        api_keys: APIKeys,
-        for_address: ChecksumAddress,
-        approve: bool,
-        tx_params: t.Optional[TxParams] = None,
-        web3: Web3 | None = None,
-    ) -> TxReceipt:
-        return self.send(
-            api_keys=api_keys,
-            function_name="setApprovalForAll",
-            function_params=[
-                for_address,
-                approve,
-            ],
-            tx_params=tx_params,
-            web3=web3,
-        )
-
-    def prepareCondition(
-        self,
-        api_keys: APIKeys,
-        oracle_address: ChecksumAddress,
-        question_id: HexBytes,
-        outcomes_slot_count: int,
-        tx_params: t.Optional[TxParams] = None,
-        web3: Web3 | None = None,
-    ) -> ConditionPreparationEvent:
-        receipt_tx = self.send(
-            api_keys=api_keys,
-            function_name="prepareCondition",
-            function_params=[
-                oracle_address,
-                question_id,
-                outcomes_slot_count,
-            ],
-            tx_params=tx_params,
-            web3=web3,
-        )
-
-        event_logs = (
-            self.get_web3_contract(web3=web3)
-            .events.ConditionPreparation()
-            .process_receipt(receipt_tx)
-        )
-        cond_event = ConditionPreparationEvent(**event_logs[0]["args"])
-
-        return cond_event
-
 
 class OmenFixedProductMarketMakerContract(ContractOnGnosisChain):
     # File content taken from https://github.com/protofire/omen-exchange/blob/master/app/src/abi/marketMaker.json.
@@ -433,7 +240,7 @@ class OmenFixedProductMarketMakerContract(ContractOnGnosisChain):
 
 class MetriSuperGroup(ContractERC20OnGnosisChain):
     address: ChecksumAddress = Web3.to_checksum_address(
-        "0x7147A7405fCFe5CFa30c6d5363f9f357a317d082"
+        METRI_SUPER_GROUP_CONTRACT_ADDRESS
     )
 
 
@@ -821,20 +628,16 @@ class OmenRealitioContract(ContractOnGnosisChain):
         return is_pending_arbitration
 
 
-class OmenAgentResultMappingContract(ContractOnGnosisChain):
+class _AgentResultMappingContract(ContractOnGnosisChain):
     # Contract ABI taken from built https://github.com/gnosis/labs-contracts.
 
     abi: ABI = abi_field_validator(
         os.path.join(
             os.path.dirname(os.path.realpath(__file__)),
-            "../../abis/omen_agentresultmapping.abi.json",
+            "../../abis/agentresultmapping.abi.json",
         )
     )
 
-    address: ChecksumAddress = Web3.to_checksum_address(
-        "0x260E1077dEA98e738324A6cEfB0EE9A272eD471a"
-    )
-
     def get_predictions(
         self,
         market_address: ChecksumAddress,
@@ -860,6 +663,18 @@ class OmenAgentResultMappingContract(ContractOnGnosisChain):
         )
 
 
+class OmenAgentResultMappingContract(_AgentResultMappingContract):
+    address: ChecksumAddress = Web3.to_checksum_address(
+        "0x99c43743A2dbd406160CC43cf08113b17178789c"
+    )
+
+
+class SeerAgentResultMappingContract(_AgentResultMappingContract):
+    address: ChecksumAddress = Web3.to_checksum_address(
+        "0x1aafdfBD38EE92A4a74A44A1614E00894205074e"
+    )
+
+
 class OmenThumbnailMapping(ContractOnGnosisChain):
     # Contract ABI taken from built https://github.com/gnosis/labs-contracts.
     abi: ABI = abi_field_validator(

prediction_market_agent_tooling/markets/omen/omen_resolving.py

@@ -13,7 +13,7 @@ from prediction_market_agent_tooling.markets.data_models import Resolution
 from prediction_market_agent_tooling.markets.manifold.api import (
     find_resolution_on_manifold,
 )
-from prediction_market_agent_tooling.markets.markets import MarketType
+from prediction_market_agent_tooling.markets.market_type import MarketType
 from prediction_market_agent_tooling.markets.omen.data_models import (
     OmenMarket,
     RealityQuestion,
@@ -31,7 +31,11 @@ from prediction_market_agent_tooling.markets.omen.omen_subgraph_handler import (
 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.utils import (
+    check_not_none,
+    extract_error_from_retry_error,
+    utcnow,
+)
 from prediction_market_agent_tooling.tools.web3_utils import ZERO_BYTES
 
 
@@ -81,10 +85,10 @@ def claim_bonds_on_realitio_question(
     responses = sorted(responses, key=lambda x: x.timestamp)
 
     if not responses:
-        raise ValueError(f"No answers found for {question.questionId.hex()=}")
+        raise ValueError(f"No answers found for {question.questionId.to_0x_hex()=}")
 
     if responses[-1].question.historyHash == ZERO_BYTES:
-        raise ValueError(f"Already claimed {question.questionId.hex()=}.")
+        raise ValueError(f"Already claimed {question.questionId.to_0x_hex()=}.")
 
     history_hashes: list[HexBytes] = []
     addresses: list[ChecksumAddress] = []
@@ -223,7 +227,10 @@ def omen_submit_answer_market_tx(
     And after the period is over, you need to resolve the market using `omen_resolve_market_tx`.
     """
     realitio_contract = OmenRealitioContract()
-    outcome_index = market.outcomes.index(resolution.outcome)
+    outcome_matching_market = check_not_none(
+        resolution.find_outcome_matching_market(market.outcomes)
+    )
+    outcome_index = market.outcomes.index(outcome_matching_market)
     realitio_contract.submit_answer(
         api_keys=api_keys,
         question_id=market.question.id,
@@ -261,14 +268,27 @@ def omen_resolve_market_tx(
     Market can be resolved after the answer if finalized on Reality.
     """
     oracle_contract = OmenOracleContract()
-    oracle_contract.resolve(
-        api_keys=api_keys,
-        question_id=market.question.id,
-        template_id=market.question.templateId,
-        question_raw=market.question.question_raw,
-        n_outcomes=market.question.n_outcomes,
-        web3=web3,
-    )
+    try:
+        oracle_contract.resolve(
+            api_keys=api_keys,
+            question_id=market.question.id,
+            template_id=market.question.templateId,
+            question_raw=market.question.question_raw,
+            n_outcomes=market.question.n_outcomes,
+            web3=web3,
+        )
+    except BaseException as e:
+        e = extract_error_from_retry_error(e)
+        if "condition not prepared or found" in str(e):
+            # We can't do anything about these, so just skip them with warning.
+            logger.warning(
+                f"Market {market.url=} not resolved, because `condition not prepared or found`, skipping."
+            )
+        elif "payout denominator already set" in str(e):
+            # We can just skip, it's been resolved already.
+            logger.info(f"Market {market.url=} is already resolved.")
+        else:
+            raise
 
 
 def find_resolution_on_other_markets(market: OmenMarket) -> Resolution | None:

prediction_market_agent_tooling/markets/omen/omen_subgraph_handler.py

@@ -32,6 +32,7 @@ from prediction_market_agent_tooling.markets.omen.omen_contracts import (
     COWContract,
     EUReContract,
     GNOContract,
+    MetriSuperGroup,
     OmenThumbnailMapping,
     SAFEContract,
     WETHContract,
@@ -52,7 +53,7 @@ from prediction_market_agent_tooling.tools.web3_utils import (
     unwrap_generic_value,
 )
 
-SAFE_COLLATERAL_TOKENS = (
+SAFE_COLLATERAL_TOKENS = [
     WrappedxDaiContract(),
     sDaiContract(),
     GNOContract(),
@@ -60,10 +61,11 @@ SAFE_COLLATERAL_TOKENS = (
     EUReContract(),
     SAFEContract(),
     COWContract(),
-)
-SAFE_COLLATERAL_TOKENS_ADDRESSES = tuple(
+    MetriSuperGroup(),
+]
+SAFE_COLLATERAL_TOKENS_ADDRESSES = [
     contract.address for contract in SAFE_COLLATERAL_TOKENS
-)
+]
 
 
 class OmenSubgraphHandler(BaseSubgraphHandler):
@@ -188,6 +190,7 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
             questions_field.templateId,
             questions_field.isPendingArbitration,
             questions_field.openingTimestamp,
+            questions_field.timeout,
         ]
 
     def _get_fields_for_markets(self, markets_field: FieldPath) -> list[FieldPath]:
@@ -235,7 +238,7 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
         liquidity_bigger_than: Wei | None,
         condition_id_in: list[HexBytes] | None,
         id_in: list[str] | None,
-        collateral_token_address_in: tuple[ChecksumAddress, ...] | None,
+        collateral_token_address_in: t.Sequence[ChecksumAddress] | None,
         category: str | None,
         include_categorical_markets: bool = False,
         include_scalar_markets: bool = False,
@@ -283,7 +286,7 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
             where_stms["liquidityParameter_gt"] = liquidity_bigger_than
 
         if condition_id_in is not None:
-            where_stms["condition_"]["id_in"] = [x.hex() for x in condition_id_in]
+            where_stms["condition_"]["id_in"] = [x.to_0x_hex() for x in condition_id_in]
 
         if id_in is not None:
             where_stms["id_in"] = [i.lower() for i in id_in]
@@ -346,7 +349,7 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
         created_after: DatetimeUTC | None = None,
         excluded_questions: set[str] | None = None,  # question titles
         collateral_token_address_in: (
-            tuple[ChecksumAddress, ...] | None
+            t.Sequence[ChecksumAddress] | None
         ) = SAFE_COLLATERAL_TOKENS_ADDRESSES,
         category: str | None = None,
         creator_in: t.Sequence[HexAddress] | None = None,
@@ -414,7 +417,7 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
         sort_by_field: FieldPath | None = None,
         sort_direction: str | None = None,
         collateral_token_address_in: (
-            tuple[ChecksumAddress, ...] | None
+            t.Sequence[ChecksumAddress] | None
         ) = SAFE_COLLATERAL_TOKENS_ADDRESSES,
         category: str | None = None,
         include_categorical_markets: bool = True,
@@ -511,7 +514,7 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
         where_stms: dict[str, t.Any] = {}
 
         if condition_id is not None:
-            where_stms["conditionIds_contains"] = [condition_id.hex()]
+            where_stms["conditionIds_contains"] = [condition_id.to_0x_hex()]
 
         positions = self.conditional_tokens_subgraph.Query.positions(
             first=sys.maxsize, where=unwrap_generic_value(where_stms)
@@ -539,10 +542,12 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
             where_stms["totalBalance_gt"] = total_balance_bigger_than
 
         if user_position_id_in is not None:
-            where_stms["id_in"] = [x.hex() for x in user_position_id_in]
+            where_stms["id_in"] = [x.to_0x_hex() for x in user_position_id_in]
 
         if position_id_in is not None:
-            where_stms["position_"]["positionId_in"] = [x.hex() for x in position_id_in]
+            where_stms["position_"]["positionId_in"] = [
+                x.to_0x_hex() for x in position_id_in
+            ]
 
         positions = self.conditional_tokens_subgraph.Query.userPositions(
             first=sys.maxsize, where=unwrap_generic_value(where_stms)
@@ -708,13 +713,13 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
             where_stms["user"] = user.lower()
 
         if question_id is not None:
-            where_stms["questionId"] = question_id.hex()
+            where_stms["questionId"] = question_id.to_0x_hex()
 
         if claimed is not None:
             if claimed:
-                where_stms["historyHash"] = ZERO_BYTES.hex()
+                where_stms["historyHash"] = ZERO_BYTES.to_0x_hex()
             else:
-                where_stms["historyHash_not"] = ZERO_BYTES.hex()
+                where_stms["historyHash_not"] = ZERO_BYTES.to_0x_hex()
 
         if current_answer_before is not None:
             where_stms["currentAnswerTimestamp_lt"] = to_int_timestamp(
@@ -748,7 +753,7 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
 
         if question_id_in is not None:
             # Be aware: On Omen subgraph, question's `id` represents `questionId` on reality subgraph. And `id` on reality subraph is just a weird concat of multiple things from the question.
-            where_stms["questionId_in"] = [x.hex() for x in question_id_in]
+            where_stms["questionId_in"] = [x.to_0x_hex() for x in question_id_in]
 
         if excluded_titles:
             # Be aware: This is called `title_not_in` on Omen subgraph.
@@ -775,7 +780,7 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
         where_stms: dict[str, t.Any] = {}
 
         if question_id is not None:
-            where_stms["id"] = question_id.hex()
+            where_stms["id"] = question_id.to_0x_hex()
 
         if current_answer_before is not None:
             where_stms["currentAnswerTimestamp_lt"] = to_int_timestamp(
@@ -809,7 +814,7 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
 
         if question_id_in is not None:
             # Be aware: On Omen subgraph, question's `id` represents `questionId` on reality subgraph. And `id` on reality subraph is just a weird concat of multiple things from the question.
-            where_stms["id_in"] = [x.hex() for x in question_id_in]
+            where_stms["id_in"] = [x.to_0x_hex() for x in question_id_in]
 
         if excluded_titles:
             # Be aware: This is called `qTitle_not_in` on Omen subgraph.
@@ -862,7 +867,7 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
         answer = self.realityeth_subgraph.Answer
         # subgrounds complains if bytes is passed, hence we convert it to HexStr
         where_stms = [
-            answer.question.questionId == question_id.hex(),
+            answer.question.questionId == question_id.to_0x_hex(),
         ]
 
         answers = self.realityeth_subgraph.Query.answers(