@d8x/perpetuals-sdk 0.0.15 → 0.0.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/perpetualDataHandler.ts +8 -5
package/package.json CHANGED
@@ -27,7 +27,7 @@
27
27
  },
28
28
  "name": "@d8x/perpetuals-sdk",
29
29
  "description": "Node TypeScript SDK for D8X Perpetual Futures",
30
- "version": "0.0.15",
30
+ "version": "0.0.16",
31
31
  "main": "./dist/index.js",
32
32
  "types": "./dist/index.d.ts",
33
33
  "directories": {
package/src/perpetualDataHandler.ts CHANGED
@@ -523,13 +523,16 @@ export default class PerpetualDataHandler {
523
523
  }
524
524
 
525
525
  private static _flagToOrderType(order: SmartContractOrder): string {
526
- let hasTrigger = BigNumber.from(order.fTriggerPrice).eq(0);
527
- let hasLimit = !BigNumber.from(order.fTriggerPrice).eq(0) || !BigNumber.from(order.fTriggerPrice).eq(MAX_64x64);
528
- if (hasTrigger && hasLimit) {
526
+ let flag = BigNumber.from(order.flags);
527
+ let isLimit = containsFlag(flag, MASK_LIMIT_ORDER);
528
+ let hasLimit = !BigNumber.from(order.fLimitPrice).eq(0) || !BigNumber.from(order.fLimitPrice).eq(MAX_64x64);
529
+ let isStop = containsFlag(flag, MASK_STOP_ORDER);
530
+
531
+ if (isStop && hasLimit) {
529
532
  return ORDER_TYPE_STOP_LIMIT;
530
- } else if (hasTrigger && !hasLimit) {
533
+ } else if (isStop && !hasLimit) {
531
534
  return ORDER_TYPE_STOP_MARKET;
532
- } else if (hasLimit && containsFlag(BigNumber.from(order.flags), MASK_LIMIT_ORDER)) {
535
+ } else if (isLimit && !isStop) {
533
536
  return ORDER_TYPE_LIMIT;
534
537
  } else {
535
538
  return ORDER_TYPE_MARKET;