@drift-labs/sdk 0.1.18-master.8 → 0.1.18-orders.3

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 (134) hide show
  1. package/lib/accounts/bulkAccountLoader.d.ts +32 -0
  2. package/lib/accounts/bulkAccountLoader.js +156 -0
  3. package/lib/accounts/bulkUserSubscription.d.ts +7 -0
  4. package/lib/accounts/bulkUserSubscription.js +28 -0
  5. package/lib/accounts/pollingClearingHouseAccountSubscriber.d.ts +49 -0
  6. package/lib/accounts/pollingClearingHouseAccountSubscriber.js +228 -0
  7. package/lib/accounts/pollingTokenAccountSubscriber.d.ts +25 -0
  8. package/lib/accounts/pollingTokenAccountSubscriber.js +79 -0
  9. package/lib/accounts/pollingUserAccountSubscriber.d.ts +32 -0
  10. package/lib/accounts/pollingUserAccountSubscriber.js +133 -0
  11. package/lib/accounts/types.d.ts +34 -3
  12. package/lib/accounts/utils.d.ts +1 -0
  13. package/lib/accounts/utils.js +7 -0
  14. package/lib/accounts/webSocketAccountSubscriber.d.ts +0 -1
  15. package/lib/accounts/{defaultClearingHouseAccountSubscriber.d.ts → webSocketClearingHouseAccountSubscriber.d.ts} +8 -3
  16. package/lib/accounts/{defaultClearingHouseAccountSubscriber.js → webSocketClearingHouseAccountSubscriber.js} +30 -4
  17. package/lib/accounts/{defaultUserAccountSubscriber.d.ts → webSocketUserAccountSubscriber.d.ts} +6 -3
  18. package/lib/accounts/{defaultUserAccountSubscriber.js → webSocketUserAccountSubscriber.js} +16 -4
  19. package/lib/addresses.d.ts +4 -1
  20. package/lib/addresses.js +28 -1
  21. package/lib/admin.d.ts +11 -4
  22. package/lib/admin.js +71 -17
  23. package/lib/assert/assert.d.ts +0 -1
  24. package/lib/clearingHouse.d.ts +35 -4
  25. package/lib/clearingHouse.js +294 -23
  26. package/lib/clearingHouseUser.d.ts +19 -18
  27. package/lib/clearingHouseUser.js +129 -101
  28. package/lib/config.d.ts +0 -1
  29. package/lib/config.js +1 -1
  30. package/lib/constants/markets.d.ts +0 -1
  31. package/lib/constants/numericConstants.d.ts +0 -1
  32. package/lib/examples/makeTradeExample.d.ts +0 -1
  33. package/lib/examples/makeTradeExample.js +6 -6
  34. package/lib/factory/clearingHouse.d.ts +25 -0
  35. package/lib/factory/clearingHouse.js +64 -0
  36. package/lib/factory/clearingHouseUser.d.ts +19 -0
  37. package/lib/factory/clearingHouseUser.js +34 -0
  38. package/lib/idl/clearing_house.json +1077 -54
  39. package/lib/index.d.ts +11 -3
  40. package/lib/index.js +12 -2
  41. package/lib/math/amm.d.ts +1 -1
  42. package/lib/math/amm.js +38 -15
  43. package/lib/math/conversion.d.ts +0 -1
  44. package/lib/math/conversion.js +1 -1
  45. package/lib/math/funding.d.ts +0 -1
  46. package/lib/math/funding.js +1 -1
  47. package/lib/math/insuranceFund.d.ts +0 -1
  48. package/lib/math/market.d.ts +2 -2
  49. package/lib/math/market.js +12 -2
  50. package/lib/math/orders.d.ts +3 -0
  51. package/lib/math/orders.js +30 -0
  52. package/lib/math/position.d.ts +4 -2
  53. package/lib/math/position.js +19 -5
  54. package/lib/math/trade.d.ts +0 -1
  55. package/lib/math/trade.js +16 -16
  56. package/lib/math/utils.d.ts +2 -3
  57. package/lib/math/utils.js +6 -3
  58. package/lib/mockUSDCFaucet.d.ts +0 -1
  59. package/lib/orderParams.d.ts +7 -0
  60. package/lib/orderParams.js +108 -0
  61. package/lib/orders.d.ts +5 -0
  62. package/lib/orders.js +136 -0
  63. package/lib/pythClient.d.ts +0 -1
  64. package/lib/pythClient.js +1 -1
  65. package/lib/token/index.d.ts +3 -0
  66. package/lib/token/index.js +38 -0
  67. package/lib/tx/defaultTxSender.d.ts +0 -1
  68. package/lib/tx/types.d.ts +0 -1
  69. package/lib/tx/utils.d.ts +0 -1
  70. package/lib/types.d.ts +144 -2
  71. package/lib/types.js +36 -1
  72. package/lib/util/computeUnits.d.ts +0 -1
  73. package/lib/util/tps.d.ts +0 -1
  74. package/lib/wallet.d.ts +0 -1
  75. package/package.json +3 -3
  76. package/src/accounts/bulkAccountLoader.ts +195 -0
  77. package/src/accounts/bulkUserSubscription.ts +28 -0
  78. package/src/accounts/pollingClearingHouseAccountSubscriber.ts +326 -0
  79. package/src/accounts/pollingTokenAccountSubscriber.ts +99 -0
  80. package/src/accounts/pollingUserAccountSubscriber.ts +186 -0
  81. package/src/accounts/types.ts +43 -1
  82. package/src/accounts/utils.ts +3 -0
  83. package/src/accounts/{defaultClearingHouseAccountSubscriber.ts → webSocketClearingHouseAccountSubscriber.ts} +51 -1
  84. package/src/accounts/{defaultUserAccountSubscriber.ts → webSocketUserAccountSubscriber.ts} +33 -3
  85. package/src/addresses.ts +37 -0
  86. package/src/admin.ts +111 -24
  87. package/src/clearingHouse.ts +399 -22
  88. package/src/clearingHouseUser.ts +179 -107
  89. package/src/config.ts +1 -1
  90. package/src/factory/clearingHouse.ts +125 -0
  91. package/src/factory/clearingHouseUser.ts +73 -0
  92. package/src/idl/clearing_house.json +1077 -54
  93. package/src/index.ts +11 -2
  94. package/src/math/amm.ts +47 -14
  95. package/src/math/market.ts +28 -2
  96. package/src/math/orders.ts +39 -0
  97. package/src/math/position.ts +23 -3
  98. package/src/math/utils.ts +1 -1
  99. package/src/orderParams.ts +151 -0
  100. package/src/orders.ts +230 -0
  101. package/src/token/index.ts +37 -0
  102. package/src/types.ts +128 -1
  103. package/tsconfig.json +0 -1
  104. package/lib/accounts/defaultClearingHouseAccountSubscriber.d.ts.map +0 -1
  105. package/lib/accounts/defaultUserAccountSubscriber.d.ts.map +0 -1
  106. package/lib/accounts/types.d.ts.map +0 -1
  107. package/lib/accounts/webSocketAccountSubscriber.d.ts.map +0 -1
  108. package/lib/addresses.d.ts.map +0 -1
  109. package/lib/admin.d.ts.map +0 -1
  110. package/lib/assert/assert.d.ts.map +0 -1
  111. package/lib/clearingHouse.d.ts.map +0 -1
  112. package/lib/clearingHouseUser.d.ts.map +0 -1
  113. package/lib/config.d.ts.map +0 -1
  114. package/lib/constants/markets.d.ts.map +0 -1
  115. package/lib/constants/numericConstants.d.ts.map +0 -1
  116. package/lib/examples/makeTradeExample.d.ts.map +0 -1
  117. package/lib/index.d.ts.map +0 -1
  118. package/lib/math/amm.d.ts.map +0 -1
  119. package/lib/math/conversion.d.ts.map +0 -1
  120. package/lib/math/funding.d.ts.map +0 -1
  121. package/lib/math/insuranceFund.d.ts.map +0 -1
  122. package/lib/math/market.d.ts.map +0 -1
  123. package/lib/math/position.d.ts.map +0 -1
  124. package/lib/math/trade.d.ts.map +0 -1
  125. package/lib/math/utils.d.ts.map +0 -1
  126. package/lib/mockUSDCFaucet.d.ts.map +0 -1
  127. package/lib/pythClient.d.ts.map +0 -1
  128. package/lib/tx/defaultTxSender.d.ts.map +0 -1
  129. package/lib/tx/types.d.ts.map +0 -1
  130. package/lib/tx/utils.d.ts.map +0 -1
  131. package/lib/types.d.ts.map +0 -1
  132. package/lib/util/computeUnits.d.ts.map +0 -1
  133. package/lib/util/tps.d.ts.map +0 -1
  134. package/lib/wallet.d.ts.map +0 -1
package/lib/index.d.ts CHANGED
@@ -1,14 +1,20 @@
1
1
  import { BN } from '@project-serum/anchor';
2
+ import { PublicKey } from '@solana/web3.js';
2
3
  export * from './mockUSDCFaucet';
3
4
  export * from './pythClient';
4
5
  export * from './types';
5
6
  export * from './constants/markets';
6
- export * from './accounts/defaultClearingHouseAccountSubscriber';
7
+ export * from './accounts/webSocketClearingHouseAccountSubscriber';
8
+ export * from './accounts/bulkAccountLoader';
9
+ export * from './accounts/pollingClearingHouseAccountSubscriber';
10
+ export * from './accounts/pollingTokenAccountSubscriber';
7
11
  export * from './accounts/types';
8
12
  export * from './addresses';
9
13
  export * from './admin';
10
14
  export * from './clearingHouseUser';
11
15
  export * from './clearingHouse';
16
+ export * from './factory/clearingHouse';
17
+ export * from './factory/clearingHouseUser';
12
18
  export * from './math/conversion';
13
19
  export * from './math/funding';
14
20
  export * from './math/insuranceFund';
@@ -16,6 +22,9 @@ export * from './math/market';
16
22
  export * from './math/position';
17
23
  export * from './math/amm';
18
24
  export * from './math/trade';
25
+ export * from './math/orders';
26
+ export * from './orders';
27
+ export * from './orderParams';
19
28
  export * from './wallet';
20
29
  export * from './types';
21
30
  export * from './math/utils';
@@ -23,5 +32,4 @@ export * from './config';
23
32
  export * from './constants/numericConstants';
24
33
  export * from './util/computeUnits';
25
34
  export * from './util/tps';
26
- export { BN };
27
- //# sourceMappingURL=index.d.ts.map
35
+ export { BN, PublicKey };
package/lib/index.js CHANGED
@@ -10,19 +10,26 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
10
10
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
11
11
  };
12
12
  Object.defineProperty(exports, "__esModule", { value: true });
13
- exports.BN = void 0;
13
+ exports.PublicKey = exports.BN = void 0;
14
14
  const anchor_1 = require("@project-serum/anchor");
15
15
  Object.defineProperty(exports, "BN", { enumerable: true, get: function () { return anchor_1.BN; } });
16
+ const web3_js_1 = require("@solana/web3.js");
17
+ Object.defineProperty(exports, "PublicKey", { enumerable: true, get: function () { return web3_js_1.PublicKey; } });
16
18
  __exportStar(require("./mockUSDCFaucet"), exports);
17
19
  __exportStar(require("./pythClient"), exports);
18
20
  __exportStar(require("./types"), exports);
19
21
  __exportStar(require("./constants/markets"), exports);
20
- __exportStar(require("./accounts/defaultClearingHouseAccountSubscriber"), exports);
22
+ __exportStar(require("./accounts/webSocketClearingHouseAccountSubscriber"), exports);
23
+ __exportStar(require("./accounts/bulkAccountLoader"), exports);
24
+ __exportStar(require("./accounts/pollingClearingHouseAccountSubscriber"), exports);
25
+ __exportStar(require("./accounts/pollingTokenAccountSubscriber"), exports);
21
26
  __exportStar(require("./accounts/types"), exports);
22
27
  __exportStar(require("./addresses"), exports);
23
28
  __exportStar(require("./admin"), exports);
24
29
  __exportStar(require("./clearingHouseUser"), exports);
25
30
  __exportStar(require("./clearingHouse"), exports);
31
+ __exportStar(require("./factory/clearingHouse"), exports);
32
+ __exportStar(require("./factory/clearingHouseUser"), exports);
26
33
  __exportStar(require("./math/conversion"), exports);
27
34
  __exportStar(require("./math/funding"), exports);
28
35
  __exportStar(require("./math/insuranceFund"), exports);
@@ -30,6 +37,9 @@ __exportStar(require("./math/market"), exports);
30
37
  __exportStar(require("./math/position"), exports);
31
38
  __exportStar(require("./math/amm"), exports);
32
39
  __exportStar(require("./math/trade"), exports);
40
+ __exportStar(require("./math/orders"), exports);
41
+ __exportStar(require("./orders"), exports);
42
+ __exportStar(require("./orderParams"), exports);
33
43
  __exportStar(require("./wallet"), exports);
34
44
  __exportStar(require("./types"), exports);
35
45
  __exportStar(require("./math/utils"), exports);
package/lib/math/amm.d.ts CHANGED
@@ -63,4 +63,4 @@ export declare function calculateRepegCost(market: Market, marketIndex: BN, newP
63
63
  * @returns cost : Precision MARK_PRICE_PRECISION
64
64
  */
65
65
  export declare function calculateTerminalPrice(market: Market): BN;
66
- //# sourceMappingURL=amm.d.ts.map
66
+ export declare function calculateMaxBaseAssetAmountToTrade(amm: AMM, limit_price: BN): [BN, PositionDirection];
package/lib/math/amm.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.calculateTerminalPrice = exports.calculateRepegCost = exports.calculateAdjustKCost = exports.getSwapDirection = exports.calculateSwapOutput = exports.calculateAmmReservesAfterSwap = exports.calculatePrice = void 0;
3
+ exports.calculateMaxBaseAssetAmountToTrade = exports.calculateTerminalPrice = exports.calculateRepegCost = exports.calculateAdjustKCost = exports.getSwapDirection = exports.calculateSwapOutput = exports.calculateAmmReservesAfterSwap = exports.calculatePrice = void 0;
4
4
  const anchor_1 = require("@project-serum/anchor");
5
5
  const numericConstants_1 = require("../constants/numericConstants");
6
6
  const position_1 = require("./position");
@@ -36,7 +36,7 @@ exports.calculatePrice = calculatePrice;
36
36
  * @returns quoteAssetReserve and baseAssetReserve after swap. : Precision AMM_RESERVE_PRECISION
37
37
  */
38
38
  function calculateAmmReservesAfterSwap(amm, inputAssetType, swapAmount, swapDirection) {
39
- (0, assert_1.assert)(swapAmount.gte(numericConstants_1.ZERO), 'swapAmount must be greater than 0');
39
+ assert_1.assert(swapAmount.gte(numericConstants_1.ZERO), 'swapAmount must be greater than 0');
40
40
  let newQuoteAssetReserve;
41
41
  let newBaseAssetReserve;
42
42
  if (inputAssetType === 'quote') {
@@ -79,12 +79,10 @@ exports.calculateSwapOutput = calculateSwapOutput;
79
79
  * @param positionDirection
80
80
  */
81
81
  function getSwapDirection(inputAssetType, positionDirection) {
82
- if (positionDirection === types_1.PositionDirection.LONG &&
83
- inputAssetType === 'base') {
82
+ if (types_1.isVariant(positionDirection, 'long') && inputAssetType === 'base') {
84
83
  return types_1.SwapDirection.REMOVE;
85
84
  }
86
- if (positionDirection === types_1.PositionDirection.SHORT &&
87
- inputAssetType === 'quote') {
85
+ if (types_1.isVariant(positionDirection, 'short') && inputAssetType === 'quote') {
88
86
  return types_1.SwapDirection.REMOVE;
89
87
  }
90
88
  return types_1.SwapDirection.ADD;
@@ -104,8 +102,9 @@ function calculateAdjustKCost(market, marketIndex, numerator, denomenator) {
104
102
  lastCumulativeFundingRate: market.amm.cumulativeFundingRate,
105
103
  marketIndex: new anchor_1.BN(marketIndex),
106
104
  quoteAssetAmount: new anchor_1.BN(0),
105
+ openOrders: new anchor_1.BN(0),
107
106
  };
108
- const currentValue = (0, position_1.calculateBaseAssetValue)(market, netUserPosition);
107
+ const currentValue = position_1.calculateBaseAssetValue(market, netUserPosition);
109
108
  const marketNewK = Object.assign({}, market);
110
109
  marketNewK.amm = Object.assign({}, market.amm);
111
110
  marketNewK.amm.baseAssetReserve = market.amm.baseAssetReserve
@@ -116,7 +115,7 @@ function calculateAdjustKCost(market, marketIndex, numerator, denomenator) {
116
115
  .div(denomenator);
117
116
  marketNewK.amm.sqrtK = market.amm.sqrtK.mul(numerator).div(denomenator);
118
117
  netUserPosition.quoteAssetAmount = currentValue;
119
- const cost = (0, __1.calculatePositionPNL)(marketNewK, netUserPosition);
118
+ const cost = __1.calculatePositionPNL(marketNewK, netUserPosition);
120
119
  return cost;
121
120
  }
122
121
  exports.calculateAdjustKCost = calculateAdjustKCost;
@@ -134,16 +133,17 @@ function calculateRepegCost(market, marketIndex, newPeg) {
134
133
  lastCumulativeFundingRate: market.amm.cumulativeFundingRate,
135
134
  marketIndex: new anchor_1.BN(marketIndex),
136
135
  quoteAssetAmount: new anchor_1.BN(0),
136
+ openOrders: new anchor_1.BN(0),
137
137
  };
138
- const currentValue = (0, position_1.calculateBaseAssetValue)(market, netUserPosition);
138
+ const currentValue = position_1.calculateBaseAssetValue(market, netUserPosition);
139
139
  netUserPosition.quoteAssetAmount = currentValue;
140
- const prevMarketPrice = (0, __1.calculateMarkPrice)(market);
140
+ const prevMarketPrice = __1.calculateMarkPrice(market);
141
141
  const marketNewPeg = Object.assign({}, market);
142
142
  marketNewPeg.amm = Object.assign({}, market.amm);
143
143
  // const marketNewPeg = JSON.parse(JSON.stringify(market));
144
144
  marketNewPeg.amm.pegMultiplier = newPeg;
145
- console.log('Price moves from', (0, __1.convertToNumber)(prevMarketPrice), 'to', (0, __1.convertToNumber)((0, __1.calculateMarkPrice)(marketNewPeg)));
146
- const cost = (0, __1.calculatePositionPNL)(marketNewPeg, netUserPosition);
145
+ console.log('Price moves from', __1.convertToNumber(prevMarketPrice), 'to', __1.convertToNumber(__1.calculateMarkPrice(marketNewPeg)));
146
+ const cost = __1.calculatePositionPNL(marketNewPeg, netUserPosition);
147
147
  return cost;
148
148
  }
149
149
  exports.calculateRepegCost = calculateRepegCost;
@@ -154,9 +154,6 @@ exports.calculateRepegCost = calculateRepegCost;
154
154
  * @returns cost : Precision MARK_PRICE_PRECISION
155
155
  */
156
156
  function calculateTerminalPrice(market) {
157
- if (!market.initialized) {
158
- return new anchor_1.BN(0);
159
- }
160
157
  const directionToClose = market.baseAssetAmount.gt(numericConstants_1.ZERO)
161
158
  ? types_1.PositionDirection.SHORT
162
159
  : types_1.PositionDirection.LONG;
@@ -169,3 +166,29 @@ function calculateTerminalPrice(market) {
169
166
  return terminalPrice;
170
167
  }
171
168
  exports.calculateTerminalPrice = calculateTerminalPrice;
169
+ function calculateMaxBaseAssetAmountToTrade(amm, limit_price) {
170
+ const invariant = amm.sqrtK.mul(amm.sqrtK);
171
+ const newBaseAssetReserveSquared = invariant
172
+ .mul(numericConstants_1.MARK_PRICE_PRECISION)
173
+ .mul(amm.pegMultiplier)
174
+ .div(limit_price)
175
+ .div(numericConstants_1.PEG_PRECISION);
176
+ const newBaseAssetReserve = __1.squareRootBN(newBaseAssetReserveSquared);
177
+ if (newBaseAssetReserve.gt(amm.baseAssetReserve)) {
178
+ return [
179
+ newBaseAssetReserve.sub(amm.baseAssetReserve),
180
+ types_1.PositionDirection.SHORT,
181
+ ];
182
+ }
183
+ else if (newBaseAssetReserve.lt(amm.baseAssetReserve)) {
184
+ return [
185
+ amm.baseAssetReserve.sub(newBaseAssetReserve),
186
+ types_1.PositionDirection.LONG,
187
+ ];
188
+ }
189
+ else {
190
+ console.log('tradeSize Too Small');
191
+ return [new anchor_1.BN(0), types_1.PositionDirection.LONG];
192
+ }
193
+ }
194
+ exports.calculateMaxBaseAssetAmountToTrade = calculateMaxBaseAssetAmountToTrade;
@@ -1,4 +1,3 @@
1
1
  import BN from 'bn.js';
2
2
  export declare const convertToNumber: (bigNumber: BN, precision?: BN) => number;
3
3
  export declare const convertBaseAssetAmountToNumber: (baseAssetAmount: BN) => number;
4
- //# sourceMappingURL=conversion.d.ts.map
@@ -10,6 +10,6 @@ const convertToNumber = (bigNumber, precision = numericConstants_1.MARK_PRICE_PR
10
10
  };
11
11
  exports.convertToNumber = convertToNumber;
12
12
  const convertBaseAssetAmountToNumber = (baseAssetAmount) => {
13
- return (0, exports.convertToNumber)(baseAssetAmount, numericConstants_1.MARK_PRICE_PRECISION.mul(numericConstants_1.PEG_PRECISION));
13
+ return exports.convertToNumber(baseAssetAmount, numericConstants_1.MARK_PRICE_PRECISION.mul(numericConstants_1.PEG_PRECISION));
14
14
  };
15
15
  exports.convertBaseAssetAmountToNumber = convertBaseAssetAmountToNumber;
@@ -41,4 +41,3 @@ export declare function calculateLongShortFundingRateAndLiveTwaps(market: Market
41
41
  * @returns Estimated fee pool size
42
42
  */
43
43
  export declare function calculateFundingPool(market: Market): BN;
44
- //# sourceMappingURL=funding.d.ts.map
@@ -40,7 +40,7 @@ function calculateAllEstimatedFundingRate(market, oraclePriceData, periodAdjustm
40
40
  const lastMarkPriceTwapTs = market.amm.lastMarkPriceTwapTs;
41
41
  const timeSinceLastMarkChange = now.sub(lastMarkPriceTwapTs);
42
42
  const markTwapTimeSinceLastUpdate = anchor_1.BN.max(secondsInHour, secondsInHour.sub(timeSinceLastMarkChange));
43
- const baseAssetPriceWithMantissa = (0, market_1.calculateMarkPrice)(market);
43
+ const baseAssetPriceWithMantissa = market_1.calculateMarkPrice(market);
44
44
  const markTwapWithMantissa = markTwapTimeSinceLastUpdate
45
45
  .mul(lastMarkTwapWithMantissa)
46
46
  .add(timeSinceLastMarkChange.mul(baseAssetPriceWithMantissa))
@@ -12,4 +12,3 @@ import { Connection } from '@solana/web3.js';
12
12
  * @returns Precision : QUOTE_ASSET_PRECISION
13
13
  */
14
14
  export declare function calculateInsuranceFundSize(connection: Connection, state: StateAccount, marketsAccount: MarketsAccount): Promise<BN>;
15
- //# sourceMappingURL=insuranceFund.d.ts.map
@@ -1,6 +1,6 @@
1
1
  /// <reference types="bn.js" />
2
2
  import { BN } from '@project-serum/anchor';
3
- import { Market } from '../types';
3
+ import { Market, PositionDirection } from '../types';
4
4
  /**
5
5
  * Calculates market mark price
6
6
  *
@@ -8,4 +8,4 @@ import { Market } from '../types';
8
8
  * @return markPrice : Precision MARK_PRICE_PRECISION
9
9
  */
10
10
  export declare function calculateMarkPrice(market: Market): BN;
11
- //# sourceMappingURL=market.d.ts.map
11
+ export declare function calculateNewMarketAfterTrade(baseAssetAmount: BN, direction: PositionDirection, market: Market): Market;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.calculateMarkPrice = void 0;
3
+ exports.calculateNewMarketAfterTrade = exports.calculateMarkPrice = void 0;
4
4
  const amm_1 = require("./amm");
5
5
  /**
6
6
  * Calculates market mark price
@@ -9,6 +9,16 @@ const amm_1 = require("./amm");
9
9
  * @return markPrice : Precision MARK_PRICE_PRECISION
10
10
  */
11
11
  function calculateMarkPrice(market) {
12
- return (0, amm_1.calculatePrice)(market.amm.baseAssetReserve, market.amm.quoteAssetReserve, market.amm.pegMultiplier);
12
+ return amm_1.calculatePrice(market.amm.baseAssetReserve, market.amm.quoteAssetReserve, market.amm.pegMultiplier);
13
13
  }
14
14
  exports.calculateMarkPrice = calculateMarkPrice;
15
+ function calculateNewMarketAfterTrade(baseAssetAmount, direction, market) {
16
+ const [newQuoteAssetReserve, newBaseAssetReserve] = amm_1.calculateAmmReservesAfterSwap(market.amm, 'base', baseAssetAmount.abs(), amm_1.getSwapDirection('base', direction));
17
+ const newAmm = Object.assign({}, market.amm);
18
+ const newMarket = Object.assign({}, market);
19
+ newMarket.amm = newAmm;
20
+ newMarket.amm.quoteAssetReserve = newQuoteAssetReserve;
21
+ newMarket.amm.baseAssetReserve = newBaseAssetReserve;
22
+ return newMarket;
23
+ }
24
+ exports.calculateNewMarketAfterTrade = calculateNewMarketAfterTrade;
@@ -0,0 +1,3 @@
1
+ import { ClearingHouseUser } from '../clearingHouseUser';
2
+ import { Order } from '../types';
3
+ export declare function isOrderRiskIncreasing(user: ClearingHouseUser, order: Order): boolean;
@@ -0,0 +1,30 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.isOrderRiskIncreasing = void 0;
4
+ const types_1 = require("../types");
5
+ const numericConstants_1 = require("../constants/numericConstants");
6
+ function isOrderRiskIncreasing(user, order) {
7
+ if (types_1.isVariant(order.status, 'init')) {
8
+ return false;
9
+ }
10
+ const position = user.getUserPosition(order.marketIndex) ||
11
+ user.getEmptyPosition(order.marketIndex);
12
+ // if no position exists, it's risk increasing
13
+ if (position.baseAssetAmount.eq(numericConstants_1.ZERO)) {
14
+ return true;
15
+ }
16
+ // if position is long and order is long
17
+ if (position.baseAssetAmount.gt(numericConstants_1.ZERO) && types_1.isVariant(order.direction, 'long')) {
18
+ return true;
19
+ }
20
+ // if position is short and order is short
21
+ if (position.baseAssetAmount.lt(numericConstants_1.ZERO) &&
22
+ types_1.isVariant(order.direction, 'short')) {
23
+ return true;
24
+ }
25
+ // if order will flip position
26
+ if (position.baseAssetAmount.abs().gt(order.baseAssetAmountFilled)) {
27
+ return true;
28
+ }
29
+ }
30
+ exports.isOrderRiskIncreasing = isOrderRiskIncreasing;
@@ -1,5 +1,5 @@
1
1
  import BN from 'bn.js';
2
- import { Market, UserPosition } from '../types';
2
+ import { Market, PositionDirection, UserPosition } from '../types';
3
3
  /**
4
4
  * calculateBaseAssetValue
5
5
  * = market value of closing entire position
@@ -30,4 +30,6 @@ export declare function calculatePositionFundingPNL(market: Market, marketPositi
30
30
  * @returns Precision: MARK_PRICE_PRECISION (10^10)
31
31
  */
32
32
  export declare function calculateEntryPrice(userPosition: UserPosition): BN;
33
- //# sourceMappingURL=position.d.ts.map
33
+ export declare function findDirectionToClose(userPosition: UserPosition): PositionDirection;
34
+ export declare function positionCurrentDirection(userPosition: UserPosition): PositionDirection;
35
+ export declare function isEmptyPosition(userPosition: UserPosition): boolean;
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.calculateEntryPrice = exports.calculatePositionFundingPNL = exports.calculatePositionPNL = exports.calculateBaseAssetValue = void 0;
6
+ exports.isEmptyPosition = exports.positionCurrentDirection = exports.findDirectionToClose = exports.calculateEntryPrice = exports.calculatePositionFundingPNL = exports.calculatePositionPNL = exports.calculateBaseAssetValue = void 0;
7
7
  const bn_js_1 = __importDefault(require("bn.js"));
8
8
  const numericConstants_1 = require("../constants/numericConstants");
9
9
  const types_1 = require("../types");
@@ -19,10 +19,8 @@ function calculateBaseAssetValue(market, userPosition) {
19
19
  if (userPosition.baseAssetAmount.eq(numericConstants_1.ZERO)) {
20
20
  return numericConstants_1.ZERO;
21
21
  }
22
- const directionToClose = userPosition.baseAssetAmount.gt(numericConstants_1.ZERO)
23
- ? types_1.PositionDirection.SHORT
24
- : types_1.PositionDirection.LONG;
25
- const [newQuoteAssetReserve, _] = (0, amm_1.calculateAmmReservesAfterSwap)(market.amm, 'base', userPosition.baseAssetAmount.abs(), (0, amm_1.getSwapDirection)('base', directionToClose));
22
+ const directionToClose = findDirectionToClose(userPosition);
23
+ const [newQuoteAssetReserve, _] = amm_1.calculateAmmReservesAfterSwap(market.amm, 'base', userPosition.baseAssetAmount.abs(), amm_1.getSwapDirection('base', directionToClose));
26
24
  switch (directionToClose) {
27
25
  case types_1.PositionDirection.SHORT:
28
26
  return market.amm.quoteAssetReserve
@@ -106,3 +104,19 @@ function calculateEntryPrice(userPosition) {
106
104
  .abs();
107
105
  }
108
106
  exports.calculateEntryPrice = calculateEntryPrice;
107
+ function findDirectionToClose(userPosition) {
108
+ return userPosition.baseAssetAmount.gt(numericConstants_1.ZERO)
109
+ ? types_1.PositionDirection.SHORT
110
+ : types_1.PositionDirection.LONG;
111
+ }
112
+ exports.findDirectionToClose = findDirectionToClose;
113
+ function positionCurrentDirection(userPosition) {
114
+ return userPosition.baseAssetAmount.gte(numericConstants_1.ZERO)
115
+ ? types_1.PositionDirection.LONG
116
+ : types_1.PositionDirection.SHORT;
117
+ }
118
+ exports.positionCurrentDirection = positionCurrentDirection;
119
+ function isEmptyPosition(userPosition) {
120
+ return (userPosition.baseAssetAmount.eq(numericConstants_1.ZERO) && userPosition.openOrders.eq(numericConstants_1.ZERO));
121
+ }
122
+ exports.isEmptyPosition = isEmptyPosition;
@@ -45,4 +45,3 @@ export declare function calculateTradeAcquiredAmounts(direction: PositionDirecti
45
45
  * ]
46
46
  */
47
47
  export declare function calculateTargetPriceTrade(market: Market, targetPrice: BN, pct?: BN, outputAssetType?: AssetType): [PositionDirection, BN, BN, BN];
48
- //# sourceMappingURL=trade.d.ts.map
package/lib/math/trade.js CHANGED
@@ -25,18 +25,18 @@ const MAXPCT = new anchor_1.BN(1000); //percentage units are [0,1000] => [0,1]
25
25
  * 'newPrice' => the price of the asset after the trade : Precision MARK_PRICE_PRECISION
26
26
  */
27
27
  function calculateTradeSlippage(direction, amount, market, inputAssetType = 'quote') {
28
- const oldPrice = (0, market_1.calculateMarkPrice)(market);
28
+ const oldPrice = market_1.calculateMarkPrice(market);
29
29
  if (amount.eq(numericConstants_1.ZERO)) {
30
30
  return [numericConstants_1.ZERO, numericConstants_1.ZERO, oldPrice, oldPrice];
31
31
  }
32
32
  const [acquiredBase, acquiredQuote] = calculateTradeAcquiredAmounts(direction, amount, market, inputAssetType);
33
- const entryPrice = (0, amm_1.calculatePrice)(acquiredBase, acquiredQuote, market.amm.pegMultiplier).mul(new anchor_1.BN(-1));
34
- const newPrice = (0, amm_1.calculatePrice)(market.amm.baseAssetReserve.sub(acquiredBase), market.amm.quoteAssetReserve.sub(acquiredQuote), market.amm.pegMultiplier);
33
+ const entryPrice = amm_1.calculatePrice(acquiredBase, acquiredQuote, market.amm.pegMultiplier).mul(new anchor_1.BN(-1));
34
+ const newPrice = amm_1.calculatePrice(market.amm.baseAssetReserve.sub(acquiredBase), market.amm.quoteAssetReserve.sub(acquiredQuote), market.amm.pegMultiplier);
35
35
  if (direction == types_1.PositionDirection.SHORT) {
36
- (0, assert_1.assert)(newPrice.lt(oldPrice));
36
+ assert_1.assert(newPrice.lt(oldPrice));
37
37
  }
38
38
  else {
39
- (0, assert_1.assert)(oldPrice.lt(newPrice));
39
+ assert_1.assert(oldPrice.lt(newPrice));
40
40
  }
41
41
  const pctMaxSlippage = newPrice
42
42
  .sub(oldPrice)
@@ -64,7 +64,7 @@ function calculateTradeAcquiredAmounts(direction, amount, market, inputAssetType
64
64
  if (amount.eq(numericConstants_1.ZERO)) {
65
65
  return [numericConstants_1.ZERO, numericConstants_1.ZERO];
66
66
  }
67
- const [newQuoteAssetReserve, newBaseAssetReserve] = (0, amm_1.calculateAmmReservesAfterSwap)(market.amm, inputAssetType, amount, (0, amm_1.getSwapDirection)(inputAssetType, direction));
67
+ const [newQuoteAssetReserve, newBaseAssetReserve] = amm_1.calculateAmmReservesAfterSwap(market.amm, inputAssetType, amount, amm_1.getSwapDirection(inputAssetType, direction));
68
68
  const acquiredBase = market.amm.baseAssetReserve.sub(newBaseAssetReserve);
69
69
  const acquiredQuote = market.amm.quoteAssetReserve.sub(newQuoteAssetReserve);
70
70
  return [acquiredBase, acquiredQuote];
@@ -86,10 +86,10 @@ exports.calculateTradeAcquiredAmounts = calculateTradeAcquiredAmounts;
86
86
  * ]
87
87
  */
88
88
  function calculateTargetPriceTrade(market, targetPrice, pct = MAXPCT, outputAssetType = 'quote') {
89
- (0, assert_1.assert)(market.amm.baseAssetReserve.gt(numericConstants_1.ZERO));
90
- (0, assert_1.assert)(targetPrice.gt(numericConstants_1.ZERO));
91
- (0, assert_1.assert)(pct.lte(MAXPCT) && pct.gt(numericConstants_1.ZERO));
92
- const markPriceBefore = (0, market_1.calculateMarkPrice)(market);
89
+ assert_1.assert(market.amm.baseAssetReserve.gt(numericConstants_1.ZERO));
90
+ assert_1.assert(targetPrice.gt(numericConstants_1.ZERO));
91
+ assert_1.assert(pct.lte(MAXPCT) && pct.gt(numericConstants_1.ZERO));
92
+ const markPriceBefore = market_1.calculateMarkPrice(market);
93
93
  if (targetPrice.gt(markPriceBefore)) {
94
94
  const priceGap = targetPrice.sub(markPriceBefore);
95
95
  const priceGapScaled = priceGap.mul(pct).div(MAXPCT);
@@ -114,11 +114,11 @@ function calculateTargetPriceTrade(market, targetPrice, pct = MAXPCT, outputAsse
114
114
  let markPriceAfter;
115
115
  if (markPriceBefore.gt(targetPrice)) {
116
116
  // overestimate y2
117
- baseAssetReserveAfter = (0, utils_1.squareRootBN)(k.div(targetPrice).mul(peg).div(numericConstants_1.PEG_PRECISION).sub(biasModifier)).sub(new anchor_1.BN(1));
117
+ baseAssetReserveAfter = utils_1.squareRootBN(k.div(targetPrice).mul(peg).div(numericConstants_1.PEG_PRECISION).sub(biasModifier)).sub(new anchor_1.BN(1));
118
118
  quoteAssetReserveAfter = k
119
119
  .div(numericConstants_1.MARK_PRICE_PRECISION)
120
120
  .div(baseAssetReserveAfter);
121
- markPriceAfter = (0, amm_1.calculatePrice)(baseAssetReserveAfter, quoteAssetReserveAfter, peg);
121
+ markPriceAfter = amm_1.calculatePrice(baseAssetReserveAfter, quoteAssetReserveAfter, peg);
122
122
  direction = types_1.PositionDirection.SHORT;
123
123
  tradeSize = quoteAssetReserveBefore
124
124
  .sub(quoteAssetReserveAfter)
@@ -129,11 +129,11 @@ function calculateTargetPriceTrade(market, targetPrice, pct = MAXPCT, outputAsse
129
129
  }
130
130
  else if (markPriceBefore.lt(targetPrice)) {
131
131
  // underestimate y2
132
- baseAssetReserveAfter = (0, utils_1.squareRootBN)(k.div(targetPrice).mul(peg).div(numericConstants_1.PEG_PRECISION).add(biasModifier)).add(new anchor_1.BN(1));
132
+ baseAssetReserveAfter = utils_1.squareRootBN(k.div(targetPrice).mul(peg).div(numericConstants_1.PEG_PRECISION).add(biasModifier)).add(new anchor_1.BN(1));
133
133
  quoteAssetReserveAfter = k
134
134
  .div(numericConstants_1.MARK_PRICE_PRECISION)
135
135
  .div(baseAssetReserveAfter);
136
- markPriceAfter = (0, amm_1.calculatePrice)(baseAssetReserveAfter, quoteAssetReserveAfter, peg);
136
+ markPriceAfter = amm_1.calculatePrice(baseAssetReserveAfter, quoteAssetReserveAfter, peg);
137
137
  direction = types_1.PositionDirection.LONG;
138
138
  tradeSize = quoteAssetReserveAfter
139
139
  .sub(quoteAssetReserveBefore)
@@ -160,8 +160,8 @@ function calculateTargetPriceTrade(market, targetPrice, pct = MAXPCT, outputAsse
160
160
  .mul(numericConstants_1.AMM_TO_QUOTE_PRECISION_RATIO)
161
161
  .mul(numericConstants_1.MARK_PRICE_PRECISION)
162
162
  .div(baseSize.abs());
163
- (0, assert_1.assert)(tp1.sub(tp2).lte(originalDiff), 'Target Price Calculation incorrect');
164
- (0, assert_1.assert)(tp2.lte(tp1) || tp2.sub(tp1).abs() < 100000, 'Target Price Calculation incorrect' +
163
+ assert_1.assert(tp1.sub(tp2).lte(originalDiff), 'Target Price Calculation incorrect');
164
+ assert_1.assert(tp2.lte(tp1) || tp2.sub(tp1).abs() < 100000, 'Target Price Calculation incorrect' +
165
165
  tp2.toString() +
166
166
  '>=' +
167
167
  tp1.toString() +
@@ -1,3 +1,2 @@
1
- /// <reference types="bn.js" />
2
- export declare const squareRootBN: (n: any, closeness?: import("bn.js")) => any;
3
- //# sourceMappingURL=utils.d.ts.map
1
+ import BN from 'bn.js';
2
+ export declare const squareRootBN: (n: any, closeness?: BN) => any;
package/lib/math/utils.js CHANGED
@@ -1,15 +1,18 @@
1
1
  "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
2
5
  Object.defineProperty(exports, "__esModule", { value: true });
3
6
  exports.squareRootBN = void 0;
4
- const bn_js_1 = require("bn.js");
5
- const squareRootBN = (n, closeness = new bn_js_1.BN(1)) => {
7
+ const bn_js_1 = __importDefault(require("bn.js"));
8
+ const squareRootBN = (n, closeness = new bn_js_1.default(1)) => {
6
9
  // Assuming the sqrt of n as n only
7
10
  let x = n;
8
11
  // The closed guess will be stored in the root
9
12
  let root;
10
13
  // To count the number of iterations
11
14
  let count = 0;
12
- const TWO = new bn_js_1.BN(2);
15
+ const TWO = new bn_js_1.default(2);
13
16
  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
14
17
  while (count < Number.MAX_SAFE_INTEGER) {
15
18
  count++;
@@ -33,4 +33,3 @@ export declare class MockUSDCFaucet {
33
33
  callback: (accountInfo: AccountInfo) => void;
34
34
  }): Promise<boolean>;
35
35
  }
36
- //# sourceMappingURL=mockUSDCFaucet.d.ts.map
@@ -0,0 +1,7 @@
1
+ /// <reference types="bn.js" />
2
+ import { OrderParams, OrderTriggerCondition, PositionDirection } from './types';
3
+ import { BN } from '@project-serum/anchor';
4
+ export declare function getLimitOrderParams(marketIndex: BN, direction: PositionDirection, baseAssetAmount: BN, price: BN, reduceOnly: boolean, discountToken?: boolean, referrer?: boolean, userOrderId?: number): OrderParams;
5
+ export declare function getStopOrderParams(marketIndex: BN, direction: PositionDirection, baseAssetAmount: BN, triggerPrice: BN, triggerCondition: OrderTriggerCondition, reduceOnly: boolean, discountToken?: boolean, referrer?: boolean, userOrderId?: number): OrderParams;
6
+ export declare function getStopLimitOrderParams(marketIndex: BN, direction: PositionDirection, baseAssetAmount: BN, price: BN, triggerPrice: BN, triggerCondition: OrderTriggerCondition, reduceOnly: boolean, discountToken?: boolean, referrer?: boolean, userOrderId?: number): OrderParams;
7
+ export declare function getMarketOrderParams(marketIndex: BN, direction: PositionDirection, quoteAssetAmount: BN, baseAssetAmount: BN, reduceOnly: boolean, price?: BN, discountToken?: boolean, referrer?: boolean): OrderParams;
@@ -0,0 +1,108 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getMarketOrderParams = exports.getStopLimitOrderParams = exports.getStopOrderParams = exports.getLimitOrderParams = void 0;
4
+ const types_1 = require("./types");
5
+ const numericConstants_1 = require("./constants/numericConstants");
6
+ function getLimitOrderParams(marketIndex, direction, baseAssetAmount, price, reduceOnly, discountToken = false, referrer = false, userOrderId = 0) {
7
+ return {
8
+ orderType: types_1.OrderType.LIMIT,
9
+ userOrderId,
10
+ marketIndex,
11
+ direction,
12
+ quoteAssetAmount: numericConstants_1.ZERO,
13
+ baseAssetAmount,
14
+ price,
15
+ reduceOnly,
16
+ postOnly: false,
17
+ immediateOrCancel: false,
18
+ positionLimit: numericConstants_1.ZERO,
19
+ padding0: true,
20
+ padding1: numericConstants_1.ZERO,
21
+ optionalAccounts: {
22
+ discountToken,
23
+ referrer,
24
+ },
25
+ triggerCondition: types_1.OrderTriggerCondition.ABOVE,
26
+ triggerPrice: numericConstants_1.ZERO,
27
+ oraclePriceOffset: numericConstants_1.ZERO,
28
+ };
29
+ }
30
+ exports.getLimitOrderParams = getLimitOrderParams;
31
+ function getStopOrderParams(marketIndex, direction, baseAssetAmount, triggerPrice, triggerCondition, reduceOnly, discountToken = false, referrer = false, userOrderId = 0) {
32
+ return {
33
+ orderType: types_1.OrderType.STOP,
34
+ userOrderId,
35
+ marketIndex,
36
+ direction,
37
+ quoteAssetAmount: numericConstants_1.ZERO,
38
+ baseAssetAmount,
39
+ price: numericConstants_1.ZERO,
40
+ reduceOnly,
41
+ postOnly: false,
42
+ immediateOrCancel: false,
43
+ positionLimit: numericConstants_1.ZERO,
44
+ padding0: true,
45
+ padding1: numericConstants_1.ZERO,
46
+ optionalAccounts: {
47
+ discountToken,
48
+ referrer,
49
+ },
50
+ triggerCondition,
51
+ triggerPrice,
52
+ oraclePriceOffset: numericConstants_1.ZERO,
53
+ };
54
+ }
55
+ exports.getStopOrderParams = getStopOrderParams;
56
+ function getStopLimitOrderParams(marketIndex, direction, baseAssetAmount, price, triggerPrice, triggerCondition, reduceOnly, discountToken = false, referrer = false, userOrderId = 0) {
57
+ return {
58
+ orderType: types_1.OrderType.STOP_LIMIT,
59
+ userOrderId,
60
+ marketIndex,
61
+ direction,
62
+ quoteAssetAmount: numericConstants_1.ZERO,
63
+ baseAssetAmount,
64
+ price,
65
+ reduceOnly,
66
+ postOnly: false,
67
+ immediateOrCancel: false,
68
+ positionLimit: numericConstants_1.ZERO,
69
+ padding0: true,
70
+ padding1: numericConstants_1.ZERO,
71
+ optionalAccounts: {
72
+ discountToken,
73
+ referrer,
74
+ },
75
+ triggerCondition,
76
+ triggerPrice,
77
+ oraclePriceOffset: numericConstants_1.ZERO,
78
+ };
79
+ }
80
+ exports.getStopLimitOrderParams = getStopLimitOrderParams;
81
+ function getMarketOrderParams(marketIndex, direction, quoteAssetAmount, baseAssetAmount, reduceOnly, price = numericConstants_1.ZERO, discountToken = false, referrer = false) {
82
+ if (baseAssetAmount.eq(numericConstants_1.ZERO) && quoteAssetAmount.eq(numericConstants_1.ZERO)) {
83
+ throw Error('baseAssetAmount or quoteAssetAmount must be zero');
84
+ }
85
+ return {
86
+ orderType: types_1.OrderType.MARKET,
87
+ userOrderId: 0,
88
+ marketIndex,
89
+ direction,
90
+ quoteAssetAmount,
91
+ baseAssetAmount,
92
+ price,
93
+ reduceOnly,
94
+ postOnly: false,
95
+ immediateOrCancel: false,
96
+ positionLimit: numericConstants_1.ZERO,
97
+ padding0: true,
98
+ padding1: numericConstants_1.ZERO,
99
+ optionalAccounts: {
100
+ discountToken,
101
+ referrer,
102
+ },
103
+ triggerCondition: types_1.OrderTriggerCondition.ABOVE,
104
+ triggerPrice: numericConstants_1.ZERO,
105
+ oraclePriceOffset: numericConstants_1.ZERO,
106
+ };
107
+ }
108
+ exports.getMarketOrderParams = getMarketOrderParams;
@@ -0,0 +1,5 @@
1
+ import { Market, Order, UserAccount, UserPosition } from './types';
2
+ import BN from 'bn.js';
3
+ export declare function calculateNewStateAfterOrder(userAccount: UserAccount, userPosition: UserPosition, market: Market, order: Order): [UserAccount, UserPosition, Market] | null;
4
+ export declare function calculateAmountToTradeForLimit(market: Market, order: Order): BN;
5
+ export declare function calculateAmountToTradeForStopLimit(market: Market, order: Order): BN;