ddx-python 1.0.0__tar.gz → 1.0.2__tar.gz

{ddx_python-1.0.0 → ddx_python-1.0.2}/Cargo.lock

@@ -2892,7 +2892,7 @@ dependencies = [
 
 [[package]]
 name = "ddx-python"
-version = "1.0.0"
+version = "1.0.2"
 dependencies = [
  "core-common",
  "core-ddx",

{ddx_python-1.0.0 → ddx_python-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ddx-python
-Version: 1.0.0
+Version: 1.0.2
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{ddx_python-1.0.0 → ddx_python-1.0.2}/ddx-operator/core/src/constants.rs

@@ -288,6 +288,11 @@ pub const COINGECKO_HOSTNAME: &str = "api.coingecko.com";
 pub const DDX_CONTRACT_ADDRESS: &str = "0x3a880652f47bfaa771908c07dd8673a787daed3a";
 pub const COINGECKO_POLL_THRESHOLD: usize = 60;
 
+// Gecko terminal Hostname and SPCX contract address
+pub const GECKO_TERMINAL_HOSTNAME: &str = "api.geckoterminal.com";
+pub const SPCX_CONTRACT_ADDRESS: &str = "0x872109274218cb50f310e2bfb160d135b502a9d5";
+pub const SPCX_POLL_THRESHOLD: usize = 2;
+
 // Default limit on strategies a trader can have
 pub const MAX_STRATEGIES: u8 = 10;
 

{ddx_python-1.0.0 → ddx_python-1.0.2}/ddx-operator/core/src/execution/test_utils.rs

@@ -53,6 +53,7 @@ pub const BTCP: &str = "BTCP";
 pub const DOGEP: &str = "DOGEP";
 pub const ETHP: &str = "ETHP";
 pub const FUNDP: &str = "FUNDP";
+pub const SPCXP: &str = "SPCXP";
 #[cfg(feature = "fixed_expiry_future")]
 pub const ETHFH: &str = "ETHFH";
 #[cfg(feature = "fixed_expiry_future")]

{ddx_python-1.0.0 → ddx_python-1.0.2}/ddx-operator/core/src/specs.rs

@@ -25,7 +25,9 @@ use crate::specs::index_fund::IndexFundPerpetual;
 #[cfg(feature = "fixed_expiry_future")]
 use crate::specs::quarterly_expiry_future::QuarterlyExpiryFuture;
 use crate::{
-    constants::{COINGECKO_HOSTNAME, DDX_CONTRACT_ADDRESS},
+    constants::{
+        COINGECKO_HOSTNAME, DDX_CONTRACT_ADDRESS, GECKO_TERMINAL_HOSTNAME, SPCX_CONTRACT_ADDRESS,
+    },
     types::primitives::UnderlyingSymbol,
 };
 use chrono::{DateTime, TimeZone, Utc};
@@ -136,6 +138,7 @@ impl MarketGateway {
                 .find_map(|(k, v)| {
                     if v.as_str() == source_symbol
                         || (v.as_str() == DDX_CONTRACT_ADDRESS && source_symbol == "DDX")
+                        || (v.as_str() == SPCX_CONTRACT_ADDRESS && source_symbol == "SPCX")
                     {
                         Some(*k)
                     } else {
@@ -156,6 +159,9 @@ impl MarketGateway {
         if self.hostname == COINGECKO_HOSTNAME {
             return Ok(DDX_CONTRACT_ADDRESS.to_string());
         }
+        if self.hostname == GECKO_TERMINAL_HOSTNAME {
+            return Ok(SPCX_CONTRACT_ADDRESS.to_string());
+        }
         // NOTE: Assuming running these regexes is cheap enough not to bother with caching.
         // This only takes the first transformation
         if let Some(tr) = self.transforms.first() {
@@ -214,6 +220,9 @@ impl MarketGateway {
         let (source_symbol, price): (String, Decimal) = if self.hostname == COINGECKO_HOSTNAME {
             let price: Decimal = serde_json::from_str(&content)?;
             ("DDX".to_string(), price)
+        } else if self.hostname == GECKO_TERMINAL_HOSTNAME {
+            let price: Decimal = serde_json::from_str(&content)?;
+            ("SPCX".to_string(), price)
         } else {
             serde_json::from_str(&content)?
         };

{ddx_python-1.0.0 → ddx_python-1.0.2}/ddx-operator/core/src/types/accounting.rs

@@ -586,6 +586,7 @@ pub enum MarkPriceKind {
 }
 
 /// Metadata for calculating the mark price, along with the current index price
+#[cfg_eval]
 #[cfg_attr(feature = "python", gen_stub_pyclass_enum, pyclass(frozen, eq))]
 #[derive(Debug, Clone, PartialEq, Deserialize, Serialize, AbiToken, Eq, Copy)]
 #[serde(tag = "t", content = "c")]

{ddx_python-1.0.0 → ddx_python-1.0.2}/ddx-operator/core/src/types/state/exported.rs

@@ -99,6 +99,7 @@ pub mod python {
         inner: RustProductSymbol,
     }
 
+    #[cfg_eval]
     #[gen_stub_pymethods]
     #[pymethods]
     impl ProductSymbol {
@@ -309,6 +310,7 @@ pub mod python {
     impl MarkPriceMetadata {
         #[getter]
         fn ema(&self) -> Option<UnscaledI128> {
+            #[allow(unreachable_patterns)]
             match self {
                 MarkPriceMetadata::Ema(ema) => Some(*ema),
                 _ => None,
@@ -355,6 +357,7 @@ pub mod python {
         }
     }
 
+    #[cfg_eval]
     #[gen_stub_pymethods]
     #[pymethods]
     impl TradableProductParameters {
@@ -386,6 +389,7 @@ pub mod python {
         inner: RustSettlementAction,
     }
 
+    #[cfg_eval]
     #[allow(non_upper_case_globals)]
     #[gen_stub_pymethods]
     #[pymethods]
@@ -1617,7 +1621,7 @@ pub mod python {
         #[classmethod]
         fn from_genesis(
             _cls: &Bound<'_, PyType>,
-            py: Python,
+            _py: Python,
             insurance_fund_cap: Balance,
             ddx_fee_pool: UnscaledI128,
             specs: &Bound<'_, PyAny>,

{ddx_python-1.0.0 → ddx_python-1.0.2}/ddx-operator/core/src/types/state/tradable_product.rs

@@ -21,6 +21,10 @@ use serde::{Deserialize, Serialize};
 
 use super::{ITEM_TRADABLE_PRODUCT, VoidableItem};
 
+#[cfg_eval]
+// Since pyclass doesn't allow for empty enums, to support non "fixed_expiry_future" situations, we
+// add a dummy `Empty` variant. This can be removed once pyo3 supports empty enums or we add
+// another non feature-gated variant.
 #[cfg_attr(
     feature = "python",
     gen_stub_pyclass_enum,
@@ -32,6 +36,8 @@ use super::{ITEM_TRADABLE_PRODUCT, VoidableItem};
 #[serde(tag = "t", content = "c")]
 #[non_exhaustive]
 pub enum TradableProductParameters {
+    // empty tuple variant used because pyo3 does not support unit variants
+    Empty(),
     #[cfg(feature = "fixed_expiry_future")]
     QuarterlyExpiryFuture(Quarter),
 }
@@ -130,7 +136,10 @@ impl TradableProductKey {
         if let Some(_parameters) = &self.parameters {
             #[cfg(feature = "fixed_expiry_future")]
             {
-                let TradableProductParameters::QuarterlyExpiryFuture(quarter) = _parameters;
+                let TradableProductParameters::QuarterlyExpiryFuture(quarter) = _parameters else {
+                    // See note in the definition of `TradableProductParameters`.
+                    unreachable!()
+                };
                 bytes.push(*quarter as u8);
             }
             #[cfg(not(feature = "fixed_expiry_future"))]

{ddx_python-1.0.0 → ddx_python-1.0.2}/ddx-python/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ddx-python"
 # NOTE: The maturin.bash build script replaces this by the SEMVER env variable for distribution.
-version = "1.0.0"
+version = "1.0.2"
 edition = "2021"
 
 [lib]

{ddx_python-1.0.0 → ddx_python-1.0.2/ddx-python}/python/ddx/__init__.py

@@ -8,7 +8,7 @@ Responsibilities:
   * In development/editable mode (when APP_SHARE is set), prepend the
     on-disk wheel directory so that `import ddx._rust` resolves locally.
   * Re-export all public symbols from the Rust extension module,
-    plus Python helpers `load_mainnet` and `load_testnet`.
+    plus Python helpers `reinit_operator_context` and `load_testnet`.
   * Configure the application data directory via APP_CONFIG and
     enforce CONTRACT_DEPLOYMENT when a custom config is used.
   * Define constants like `DDX_APPLICATION_ID`.
@@ -26,25 +26,32 @@ if share := os.environ.get("APP_SHARE"):
     wheel_dir = os.path.join(share, "ddx", "wheels", "ddx")
     _pkg.__path__.insert(0, wheel_dir)
 
-# Step 3: Import the Rust extension and re-export its public API
-import ddx._rust as _rust  # noqa: F401,F403
-
-__doc__ = _rust.__doc__  # mirror the Rust module's docstring
-__all__ = list(getattr(_rust, "__all__", []))
-__all__.extend(["load_mainnet", "load_testnet"])
-
-# Step 4: Application configuration
+# Step 3: Application configuration
 from .config import *
 
 if "APP_CONFIG" not in os.environ:
-    default_cfg = files("ddx") / "app_config"
+    default_cfg = files("ddx") / "app_config" / "ethereum"
     os.environ["APP_CONFIG"] = str(default_cfg)
-    load_mainnet()
+
+    # To use testnet or other environments in the default `app_config` set that variable upfront.
+    # Otherwise, it defaults to "derivadex" (mainnet).
+    if not os.environ.get("CONTRACT_DEPLOYMENT"):
+        os.environ["CONTRACT_DEPLOYMENT"] = "derivadex"
+
+    reinit_operator_context()
 else:
     # HACK: This happens during the docker build state when validating the install.
     if not os.environ.get("CONTRACT_DEPLOYMENT"):
         os.environ["CONTRACT_DEPLOYMENT"] = "snapshot"
 
+# Step 4: Import the Rust extension and re-export its public API
+# This internally reads APP_CONFIG nd CONTRACT_DEPLOYMENT so it must be done after step 3.
+import ddx._rust as _rust  # noqa: F401,F403
+
+__doc__ = _rust.__doc__  # mirror the Rust module's docstring
+__all__ = list(getattr(_rust, "__all__", []))
+__all__.extend(["load_mainnet", "load_testnet"])
+
 # Step 5: Constants
 from eth_abi.utils.padding import zpad32_right
 

{ddx_python-1.0.0 → ddx_python-1.0.2}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "maturin"
 [project]
 name = "ddx-python"
 # NOTE: The maturin.bash build script replaces this by the SEMVER env variable for distribution.
-version = "1.0.0"
+version = "1.0.2"
 requires-python = ">=3.10"
 classifiers = [
     "Programming Language :: Rust",

{ddx_python-1.0.0/ddx-python → ddx_python-1.0.2}/python/ddx/__init__.py

@@ -8,7 +8,7 @@ Responsibilities:
   * In development/editable mode (when APP_SHARE is set), prepend the
     on-disk wheel directory so that `import ddx._rust` resolves locally.
   * Re-export all public symbols from the Rust extension module,
-    plus Python helpers `load_mainnet` and `load_testnet`.
+    plus Python helpers `reinit_operator_context` and `load_testnet`.
   * Configure the application data directory via APP_CONFIG and
     enforce CONTRACT_DEPLOYMENT when a custom config is used.
   * Define constants like `DDX_APPLICATION_ID`.
@@ -26,25 +26,32 @@ if share := os.environ.get("APP_SHARE"):
     wheel_dir = os.path.join(share, "ddx", "wheels", "ddx")
     _pkg.__path__.insert(0, wheel_dir)
 
-# Step 3: Import the Rust extension and re-export its public API
-import ddx._rust as _rust  # noqa: F401,F403
-
-__doc__ = _rust.__doc__  # mirror the Rust module's docstring
-__all__ = list(getattr(_rust, "__all__", []))
-__all__.extend(["load_mainnet", "load_testnet"])
-
-# Step 4: Application configuration
+# Step 3: Application configuration
 from .config import *
 
 if "APP_CONFIG" not in os.environ:
-    default_cfg = files("ddx") / "app_config"
+    default_cfg = files("ddx") / "app_config" / "ethereum"
     os.environ["APP_CONFIG"] = str(default_cfg)
-    load_mainnet()
+
+    # To use testnet or other environments in the default `app_config` set that variable upfront.
+    # Otherwise, it defaults to "derivadex" (mainnet).
+    if not os.environ.get("CONTRACT_DEPLOYMENT"):
+        os.environ["CONTRACT_DEPLOYMENT"] = "derivadex"
+
+    reinit_operator_context()
 else:
     # HACK: This happens during the docker build state when validating the install.
     if not os.environ.get("CONTRACT_DEPLOYMENT"):
         os.environ["CONTRACT_DEPLOYMENT"] = "snapshot"
 
+# Step 4: Import the Rust extension and re-export its public API
+# This internally reads APP_CONFIG nd CONTRACT_DEPLOYMENT so it must be done after step 3.
+import ddx._rust as _rust  # noqa: F401,F403
+
+__doc__ = _rust.__doc__  # mirror the Rust module's docstring
+__all__ = list(getattr(_rust, "__all__", []))
+__all__.extend(["load_mainnet", "load_testnet"])
+
 # Step 5: Constants
 from eth_abi.utils.padding import zpad32_right