deltadefi 0.0.9__tar.gz → 0.0.10__tar.gz

{deltadefi-0.0.9 → deltadefi-0.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: deltadefi
-Version: 0.0.9
+Version: 0.0.10
 Summary: Python SDK for DeltaDeFi protocol.
 License: Apache-2.0
 Keywords: cardano
@@ -79,11 +79,11 @@ The Market client allows you to interact with market-related endpoints.
 
 ```python
 # Get market depth
-market_depth = api.market.get_depth("ADAUSDX")
+market_depth = api.market.get_depth("ADAUSDM")
 print(market_depth_response)
 
 # Get market price
-market_price_response = api.market.get_market_price("ADAUSDX")
+market_price_response = api.market.get_market_price("ADAUSDM")
 print(market_price_response)
 ```
 
@@ -94,7 +94,7 @@ The Order client allows you to interact with order-related endpoints.
 ```python
 # Build place order transaction
 place_order_request = BuildPlaceOrderTransactionRequest(pair="BTC/USD", amount=1, price=50000)
-place_order_response = api.order.build_place_order_transaction(symbol="ADAUSDX", amount=50, price=0.75, type="limit")
+place_order_response = api.order.build_place_order_transaction(symbol="ADAUSDM", amount=50, price=0.75, type="limit")
 print(place_order_response)
 
 # Submit place order transaction

{deltadefi-0.0.9 → deltadefi-0.0.10}/README.md

@@ -51,11 +51,11 @@ The Market client allows you to interact with market-related endpoints.
 
 ```python
 # Get market depth
-market_depth = api.market.get_depth("ADAUSDX")
+market_depth = api.market.get_depth("ADAUSDM")
 print(market_depth_response)
 
 # Get market price
-market_price_response = api.market.get_market_price("ADAUSDX")
+market_price_response = api.market.get_market_price("ADAUSDM")
 print(market_price_response)
 ```
 
@@ -66,7 +66,7 @@ The Order client allows you to interact with order-related endpoints.
 ```python
 # Build place order transaction
 place_order_request = BuildPlaceOrderTransactionRequest(pair="BTC/USD", amount=1, price=50000)
-place_order_response = api.order.build_place_order_transaction(symbol="ADAUSDX", amount=50, price=0.75, type="limit")
+place_order_response = api.order.build_place_order_transaction(symbol="ADAUSDM", amount=50, price=0.75, type="limit")
 print(place_order_response)
 
 # Submit place order transaction

{deltadefi-0.0.9 → deltadefi-0.0.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "deltadefi"
-version = "0.0.9"
+version = "0.0.10"
 classifiers = [
     "Intended Audience :: Developers",
     "License :: OSI Approved :: Apache Software License",

deltadefi-0.0.10/src/deltadefi/clients/__init__.py

@@ -0,0 +1,2 @@
+# flake8: noqa
+from .client import *

{deltadefi-0.0.9 → deltadefi-0.0.10}/src/deltadefi/clients/accounts.py

@@ -5,6 +5,7 @@ from sidan_gin import Asset, UTxO
 
 from deltadefi.api import API
 from deltadefi.lib.utils import check_required_parameter, check_required_parameters
+from deltadefi.models.models import OrderStatusType
 from deltadefi.responses import (
     BuildDepositTransactionResponse,
     BuildWithdrawalTransactionResponse,
@@ -71,15 +72,26 @@ class Accounts(API):
         url_path = "/withdrawal-records"
         return self.send_request("GET", self.group_url_path + url_path, kwargs)
 
-    def get_order_records(self, **kwargs) -> GetOrderRecordResponse:
+    def get_order_records(
+        self, status: OrderStatusType, **kwargs
+    ) -> GetOrderRecordResponse:
         """
         Get order records.
 
+        Args:
+            status: The status of the order records to retrieve. It can be "openOrder",
+                    "orderHistory", or "tradingHistory".
+            limit: Optional; The maximum number of records to return. Defaults to 10, max 250.
+            page: Optional; The page number for pagination. Defaults to 1.
+
         Returns:
             A GetOrderRecordResponse object containing the order records.
         """
+        check_required_parameter(status, "status")
+        payload = {"status": status, **kwargs}
+
         url_path = "/order-records"
-        return self.send_request("GET", self.group_url_path + url_path, kwargs)
+        return self.send_request("GET", self.group_url_path + url_path, payload)
 
     def get_account_balance(self, **kwargs) -> GetAccountBalanceResponse:
         """

deltadefi-0.0.9/src/deltadefi/clients/clients.py → deltadefi-0.0.10/src/deltadefi/clients/client.py

@@ -1,10 +1,10 @@
 # flake8: noqa: E501
-from sidan_gin import Wallet
+from sidan_gin import Wallet, decrypt_with_cipher
 
 from deltadefi.clients.accounts import Accounts
 from deltadefi.clients.app import App
-from deltadefi.clients.market import Market
-from deltadefi.clients.order import Order
+from deltadefi.clients.markets import Market
+from deltadefi.clients.orders import Order
 from deltadefi.models.models import OrderSide, OrderType
 from deltadefi.responses import PostOrderResponse
 
@@ -18,8 +18,8 @@ class ApiClient:
         self,
         network: str = "preprod",
         api_key: str = None,
-        wallet: Wallet = None,
         base_url: str = None,
+        master_wallet: Wallet = None,
     ):
         """
         Initialize the ApiClient.
@@ -40,12 +40,26 @@ class ApiClient:
             self.base_url = base_url
 
         self.api_key = api_key
-        self.wallet = wallet
+        self.master_wallet = master_wallet
 
         self.accounts = Accounts(base_url=self.base_url, api_key=api_key)
         self.app = App(base_url=self.base_url, api_key=api_key)
-        self.order = Order(base_url=self.base_url, api_key=api_key)
-        self.market = Market(base_url=self.base_url, api_key=api_key)
+        self.orders = Order(base_url=self.base_url, api_key=api_key)
+        self.markets = Market(base_url=self.base_url, api_key=api_key)
+
+    def load_operation_key(self, password: str):
+        """
+        Load the operation key from the wallet using the provided password.
+
+        Args:
+            password: The password to decrypt the operation key.
+
+        Returns:
+            The decrypted operation key.
+        """
+        res = self.accounts.get_operation_key()
+        operation_key = decrypt_with_cipher(res["encrypted_operation_key"], password)
+        self.operation_wallet = Wallet.new_root_key(operation_key)
 
     def post_order(
         self, symbol: str, side: OrderSide, type: OrderType, quantity: int, **kwargs
@@ -58,7 +72,9 @@ class ApiClient:
             side: The side of the order (e.g., "buy" or "sell").
             type: The type of the order (e.g., "limit" or "market").
             quantity: The quantity of the asset to be traded.
-            **kwargs: Additional parameters for the order, such as price, limit_slippage, etc.
+            price: Required for limit order; The price for limit orders.
+            limit_slippage: Optional; Whether to apply slippage for market orders. Defaults to False.
+            max_slippage_basis_point: Optional; The maximum slippage in basis points for market orders. Defaults to null.
 
         Returns:
             A PostOrderResponse object containing the response from the API.
@@ -66,19 +82,29 @@ class ApiClient:
         Raises:
             ValueError: If the wallet is not initialized.
         """
-        print(
-            f"post_order: symbol={symbol}, side={side}, type={type}, quantity={quantity}, kwargs={kwargs}"
-        )
-        if not hasattr(self, "wallet") or self.wallet is None:
-            raise ValueError("Wallet is not initialized")
+        if not hasattr(self, "operation_wallet") or self.operation_wallet is None:
+            raise ValueError("Operation wallet is not initialized")
 
-        build_res = self.order.build_place_order_transaction(
+        build_res = self.orders.build_place_order_transaction(
             symbol, side, type, quantity, **kwargs
         )
-        print(f"build_res: {build_res}")
-        signed_tx = self.wallet.sign_tx(build_res["tx_hex"])
-        submit_res = self.order.submit_place_order_transaction(
+        signed_tx = self.operation_wallet.sign_tx(build_res["tx_hex"])
+        submit_res = self.orders.submit_place_order_transaction(
             build_res["order_id"], signed_tx, **kwargs
         )
-        print(f"submit_res: {submit_res}")
         return submit_res
+
+    def cancel_order(self, order_id: str, **kwargs):
+        """
+        Cancel an order by its ID.
+
+        Args:
+            order_id: The ID of the order to be canceled.
+        """
+        if not hasattr(self, "operation_wallet") or self.operation_wallet is None:
+            raise ValueError("Operation wallet is not initialized")
+
+        build_res = self.orders.build_cancel_order_transaction(order_id)
+        signed_tx = self.operation_wallet.sign_tx(build_res["tx_hex"])
+        self.orders.submit_cancel_order_transaction(signed_tx, **kwargs)
+        return {"message": "Order cancelled successfully", "order_id": order_id}

deltadefi-0.0.9/src/deltadefi/clients/order.py → deltadefi-0.0.10/src/deltadefi/clients/orders.py

@@ -4,7 +4,6 @@ from deltadefi.models.models import OrderSide, OrderType
 from deltadefi.responses import (
     BuildCancelOrderTransactionResponse,
     BuildPlaceOrderTransactionResponse,
-    SubmitCancelOrderTransactionResponse,
     SubmitPlaceOrderTransactionResponse,
 )
 
@@ -105,17 +104,12 @@ class Order(API):
         url_path = "/submit"
         return self.send_request("POST", self.group_url_path + url_path, payload)
 
-    def submit_cancel_order_transaction(
-        self, signed_tx: str, **kwargs
-    ) -> SubmitCancelOrderTransactionResponse:
+    def submit_cancel_order_transaction(self, signed_tx: str, **kwargs):
         """
         Submit a cancel order transaction.
 
         Args:
             data: A SubmitCancelOrderTransactionRequest object containing the cancel order details.
-
-        Returns:
-            A SubmitCancelOrderTransactionResponse object containing the submitted cancel order transaction.
         """
         check_required_parameter(signed_tx, "signed_tx")
         payload = {"signed_tx": signed_tx, **kwargs}

{deltadefi-0.0.9 → deltadefi-0.0.10}/src/deltadefi/constants/constants.py

@@ -1,6 +1,6 @@
 from typing import Literal
 
-TradingPair = Literal["ADAUSDX"]
+TradingPair = Literal["ADAUSDM"]
 TradingSide = Literal["buy", "sell"]
 TradingType = Literal["limit", "market"]
 TimeInForce = Literal["GTC"]

{deltadefi-0.0.9 → deltadefi-0.0.10}/src/deltadefi/models/models.py

@@ -1,9 +1,11 @@
 from dataclasses import dataclass
 from typing import List, Literal
 
-from sidan_gin import Asset
+OrderStatusType = Literal["openOrder", "orderHistory", "tradingHistory"]
 
-OrderStatus = Literal["building", "open", "closed", "failed"]
+OrderStatus = Literal[
+    "open", "fully_filled", "partially_filled", "cancelled", "partially_cancelled"
+]
 
 OrderSide = Literal["buy", "sell"]
 
@@ -20,6 +22,13 @@ OrderTypes = {
 }
 
 
+@dataclass
+class AssetRecord:
+    asset: str
+    asset_unit: str
+    qty: float
+
+
 @dataclass
 class TransactionStatus:
     building = "building"
@@ -50,7 +59,7 @@ class OrderJSON:
 class DepositRecord:
     created_at: str
     status: TransactionStatus
-    assets: List[Asset]
+    assets: List[AssetRecord]
     tx_hash: str
 
 
@@ -58,7 +67,7 @@ class DepositRecord:
 class WithdrawalRecord:
     created_at: str
     status: TransactionStatus
-    assets: List[Asset]
+    assets: List[AssetRecord]
 
 
 @dataclass
@@ -66,3 +75,18 @@ class AssetBalance:
     asset: str
     free: int
     locked: int
+
+
+@dataclass
+class OrderFillingRecordJSON:
+    execution_id: str
+    order_id: str
+    status: OrderStatus
+    symbol: str
+    executed_qty: str
+    side: OrderSide
+    type: OrderType
+    fee_charged: str
+    fee_unit: str
+    executed_price: float
+    created_time: int

{deltadefi-0.0.9 → deltadefi-0.0.10}/src/deltadefi/responses/accounts.py

@@ -4,6 +4,7 @@ from typing import List, TypedDict
 from deltadefi.models.models import (
     AssetBalance,
     DepositRecord,
+    OrderFillingRecordJSON,
     OrderJSON,
     WithdrawalRecord,
 )
@@ -43,6 +44,7 @@ class GetWithdrawalRecordsResponse(List[WithdrawalRecord]):
 @dataclass
 class GetOrderRecordResponse(TypedDict):
     orders: List[OrderJSON]
+    order_filling_records: List[OrderFillingRecordJSON]
 
 
 @dataclass

{deltadefi-0.0.9 → deltadefi-0.0.10}/src/deltadefi/responses/responses.py

@@ -61,8 +61,3 @@ class PostOrderResponse(SubmitPlaceOrderTransactionResponse):
 @dataclass
 class BuildCancelOrderTransactionResponse(TypedDict):
     tx_hex: str
-
-
-@dataclass
-class SubmitCancelOrderTransactionResponse(TypedDict):
-    tx_hash: str

deltadefi-0.0.9/src/deltadefi/clients/__init__.py

@@ -1,2 +0,0 @@
-# flake8: noqa
-from .clients import *