prediction-market-agent-tooling 0.69.4.dev1072__tar.gz → 0.69.5__tar.gz

{prediction_market_agent_tooling-0.69.4.dev1072 → prediction_market_agent_tooling-0.69.5}/PKG-INFO

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

{prediction_market_agent_tooling-0.69.4.dev1072 → prediction_market_agent_tooling-0.69.5}/prediction_market_agent_tooling/markets/seer/data_models.py

@@ -163,13 +163,6 @@ class SeerMarketWithQuestions(SeerMarket):
     questions: list[SeerMarketQuestions]
 
 
-class RedeemParams(BaseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    market: ChecksumAddress
-    outcome_indices: list[int] = Field(alias="outcomeIndexes")
-    amounts: list[OutcomeWei]
-
-
 class ExactInputSingleParams(BaseModel):
     # from https://gnosisscan.io/address/0xffb643e73f280b97809a8b41f7232ab401a04ee1#code
     model_config = ConfigDict(populate_by_name=True)

{prediction_market_agent_tooling-0.69.4.dev1072 → prediction_market_agent_tooling-0.69.5}/prediction_market_agent_tooling/markets/seer/seer.py

@@ -49,7 +49,6 @@ from prediction_market_agent_tooling.markets.omen.omen_contracts import (
     SeerAgentResultMappingContract,
 )
 from prediction_market_agent_tooling.markets.seer.data_models import (
-    RedeemParams,
     SeerMarket,
     SeerMarketWithQuestions,
 )
@@ -83,6 +82,7 @@ from prediction_market_agent_tooling.tools.cow.cow_order import (
     OrderStatusError,
     get_orders_by_owner,
     get_trades_by_order_uid,
+    handle_allowance,
     swap_tokens_waiting,
     wait_for_order_completion,
 )
@@ -279,6 +279,7 @@ class SeerAgentMarket(AgentMarket):
         """
         We filter the markets using previous trades by the user so that we don't have to process all Seer markets.
         """
+
         trades_by_user = get_seer_transactions(
             api_keys.bet_from_address, RPCConfig().CHAIN_ID
         )
@@ -299,10 +300,12 @@ class SeerAgentMarket(AgentMarket):
         return filtered_markets
 
     @staticmethod
-    def redeem_winnings(api_keys: APIKeys) -> None:
-        web3 = RPCConfig().get_web3()
+    def redeem_winnings(api_keys: APIKeys, web3: Web3 | None = None) -> None:
+        web3 = web3 or RPCConfig().get_web3()
         subgraph = SeerSubgraphHandler()
 
+        # ToDo - Find open positions by user directly
+
         closed_markets = subgraph.get_markets(
             filter_by=FilterBy.RESOLVED, sort_by=SortBy.NEWEST
         )
@@ -311,8 +314,8 @@ class SeerAgentMarket(AgentMarket):
         )
 
         market_balances = {
-            market.id: market.get_outcome_token_balances(
-                api_keys.bet_from_address, web3
+            market.id: list(
+                market.get_outcome_token_balances(api_keys.bet_from_address, web3)
             )
             for market in filtered_markets
         }
@@ -329,17 +332,15 @@ class SeerAgentMarket(AgentMarket):
             try:
                 # GnosisRouter needs approval to use our outcome tokens
                 for i, token in enumerate(market.wrapped_tokens):
-                    ContractERC20OnGnosisChain(
-                        address=Web3.to_checksum_address(token)
-                    ).approve(
-                        api_keys,
+                    handle_allowance(
+                        api_keys=api_keys,
+                        sell_token=Web3.to_checksum_address(token),
+                        amount_to_check_wei=market_balances[market.id][i].as_wei,
                         for_address=gnosis_router.address,
-                        amount_wei=market_balances[market.id][i].as_wei,
                         web3=web3,
                     )
 
                 # We can only ask for redeem of outcome tokens on correct outcomes
-                # TODO: Implement more complex use-cases: https://github.com/gnosis/prediction-market-agent-tooling/issues/850
                 amounts_to_redeem = [
                     (amount if numerator > 0 else OutcomeWei(0))
                     for amount, numerator in zip(
@@ -347,13 +348,13 @@ class SeerAgentMarket(AgentMarket):
                     )
                 ]
 
-                # Redeem!
-                params = RedeemParams(
+                gnosis_router.redeem_to_base(
+                    api_keys,
                     market=Web3.to_checksum_address(market.id),
-                    outcome_indices=list(range(len(market.payout_numerators))),
+                    outcome_indexes=list(range(len(market.payout_numerators))),
                     amounts=amounts_to_redeem,
+                    web3=web3,
                 )
-                gnosis_router.redeem_to_base(api_keys, params=params, web3=web3)
                 logger.info(f"Redeemed market {market.url}.")
             except Exception:
                 logger.exception(

{prediction_market_agent_tooling-0.69.4.dev1072 → prediction_market_agent_tooling-0.69.5}/prediction_market_agent_tooling/markets/seer/seer_contracts.py

@@ -8,13 +8,13 @@ from prediction_market_agent_tooling.gtypes import (
     ABI,
     ChecksumAddress,
     OutcomeStr,
+    OutcomeWei,
     TxReceipt,
     Wei,
     xDai,
 )
 from prediction_market_agent_tooling.markets.seer.data_models import (
     ExactInputSingleParams,
-    RedeemParams,
 )
 from prediction_market_agent_tooling.markets.seer.subgraph_data_models import (
     CreateCategoricalMarketsParams,
@@ -102,12 +102,18 @@ class GnosisRouter(ContractOnGnosisChain):
     def redeem_to_base(
         self,
         api_keys: APIKeys,
-        params: RedeemParams,
+        market: ChecksumAddress,
+        outcome_indexes: list[int],
+        amounts: list[OutcomeWei],
         web3: Web3 | None = None,
     ) -> TxReceipt:
-        params_dict = params.model_dump(by_alias=True)
         # We explicity set amounts since OutcomeWei gets serialized as dict
-        params_dict["amounts"] = [amount.value for amount in params.amounts]
+        params_dict = {
+            "market": market,
+            "outcomeIndexes": outcome_indexes,
+            "amounts": [amount.value for amount in amounts],
+        }
+
         receipt_tx = self.send(
             api_keys=api_keys,
             function_name="redeemToBase",
@@ -116,6 +122,22 @@ class GnosisRouter(ContractOnGnosisChain):
         )
         return receipt_tx
 
+    def split_from_base(
+        self,
+        api_keys: APIKeys,
+        market_id: ChecksumAddress,
+        amount_wei: Wei,
+        web3: Web3 | None = None,
+    ) -> TxReceipt:
+        """Splits using xDAI and receives outcome tokens"""
+        return self.send_with_value(
+            api_keys=api_keys,
+            function_name="splitFromBase",
+            amount_wei=amount_wei,
+            function_params=[market_id],
+            web3=web3,
+        )
+
     def split_position(
         self,
         api_keys: APIKeys,

{prediction_market_agent_tooling-0.69.4.dev1072 → prediction_market_agent_tooling-0.69.5}/prediction_market_agent_tooling/tools/contract.py

@@ -434,6 +434,25 @@ class ContractWrapped1155BaseClass(ContractERC20BaseClass):
         )
     )
 
+    def factory(self, web3: Web3 | None = None) -> ChecksumAddress:
+        return Web3.to_checksum_address(self.call("factory", web3=web3))
+
+    def mint(
+        self,
+        api_keys: APIKeys,
+        to_address: ChecksumAddress,
+        amount: Wei,
+        tx_params: t.Optional[TxParams] = None,
+        web3: Web3 | None = None,
+    ) -> TxReceipt:
+        return self.send(
+            api_keys=api_keys,
+            function_name="mint",
+            function_params=[to_address, amount],
+            tx_params=tx_params,
+            web3=web3,
+        )
+
 
 class OwnableContract(ContractBaseClass):
     abi: ABI = abi_field_validator(

{prediction_market_agent_tooling-0.69.4.dev1072 → prediction_market_agent_tooling-0.69.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "prediction-market-agent-tooling"
-version = "0.69.4.dev1072"
+version = "0.69.5"
 description = "Tools to benchmark, deploy and monitor prediction market agents."
 authors = ["Gnosis"]
 readme = "README.md"