From e815373b0b7fab893d22aa457d245bac2bfdb6f2 Mon Sep 17 00:00:00 2001
From: TheJuze <dimanikus0106@gmail.com>
Date: Wed, 24 Jan 2024 15:01:14 +0300
Subject: [PATCH] fix signLockOrder

---
 package-lock.json                | 4 ++--
 package.json                     | 2 +-
 src/constants/lockOrderTypes.ts  | 1 -
 src/crypt/signLockOrder.ts       | 4 ++--
 src/crypt/signOrder.ts           | 3 +--
 src/services/Aggregator/index.ts | 2 +-
 src/types.ts                     | 2 +-
 7 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 230bef4..9189f5e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@orionprotocol/sdk",
-  "version": "0.20.42-rc13",
+  "version": "0.20.42-rc14",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@orionprotocol/sdk",
-      "version": "0.20.42-rc13",
+      "version": "0.20.42-rc14",
       "hasInstallScript": true,
       "license": "ISC",
       "dependencies": {
diff --git a/package.json b/package.json
index 7a942f4..e1dd067 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orionprotocol/sdk",
-  "version": "0.20.42-rc13",
+  "version": "0.20.42-rc14",
   "description": "Orion Protocol SDK",
   "main": "./lib/index.cjs",
   "module": "./lib/index.js",
diff --git a/src/constants/lockOrderTypes.ts b/src/constants/lockOrderTypes.ts
index 304a991..6302bfa 100644
--- a/src/constants/lockOrderTypes.ts
+++ b/src/constants/lockOrderTypes.ts
@@ -6,6 +6,5 @@ export const LOCK_ORDER_TYPES = {
     { name: 'asset', type: 'string' },
     { name: 'amount', type: 'uint64' },
     { name: 'targetChainId', type: 'uint64' },
-    { name: 'secretHash', type: 'string' },
   ],
 };
diff --git a/src/crypt/signLockOrder.ts b/src/crypt/signLockOrder.ts
index aefbb21..1488c9d 100644
--- a/src/crypt/signLockOrder.ts
+++ b/src/crypt/signLockOrder.ts
@@ -44,7 +44,6 @@ export const signLockOrder = async ({
       BigNumber.ROUND_FLOOR,
     )),
     targetChainId,
-    secretHash,
   };
 
   const signature = await signer.signTypedData(
@@ -62,7 +61,8 @@ export const signLockOrder = async ({
   const signedOrder: SignedLockOrder = {
     ...order,
     signature: fixedSignature,
-    secret
+    secret,
+    secretHash
   };
 
   return signedOrder;
diff --git a/src/crypt/signOrder.ts b/src/crypt/signOrder.ts
index 48f3ed9..533662a 100644
--- a/src/crypt/signOrder.ts
+++ b/src/crypt/signOrder.ts
@@ -56,7 +56,6 @@ export const signOrder = async (
     expiration,
     ...(isCrossChain
       ? {
-        secretHash,
         targetChainId
       }
       : {}),
@@ -79,7 +78,7 @@ export const signOrder = async (
     ...order,
     id: hashOrder(order),
     signature: fixedSignature,
-    ...(isCrossChain ? { secret } : {})
+    ...(isCrossChain ? { secret, secretHash } : {})
   };
   return signedOrder;
 };
diff --git a/src/services/Aggregator/index.ts b/src/services/Aggregator/index.ts
index 300067e..789ee2b 100644
--- a/src/services/Aggregator/index.ts
+++ b/src/services/Aggregator/index.ts
@@ -267,7 +267,7 @@ class Aggregator {
       {
         headers,
         method: 'POST',
-        body: JSON.stringify(signedLockOrder),
+        body: JSON.stringify({ ...signedLockOrder, sign: '' }), // TODO: remove field sign when api updated
       },
       errorSchema,
     );
diff --git a/src/types.ts b/src/types.ts
index 68fe560..3df00e3 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -62,12 +62,12 @@ export type LockOrder = {
   asset: string // address(?)
   amount: number // uint64
   targetChainId: SupportedChainId // uint64
-  secretHash: string // uint64
 }
 
 type SignedOrderAdditionalProps = {
   signature: string // bytes
   secret?: string
+  secretHash?: string // bytes32
   needWithdraw?: boolean // bool (not supported yet by smart-contract)
 }