From 9c0f09ea62eda67b4bc15bd93285101a77f4cfc3 Mon Sep 17 00:00:00 2001
From: Tim Olson <>
Date: Fri, 8 Dec 2023 21:17:15 -0400
Subject: [PATCH] orderstate reordering

---
 src/dexorder/base/orderlib.py    | 11 ++++++-----
 src/dexorder/order/orderstate.py |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/dexorder/base/orderlib.py b/src/dexorder/base/orderlib.py
index bddd946..51bdb40 100644
--- a/src/dexorder/base/orderlib.py
+++ b/src/dexorder/base/orderlib.py
@@ -10,12 +10,13 @@ log = logging.getLogger(__name__)
 
 
 class SwapOrderState (Enum):
-    Unknown = 0
-    Open = 1
-    Canceled = 2
-    Filled = 3
+    Unknown = -1
+    Signing = 0 # only used by the web but here for completeness
+    Underfunded = 1
+    Open = 2
+    Canceled = 3
     Expired = 4
-    Underfunded = 5
+    Filled = 5
 
 class Exchange (Enum):
     UniswapV2 = 0
diff --git a/src/dexorder/order/orderstate.py b/src/dexorder/order/orderstate.py
index fc61d38..d23dfc4 100644
--- a/src/dexorder/order/orderstate.py
+++ b/src/dexorder/order/orderstate.py
@@ -164,7 +164,7 @@ class Order:
 
     def complete(self, final_state: SwapOrderState):
         """ updates the static order record with its final values, then deletes all its dynamic blockstate and removes the Order from the actives list """
-        assert final_state is not SwapOrderState.Open
+        assert final_state in (SwapOrderState.Canceled, SwapOrderState.Expired, SwapOrderState.Filled)
         status = self.status.copy()
         status.state = final_state
         if self.is_open: