From 0c99c52d6937f031384352c8fec6b8ab8f6ea1bc Mon Sep 17 00:00:00 2001
From: TheJuze <dimanikus0106@gmail.com>
Date: Wed, 29 May 2024 10:37:18 +0300
Subject: [PATCH] update orderTypes.ts

---
 package-lock.json           |  4 ++--
 package.json                |  2 +-
 src/constants/orderTypes.ts | 19 ++++++++++++++++---
 src/crypt/signOrder.ts      |  5 ++---
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6c79703..0b4248b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@orionprotocol/sdk",
-  "version": "0.22.0-rc6",
+  "version": "0.22.0-rc7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@orionprotocol/sdk",
-      "version": "0.22.0-rc6",
+      "version": "0.22.0-rc7",
       "hasInstallScript": true,
       "license": "ISC",
       "dependencies": {
diff --git a/package.json b/package.json
index 2f7282b..a50d670 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orionprotocol/sdk",
-  "version": "0.22.0-rc6",
+  "version": "0.22.0-rc7",
   "description": "Orion Protocol SDK",
   "main": "./lib/index.cjs",
   "module": "./lib/index.js",
diff --git a/src/constants/orderTypes.ts b/src/constants/orderTypes.ts
index 4961fec..a420be2 100644
--- a/src/constants/orderTypes.ts
+++ b/src/constants/orderTypes.ts
@@ -1,10 +1,23 @@
-const ORDER_TYPES = {
+export const ORDER_TYPES = {
   CrossChainOrder: [
-    { name: 'limitOrder', type: 'bytes32' },
+    { name: 'limitOrder', type: 'Order' },
     { name: 'chainId', type: 'uint24' },
     { name: 'secretHash', type: 'bytes32' },
     { name: 'lockOrderExpiration', type: 'uint64' },
   ],
-};
+  Order: [
+    { name: 'senderAddress', type: 'address' },
+    { name: 'matcherAddress', type: 'address' },
+    { name: 'baseAsset', type: 'address' },
+    { name: 'quoteAsset', type: 'address' },
+    { name: 'matcherFeeAsset', type: 'address' },
+    { name: 'amount', type: 'uint64' },
+    { name: 'price', type: 'uint64' },
+    { name: 'matcherFee', type: 'uint64' },
+    { name: 'nonce', type: 'uint64' },
+    { name: 'expiration', type: 'uint64' },
+    { name: 'buySide', type: 'uint8' },
+  ]
+}
 
 export default ORDER_TYPES;
diff --git a/src/crypt/signOrder.ts b/src/crypt/signOrder.ts
index 406ee31..fb40160 100644
--- a/src/crypt/signOrder.ts
+++ b/src/crypt/signOrder.ts
@@ -98,7 +98,7 @@ export const signOrder = async ({
   )));
 
   const crossChainOrder = {
-    limitOrder: limitOrderHash,
+    limitOrder: order,
     chainId: Number(chainId),
     secretHash,
     lockOrderExpiration: expiration // TODO: change to fillAndLockAtomic data
@@ -115,8 +115,7 @@ export const signOrder = async ({
     getDomainData(chainId),
     ORDER_TYPES,
     {
-      order,
-      ...crossChainOrder,
+      crossChainOrder,
     }
   );