deltadefi 0.1.1__py3-none-any.whl → 1.0.0__py3-none-any.whl

deltadefi/clients/accounts.py

@@ -1,4 +1,5 @@
 #
+from typing import cast
 
 from sidan_gin import Asset, UTxO
 
@@ -43,7 +44,10 @@ class Accounts(API):
         """
 
         url_path = "/operation-key"
-        return self.send_request("GET", self.group_url_path + url_path, kwargs)
+        return cast(
+            "GetOperationKeyResponse",
+            self.send_request("GET", self.group_url_path + url_path, kwargs),
+        )
 
     def create_new_api_key(self, **kwargs) -> CreateNewAPIKeyResponse:
         """
@@ -54,7 +58,10 @@ class Accounts(API):
         """
 
         url_path = "/new-api-key"
-        return self.send_request("GET", self.group_url_path + url_path, kwargs)
+        return cast(
+            "CreateNewAPIKeyResponse",
+            self.send_request("GET", self.group_url_path + url_path, kwargs),
+        )
 
     def get_deposit_records(self, **kwargs) -> GetDepositRecordsResponse:
         """
@@ -64,7 +71,10 @@ class Accounts(API):
             A GetDepositRecordsResponse object containing the deposit records.
         """
         url_path = "/deposit-records"
-        return self.send_request("GET", self.group_url_path + url_path, kwargs)
+        return cast(
+            "GetDepositRecordsResponse",
+            self.send_request("GET", self.group_url_path + url_path, kwargs),
+        )
 
     def get_withdrawal_records(self, **kwargs) -> GetWithdrawalRecordsResponse:
         """
@@ -74,7 +84,10 @@ class Accounts(API):
             A GetWithdrawalRecordsResponse object containing the withdrawal records.
         """
         url_path = "/withdrawal-records"
-        return self.send_request("GET", self.group_url_path + url_path, kwargs)
+        return cast(
+            "GetWithdrawalRecordsResponse",
+            self.send_request("GET", self.group_url_path + url_path, kwargs),
+        )
 
     def get_order_records(
         self, status: OrderStatusType, **kwargs
@@ -95,7 +108,10 @@ class Accounts(API):
         payload = {"status": status, **kwargs}
 
         url_path = "/order-records"
-        return self.send_request("GET", self.group_url_path + url_path, payload)
+        return cast(
+            "GetOrderRecordsResponse",
+            self.send_request("GET", self.group_url_path + url_path, payload),
+        )
 
     def get_order_record(self, order_id: str, **kwargs) -> GetOrderRecordResponse:
         """
@@ -110,7 +126,10 @@ class Accounts(API):
         check_required_parameter(order_id, "order_id")
 
         url_path = f"/order/{order_id}"
-        return self.send_request("GET", self.group_url_path + url_path, kwargs)
+        return cast(
+            "GetOrderRecordResponse",
+            self.send_request("GET", self.group_url_path + url_path, kwargs),
+        )
 
     def get_account_balance(self, **kwargs) -> GetAccountBalanceResponse:
         """
@@ -120,7 +139,10 @@ class Accounts(API):
             A GetAccountBalanceResponse object containing the account balance.
         """
         url_path = "/balance"
-        return self.send_request("GET", self.group_url_path + url_path, kwargs)
+        return cast(
+            "GetAccountBalanceResponse",
+            self.send_request("GET", self.group_url_path + url_path, kwargs),
+        )
 
     def build_deposit_transaction(
         self, deposit_amount: list[Asset], input_utxos: list[UTxO], **kwargs
@@ -145,7 +167,10 @@ class Accounts(API):
         }
 
         url_path = "/deposit/build"
-        return self.send_request("POST", self.group_url_path + url_path, payload)
+        return cast(
+            "BuildDepositTransactionResponse",
+            self.send_request("POST", self.group_url_path + url_path, payload),
+        )
 
     def build_withdrawal_transaction(
         self, withdrawal_amount: list[Asset], **kwargs
@@ -164,7 +189,10 @@ class Accounts(API):
         payload = {"withdrawal_amount": withdrawal_amount, **kwargs}
 
         url_path = "/withdrawal/build"
-        return self.send_request("POST", self.group_url_path + url_path, payload)
+        return cast(
+            "BuildWithdrawalTransactionResponse",
+            self.send_request("POST", self.group_url_path + url_path, payload),
+        )
 
     def build_transferal_transaction(
         self, transferal_amount: list[Asset], to_address: str, **kwargs
@@ -179,8 +207,8 @@ class Accounts(API):
             A BuildTransferalTransactionResponse object containing the built transferal transaction.
         """
 
-        check_required_parameter(
-            transferal_amount, "transferal_amount", to_address, "to_address"
+        check_required_parameters(
+            [[transferal_amount, "transferal_amount"], [to_address, "to_address"]]
         )
         payload = {
             "transferal_amount": transferal_amount,
@@ -189,7 +217,10 @@ class Accounts(API):
         }
 
         url_path = "/transferal/build"
-        return self.send_request("POST", self.group_url_path + url_path, payload)
+        return cast(
+            "BuildTransferalTransactionResponse",
+            self.send_request("POST", self.group_url_path + url_path, payload),
+        )
 
     def submit_deposit_transaction(
         self, signed_tx: str, **kwargs
@@ -208,7 +239,10 @@ class Accounts(API):
         payload = {"signed_tx": signed_tx, **kwargs}
 
         url_path = "/deposit/submit"
-        return self.send_request("POST", self.group_url_path + url_path, payload)
+        return cast(
+            "SubmitDepositTransactionResponse",
+            self.send_request("POST", self.group_url_path + url_path, payload),
+        )
 
     def submit_withdrawal_transaction(
         self, signed_tx: str, **kwargs
@@ -227,7 +261,10 @@ class Accounts(API):
         payload = {"signed_tx": signed_tx, **kwargs}
 
         url_path = "/withdrawal/submit"
-        return self.send_request("POST", self.group_url_path + url_path, payload)
+        return cast(
+            "SubmitWithdrawalTransactionResponse",
+            self.send_request("POST", self.group_url_path + url_path, payload),
+        )
 
     def submit_transferal_transaction(
         self, signed_tx: str, **kwargs
@@ -246,4 +283,7 @@ class Accounts(API):
         payload = {"signed_tx": signed_tx, **kwargs}
 
         url_path = "/transferal/submit"
-        return self.send_request("POST", self.group_url_path + url_path, payload)
+        return cast(
+            "SubmitTransferalTransactionResponse",
+            self.send_request("POST", self.group_url_path + url_path, payload),
+        )

deltadefi/clients/client.py

@@ -18,6 +18,7 @@ class ApiClient:
         network: str = "preprod",
         api_key: str | None = None,
         base_url: str | None = None,
+        ws_url: str | None = None,
         master_wallet: Wallet | None = None,
     ):
         """
@@ -30,30 +31,26 @@ class ApiClient:
         """
         if network == "mainnet":
             self.network_id = 1
-            self.base_url = "https://api-dev.deltadefi.io"  # TODO: input production link once available
+            self.base_url = "https://api.deltadefi.io"
+            self.ws_url = "wss://stream.deltadefi.io"
         else:
             self.network_id = 0
             self.base_url = "https://api-staging.deltadefi.io"
+            self.ws_url = "wss://stream-staging.deltadefi.io"
 
         if base_url:
             self.base_url = base_url
 
+        if ws_url:
+            self.ws_url = ws_url
+
         self.api_key = api_key
         self.master_wallet = master_wallet
 
         self.accounts = Accounts(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)
-
-        # Initialize WebSocket client with correct stream URL
-        if network == "mainnet":
-            ws_base_url = (
-                "wss://stream.deltadefi.io"  # TODO: Update when mainnet is available
-            )
-        else:
-            ws_base_url = "wss://stream-staging.deltadefi.io"
-
-        self.websocket = WebSocketClient(base_url=ws_base_url, api_key=api_key)
+        self.websocket = WebSocketClient(base_url=self.ws_url, api_key=api_key)
 
     def load_operation_key(self, password: str):
         """
@@ -116,3 +113,25 @@ class ApiClient:
         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}
+
+    def cancel_all_orders(self, **kwargs):
+        """
+        Cancel all open orders for the account.
+        """
+        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_all_orders_transaction()
+
+        signed_txs: list[str] = []
+        for tx_hex in build_res["tx_hexes"]:
+            signed_tx = self.operation_wallet.sign_tx(tx_hex)
+            signed_txs.append(signed_tx)
+
+        submit_res = self.orders.submit_cancel_all_orders_transaction(
+            signed_txs, **kwargs
+        )
+        return {
+            "message": "All orders cancelled successfully",
+            "cancelled_order_ids": submit_res["cancelled_order_ids"],
+        }

deltadefi/clients/markets.py

@@ -1,4 +1,4 @@
-from typing import Literal
+from typing import Literal, cast
 
 from deltadefi.api import API
 from deltadefi.responses import GetAggregatedPriceResponse, GetMarketPriceResponse
@@ -28,7 +28,10 @@ class Market(API):
         check_required_parameter(symbol, "symbol")
         payload = {"symbol": symbol, **kwargs}
         url_path = "/market-price"
-        return self.send_request("GET", self.group_url_path + url_path, payload)
+        return cast(
+            "GetMarketPriceResponse",
+            self.send_request("GET", self.group_url_path + url_path, payload),
+        )
 
     def get_aggregated_price(
         self,
@@ -56,12 +59,15 @@ class Market(API):
             ]
         )
         url_path = f"/graph/{symbol}"
-        return self.send_request(
-            "GET",
-            self.group_url_path + url_path,
-            {
-                "interval": interval,
-                "start": start,
-                "end": end,
-            },
+        return cast(
+            "GetAggregatedPriceResponse",
+            self.send_request(
+                "GET",
+                self.group_url_path + url_path,
+                {
+                    "interval": interval,
+                    "start": start,
+                    "end": end,
+                },
+            ),
         )

deltadefi/clients/orders.py

@@ -1,8 +1,12 @@
+from typing import cast
+
 from deltadefi.api import API
 from deltadefi.models.models import OrderSide, OrderType
 from deltadefi.responses import (
+    BuildCancelAllOrdersTransactionResponse,
     BuildCancelOrderTransactionResponse,
     BuildPlaceOrderTransactionResponse,
+    SubmitCancelAllOrdersTransactionResponse,
     SubmitPlaceOrderTransactionResponse,
 )
 from deltadefi.utils import check_required_parameter, check_required_parameters
@@ -66,7 +70,10 @@ class Order(API):
         }
 
         url_path = "/build"
-        return self.send_request("POST", self.group_url_path + url_path, payload)
+        return cast(
+            "BuildPlaceOrderTransactionResponse",
+            self.send_request("POST", self.group_url_path + url_path, payload),
+        )
 
     def build_cancel_order_transaction(
         self, order_id: str, **kwargs
@@ -84,7 +91,26 @@ class Order(API):
         check_required_parameter(order_id, "order_id")
 
         url_path = f"/{order_id}/build"
-        return self.send_request("DELETE", self.group_url_path + url_path, **kwargs)
+        return cast(
+            "BuildCancelOrderTransactionResponse",
+            self.send_request("DELETE", self.group_url_path + url_path, **kwargs),
+        )
+
+    def build_cancel_all_orders_transaction(
+        self, **kwargs
+    ) -> BuildCancelAllOrdersTransactionResponse:
+        """
+        Build a cancel all orders transaction.
+
+        Returns:
+            A BuildCancelAllOrdersTransactionResponse object containing the built cancel all orders transaction.
+        """
+
+        url_path = "/cancel-all/build"
+        return cast(
+            "BuildCancelAllOrdersTransactionResponse",
+            self.send_request("DELETE", self.group_url_path + url_path, **kwargs),
+        )
 
     def submit_place_order_transaction(
         self, order_id: str, signed_tx: str, **kwargs
@@ -93,7 +119,8 @@ class Order(API):
         Submit a place order transaction.
 
         Args:
-            data: A SubmitPlaceOrderTransactionRequest object containing the order details.
+            order_id: The ID of the order to be placed.
+            signed_tx: The signed transaction hex string for placing the order.
 
         Returns:
             A SubmitPlaceOrderTransactionResponse object containing the submitted order transaction.
@@ -102,17 +129,38 @@ class Order(API):
         payload = {"order_id": order_id, "signed_tx": signed_tx, **kwargs}
 
         url_path = "/submit"
-        return self.send_request("POST", self.group_url_path + url_path, payload)
+        return cast(
+            "SubmitPlaceOrderTransactionResponse",
+            self.send_request("POST", self.group_url_path + url_path, payload),
+        )
 
     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.
+            signed_tx: The signed transaction hex string for canceling the order.
         """
         check_required_parameter(signed_tx, "signed_tx")
         payload = {"signed_tx": signed_tx, **kwargs}
 
         path_url = "/submit"
         return self.send_request("DELETE", self.group_url_path + path_url, payload)
+
+    def submit_cancel_all_orders_transaction(
+        self, signed_txs: list[str], **kwargs
+    ) -> SubmitCancelAllOrdersTransactionResponse:
+        """
+        Submit a cancel all orders transaction.
+
+        Args:
+            signed_txs: A list of signed transaction hex strings for canceling all orders.
+        """
+        check_required_parameter(signed_txs, "signed_txs")
+        payload = {"signed_txs": signed_txs, **kwargs}
+
+        path_url = "/cancel-all/submit"
+        return cast(
+            "SubmitCancelAllOrdersTransactionResponse",
+            self.send_request("DELETE", self.group_url_path + path_url, payload),
+        )

deltadefi/clients/websocket.py

@@ -47,7 +47,7 @@ class WebSocketClient:
         self.ping_interval = ping_interval
         self.ping_timeout = ping_timeout
 
-        self.websocket: websockets.WebSocketServerProtocol | None = None
+        self.websocket: websockets.WebSocketClientProtocol | None = None
         self.subscriptions: dict[str, dict[str, Any]] = {}
         self.message_handlers: dict[str, Callable] = {}
         self.is_connected = False
@@ -119,10 +119,14 @@ class WebSocketClient:
         except Exception as e:
             self.logger.error(f"Error in message listener: {e}")
 
-    async def _handle_message(self, message: str) -> None:
+    async def _handle_message(self, message: str | bytes) -> None:
         """Handle incoming WebSocket message."""
         try:
-            data = json.loads(message)
+            # Convert bytes to string if needed
+            message_str = (
+                message.decode("utf-8") if isinstance(message, bytes) else message
+            )
+            data = json.loads(message_str)
 
             # Determine message type based on structure
             if isinstance(data, list) and len(data) > 0 and "timestamp" in data[0]:
@@ -171,7 +175,10 @@ class WebSocketClient:
                 self.logger.debug(f"Unknown message format: {data}")
 
         except json.JSONDecodeError:
-            self.logger.error(f"Failed to parse message: {message}")
+            message_repr = (
+                message.decode("utf-8") if isinstance(message, bytes) else message
+            )
+            self.logger.error(f"Failed to parse message: {message_repr}")
         except Exception as e:
             self.logger.error(f"Error handling message: {e}")
 
@@ -187,10 +194,8 @@ class WebSocketClient:
             # In a more complex implementation, you'd want to handle multiple concurrent subscriptions
             if self.subscriptions:
                 first_sub = next(iter(self.subscriptions.values()))
-                if first_sub.get("type") == "trade":
-                    await self.connect(first_sub["endpoint"])
-                else:
-                    await self.connect()
+                # Always use the stored endpoint for reconnection
+                await self.connect(first_sub["endpoint"])
             else:
                 await self.connect()
 

deltadefi/responses/responses.py

@@ -61,3 +61,13 @@ class PostOrderResponse(SubmitPlaceOrderTransactionResponse):
 @dataclass
 class BuildCancelOrderTransactionResponse(TypedDict):
     tx_hex: str
+
+
+@dataclass
+class BuildCancelAllOrdersTransactionResponse(TypedDict):
+    tx_hexes: list[str]
+
+
+@dataclass
+class SubmitCancelAllOrdersTransactionResponse(TypedDict):
+    cancelled_order_ids: list[str]

{deltadefi-0.1.1.dist-info → deltadefi-1.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deltadefi
-Version: 0.1.1
+Version: 1.0.0
 Summary: Python SDK for DeltaDeFi protocol.
 Author-email: HinsonSIDAN <wongkahinhinson@gmail.com>
 License-Expression: Apache-2.0

{deltadefi-0.1.1.dist-info → deltadefi-1.0.0.dist-info}/RECORD

@@ -5,20 +5,20 @@ deltadefi/api_resources/__init__.py,sha256=_SGHTpaQTIBvh9Rm868IT5pXpvvGBPqz3bxkY
 deltadefi/api_resources/auth.py,sha256=4QCEI4P4UlQPQYctqY9Oat4hn7lsI95QihHTD_0PZKg,245
 deltadefi/api_resources/validation.py,sha256=vz-hovpLy9SMOIFGcBHC8vWZH8CJRlQP8rcbbTSM-PM,1375
 deltadefi/clients/__init__.py,sha256=4hyPuk6_bcJGXUElOvkgZ7ARlQ6QwKLp-nFgCXTbFVI,76
-deltadefi/clients/accounts.py,sha256=sfdPh8CWsein1UAn8h-Y0JB_zMvr95FZx2QuaL6Tico,8407
-deltadefi/clients/client.py,sha256=2hLOsxqBc8eu_6ovuYLRoK2popdI1_t3pGcEP8Keu9A,4619
-deltadefi/clients/markets.py,sha256=--wMUFYkZryZjj8wO-rxxJhHEbM3UmcPpubrHU92Bdk,1985
-deltadefi/clients/orders.py,sha256=AX6RZfLZFUonjKDPYc1T4wbxVomQeES1mzfJHSjhI-M,3886
-deltadefi/clients/websocket.py,sha256=0454RunoE9eHqmQ0wrywEwxqrie1qEXq2ObxyKXopck,12424
+deltadefi/clients/accounts.py,sha256=BR5o8DZ7EmN958UzQbFl7knZyIq1gQXM7PEJVg5snoc,9393
+deltadefi/clients/client.py,sha256=n6NzSk8OYbZ6mTo-TWCyVyNbGR2UAqszFfr8D3AF9Kg,5266
+deltadefi/clients/markets.py,sha256=3S1zmP27AnRYeGFZMu-UncRxUJnrGGibJaBsf6O1l_8,2161
+deltadefi/clients/orders.py,sha256=tonrB6pj0TEFFKRvb66FcIAL4aENzlK7RGWSY0_Gpig,5443
+deltadefi/clients/websocket.py,sha256=eWWoYuhNJc-GI-Tn94HZsb5E9EbOb7ndWJOyXfYr5Ho,12686
 deltadefi/constants/__init__.py,sha256=7LkrzfLTJsCCUl5IgZYrl-AbY_cf1fftcLklgnBYDTs,40
 deltadefi/constants/constants.py,sha256=4bkY4kfNcsgoCe1xU8n2We7w-vxZXyzVw5rQvAsx4j8,168
 deltadefi/models/__init__.py,sha256=oDJj6Y4gXN6C7Oz_t2fq8hej-D0G9OqfXjL4Jaeq8z8,37
 deltadefi/models/models.py,sha256=kiRpCdzUh3WmyuFOaxlZ1rjsQ2cxLWjVFBCqsHXMtBc,1633
 deltadefi/responses/__init__.py,sha256=JKSIUQu6qI_XhbAR2mVMCKNvR6x_vFZdyLGOuQTVrVY,64
 deltadefi/responses/accounts.py,sha256=o-It4vyNsiDeCmHa-XQl77KuCVtJi7qlPdn059fgwcI,1590
-deltadefi/responses/responses.py,sha256=Kz5PtDnx_AgKrV7NhZqrSMnS1wPlLbu13J2BKNzN0ME,1012
+deltadefi/responses/responses.py,sha256=BqutIkilVCibcxH_10FwN-dY3p3g9XFDOp9NYPbuLPw,1214
 deltadefi/utils/__init__.py,sha256=krFwciyC3ArJ1j96b5IOVMqKfiFjnKtgQvYPsw3A-MU,38
 deltadefi/utils/helpers.py,sha256=S90RpdkKJS-khuwk8B0vhOdTQXuUkutZ0RZLybeF550,1025
-deltadefi-0.1.1.dist-info/METADATA,sha256=_Y9ZNj9oM_W99lWEj6HzoBb2uJo3Q6DDWh_sjN0jYGw,3075
-deltadefi-0.1.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-deltadefi-0.1.1.dist-info/RECORD,,
+deltadefi-1.0.0.dist-info/METADATA,sha256=qfK9tIYw4ASRuzf1e1AoU_yTb_qJu8nX7L5vqC9bjE8,3075
+deltadefi-1.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+deltadefi-1.0.0.dist-info/RECORD,,