@triadxyz/triad-protocol 3.2.2-beta → 3.2.3-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/index.d.ts +0 -5
  2. package/dist/index.js +2 -27
  3. package/dist/types/idl_triad_protocol.json +8 -364
  4. package/dist/types/index.d.ts +0 -2
  5. package/dist/types/triad_protocol.d.ts +8 -480
  6. package/dist/utils/helpers.js +0 -2
  7. package/package.json +1 -1
package/dist/index.d.ts CHANGED
@@ -266,11 +266,6 @@ export default class TriadProtocolClient {
266
266
  customerId: number;
267
267
  customerFeeRecipient: PublicKey;
268
268
  }[]): Promise<string | import("@solana/web3.js").VersionedTransaction>;
269
- /**
270
- * Collect Market Order Fee
271
- * @param marketAddress - The address of the market
272
- */
273
- collectMarketOrderFee(marketAddress: PublicKey[]): Promise<string | import("@solana/web3.js").VersionedTransaction>;
274
269
  /**
275
270
  * Close Order Book
276
271
  * @param marketIds - Market IDs
package/dist/index.js CHANGED
@@ -456,25 +456,6 @@ class TriadProtocolClient {
456
456
  return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
457
457
  });
458
458
  }
459
- /**
460
- * Collect Market Order Fee
461
- * @param marketAddress - The address of the market
462
- */
463
- collectMarketOrderFee(marketAddress) {
464
- return __awaiter(this, void 0, void 0, function* () {
465
- const ixs = [];
466
- for (const market of marketAddress) {
467
- ixs.push(yield this.program.methods
468
- .collectMarketOrderFee()
469
- .accounts({
470
- signer: this.program.provider.publicKey,
471
- market: market
472
- })
473
- .instruction());
474
- }
475
- return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
476
- });
477
- }
478
459
  /**
479
460
  * Close Order Book
480
461
  * @param marketIds - Market IDs
@@ -689,7 +670,6 @@ class TriadProtocolClient {
689
670
  }
690
671
  });
691
672
  }
692
- console.log('nonce', nonce);
693
673
  if (nonce === null) {
694
674
  throw new Error('No open orders found');
695
675
  }
@@ -1009,16 +989,13 @@ class TriadProtocolClient {
1009
989
  })
1010
990
  .accounts({
1011
991
  signer: this.program.provider.publicKey,
1012
- payer: this.rpcOptions.payer,
1013
992
  market: marketPDA,
1014
993
  buyerTrade: userTradePDA,
1015
994
  orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, marketId),
1016
995
  sellerAuthority: new web3_js_1.PublicKey(order.authority),
1017
996
  sellerTrade: this.getUserPDA(new web3_js_1.PublicKey(order.authority), Number(order.userNonce)),
1018
997
  marketAta: (0, pda_1.getTokenATA)(marketPDA, constants_1.USDC_MINT, spl_token_1.TOKEN_PROGRAM_ID),
1019
- buyerAta: (0, pda_1.getTokenATA)(this.program.provider.publicKey, constants_1.USDC_MINT, spl_token_1.TOKEN_PROGRAM_ID),
1020
- mint: constants_1.USDC_MINT,
1021
- tokenProgram: spl_token_1.TOKEN_PROGRAM_ID
998
+ buyerAta: (0, pda_1.getTokenATA)(this.program.provider.publicKey, constants_1.USDC_MINT, spl_token_1.TOKEN_PROGRAM_ID)
1022
999
  })
1023
1000
  .instruction());
1024
1001
  remainingUSDC = remainingUSDC.sub(usdcAmount);
@@ -1095,9 +1072,7 @@ class TriadProtocolClient {
1095
1072
  buyerTrade: this.getUserPDA(new web3_js_1.PublicKey(order.authority), Number(order.userNonce)),
1096
1073
  orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, marketId),
1097
1074
  marketAta: (0, pda_1.getTokenATA)(marketPDA, constants_1.USDC_MINT, spl_token_1.TOKEN_PROGRAM_ID),
1098
- sellerTrade: this.getUserPDA(this.program.provider.publicKey, inputOrder.userNonce),
1099
- mint: constants_1.USDC_MINT,
1100
- tokenProgram: spl_token_1.TOKEN_PROGRAM_ID
1075
+ sellerTrade: this.getUserPDA(this.program.provider.publicKey, inputOrder.userNonce)
1101
1076
  })
1102
1077
  .instruction());
1103
1078
  }
package/dist/types/idl_triad_protocol.json CHANGED
@@ -852,100 +852,6 @@
852
852
  ],
853
853
  "args": []
854
854
  },
855
- {
856
- "name": "collect_market_order_fee",
857
- "discriminator": [127, 95, 245, 217, 143, 141, 206, 34],
858
- "accounts": [
859
- {
860
- "name": "signer",
861
- "writable": true,
862
- "signer": true
863
- },
864
- {
865
- "name": "squads",
866
- "writable": true,
867
- "address": "Hk1r2NUL4LbUhx1agg1w44tyZiNr72mbeLsg6suF5MA4"
868
- },
869
- {
870
- "name": "market",
871
- "writable": true
872
- },
873
- {
874
- "name": "mint",
875
- "writable": true,
876
- "address": "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
877
- },
878
- {
879
- "name": "market_ata",
880
- "writable": true,
881
- "pda": {
882
- "seeds": [
883
- {
884
- "kind": "account",
885
- "path": "market"
886
- },
887
- {
888
- "kind": "account",
889
- "path": "token_program"
890
- },
891
- {
892
- "kind": "account",
893
- "path": "mint"
894
- }
895
- ],
896
- "program": {
897
- "kind": "const",
898
- "value": [
899
- 140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142,
900
- 13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216,
901
- 219, 233, 248, 89
902
- ]
903
- }
904
- }
905
- },
906
- {
907
- "name": "squads_ata",
908
- "writable": true,
909
- "pda": {
910
- "seeds": [
911
- {
912
- "kind": "account",
913
- "path": "squads"
914
- },
915
- {
916
- "kind": "account",
917
- "path": "token_program"
918
- },
919
- {
920
- "kind": "account",
921
- "path": "mint"
922
- }
923
- ],
924
- "program": {
925
- "kind": "const",
926
- "value": [
927
- 140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142,
928
- 13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216,
929
- 219, 233, 248, 89
930
- ]
931
- }
932
- }
933
- },
934
- {
935
- "name": "token_program",
936
- "address": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
937
- },
938
- {
939
- "name": "associated_token_program",
940
- "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
941
- },
942
- {
943
- "name": "system_program",
944
- "address": "11111111111111111111111111111111"
945
- }
946
- ],
947
- "args": []
948
- },
949
855
  {
950
856
  "name": "collect_royalty",
951
857
  "discriminator": [189, 235, 7, 168, 255, 50, 30, 75],
@@ -1435,99 +1341,6 @@
1435
1341
  "name": "order_book",
1436
1342
  "writable": true
1437
1343
  },
1438
- {
1439
- "name": "squads",
1440
- "writable": true,
1441
- "address": "Hk1r2NUL4LbUhx1agg1w44tyZiNr72mbeLsg6suF5MA4"
1442
- },
1443
- {
1444
- "name": "buyer_authority",
1445
- "writable": true
1446
- },
1447
- {
1448
- "name": "seller_trade",
1449
- "writable": true
1450
- },
1451
- {
1452
- "name": "buyer_trade",
1453
- "writable": true
1454
- },
1455
- {
1456
- "name": "mint",
1457
- "writable": true
1458
- },
1459
- {
1460
- "name": "seller_ata",
1461
- "writable": true,
1462
- "pda": {
1463
- "seeds": [
1464
- {
1465
- "kind": "account",
1466
- "path": "signer"
1467
- },
1468
- {
1469
- "kind": "account",
1470
- "path": "token_program"
1471
- },
1472
- {
1473
- "kind": "account",
1474
- "path": "mint"
1475
- }
1476
- ],
1477
- "program": {
1478
- "kind": "const",
1479
- "value": [
1480
- 140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142,
1481
- 13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216,
1482
- 219, 233, 248, 89
1483
- ]
1484
- }
1485
- }
1486
- },
1487
- {
1488
- "name": "market_ata",
1489
- "writable": true
1490
- },
1491
- {
1492
- "name": "token_program"
1493
- },
1494
- {
1495
- "name": "associated_token_program",
1496
- "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
1497
- },
1498
- {
1499
- "name": "system_program",
1500
- "address": "11111111111111111111111111111111"
1501
- }
1502
- ],
1503
- "args": [
1504
- {
1505
- "name": "args",
1506
- "type": {
1507
- "defined": {
1508
- "name": "MarketAskOrderArgs"
1509
- }
1510
- }
1511
- }
1512
- ]
1513
- },
1514
- {
1515
- "name": "market_ask_order_v1",
1516
- "discriminator": [232, 254, 180, 215, 149, 178, 211, 216],
1517
- "accounts": [
1518
- {
1519
- "name": "signer",
1520
- "writable": true,
1521
- "signer": true
1522
- },
1523
- {
1524
- "name": "market",
1525
- "writable": true
1526
- },
1527
- {
1528
- "name": "order_book",
1529
- "writable": true
1530
- },
1531
1344
  {
1532
1345
  "name": "buyer_authority",
1533
1346
  "writable": true
@@ -1623,103 +1436,6 @@
1623
1436
  "name": "order_book",
1624
1437
  "writable": true
1625
1438
  },
1626
- {
1627
- "name": "squads",
1628
- "writable": true,
1629
- "address": "Hk1r2NUL4LbUhx1agg1w44tyZiNr72mbeLsg6suF5MA4"
1630
- },
1631
- {
1632
- "name": "seller_authority",
1633
- "writable": true
1634
- },
1635
- {
1636
- "name": "buyer_trade",
1637
- "writable": true
1638
- },
1639
- {
1640
- "name": "seller_trade",
1641
- "writable": true
1642
- },
1643
- {
1644
- "name": "mint",
1645
- "writable": true
1646
- },
1647
- {
1648
- "name": "buyer_ata",
1649
- "writable": true
1650
- },
1651
- {
1652
- "name": "seller_ata",
1653
- "writable": true,
1654
- "pda": {
1655
- "seeds": [
1656
- {
1657
- "kind": "account",
1658
- "path": "seller_authority"
1659
- },
1660
- {
1661
- "kind": "account",
1662
- "path": "token_program"
1663
- },
1664
- {
1665
- "kind": "account",
1666
- "path": "mint"
1667
- }
1668
- ],
1669
- "program": {
1670
- "kind": "const",
1671
- "value": [
1672
- 140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142,
1673
- 13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216,
1674
- 219, 233, 248, 89
1675
- ]
1676
- }
1677
- }
1678
- },
1679
- {
1680
- "name": "market_ata",
1681
- "writable": true
1682
- },
1683
- {
1684
- "name": "token_program"
1685
- },
1686
- {
1687
- "name": "associated_token_program",
1688
- "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
1689
- },
1690
- {
1691
- "name": "system_program",
1692
- "address": "11111111111111111111111111111111"
1693
- }
1694
- ],
1695
- "args": [
1696
- {
1697
- "name": "args",
1698
- "type": {
1699
- "defined": {
1700
- "name": "MarketBidOrderArgs"
1701
- }
1702
- }
1703
- }
1704
- ]
1705
- },
1706
- {
1707
- "name": "market_bid_order_v1",
1708
- "discriminator": [217, 128, 204, 203, 203, 240, 236, 136],
1709
- "accounts": [
1710
- {
1711
- "name": "signer",
1712
- "writable": true,
1713
- "signer": true
1714
- },
1715
- {
1716
- "name": "market",
1717
- "writable": true
1718
- },
1719
- {
1720
- "name": "order_book",
1721
- "writable": true
1722
- },
1723
1439
  {
1724
1440
  "name": "seller_authority",
1725
1441
  "writable": true
@@ -2997,10 +2713,6 @@
2997
2713
  "name": "BookOrderEvent",
2998
2714
  "discriminator": [175, 216, 61, 224, 98, 215, 181, 62]
2999
2715
  },
3000
- {
3001
- "name": "BookOrderFilledEvent",
3002
- "discriminator": [143, 95, 119, 33, 30, 15, 222, 175]
3003
- },
3004
2716
  {
3005
2717
  "name": "ClaimTokenEvent",
3006
2718
  "discriminator": [127, 10, 14, 49, 47, 171, 31, 127]
@@ -3013,10 +2725,6 @@
3013
2725
  "name": "CollectMarketFeeEvent",
3014
2726
  "discriminator": [210, 147, 203, 216, 158, 111, 59, 143]
3015
2727
  },
3016
- {
3017
- "name": "CollectMarketOrderFeeEvent",
3018
- "discriminator": [161, 42, 44, 15, 110, 57, 203, 165]
3019
- },
3020
2728
  {
3021
2729
  "name": "MarketEvent",
3022
2730
  "discriminator": [212, 67, 145, 23, 58, 104, 52, 83]
@@ -3364,46 +3072,6 @@
3364
3072
  ]
3365
3073
  }
3366
3074
  },
3367
- {
3368
- "name": "BookOrderFilledEvent",
3369
- "type": {
3370
- "kind": "struct",
3371
- "fields": [
3372
- {
3373
- "name": "market_id",
3374
- "type": "u64"
3375
- },
3376
- {
3377
- "name": "authority",
3378
- "type": "pubkey"
3379
- },
3380
- {
3381
- "name": "shares",
3382
- "type": "u64"
3383
- },
3384
- {
3385
- "name": "price",
3386
- "type": "u64"
3387
- },
3388
- {
3389
- "name": "order_direction",
3390
- "type": {
3391
- "defined": {
3392
- "name": "OrderDirection"
3393
- }
3394
- }
3395
- },
3396
- {
3397
- "name": "rewards",
3398
- "type": "u64"
3399
- },
3400
- {
3401
- "name": "timestamp",
3402
- "type": "i64"
3403
- }
3404
- ]
3405
- }
3406
- },
3407
3075
  {
3408
3076
  "name": "CancelOrderArgs",
3409
3077
  "type": {
@@ -3666,26 +3334,6 @@
3666
3334
  ]
3667
3335
  }
3668
3336
  },
3669
- {
3670
- "name": "CollectMarketOrderFeeEvent",
3671
- "type": {
3672
- "kind": "struct",
3673
- "fields": [
3674
- {
3675
- "name": "market_id",
3676
- "type": "u64"
3677
- },
3678
- {
3679
- "name": "fee",
3680
- "type": "u64"
3681
- },
3682
- {
3683
- "name": "timestamp",
3684
- "type": "i64"
3685
- }
3686
- ]
3687
- }
3688
- },
3689
3337
  {
3690
3338
  "name": "Collection",
3691
3339
  "type": {
@@ -4078,14 +3726,6 @@
4078
3726
  "name": "pool_id",
4079
3727
  "type": "u64"
4080
3728
  },
4081
- {
4082
- "name": "market_order_fee_available",
4083
- "type": "u64"
4084
- },
4085
- {
4086
- "name": "market_order_fee_claimed",
4087
- "type": "u64"
4088
- },
4089
3729
  {
4090
3730
  "name": "fee_recipient",
4091
3731
  "type": "pubkey"
@@ -4225,12 +3865,16 @@
4225
3865
  "type": "u64"
4226
3866
  },
4227
3867
  {
4228
- "name": "market_order_fee_available",
4229
- "type": "u64"
3868
+ "name": "padding_1",
3869
+ "type": {
3870
+ "array": ["u8", 8]
3871
+ }
4230
3872
  },
4231
3873
  {
4232
- "name": "market_order_fee_claimed",
4233
- "type": "u64"
3874
+ "name": "padding_2",
3875
+ "type": {
3876
+ "array": ["u8", 8]
3877
+ }
4234
3878
  },
4235
3879
  {
4236
3880
  "name": "padding",
package/dist/types/index.d.ts CHANGED
@@ -45,8 +45,6 @@ export type Market = {
45
45
  customer: string;
46
46
  poolId: number;
47
47
  feeRecipient: string;
48
- marketOrderFeeAvailable: string;
49
- marketOrderFeeClaimed: string;
50
48
  };
51
49
  export type UserTrade = {
52
50
  user: string;
package/dist/types/triad_protocol.d.ts CHANGED
@@ -1298,158 +1298,6 @@ export type TriadProtocol = {
1298
1298
  ];
1299
1299
  args: [];
1300
1300
  },
1301
- {
1302
- name: 'collectMarketOrderFee';
1303
- discriminator: [127, 95, 245, 217, 143, 141, 206, 34];
1304
- accounts: [
1305
- {
1306
- name: 'signer';
1307
- writable: true;
1308
- signer: true;
1309
- },
1310
- {
1311
- name: 'squads';
1312
- writable: true;
1313
- address: 'Hk1r2NUL4LbUhx1agg1w44tyZiNr72mbeLsg6suF5MA4';
1314
- },
1315
- {
1316
- name: 'market';
1317
- writable: true;
1318
- },
1319
- {
1320
- name: 'mint';
1321
- writable: true;
1322
- address: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v';
1323
- },
1324
- {
1325
- name: 'marketAta';
1326
- writable: true;
1327
- pda: {
1328
- seeds: [
1329
- {
1330
- kind: 'account';
1331
- path: 'market';
1332
- },
1333
- {
1334
- kind: 'account';
1335
- path: 'tokenProgram';
1336
- },
1337
- {
1338
- kind: 'account';
1339
- path: 'mint';
1340
- }
1341
- ];
1342
- program: {
1343
- kind: 'const';
1344
- value: [
1345
- 140,
1346
- 151,
1347
- 37,
1348
- 143,
1349
- 78,
1350
- 36,
1351
- 137,
1352
- 241,
1353
- 187,
1354
- 61,
1355
- 16,
1356
- 41,
1357
- 20,
1358
- 142,
1359
- 13,
1360
- 131,
1361
- 11,
1362
- 90,
1363
- 19,
1364
- 153,
1365
- 218,
1366
- 255,
1367
- 16,
1368
- 132,
1369
- 4,
1370
- 142,
1371
- 123,
1372
- 216,
1373
- 219,
1374
- 233,
1375
- 248,
1376
- 89
1377
- ];
1378
- };
1379
- };
1380
- },
1381
- {
1382
- name: 'squadsAta';
1383
- writable: true;
1384
- pda: {
1385
- seeds: [
1386
- {
1387
- kind: 'account';
1388
- path: 'squads';
1389
- },
1390
- {
1391
- kind: 'account';
1392
- path: 'tokenProgram';
1393
- },
1394
- {
1395
- kind: 'account';
1396
- path: 'mint';
1397
- }
1398
- ];
1399
- program: {
1400
- kind: 'const';
1401
- value: [
1402
- 140,
1403
- 151,
1404
- 37,
1405
- 143,
1406
- 78,
1407
- 36,
1408
- 137,
1409
- 241,
1410
- 187,
1411
- 61,
1412
- 16,
1413
- 41,
1414
- 20,
1415
- 142,
1416
- 13,
1417
- 131,
1418
- 11,
1419
- 90,
1420
- 19,
1421
- 153,
1422
- 218,
1423
- 255,
1424
- 16,
1425
- 132,
1426
- 4,
1427
- 142,
1428
- 123,
1429
- 216,
1430
- 219,
1431
- 233,
1432
- 248,
1433
- 89
1434
- ];
1435
- };
1436
- };
1437
- },
1438
- {
1439
- name: 'tokenProgram';
1440
- address: 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';
1441
- },
1442
- {
1443
- name: 'associatedTokenProgram';
1444
- address: 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
1445
- },
1446
- {
1447
- name: 'systemProgram';
1448
- address: '11111111111111111111111111111111';
1449
- }
1450
- ];
1451
- args: [];
1452
- },
1453
1301
  {
1454
1302
  name: 'collectRoyalty';
1455
1303
  discriminator: [189, 235, 7, 168, 255, 50, 30, 75];
@@ -2026,128 +1874,6 @@ export type TriadProtocol = {
2026
1874
  name: 'orderBook';
2027
1875
  writable: true;
2028
1876
  },
2029
- {
2030
- name: 'squads';
2031
- writable: true;
2032
- address: 'Hk1r2NUL4LbUhx1agg1w44tyZiNr72mbeLsg6suF5MA4';
2033
- },
2034
- {
2035
- name: 'buyerAuthority';
2036
- writable: true;
2037
- },
2038
- {
2039
- name: 'sellerTrade';
2040
- writable: true;
2041
- },
2042
- {
2043
- name: 'buyerTrade';
2044
- writable: true;
2045
- },
2046
- {
2047
- name: 'mint';
2048
- writable: true;
2049
- },
2050
- {
2051
- name: 'sellerAta';
2052
- writable: true;
2053
- pda: {
2054
- seeds: [
2055
- {
2056
- kind: 'account';
2057
- path: 'signer';
2058
- },
2059
- {
2060
- kind: 'account';
2061
- path: 'tokenProgram';
2062
- },
2063
- {
2064
- kind: 'account';
2065
- path: 'mint';
2066
- }
2067
- ];
2068
- program: {
2069
- kind: 'const';
2070
- value: [
2071
- 140,
2072
- 151,
2073
- 37,
2074
- 143,
2075
- 78,
2076
- 36,
2077
- 137,
2078
- 241,
2079
- 187,
2080
- 61,
2081
- 16,
2082
- 41,
2083
- 20,
2084
- 142,
2085
- 13,
2086
- 131,
2087
- 11,
2088
- 90,
2089
- 19,
2090
- 153,
2091
- 218,
2092
- 255,
2093
- 16,
2094
- 132,
2095
- 4,
2096
- 142,
2097
- 123,
2098
- 216,
2099
- 219,
2100
- 233,
2101
- 248,
2102
- 89
2103
- ];
2104
- };
2105
- };
2106
- },
2107
- {
2108
- name: 'marketAta';
2109
- writable: true;
2110
- },
2111
- {
2112
- name: 'tokenProgram';
2113
- },
2114
- {
2115
- name: 'associatedTokenProgram';
2116
- address: 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
2117
- },
2118
- {
2119
- name: 'systemProgram';
2120
- address: '11111111111111111111111111111111';
2121
- }
2122
- ];
2123
- args: [
2124
- {
2125
- name: 'args';
2126
- type: {
2127
- defined: {
2128
- name: 'marketAskOrderArgs';
2129
- };
2130
- };
2131
- }
2132
- ];
2133
- },
2134
- {
2135
- name: 'marketAskOrderV1';
2136
- discriminator: [232, 254, 180, 215, 149, 178, 211, 216];
2137
- accounts: [
2138
- {
2139
- name: 'signer';
2140
- writable: true;
2141
- signer: true;
2142
- },
2143
- {
2144
- name: 'market';
2145
- writable: true;
2146
- },
2147
- {
2148
- name: 'orderBook';
2149
- writable: true;
2150
- },
2151
1877
  {
2152
1878
  name: 'buyerAuthority';
2153
1879
  writable: true;
@@ -2272,132 +1998,6 @@ export type TriadProtocol = {
2272
1998
  name: 'orderBook';
2273
1999
  writable: true;
2274
2000
  },
2275
- {
2276
- name: 'squads';
2277
- writable: true;
2278
- address: 'Hk1r2NUL4LbUhx1agg1w44tyZiNr72mbeLsg6suF5MA4';
2279
- },
2280
- {
2281
- name: 'sellerAuthority';
2282
- writable: true;
2283
- },
2284
- {
2285
- name: 'buyerTrade';
2286
- writable: true;
2287
- },
2288
- {
2289
- name: 'sellerTrade';
2290
- writable: true;
2291
- },
2292
- {
2293
- name: 'mint';
2294
- writable: true;
2295
- },
2296
- {
2297
- name: 'buyerAta';
2298
- writable: true;
2299
- },
2300
- {
2301
- name: 'sellerAta';
2302
- writable: true;
2303
- pda: {
2304
- seeds: [
2305
- {
2306
- kind: 'account';
2307
- path: 'sellerAuthority';
2308
- },
2309
- {
2310
- kind: 'account';
2311
- path: 'tokenProgram';
2312
- },
2313
- {
2314
- kind: 'account';
2315
- path: 'mint';
2316
- }
2317
- ];
2318
- program: {
2319
- kind: 'const';
2320
- value: [
2321
- 140,
2322
- 151,
2323
- 37,
2324
- 143,
2325
- 78,
2326
- 36,
2327
- 137,
2328
- 241,
2329
- 187,
2330
- 61,
2331
- 16,
2332
- 41,
2333
- 20,
2334
- 142,
2335
- 13,
2336
- 131,
2337
- 11,
2338
- 90,
2339
- 19,
2340
- 153,
2341
- 218,
2342
- 255,
2343
- 16,
2344
- 132,
2345
- 4,
2346
- 142,
2347
- 123,
2348
- 216,
2349
- 219,
2350
- 233,
2351
- 248,
2352
- 89
2353
- ];
2354
- };
2355
- };
2356
- },
2357
- {
2358
- name: 'marketAta';
2359
- writable: true;
2360
- },
2361
- {
2362
- name: 'tokenProgram';
2363
- },
2364
- {
2365
- name: 'associatedTokenProgram';
2366
- address: 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
2367
- },
2368
- {
2369
- name: 'systemProgram';
2370
- address: '11111111111111111111111111111111';
2371
- }
2372
- ];
2373
- args: [
2374
- {
2375
- name: 'args';
2376
- type: {
2377
- defined: {
2378
- name: 'marketBidOrderArgs';
2379
- };
2380
- };
2381
- }
2382
- ];
2383
- },
2384
- {
2385
- name: 'marketBidOrderV1';
2386
- discriminator: [217, 128, 204, 203, 203, 240, 236, 136];
2387
- accounts: [
2388
- {
2389
- name: 'signer';
2390
- writable: true;
2391
- signer: true;
2392
- },
2393
- {
2394
- name: 'market';
2395
- writable: true;
2396
- },
2397
- {
2398
- name: 'orderBook';
2399
- writable: true;
2400
- },
2401
2001
  {
2402
2002
  name: 'sellerAuthority';
2403
2003
  writable: true;
@@ -4100,10 +3700,6 @@ export type TriadProtocol = {
4100
3700
  name: 'bookOrderEvent';
4101
3701
  discriminator: [175, 216, 61, 224, 98, 215, 181, 62];
4102
3702
  },
4103
- {
4104
- name: 'bookOrderFilledEvent';
4105
- discriminator: [143, 95, 119, 33, 30, 15, 222, 175];
4106
- },
4107
3703
  {
4108
3704
  name: 'claimTokenEvent';
4109
3705
  discriminator: [127, 10, 14, 49, 47, 171, 31, 127];
@@ -4116,10 +3712,6 @@ export type TriadProtocol = {
4116
3712
  name: 'collectMarketFeeEvent';
4117
3713
  discriminator: [210, 147, 203, 216, 158, 111, 59, 143];
4118
3714
  },
4119
- {
4120
- name: 'collectMarketOrderFeeEvent';
4121
- discriminator: [161, 42, 44, 15, 110, 57, 203, 165];
4122
- },
4123
3715
  {
4124
3716
  name: 'marketEvent';
4125
3717
  discriminator: [212, 67, 145, 23, 58, 104, 52, 83];
@@ -4467,46 +4059,6 @@ export type TriadProtocol = {
4467
4059
  ];
4468
4060
  };
4469
4061
  },
4470
- {
4471
- name: 'bookOrderFilledEvent';
4472
- type: {
4473
- kind: 'struct';
4474
- fields: [
4475
- {
4476
- name: 'marketId';
4477
- type: 'u64';
4478
- },
4479
- {
4480
- name: 'authority';
4481
- type: 'pubkey';
4482
- },
4483
- {
4484
- name: 'shares';
4485
- type: 'u64';
4486
- },
4487
- {
4488
- name: 'price';
4489
- type: 'u64';
4490
- },
4491
- {
4492
- name: 'orderDirection';
4493
- type: {
4494
- defined: {
4495
- name: 'orderDirection';
4496
- };
4497
- };
4498
- },
4499
- {
4500
- name: 'rewards';
4501
- type: 'u64';
4502
- },
4503
- {
4504
- name: 'timestamp';
4505
- type: 'i64';
4506
- }
4507
- ];
4508
- };
4509
- },
4510
4062
  {
4511
4063
  name: 'cancelOrderArgs';
4512
4064
  type: {
@@ -4769,26 +4321,6 @@ export type TriadProtocol = {
4769
4321
  ];
4770
4322
  };
4771
4323
  },
4772
- {
4773
- name: 'collectMarketOrderFeeEvent';
4774
- type: {
4775
- kind: 'struct';
4776
- fields: [
4777
- {
4778
- name: 'marketId';
4779
- type: 'u64';
4780
- },
4781
- {
4782
- name: 'fee';
4783
- type: 'u64';
4784
- },
4785
- {
4786
- name: 'timestamp';
4787
- type: 'i64';
4788
- }
4789
- ];
4790
- };
4791
- },
4792
4324
  {
4793
4325
  name: 'collection';
4794
4326
  type: {
@@ -5181,14 +4713,6 @@ export type TriadProtocol = {
5181
4713
  name: 'poolId';
5182
4714
  type: 'u64';
5183
4715
  },
5184
- {
5185
- name: 'marketOrderFeeAvailable';
5186
- type: 'u64';
5187
- },
5188
- {
5189
- name: 'marketOrderFeeClaimed';
5190
- type: 'u64';
5191
- },
5192
4716
  {
5193
4717
  name: 'feeRecipient';
5194
4718
  type: 'pubkey';
@@ -5328,12 +4852,16 @@ export type TriadProtocol = {
5328
4852
  type: 'u64';
5329
4853
  },
5330
4854
  {
5331
- name: 'marketOrderFeeAvailable';
5332
- type: 'u64';
4855
+ name: 'padding1';
4856
+ type: {
4857
+ array: ['u8', 8];
4858
+ };
5333
4859
  },
5334
4860
  {
5335
- name: 'marketOrderFeeClaimed';
5336
- type: 'u64';
4861
+ name: 'padding2';
4862
+ type: {
4863
+ array: ['u8', 8];
4864
+ };
5337
4865
  },
5338
4866
  {
5339
4867
  name: 'padding';
package/dist/utils/helpers.js CHANGED
@@ -102,8 +102,6 @@ const formatMarket = (account, address) => {
102
102
  customer: account.customerId === 0 ? 'Triad' : account.customerId.toString(),
103
103
  poolId: account.poolId.toNumber(),
104
104
  feeRecipient: account.feeRecipient.toString(),
105
- marketOrderFeeAvailable: account.marketOrderFeeAvailable.toString(),
106
- marketOrderFeeClaimed: account.marketOrderFeeClaimed.toString()
107
105
  };
108
106
  };
109
107
  exports.formatMarket = formatMarket;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@triadxyz/triad-protocol",
3
- "version": "3.2.2-beta",
3
+ "version": "3.2.3-beta",
4
4
  "main": "./dist/index.js",
5
5
  "module": "./dist/index.js",
6
6
  "types": "./dist/index.d.ts",