From 3cb95bb8dfd13843688ff5857e5f6f5bd1e4aef7 Mon Sep 17 00:00:00 2001 From: TheJuze Date: Tue, 28 May 2024 19:21:50 +0300 Subject: [PATCH] update signOrder types --- package-lock.json | 4 ++-- package.json | 2 +- src/crypt/signOrder.ts | 4 ++-- src/types.ts | 5 +++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9ea111b..f009cd3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@orionprotocol/sdk", - "version": "0.22.0-rc3", + "version": "0.22.0-rc5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@orionprotocol/sdk", - "version": "0.22.0-rc3", + "version": "0.22.0-rc5", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 98c502b..a07554b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.22.0-rc4", + "version": "0.22.0-rc5", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js", diff --git a/src/crypt/signOrder.ts b/src/crypt/signOrder.ts index a86ca13..7df8a5d 100644 --- a/src/crypt/signOrder.ts +++ b/src/crypt/signOrder.ts @@ -101,7 +101,7 @@ export const signOrder = async ({ limitOrder: limitOrderHash, chainId: Number(chainId), secretHash, - lockOrderExpiration: expiration + lockOrderExpiration: expiration // TODO: change to fillAndLockAtomic data } // Generate the full crossChainOrder hash @@ -131,7 +131,7 @@ export const signOrder = async ({ ...order, id: limitOrderHash, // TODO: change to orderHash signature: fixedSignature, - ...(isCrossChain ? { secret, secretHash, targetChainId: Number(targetChainId) } : {}) + ...(isCrossChain ? { secret, secretHash, targetChainId: Number(targetChainId), lockOrderExpiration: expiration } : {}) }; return signedOrder; }; diff --git a/src/types.ts b/src/types.ts index 8baa3f7..3f2445e 100644 --- a/src/types.ts +++ b/src/types.ts @@ -51,8 +51,9 @@ export type Order = { buySide: 0 | 1 // uint8, 1=buy, 0=sell } export type CrossOrder = Order & { - secretHash: string // uint64 - targetChainId: SupportedChainId // uint64 + secretHash: string // bytes32 + targetChainId: number // uint24 + lockOrderExpiration: number // uint64 } export type LockOrder = {