v14.0.4 (#30)

Author: truemagic-coder

pyproject.toml

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

sakit/privy_trigger.py

@@ -7,6 +7,7 @@
 
 import base64
 import logging
+import time
 from typing import Dict, Any, List, Optional
 
 from solana_agent import AutoTool, ToolRegistry
@@ -401,6 +402,22 @@ async def _create_order(
                 "message": "Missing required parameters: input_mint, output_mint, making_amount, taking_amount",
             }
 
+        # Validate expired_at is in the future if provided
+        if expired_at:
+            try:
+                exp_timestamp = int(expired_at)
+                current_timestamp = int(time.time())
+                if exp_timestamp <= current_timestamp:
+                    return {
+                        "status": "error",
+                        "message": f"expired_at timestamp ({exp_timestamp}) must be in the future. Current time is {current_timestamp}.",
+                    }
+            except (ValueError, TypeError):
+                return {
+                    "status": "error",
+                    "message": f"Invalid expired_at value: {expired_at}. Must be a unix timestamp.",
+                }
+
         try:
             payer_pubkey = None
             if self._payer_private_key:

sakit/utils/trigger.py

@@ -7,6 +7,7 @@
 
 import logging
 import base64
+import time
 from typing import Dict, Any, Optional, List
 from dataclasses import dataclass, field
 import httpx
@@ -115,6 +116,22 @@ async def create_order(
         Returns:
             TriggerOrderResponse with transaction to sign
         """
+        # Validate expired_at is in the future if provided
+        if expired_at:
+            try:
+                exp_timestamp = int(expired_at)
+                current_timestamp = int(time.time())
+                if exp_timestamp <= current_timestamp:
+                    return TriggerOrderResponse(
+                        success=False,
+                        error=f"expired_at timestamp ({exp_timestamp}) must be in the future. Current time is {current_timestamp}.",
+                    )
+            except (ValueError, TypeError):
+                return TriggerOrderResponse(
+                    success=False,
+                    error=f"Invalid expired_at value: {expired_at}. Must be a unix timestamp.",
+                )
+
         body = {
             "inputMint": input_mint,
             "outputMint": output_mint,

tests/test_trigger_utils.py

@@ -87,6 +87,9 @@ async def test_create_order_with_expiry(self, trigger_client):
             "requestId": "req123",
         }
 
+        # Use a future timestamp (year 2030)
+        future_timestamp = "1893456000"
+
         with patch("httpx.AsyncClient") as MockClient:
             mock_instance = AsyncMock()
             mock_response_obj = MagicMock(status_code=200, json=lambda: mock_response)
@@ -101,13 +104,31 @@ async def test_create_order_with_expiry(self, trigger_client):
                 maker="WalletPubkey123",
                 making_amount="1000000",
                 taking_amount="100000",
-                expired_at="1700000000",
+                expired_at=future_timestamp,
             )
 
             # Verify the call was made with expiredAt in params
             call_args = mock_instance.post.call_args
             payload = call_args.kwargs.get("json") or call_args[1].get("json")
-            assert payload.get("params", {}).get("expiredAt") == "1700000000"
+            assert payload.get("params", {}).get("expiredAt") == future_timestamp
+
+    @pytest.mark.asyncio
+    async def test_create_order_with_past_expiry_fails(self, trigger_client):
+        """Should return error when expired_at is in the past."""
+        # Use a past timestamp (year 2020)
+        past_timestamp = "1577836800"
+
+        result = await trigger_client.create_order(
+            input_mint="So11111111111111111111111111111111111111112",
+            output_mint="EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v",
+            maker="WalletPubkey123",
+            making_amount="1000000",
+            taking_amount="100000",
+            expired_at=past_timestamp,
+        )
+
+        assert result.success is False
+        assert "must be in the future" in result.error
 
     @pytest.mark.asyncio
     async def test_create_order_with_payer(self, trigger_client):