@triadxyz/triad-protocol 1.5.9-beta → 1.6.1-beta

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.
package/dist/index.js CHANGED
@@ -25,7 +25,7 @@ const sendTransactionWithOptions_1 = __importDefault(require("./utils/sendTransa
25
25
  class TriadProtocolClient {
26
26
  constructor(connection, wallet) {
27
27
  this.provider = new anchor_1.AnchorProvider(connection, wallet, {
28
- commitment: 'processed'
28
+ commitment: 'confirmed'
29
29
  });
30
30
  this.program = new anchor_1.Program(idl_triad_protocol_json_1.default, this.provider);
31
31
  this.trade = new trade_1.default(this.program, this.provider);
package/dist/trade.d.ts CHANGED
@@ -57,18 +57,38 @@ export default class Trade {
57
57
  status: ({
58
58
  open?: never;
59
59
  closed?: never;
60
+ claimed?: never;
61
+ liquidated?: never;
60
62
  } & {
61
63
  init: Record<string, never>;
62
64
  }) | ({
63
65
  init?: never;
64
66
  closed?: never;
67
+ claimed?: never;
68
+ liquidated?: never;
65
69
  } & {
66
70
  open: Record<string, never>;
67
71
  }) | ({
68
72
  init?: never;
69
73
  open?: never;
74
+ claimed?: never;
75
+ liquidated?: never;
70
76
  } & {
71
77
  closed: Record<string, never>;
78
+ }) | ({
79
+ init?: never;
80
+ open?: never;
81
+ closed?: never;
82
+ liquidated?: never;
83
+ } & {
84
+ claimed: Record<string, never>;
85
+ }) | ({
86
+ init?: never;
87
+ open?: never;
88
+ closed?: never;
89
+ claimed?: never;
90
+ } & {
91
+ liquidated: Record<string, never>;
72
92
  });
73
93
  price: BN;
74
94
  totalAmount: BN;
package/dist/trade.js CHANGED
@@ -191,20 +191,21 @@ class Trade {
191
191
  })
192
192
  .instruction());
193
193
  }
194
- try {
195
- userTradePDA = yield this.getUserTradeNonceWithSlots(myUserTrades);
196
- console.log(userTradePDA);
197
- }
198
- catch (_a) {
199
- const mainUserTrade = myUserTrades.find((userTrade) => !userTrade.isSubUser);
200
- const subUserTradePDA = (0, trade_1.getSubUserTradePDA)(this.program.programId, this.provider.publicKey, Number(mainUserTrade.nonce) + 1);
201
- userTradePDA = (0, trade_1.getUserTradePDA)(this.program.programId, subUserTradePDA);
202
- ixs.push(yield this.program.methods
203
- .createSubUserTrade(subUserTradePDA)
204
- .accounts({
205
- signer: this.provider.publicKey
206
- })
207
- .instruction());
194
+ if (myUserTrades.length > 0) {
195
+ try {
196
+ userTradePDA = yield this.getUserTradeNonceWithSlots(myUserTrades);
197
+ }
198
+ catch (_a) {
199
+ const mainUserTrade = myUserTrades.find((userTrade) => !userTrade.isSubUser);
200
+ const subUserTradePDA = (0, trade_1.getSubUserTradePDA)(this.program.programId, this.provider.publicKey, Number(mainUserTrade.nonce) + 1);
201
+ userTradePDA = (0, trade_1.getUserTradePDA)(this.program.programId, subUserTradePDA);
202
+ ixs.push(yield this.program.methods
203
+ .createSubUserTrade(subUserTradePDA)
204
+ .accounts({
205
+ signer: this.provider.publicKey
206
+ })
207
+ .instruction());
208
+ }
208
209
  }
209
210
  if (token !== constants_1.TRD_MINT.toBase58()) {
210
211
  const { setupInstructions, swapIxs, addressLookupTableAccounts, trdAmount } = yield (0, swap_1.swap)({
@@ -2082,6 +2082,12 @@
2082
2082
  },
2083
2083
  {
2084
2084
  "name": "Closed"
2085
+ },
2086
+ {
2087
+ "name": "Claimed"
2088
+ },
2089
+ {
2090
+ "name": "Liquidated"
2085
2091
  }
2086
2092
  ]
2087
2093
  }
@@ -2639,6 +2639,12 @@ export type TriadProtocol = {
2639
2639
  },
2640
2640
  {
2641
2641
  name: 'closed';
2642
+ },
2643
+ {
2644
+ name: 'claimed';
2645
+ },
2646
+ {
2647
+ name: 'liquidated';
2642
2648
  }
2643
2649
  ];
2644
2650
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@triadxyz/triad-protocol",
3
- "version": "1.5.9-beta",
3
+ "version": "1.6.1-beta",
4
4
  "main": "./dist/index.js",
5
5
  "module": "./dist/index.js",
6
6
  "types": "./dist/index.d.ts",