@triadxyz/triad-protocol 2.2.7-beta → 2.2.8-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.
Files changed (7) hide show
  1. package/dist/trade.d.ts +2 -2
  2. package/dist/trade.js +2 -1
  3. package/dist/types/idl_triad_protocol.json +23 -16
  4. package/dist/types/trade.d.ts +1 -2
  5. package/dist/types/triad_protocol.d.ts +23 -16
  6. package/dist/utils/helpers.js +1 -2
  7. package/package.json +6 -8
package/dist/trade.d.ts CHANGED
@@ -48,7 +48,7 @@ export default class Trade {
48
48
  authority: PublicKey;
49
49
  totalDeposits: BN;
50
50
  totalWithdraws: BN;
51
- version: BN;
51
+ padding1: number[];
52
52
  orders: {
53
53
  ts: BN;
54
54
  orderId: BN;
@@ -104,7 +104,7 @@ export default class Trade {
104
104
  waiting: Record<string, never>;
105
105
  });
106
106
  price: BN;
107
- version: BN;
107
+ padding1: number[];
108
108
  totalShares: BN;
109
109
  orderType: ({
110
110
  limit?: never;
package/dist/trade.js CHANGED
@@ -129,7 +129,8 @@ class Trade {
129
129
  }
130
130
  let userTrade = null;
131
131
  try {
132
- userTrade = yield this.getUserTrade(this.program.provider.publicKey);
132
+ yield this.getUserTrade(this.program.provider.publicKey);
133
+ userTrade = (0, pda_1.getUserTradePDA)(this.program.programId, this.program.provider.publicKey);
133
134
  }
134
135
  catch (_a) { }
135
136
  ixs.push(yield this.program.methods
package/dist/types/idl_triad_protocol.json CHANGED
@@ -2557,6 +2557,11 @@
2557
2557
  "code": 6030,
2558
2558
  "name": "MarketAlreadyAggregated",
2559
2559
  "msg": "Market already aggregated"
2560
+ },
2561
+ {
2562
+ "code": 6031,
2563
+ "name": "MarketAlreadyPaidOut",
2564
+ "msg": "Market already paid out"
2560
2565
  }
2561
2566
  ],
2562
2567
  "types": [
@@ -2674,10 +2679,6 @@
2674
2679
  {
2675
2680
  "name": "timestamp",
2676
2681
  "type": "i64"
2677
- },
2678
- {
2679
- "name": "version",
2680
- "type": "u64"
2681
2682
  }
2682
2683
  ]
2683
2684
  }
@@ -2728,8 +2729,10 @@
2728
2729
  "type": "pubkey"
2729
2730
  },
2730
2731
  {
2731
- "name": "version",
2732
- "type": "u64"
2732
+ "name": "padding_1",
2733
+ "type": {
2734
+ "array": ["u8", 8]
2735
+ }
2733
2736
  },
2734
2737
  {
2735
2738
  "name": "ts",
@@ -3152,10 +3155,8 @@
3152
3155
  "type": "i64"
3153
3156
  },
3154
3157
  {
3155
- "name": "padding_1",
3156
- "type": {
3157
- "array": ["u8", 8]
3158
- }
3158
+ "name": "resolved_ts",
3159
+ "type": "i64"
3159
3160
  },
3160
3161
  {
3161
3162
  "name": "next_order_id",
@@ -3220,8 +3221,10 @@
3220
3221
  "type": "u16"
3221
3222
  },
3222
3223
  {
3223
- "name": "version",
3224
- "type": "u64"
3224
+ "name": "padding_2",
3225
+ "type": {
3226
+ "array": ["u8", 8]
3227
+ }
3225
3228
  },
3226
3229
  {
3227
3230
  "name": "pool_id",
@@ -3297,8 +3300,10 @@
3297
3300
  "type": "u64"
3298
3301
  },
3299
3302
  {
3300
- "name": "version",
3301
- "type": "u64"
3303
+ "name": "padding_1",
3304
+ "type": {
3305
+ "array": ["u8", 8]
3306
+ }
3302
3307
  },
3303
3308
  {
3304
3309
  "name": "total_shares",
@@ -3910,8 +3915,10 @@
3910
3915
  "type": "u64"
3911
3916
  },
3912
3917
  {
3913
- "name": "version",
3914
- "type": "u64"
3918
+ "name": "padding_1",
3919
+ "type": {
3920
+ "array": ["u8", 8]
3921
+ }
3915
3922
  },
3916
3923
  {
3917
3924
  "name": "orders",
package/dist/types/trade.d.ts CHANGED
@@ -13,6 +13,7 @@ export type Market = {
13
13
  volume: string;
14
14
  mint: string;
15
15
  updateTs: string;
16
+ resolvedTs: string;
16
17
  nextOrderId: string;
17
18
  feeBps: number;
18
19
  isAllowedToPayout: boolean;
@@ -27,7 +28,6 @@ export type Market = {
27
28
  marketLiquidityAtStart: string;
28
29
  payoutFee: number;
29
30
  customer: string;
30
- version: number;
31
31
  poolId: number;
32
32
  };
33
33
  export type UserTrade = {
@@ -62,7 +62,6 @@ export type Chest = {
62
62
  timer: number;
63
63
  isFinished: boolean;
64
64
  lastUser: string;
65
- version: number;
66
65
  ts: number;
67
66
  };
68
67
  export declare enum WinningDirection {
package/dist/types/triad_protocol.d.ts CHANGED
@@ -3597,6 +3597,11 @@ export type TriadProtocol = {
3597
3597
  code: 6030;
3598
3598
  name: 'marketAlreadyAggregated';
3599
3599
  msg: 'Market already aggregated';
3600
+ },
3601
+ {
3602
+ code: 6031;
3603
+ name: 'marketAlreadyPaidOut';
3604
+ msg: 'Market already paid out';
3600
3605
  }
3601
3606
  ];
3602
3607
  types: [
@@ -3714,10 +3719,6 @@ export type TriadProtocol = {
3714
3719
  {
3715
3720
  name: 'timestamp';
3716
3721
  type: 'i64';
3717
- },
3718
- {
3719
- name: 'version';
3720
- type: 'u64';
3721
3722
  }
3722
3723
  ];
3723
3724
  };
@@ -3768,8 +3769,10 @@ export type TriadProtocol = {
3768
3769
  type: 'pubkey';
3769
3770
  },
3770
3771
  {
3771
- name: 'version';
3772
- type: 'u64';
3772
+ name: 'padding1';
3773
+ type: {
3774
+ array: ['u8', 8];
3775
+ };
3773
3776
  },
3774
3777
  {
3775
3778
  name: 'ts';
@@ -4192,10 +4195,8 @@ export type TriadProtocol = {
4192
4195
  type: 'i64';
4193
4196
  },
4194
4197
  {
4195
- name: 'padding1';
4196
- type: {
4197
- array: ['u8', 8];
4198
- };
4198
+ name: 'resolvedTs';
4199
+ type: 'i64';
4199
4200
  },
4200
4201
  {
4201
4202
  name: 'nextOrderId';
@@ -4260,8 +4261,10 @@ export type TriadProtocol = {
4260
4261
  type: 'u16';
4261
4262
  },
4262
4263
  {
4263
- name: 'version';
4264
- type: 'u64';
4264
+ name: 'padding2';
4265
+ type: {
4266
+ array: ['u8', 8];
4267
+ };
4265
4268
  },
4266
4269
  {
4267
4270
  name: 'poolId';
@@ -4337,8 +4340,10 @@ export type TriadProtocol = {
4337
4340
  type: 'u64';
4338
4341
  },
4339
4342
  {
4340
- name: 'version';
4341
- type: 'u64';
4343
+ name: 'padding1';
4344
+ type: {
4345
+ array: ['u8', 8];
4346
+ };
4342
4347
  },
4343
4348
  {
4344
4349
  name: 'totalShares';
@@ -4950,8 +4955,10 @@ export type TriadProtocol = {
4950
4955
  type: 'u64';
4951
4956
  },
4952
4957
  {
4953
- name: 'version';
4954
- type: 'u64';
4958
+ name: 'padding1';
4959
+ type: {
4960
+ array: ['u8', 8];
4961
+ };
4955
4962
  },
4956
4963
  {
4957
4964
  name: 'orders';
package/dist/utils/helpers.js CHANGED
@@ -67,6 +67,7 @@ const formatMarket = (account, address) => {
67
67
  volume: account.volume.toString(),
68
68
  mint: account.mint.toString(),
69
69
  updateTs: account.updateTs.toString(),
70
+ resolvedTs: account.resolvedTs.toString(),
70
71
  nextOrderId: account.nextOrderId.toString(),
71
72
  feeBps: account.feeBps,
72
73
  isAllowedToPayout: account.isAllowedToPayout,
@@ -83,7 +84,6 @@ const formatMarket = (account, address) => {
83
84
  : '0',
84
85
  payoutFee: account.payoutFee,
85
86
  customer: account.customerId === 0 ? 'Triad' : account.customerId.toString(),
86
- version: account.version.toNumber(),
87
87
  poolId: account.poolId.toNumber()
88
88
  };
89
89
  };
@@ -129,7 +129,6 @@ const formatChest = (chest) => {
129
129
  timer: chest.timer.toNumber(),
130
130
  isFinished: chest.isFinished,
131
131
  lastUser: chest.lastUser.toString(),
132
- version: chest.version.toNumber(),
133
132
  ts: chest.ts.toNumber()
134
133
  };
135
134
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@triadxyz/triad-protocol",
3
- "version": "2.2.7-beta",
3
+ "version": "2.2.8-beta",
4
4
  "main": "./dist/index.js",
5
5
  "module": "./dist/index.js",
6
6
  "types": "./dist/index.d.ts",
@@ -31,18 +31,16 @@
31
31
  "license": "ISC",
32
32
  "dependencies": {
33
33
  "@coral-xyz/anchor": "0.30.1",
34
- "@shadow-drive/sdk": "^6.0.0",
35
34
  "@solana/spl-token": "0.4.8",
36
- "@solana/web3.js": "^1.95.3",
37
- "axios": "^1.5.1",
38
- "base64-js": "^1.5.1",
39
- "bn.js": "^5.2.1",
40
- "bs58": "5.0.0",
41
- "uuid": "^9.0.1"
35
+ "@solana/web3.js": "1.95.3",
36
+ "axios": "1.9.0",
37
+ "bn.js": "5.2.2",
38
+ "bs58": "6.0.0"
42
39
  },
43
40
  "devDependencies": {
44
41
  "@typescript-eslint/eslint-plugin": "6.7.3",
45
42
  "@typescript-eslint/parser": "6.7.3",
43
+ "@types/bn.js": "^5.1.0",
46
44
  "eslint": "8.50.0",
47
45
  "eslint-config-prettier": "9.0.0",
48
46
  "eslint-plugin-prettier": "5.0.0",