prediction-market-agent-tooling 0.62.0.dev474__py3-none-any.whl → 0.62.0.dev490__py3-none-any.whl

prediction_market_agent_tooling/markets/omen/omen.py

@@ -725,6 +725,10 @@ def omen_buy_outcome_tx(
     amount_token = market.get_in_token(amount)
     amount_wei = amount_token.as_wei
 
+    logger.info(
+        f"Buying asked {amount.value=} {amount.symbol}, converted to {amount_token.value=} {amount_token.symbol} for {outcome=} in market {market.url=}."
+    )
+
     # Get the index of the outcome we want to buy.
     outcome_index: int = market.get_outcome_index(outcome)
 
@@ -806,7 +810,7 @@ def omen_sell_outcome_tx(
     amount_wei = amount_wei.without_fraction(slippage)
 
     logger.info(
-        f"Selling asked {amount.value=} {amount.symbol}, converted to {amount_wei.as_token.value=} (collateral token worth) for {outcome=} in market {market.url=}."
+        f"Selling asked {amount.value=} {amount.symbol}, converted to {amount_wei.as_token.value=} {amount_wei.as_token.symbol} for {outcome=} in market {market.url=}."
     )
 
     # Verify, that markets uses conditional tokens that we expect.

prediction_market_agent_tooling/tools/tokens/usd.py

@@ -5,7 +5,6 @@ from prediction_market_agent_tooling.gtypes import (
     USD,
     ChecksumAddress,
     CollateralToken,
-    OutcomeToken,
     xDai,
 )
 from prediction_market_agent_tooling.markets.omen.omen_constants import (
@@ -27,23 +26,18 @@ def get_xdai_in_usd(amount: xDai) -> USD:
 
 
 def get_usd_in_token(amount: USD, token_address: ChecksumAddress) -> CollateralToken:
-    rate = get_single_token_unit_to_usd_rate(token_address)
-    return CollateralToken(amount.value / rate.value)
+    rate = get_single_usd_to_token_rate(token_address)
+    return CollateralToken(amount.value * rate.value)
 
 
-def get_token_in_usd(
-    amount: CollateralToken | OutcomeToken, token_address: ChecksumAddress
-) -> USD:
-    rate = get_single_token_unit_to_usd_rate(token_address)
+def get_token_in_usd(amount: CollateralToken, token_address: ChecksumAddress) -> USD:
+    rate = get_single_token_to_usd_rate(token_address)
     return USD(amount.value * rate.value)
 
 
 # A short cache to not spam CoW and prevent timeouts, but still have relatively fresh data.
-RATE_CACHE: TTLCache[ChecksumAddress, USD] = TTLCache(maxsize=100, ttl=5 * 60)
-
-
-@cached(RATE_CACHE)
-def get_single_token_unit_to_usd_rate(token_address: ChecksumAddress) -> USD:
+@cached(TTLCache(maxsize=100, ttl=5 * 60))
+def get_single_token_to_usd_rate(token_address: ChecksumAddress) -> USD:
     # (w)xDai is a stable coin against USD, so use it to estimate USD worth.
     if WRAPPED_XDAI_CONTRACT_ADDRESS == token_address:
         return USD(1.0)
@@ -61,3 +55,25 @@ def get_single_token_unit_to_usd_rate(token_address: ChecksumAddress) -> USD:
     )
     in_token = in_wei.as_token
     return USD(in_token.value)
+
+
+# A short cache to not spam CoW and prevent timeouts, but still have relatively fresh data.
+@cached(TTLCache(maxsize=100, ttl=5 * 60))
+def get_single_usd_to_token_rate(token_address: ChecksumAddress) -> CollateralToken:
+    # (w)xDai is a stable coin against USD, so use it to estimate USD worth.
+    if WRAPPED_XDAI_CONTRACT_ADDRESS == token_address:
+        return CollateralToken(1.0)
+    # sDai is ERC4626 with wxDai as asset, we can take the rate directly from there instead of calling CoW.
+    if SDAI_CONTRACT_ADDRESS == token_address:
+        return CollateralToken(
+            ContractERC4626OnGnosisChain(address=SDAI_CONTRACT_ADDRESS)
+            .convertToShares(CollateralToken(1).as_wei)
+            .as_token.value
+        )
+    in_wei = get_buy_token_amount(
+        sell_amount=CollateralToken(1).as_wei,
+        sell_token=WRAPPED_XDAI_CONTRACT_ADDRESS,
+        buy_token=token_address,
+    )
+    in_token = in_wei.as_token
+    return CollateralToken(in_token.value)

{prediction_market_agent_tooling-0.62.0.dev474.dist-info → prediction_market_agent_tooling-0.62.0.dev490.dist-info}/METADATA

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

{prediction_market_agent_tooling-0.62.0.dev474.dist-info → prediction_market_agent_tooling-0.62.0.dev490.dist-info}/RECORD

@@ -51,7 +51,7 @@ prediction_market_agent_tooling/markets/metaculus/data_models.py,sha256=FaBCTPPe
 prediction_market_agent_tooling/markets/metaculus/metaculus.py,sha256=86TIx6cavEWc8Cv4KpZxSvwiSw9oFybXE3YB49pg-CA,4377
 prediction_market_agent_tooling/markets/omen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 prediction_market_agent_tooling/markets/omen/data_models.py,sha256=URvplDcTLeL6vfpkSgi8ln2iEKxt8w5qf6mTZkSyrCo,29189
-prediction_market_agent_tooling/markets/omen/omen.py,sha256=TNODbUHsQ8VSXH95OPOGkmZhNulWUIEWQwc7wmtb-m8,51767
+prediction_market_agent_tooling/markets/omen/omen.py,sha256=L1NaKGkdCVtGVz7RbkBuHaYRyYfuYRthTxmnYWNwgeU,51949
 prediction_market_agent_tooling/markets/omen/omen_constants.py,sha256=D9oflYKafLQiHYtB5sScMHqmXyzM8JP8J0yATmc4SQQ,233
 prediction_market_agent_tooling/markets/omen/omen_contracts.py,sha256=bCC9A7ZTJxMDJcPbl3jof6HcAGGHv1BrFq3RRWbkQ_c,28739
 prediction_market_agent_tooling/markets/omen/omen_resolving.py,sha256=Cyi9Ci-Z-K8WCZWVLs9oSuJC6qRobi_CpqDCno_5F-0,10238
@@ -116,12 +116,12 @@ prediction_market_agent_tooling/tools/tokens/auto_deposit.py,sha256=ZKGJPoRhch7Q
 prediction_market_agent_tooling/tools/tokens/auto_withdraw.py,sha256=nV9jSUt1ydceDj03cTwdyrJs8kFGqz9z6YcvTVUaNg4,2682
 prediction_market_agent_tooling/tools/tokens/main_token.py,sha256=1rbwpdCusPgQIVFuo3m00nBZ_b2lCAoFVm67i-YDcEw,812
 prediction_market_agent_tooling/tools/tokens/token_utils.py,sha256=zwV-jGFkPJu4-IslXOUqnsNQjzh_9CrfkruDQL0dq0c,1381
-prediction_market_agent_tooling/tools/tokens/usd.py,sha256=FmQUfrkLvN8cI_6vw9QNhOXdaqYlw-DxevP39VA8hmQ,2240
+prediction_market_agent_tooling/tools/tokens/usd.py,sha256=l4vPemtF6Zcwh8HNXH3-L5k7OE_XolbklzBsTpFruW8,3116
 prediction_market_agent_tooling/tools/transaction_cache.py,sha256=K5YKNL2_tR10Iw2TD9fuP-CTGpBbZtNdgbd0B_R7pjg,1814
 prediction_market_agent_tooling/tools/utils.py,sha256=1xsyBBJfiEdSoMlceB2F8o2sCb6Z8-qNz11pEJFrdyE,6566
 prediction_market_agent_tooling/tools/web3_utils.py,sha256=eYCc1iWAVtqDKUPTwnMUHuYolPdwh_OTiM3-AdRgDp4,12198
-prediction_market_agent_tooling-0.62.0.dev474.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
-prediction_market_agent_tooling-0.62.0.dev474.dist-info/METADATA,sha256=10VgtMIyKALMPagmYlJ0LKO5htx9XmltcIC8tVLt6Bo,8696
-prediction_market_agent_tooling-0.62.0.dev474.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-prediction_market_agent_tooling-0.62.0.dev474.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
-prediction_market_agent_tooling-0.62.0.dev474.dist-info/RECORD,,
+prediction_market_agent_tooling-0.62.0.dev490.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
+prediction_market_agent_tooling-0.62.0.dev490.dist-info/METADATA,sha256=QXEPne_UD36t4P1ZD9N0bTdv8U0DceB4xBtDnrwjmz4,8696
+prediction_market_agent_tooling-0.62.0.dev490.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+prediction_market_agent_tooling-0.62.0.dev490.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
+prediction_market_agent_tooling-0.62.0.dev490.dist-info/RECORD,,