@triadxyz/triad-protocol 0.1.9-beta → 0.2.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.
Files changed (11) hide show
  1. package/dist/index.d.ts +4 -0
  2. package/dist/index.js +8 -3
  3. package/dist/stake.d.ts +1 -1
  4. package/dist/stake.js +2 -15
  5. package/dist/test.js +3 -8
  6. package/dist/types/idl_triad_protocol.json +16 -248
  7. package/dist/types/stake.d.ts +1 -3
  8. package/dist/types/triad_protocol.d.ts +446 -248
  9. package/dist/utils/helpers.d.ts +0 -1
  10. package/dist/utils/helpers.js +1 -6
  11. package/package.json +1 -1
package/dist/index.d.ts CHANGED
@@ -16,6 +16,10 @@ export default class TriadProtocolClient {
16
16
  * Get all Users
17
17
  */
18
18
  getUsers: () => Promise<import("./types/stake").UserResponse[]>;
19
+ /**
20
+ * Check if user has referral
21
+ * @param referral - User referral
22
+ */
19
23
  hasReferral: (referral: string) => Promise<boolean>;
20
24
  getUserPositions: (userWallet: PublicKey) => Promise<{}[]>;
21
25
  /**
package/dist/index.js CHANGED
@@ -26,8 +26,14 @@ class TriadProtocolClient {
26
26
  */
27
27
  this.getUsers = () => __awaiter(this, void 0, void 0, function* () {
28
28
  const response = yield this.program.account.user.all();
29
- return response.map((item) => (0, helpers_1.formatUser)(item.account));
29
+ return response
30
+ .map((item) => (0, helpers_1.formatUser)(item.account))
31
+ .sort((a, b) => b.referred - a.referred);
30
32
  });
33
+ /**
34
+ * Check if user has referral
35
+ * @param referral - User referral
36
+ */
31
37
  this.hasReferral = (referral) => __awaiter(this, void 0, void 0, function* () {
32
38
  try {
33
39
  yield this.program.account.user.fetch((0, helpers_1.getUserAddressSync)(this.program.programId, referral));
@@ -69,8 +75,7 @@ class TriadProtocolClient {
69
75
  const referralPDA = (0, helpers_1.getUserAddressSync)(this.program.programId, referral);
70
76
  const method = this.program.methods
71
77
  .createUser({
72
- name,
73
- referral: referralPDA
78
+ name
74
79
  })
75
80
  .accounts({
76
81
  signer: wallet,
package/dist/stake.d.ts CHANGED
@@ -105,7 +105,7 @@ export default class Stake {
105
105
  * @param week - Current week rewards (Starts from 0)
106
106
  *
107
107
  */
108
- updateStakeVaultStatus({ wallet, isLocked, week, stakeVault }: UpdateStakeVaultStatusArgs, options?: RpcOptions): Promise<string>;
108
+ updateStakeVaultStatus({ wallet, isLocked, stakeVault, initTs }: UpdateStakeVaultStatusArgs, options?: RpcOptions): Promise<string>;
109
109
  /**
110
110
  * Claim Stake Rewards
111
111
  * @param wallet - User wallet
package/dist/stake.js CHANGED
@@ -118,12 +118,10 @@ class Stake {
118
118
  */
119
119
  stakeNft({ wallet, stakeVault, items }, options) {
120
120
  return __awaiter(this, void 0, void 0, function* () {
121
- const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
122
121
  let ixs = [];
123
122
  for (let i = 0; i < items.length; i++) {
124
123
  let item = items[i];
125
124
  const FromAta = (0, helpers_1.getATASync)(wallet, item.mint);
126
- const ToAta = (0, helpers_1.getATASync)(StakeVault, item.mint);
127
125
  ixs.push(yield this.program.methods
128
126
  .stakeNft({
129
127
  name: item.name,
@@ -131,7 +129,6 @@ class Stake {
131
129
  })
132
130
  .accounts({
133
131
  signer: wallet,
134
- toAta: ToAta,
135
132
  fromAta: FromAta,
136
133
  mint: item.mint
137
134
  })
@@ -165,10 +162,8 @@ class Stake {
165
162
  */
166
163
  stakeToken({ name, wallet, stakeVault, amount }, options) {
167
164
  return __awaiter(this, void 0, void 0, function* () {
168
- const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
169
165
  const ttriad = new web3_js_1.PublicKey(constants_1.TTRIAD_MINT);
170
166
  const FromAta = (0, helpers_1.getATASync)(wallet, ttriad);
171
- const ToAta = (0, helpers_1.getATASync)(StakeVault, ttriad);
172
167
  const method = this.program.methods
173
168
  .stakeToken({
174
169
  name,
@@ -177,7 +172,6 @@ class Stake {
177
172
  })
178
173
  .accounts({
179
174
  signer: wallet,
180
- toAta: ToAta,
181
175
  fromAta: FromAta,
182
176
  mint: ttriad
183
177
  });
@@ -229,8 +223,6 @@ class Stake {
229
223
  */
230
224
  depositStakeRewards({ wallet, mint, amount, stakeVault }, options) {
231
225
  return __awaiter(this, void 0, void 0, function* () {
232
- const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
233
- const ToAta = (0, helpers_1.getATASync)(StakeVault, mint);
234
226
  const FromAta = (0, helpers_1.getATASync)(wallet, mint);
235
227
  const method = this.program.methods
236
228
  .depositStakeRewards({
@@ -240,7 +232,6 @@ class Stake {
240
232
  .accounts({
241
233
  signer: wallet,
242
234
  fromAta: FromAta,
243
- toAta: ToAta,
244
235
  mint: mint
245
236
  });
246
237
  if (options === null || options === void 0 ? void 0 : options.microLamports) {
@@ -292,13 +283,11 @@ class Stake {
292
283
  return __awaiter(this, void 0, void 0, function* () {
293
284
  const stakeVaultPDA = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
294
285
  const FromAta = (0, helpers_1.getATASync)(stakeVaultPDA, mint);
295
- const ToAta = (0, helpers_1.getATASync)(wallet, mint);
296
286
  const stakePDA = (0, helpers_1.getStakeAddressSync)(this.program.programId, wallet, name);
297
287
  const method = this.program.methods.withdrawStake().accounts({
298
288
  signer: wallet,
299
289
  fromAta: FromAta,
300
290
  stake: stakePDA,
301
- toAta: ToAta,
302
291
  stakeVault: stakeVaultPDA,
303
292
  admin: new web3_js_1.PublicKey('82ppCojm3yrEKgdpH8B5AmBJTU1r1uAWXFWhxvPs9UCR'),
304
293
  mint: mint
@@ -321,13 +310,13 @@ class Stake {
321
310
  * @param week - Current week rewards (Starts from 0)
322
311
  *
323
312
  */
324
- updateStakeVaultStatus({ wallet, isLocked, week, stakeVault }, options) {
313
+ updateStakeVaultStatus({ wallet, isLocked, stakeVault, initTs }, options) {
325
314
  return __awaiter(this, void 0, void 0, function* () {
326
315
  const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
327
316
  const method = this.program.methods
328
317
  .updateStakeVaultStatus({
329
318
  isLocked,
330
- week
319
+ initTs: new anchor_1.BN(initTs)
331
320
  })
332
321
  .accounts({
333
322
  signer: wallet,
@@ -355,12 +344,10 @@ class Stake {
355
344
  return __awaiter(this, void 0, void 0, function* () {
356
345
  const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
357
346
  const Stake = (0, helpers_1.getStakeAddressSync)(this.program.programId, wallet, nftName);
358
- const ToATA = (0, helpers_1.getATASync)(wallet, mint);
359
347
  const FromAta = (0, helpers_1.getATASync)(StakeVault, mint);
360
348
  const method = this.program.methods.claimStake().accounts({
361
349
  signer: wallet,
362
350
  fromAta: FromAta,
363
- toAta: ToATA,
364
351
  mint: mint,
365
352
  stake: Stake,
366
353
  stakeVault: StakeVault
package/dist/test.js CHANGED
@@ -27,15 +27,14 @@ const updateStakeVaultStatus = () => __awaiter(void 0, void 0, void 0, function*
27
27
  const response = yield triadProtocol.stake.updateStakeVaultStatus({
28
28
  wallet: wallet.publicKey,
29
29
  isLocked: false,
30
- week: 4,
31
- stakeVault: constants_1.STAKE_SEASON
30
+ stakeVault: constants_1.STAKE_SEASON,
31
+ initTs: 0
32
32
  }, {
33
33
  skipPreflight: true,
34
34
  microLamports: 10000
35
35
  });
36
36
  console.log(response);
37
37
  });
38
- updateStakeVaultStatus();
39
38
  const getStake = () => __awaiter(void 0, void 0, void 0, function* () {
40
39
  const response = yield triadProtocol.stake.getStakeByWallet(new web3_js_1.PublicKey('BCTdjdcjMiECGFbF5Ps15yjLRPzy5YZGJNa4VdGRbhjB'), constants_1.STAKE_SEASON);
41
40
  const stakeVaults = yield triadProtocol.stake.getStakeVaults();
@@ -46,11 +45,7 @@ const getUsers = () => __awaiter(void 0, void 0, void 0, function* () {
46
45
  const response = yield triadProtocol.getUsers();
47
46
  console.log(response);
48
47
  });
49
- const getStakes = () => __awaiter(void 0, void 0, void 0, function* () {
50
- const response = yield triadProtocol.stake.getStakes(constants_1.STAKE_SEASON);
51
- console.log(response);
52
- fs_1.default.writeFileSync('stakes.json', JSON.stringify(response));
53
- });
48
+ getUsers();
54
49
  const getReferral = () => __awaiter(void 0, void 0, void 0, function* () {
55
50
  const response = yield triadProtocol.hasReferral('a');
56
51
  console.log(response);
package/dist/types/idl_triad_protocol.json CHANGED
@@ -431,88 +431,6 @@
431
431
  }
432
432
  ]
433
433
  },
434
- {
435
- "name": "migrate_stake",
436
- "discriminator": [178, 5, 26, 85, 56, 20, 153, 160],
437
- "accounts": [
438
- {
439
- "name": "signer",
440
- "writable": true,
441
- "signer": true
442
- },
443
- {
444
- "name": "stake_vault",
445
- "writable": true,
446
- "pda": {
447
- "seeds": [
448
- {
449
- "kind": "const",
450
- "value": [115, 116, 97, 107, 101, 95, 118, 97, 117, 108, 116]
451
- },
452
- {
453
- "kind": "arg",
454
- "path": "args.stake_vault"
455
- }
456
- ]
457
- }
458
- },
459
- {
460
- "name": "stake_v1",
461
- "writable": true
462
- },
463
- {
464
- "name": "stake_v2",
465
- "writable": true,
466
- "pda": {
467
- "seeds": [
468
- {
469
- "kind": "const",
470
- "value": [115, 116, 97, 107, 101]
471
- },
472
- {
473
- "kind": "account",
474
- "path": "stake_v1.authority",
475
- "account": "Stake"
476
- },
477
- {
478
- "kind": "arg",
479
- "path": "args.name"
480
- }
481
- ]
482
- }
483
- },
484
- {
485
- "name": "mint",
486
- "writable": true
487
- },
488
- {
489
- "name": "nft_rewards",
490
- "writable": true
491
- },
492
- {
493
- "name": "token_program",
494
- "address": "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
495
- },
496
- {
497
- "name": "associated_token_program",
498
- "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
499
- },
500
- {
501
- "name": "system_program",
502
- "address": "11111111111111111111111111111111"
503
- }
504
- ],
505
- "args": [
506
- {
507
- "name": "args",
508
- "type": {
509
- "defined": {
510
- "name": "MigrateStakeArgs"
511
- }
512
- }
513
- }
514
- ]
515
- },
516
434
  {
517
435
  "name": "open_position",
518
436
  "discriminator": [135, 128, 47, 77, 15, 152, 240, 49],
@@ -963,14 +881,6 @@
963
881
  }
964
882
  ],
965
883
  "accounts": [
966
- {
967
- "name": "NFTRewards",
968
- "discriminator": [210, 99, 18, 65, 58, 128, 167, 91]
969
- },
970
- {
971
- "name": "Stake",
972
- "discriminator": [150, 197, 176, 29, 55, 132, 112, 149]
973
- },
974
884
  {
975
885
  "name": "StakeV2",
976
886
  "discriminator": [207, 98, 130, 13, 118, 181, 238, 47]
@@ -1161,26 +1071,6 @@
1161
1071
  ]
1162
1072
  }
1163
1073
  },
1164
- {
1165
- "name": "Collection",
1166
- "type": {
1167
- "kind": "enum",
1168
- "variants": [
1169
- {
1170
- "name": "COLETA"
1171
- },
1172
- {
1173
- "name": "UNDEAD"
1174
- },
1175
- {
1176
- "name": "ALLIGATORS"
1177
- },
1178
- {
1179
- "name": "PYTH"
1180
- }
1181
- ]
1182
- }
1183
- },
1184
1074
  {
1185
1075
  "name": "CreateTickerArgs",
1186
1076
  "type": {
@@ -1205,10 +1095,6 @@
1205
1095
  {
1206
1096
  "name": "name",
1207
1097
  "type": "string"
1208
- },
1209
- {
1210
- "name": "referral",
1211
- "type": "pubkey"
1212
1098
  }
1213
1099
  ]
1214
1100
  }
@@ -1253,50 +1139,6 @@
1253
1139
  ]
1254
1140
  }
1255
1141
  },
1256
- {
1257
- "name": "MigrateStakeArgs",
1258
- "type": {
1259
- "kind": "struct",
1260
- "fields": [
1261
- {
1262
- "name": "name",
1263
- "type": "string"
1264
- },
1265
- {
1266
- "name": "stake_vault",
1267
- "type": "string"
1268
- }
1269
- ]
1270
- }
1271
- },
1272
- {
1273
- "name": "NFTRewards",
1274
- "type": {
1275
- "kind": "struct",
1276
- "fields": [
1277
- {
1278
- "name": "stake",
1279
- "type": "pubkey"
1280
- },
1281
- {
1282
- "name": "daily_rewards",
1283
- "type": {
1284
- "array": ["u64", 30]
1285
- }
1286
- },
1287
- {
1288
- "name": "weekly_rewards_paid",
1289
- "type": {
1290
- "array": ["bool", 5]
1291
- }
1292
- },
1293
- {
1294
- "name": "apr",
1295
- "type": "f32"
1296
- }
1297
- ]
1298
- }
1299
- },
1300
1142
  {
1301
1143
  "name": "OpenPositionArgs",
1302
1144
  "type": {
@@ -1377,94 +1219,6 @@
1377
1219
  ]
1378
1220
  }
1379
1221
  },
1380
- {
1381
- "name": "Rarity",
1382
- "type": {
1383
- "kind": "enum",
1384
- "variants": [
1385
- {
1386
- "name": "COMMON"
1387
- },
1388
- {
1389
- "name": "UNCOMMON"
1390
- },
1391
- {
1392
- "name": "RARE"
1393
- },
1394
- {
1395
- "name": "EPIC"
1396
- },
1397
- {
1398
- "name": "LEGENDARY"
1399
- },
1400
- {
1401
- "name": "MYTHIC"
1402
- }
1403
- ]
1404
- }
1405
- },
1406
- {
1407
- "name": "Stake",
1408
- "type": {
1409
- "kind": "struct",
1410
- "fields": [
1411
- {
1412
- "name": "bump",
1413
- "type": "u8"
1414
- },
1415
- {
1416
- "name": "authority",
1417
- "type": "pubkey"
1418
- },
1419
- {
1420
- "name": "init_ts",
1421
- "type": "i64"
1422
- },
1423
- {
1424
- "name": "is_locked",
1425
- "type": "bool"
1426
- },
1427
- {
1428
- "name": "withdraw_ts",
1429
- "type": "i64"
1430
- },
1431
- {
1432
- "name": "name",
1433
- "type": "string"
1434
- },
1435
- {
1436
- "name": "collections",
1437
- "type": {
1438
- "vec": {
1439
- "defined": {
1440
- "name": "Collection"
1441
- }
1442
- }
1443
- }
1444
- },
1445
- {
1446
- "name": "rarity",
1447
- "type": {
1448
- "defined": {
1449
- "name": "Rarity"
1450
- }
1451
- }
1452
- },
1453
- {
1454
- "name": "mint",
1455
- "type": "pubkey"
1456
- },
1457
- {
1458
- "name": "stake_vault",
1459
- "type": "pubkey"
1460
- },
1461
- {
1462
- "name": "stake_rewards",
1463
- "type": "pubkey"
1464
- }
1465
- ]
1466
- }
1467
- },
1468
1222
  {
1469
1223
  "name": "StakeNFTArgs",
1470
1224
  "type": {
@@ -1705,8 +1459,8 @@
1705
1459
  "type": "bool"
1706
1460
  },
1707
1461
  {
1708
- "name": "week",
1709
- "type": "u8"
1462
+ "name": "init_ts",
1463
+ "type": "i64"
1710
1464
  }
1711
1465
  ]
1712
1466
  }
@@ -1751,6 +1505,20 @@
1751
1505
  {
1752
1506
  "name": "name",
1753
1507
  "type": "string"
1508
+ },
1509
+ {
1510
+ "name": "swaps",
1511
+ "type": "i16"
1512
+ },
1513
+ {
1514
+ "name": "swaps_made",
1515
+ "type": "i16"
1516
+ },
1517
+ {
1518
+ "name": "padding",
1519
+ "type": {
1520
+ "array": ["u8", 48]
1521
+ }
1754
1522
  }
1755
1523
  ]
1756
1524
  }
package/dist/types/stake.d.ts CHANGED
@@ -2,10 +2,8 @@ import { PublicKey } from '@solana/web3.js';
2
2
  import BN from 'bn.js';
3
3
  export type Collection = 'alligators' | 'coleta' | 'undead' | 'pyth';
4
4
  export type StakeNftArgs = {
5
- name: string;
6
5
  wallet: PublicKey;
7
6
  stakeVault: string;
8
- mint: PublicKey;
9
7
  items: {
10
8
  mint: PublicKey;
11
9
  name: string;
@@ -53,8 +51,8 @@ export type WithdrawArgs = {
53
51
  export type UpdateStakeVaultStatusArgs = {
54
52
  wallet: PublicKey;
55
53
  isLocked: boolean;
56
- week: number;
57
54
  stakeVault: string;
55
+ initTs: number;
58
56
  };
59
57
  export type ClaimStakeRewardsArgs = {
60
58
  wallet: PublicKey;
package/dist/types/triad_protocol.d.ts CHANGED
@@ -40,6 +40,92 @@ export type TriadProtocol = {
40
40
  {
41
41
  name: 'toAta';
42
42
  writable: true;
43
+ pda: {
44
+ seeds: [
45
+ {
46
+ kind: 'account';
47
+ path: 'signer';
48
+ },
49
+ {
50
+ kind: 'const';
51
+ value: [
52
+ 6,
53
+ 221,
54
+ 246,
55
+ 225,
56
+ 215,
57
+ 101,
58
+ 161,
59
+ 147,
60
+ 217,
61
+ 203,
62
+ 225,
63
+ 70,
64
+ 206,
65
+ 235,
66
+ 121,
67
+ 172,
68
+ 28,
69
+ 180,
70
+ 133,
71
+ 237,
72
+ 95,
73
+ 91,
74
+ 55,
75
+ 145,
76
+ 58,
77
+ 140,
78
+ 245,
79
+ 133,
80
+ 126,
81
+ 255,
82
+ 0,
83
+ 169
84
+ ];
85
+ },
86
+ {
87
+ kind: 'account';
88
+ path: 'mint';
89
+ }
90
+ ];
91
+ program: {
92
+ kind: 'const';
93
+ value: [
94
+ 140,
95
+ 151,
96
+ 37,
97
+ 143,
98
+ 78,
99
+ 36,
100
+ 137,
101
+ 241,
102
+ 187,
103
+ 61,
104
+ 16,
105
+ 41,
106
+ 20,
107
+ 142,
108
+ 13,
109
+ 131,
110
+ 11,
111
+ 90,
112
+ 19,
113
+ 153,
114
+ 218,
115
+ 255,
116
+ 16,
117
+ 132,
118
+ 4,
119
+ 142,
120
+ 123,
121
+ 216,
122
+ 219,
123
+ 233,
124
+ 248,
125
+ 89
126
+ ];
127
+ };
128
+ };
43
129
  },
44
130
  {
45
131
  name: 'tokenProgram';
@@ -340,6 +426,92 @@ export type TriadProtocol = {
340
426
  {
341
427
  name: 'toAta';
342
428
  writable: true;
429
+ pda: {
430
+ seeds: [
431
+ {
432
+ kind: 'account';
433
+ path: 'stakeVault';
434
+ },
435
+ {
436
+ kind: 'const';
437
+ value: [
438
+ 6,
439
+ 221,
440
+ 246,
441
+ 225,
442
+ 215,
443
+ 101,
444
+ 161,
445
+ 147,
446
+ 217,
447
+ 203,
448
+ 225,
449
+ 70,
450
+ 206,
451
+ 235,
452
+ 121,
453
+ 172,
454
+ 28,
455
+ 180,
456
+ 133,
457
+ 237,
458
+ 95,
459
+ 91,
460
+ 55,
461
+ 145,
462
+ 58,
463
+ 140,
464
+ 245,
465
+ 133,
466
+ 126,
467
+ 255,
468
+ 0,
469
+ 169
470
+ ];
471
+ },
472
+ {
473
+ kind: 'account';
474
+ path: 'mint';
475
+ }
476
+ ];
477
+ program: {
478
+ kind: 'const';
479
+ value: [
480
+ 140,
481
+ 151,
482
+ 37,
483
+ 143,
484
+ 78,
485
+ 36,
486
+ 137,
487
+ 241,
488
+ 187,
489
+ 61,
490
+ 16,
491
+ 41,
492
+ 20,
493
+ 142,
494
+ 13,
495
+ 131,
496
+ 11,
497
+ 90,
498
+ 19,
499
+ 153,
500
+ 218,
501
+ 255,
502
+ 16,
503
+ 132,
504
+ 4,
505
+ 142,
506
+ 123,
507
+ 216,
508
+ 219,
509
+ 233,
510
+ 248,
511
+ 89
512
+ ];
513
+ };
514
+ };
343
515
  },
344
516
  {
345
517
  name: 'tokenProgram';
@@ -410,88 +582,6 @@ export type TriadProtocol = {
410
582
  }
411
583
  ];
412
584
  },
413
- {
414
- name: 'migrateStake';
415
- discriminator: [178, 5, 26, 85, 56, 20, 153, 160];
416
- accounts: [
417
- {
418
- name: 'signer';
419
- writable: true;
420
- signer: true;
421
- },
422
- {
423
- name: 'stakeVault';
424
- writable: true;
425
- pda: {
426
- seeds: [
427
- {
428
- kind: 'const';
429
- value: [115, 116, 97, 107, 101, 95, 118, 97, 117, 108, 116];
430
- },
431
- {
432
- kind: 'arg';
433
- path: 'args.stake_vault';
434
- }
435
- ];
436
- };
437
- },
438
- {
439
- name: 'stakeV1';
440
- writable: true;
441
- },
442
- {
443
- name: 'stakeV2';
444
- writable: true;
445
- pda: {
446
- seeds: [
447
- {
448
- kind: 'const';
449
- value: [115, 116, 97, 107, 101];
450
- },
451
- {
452
- kind: 'account';
453
- path: 'stake_v1.authority';
454
- account: 'stake';
455
- },
456
- {
457
- kind: 'arg';
458
- path: 'args.name';
459
- }
460
- ];
461
- };
462
- },
463
- {
464
- name: 'mint';
465
- writable: true;
466
- },
467
- {
468
- name: 'nftRewards';
469
- writable: true;
470
- },
471
- {
472
- name: 'tokenProgram';
473
- address: 'TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb';
474
- },
475
- {
476
- name: 'associatedTokenProgram';
477
- address: 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
478
- },
479
- {
480
- name: 'systemProgram';
481
- address: '11111111111111111111111111111111';
482
- }
483
- ];
484
- args: [
485
- {
486
- name: 'args';
487
- type: {
488
- defined: {
489
- name: 'migrateStakeArgs';
490
- };
491
- };
492
- }
493
- ];
494
- },
495
585
  {
496
586
  name: 'openPosition';
497
587
  discriminator: [135, 128, 47, 77, 15, 152, 240, 49];
@@ -661,6 +751,92 @@ export type TriadProtocol = {
661
751
  {
662
752
  name: 'toAta';
663
753
  writable: true;
754
+ pda: {
755
+ seeds: [
756
+ {
757
+ kind: 'account';
758
+ path: 'stakeVault';
759
+ },
760
+ {
761
+ kind: 'const';
762
+ value: [
763
+ 6,
764
+ 221,
765
+ 246,
766
+ 225,
767
+ 215,
768
+ 101,
769
+ 161,
770
+ 147,
771
+ 217,
772
+ 203,
773
+ 225,
774
+ 70,
775
+ 206,
776
+ 235,
777
+ 121,
778
+ 172,
779
+ 28,
780
+ 180,
781
+ 133,
782
+ 237,
783
+ 95,
784
+ 91,
785
+ 55,
786
+ 145,
787
+ 58,
788
+ 140,
789
+ 245,
790
+ 133,
791
+ 126,
792
+ 255,
793
+ 0,
794
+ 169
795
+ ];
796
+ },
797
+ {
798
+ kind: 'account';
799
+ path: 'mint';
800
+ }
801
+ ];
802
+ program: {
803
+ kind: 'const';
804
+ value: [
805
+ 140,
806
+ 151,
807
+ 37,
808
+ 143,
809
+ 78,
810
+ 36,
811
+ 137,
812
+ 241,
813
+ 187,
814
+ 61,
815
+ 16,
816
+ 41,
817
+ 20,
818
+ 142,
819
+ 13,
820
+ 131,
821
+ 11,
822
+ 90,
823
+ 19,
824
+ 153,
825
+ 218,
826
+ 255,
827
+ 16,
828
+ 132,
829
+ 4,
830
+ 142,
831
+ 123,
832
+ 216,
833
+ 219,
834
+ 233,
835
+ 248,
836
+ 89
837
+ ];
838
+ };
839
+ };
664
840
  },
665
841
  {
666
842
  name: 'tokenProgram';
@@ -742,6 +918,92 @@ export type TriadProtocol = {
742
918
  {
743
919
  name: 'toAta';
744
920
  writable: true;
921
+ pda: {
922
+ seeds: [
923
+ {
924
+ kind: 'account';
925
+ path: 'stakeVault';
926
+ },
927
+ {
928
+ kind: 'const';
929
+ value: [
930
+ 6,
931
+ 221,
932
+ 246,
933
+ 225,
934
+ 215,
935
+ 101,
936
+ 161,
937
+ 147,
938
+ 217,
939
+ 203,
940
+ 225,
941
+ 70,
942
+ 206,
943
+ 235,
944
+ 121,
945
+ 172,
946
+ 28,
947
+ 180,
948
+ 133,
949
+ 237,
950
+ 95,
951
+ 91,
952
+ 55,
953
+ 145,
954
+ 58,
955
+ 140,
956
+ 245,
957
+ 133,
958
+ 126,
959
+ 255,
960
+ 0,
961
+ 169
962
+ ];
963
+ },
964
+ {
965
+ kind: 'account';
966
+ path: 'mint';
967
+ }
968
+ ];
969
+ program: {
970
+ kind: 'const';
971
+ value: [
972
+ 140,
973
+ 151,
974
+ 37,
975
+ 143,
976
+ 78,
977
+ 36,
978
+ 137,
979
+ 241,
980
+ 187,
981
+ 61,
982
+ 16,
983
+ 41,
984
+ 20,
985
+ 142,
986
+ 13,
987
+ 131,
988
+ 11,
989
+ 90,
990
+ 19,
991
+ 153,
992
+ 218,
993
+ 255,
994
+ 16,
995
+ 132,
996
+ 4,
997
+ 142,
998
+ 123,
999
+ 216,
1000
+ 219,
1001
+ 233,
1002
+ 248,
1003
+ 89
1004
+ ];
1005
+ };
1006
+ };
745
1007
  },
746
1008
  {
747
1009
  name: 'tokenProgram';
@@ -857,6 +1119,92 @@ export type TriadProtocol = {
857
1119
  {
858
1120
  name: 'toAta';
859
1121
  writable: true;
1122
+ pda: {
1123
+ seeds: [
1124
+ {
1125
+ kind: 'account';
1126
+ path: 'signer';
1127
+ },
1128
+ {
1129
+ kind: 'const';
1130
+ value: [
1131
+ 6,
1132
+ 221,
1133
+ 246,
1134
+ 225,
1135
+ 215,
1136
+ 101,
1137
+ 161,
1138
+ 147,
1139
+ 217,
1140
+ 203,
1141
+ 225,
1142
+ 70,
1143
+ 206,
1144
+ 235,
1145
+ 121,
1146
+ 172,
1147
+ 28,
1148
+ 180,
1149
+ 133,
1150
+ 237,
1151
+ 95,
1152
+ 91,
1153
+ 55,
1154
+ 145,
1155
+ 58,
1156
+ 140,
1157
+ 245,
1158
+ 133,
1159
+ 126,
1160
+ 255,
1161
+ 0,
1162
+ 169
1163
+ ];
1164
+ },
1165
+ {
1166
+ kind: 'account';
1167
+ path: 'mint';
1168
+ }
1169
+ ];
1170
+ program: {
1171
+ kind: 'const';
1172
+ value: [
1173
+ 140,
1174
+ 151,
1175
+ 37,
1176
+ 143,
1177
+ 78,
1178
+ 36,
1179
+ 137,
1180
+ 241,
1181
+ 187,
1182
+ 61,
1183
+ 16,
1184
+ 41,
1185
+ 20,
1186
+ 142,
1187
+ 13,
1188
+ 131,
1189
+ 11,
1190
+ 90,
1191
+ 19,
1192
+ 153,
1193
+ 218,
1194
+ 255,
1195
+ 16,
1196
+ 132,
1197
+ 4,
1198
+ 142,
1199
+ 123,
1200
+ 216,
1201
+ 219,
1202
+ 233,
1203
+ 248,
1204
+ 89
1205
+ ];
1206
+ };
1207
+ };
860
1208
  },
861
1209
  {
862
1210
  name: 'tokenProgram';
@@ -875,14 +1223,6 @@ export type TriadProtocol = {
875
1223
  }
876
1224
  ];
877
1225
  accounts: [
878
- {
879
- name: 'nftRewards';
880
- discriminator: [210, 99, 18, 65, 58, 128, 167, 91];
881
- },
882
- {
883
- name: 'stake';
884
- discriminator: [150, 197, 176, 29, 55, 132, 112, 149];
885
- },
886
1226
  {
887
1227
  name: 'stakeV2';
888
1228
  discriminator: [207, 98, 130, 13, 118, 181, 238, 47];
@@ -1073,26 +1413,6 @@ export type TriadProtocol = {
1073
1413
  ];
1074
1414
  };
1075
1415
  },
1076
- {
1077
- name: 'collection';
1078
- type: {
1079
- kind: 'enum';
1080
- variants: [
1081
- {
1082
- name: 'coleta';
1083
- },
1084
- {
1085
- name: 'undead';
1086
- },
1087
- {
1088
- name: 'alligators';
1089
- },
1090
- {
1091
- name: 'pyth';
1092
- }
1093
- ];
1094
- };
1095
- },
1096
1416
  {
1097
1417
  name: 'createTickerArgs';
1098
1418
  type: {
@@ -1117,10 +1437,6 @@ export type TriadProtocol = {
1117
1437
  {
1118
1438
  name: 'name';
1119
1439
  type: 'string';
1120
- },
1121
- {
1122
- name: 'referral';
1123
- type: 'pubkey';
1124
1440
  }
1125
1441
  ];
1126
1442
  };
@@ -1165,50 +1481,6 @@ export type TriadProtocol = {
1165
1481
  ];
1166
1482
  };
1167
1483
  },
1168
- {
1169
- name: 'migrateStakeArgs';
1170
- type: {
1171
- kind: 'struct';
1172
- fields: [
1173
- {
1174
- name: 'name';
1175
- type: 'string';
1176
- },
1177
- {
1178
- name: 'stakeVault';
1179
- type: 'string';
1180
- }
1181
- ];
1182
- };
1183
- },
1184
- {
1185
- name: 'nftRewards';
1186
- type: {
1187
- kind: 'struct';
1188
- fields: [
1189
- {
1190
- name: 'stake';
1191
- type: 'pubkey';
1192
- },
1193
- {
1194
- name: 'dailyRewards';
1195
- type: {
1196
- array: ['u64', 30];
1197
- };
1198
- },
1199
- {
1200
- name: 'weeklyRewardsPaid';
1201
- type: {
1202
- array: ['bool', 5];
1203
- };
1204
- },
1205
- {
1206
- name: 'apr';
1207
- type: 'f32';
1208
- }
1209
- ];
1210
- };
1211
- },
1212
1484
  {
1213
1485
  name: 'openPositionArgs';
1214
1486
  type: {
@@ -1289,94 +1561,6 @@ export type TriadProtocol = {
1289
1561
  ];
1290
1562
  };
1291
1563
  },
1292
- {
1293
- name: 'rarity';
1294
- type: {
1295
- kind: 'enum';
1296
- variants: [
1297
- {
1298
- name: 'common';
1299
- },
1300
- {
1301
- name: 'uncommon';
1302
- },
1303
- {
1304
- name: 'rare';
1305
- },
1306
- {
1307
- name: 'epic';
1308
- },
1309
- {
1310
- name: 'legendary';
1311
- },
1312
- {
1313
- name: 'mythic';
1314
- }
1315
- ];
1316
- };
1317
- },
1318
- {
1319
- name: 'stake';
1320
- type: {
1321
- kind: 'struct';
1322
- fields: [
1323
- {
1324
- name: 'bump';
1325
- type: 'u8';
1326
- },
1327
- {
1328
- name: 'authority';
1329
- type: 'pubkey';
1330
- },
1331
- {
1332
- name: 'initTs';
1333
- type: 'i64';
1334
- },
1335
- {
1336
- name: 'isLocked';
1337
- type: 'bool';
1338
- },
1339
- {
1340
- name: 'withdrawTs';
1341
- type: 'i64';
1342
- },
1343
- {
1344
- name: 'name';
1345
- type: 'string';
1346
- },
1347
- {
1348
- name: 'collections';
1349
- type: {
1350
- vec: {
1351
- defined: {
1352
- name: 'collection';
1353
- };
1354
- };
1355
- };
1356
- },
1357
- {
1358
- name: 'rarity';
1359
- type: {
1360
- defined: {
1361
- name: 'rarity';
1362
- };
1363
- };
1364
- },
1365
- {
1366
- name: 'mint';
1367
- type: 'pubkey';
1368
- },
1369
- {
1370
- name: 'stakeVault';
1371
- type: 'pubkey';
1372
- },
1373
- {
1374
- name: 'stakeRewards';
1375
- type: 'pubkey';
1376
- }
1377
- ];
1378
- };
1379
- },
1380
1564
  {
1381
1565
  name: 'stakeNftArgs';
1382
1566
  type: {
@@ -1617,8 +1801,8 @@ export type TriadProtocol = {
1617
1801
  type: 'bool';
1618
1802
  },
1619
1803
  {
1620
- name: 'week';
1621
- type: 'u8';
1804
+ name: 'initTs';
1805
+ type: 'i64';
1622
1806
  }
1623
1807
  ];
1624
1808
  };
@@ -1663,6 +1847,20 @@ export type TriadProtocol = {
1663
1847
  {
1664
1848
  name: 'name';
1665
1849
  type: 'string';
1850
+ },
1851
+ {
1852
+ name: 'swaps';
1853
+ type: 'i16';
1854
+ },
1855
+ {
1856
+ name: 'swapsMade';
1857
+ type: 'i16';
1858
+ },
1859
+ {
1860
+ name: 'padding';
1861
+ type: {
1862
+ array: ['u8', 48];
1863
+ };
1666
1864
  }
1667
1865
  ];
1668
1866
  };
package/dist/utils/helpers.d.ts CHANGED
@@ -8,7 +8,6 @@ export declare const getVaultAddressSync: (programId: PublicKey, tickerAddress:
8
8
  export declare const getTokenVaultAddressSync: (programId: PublicKey, vault: PublicKey) => PublicKey;
9
9
  export declare function getUserPositionAddressSync(programId: PublicKey, authority: PublicKey, ticker: PublicKey): PublicKey;
10
10
  export declare const getStakeVaultAddressSync: (programId: PublicKey, vaultName: string) => PublicKey;
11
- export declare const getStakeV1AddressSync: (programId: PublicKey, nftName: string) => PublicKey;
12
11
  export declare const getStakeAddressSync: (programId: PublicKey, wallet: PublicKey, name: string) => PublicKey;
13
12
  export declare const getNFTRewardsAddressSync: (programId: PublicKey, stake: PublicKey) => PublicKey;
14
13
  export declare const getATASync: (address: PublicKey, Mint: PublicKey) => PublicKey;
package/dist/utils/helpers.js CHANGED
@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
23
23
  return result;
24
24
  };
25
25
  Object.defineProperty(exports, "__esModule", { value: true });
26
- exports.calculateAPR = exports.calculateTotalMultiplier = exports.formatUser = exports.formatStake = exports.formatStakeVault = exports.formatNumber = exports.getUserAddressSync = exports.getATASync = exports.getNFTRewardsAddressSync = exports.getStakeAddressSync = exports.getStakeV1AddressSync = exports.getStakeVaultAddressSync = exports.getUserPositionAddressSync = exports.getTokenVaultAddressSync = exports.getVaultAddressSync = exports.decodeString = exports.encodeString = exports.getTickerAddressSync = void 0;
26
+ exports.calculateAPR = exports.calculateTotalMultiplier = exports.formatUser = exports.formatStake = exports.formatStakeVault = exports.formatNumber = exports.getUserAddressSync = exports.getATASync = exports.getNFTRewardsAddressSync = exports.getStakeAddressSync = exports.getStakeVaultAddressSync = exports.getUserPositionAddressSync = exports.getTokenVaultAddressSync = exports.getVaultAddressSync = exports.decodeString = exports.encodeString = exports.getTickerAddressSync = void 0;
27
27
  const stake_1 = require("./../types/stake");
28
28
  const web3_js_1 = require("@solana/web3.js");
29
29
  const anchor = __importStar(require("@coral-xyz/anchor"));
@@ -76,11 +76,6 @@ const getStakeVaultAddressSync = (programId, vaultName) => {
76
76
  return StakeVaultPDA;
77
77
  };
78
78
  exports.getStakeVaultAddressSync = getStakeVaultAddressSync;
79
- const getStakeV1AddressSync = (programId, nftName) => {
80
- const [StakePDA] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('stake'), Buffer.from(nftName)], programId);
81
- return StakePDA;
82
- };
83
- exports.getStakeV1AddressSync = getStakeV1AddressSync;
84
79
  const getStakeAddressSync = (programId, wallet, name) => {
85
80
  const [StakePDA] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('stake'), wallet.toBuffer(), Buffer.from(name)], programId);
86
81
  return StakePDA;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@triadxyz/triad-protocol",
3
- "version": "0.1.9-beta",
3
+ "version": "0.2.1-beta",
4
4
  "main": "./dist/index.js",
5
5
  "module": "./dist/index.js",
6
6
  "types": "./dist/index.d.ts",