@gardenfi/orderbook 3.1.3-beta.8 → 3.1.3-beta.9

package/dist/index10.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index4.cjs"),u=t=>{const{created_at:n,source_swap:r,destination_swap:d}=t;if(d.redeem_tx_hash)return Number(d.redeem_block_number)||e.isBitcoin(d.chain)?e.OrderStatus.Redeemed:e.OrderStatus.RedeemDetected;if(e.isBitcoin(d.chain)&&r.redeem_tx_hash&&!d.redeem_tx_hash)return e.OrderStatus.Redeemed;if(r.refund_tx_hash)return Number(r.refund_block_number)?e.OrderStatus.Refunded:e.OrderStatus.RefundDetected;if(d.refund_tx_hash)return e.OrderStatus.AwaitingRefund;const a=e.isBitcoin(r.chain)?s(new Date(n),6):s(new Date(n),1);return d.initiate_tx_hash?e.OrderStatus.AwaitingRedeem:r.initiate_tx_hash?a?e.OrderStatus.AwaitingRefund:Number(r.initiate_block_number)?e.OrderStatus.Initiated:e.OrderStatus.InitiateDetected:a?e.OrderStatus.Expired:e.OrderStatus.Created},s=(t,n=1)=>{const r=new Date,d=new Date(t);return d.setHours(d.getHours()+n),r>d},_=t=>{const n=u(t);return n===e.OrderStatus.Redeemed||n===e.OrderStatus.Refunded||n===e.OrderStatus.Expired};var i=(t=>(t.Initiate="Initiate",t.PostRefundSACP="PostRefundSACP",t.Redeem="Redeem",t.Refund="Refund",t.Idle="Idle",t))(i||{});const o=t=>{const{source_swap:n,destination_swap:r}=t;return r.redeem_tx_hash&&Number(r.redeem_block_number)||n.refund_tx_hash&&Number(n.refund_block_number)?"Idle":!r.refund_tx_hash&&r.initiate_tx_hash?"Redeem":"Idle"};exports.OrderAction=i;exports.ParseOrderStatus=u;exports.isCompleted=_;exports.isDeadlinePassed=s;exports.parseAction=o;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index4.cjs"),s=t=>{const{source_swap:r,destination_swap:d}=t;if(d.redeem_tx_hash)return Number(d.redeem_block_number)||e.isBitcoin(d.chain)?e.OrderStatus.Redeemed:e.OrderStatus.RedeemDetected;if(e.isBitcoin(d.chain)&&r.redeem_tx_hash&&!d.redeem_tx_hash)return e.OrderStatus.Redeemed;if(r.refund_tx_hash)return Number(r.refund_block_number)?e.OrderStatus.Refunded:e.OrderStatus.RefundDetected;if(d.refund_tx_hash)return e.OrderStatus.AwaitingRefund;const n=u(t.deadline);return d.initiate_tx_hash?e.OrderStatus.AwaitingRedeem:r.initiate_tx_hash?n?e.OrderStatus.AwaitingRefund:Number(r.initiate_block_number)?e.OrderStatus.Initiated:e.OrderStatus.InitiateDetected:n?e.OrderStatus.Expired:e.OrderStatus.Created},u=t=>Date.now()>t,a=t=>{const r=s(t);return r===e.OrderStatus.Redeemed||r===e.OrderStatus.Refunded||r===e.OrderStatus.Expired};var i=(t=>(t.Initiate="Initiate",t.PostRefundSACP="PostRefundSACP",t.Redeem="Redeem",t.Refund="Refund",t.Idle="Idle",t))(i||{});const _=t=>{const{source_swap:r,destination_swap:d}=t;return d.redeem_tx_hash&&Number(d.redeem_block_number)||r.refund_tx_hash&&Number(r.refund_block_number)?"Idle":!d.refund_tx_hash&&d.initiate_tx_hash?"Redeem":"Idle"};exports.OrderAction=i;exports.ParseOrderStatus=s;exports.isCompleted=a;exports.isDeadlinePassed=u;exports.parseAction=_;

package/dist/index10.js

@@ -1,31 +1,28 @@
 import { OrderStatus as e, isBitcoin as d } from "./index4.js";
-const s = (t) => {
-  const { created_at: r, source_swap: n, destination_swap: i } = t;
-  if (i.redeem_tx_hash)
-    return Number(i.redeem_block_number) ? e.Redeemed : d(i.chain) ? e.Redeemed : e.RedeemDetected;
-  if (d(i.chain) && n.redeem_tx_hash && !i.redeem_tx_hash)
+const u = (t) => {
+  const { source_swap: n, destination_swap: r } = t;
+  if (r.redeem_tx_hash)
+    return Number(r.redeem_block_number) ? e.Redeemed : d(r.chain) ? e.Redeemed : e.RedeemDetected;
+  if (d(r.chain) && n.redeem_tx_hash && !r.redeem_tx_hash)
     return e.Redeemed;
   if (n.refund_tx_hash)
     return Number(n.refund_block_number) ? e.Refunded : e.RefundDetected;
-  if (i.refund_tx_hash) return e.AwaitingRefund;
-  const u = d(n.chain) ? a(new Date(r), 6) : a(new Date(r), 1);
-  return i.initiate_tx_hash ? e.AwaitingRedeem : n.initiate_tx_hash ? u ? e.AwaitingRefund : Number(n.initiate_block_number) ? e.Initiated : e.InitiateDetected : u ? e.Expired : e.Created;
-}, a = (t, r = 1) => {
-  const n = /* @__PURE__ */ new Date(), i = new Date(t);
-  return i.setHours(i.getHours() + r), n > i;
-}, m = (t) => {
-  const r = s(t);
-  return r === e.Redeemed || r === e.Refunded || r === e.Expired;
+  if (r.refund_tx_hash) return e.AwaitingRefund;
+  const i = s(t.deadline);
+  return r.initiate_tx_hash ? e.AwaitingRedeem : n.initiate_tx_hash ? i ? e.AwaitingRefund : Number(n.initiate_block_number) ? e.Initiated : e.InitiateDetected : i ? e.Expired : e.Created;
+}, s = (t) => Date.now() > t, f = (t) => {
+  const n = u(t);
+  return n === e.Redeemed || n === e.Refunded || n === e.Expired;
 };
-var _ = /* @__PURE__ */ ((t) => (t.Initiate = "Initiate", t.PostRefundSACP = "PostRefundSACP", t.Redeem = "Redeem", t.Refund = "Refund", t.Idle = "Idle", t))(_ || {});
-const o = (t) => {
-  const { source_swap: r, destination_swap: n } = t;
-  return n.redeem_tx_hash && Number(n.redeem_block_number) || r.refund_tx_hash && Number(r.refund_block_number) ? "Idle" : !n.refund_tx_hash && n.initiate_tx_hash ? "Redeem" : "Idle";
+var a = /* @__PURE__ */ ((t) => (t.Initiate = "Initiate", t.PostRefundSACP = "PostRefundSACP", t.Redeem = "Redeem", t.Refund = "Refund", t.Idle = "Idle", t))(a || {});
+const m = (t) => {
+  const { source_swap: n, destination_swap: r } = t;
+  return r.redeem_tx_hash && Number(r.redeem_block_number) || n.refund_tx_hash && Number(n.refund_block_number) ? "Idle" : !r.refund_tx_hash && r.initiate_tx_hash ? "Redeem" : "Idle";
 };
 export {
-  _ as OrderAction,
-  s as ParseOrderStatus,
-  m as isCompleted,
-  a as isDeadlinePassed,
-  o as parseAction
+  a as OrderAction,
+  u as ParseOrderStatus,
+  f as isCompleted,
+  s as isDeadlinePassed,
+  m as parseAction
 };

package/dist/src/lib/orderStatus/orderStatus.d.ts

@@ -2,7 +2,7 @@ import { OrderStatus } from '../constants/asset';
 import { Order } from '../orderbook/orderbook.types';
 
 export declare const ParseOrderStatus: (order: Order) => OrderStatus;
-export declare const isDeadlinePassed: (date: Date, tillHours?: number) => boolean;
+export declare const isDeadlinePassed: (deadline: EpochTimeStamp) => boolean;
 export declare const isCompleted: (order: Order) => boolean;
 export declare enum OrderAction {
     Initiate = "Initiate",

package/dist/src/lib/orderbook/orderbook.types.d.ts

@@ -104,6 +104,7 @@ export type Order = {
     affiliate_fees: AffiliateFeeV2[];
     integrator: string;
     version: string;
+    deadline: EpochTimeStamp;
 };
 export type OrderWithStatus = Order & {
     status: OrderStatus;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gardenfi/orderbook",
-  "version": "3.1.3-beta.8",
+  "version": "3.1.3-beta.9",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.31.1",
-    "@gardenfi/utils": "3.1.1-beta.6",
+    "@gardenfi/utils": "3.1.1-beta.7",
     "bufferutil": "^4.0.8",
     "node-cache": "^5.1.2",
     "siwe": "^2.1.4",