ddx-python 1.1.6__tar.gz → 1.1.7__tar.gz

{ddx_python-1.1.6 → ddx_python-1.1.7}/Cargo.lock

@@ -3129,10 +3129,12 @@ dependencies = [
 
 [[package]]
 name = "ddx-python"
-version = "1.1.6"
+version = "1.1.7"
 dependencies = [
  "core-common",
+ "core-crypto",
  "core-ddx",
+ "getrandom 0.3.4",
  "pyo3",
  "pyo3-stub-gen",
 ]

{ddx_python-1.1.6 → ddx_python-1.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ddx-python
-Version: 1.1.6
+Version: 1.1.7
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Office/Business :: Financial :: Investment
@@ -31,8 +31,6 @@ Requires-Dist: simplejson>=3.19.2,<4
 Requires-Dist: sphinx>=8.0.2,<9
 Requires-Dist: verboselogs>=1.7,<2
 Requires-Dist: btrees>=6.0,<7
-Requires-Dist: ccxt>=4.3.79,<5
-Requires-Dist: coincurve>=20.0.0,<21
 Requires-Dist: dash-bootstrap-components>=1.6.0,<2
 Requires-Dist: python-dotenv>=1.0.1,<2
 Requires-Dist: sexpdata>=1.0.2,<2

{ddx_python-1.1.6 → ddx_python-1.1.7}/core/macros/src/lib.rs

@@ -124,7 +124,7 @@ pub fn nonced(input: TokenStream) -> TokenStream {
             let name = s.ident;
             let expanded = quote! {
                 impl Nonced for #name {
-                    fn nonce(&self) -> Nonce {
+                    fn get_nonce(&self) -> Nonce {
                         self.nonce
                     }
                 }
@@ -137,12 +137,12 @@ pub fn nonced(input: TokenStream) -> TokenStream {
             for v in e.variants.into_iter() {
                 let vname = v.ident;
                 arms.push(parse_quote! {
-                    #name::#vname(inner) => inner.nonce(),
+                    #name::#vname(inner) => inner.get_nonce(),
                 });
             }
             let expanded = quote! {
                 impl Nonced for #name {
-                        fn nonce(&self) -> Nonce {
+                        fn get_nonce(&self) -> Nonce {
                         match self {
                             #(#arms)*
                         }

{ddx_python-1.1.6 → ddx_python-1.1.7}/ddx-operator/core/Cargo.toml

@@ -13,7 +13,6 @@ default = [
     "fixed_expiry_future",
     "index_fund",
     "pred_market_future",
-    "private_equity_perp",
     "price_feed_fuzzer",
 ]
 alpha1 = []
@@ -40,7 +39,6 @@ eth-base = ["alloy", "alloy-sol-types"]
 multi_strategies = []
 insurance_fund_client_req = []
 index_fund = []
-private_equity_perp = []
 fixed_expiry_future = ["pyo3?/chrono"]
 pred_market_future = ["pyo3?/chrono"]
 

{ddx_python-1.1.6 → ddx_python-1.1.7}/ddx-operator/core/src/adapter.rs

@@ -224,8 +224,8 @@ mod tests {
         types::{
             request::{
                 ClientRequest, ClientSequencingOutcome, Cmd, DdxSessionDelegatedPayload,
-                OrderIntent, OrderType, PreProcessedRequest, Receipt, Request, RequestWithReceipt,
-                SessionAction,
+                OrderIntent, OrderIntentPayload, OrderType, PreProcessedRequest, Receipt, Request,
+                RequestWithReceipt, SessionAction,
             },
             transaction::ExecutionOps,
         },
@@ -244,20 +244,22 @@ mod tests {
         })
         .expect("encode delegated payload");
 
-        Request::ClientRequest(ClientRequest::Order(OrderIntent {
-            symbol: "ETHP".into(),
-            strategy: Default::default(),
-            side: OrderSide::Bid,
-            order_type: OrderType::Limit { post_only: false },
-            nonce: Default::default(),
-            client_timestamp_ms: 0,
-            recv_window_ms: crate::types::request::DEFAULT_RECV_WINDOW_MS,
-            amount: unscaled!(10),
-            price: unscaled!(200),
-            stop_price: Default::default(),
-            session_key_signature: Some(session_key_signature),
-            signature: Default::default(),
-        }))
+        Request::ClientRequest(ClientRequest::Order(OrderIntent::new(
+            OrderIntentPayload {
+                symbol: "ETHP".into(),
+                strategy: Default::default(),
+                side: OrderSide::Bid,
+                order_type: OrderType::Limit { post_only: false },
+                amount: unscaled!(10),
+                price: unscaled!(200),
+                stop_price: Default::default(),
+            },
+            Default::default(),
+            0,
+            crate::types::request::DEFAULT_RECV_WINDOW_MS,
+            Some(session_key_signature),
+            Default::default(),
+        )))
     }
 
     #[test]

{ddx_python-1.1.6 → ddx_python-1.1.7}/ddx-operator/core/src/constants.rs

@@ -278,15 +278,9 @@ pub const COINGECKO_ID: &str = "coingecko";
 // The current polling threshold is set to 10 minutes.
 pub const COINGECKO_POLL_THRESHOLD: usize = 600;
 
-// Gecko terminal Hostname and SPCX contract address
-pub const GECKO_TERMINAL_ID: &str = "gecko-terminal";
-
 // Elections Kalshi Hostname and WAS contract address
 pub const ELECTIONS_KALSHI_ID: &str = "kalshi";
 
-// Due to rate limit and low liquidity, we need to poll less often for SPCX
-pub const SPCX_POLL_THRESHOLD: usize = 10;
-
 // Default limit on strategies a trader can have
 pub const MAX_STRATEGIES: u8 = 10;
 

{ddx_python-1.1.6 → ddx_python-1.1.7}/ddx-operator/core/src/execution/test_utils.rs

@@ -2,8 +2,6 @@
 pub use test_harness_utils::*;
 #[cfg(feature = "test_harness")]
 mod test_harness_utils {
-    #[cfg(feature = "private_equity_perp")]
-    use crate::specs::constants::SINGLENAMEPERP_SPCXP;
     use crate::{
         execution::validation::Valuation,
         specs::{
@@ -21,7 +19,8 @@ mod test_harness_utils {
             primitives::{ProductSymbol, UnderlyingSymbol},
             request::{
                 CancelOrderIntent, DdxSessionDelegatedPayload, ModifyOrderIntent, OrderIntent,
-                OrderType, ProfileUpdateIntent, SessionAction, WithdrawDDXIntent, WithdrawIntent,
+                OrderIntentPayload, OrderType, ProfileUpdateIntent, SessionAction,
+                WithdrawDDXIntent, WithdrawIntent,
             },
             state::BookOrder,
             transaction::{
@@ -72,7 +71,6 @@ mod test_harness_utils {
     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 ETHHF: &str = "ETHHF";
     #[cfg(feature = "fixed_expiry_future")]
@@ -131,15 +129,6 @@ mod test_harness_utils {
             SPOTGATEWAY_COINGECKO.into(),
         );
 
-        #[cfg(feature = "private_equity_perp")]
-        {
-            system_specs.insert(
-                SpecsKey::single_name_perpetual("SPCXP"),
-                SINGLENAMEPERP_SPCXP.into(),
-            );
-            system_specs.insert(SpecsKey::spot_index("SPCX"), SPOTINDEX_SPCX.into());
-        }
-
         system_specs
     }
 
@@ -395,20 +384,22 @@ mod test_harness_utils {
         P: Into<ProductSymbol>,
         F: Into<f64>,
     {
-        let mut order = OrderIntent {
-            symbol: symbol.into(),
-            strategy: strategy.into(),
-            side,
-            order_type: OrderType::Limit { post_only },
-            nonce: nonce(),
-            client_timestamp_ms: 0,
-            recv_window_ms: crate::types::request::DEFAULT_RECV_WINDOW_MS,
-            amount: Decimal::from_f64(amount.into()).unwrap().into(),
-            price: Decimal::from_f64(price.into()).unwrap().into(),
-            stop_price: Default::default(),
-            session_key_signature: None,
-            signature: Default::default(),
-        };
+        let mut order = OrderIntent::new(
+            OrderIntentPayload {
+                symbol: symbol.into(),
+                strategy: strategy.into(),
+                side,
+                order_type: OrderType::Limit { post_only },
+                amount: Decimal::from_f64(amount.into()).unwrap().into(),
+                price: Decimal::from_f64(price.into()).unwrap().into(),
+                stop_price: Default::default(),
+            },
+            nonce(),
+            0,
+            0,
+            None,
+            Default::default(),
+        );
         sign_order_as(&mut order, trader);
         order
     }
@@ -425,20 +416,22 @@ mod test_harness_utils {
         P: Into<ProductSymbol>,
         F: Into<f64>,
     {
-        let mut order = OrderIntent {
-            symbol: symbol.into(),
-            strategy: strategy.into(),
-            side,
-            order_type: OrderType::Limit { post_only: false },
-            nonce: nonce(),
-            client_timestamp_ms: 0,
-            recv_window_ms: crate::types::request::DEFAULT_RECV_WINDOW_MS,
-            amount: Decimal::from_f64(amount.into()).unwrap().into(),
-            price: Decimal::from_f64(price.into()).unwrap().into(),
-            stop_price: Default::default(),
-            session_key_signature: None,
-            signature: Default::default(),
-        };
+        let mut order = OrderIntent::new(
+            OrderIntentPayload {
+                symbol: symbol.into(),
+                strategy: strategy.into(),
+                side,
+                order_type: OrderType::Limit { post_only: false },
+                amount: Decimal::from_f64(amount.into()).unwrap().into(),
+                price: Decimal::from_f64(price.into()).unwrap().into(),
+                stop_price: Default::default(),
+            },
+            nonce(),
+            0,
+            0,
+            None,
+            Default::default(),
+        );
         let order_hash = order.hash_eip712();
         let secret_key = parse_secret_key(key).unwrap();
         let signature = sign_message(&secret_key, order_hash.into()).unwrap();
@@ -458,20 +451,22 @@ mod test_harness_utils {
         P: Into<ProductSymbol>,
         F: Into<f64>,
     {
-        let mut order = OrderIntent {
-            symbol: symbol.into(),
-            strategy: strategy.into(),
-            side,
-            order_type: OrderType::Market,
-            nonce: nonce(),
-            client_timestamp_ms: 0,
-            recv_window_ms: crate::types::request::DEFAULT_RECV_WINDOW_MS,
-            amount: Decimal::from_f64(amount.into()).unwrap().into(),
-            price: Default::default(),
-            stop_price: Default::default(),
-            session_key_signature: None,
-            signature: Default::default(),
-        };
+        let mut order = OrderIntent::new(
+            OrderIntentPayload {
+                symbol: symbol.into(),
+                strategy: strategy.into(),
+                side,
+                order_type: OrderType::Market,
+                amount: Decimal::from_f64(amount.into()).unwrap().into(),
+                price: Default::default(),
+                stop_price: Default::default(),
+            },
+            nonce(),
+            0,
+            0,
+            None,
+            Default::default(),
+        );
         sign_order_as(&mut order, trader);
         order
     }
@@ -769,6 +764,17 @@ mod test_harness_utils {
         intent.signature = signature.into();
     }
 
+    #[cfg(feature = "insurance_fund_client_req")]
+    pub fn sign_insurance_fund_withdraw_as<T: Into<TraderAddress>>(
+        intent: &mut crate::types::request::InsuranceFundWithdrawIntent,
+        signer: T,
+    ) {
+        let hash = intent.hash_eip712();
+        let secret_key = get_secret_key(&signer.into()).unwrap();
+        let signature = sign_message(&secret_key, hash.into()).unwrap();
+        intent.signature = signature.into();
+    }
+
     pub fn get_cancels(trade_outcomes: &[TradeOutcomeMeta]) -> Vec<Cancel> {
         trade_outcomes
             .iter()
@@ -857,12 +863,6 @@ mod fuzzer_constants {
  :gateway-pricefeedfuzzer (Gateway :symbol "DDXUSDC"))
 "#;
 
-    #[cfg(feature = "private_equity_perp")]
-    pub const SPOTINDEX_SPCX: &str = r#"
-(SpotIndex :symbol "SPCX"
- :gateway-pricefeedfuzzer (Gateway :symbol "SPCXUSDC"))
-"#;
-
     pub const SPOTGATEWAY_PRICEFEEDFUZZER: &str = r#"
 (SpotGateway :id "pricefeedfuzzer"
  :hostname "pricefeedfuzzer"

{ddx_python-1.1.6 → ddx_python-1.1.7}/ddx-operator/core/src/specs/constants.rs

@@ -32,14 +32,6 @@ pub const SINGLENAMEPERP_BTCP: &str = r#"
  :min-order-size 0.00001
 )"#;
 
-pub const SINGLENAMEPERP_SPCXP: &str = r#"
-(SingleNamePerpetual :underlying "SPCX"
- :tick-size 0.1
- :max-order-notional 1000000
- :max-taker-price-deviation 0.02
- :min-order-size 0.0001
-)"#;
-
 // ============================================================================
 // Test-only Single Name Perpetual Products
 // ============================================================================
@@ -115,11 +107,6 @@ pub const SPOTINDEX_ETH: &str = r#"
  :gateway-coinbase (Gateway :symbol "ETH-USD"))
 "#;
 
-pub const SPOTINDEX_SPCX: &str = r#"
-(SpotIndex :symbol "SPCX"
- :gateway-gecko-terminal (Gateway :symbol "0x872109274218cb50f310e2bfb160d135b502a9d5"))
-"#;
-
 // ============================================================================
 // Spot Gateways
 // ============================================================================
@@ -164,15 +151,6 @@ pub const SPOTGATEWAY_COINBASE: &str = r#"
  )
 )"#;
 
-pub const SPOTGATEWAY_GECKO_TERMINAL: &str = r#"
-(SpotGateway :id "gecko-terminal" :hostname "api.geckoterminal.com"
- :port 443
- :get-spot-price (Get
-  :query (format "/api/v2/networks/bsc/tokens/{}")
-  :reader (jq "[data.attributes.address,data.attributes.price_usd]")
- )
-)"#;
-
 // ============================================================================
 // Binary Prediction Futures
 // ============================================================================