v14.2.1 (#45)

Author: truemagic-coder

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sakit"
-version = "14.2.0"
+version = "14.2.1"
 description = "Solana Agent Kit"
 authors = ["Bevan Hunt <bevan@bevanhunt.com>"]
 license = "MIT"

sakit/jupiter_trigger.py

@@ -240,7 +240,7 @@ async def _cancel_order(  # pragma: no cover
             orders_result = await trigger.get_orders(user=maker, order_status="active")
             if orders_result.get("success", False):
                 user_orders = [
-                    o.get("order") or o.get("orderPubkey")
+                    o.get("orderKey") or o.get("order") or o.get("orderPubkey")
                     for o in orders_result.get("orders", [])
                 ]
                 if order_pubkey not in user_orders:
@@ -401,13 +401,16 @@ async def _list_orders(  # pragma: no cover
             for order in orders:
                 formatted_orders.append(
                     {
-                        "order_pubkey": order.get("order") or order.get("orderPubkey"),
+                        "order_pubkey": order.get("orderKey")
+                        or order.get("order")
+                        or order.get("orderPubkey"),
                         "input_mint": order.get("inputMint"),
                         "output_mint": order.get("outputMint"),
                         "making_amount": order.get("makingAmount"),
                         "taking_amount": order.get("takingAmount"),
-                        "filled_making_amount": order.get("filledMakingAmount"),
-                        "filled_taking_amount": order.get("filledTakingAmount"),
+                        "remaining_making_amount": order.get("remainingMakingAmount"),
+                        "remaining_taking_amount": order.get("remainingTakingAmount"),
+                        "status": order.get("status"),
                         "expired_at": order.get("expiredAt"),
                         "created_at": order.get("createdAt"),
                     }

sakit/privy_trigger.py

@@ -606,7 +606,7 @@ async def _cancel_order(  # pragma: no cover
             )
             if orders_result.get("success", False):
                 user_orders = [
-                    o.get("order") or o.get("orderPubkey")
+                    o.get("orderKey") or o.get("order") or o.get("orderPubkey")
                     for o in orders_result.get("orders", [])
                 ]
                 if order_pubkey not in user_orders:
@@ -742,13 +742,16 @@ async def _list_orders(  # pragma: no cover
             for order in orders:
                 formatted_orders.append(
                     {
-                        "order_pubkey": order.get("order") or order.get("orderPubkey"),
+                        "order_pubkey": order.get("orderKey")
+                        or order.get("order")
+                        or order.get("orderPubkey"),
                         "input_mint": order.get("inputMint"),
                         "output_mint": order.get("outputMint"),
                         "making_amount": order.get("makingAmount"),
                         "taking_amount": order.get("takingAmount"),
-                        "filled_making_amount": order.get("filledMakingAmount"),
-                        "filled_taking_amount": order.get("filledTakingAmount"),
+                        "remaining_making_amount": order.get("remainingMakingAmount"),
+                        "remaining_taking_amount": order.get("remainingTakingAmount"),
+                        "status": order.get("status"),
                         "expired_at": order.get("expiredAt"),
                         "created_at": order.get("createdAt"),
                     }