@triadxyz/triad-protocol 1.6.8-beta → 1.7.0-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.
@@ -7,26 +7,6 @@
7
7
  "description": "Triad protocol, trade solana projects"
8
8
  },
9
9
  "instructions": [
10
- {
11
- "name": "add_default_poseidon",
12
- "discriminator": [121, 129, 69, 151, 102, 241, 191, 34],
13
- "accounts": [
14
- {
15
- "name": "signer",
16
- "writable": true,
17
- "signer": true
18
- },
19
- {
20
- "name": "user_trade",
21
- "writable": true
22
- },
23
- {
24
- "name": "system_program",
25
- "address": "11111111111111111111111111111111"
26
- }
27
- ],
28
- "args": []
29
- },
30
10
  {
31
11
  "name": "add_trader_poseidon",
32
12
  "discriminator": [34, 241, 88, 67, 66, 83, 83, 134],
@@ -412,8 +392,8 @@
412
392
  "args": []
413
393
  },
414
394
  {
415
- "name": "create_sub_user_trade",
416
- "discriminator": [77, 201, 111, 73, 47, 229, 244, 161],
395
+ "name": "create_customer",
396
+ "discriminator": [120, 122, 113, 216, 95, 207, 252, 147],
417
397
  "accounts": [
418
398
  {
419
399
  "name": "signer",
@@ -421,33 +401,17 @@
421
401
  "signer": true
422
402
  },
423
403
  {
424
- "name": "user_trade",
425
- "writable": true,
426
- "pda": {
427
- "seeds": [
428
- {
429
- "kind": "const",
430
- "value": [117, 115, 101, 114, 95, 116, 114, 97, 100, 101]
431
- },
432
- {
433
- "kind": "account",
434
- "path": "signer"
435
- }
436
- ]
437
- }
438
- },
439
- {
440
- "name": "sub_user_trade",
404
+ "name": "customer",
441
405
  "writable": true,
442
406
  "pda": {
443
407
  "seeds": [
444
408
  {
445
409
  "kind": "const",
446
- "value": [117, 115, 101, 114, 95, 116, 114, 97, 100, 101]
410
+ "value": [99, 117, 115, 116, 111, 109, 101, 114]
447
411
  },
448
412
  {
449
413
  "kind": "arg",
450
- "path": "sub_user_key"
414
+ "path": "args.id"
451
415
  }
452
416
  ]
453
417
  }
@@ -459,14 +423,18 @@
459
423
  ],
460
424
  "args": [
461
425
  {
462
- "name": "sub_user_key",
463
- "type": "pubkey"
426
+ "name": "args",
427
+ "type": {
428
+ "defined": {
429
+ "name": "CreateCustomerArgs"
430
+ }
431
+ }
464
432
  }
465
433
  ]
466
434
  },
467
435
  {
468
- "name": "create_user_trade",
469
- "discriminator": [232, 235, 58, 194, 135, 248, 153, 1],
436
+ "name": "create_market",
437
+ "discriminator": [103, 226, 97, 235, 200, 188, 251, 254],
470
438
  "accounts": [
471
439
  {
472
440
  "name": "signer",
@@ -474,83 +442,37 @@
474
442
  "signer": true
475
443
  },
476
444
  {
477
- "name": "user_trade",
445
+ "name": "squads",
478
446
  "writable": true,
479
- "pda": {
480
- "seeds": [
481
- {
482
- "kind": "const",
483
- "value": [117, 115, 101, 114, 95, 116, 114, 97, 100, 101]
484
- },
485
- {
486
- "kind": "account",
487
- "path": "signer"
488
- }
489
- ]
490
- }
447
+ "address": "6fcSf6qfwPNR9AUUNC1UWYZDy5cQ4TzTb2aaipN2zFdq"
491
448
  },
492
449
  {
493
- "name": "system_program",
494
- "address": "11111111111111111111111111111111"
495
- }
496
- ],
497
- "args": []
498
- },
499
- {
500
- "name": "force_cancel_order",
501
- "discriminator": [10, 45, 231, 51, 229, 251, 182, 45],
502
- "accounts": [
503
- {
504
- "name": "signer",
450
+ "name": "customer",
505
451
  "writable": true,
506
- "signer": true
507
- },
508
- {
509
- "name": "user",
510
- "writable": true
511
- },
512
- {
513
- "name": "user_trade",
514
- "writable": true
452
+ "optional": true
515
453
  },
516
454
  {
517
455
  "name": "market",
518
- "writable": true
519
- },
520
- {
521
- "name": "mint",
522
- "writable": true
523
- },
524
- {
525
- "name": "user_ata",
526
456
  "writable": true,
527
457
  "pda": {
528
458
  "seeds": [
529
459
  {
530
- "kind": "account",
531
- "path": "user"
532
- },
533
- {
534
- "kind": "account",
535
- "path": "token_program"
460
+ "kind": "const",
461
+ "value": [109, 97, 114, 107, 101, 116]
536
462
  },
537
463
  {
538
- "kind": "account",
539
- "path": "mint"
464
+ "kind": "arg",
465
+ "path": "args.market_id"
540
466
  }
541
- ],
542
- "program": {
543
- "kind": "const",
544
- "value": [
545
- 140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142,
546
- 13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216,
547
- 219, 233, 248, 89
548
- ]
549
- }
467
+ ]
550
468
  }
551
469
  },
552
470
  {
553
- "name": "market_vault",
471
+ "name": "mint",
472
+ "writable": true
473
+ },
474
+ {
475
+ "name": "market_to_ata",
554
476
  "writable": true,
555
477
  "pda": {
556
478
  "seeds": [
@@ -578,8 +500,7 @@
578
500
  }
579
501
  },
580
502
  {
581
- "name": "token_program",
582
- "address": "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
503
+ "name": "token_program"
583
504
  },
584
505
  {
585
506
  "name": "associated_token_program",
@@ -592,14 +513,18 @@
592
513
  ],
593
514
  "args": [
594
515
  {
595
- "name": "order_id",
596
- "type": "u64"
516
+ "name": "args",
517
+ "type": {
518
+ "defined": {
519
+ "name": "CreateMarketArgs"
520
+ }
521
+ }
597
522
  }
598
523
  ]
599
524
  },
600
525
  {
601
- "name": "initialize_market",
602
- "discriminator": [35, 35, 189, 193, 155, 48, 170, 203],
526
+ "name": "create_sub_user_trade",
527
+ "discriminator": [77, 201, 111, 73, 47, 229, 244, 161],
603
528
  "accounts": [
604
529
  {
605
530
  "name": "signer",
@@ -607,61 +532,37 @@
607
532
  "signer": true
608
533
  },
609
534
  {
610
- "name": "market",
535
+ "name": "user_trade",
611
536
  "writable": true,
612
537
  "pda": {
613
538
  "seeds": [
614
539
  {
615
540
  "kind": "const",
616
- "value": [109, 97, 114, 107, 101, 116]
541
+ "value": [117, 115, 101, 114, 95, 116, 114, 97, 100, 101]
617
542
  },
618
543
  {
619
- "kind": "arg",
620
- "path": "args.market_id"
544
+ "kind": "account",
545
+ "path": "signer"
621
546
  }
622
547
  ]
623
548
  }
624
549
  },
625
550
  {
626
- "name": "mint",
627
- "writable": true
628
- },
629
- {
630
- "name": "market_ata",
551
+ "name": "sub_user_trade",
631
552
  "writable": true,
632
553
  "pda": {
633
554
  "seeds": [
634
555
  {
635
- "kind": "account",
636
- "path": "market"
637
- },
638
- {
639
- "kind": "account",
640
- "path": "token_program"
556
+ "kind": "const",
557
+ "value": [117, 115, 101, 114, 95, 116, 114, 97, 100, 101]
641
558
  },
642
559
  {
643
- "kind": "account",
644
- "path": "mint"
560
+ "kind": "arg",
561
+ "path": "sub_user_key"
645
562
  }
646
- ],
647
- "program": {
648
- "kind": "const",
649
- "value": [
650
- 140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142,
651
- 13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216,
652
- 219, 233, 248, 89
653
- ]
654
- }
563
+ ]
655
564
  }
656
565
  },
657
- {
658
- "name": "token_program",
659
- "address": "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
660
- },
661
- {
662
- "name": "associated_token_program",
663
- "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
664
- },
665
566
  {
666
567
  "name": "system_program",
667
568
  "address": "11111111111111111111111111111111"
@@ -669,15 +570,43 @@
669
570
  ],
670
571
  "args": [
671
572
  {
672
- "name": "args",
673
- "type": {
674
- "defined": {
675
- "name": "InitializeMarketArgs"
676
- }
677
- }
573
+ "name": "sub_user_key",
574
+ "type": "pubkey"
678
575
  }
679
576
  ]
680
577
  },
578
+ {
579
+ "name": "create_user_trade",
580
+ "discriminator": [232, 235, 58, 194, 135, 248, 153, 1],
581
+ "accounts": [
582
+ {
583
+ "name": "signer",
584
+ "writable": true,
585
+ "signer": true
586
+ },
587
+ {
588
+ "name": "user_trade",
589
+ "writable": true,
590
+ "pda": {
591
+ "seeds": [
592
+ {
593
+ "kind": "const",
594
+ "value": [117, 115, 101, 114, 95, 116, 114, 97, 100, 101]
595
+ },
596
+ {
597
+ "kind": "account",
598
+ "path": "signer"
599
+ }
600
+ ]
601
+ }
602
+ },
603
+ {
604
+ "name": "system_program",
605
+ "address": "11111111111111111111111111111111"
606
+ }
607
+ ],
608
+ "args": []
609
+ },
681
610
  {
682
611
  "name": "open_order",
683
612
  "discriminator": [206, 88, 88, 143, 38, 136, 50, 224],
@@ -1442,6 +1371,10 @@
1442
1371
  "name": "Collection",
1443
1372
  "discriminator": [48, 160, 232, 205, 191, 207, 26, 141]
1444
1373
  },
1374
+ {
1375
+ "name": "Customer",
1376
+ "discriminator": [112, 147, 140, 31, 93, 186, 103, 18]
1377
+ },
1445
1378
  {
1446
1379
  "name": "MarketV2",
1447
1380
  "discriminator": [27, 60, 50, 75, 191, 193, 86, 227]
@@ -1586,6 +1519,16 @@
1586
1519
  "code": 6020,
1587
1520
  "name": "NotLinked",
1588
1521
  "msg": "Not linked"
1522
+ },
1523
+ {
1524
+ "code": 6021,
1525
+ "name": "InvalidCustomer",
1526
+ "msg": "Invalid customer"
1527
+ },
1528
+ {
1529
+ "code": 6022,
1530
+ "name": "InvalidMint",
1531
+ "msg": "Invalid mint"
1589
1532
  }
1590
1533
  ],
1591
1534
  "types": [
@@ -1718,7 +1661,27 @@
1718
1661
  }
1719
1662
  },
1720
1663
  {
1721
- "name": "InitializeMarketArgs",
1664
+ "name": "CreateCustomerArgs",
1665
+ "type": {
1666
+ "kind": "struct",
1667
+ "fields": [
1668
+ {
1669
+ "name": "name",
1670
+ "type": "string"
1671
+ },
1672
+ {
1673
+ "name": "authority",
1674
+ "type": "pubkey"
1675
+ },
1676
+ {
1677
+ "name": "id",
1678
+ "type": "u16"
1679
+ }
1680
+ ]
1681
+ }
1682
+ },
1683
+ {
1684
+ "name": "CreateMarketArgs",
1722
1685
  "type": {
1723
1686
  "kind": "struct",
1724
1687
  "fields": [
@@ -1739,6 +1702,40 @@
1739
1702
  {
1740
1703
  "name": "market_end",
1741
1704
  "type": "i64"
1705
+ },
1706
+ {
1707
+ "name": "fee_bps",
1708
+ "type": "u8"
1709
+ }
1710
+ ]
1711
+ }
1712
+ },
1713
+ {
1714
+ "name": "Customer",
1715
+ "type": {
1716
+ "kind": "struct",
1717
+ "fields": [
1718
+ {
1719
+ "name": "bump",
1720
+ "type": "u8"
1721
+ },
1722
+ {
1723
+ "name": "id",
1724
+ "type": "u16"
1725
+ },
1726
+ {
1727
+ "name": "authority",
1728
+ "type": "pubkey"
1729
+ },
1730
+ {
1731
+ "name": "name",
1732
+ "type": "string"
1733
+ },
1734
+ {
1735
+ "name": "padding",
1736
+ "type": {
1737
+ "array": ["u8", 64]
1738
+ }
1742
1739
  }
1743
1740
  ]
1744
1741
  }
@@ -1774,6 +1771,10 @@
1774
1771
  "type": {
1775
1772
  "kind": "struct",
1776
1773
  "fields": [
1774
+ {
1775
+ "name": "authority",
1776
+ "type": "pubkey"
1777
+ },
1777
1778
  {
1778
1779
  "name": "market_id",
1779
1780
  "type": "u64"
@@ -1806,6 +1807,10 @@
1806
1807
  "name": "volume",
1807
1808
  "type": "u64"
1808
1809
  },
1810
+ {
1811
+ "name": "mint",
1812
+ "type": "pubkey"
1813
+ },
1809
1814
  {
1810
1815
  "name": "update_ts",
1811
1816
  "type": "i64"
@@ -1818,6 +1823,28 @@
1818
1823
  "name": "next_order_id",
1819
1824
  "type": "u64"
1820
1825
  },
1826
+ {
1827
+ "name": "fee_bps",
1828
+ "type": "u16"
1829
+ },
1830
+ {
1831
+ "name": "is_allowed_to_payout",
1832
+ "type": "bool"
1833
+ },
1834
+ {
1835
+ "name": "market_start",
1836
+ "type": "i64"
1837
+ },
1838
+ {
1839
+ "name": "market_end",
1840
+ "type": "i64"
1841
+ },
1842
+ {
1843
+ "name": "question",
1844
+ "type": {
1845
+ "array": ["u8", 80]
1846
+ }
1847
+ },
1821
1848
  {
1822
1849
  "name": "winning_direction",
1823
1850
  "type": {
@@ -1827,19 +1854,23 @@
1827
1854
  }
1828
1855
  },
1829
1856
  {
1830
- "name": "market_start",
1831
- "type": "i64"
1857
+ "name": "market_liquidity_at_start",
1858
+ "type": "u64"
1832
1859
  },
1833
1860
  {
1834
- "name": "market_end",
1835
- "type": "i64"
1861
+ "name": "creator_fee_available",
1862
+ "type": "u64"
1836
1863
  },
1837
1864
  {
1838
- "name": "is_allowed_to_payout",
1839
- "type": "bool"
1865
+ "name": "creator_fee_claimed",
1866
+ "type": "u64"
1840
1867
  },
1841
1868
  {
1842
- "name": "market_liquidity_at_start",
1869
+ "name": "market_fee_available",
1870
+ "type": "u64"
1871
+ },
1872
+ {
1873
+ "name": "market_fee_claimed",
1843
1874
  "type": "u64"
1844
1875
  }
1845
1876
  ]
@@ -1911,11 +1942,11 @@
1911
1942
  "type": "u16"
1912
1943
  },
1913
1944
  {
1914
- "name": "nft_holders_fee_available",
1945
+ "name": "creator_fee_available",
1915
1946
  "type": "u64"
1916
1947
  },
1917
1948
  {
1918
- "name": "nft_holders_fee_claimed",
1949
+ "name": "creator_fee_claimed",
1919
1950
  "type": "u64"
1920
1951
  },
1921
1952
  {
@@ -1956,10 +1987,14 @@
1956
1987
  "name": "market_liquidity_at_start",
1957
1988
  "type": "u64"
1958
1989
  },
1990
+ {
1991
+ "name": "customer_id",
1992
+ "type": "u16"
1993
+ },
1959
1994
  {
1960
1995
  "name": "padding",
1961
1996
  "type": {
1962
- "array": ["u8", 92]
1997
+ "array": ["u8", 90]
1963
1998
  }
1964
1999
  }
1965
2000
  ]
@@ -3,11 +3,6 @@ export type RpcOptions = {
3
3
  skipPreflight?: boolean;
4
4
  microLamports?: number;
5
5
  };
6
- export type CreateUserArgs = {
7
- wallet: PublicKey;
8
- name: string;
9
- referral?: PublicKey;
10
- };
11
6
  export type MintTicketArgs = {
12
7
  discount: number;
13
8
  isBoosted: boolean;
@@ -27,13 +22,6 @@ export type MintTicketArgs = {
27
22
  verifier: string;
28
23
  nftMint: PublicKey;
29
24
  };
30
- export type User = {
31
- ts: number;
32
- authority: string;
33
- referral: string;
34
- referred: number;
35
- name: string;
36
- };
37
25
  export type OrderStatus = {
38
26
  init: {};
39
27
  } | {
@@ -1,3 +1,4 @@
1
+ import { PublicKey } from '@solana/web3.js';
1
2
  export type Market = {
2
3
  address: string;
3
4
  bump: number;
@@ -16,8 +17,8 @@ export type Market = {
16
17
  nextOrderId: string;
17
18
  feeBps: number;
18
19
  isAllowedToPayout: boolean;
19
- nftHoldersFeeAvailable: string;
20
- nftHoldersFeeClaimed: string;
20
+ creatorFeeAvailable: string;
21
+ creatorFeeClaimed: string;
21
22
  marketFeeAvailable: string;
22
23
  marketFeeClaimed: string;
23
24
  marketStart: string;
@@ -25,6 +26,7 @@ export type Market = {
25
26
  question: string;
26
27
  winningDirection: WinningDirection;
27
28
  marketLiquidityAtStart: string;
29
+ customer: string;
28
30
  };
29
31
  export type UserTrade = {
30
32
  user: string;
@@ -77,9 +79,16 @@ export type OpenOrderArgs = {
77
79
  direction: OrderDirection;
78
80
  token: string;
79
81
  };
80
- export type InitializeMarketArgs = {
82
+ export type CreateMarketArgs = {
81
83
  marketId: number;
82
84
  startTime: number;
83
85
  endTime: number;
84
86
  question: string;
87
+ feeBps: number;
88
+ customer: PublicKey;
89
+ };
90
+ export type CreateCustomerArgs = {
91
+ id: number;
92
+ name: string;
93
+ authority: PublicKey;
85
94
  };