prediction-market-agent-tooling 0.26.0__tar.gz → 0.27.0__tar.gz

{prediction_market_agent_tooling-0.26.0 → prediction_market_agent_tooling-0.27.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prediction-market-agent-tooling
-Version: 0.26.0
+Version: 0.27.0
 Summary: Tools to benchmark, deploy and monitor prediction market agents.
 Author: Gnosis
 Requires-Python: >=3.10,<3.12

{prediction_market_agent_tooling-0.26.0 → prediction_market_agent_tooling-0.27.0}/prediction_market_agent_tooling/config.py

@@ -2,7 +2,6 @@ import typing as t
 
 from gnosis.eth import EthereumClient
 from gnosis.safe import Safe
-from pydantic import BaseModel
 from pydantic.types import SecretStr
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
@@ -58,6 +57,15 @@ class APIKeys(BaseSettings):
             "BET_FROM_PRIVATE_KEY missing in the environment.",
         )
 
+    @property
+    def bet_from_address(self) -> ChecksumAddress:
+        """If the SAFE is available, we always route transactions via SAFE. Otherwise we use the EOA."""
+        return (
+            self.SAFE_ADDRESS
+            if self.SAFE_ADDRESS
+            else private_key_to_public_key(self.bet_from_private_key)
+        )
+
     @property
     def openai_api_key(self) -> SecretStr:
         return check_not_none(
@@ -110,35 +118,10 @@ class APIKeys(BaseSettings):
             if APIKeys.model_fields[k].annotation in SECRET_TYPES and v is not None
         }
 
-
-class PrivateCredentials(BaseModel):
-    private_key: PrivateKey
-    safe_address: ChecksumAddress | None
-
-    @property
-    def public_key(self) -> ChecksumAddress:
-        """If the SAFE is available, we always route transactions via SAFE. Otherwise we use the EOA."""
-        return (
-            self.safe_address
-            if self.safe_address is not None
-            else private_key_to_public_key(self.private_key)
-        )
-
-    @property
-    def has_safe_address(self) -> bool:
-        return self.safe_address is not None
-
-    @staticmethod
-    def from_api_keys(api_keys: APIKeys) -> "PrivateCredentials":
-        return PrivateCredentials(
-            private_key=api_keys.bet_from_private_key,
-            safe_address=api_keys.SAFE_ADDRESS,
-        )
-
     def check_if_is_safe_owner(self, ethereum_client: EthereumClient) -> bool:
-        if not self.safe_address:
+        if not self.SAFE_ADDRESS:
             raise ValueError("Cannot check ownership if safe_address is not defined.")
 
-        s = Safe(self.safe_address, ethereum_client)  # type: ignore[abstract]
-        public_key_from_signer = private_key_to_public_key(self.private_key)
+        s = Safe(self.SAFE_ADDRESS, ethereum_client)  # type: ignore[abstract]
+        public_key_from_signer = private_key_to_public_key(self.bet_from_private_key)
         return s.retrieve_is_owner(public_key_from_signer)

{prediction_market_agent_tooling-0.26.0 → prediction_market_agent_tooling-0.27.0}/prediction_market_agent_tooling/deploy/agent.py

@@ -8,7 +8,7 @@ from datetime import datetime, timedelta
 from pydantic import BaseModel, BeforeValidator
 from typing_extensions import Annotated
 
-from prediction_market_agent_tooling.config import APIKeys, PrivateCredentials
+from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.deploy.constants import (
     MARKET_TYPE_KEY,
     REPOSITORY_KEY,
@@ -260,11 +260,9 @@ class DeployableTraderAgent(DeployableAgent):
         """
         Executes actions that occur before bets are placed.
         """
-        private_credentials = PrivateCredentials.from_api_keys(APIKeys())
-
         if market_type == MarketType.OMEN:
             # Omen is specific, because the user (agent) needs to manually withdraw winnings from the market.
-            redeem_from_all_user_positions(private_credentials)
+            redeem_from_all_user_positions(APIKeys())
 
     def process_bets(self, market_type: MarketType) -> None:
         """

{prediction_market_agent_tooling-0.26.0 → prediction_market_agent_tooling-0.27.0}/prediction_market_agent_tooling/markets/markets.py

@@ -2,7 +2,7 @@ import typing as t
 from datetime import datetime, timedelta
 from enum import Enum
 
-from prediction_market_agent_tooling.config import APIKeys, PrivateCredentials
+from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.markets.agent_market import (
     AgentMarket,
     FilterBy,
@@ -68,7 +68,6 @@ def have_bet_on_market_since(
     keys: APIKeys, market: AgentMarket, since: timedelta
 ) -> bool:
     start_time = utcnow() - since
-    credentials = PrivateCredentials.from_api_keys(keys)
     recently_betted_questions = (
         set(
             get_manifold_market(b.contractId).question
@@ -85,7 +84,7 @@ def have_bet_on_market_since(
             set(
                 b.title
                 for b in OmenSubgraphHandler().get_bets(
-                    better_address=credentials.public_key,
+                    better_address=keys.bet_from_address,
                     start_time=start_time,
                 )
             )

{prediction_market_agent_tooling-0.26.0 → prediction_market_agent_tooling-0.27.0}/prediction_market_agent_tooling/markets/omen/omen.py

@@ -5,7 +5,7 @@ from datetime import datetime
 from web3 import Web3
 from web3.constants import HASH_ZERO
 
-from prediction_market_agent_tooling.config import APIKeys, PrivateCredentials
+from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.gtypes import (
     ChecksumAddress,
     HexAddress,
@@ -136,10 +136,8 @@ class OmenAgentMarket(AgentMarket):
         if amount.currency != self.currency:
             raise ValueError(f"Omen bets are made in xDai. Got {amount.currency}.")
         amount_xdai = xDai(amount.amount)
-        keys = APIKeys()
-        private_credentials = PrivateCredentials.from_api_keys(keys)
         binary_omen_buy_outcome_tx(
-            private_credentials=private_credentials,
+            api_keys=APIKeys(),
             amount=amount_xdai,
             market=self,
             binary_outcome=outcome,
@@ -150,10 +148,8 @@ class OmenAgentMarket(AgentMarket):
     def sell_tokens(
         self, outcome: bool, amount: TokenAmount, auto_withdraw: bool = True
     ) -> None:
-        keys = APIKeys()
-        private_credentials = PrivateCredentials.from_api_keys(keys)
         binary_omen_sell_outcome_tx(
-            private_credentials=private_credentials,
+            api_keys=APIKeys(),
             amount=xDai(amount.amount),
             market=self,
             binary_outcome=outcome,
@@ -206,9 +202,9 @@ class OmenAgentMarket(AgentMarket):
 
     def redeem_positions(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
     ) -> None:
-        for_public_key = private_credentials.public_key
+        for_public_key = api_keys.bet_from_address
         market_is_redeemable = self.market_redeemable_by(user=for_public_key)
         if not market_is_redeemable:
             logger.debug(
@@ -216,9 +212,7 @@ class OmenAgentMarket(AgentMarket):
             )
             return None
 
-        omen_redeem_full_position_tx(
-            private_credentials=private_credentials, market=self
-        )
+        omen_redeem_full_position_tx(api_keys=api_keys, market=self)
 
     @staticmethod
     def from_data_model(model: OmenMarket) -> "OmenAgentMarket":
@@ -273,9 +267,6 @@ class OmenAgentMarket(AgentMarket):
         bets = OmenSubgraphHandler().get_bets(
             better_address=better_address, start_time=start_time
         )
-        # get unique titles
-        seen_titles = {bet.title: bet for bet in bets}
-        bets = list(seen_titles.values())
         bets.sort(key=lambda x: x.creation_datetime)
         return [b.to_bet() for b in bets]
 
@@ -370,7 +361,7 @@ def pick_binary_market(
 
 
 def omen_buy_outcome_tx(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     amount: xDai,
     market: OmenAgentMarket,
     outcome: str,
@@ -381,7 +372,7 @@ def omen_buy_outcome_tx(
     Bets the given amount of xDai for the given outcome in the given market.
     """
     amount_wei = xdai_to_wei(amount)
-    from_address_checksummed = private_credentials.public_key
+    from_address_checksummed = api_keys.bet_from_address
 
     market_contract: OmenFixedProductMarketMakerContract = market.get_contract()
 
@@ -398,7 +389,7 @@ def omen_buy_outcome_tx(
     expected_shares = remove_fraction(expected_shares, 0.01)
     # Approve the market maker to withdraw our collateral token.
     collateral_token_contract.approve(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         for_address=market_contract.address,
         amount_wei=amount_wei,
         web3=web3,
@@ -410,11 +401,11 @@ def omen_buy_outcome_tx(
     )
     if auto_deposit and collateral_token_balance < amount_wei:
         collateral_token_contract.deposit(
-            private_credentials=private_credentials, amount_wei=amount_wei, web3=web3
+            api_keys=api_keys, amount_wei=amount_wei, web3=web3
         )
     # Buy shares using the deposited xDai in the collateral token.
     market_contract.buy(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         amount_wei=amount_wei,
         outcome_index=outcome_index,
         min_outcome_tokens_to_buy=expected_shares,
@@ -423,7 +414,7 @@ def omen_buy_outcome_tx(
 
 
 def binary_omen_buy_outcome_tx(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     amount: xDai,
     market: OmenAgentMarket,
     binary_outcome: bool,
@@ -431,7 +422,7 @@ def binary_omen_buy_outcome_tx(
     web3: Web3 | None = None,
 ) -> None:
     omen_buy_outcome_tx(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         amount=amount,
         market=market,
         outcome=OMEN_TRUE_OUTCOME if binary_outcome else OMEN_FALSE_OUTCOME,
@@ -441,7 +432,7 @@ def binary_omen_buy_outcome_tx(
 
 
 def omen_sell_outcome_tx(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     amount: xDai,  # The xDai value of shares to sell.
     market: OmenAgentMarket,
     outcome: str,
@@ -482,14 +473,14 @@ def omen_sell_outcome_tx(
 
     # Approve the market maker to move our (all) conditional tokens.
     conditional_token_contract.setApprovalForAll(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         for_address=market_contract.address,
         approve=True,
         web3=web3,
     )
     # Sell the shares.
     market_contract.sell(
-        private_credentials,
+        api_keys,
         amount_wei,
         outcome_index,
         max_outcome_tokens_to_sell,
@@ -497,13 +488,11 @@ def omen_sell_outcome_tx(
     )
     if auto_withdraw:
         # Optionally, withdraw from the collateral token back to the `from_address` wallet.
-        collateral_token.withdraw(
-            private_credentials=private_credentials, amount_wei=amount_wei, web3=web3
-        )
+        collateral_token.withdraw(api_keys=api_keys, amount_wei=amount_wei, web3=web3)
 
 
 def binary_omen_sell_outcome_tx(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     amount: xDai,
     market: OmenAgentMarket,
     binary_outcome: bool,
@@ -511,7 +500,7 @@ def binary_omen_sell_outcome_tx(
     web3: Web3 | None = None,
 ) -> None:
     omen_sell_outcome_tx(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         amount=amount,
         market=market,
         outcome=OMEN_TRUE_OUTCOME if binary_outcome else OMEN_FALSE_OUTCOME,
@@ -521,7 +510,7 @@ def binary_omen_sell_outcome_tx(
 
 
 def omen_create_market_tx(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     initial_funds: xDai,
     question: str,
     closing_time: datetime,
@@ -535,7 +524,7 @@ def omen_create_market_tx(
     """
     Based on omen-exchange TypeScript code: https://github.com/protofire/omen-exchange/blob/b0b9a3e71b415d6becf21fe428e1c4fc0dad2e80/app/src/services/cpk/cpk.ts#L308
     """
-    from_address = private_credentials.public_key
+    from_address = api_keys.bet_from_address
     initial_funds_wei = xdai_to_wei(initial_funds)
 
     realitio_contract = OmenRealitioContract()
@@ -558,7 +547,7 @@ def omen_create_market_tx(
 
     # Approve the market maker to withdraw our collateral token.
     collateral_token_contract.approve(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         for_address=factory_contract.address,
         amount_wei=initial_funds_wei,
         web3=web3,
@@ -574,13 +563,11 @@ def omen_create_market_tx(
         and initial_funds_wei > 0
         and collateral_token_balance < initial_funds_wei
     ):
-        collateral_token_contract.deposit(
-            private_credentials, initial_funds_wei, web3=web3
-        )
+        collateral_token_contract.deposit(api_keys, initial_funds_wei, web3=web3)
 
     # Create the question on Realitio.
     question_id = realitio_contract.askQuestion(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         question=question,
         category=category,
         outcomes=outcomes,
@@ -599,7 +586,7 @@ def omen_create_market_tx(
     )
     if not conditional_token_contract.does_condition_exists(condition_id, web3=web3):
         conditional_token_contract.prepareCondition(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             question_id=question_id,
             oracle_address=oracle_contract.address,
             outcomes_slot_count=len(outcomes),
@@ -608,7 +595,7 @@ def omen_create_market_tx(
 
     # Create the market.
     create_market_receipt_tx = factory_contract.create2FixedProductMarketMaker(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         condition_id=condition_id,
         fee=fee,
         initial_funds_wei=initial_funds_wei,
@@ -627,13 +614,13 @@ def omen_create_market_tx(
 
 
 def omen_fund_market_tx(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     market: OmenAgentMarket,
     funds: Wei,
     auto_deposit: bool,
     web3: Web3 | None = None,
 ) -> None:
-    from_address = private_credentials.public_key
+    from_address = api_keys.bet_from_address
     market_contract = market.get_contract()
     collateral_token_contract = OmenCollateralTokenContract()
 
@@ -644,16 +631,16 @@ def omen_fund_market_tx(
         and collateral_token_contract.balanceOf(for_address=from_address, web3=web3)
         < funds
     ):
-        collateral_token_contract.deposit(private_credentials, funds, web3=web3)
+        collateral_token_contract.deposit(api_keys, funds, web3=web3)
 
     collateral_token_contract.approve(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         for_address=market_contract.address,
         amount_wei=funds,
         web3=web3,
     )
 
-    market_contract.addFunding(private_credentials, funds, web3=web3)
+    market_contract.addFunding(api_keys, funds, web3=web3)
 
 
 def build_parent_collection_id() -> HexStr:
@@ -661,7 +648,7 @@ def build_parent_collection_id() -> HexStr:
 
 
 def omen_redeem_full_position_tx(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     market: OmenAgentMarket,
     web3: Web3 | None = None,
 ) -> None:
@@ -670,7 +657,7 @@ def omen_redeem_full_position_tx(
     to be redeemed before sending the transaction.
     """
 
-    from_address = private_credentials.public_key
+    from_address = api_keys.bet_from_address
 
     market_contract: OmenFixedProductMarketMakerContract = market.get_contract()
     conditional_token_contract = OmenConditionalTokenContract()
@@ -700,7 +687,7 @@ def omen_redeem_full_position_tx(
         return
 
     conditional_token_contract.redeemPositions(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         collateral_token_address=market.collateral_token_contract_address_checksummed,
         condition_id=market.condition.id,
         parent_collection_id=parent_collection_id,
@@ -741,7 +728,7 @@ def get_conditional_tokens_balance_for_market(
 
 
 def omen_remove_fund_market_tx(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     market: OmenAgentMarket,
     shares: Wei | None,
     web3: Web3 | None = None,
@@ -754,7 +741,7 @@ def omen_remove_fund_market_tx(
     After we remove funding, using the `mergePositions` we get `min(shares per index)` of wxDai back, but the remaining shares can be converted back only after the market is resolved.
     That can be done using the `redeem_from_all_user_positions` function below.
     """
-    from_address = private_credentials.public_key
+    from_address = api_keys.bet_from_address
     market_contract = market.get_contract()
     original_balances = get_balances(from_address, web3=web3)
 
@@ -769,9 +756,7 @@ def omen_remove_fund_market_tx(
         )
         shares = total_shares
 
-    market_contract.removeFunding(
-        private_credentials=private_credentials, remove_funding=shares, web3=web3
-    )
+    market_contract.removeFunding(api_keys=api_keys, remove_funding=shares, web3=web3)
 
     conditional_tokens = OmenConditionalTokenContract()
     parent_collection_id = build_parent_collection_id()
@@ -784,7 +769,7 @@ def omen_remove_fund_market_tx(
     amount_to_merge = min(amount_per_index_set.values())
 
     result = conditional_tokens.mergePositions(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         collateral_token_address=market.collateral_token_contract_address_checksummed,
         parent_collection_id=parent_collection_id,
         conditionId=market.condition.id,
@@ -802,13 +787,13 @@ def omen_remove_fund_market_tx(
 
 
 def redeem_from_all_user_positions(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     web3: Web3 | None = None,
 ) -> None:
     """
     Redeems from all user positions where the user didn't redeem yet.
     """
-    public_key = private_credentials.public_key
+    public_key = api_keys.bet_from_address
 
     conditional_token_contract = OmenConditionalTokenContract()
     user_positions = OmenSubgraphHandler().get_user_positions(
@@ -832,7 +817,7 @@ def redeem_from_all_user_positions(
 
         original_balances = get_balances(public_key, web3)
         conditional_token_contract.redeemPositions(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             collateral_token_address=user_position.position.collateral_token_contract_address_checksummed,
             condition_id=condition_id,
             parent_collection_id=build_parent_collection_id(),

{prediction_market_agent_tooling-0.26.0 → prediction_market_agent_tooling-0.27.0}/prediction_market_agent_tooling/markets/omen/omen_contracts.py

@@ -6,7 +6,7 @@ from enum import Enum
 
 from web3 import Web3
 
-from prediction_market_agent_tooling.config import PrivateCredentials
+from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.gtypes import (
     ABI,
     ChecksumAddress,
@@ -51,7 +51,7 @@ class OmenOracleContract(ContractOnGnosisChain):
 
     def resolve(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         question_id: HexBytes,
         template_id: int,
         question_raw: str,
@@ -59,7 +59,7 @@ class OmenOracleContract(ContractOnGnosisChain):
         web3: Web3 | None = None,
     ) -> TxReceipt:
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="resolve",
             function_params=dict(
                 questionId=question_id,
@@ -138,7 +138,7 @@ class OmenConditionalTokenContract(ContractOnGnosisChain):
 
     def mergePositions(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         collateral_token_address: ChecksumAddress,
         parent_collection_id: HexStr,
         conditionId: HexBytes,
@@ -147,7 +147,7 @@ class OmenConditionalTokenContract(ContractOnGnosisChain):
         web3: Web3 | None = None,
     ) -> TxReceipt:
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="mergePositions",
             function_params=[
                 collateral_token_address,
@@ -161,7 +161,7 @@ class OmenConditionalTokenContract(ContractOnGnosisChain):
 
     def redeemPositions(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         collateral_token_address: HexAddress,
         condition_id: HexBytes,
         parent_collection_id: HexStr,
@@ -169,7 +169,7 @@ class OmenConditionalTokenContract(ContractOnGnosisChain):
         web3: Web3 | None = None,
     ) -> TxReceipt:
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="redeemPositions",
             function_params=[
                 collateral_token_address,
@@ -209,14 +209,14 @@ class OmenConditionalTokenContract(ContractOnGnosisChain):
 
     def setApprovalForAll(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         for_address: ChecksumAddress,
         approve: bool,
         tx_params: t.Optional[TxParams] = None,
         web3: Web3 | None = None,
     ) -> TxReceipt:
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="setApprovalForAll",
             function_params=[
                 for_address,
@@ -228,7 +228,7 @@ class OmenConditionalTokenContract(ContractOnGnosisChain):
 
     def prepareCondition(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         oracle_address: ChecksumAddress,
         question_id: HexBytes,
         outcomes_slot_count: int,
@@ -236,7 +236,7 @@ class OmenConditionalTokenContract(ContractOnGnosisChain):
         web3: Web3 | None = None,
     ) -> TxReceipt:
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="prepareCondition",
             function_params=[
                 oracle_address,
@@ -291,7 +291,7 @@ class OmenFixedProductMarketMakerContract(ContractOnGnosisChain):
 
     def buy(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         amount_wei: Wei,
         outcome_index: int,
         min_outcome_tokens_to_buy: OmenOutcomeToken,
@@ -299,7 +299,7 @@ class OmenFixedProductMarketMakerContract(ContractOnGnosisChain):
         web3: Web3 | None = None,
     ) -> TxReceipt:
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="buy",
             function_params=[
                 amount_wei,
@@ -312,7 +312,7 @@ class OmenFixedProductMarketMakerContract(ContractOnGnosisChain):
 
     def sell(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         amount_wei: Wei,
         outcome_index: int,
         max_outcome_tokens_to_sell: OmenOutcomeToken,
@@ -320,7 +320,7 @@ class OmenFixedProductMarketMakerContract(ContractOnGnosisChain):
         web3: Web3 | None = None,
     ) -> TxReceipt:
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="sell",
             function_params=[
                 amount_wei,
@@ -333,7 +333,7 @@ class OmenFixedProductMarketMakerContract(ContractOnGnosisChain):
 
     def addFunding(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         add_funding: Wei,
         tx_params: t.Optional[TxParams] = None,
         web3: Web3 | None = None,
@@ -344,7 +344,7 @@ class OmenFixedProductMarketMakerContract(ContractOnGnosisChain):
         # `addFunding` with `distribution_hint` can be used only during the market creation, so forcing empty here.
         distribution_hint: list[int] = []
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="addFunding",
             function_params=[add_funding, distribution_hint],
             tx_params=tx_params,
@@ -353,7 +353,7 @@ class OmenFixedProductMarketMakerContract(ContractOnGnosisChain):
 
     def removeFunding(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         remove_funding: Wei,
         tx_params: t.Optional[TxParams] = None,
         web3: Web3 | None = None,
@@ -362,7 +362,7 @@ class OmenFixedProductMarketMakerContract(ContractOnGnosisChain):
         Remove funding is done in shares.
         """
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="removeFunding",
             function_params=[remove_funding],
             tx_params=tx_params,
@@ -407,7 +407,7 @@ class OmenFixedProductMarketMakerFactoryContract(ContractOnGnosisChain):
 
     def create2FixedProductMarketMaker(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         condition_id: HexBytes,
         initial_funds_wei: Wei,
         fee: float = OMEN_DEFAULT_MARKET_FEE,
@@ -418,7 +418,7 @@ class OmenFixedProductMarketMakerFactoryContract(ContractOnGnosisChain):
             xdai_type(fee)
         )  # We need to convert this to the wei units, but in reality it's % fee as stated in the `OMEN_DEFAULT_MARKET_FEE` variable.
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="create2FixedProductMarketMaker",
             function_params=dict(
                 saltNonce=random.randint(
@@ -491,7 +491,7 @@ class OmenRealitioContract(ContractOnGnosisChain):
 
     def askQuestion(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         question: str,
         category: str,
         outcomes: list[str],
@@ -518,7 +518,7 @@ class OmenRealitioContract(ContractOnGnosisChain):
             ]
         )
         receipt_tx = self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="askQuestion",
             function_params=dict(
                 template_id=template_id,
@@ -540,7 +540,7 @@ class OmenRealitioContract(ContractOnGnosisChain):
 
     def submitAnswer(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         question_id: HexBytes,
         answer: str,
         outcomes: list[str],
@@ -558,7 +558,7 @@ class OmenRealitioContract(ContractOnGnosisChain):
         outcomes = [o.lower() for o in outcomes]
 
         return self.send_with_value(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="submitAnswer",
             function_params=dict(
                 question_id=question_id,
@@ -573,7 +573,7 @@ class OmenRealitioContract(ContractOnGnosisChain):
 
     def claimWinnings(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         question_id: HexBytes,
         history_hashes: list[HexBytes],
         addresses: list[ChecksumAddress],
@@ -583,7 +583,7 @@ class OmenRealitioContract(ContractOnGnosisChain):
         web3: Web3 | None = None,
     ) -> TxReceipt:
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="claimWinnings",
             function_params=dict(
                 question_id=question_id,
@@ -606,9 +606,7 @@ class OmenRealitioContract(ContractOnGnosisChain):
 
     def withdraw(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         web3: Web3 | None = None,
     ) -> TxReceipt:
-        return self.send(
-            private_credentials=private_credentials, function_name="withdraw", web3=web3
-        )
+        return self.send(api_keys=api_keys, function_name="withdraw", web3=web3)

{prediction_market_agent_tooling-0.26.0 → prediction_market_agent_tooling-0.27.0}/prediction_market_agent_tooling/markets/omen/omen_resolving.py

@@ -1,6 +1,6 @@
 from web3 import Web3
 
-from prediction_market_agent_tooling.config import PrivateCredentials
+from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.gtypes import (
     ChecksumAddress,
     HexAddress,
@@ -35,7 +35,7 @@ from prediction_market_agent_tooling.tools.web3_utils import ZERO_BYTES, xdai_to
 
 
 def claim_bonds_on_realitio_questions(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     questions: list[RealityQuestion],
     auto_withdraw: bool,
     web3: Web3 | None = None,
@@ -47,7 +47,7 @@ def claim_bonds_on_realitio_questions(
             f"[{idx+1} / {len(questions)}] Claiming bond for {question.questionId=} {question.url=}"
         )
         claim_bonds_on_realitio_question(
-            private_credentials, question, auto_withdraw=auto_withdraw, web3=web3
+            api_keys, question, auto_withdraw=auto_withdraw, web3=web3
         )
         claimed_questions.append(question.questionId)
 
@@ -55,12 +55,12 @@ def claim_bonds_on_realitio_questions(
 
 
 def claim_bonds_on_realitio_question(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     question: RealityQuestion,
     auto_withdraw: bool,
     web3: Web3 | None = None,
 ) -> None:
-    public_key = private_credentials.public_key
+    public_key = api_keys.bet_from_address
     realitio_contract = OmenRealitioContract()
 
     # Get all answers for the question.
@@ -105,7 +105,7 @@ def claim_bonds_on_realitio_question(
         answers.append(answer.answer)
 
     realitio_contract.claimWinnings(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         question_id=question.questionId,
         history_hashes=history_hashes,
         addresses=addresses,
@@ -118,11 +118,11 @@ 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 {current_balance=}")
-        realitio_contract.withdraw(private_credentials, web3=web3)
+        realitio_contract.withdraw(api_keys, web3=web3)
 
 
 def finalize_markets(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     markets_with_resolutions: list[tuple[OmenMarket, Resolution | None]],
     web3: Web3 | None = None,
 ) -> list[HexAddress]:
@@ -139,7 +139,7 @@ def finalize_markets(
         elif resolution in (Resolution.YES, Resolution.NO):
             logger.info(f"Found resolution {resolution.value=} for {market.url=}")
             omen_submit_answer_market_tx(
-                private_credentials,
+                api_keys,
                 market,
                 resolution,
                 OMEN_DEFAULT_REALITIO_BOND_VALUE,
@@ -155,7 +155,7 @@ def finalize_markets(
 
 
 def resolve_markets(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     markets: list[OmenMarket],
     web3: Web3 | None = None,
 ) -> list[HexAddress]:
@@ -165,14 +165,14 @@ def resolve_markets(
         logger.info(
             f"[{idx+1} / {len(markets)}] Resolving {market.url=} {market.question_title=}"
         )
-        omen_resolve_market_tx(private_credentials, market, web3=web3)
+        omen_resolve_market_tx(api_keys, market, web3=web3)
         resolved_markets.append(market.id)
 
     return resolved_markets
 
 
 def omen_submit_answer_market_tx(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     market: OmenMarket,
     resolution: Resolution,
     bond: xDai,
@@ -184,7 +184,7 @@ def omen_submit_answer_market_tx(
     """
     realitio_contract = OmenRealitioContract()
     realitio_contract.submitAnswer(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         question_id=market.question.id,
         answer=resolution.value,
         outcomes=market.question.outcomes,
@@ -194,7 +194,7 @@ def omen_submit_answer_market_tx(
 
 
 def omen_resolve_market_tx(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     market: OmenMarket,
     web3: Web3 | None = None,
 ) -> None:
@@ -203,7 +203,7 @@ def omen_resolve_market_tx(
     """
     oracle_contract = OmenOracleContract()
     oracle_contract.resolve(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         question_id=market.question.id,
         template_id=market.question.templateId,
         question_raw=market.question.question_raw,

{prediction_market_agent_tooling-0.26.0 → prediction_market_agent_tooling-0.27.0}/prediction_market_agent_tooling/monitor/markets/omen.py

@@ -2,7 +2,7 @@ import typing as t
 
 from google.cloud.functions_v2.types.functions import Function
 
-from prediction_market_agent_tooling.config import APIKeys, PrivateCredentials
+from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.deploy.constants import MARKET_TYPE_KEY
 from prediction_market_agent_tooling.gtypes import ChecksumAddress, DatetimeWithTimezone
 from prediction_market_agent_tooling.markets.data_models import ResolvedBet
@@ -49,8 +49,7 @@ class DeployedOmenAgent(DeployedAgent):
             and api_keys.BET_FROM_PRIVATE_KEY
             != APIKeys().BET_FROM_PRIVATE_KEY  # Check that it didn't get if from the default env.
         ):
-            private_credentials = PrivateCredentials.from_api_keys(api_keys)
-            env_vars["omen_public_key"] = private_credentials.public_key
+            env_vars["omen_public_key"] = api_keys.bet_from_address
         return super().from_env_vars_without_prefix(
             env_vars=env_vars, extra_vars=extra_vars
         )
@@ -61,11 +60,10 @@ class DeployedOmenAgent(DeployedAgent):
         start_time: DatetimeWithTimezone,
         api_keys: APIKeys,
     ) -> "DeployedOmenAgent":
-        private_credentials = PrivateCredentials.from_api_keys(api_keys)
         return DeployedOmenAgent(
             name=name,
             start_time=start_time,
-            omen_public_key=private_credentials.public_key,
+            omen_public_key=api_keys.bet_from_address,
         )
 
     @classmethod

{prediction_market_agent_tooling-0.26.0 → prediction_market_agent_tooling-0.27.0}/prediction_market_agent_tooling/monitor/markets/polymarket.py

@@ -2,7 +2,7 @@ import typing as t
 
 from google.cloud.functions_v2.types.functions import Function
 
-from prediction_market_agent_tooling.config import APIKeys, PrivateCredentials
+from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.deploy.constants import MARKET_TYPE_KEY
 from prediction_market_agent_tooling.gtypes import ChecksumAddress, DatetimeWithTimezone
 from prediction_market_agent_tooling.markets.data_models import ResolvedBet
@@ -28,11 +28,10 @@ class DeployedPolymarketAgent(DeployedAgent):
         start_time: DatetimeWithTimezone,
         api_keys: APIKeys,
     ) -> "DeployedPolymarketAgent":
-        private_credentials = PrivateCredentials.from_api_keys(api_keys)
         return DeployedPolymarketAgent(
             name=name,
             start_time=start_time,
-            polymarket_public_key=private_credentials.public_key,
+            polymarket_public_key=api_keys.bet_from_address,
         )
 
     @classmethod

{prediction_market_agent_tooling-0.26.0 → prediction_market_agent_tooling-0.27.0}/prediction_market_agent_tooling/tools/contract.py

@@ -6,7 +6,7 @@ from contextlib import contextmanager
 from pydantic import BaseModel, field_validator
 from web3 import Web3
 
-from prediction_market_agent_tooling.config import PrivateCredentials
+from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.gtypes import (
     ABI,
     ChainID,
@@ -86,7 +86,7 @@ class ContractBaseClass(BaseModel):
 
     def send(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         function_name: str,
         function_params: t.Optional[list[t.Any] | dict[str, t.Any]] = None,
         tx_params: t.Optional[TxParams] = None,
@@ -97,13 +97,13 @@ class ContractBaseClass(BaseModel):
         Used for changing a state (writing) to the contract.
         """
 
-        if private_credentials.safe_address is not None:
+        if api_keys.SAFE_ADDRESS:
             return send_function_on_contract_tx_using_safe(
                 web3=web3 or self.get_web3(),
                 contract_address=self.address,
                 contract_abi=self.abi,
-                from_private_key=private_credentials.private_key,
-                safe_address=private_credentials.safe_address,
+                from_private_key=api_keys.bet_from_private_key,
+                safe_address=api_keys.SAFE_ADDRESS,
                 function_name=function_name,
                 function_params=function_params,
                 tx_params=tx_params,
@@ -113,7 +113,7 @@ class ContractBaseClass(BaseModel):
             web3=web3 or self.get_web3(),
             contract_address=self.address,
             contract_abi=self.abi,
-            from_private_key=private_credentials.private_key,
+            from_private_key=api_keys.bet_from_private_key,
             function_name=function_name,
             function_params=function_params,
             tx_params=tx_params,
@@ -122,7 +122,7 @@ class ContractBaseClass(BaseModel):
 
     def send_with_value(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         function_name: str,
         amount_wei: Wei,
         function_params: t.Optional[list[t.Any] | dict[str, t.Any]] = None,
@@ -134,7 +134,7 @@ class ContractBaseClass(BaseModel):
         Used for changing a state (writing) to the contract, including sending chain's native currency.
         """
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name=function_name,
             function_params=function_params,
             tx_params={"value": amount_wei, **(tx_params or {})},
@@ -158,14 +158,14 @@ class ContractERC20BaseClass(ContractBaseClass):
 
     def approve(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         for_address: ChecksumAddress,
         amount_wei: Wei,
         tx_params: t.Optional[TxParams] = None,
         web3: Web3 | None = None,
     ) -> TxReceipt:
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="approve",
             function_params=[
                 for_address,
@@ -177,13 +177,13 @@ class ContractERC20BaseClass(ContractBaseClass):
 
     def deposit(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         amount_wei: Wei,
         tx_params: t.Optional[TxParams] = None,
         web3: Web3 | None = None,
     ) -> TxReceipt:
         return self.send_with_value(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="deposit",
             amount_wei=amount_wei,
             tx_params=tx_params,
@@ -192,7 +192,7 @@ class ContractERC20BaseClass(ContractBaseClass):
 
     def transferFrom(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         sender: ChecksumAddress,
         recipient: ChecksumAddress,
         amount_wei: Wei,
@@ -200,7 +200,7 @@ class ContractERC20BaseClass(ContractBaseClass):
         web3: Web3 | None = None,
     ) -> TxReceipt:
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="transferFrom",
             function_params=[sender, recipient, amount_wei],
             tx_params=tx_params,
@@ -209,13 +209,13 @@ class ContractERC20BaseClass(ContractBaseClass):
 
     def withdraw(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         amount_wei: Wei,
         tx_params: t.Optional[TxParams] = None,
         web3: Web3 | None = None,
     ) -> TxReceipt:
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="withdraw",
             function_params=[amount_wei],
             tx_params=tx_params,

{prediction_market_agent_tooling-0.26.0 → prediction_market_agent_tooling-0.27.0}/pyproject.toml

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