@drift-labs/sdk 0.1.18-orders.1 → 0.1.19-master.2

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 (112) hide show
  1. package/README.md +2 -1
  2. package/lib/accounts/defaultClearingHouseAccountSubscriber.d.ts +4 -7
  3. package/lib/accounts/defaultClearingHouseAccountSubscriber.d.ts.map +1 -0
  4. package/lib/accounts/defaultClearingHouseAccountSubscriber.js +2 -27
  5. package/lib/accounts/defaultUserAccountSubscriber.d.ts +2 -3
  6. package/lib/accounts/defaultUserAccountSubscriber.d.ts.map +1 -0
  7. package/lib/accounts/defaultUserAccountSubscriber.js +5 -14
  8. package/lib/accounts/types.d.ts +6 -32
  9. package/lib/accounts/types.d.ts.map +1 -0
  10. package/lib/accounts/webSocketAccountSubscriber.d.ts +1 -0
  11. package/lib/accounts/webSocketAccountSubscriber.d.ts.map +1 -0
  12. package/lib/addresses.d.ts +1 -4
  13. package/lib/addresses.d.ts.map +1 -0
  14. package/lib/addresses.js +1 -28
  15. package/lib/admin.d.ts +7 -10
  16. package/lib/admin.d.ts.map +1 -0
  17. package/lib/admin.js +64 -53
  18. package/lib/assert/assert.d.ts +1 -0
  19. package/lib/assert/assert.d.ts.map +1 -0
  20. package/lib/clearingHouse.d.ts +3 -22
  21. package/lib/clearingHouse.d.ts.map +1 -0
  22. package/lib/clearingHouse.js +15 -246
  23. package/lib/clearingHouseUser.d.ts +17 -10
  24. package/lib/clearingHouseUser.d.ts.map +1 -0
  25. package/lib/clearingHouseUser.js +97 -111
  26. package/lib/config.d.ts +1 -0
  27. package/lib/config.d.ts.map +1 -0
  28. package/lib/config.js +1 -1
  29. package/lib/constants/markets.d.ts +1 -0
  30. package/lib/constants/markets.d.ts.map +1 -0
  31. package/lib/constants/markets.js +16 -0
  32. package/lib/constants/numericConstants.d.ts +1 -0
  33. package/lib/constants/numericConstants.d.ts.map +1 -0
  34. package/lib/examples/makeTradeExample.d.ts +1 -0
  35. package/lib/examples/makeTradeExample.d.ts.map +1 -0
  36. package/lib/examples/makeTradeExample.js +6 -6
  37. package/lib/idl/clearing_house.json +233 -911
  38. package/lib/index.d.ts +1 -4
  39. package/lib/index.d.ts.map +1 -0
  40. package/lib/index.js +0 -4
  41. package/lib/math/amm.d.ts +1 -1
  42. package/lib/math/amm.d.ts.map +1 -0
  43. package/lib/math/amm.js +15 -38
  44. package/lib/math/conversion.d.ts +1 -0
  45. package/lib/math/conversion.d.ts.map +1 -0
  46. package/lib/math/conversion.js +1 -1
  47. package/lib/math/funding.d.ts +1 -0
  48. package/lib/math/funding.d.ts.map +1 -0
  49. package/lib/math/funding.js +5 -2
  50. package/lib/math/insuranceFund.d.ts +1 -0
  51. package/lib/math/insuranceFund.d.ts.map +1 -0
  52. package/lib/math/market.d.ts +2 -2
  53. package/lib/math/market.d.ts.map +1 -0
  54. package/lib/math/market.js +2 -12
  55. package/lib/math/position.d.ts +2 -4
  56. package/lib/math/position.d.ts.map +1 -0
  57. package/lib/math/position.js +5 -19
  58. package/lib/math/trade.d.ts +1 -0
  59. package/lib/math/trade.d.ts.map +1 -0
  60. package/lib/math/trade.js +16 -16
  61. package/lib/math/utils.d.ts +1 -0
  62. package/lib/math/utils.d.ts.map +1 -0
  63. package/lib/mockUSDCFaucet.d.ts +1 -0
  64. package/lib/mockUSDCFaucet.d.ts.map +1 -0
  65. package/lib/pythClient.d.ts +1 -0
  66. package/lib/pythClient.d.ts.map +1 -0
  67. package/lib/pythClient.js +1 -1
  68. package/lib/tx/defaultTxSender.d.ts +1 -0
  69. package/lib/tx/defaultTxSender.d.ts.map +1 -0
  70. package/lib/tx/types.d.ts +1 -0
  71. package/lib/tx/types.d.ts.map +1 -0
  72. package/lib/tx/utils.d.ts +1 -0
  73. package/lib/tx/utils.d.ts.map +1 -0
  74. package/lib/types.d.ts +9 -140
  75. package/lib/types.d.ts.map +1 -0
  76. package/lib/types.js +1 -36
  77. package/lib/util/computeUnits.d.ts +1 -0
  78. package/lib/util/computeUnits.d.ts.map +1 -0
  79. package/lib/util/tps.d.ts +1 -0
  80. package/lib/util/tps.d.ts.map +1 -0
  81. package/lib/wallet.d.ts +1 -0
  82. package/lib/wallet.d.ts.map +1 -0
  83. package/package.json +1 -1
  84. package/src/accounts/defaultClearingHouseAccountSubscriber.ts +5 -52
  85. package/src/accounts/defaultUserAccountSubscriber.ts +6 -31
  86. package/src/accounts/types.ts +5 -42
  87. package/src/addresses.ts +0 -35
  88. package/src/admin.ts +71 -86
  89. package/src/clearingHouse.ts +7 -340
  90. package/src/clearingHouseUser.ts +102 -154
  91. package/src/config.ts +1 -1
  92. package/src/constants/markets.ts +16 -0
  93. package/src/idl/clearing_house.json +233 -911
  94. package/src/index.ts +0 -4
  95. package/src/math/amm.ts +14 -47
  96. package/src/math/funding.ts +5 -1
  97. package/src/math/market.ts +2 -28
  98. package/src/math/position.ts +3 -23
  99. package/src/types.ts +8 -124
  100. package/tsconfig.json +1 -0
  101. package/lib/accounts/defaultHistoryAccountSubscriber.d.ts +0 -28
  102. package/lib/accounts/defaultHistoryAccountSubscriber.js +0 -110
  103. package/lib/math/orders.d.ts +0 -3
  104. package/lib/math/orders.js +0 -30
  105. package/lib/orderParams.d.ts +0 -7
  106. package/lib/orderParams.js +0 -88
  107. package/lib/orders.d.ts +0 -5
  108. package/lib/orders.js +0 -136
  109. package/src/accounts/defaultHistoryAccountSubscriber.ts +0 -176
  110. package/src/math/orders.ts +0 -39
  111. package/src/orderParams.ts +0 -128
  112. package/src/orders.ts +0 -230
package/lib/idl/clearing_house.json CHANGED
@@ -126,47 +126,6 @@
126
126
  ],
127
127
  "args": []
128
128
  },
129
- {
130
- "name": "initializeOrderState",
131
- "accounts": [
132
- {
133
- "name": "admin",
134
- "isMut": false,
135
- "isSigner": true
136
- },
137
- {
138
- "name": "state",
139
- "isMut": true,
140
- "isSigner": false
141
- },
142
- {
143
- "name": "orderState",
144
- "isMut": true,
145
- "isSigner": false
146
- },
147
- {
148
- "name": "orderHistory",
149
- "isMut": true,
150
- "isSigner": false
151
- },
152
- {
153
- "name": "rent",
154
- "isMut": false,
155
- "isSigner": false
156
- },
157
- {
158
- "name": "systemProgram",
159
- "isMut": false,
160
- "isSigner": false
161
- }
162
- ],
163
- "args": [
164
- {
165
- "name": "orderHouseNonce",
166
- "type": "u8"
167
- }
168
- ]
169
- },
170
129
  {
171
130
  "name": "initializeMarket",
172
131
  "accounts": [
@@ -489,269 +448,6 @@
489
448
  }
490
449
  ]
491
450
  },
492
- {
493
- "name": "placeOrder",
494
- "accounts": [
495
- {
496
- "name": "state",
497
- "isMut": false,
498
- "isSigner": false
499
- },
500
- {
501
- "name": "orderState",
502
- "isMut": false,
503
- "isSigner": false
504
- },
505
- {
506
- "name": "user",
507
- "isMut": false,
508
- "isSigner": false
509
- },
510
- {
511
- "name": "authority",
512
- "isMut": false,
513
- "isSigner": true
514
- },
515
- {
516
- "name": "markets",
517
- "isMut": false,
518
- "isSigner": false
519
- },
520
- {
521
- "name": "userPositions",
522
- "isMut": true,
523
- "isSigner": false
524
- },
525
- {
526
- "name": "userOrders",
527
- "isMut": true,
528
- "isSigner": false
529
- },
530
- {
531
- "name": "fundingPaymentHistory",
532
- "isMut": true,
533
- "isSigner": false
534
- },
535
- {
536
- "name": "orderHistory",
537
- "isMut": true,
538
- "isSigner": false
539
- }
540
- ],
541
- "args": [
542
- {
543
- "name": "params",
544
- "type": {
545
- "defined": "OrderParams"
546
- }
547
- }
548
- ]
549
- },
550
- {
551
- "name": "cancelOrder",
552
- "accounts": [
553
- {
554
- "name": "state",
555
- "isMut": false,
556
- "isSigner": false
557
- },
558
- {
559
- "name": "orderState",
560
- "isMut": false,
561
- "isSigner": false
562
- },
563
- {
564
- "name": "user",
565
- "isMut": false,
566
- "isSigner": false
567
- },
568
- {
569
- "name": "authority",
570
- "isMut": false,
571
- "isSigner": true
572
- },
573
- {
574
- "name": "markets",
575
- "isMut": true,
576
- "isSigner": false
577
- },
578
- {
579
- "name": "userPositions",
580
- "isMut": true,
581
- "isSigner": false
582
- },
583
- {
584
- "name": "userOrders",
585
- "isMut": true,
586
- "isSigner": false
587
- },
588
- {
589
- "name": "fundingPaymentHistory",
590
- "isMut": true,
591
- "isSigner": false
592
- },
593
- {
594
- "name": "orderHistory",
595
- "isMut": true,
596
- "isSigner": false
597
- }
598
- ],
599
- "args": [
600
- {
601
- "name": "orderId",
602
- "type": "u128"
603
- }
604
- ]
605
- },
606
- {
607
- "name": "fillOrder",
608
- "accounts": [
609
- {
610
- "name": "state",
611
- "isMut": true,
612
- "isSigner": false
613
- },
614
- {
615
- "name": "orderState",
616
- "isMut": false,
617
- "isSigner": false
618
- },
619
- {
620
- "name": "authority",
621
- "isMut": false,
622
- "isSigner": true
623
- },
624
- {
625
- "name": "filler",
626
- "isMut": true,
627
- "isSigner": false
628
- },
629
- {
630
- "name": "user",
631
- "isMut": true,
632
- "isSigner": false
633
- },
634
- {
635
- "name": "markets",
636
- "isMut": true,
637
- "isSigner": false
638
- },
639
- {
640
- "name": "userPositions",
641
- "isMut": true,
642
- "isSigner": false
643
- },
644
- {
645
- "name": "userOrders",
646
- "isMut": true,
647
- "isSigner": false
648
- },
649
- {
650
- "name": "tradeHistory",
651
- "isMut": true,
652
- "isSigner": false
653
- },
654
- {
655
- "name": "fundingPaymentHistory",
656
- "isMut": true,
657
- "isSigner": false
658
- },
659
- {
660
- "name": "fundingRateHistory",
661
- "isMut": true,
662
- "isSigner": false
663
- },
664
- {
665
- "name": "orderHistory",
666
- "isMut": true,
667
- "isSigner": false
668
- },
669
- {
670
- "name": "oracle",
671
- "isMut": false,
672
- "isSigner": false
673
- }
674
- ],
675
- "args": [
676
- {
677
- "name": "orderId",
678
- "type": "u128"
679
- }
680
- ]
681
- },
682
- {
683
- "name": "placeAndFillOrder",
684
- "accounts": [
685
- {
686
- "name": "state",
687
- "isMut": false,
688
- "isSigner": false
689
- },
690
- {
691
- "name": "orderState",
692
- "isMut": false,
693
- "isSigner": false
694
- },
695
- {
696
- "name": "user",
697
- "isMut": true,
698
- "isSigner": false
699
- },
700
- {
701
- "name": "authority",
702
- "isMut": false,
703
- "isSigner": true
704
- },
705
- {
706
- "name": "markets",
707
- "isMut": true,
708
- "isSigner": false
709
- },
710
- {
711
- "name": "userPositions",
712
- "isMut": true,
713
- "isSigner": false
714
- },
715
- {
716
- "name": "userOrders",
717
- "isMut": true,
718
- "isSigner": false
719
- },
720
- {
721
- "name": "fundingPaymentHistory",
722
- "isMut": true,
723
- "isSigner": false
724
- },
725
- {
726
- "name": "tradeHistory",
727
- "isMut": true,
728
- "isSigner": false
729
- },
730
- {
731
- "name": "fundingRateHistory",
732
- "isMut": true,
733
- "isSigner": false
734
- },
735
- {
736
- "name": "orderHistory",
737
- "isMut": true,
738
- "isSigner": false
739
- },
740
- {
741
- "name": "oracle",
742
- "isMut": false,
743
- "isSigner": false
744
- }
745
- ],
746
- "args": [
747
- {
748
- "name": "params",
749
- "type": {
750
- "defined": "OrderParams"
751
- }
752
- }
753
- ]
754
- },
755
451
  {
756
452
  "name": "liquidate",
757
453
  "accounts": [
@@ -1044,54 +740,79 @@
1044
740
  ]
1045
741
  },
1046
742
  {
1047
- "name": "initializeUser",
743
+ "name": "updateAmmOracleTwap",
1048
744
  "accounts": [
1049
745
  {
1050
- "name": "user",
746
+ "name": "state",
747
+ "isMut": false,
748
+ "isSigner": false
749
+ },
750
+ {
751
+ "name": "markets",
1051
752
  "isMut": true,
1052
753
  "isSigner": false
1053
754
  },
1054
755
  {
1055
- "name": "state",
756
+ "name": "oracle",
1056
757
  "isMut": false,
1057
758
  "isSigner": false
1058
759
  },
1059
760
  {
1060
- "name": "userPositions",
1061
- "isMut": true,
761
+ "name": "admin",
762
+ "isMut": false,
1062
763
  "isSigner": true
1063
764
  },
1064
765
  {
1065
- "name": "authority",
766
+ "name": "curveHistory",
1066
767
  "isMut": true,
1067
- "isSigner": true
768
+ "isSigner": false
769
+ }
770
+ ],
771
+ "args": [
772
+ {
773
+ "name": "marketIndex",
774
+ "type": "u64"
775
+ }
776
+ ]
777
+ },
778
+ {
779
+ "name": "resetAmmOracleTwap",
780
+ "accounts": [
781
+ {
782
+ "name": "state",
783
+ "isMut": false,
784
+ "isSigner": false
1068
785
  },
1069
786
  {
1070
- "name": "rent",
787
+ "name": "markets",
788
+ "isMut": true,
789
+ "isSigner": false
790
+ },
791
+ {
792
+ "name": "oracle",
1071
793
  "isMut": false,
1072
794
  "isSigner": false
1073
795
  },
1074
796
  {
1075
- "name": "systemProgram",
797
+ "name": "admin",
1076
798
  "isMut": false,
799
+ "isSigner": true
800
+ },
801
+ {
802
+ "name": "curveHistory",
803
+ "isMut": true,
1077
804
  "isSigner": false
1078
805
  }
1079
806
  ],
1080
807
  "args": [
1081
808
  {
1082
- "name": "userNonce",
1083
- "type": "u8"
1084
- },
1085
- {
1086
- "name": "optionalAccounts",
1087
- "type": {
1088
- "defined": "InitializeUserOptionalAccounts"
1089
- }
809
+ "name": "marketIndex",
810
+ "type": "u64"
1090
811
  }
1091
812
  ]
1092
813
  },
1093
814
  {
1094
- "name": "initializeUserWithExplicitPayer",
815
+ "name": "initializeUser",
1095
816
  "accounts": [
1096
817
  {
1097
818
  "name": "user",
@@ -1110,11 +831,6 @@
1110
831
  },
1111
832
  {
1112
833
  "name": "authority",
1113
- "isMut": false,
1114
- "isSigner": true
1115
- },
1116
- {
1117
- "name": "payer",
1118
834
  "isMut": true,
1119
835
  "isSigner": true
1120
836
  },
@@ -1143,15 +859,10 @@
1143
859
  ]
1144
860
  },
1145
861
  {
1146
- "name": "initializeUserOrders",
862
+ "name": "initializeUserWithExplicitPayer",
1147
863
  "accounts": [
1148
864
  {
1149
865
  "name": "user",
1150
- "isMut": false,
1151
- "isSigner": false
1152
- },
1153
- {
1154
- "name": "userOrders",
1155
866
  "isMut": true,
1156
867
  "isSigner": false
1157
868
  },
@@ -1160,11 +871,21 @@
1160
871
  "isMut": false,
1161
872
  "isSigner": false
1162
873
  },
874
+ {
875
+ "name": "userPositions",
876
+ "isMut": true,
877
+ "isSigner": true
878
+ },
1163
879
  {
1164
880
  "name": "authority",
1165
881
  "isMut": false,
1166
882
  "isSigner": true
1167
883
  },
884
+ {
885
+ "name": "payer",
886
+ "isMut": true,
887
+ "isSigner": true
888
+ },
1168
889
  {
1169
890
  "name": "rent",
1170
891
  "isMut": false,
@@ -1178,8 +899,14 @@
1178
899
  ],
1179
900
  "args": [
1180
901
  {
1181
- "name": "userOrdersNonce",
902
+ "name": "userNonce",
1182
903
  "type": "u8"
904
+ },
905
+ {
906
+ "name": "optionalAccounts",
907
+ "type": {
908
+ "defined": "InitializeUserOptionalAccounts"
909
+ }
1183
910
  }
1184
911
  ]
1185
912
  },
@@ -1284,6 +1011,11 @@
1284
1011
  "isMut": true,
1285
1012
  "isSigner": false
1286
1013
  },
1014
+ {
1015
+ "name": "oracle",
1016
+ "isMut": false,
1017
+ "isSigner": false
1018
+ },
1287
1019
  {
1288
1020
  "name": "curveHistory",
1289
1021
  "isMut": true,
@@ -1301,6 +1033,32 @@
1301
1033
  }
1302
1034
  ]
1303
1035
  },
1036
+ {
1037
+ "name": "updateCurveHistory",
1038
+ "accounts": [
1039
+ {
1040
+ "name": "admin",
1041
+ "isMut": false,
1042
+ "isSigner": true
1043
+ },
1044
+ {
1045
+ "name": "state",
1046
+ "isMut": true,
1047
+ "isSigner": false
1048
+ },
1049
+ {
1050
+ "name": "extendedCurveHistory",
1051
+ "isMut": true,
1052
+ "isSigner": false
1053
+ },
1054
+ {
1055
+ "name": "curveHistory",
1056
+ "isMut": false,
1057
+ "isSigner": false
1058
+ }
1059
+ ],
1060
+ "args": []
1061
+ },
1304
1062
  {
1305
1063
  "name": "updateMarginRatio",
1306
1064
  "accounts": [
@@ -1470,95 +1228,31 @@
1470
1228
  }
1471
1229
  ]
1472
1230
  },
1473
- {
1474
- "name": "updateOrderFillerRewardStructure",
1475
- "accounts": [
1476
- {
1477
- "name": "admin",
1478
- "isMut": false,
1479
- "isSigner": true
1480
- },
1481
- {
1482
- "name": "state",
1483
- "isMut": false,
1484
- "isSigner": false
1485
- },
1486
- {
1487
- "name": "orderState",
1488
- "isMut": true,
1489
- "isSigner": false
1490
- }
1491
- ],
1492
- "args": [
1493
- {
1494
- "name": "orderFillerRewardStructure",
1495
- "type": {
1496
- "defined": "OrderFillerRewardStructure"
1497
- }
1498
- }
1499
- ]
1500
- },
1501
1231
  {
1502
1232
  "name": "updateOracleGuardRails",
1503
1233
  "accounts": [
1504
1234
  {
1505
1235
  "name": "admin",
1506
1236
  "isMut": false,
1507
- "isSigner": true
1508
- },
1509
- {
1510
- "name": "state",
1511
- "isMut": true,
1512
- "isSigner": false
1513
- }
1514
- ],
1515
- "args": [
1516
- {
1517
- "name": "oracleGuardRails",
1518
- "type": {
1519
- "defined": "OracleGuardRails"
1520
- }
1521
- }
1522
- ]
1523
- },
1524
- {
1525
- "name": "updateMarketOracle",
1526
- "accounts": [
1527
- {
1528
- "name": "admin",
1529
- "isMut": false,
1530
- "isSigner": true
1531
- },
1532
- {
1533
- "name": "state",
1534
- "isMut": false,
1535
- "isSigner": false
1237
+ "isSigner": true
1536
1238
  },
1537
1239
  {
1538
- "name": "markets",
1240
+ "name": "state",
1539
1241
  "isMut": true,
1540
1242
  "isSigner": false
1541
1243
  }
1542
1244
  ],
1543
1245
  "args": [
1544
1246
  {
1545
- "name": "marketIndex",
1546
- "type": "u64"
1547
- },
1548
- {
1549
- "name": "oracle",
1550
- "type": "publicKey"
1551
- },
1552
- {
1553
- "name": "oracleSource",
1247
+ "name": "oracleGuardRails",
1554
1248
  "type": {
1555
- "defined": "OracleSource"
1249
+ "defined": "OracleGuardRails"
1556
1250
  }
1557
1251
  }
1558
1252
  ]
1559
1253
  },
1560
1254
  {
1561
- "name": "updateMarketMinimumQuoteAssetTradeSize",
1255
+ "name": "updateMarketOracle",
1562
1256
  "accounts": [
1563
1257
  {
1564
1258
  "name": "admin",
@@ -1582,13 +1276,19 @@
1582
1276
  "type": "u64"
1583
1277
  },
1584
1278
  {
1585
- "name": "minimumTradeSize",
1586
- "type": "u128"
1279
+ "name": "oracle",
1280
+ "type": "publicKey"
1281
+ },
1282
+ {
1283
+ "name": "oracleSource",
1284
+ "type": {
1285
+ "defined": "OracleSource"
1286
+ }
1587
1287
  }
1588
1288
  ]
1589
1289
  },
1590
1290
  {
1591
- "name": "updateMarketMinimumBaseAssetTradeSize",
1291
+ "name": "updateMarketMinimumTradeSize",
1592
1292
  "accounts": [
1593
1293
  {
1594
1294
  "name": "admin",
@@ -1771,7 +1471,7 @@
1771
1471
  "type": "u64"
1772
1472
  },
1773
1473
  {
1774
- "name": "depositRecords",
1474
+ "name": "curveRecords",
1775
1475
  "type": {
1776
1476
  "array": [
1777
1477
  {
@@ -1785,7 +1485,7 @@
1785
1485
  }
1786
1486
  },
1787
1487
  {
1788
- "name": "DepositHistory",
1488
+ "name": "ExtendedCurveHistory",
1789
1489
  "type": {
1790
1490
  "kind": "struct",
1791
1491
  "fields": [
@@ -1794,11 +1494,11 @@
1794
1494
  "type": "u64"
1795
1495
  },
1796
1496
  {
1797
- "name": "depositRecords",
1497
+ "name": "curveRecords",
1798
1498
  "type": {
1799
1499
  "array": [
1800
1500
  {
1801
- "defined": "DepositRecord"
1501
+ "defined": "ExtendedCurveRecord"
1802
1502
  },
1803
1503
  1024
1804
1504
  ]
@@ -1808,7 +1508,7 @@
1808
1508
  }
1809
1509
  },
1810
1510
  {
1811
- "name": "FundingPaymentHistory",
1511
+ "name": "DepositHistory",
1812
1512
  "type": {
1813
1513
  "kind": "struct",
1814
1514
  "fields": [
@@ -1817,11 +1517,11 @@
1817
1517
  "type": "u64"
1818
1518
  },
1819
1519
  {
1820
- "name": "fundingPaymentRecords",
1520
+ "name": "depositRecords",
1821
1521
  "type": {
1822
1522
  "array": [
1823
1523
  {
1824
- "defined": "FundingPaymentRecord"
1524
+ "defined": "DepositRecord"
1825
1525
  },
1826
1526
  1024
1827
1527
  ]
@@ -1831,7 +1531,7 @@
1831
1531
  }
1832
1532
  },
1833
1533
  {
1834
- "name": "FundingRateHistory",
1534
+ "name": "FundingPaymentHistory",
1835
1535
  "type": {
1836
1536
  "kind": "struct",
1837
1537
  "fields": [
@@ -1840,11 +1540,11 @@
1840
1540
  "type": "u64"
1841
1541
  },
1842
1542
  {
1843
- "name": "fundingRateRecords",
1543
+ "name": "fundingPaymentRecords",
1844
1544
  "type": {
1845
1545
  "array": [
1846
1546
  {
1847
- "defined": "FundingRateRecord"
1547
+ "defined": "FundingPaymentRecord"
1848
1548
  },
1849
1549
  1024
1850
1550
  ]
@@ -1854,7 +1554,7 @@
1854
1554
  }
1855
1555
  },
1856
1556
  {
1857
- "name": "LiquidationHistory",
1557
+ "name": "FundingRateHistory",
1858
1558
  "type": {
1859
1559
  "kind": "struct",
1860
1560
  "fields": [
@@ -1863,11 +1563,11 @@
1863
1563
  "type": "u64"
1864
1564
  },
1865
1565
  {
1866
- "name": "liquidationRecords",
1566
+ "name": "fundingRateRecords",
1867
1567
  "type": {
1868
1568
  "array": [
1869
1569
  {
1870
- "defined": "LiquidationRecord"
1570
+ "defined": "FundingRateRecord"
1871
1571
  },
1872
1572
  1024
1873
1573
  ]
@@ -1877,26 +1577,7 @@
1877
1577
  }
1878
1578
  },
1879
1579
  {
1880
- "name": "Markets",
1881
- "type": {
1882
- "kind": "struct",
1883
- "fields": [
1884
- {
1885
- "name": "markets",
1886
- "type": {
1887
- "array": [
1888
- {
1889
- "defined": "Market"
1890
- },
1891
- 64
1892
- ]
1893
- }
1894
- }
1895
- ]
1896
- }
1897
- },
1898
- {
1899
- "name": "OrderHistory",
1580
+ "name": "LiquidationHistory",
1900
1581
  "type": {
1901
1582
  "kind": "struct",
1902
1583
  "fields": [
@@ -1905,15 +1586,11 @@
1905
1586
  "type": "u64"
1906
1587
  },
1907
1588
  {
1908
- "name": "lastOrderId",
1909
- "type": "u128"
1910
- },
1911
- {
1912
- "name": "orderRecords",
1589
+ "name": "liquidationRecords",
1913
1590
  "type": {
1914
1591
  "array": [
1915
1592
  {
1916
- "defined": "OrderRecord"
1593
+ "defined": "LiquidationRecord"
1917
1594
  },
1918
1595
  1024
1919
1596
  ]
@@ -1923,23 +1600,20 @@
1923
1600
  }
1924
1601
  },
1925
1602
  {
1926
- "name": "OrderState",
1603
+ "name": "Markets",
1927
1604
  "type": {
1928
1605
  "kind": "struct",
1929
1606
  "fields": [
1930
1607
  {
1931
- "name": "orderHistory",
1932
- "type": "publicKey"
1933
- },
1934
- {
1935
- "name": "orderFillerRewardStructure",
1608
+ "name": "markets",
1936
1609
  "type": {
1937
- "defined": "OrderFillerRewardStructure"
1610
+ "array": [
1611
+ {
1612
+ "defined": "Market"
1613
+ },
1614
+ 64
1615
+ ]
1938
1616
  }
1939
- },
1940
- {
1941
- "name": "minOrderQuoteAssetAmount",
1942
- "type": "u128"
1943
1617
  }
1944
1618
  ]
1945
1619
  }
@@ -2090,7 +1764,7 @@
2090
1764
  "type": "u128"
2091
1765
  },
2092
1766
  {
2093
- "name": "orderState",
1767
+ "name": "extendedCurveHistory",
2094
1768
  "type": "publicKey"
2095
1769
  },
2096
1770
  {
@@ -2221,29 +1895,6 @@
2221
1895
  }
2222
1896
  ]
2223
1897
  }
2224
- },
2225
- {
2226
- "name": "UserOrders",
2227
- "type": {
2228
- "kind": "struct",
2229
- "fields": [
2230
- {
2231
- "name": "user",
2232
- "type": "publicKey"
2233
- },
2234
- {
2235
- "name": "orders",
2236
- "type": {
2237
- "array": [
2238
- {
2239
- "defined": "Order"
2240
- },
2241
- 20
2242
- ]
2243
- }
2244
- }
2245
- ]
2246
- }
2247
1898
  }
2248
1899
  ],
2249
1900
  "types": [
@@ -2276,87 +1927,87 @@
2276
1927
  }
2277
1928
  },
2278
1929
  {
2279
- "name": "OrderParams",
1930
+ "name": "CurveRecord",
2280
1931
  "type": {
2281
1932
  "kind": "struct",
2282
1933
  "fields": [
2283
1934
  {
2284
- "name": "orderType",
2285
- "type": {
2286
- "defined": "OrderType"
2287
- }
1935
+ "name": "ts",
1936
+ "type": "i64"
2288
1937
  },
2289
1938
  {
2290
- "name": "direction",
2291
- "type": {
2292
- "defined": "PositionDirection"
2293
- }
1939
+ "name": "recordId",
1940
+ "type": "u128"
2294
1941
  },
2295
1942
  {
2296
- "name": "quoteAssetAmount",
1943
+ "name": "marketIndex",
1944
+ "type": "u64"
1945
+ },
1946
+ {
1947
+ "name": "pegMultiplierBefore",
2297
1948
  "type": "u128"
2298
1949
  },
2299
1950
  {
2300
- "name": "baseAssetAmount",
1951
+ "name": "baseAssetReserveBefore",
2301
1952
  "type": "u128"
2302
1953
  },
2303
1954
  {
2304
- "name": "price",
1955
+ "name": "quoteAssetReserveBefore",
2305
1956
  "type": "u128"
2306
1957
  },
2307
1958
  {
2308
- "name": "marketIndex",
2309
- "type": "u64"
1959
+ "name": "sqrtKBefore",
1960
+ "type": "u128"
2310
1961
  },
2311
1962
  {
2312
- "name": "reduceOnly",
2313
- "type": "bool"
1963
+ "name": "pegMultiplierAfter",
1964
+ "type": "u128"
2314
1965
  },
2315
1966
  {
2316
- "name": "postOnly",
2317
- "type": "bool"
1967
+ "name": "baseAssetReserveAfter",
1968
+ "type": "u128"
2318
1969
  },
2319
1970
  {
2320
- "name": "immediateOrCancel",
2321
- "type": "bool"
1971
+ "name": "quoteAssetReserveAfter",
1972
+ "type": "u128"
2322
1973
  },
2323
1974
  {
2324
- "name": "triggerPrice",
1975
+ "name": "sqrtKAfter",
2325
1976
  "type": "u128"
2326
1977
  },
2327
1978
  {
2328
- "name": "triggerCondition",
2329
- "type": {
2330
- "defined": "OrderTriggerCondition"
2331
- }
1979
+ "name": "baseAssetAmountLong",
1980
+ "type": "u128"
2332
1981
  },
2333
1982
  {
2334
- "name": "optionalAccounts",
2335
- "type": {
2336
- "defined": "OrderParamsOptionalAccounts"
2337
- }
2338
- }
2339
- ]
2340
- }
2341
- },
2342
- {
2343
- "name": "OrderParamsOptionalAccounts",
2344
- "type": {
2345
- "kind": "struct",
2346
- "fields": [
1983
+ "name": "baseAssetAmountShort",
1984
+ "type": "u128"
1985
+ },
2347
1986
  {
2348
- "name": "discountToken",
2349
- "type": "bool"
1987
+ "name": "baseAssetAmount",
1988
+ "type": "i128"
2350
1989
  },
2351
1990
  {
2352
- "name": "referrer",
2353
- "type": "bool"
1991
+ "name": "openInterest",
1992
+ "type": "u128"
1993
+ },
1994
+ {
1995
+ "name": "totalFee",
1996
+ "type": "u128"
1997
+ },
1998
+ {
1999
+ "name": "totalFeeMinusDistributions",
2000
+ "type": "u128"
2001
+ },
2002
+ {
2003
+ "name": "adjustmentCost",
2004
+ "type": "i128"
2354
2005
  }
2355
2006
  ]
2356
2007
  }
2357
2008
  },
2358
2009
  {
2359
- "name": "CurveRecord",
2010
+ "name": "ExtendedCurveRecord",
2360
2011
  "type": {
2361
2012
  "kind": "struct",
2362
2013
  "fields": [
@@ -2431,6 +2082,23 @@
2431
2082
  {
2432
2083
  "name": "adjustmentCost",
2433
2084
  "type": "i128"
2085
+ },
2086
+ {
2087
+ "name": "oraclePrice",
2088
+ "type": "i128"
2089
+ },
2090
+ {
2091
+ "name": "tradeRecord",
2092
+ "type": "u128"
2093
+ },
2094
+ {
2095
+ "name": "padding",
2096
+ "type": {
2097
+ "array": [
2098
+ "u128",
2099
+ 5
2100
+ ]
2101
+ }
2434
2102
  }
2435
2103
  ]
2436
2104
  }
@@ -2728,158 +2396,78 @@
2728
2396
  },
2729
2397
  {
2730
2398
  "name": "cumulativeFundingRateShort",
2731
- "type": "i128"
2732
- },
2733
- {
2734
- "name": "lastFundingRate",
2735
- "type": "i128"
2736
- },
2737
- {
2738
- "name": "lastFundingRateTs",
2739
- "type": "i64"
2740
- },
2741
- {
2742
- "name": "fundingPeriod",
2743
- "type": "i64"
2744
- },
2745
- {
2746
- "name": "lastOraclePriceTwap",
2747
- "type": "i128"
2748
- },
2749
- {
2750
- "name": "lastMarkPriceTwap",
2751
- "type": "u128"
2752
- },
2753
- {
2754
- "name": "lastMarkPriceTwapTs",
2755
- "type": "i64"
2756
- },
2757
- {
2758
- "name": "sqrtK",
2759
- "type": "u128"
2760
- },
2761
- {
2762
- "name": "pegMultiplier",
2763
- "type": "u128"
2764
- },
2765
- {
2766
- "name": "totalFee",
2767
- "type": "u128"
2768
- },
2769
- {
2770
- "name": "totalFeeMinusDistributions",
2771
- "type": "u128"
2772
- },
2773
- {
2774
- "name": "totalFeeWithdrawn",
2775
- "type": "u128"
2776
- },
2777
- {
2778
- "name": "minimumQuoteAssetTradeSize",
2779
- "type": "u128"
2780
- },
2781
- {
2782
- "name": "lastOraclePriceTwapTs",
2783
- "type": "i64"
2784
- },
2785
- {
2786
- "name": "minimumBaseAssetTradeSize",
2787
- "type": "u128"
2788
- },
2789
- {
2790
- "name": "padding0",
2791
- "type": "u64"
2792
- },
2793
- {
2794
- "name": "padding1",
2795
- "type": "u128"
2399
+ "type": "i128"
2796
2400
  },
2797
2401
  {
2798
- "name": "padding2",
2799
- "type": "u128"
2402
+ "name": "lastFundingRate",
2403
+ "type": "i128"
2800
2404
  },
2801
2405
  {
2802
- "name": "padding3",
2803
- "type": "u128"
2804
- }
2805
- ]
2806
- }
2807
- },
2808
- {
2809
- "name": "OrderRecord",
2810
- "type": {
2811
- "kind": "struct",
2812
- "fields": [
2813
- {
2814
- "name": "ts",
2406
+ "name": "lastFundingRateTs",
2815
2407
  "type": "i64"
2816
2408
  },
2817
2409
  {
2818
- "name": "recordId",
2819
- "type": "u128"
2410
+ "name": "fundingPeriod",
2411
+ "type": "i64"
2820
2412
  },
2821
2413
  {
2822
- "name": "user",
2823
- "type": "publicKey"
2414
+ "name": "lastOraclePriceTwap",
2415
+ "type": "i128"
2824
2416
  },
2825
2417
  {
2826
- "name": "authority",
2827
- "type": "publicKey"
2418
+ "name": "lastMarkPriceTwap",
2419
+ "type": "u128"
2828
2420
  },
2829
2421
  {
2830
- "name": "order",
2831
- "type": {
2832
- "defined": "Order"
2833
- }
2422
+ "name": "lastMarkPriceTwapTs",
2423
+ "type": "i64"
2834
2424
  },
2835
2425
  {
2836
- "name": "action",
2837
- "type": {
2838
- "defined": "OrderAction"
2839
- }
2426
+ "name": "sqrtK",
2427
+ "type": "u128"
2840
2428
  },
2841
2429
  {
2842
- "name": "filler",
2843
- "type": "publicKey"
2430
+ "name": "pegMultiplier",
2431
+ "type": "u128"
2844
2432
  },
2845
2433
  {
2846
- "name": "tradeRecordId",
2434
+ "name": "totalFee",
2847
2435
  "type": "u128"
2848
2436
  },
2849
2437
  {
2850
- "name": "baseAssetAmountFilled",
2438
+ "name": "totalFeeMinusDistributions",
2851
2439
  "type": "u128"
2852
2440
  },
2853
2441
  {
2854
- "name": "quoteAssetAmountFilled",
2442
+ "name": "totalFeeWithdrawn",
2855
2443
  "type": "u128"
2856
2444
  },
2857
2445
  {
2858
- "name": "fee",
2446
+ "name": "minimumTradeSize",
2859
2447
  "type": "u128"
2860
2448
  },
2861
2449
  {
2862
- "name": "fillerReward",
2863
- "type": "u128"
2864
- }
2865
- ]
2866
- }
2867
- },
2868
- {
2869
- "name": "OrderFillerRewardStructure",
2870
- "type": {
2871
- "kind": "struct",
2872
- "fields": [
2450
+ "name": "lastOraclePriceTwapTs",
2451
+ "type": "i64"
2452
+ },
2453
+ {
2454
+ "name": "lastOraclePrice",
2455
+ "type": "i128"
2456
+ },
2457
+ {
2458
+ "name": "padding1",
2459
+ "type": "u64"
2460
+ },
2873
2461
  {
2874
- "name": "rewardNumerator",
2462
+ "name": "padding2",
2875
2463
  "type": "u128"
2876
2464
  },
2877
2465
  {
2878
- "name": "rewardDenominator",
2466
+ "name": "padding3",
2879
2467
  "type": "u128"
2880
2468
  },
2881
2469
  {
2882
- "name": "timeBasedRewardLowerBound",
2470
+ "name": "padding4",
2883
2471
  "type": "u128"
2884
2472
  }
2885
2473
  ]
@@ -3153,130 +2741,32 @@
3153
2741
  "type": "i64"
3154
2742
  },
3155
2743
  {
3156
- "name": "openOrders",
3157
- "type": "u128"
3158
- },
3159
- {
3160
- "name": "padding0",
3161
- "type": "u128"
3162
- },
3163
- {
3164
- "name": "padding1",
3165
- "type": "u128"
3166
- },
3167
- {
3168
- "name": "padding2",
3169
- "type": "u128"
3170
- },
3171
- {
3172
- "name": "padding3",
3173
- "type": "u128"
3174
- },
3175
- {
3176
- "name": "padding4",
3177
- "type": "u128"
3178
- },
3179
- {
3180
- "name": "padding5",
3181
- "type": "u128"
3182
- },
3183
- {
3184
- "name": "padding6",
3185
- "type": "u128"
3186
- }
3187
- ]
3188
- }
3189
- },
3190
- {
3191
- "name": "Order",
3192
- "type": {
3193
- "kind": "struct",
3194
- "fields": [
3195
- {
3196
- "name": "status",
3197
- "type": {
3198
- "defined": "OrderStatus"
3199
- }
3200
- },
3201
- {
3202
- "name": "orderType",
3203
- "type": {
3204
- "defined": "OrderType"
3205
- }
3206
- },
3207
- {
3208
- "name": "ts",
3209
- "type": "i64"
3210
- },
3211
- {
3212
- "name": "orderId",
3213
- "type": "u128"
3214
- },
3215
- {
3216
- "name": "marketIndex",
3217
- "type": "u64"
3218
- },
3219
- {
3220
- "name": "price",
2744
+ "name": "stopLossPrice",
3221
2745
  "type": "u128"
3222
2746
  },
3223
2747
  {
3224
- "name": "quoteAssetAmount",
2748
+ "name": "stopLossAmount",
3225
2749
  "type": "u128"
3226
2750
  },
3227
2751
  {
3228
- "name": "baseAssetAmount",
2752
+ "name": "stopProfitPrice",
3229
2753
  "type": "u128"
3230
2754
  },
3231
2755
  {
3232
- "name": "baseAssetAmountFilled",
2756
+ "name": "stopProfitAmount",
3233
2757
  "type": "u128"
3234
2758
  },
3235
2759
  {
3236
- "name": "quoteAssetAmountFilled",
3237
- "type": "u128"
2760
+ "name": "transferTo",
2761
+ "type": "publicKey"
3238
2762
  },
3239
2763
  {
3240
- "name": "fee",
2764
+ "name": "padding0",
3241
2765
  "type": "u128"
3242
2766
  },
3243
2767
  {
3244
- "name": "direction",
3245
- "type": {
3246
- "defined": "PositionDirection"
3247
- }
3248
- },
3249
- {
3250
- "name": "reduceOnly",
3251
- "type": "bool"
3252
- },
3253
- {
3254
- "name": "postOnly",
3255
- "type": "bool"
3256
- },
3257
- {
3258
- "name": "immediateOrCancel",
3259
- "type": "bool"
3260
- },
3261
- {
3262
- "name": "discountTier",
3263
- "type": {
3264
- "defined": "OrderDiscountTier"
3265
- }
3266
- },
3267
- {
3268
- "name": "triggerPrice",
2768
+ "name": "padding1",
3269
2769
  "type": "u128"
3270
- },
3271
- {
3272
- "name": "triggerCondition",
3273
- "type": {
3274
- "defined": "OrderTriggerCondition"
3275
- }
3276
- },
3277
- {
3278
- "name": "referrer",
3279
- "type": "publicKey"
3280
2770
  }
3281
2771
  ]
3282
2772
  }
@@ -3337,23 +2827,6 @@
3337
2827
  ]
3338
2828
  }
3339
2829
  },
3340
- {
3341
- "name": "OrderAction",
3342
- "type": {
3343
- "kind": "enum",
3344
- "variants": [
3345
- {
3346
- "name": "Place"
3347
- },
3348
- {
3349
- "name": "Cancel"
3350
- },
3351
- {
3352
- "name": "Fill"
3353
- }
3354
- ]
3355
- }
3356
- },
3357
2830
  {
3358
2831
  "name": "PositionDirection",
3359
2832
  "type": {
@@ -3367,77 +2840,6 @@
3367
2840
  }
3368
2841
  ]
3369
2842
  }
3370
- },
3371
- {
3372
- "name": "OrderStatus",
3373
- "type": {
3374
- "kind": "enum",
3375
- "variants": [
3376
- {
3377
- "name": "Init"
3378
- },
3379
- {
3380
- "name": "Open"
3381
- }
3382
- ]
3383
- }
3384
- },
3385
- {
3386
- "name": "OrderType",
3387
- "type": {
3388
- "kind": "enum",
3389
- "variants": [
3390
- {
3391
- "name": "Market"
3392
- },
3393
- {
3394
- "name": "Limit"
3395
- },
3396
- {
3397
- "name": "Stop"
3398
- },
3399
- {
3400
- "name": "StopLimit"
3401
- }
3402
- ]
3403
- }
3404
- },
3405
- {
3406
- "name": "OrderDiscountTier",
3407
- "type": {
3408
- "kind": "enum",
3409
- "variants": [
3410
- {
3411
- "name": "None"
3412
- },
3413
- {
3414
- "name": "First"
3415
- },
3416
- {
3417
- "name": "Second"
3418
- },
3419
- {
3420
- "name": "Third"
3421
- },
3422
- {
3423
- "name": "Fourth"
3424
- }
3425
- ]
3426
- }
3427
- },
3428
- {
3429
- "name": "OrderTriggerCondition",
3430
- "type": {
3431
- "kind": "enum",
3432
- "variants": [
3433
- {
3434
- "name": "Above"
3435
- },
3436
- {
3437
- "name": "Below"
3438
- }
3439
- ]
3440
- }
3441
2843
  }
3442
2844
  ],
3443
2845
  "errors": [
@@ -3635,86 +3037,6 @@
3635
3037
  "code": 6038,
3636
3038
  "name": "CastingFailure",
3637
3039
  "msg": "Casting Failure"
3638
- },
3639
- {
3640
- "code": 6039,
3641
- "name": "InvalidOrder",
3642
- "msg": "Invalid Order"
3643
- },
3644
- {
3645
- "code": 6040,
3646
- "name": "UserHasNoOrder",
3647
- "msg": "User has no order"
3648
- },
3649
- {
3650
- "code": 6041,
3651
- "name": "OrderAmountTooSmall",
3652
- "msg": "Order Amount Too Small"
3653
- },
3654
- {
3655
- "code": 6042,
3656
- "name": "MaxNumberOfOrders",
3657
- "msg": "Max number of orders taken"
3658
- },
3659
- {
3660
- "code": 6043,
3661
- "name": "OrderDoesNotExist",
3662
- "msg": "Order does not exist"
3663
- },
3664
- {
3665
- "code": 6044,
3666
- "name": "OrderNotOpen",
3667
- "msg": "Order not open"
3668
- },
3669
- {
3670
- "code": 6045,
3671
- "name": "CouldNotFillOrder",
3672
- "msg": "CouldNotFillOrder"
3673
- },
3674
- {
3675
- "code": 6046,
3676
- "name": "ReduceOnlyOrderIncreasedRisk",
3677
- "msg": "Reduce only order increased risk"
3678
- },
3679
- {
3680
- "code": 6047,
3681
- "name": "OrderStateAlreadyInitialized",
3682
- "msg": "Order state already initialized"
3683
- },
3684
- {
3685
- "code": 6048,
3686
- "name": "UnableToLoadAccountLoader",
3687
- "msg": "Unable to load AccountLoader"
3688
- },
3689
- {
3690
- "code": 6049,
3691
- "name": "TradeSizeTooLarge",
3692
- "msg": "Trade Size Too Large"
3693
- },
3694
- {
3695
- "code": 6050,
3696
- "name": "UnableToWriteToRemainingAccount",
3697
- "msg": "Unable to write to remaining account"
3698
- },
3699
- {
3700
- "code": 6051,
3701
- "name": "UserCantReferThemselves",
3702
- "msg": "User cant refer themselves"
3703
- },
3704
- {
3705
- "code": 6052,
3706
- "name": "DidNotReceiveExpectedReferrer",
3707
- "msg": "Did not receive expected referrer"
3708
- },
3709
- {
3710
- "code": 6053,
3711
- "name": "CouldNotDeserializeReferrer",
3712
- "msg": "Could not deserialize referrer"
3713
- },
3714
- {
3715
- "code": 6054,
3716
- "name": "MarketOrderMustBeInPlaceAndFill",
3717
- "msg": "Market order must be in place and fill"
3718
3040
  }
3719
3041
  ]
3720
3042
  }