@triadxyz/triad-protocol 2.2.6-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 +8 -1
  3. package/dist/types/idl_triad_protocol.json +28 -16
  4. package/dist/types/trade.d.ts +1 -2
  5. package/dist/types/triad_protocol.d.ts +28 -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
@@ -127,6 +127,12 @@ class Trade {
127
127
  if (poolId) {
128
128
  poolPDA = (0, pda_1.getPoolPDA)(this.program.programId, poolId);
129
129
  }
130
+ let userTrade = null;
131
+ try {
132
+ yield this.getUserTrade(this.program.provider.publicKey);
133
+ userTrade = (0, pda_1.getUserTradePDA)(this.program.programId, this.program.provider.publicKey);
134
+ }
135
+ catch (_a) { }
130
136
  ixs.push(yield this.program.methods
131
137
  .createMarket({
132
138
  marketId: new bn_js_1.default(marketId),
@@ -141,7 +147,8 @@ class Trade {
141
147
  mint,
142
148
  tokenProgram: (0, helpers_1.getTokenProgram)(mint),
143
149
  customer,
144
- pool: poolPDA
150
+ pool: poolPDA,
151
+ userTrade
145
152
  })
146
153
  .instruction());
147
154
  return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
package/dist/types/idl_triad_protocol.json CHANGED
@@ -1083,6 +1083,11 @@
1083
1083
  "writable": true,
1084
1084
  "optional": true
1085
1085
  },
1086
+ {
1087
+ "name": "user_trade",
1088
+ "writable": true,
1089
+ "optional": true
1090
+ },
1086
1091
  {
1087
1092
  "name": "pool",
1088
1093
  "writable": true,
@@ -2552,6 +2557,11 @@
2552
2557
  "code": 6030,
2553
2558
  "name": "MarketAlreadyAggregated",
2554
2559
  "msg": "Market already aggregated"
2560
+ },
2561
+ {
2562
+ "code": 6031,
2563
+ "name": "MarketAlreadyPaidOut",
2564
+ "msg": "Market already paid out"
2555
2565
  }
2556
2566
  ],
2557
2567
  "types": [
@@ -2669,10 +2679,6 @@
2669
2679
  {
2670
2680
  "name": "timestamp",
2671
2681
  "type": "i64"
2672
- },
2673
- {
2674
- "name": "version",
2675
- "type": "u64"
2676
2682
  }
2677
2683
  ]
2678
2684
  }
@@ -2723,8 +2729,10 @@
2723
2729
  "type": "pubkey"
2724
2730
  },
2725
2731
  {
2726
- "name": "version",
2727
- "type": "u64"
2732
+ "name": "padding_1",
2733
+ "type": {
2734
+ "array": ["u8", 8]
2735
+ }
2728
2736
  },
2729
2737
  {
2730
2738
  "name": "ts",
@@ -3147,10 +3155,8 @@
3147
3155
  "type": "i64"
3148
3156
  },
3149
3157
  {
3150
- "name": "padding_1",
3151
- "type": {
3152
- "array": ["u8", 8]
3153
- }
3158
+ "name": "resolved_ts",
3159
+ "type": "i64"
3154
3160
  },
3155
3161
  {
3156
3162
  "name": "next_order_id",
@@ -3215,8 +3221,10 @@
3215
3221
  "type": "u16"
3216
3222
  },
3217
3223
  {
3218
- "name": "version",
3219
- "type": "u64"
3224
+ "name": "padding_2",
3225
+ "type": {
3226
+ "array": ["u8", 8]
3227
+ }
3220
3228
  },
3221
3229
  {
3222
3230
  "name": "pool_id",
@@ -3292,8 +3300,10 @@
3292
3300
  "type": "u64"
3293
3301
  },
3294
3302
  {
3295
- "name": "version",
3296
- "type": "u64"
3303
+ "name": "padding_1",
3304
+ "type": {
3305
+ "array": ["u8", 8]
3306
+ }
3297
3307
  },
3298
3308
  {
3299
3309
  "name": "total_shares",
@@ -3905,8 +3915,10 @@
3905
3915
  "type": "u64"
3906
3916
  },
3907
3917
  {
3908
- "name": "version",
3909
- "type": "u64"
3918
+ "name": "padding_1",
3919
+ "type": {
3920
+ "array": ["u8", 8]
3921
+ }
3910
3922
  },
3911
3923
  {
3912
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
@@ -1652,6 +1652,11 @@ export type TriadProtocol = {
1652
1652
  writable: true;
1653
1653
  optional: true;
1654
1654
  },
1655
+ {
1656
+ name: 'userTrade';
1657
+ writable: true;
1658
+ optional: true;
1659
+ },
1655
1660
  {
1656
1661
  name: 'pool';
1657
1662
  writable: true;
@@ -3592,6 +3597,11 @@ export type TriadProtocol = {
3592
3597
  code: 6030;
3593
3598
  name: 'marketAlreadyAggregated';
3594
3599
  msg: 'Market already aggregated';
3600
+ },
3601
+ {
3602
+ code: 6031;
3603
+ name: 'marketAlreadyPaidOut';
3604
+ msg: 'Market already paid out';
3595
3605
  }
3596
3606
  ];
3597
3607
  types: [
@@ -3709,10 +3719,6 @@ export type TriadProtocol = {
3709
3719
  {
3710
3720
  name: 'timestamp';
3711
3721
  type: 'i64';
3712
- },
3713
- {
3714
- name: 'version';
3715
- type: 'u64';
3716
3722
  }
3717
3723
  ];
3718
3724
  };
@@ -3763,8 +3769,10 @@ export type TriadProtocol = {
3763
3769
  type: 'pubkey';
3764
3770
  },
3765
3771
  {
3766
- name: 'version';
3767
- type: 'u64';
3772
+ name: 'padding1';
3773
+ type: {
3774
+ array: ['u8', 8];
3775
+ };
3768
3776
  },
3769
3777
  {
3770
3778
  name: 'ts';
@@ -4187,10 +4195,8 @@ export type TriadProtocol = {
4187
4195
  type: 'i64';
4188
4196
  },
4189
4197
  {
4190
- name: 'padding1';
4191
- type: {
4192
- array: ['u8', 8];
4193
- };
4198
+ name: 'resolvedTs';
4199
+ type: 'i64';
4194
4200
  },
4195
4201
  {
4196
4202
  name: 'nextOrderId';
@@ -4255,8 +4261,10 @@ export type TriadProtocol = {
4255
4261
  type: 'u16';
4256
4262
  },
4257
4263
  {
4258
- name: 'version';
4259
- type: 'u64';
4264
+ name: 'padding2';
4265
+ type: {
4266
+ array: ['u8', 8];
4267
+ };
4260
4268
  },
4261
4269
  {
4262
4270
  name: 'poolId';
@@ -4332,8 +4340,10 @@ export type TriadProtocol = {
4332
4340
  type: 'u64';
4333
4341
  },
4334
4342
  {
4335
- name: 'version';
4336
- type: 'u64';
4343
+ name: 'padding1';
4344
+ type: {
4345
+ array: ['u8', 8];
4346
+ };
4337
4347
  },
4338
4348
  {
4339
4349
  name: 'totalShares';
@@ -4945,8 +4955,10 @@ export type TriadProtocol = {
4945
4955
  type: 'u64';
4946
4956
  },
4947
4957
  {
4948
- name: 'version';
4949
- type: 'u64';
4958
+ name: 'padding1';
4959
+ type: {
4960
+ array: ['u8', 8];
4961
+ };
4950
4962
  },
4951
4963
  {
4952
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.6-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",