@drift-labs/sdk 0.2.0-master.0 → 0.2.0-master.11

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 (121) hide show
  1. package/lib/admin.d.ts +8 -5
  2. package/lib/admin.js +43 -11
  3. package/lib/clearingHouse.d.ts +28 -18
  4. package/lib/clearingHouse.js +366 -143
  5. package/lib/clearingHouseUser.d.ts +2 -2
  6. package/lib/clearingHouseUser.js +8 -17
  7. package/lib/config.js +1 -1
  8. package/lib/constants/banks.js +9 -2
  9. package/lib/constants/numericConstants.d.ts +2 -0
  10. package/lib/constants/numericConstants.js +3 -1
  11. package/lib/factory/bigNum.d.ts +8 -2
  12. package/lib/factory/bigNum.js +14 -6
  13. package/lib/idl/clearing_house.json +805 -202
  14. package/lib/idl/{mock_usdc_faucet.json → token_faucet.json} +46 -23
  15. package/lib/index.d.ts +3 -2
  16. package/lib/index.js +7 -2
  17. package/lib/math/amm.d.ts +6 -1
  18. package/lib/math/amm.js +124 -41
  19. package/lib/math/auction.js +4 -1
  20. package/lib/math/orders.d.ts +2 -2
  21. package/lib/math/orders.js +18 -11
  22. package/lib/math/position.js +3 -1
  23. package/lib/math/repeg.js +1 -1
  24. package/lib/math/trade.d.ts +1 -1
  25. package/lib/math/trade.js +7 -10
  26. package/lib/orderParams.d.ts +14 -5
  27. package/lib/orderParams.js +8 -96
  28. package/lib/orders.d.ts +1 -2
  29. package/lib/orders.js +6 -85
  30. package/lib/slot/SlotSubscriber.d.ts +7 -0
  31. package/lib/slot/SlotSubscriber.js +3 -0
  32. package/lib/{mockUSDCFaucet.d.ts → tokenFaucet.d.ts} +7 -5
  33. package/lib/{mockUSDCFaucet.js → tokenFaucet.js} +41 -40
  34. package/lib/tx/utils.js +1 -1
  35. package/lib/types.d.ts +137 -14
  36. package/lib/types.js +53 -1
  37. package/lib/util/computeUnits.js +1 -1
  38. package/package.json +3 -3
  39. package/src/accounts/bulkAccountLoader.js +197 -0
  40. package/src/accounts/bulkUserSubscription.js +33 -0
  41. package/src/accounts/fetch.js +29 -0
  42. package/src/accounts/pollingClearingHouseAccountSubscriber.js +311 -0
  43. package/src/accounts/pollingOracleSubscriber.js +93 -0
  44. package/src/accounts/pollingTokenAccountSubscriber.js +90 -0
  45. package/src/accounts/pollingUserAccountSubscriber.js +132 -0
  46. package/src/accounts/types.js +10 -0
  47. package/src/accounts/utils.js +7 -0
  48. package/src/accounts/webSocketAccountSubscriber.js +93 -0
  49. package/src/accounts/webSocketClearingHouseAccountSubscriber.js +233 -0
  50. package/src/accounts/webSocketUserAccountSubscriber.js +62 -0
  51. package/src/addresses/marketAddresses.js +26 -0
  52. package/src/addresses/pda.js +104 -0
  53. package/src/admin.ts +66 -14
  54. package/src/assert/assert.js +9 -0
  55. package/src/clearingHouse.ts +558 -230
  56. package/src/clearingHouseUser.ts +12 -23
  57. package/src/config.ts +1 -1
  58. package/src/constants/banks.ts +9 -2
  59. package/src/constants/numericConstants.ts +2 -0
  60. package/src/events/eventList.js +77 -0
  61. package/src/events/eventSubscriber.js +139 -0
  62. package/src/events/fetchLogs.js +50 -0
  63. package/src/events/pollingLogProvider.js +64 -0
  64. package/src/events/sort.js +44 -0
  65. package/src/events/txEventCache.js +71 -0
  66. package/src/events/types.js +20 -0
  67. package/src/events/webSocketLogProvider.js +41 -0
  68. package/src/examples/makeTradeExample.js +80 -0
  69. package/src/factory/bigNum.js +364 -0
  70. package/src/factory/bigNum.ts +26 -9
  71. package/src/factory/oracleClient.js +20 -0
  72. package/src/idl/clearing_house.json +805 -202
  73. package/src/idl/{mock_usdc_faucet.json → token_faucet.json} +46 -23
  74. package/src/index.js +100 -0
  75. package/src/index.ts +3 -2
  76. package/src/math/amm.js +369 -0
  77. package/src/math/amm.ts +207 -52
  78. package/src/math/auction.js +42 -0
  79. package/src/math/auction.ts +5 -1
  80. package/src/math/bankBalance.js +75 -0
  81. package/src/math/conversion.js +11 -0
  82. package/src/math/funding.js +248 -0
  83. package/src/math/market.js +57 -0
  84. package/src/math/oracles.js +26 -0
  85. package/src/math/orders.js +110 -0
  86. package/src/math/orders.ts +17 -13
  87. package/src/math/position.js +140 -0
  88. package/src/math/position.ts +5 -1
  89. package/src/math/repeg.js +128 -0
  90. package/src/math/repeg.ts +2 -1
  91. package/src/math/state.js +15 -0
  92. package/src/math/trade.js +253 -0
  93. package/src/math/trade.ts +23 -25
  94. package/src/math/utils.js +0 -1
  95. package/src/mockUSDCFaucet.js +280 -0
  96. package/src/oracles/oracleClientCache.js +19 -0
  97. package/src/oracles/pythClient.js +46 -0
  98. package/src/oracles/quoteAssetOracleClient.js +32 -0
  99. package/src/oracles/switchboardClient.js +69 -0
  100. package/src/oracles/types.js +2 -0
  101. package/src/orderParams.js +20 -0
  102. package/src/orderParams.ts +20 -141
  103. package/src/orders.js +134 -0
  104. package/src/orders.ts +7 -131
  105. package/src/slot/SlotSubscriber.js +39 -0
  106. package/src/slot/SlotSubscriber.ts +11 -1
  107. package/src/token/index.js +38 -0
  108. package/src/{mockUSDCFaucet.ts → tokenFaucet.ts} +48 -59
  109. package/src/tx/retryTxSender.js +188 -0
  110. package/src/tx/types.js +2 -0
  111. package/src/tx/utils.js +17 -0
  112. package/src/tx/utils.ts +1 -1
  113. package/src/types.js +114 -0
  114. package/src/types.ts +132 -16
  115. package/src/userName.js +20 -0
  116. package/src/util/computeUnits.ts +1 -1
  117. package/src/util/promiseTimeout.js +14 -0
  118. package/src/util/tps.js +27 -0
  119. package/src/wallet.js +35 -0
  120. package/src/util/computeUnits.js +0 -17
  121. package/src/util/computeUnits.js.map +0 -1
@@ -0,0 +1,128 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.calculateBudgetedPeg = exports.calculateBudgetedK = exports.calculateBudgetedKBN = exports.calculateRepegCost = exports.calculateAdjustKCost = void 0;
4
+ const anchor_1 = require("@project-serum/anchor");
5
+ const assert_1 = require("../assert/assert");
6
+ const numericConstants_1 = require("../constants/numericConstants");
7
+ /**
8
+ * Helper function calculating adjust k cost
9
+ * @param amm
10
+ * @param numerator
11
+ * @param denomenator
12
+ * @returns cost : Precision QUOTE_ASSET_PRECISION
13
+ */
14
+ function calculateAdjustKCost(amm, numerator, denomenator) {
15
+ // const k = market.amm.sqrtK.mul(market.amm.sqrtK);
16
+ const x = amm.baseAssetReserve;
17
+ const y = amm.quoteAssetReserve;
18
+ const d = amm.netBaseAssetAmount;
19
+ const Q = amm.pegMultiplier;
20
+ const quoteScale = y.mul(d).mul(Q); //.div(AMM_RESERVE_PRECISION);
21
+ const p = numerator.mul(numericConstants_1.MARK_PRICE_PRECISION).div(denomenator);
22
+ const cost = quoteScale
23
+ .div(x.add(d))
24
+ .sub(quoteScale
25
+ .mul(p)
26
+ .div(numericConstants_1.MARK_PRICE_PRECISION)
27
+ .div(x.mul(p).div(numericConstants_1.MARK_PRICE_PRECISION).add(d)))
28
+ .div(numericConstants_1.AMM_TO_QUOTE_PRECISION_RATIO)
29
+ .div(numericConstants_1.PEG_PRECISION);
30
+ return cost.mul(new anchor_1.BN(-1));
31
+ }
32
+ exports.calculateAdjustKCost = calculateAdjustKCost;
33
+ /**
34
+ * Helper function calculating adjust pegMultiplier (repeg) cost
35
+ *
36
+ * @param amm
37
+ * @param newPeg
38
+ * @returns cost : Precision QUOTE_ASSET_PRECISION
39
+ */
40
+ function calculateRepegCost(amm, newPeg) {
41
+ const dqar = amm.quoteAssetReserve.sub(amm.terminalQuoteAssetReserve);
42
+ const cost = dqar
43
+ .mul(newPeg.sub(amm.pegMultiplier))
44
+ .div(numericConstants_1.AMM_TO_QUOTE_PRECISION_RATIO)
45
+ .div(numericConstants_1.PEG_PRECISION);
46
+ return cost;
47
+ }
48
+ exports.calculateRepegCost = calculateRepegCost;
49
+ function calculateBudgetedKBN(x, y, budget, Q, d) {
50
+ assert_1.assert(Q.gt(new anchor_1.BN(0)));
51
+ const C = budget.mul(new anchor_1.BN(-1));
52
+ let dSign = new anchor_1.BN(1);
53
+ if (d.lt(new anchor_1.BN(0))) {
54
+ dSign = new anchor_1.BN(-1);
55
+ }
56
+ const pegged_y_d_d = y
57
+ .mul(d)
58
+ .mul(d)
59
+ .mul(Q)
60
+ .div(numericConstants_1.AMM_RESERVE_PRECISION)
61
+ .div(numericConstants_1.AMM_RESERVE_PRECISION)
62
+ .div(numericConstants_1.PEG_PRECISION);
63
+ const numer1 = pegged_y_d_d;
64
+ const numer2 = C.mul(d)
65
+ .div(numericConstants_1.QUOTE_PRECISION)
66
+ .mul(x.add(d))
67
+ .div(numericConstants_1.AMM_RESERVE_PRECISION)
68
+ .mul(dSign);
69
+ const denom1 = C.mul(x)
70
+ .mul(x.add(d))
71
+ .div(numericConstants_1.AMM_RESERVE_PRECISION)
72
+ .div(numericConstants_1.QUOTE_PRECISION);
73
+ const denom2 = pegged_y_d_d;
74
+ const numerator = numer1.sub(numer2).div(numericConstants_1.AMM_TO_QUOTE_PRECISION_RATIO);
75
+ const denominator = denom1.add(denom2).div(numericConstants_1.AMM_TO_QUOTE_PRECISION_RATIO);
76
+ return [numerator, denominator];
77
+ }
78
+ exports.calculateBudgetedKBN = calculateBudgetedKBN;
79
+ function calculateBudgetedK(amm, cost) {
80
+ // wolframalpha.com
81
+ // (1/(x+d) - p/(x*p+d))*y*d*Q = C solve for p
82
+ // p = (d(y*d*Q - C(x+d))) / (C*x(x+d) + y*d*d*Q)
83
+ // numer
84
+ // = y*d*d*Q - Cxd - Cdd
85
+ // = y/x*Q*d*d - Cd - Cd/x
86
+ // = mark - C/d - C/(x)
87
+ // = mark/C - 1/d - 1/x
88
+ // denom
89
+ // = C*x*x + C*x*d + y*d*d*Q
90
+ // = x/d**2 + 1 / d + mark/C
91
+ // todo: assumes k = x * y
92
+ // otherwise use: (y(1-p) + (kp^2/(x*p+d)) - k/(x+d)) * Q = C solve for p
93
+ const x = amm.baseAssetReserve;
94
+ const y = amm.quoteAssetReserve;
95
+ const d = amm.netBaseAssetAmount;
96
+ const Q = amm.pegMultiplier;
97
+ const [numerator, denominator] = calculateBudgetedKBN(x, y, cost, Q, d);
98
+ return [numerator, denominator];
99
+ }
100
+ exports.calculateBudgetedK = calculateBudgetedK;
101
+ function calculateBudgetedPeg(amm, cost, targetPrice) {
102
+ // wolframalpha.com
103
+ // (1/(x+d) - p/(x*p+d))*y*d*Q = C solve for p
104
+ // p = (d(y*d*Q - C(x+d))) / (C*x(x+d) + y*y*d*Q)
105
+ // todo: assumes k = x * y
106
+ // otherwise use: (y(1-p) + (kp^2/(x*p+d)) - k/(x+d)) * Q = C solve for p
107
+ const targetPeg = targetPrice
108
+ .mul(amm.baseAssetReserve)
109
+ .div(amm.quoteAssetReserve)
110
+ .div(numericConstants_1.PRICE_DIV_PEG);
111
+ const k = amm.sqrtK.mul(amm.sqrtK);
112
+ const x = amm.baseAssetReserve;
113
+ const y = amm.quoteAssetReserve;
114
+ const d = amm.netBaseAssetAmount;
115
+ const Q = amm.pegMultiplier;
116
+ const C = cost.mul(new anchor_1.BN(-1));
117
+ const deltaQuoteAssetReserves = y.sub(k.div(x.add(d)));
118
+ const pegChangeDirection = targetPeg.sub(Q);
119
+ const useTargetPeg = (deltaQuoteAssetReserves.lt(numericConstants_1.ZERO) && pegChangeDirection.gt(numericConstants_1.ZERO)) ||
120
+ (deltaQuoteAssetReserves.gt(numericConstants_1.ZERO) && pegChangeDirection.lt(numericConstants_1.ZERO));
121
+ if (deltaQuoteAssetReserves.eq(numericConstants_1.ZERO) || useTargetPeg) {
122
+ return targetPeg;
123
+ }
124
+ const deltaPegMultiplier = C.mul(numericConstants_1.MARK_PRICE_PRECISION).div(deltaQuoteAssetReserves.div(numericConstants_1.AMM_TO_QUOTE_PRECISION_RATIO));
125
+ const newPeg = Q.sub(deltaPegMultiplier.mul(numericConstants_1.PEG_PRECISION).div(numericConstants_1.MARK_PRICE_PRECISION));
126
+ return newPeg;
127
+ }
128
+ exports.calculateBudgetedPeg = calculateBudgetedPeg;
package/src/math/repeg.ts CHANGED
@@ -5,6 +5,7 @@ import {
5
5
  AMM_RESERVE_PRECISION,
6
6
  PEG_PRECISION,
7
7
  AMM_TO_QUOTE_PRECISION_RATIO,
8
+ PRICE_DIV_PEG,
8
9
  QUOTE_PRECISION,
9
10
  ZERO,
10
11
  } from '../constants/numericConstants';
@@ -142,7 +143,7 @@ export function calculateBudgetedPeg(amm: AMM, cost: BN, targetPrice: BN): BN {
142
143
  const targetPeg = targetPrice
143
144
  .mul(amm.baseAssetReserve)
144
145
  .div(amm.quoteAssetReserve)
145
- .div(MARK_PRICE_PRECISION.div(PEG_PRECISION));
146
+ .div(PRICE_DIV_PEG);
146
147
 
147
148
  const k = amm.sqrtK.mul(amm.sqrtK);
148
149
  const x = amm.baseAssetReserve;
@@ -0,0 +1,15 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getExchangeFee = void 0;
4
+ /**
5
+ * Get the clearing house percent fee charged on notional of taking trades
6
+ *
7
+ * @param state
8
+ * @returns Precision : basis points (bps)
9
+ */
10
+ function getExchangeFee(state) {
11
+ const exchangeFee = state.feeStructure.feeNumerator.toNumber() /
12
+ state.feeStructure.feeDenominator.toNumber();
13
+ return exchangeFee;
14
+ }
15
+ exports.getExchangeFee = getExchangeFee;
@@ -0,0 +1,253 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.calculateTargetPriceTrade = exports.calculateTradeAcquiredAmounts = exports.calculateTradeSlippage = void 0;
4
+ const types_1 = require("../types");
5
+ const anchor_1 = require("@project-serum/anchor");
6
+ const assert_1 = require("../assert/assert");
7
+ const numericConstants_1 = require("../constants/numericConstants");
8
+ const market_1 = require("./market");
9
+ const amm_1 = require("./amm");
10
+ const utils_1 = require("./utils");
11
+ const types_2 = require("../types");
12
+ const MAXPCT = new anchor_1.BN(1000); //percentage units are [0,1000] => [0,1]
13
+ /**
14
+ * Calculates avg/max slippage (price impact) for candidate trade
15
+ * @param direction
16
+ * @param amount
17
+ * @param market
18
+ * @param inputAssetType which asset is being traded
19
+ * @param useSpread whether to consider spread with calculating slippage
20
+ * @return [pctAvgSlippage, pctMaxSlippage, entryPrice, newPrice]
21
+ *
22
+ * 'pctAvgSlippage' => the percentage change to entryPrice (average est slippage in execution) : Precision MARK_PRICE_PRECISION
23
+ *
24
+ * 'pctMaxSlippage' => the percentage change to maxPrice (highest est slippage in execution) : Precision MARK_PRICE_PRECISION
25
+ *
26
+ * 'entryPrice' => the average price of the trade : Precision MARK_PRICE_PRECISION
27
+ *
28
+ * 'newPrice' => the price of the asset after the trade : Precision MARK_PRICE_PRECISION
29
+ */
30
+ function calculateTradeSlippage(direction, amount, market, inputAssetType = 'quote', oraclePriceData, useSpread = true) {
31
+ let oldPrice;
32
+ if (useSpread && market.amm.baseSpread > 0) {
33
+ if (types_2.isVariant(direction, 'long')) {
34
+ oldPrice = market_1.calculateAskPrice(market, oraclePriceData);
35
+ }
36
+ else {
37
+ oldPrice = market_1.calculateBidPrice(market, oraclePriceData);
38
+ }
39
+ }
40
+ else {
41
+ oldPrice = market_1.calculateMarkPrice(market, oraclePriceData);
42
+ }
43
+ if (amount.eq(numericConstants_1.ZERO)) {
44
+ return [numericConstants_1.ZERO, numericConstants_1.ZERO, oldPrice, oldPrice];
45
+ }
46
+ const [acquiredBaseReserve, acquiredQuoteReserve, acquiredQuoteAssetAmount] = calculateTradeAcquiredAmounts(direction, amount, market, inputAssetType, oraclePriceData, useSpread);
47
+ const entryPrice = acquiredQuoteAssetAmount
48
+ .mul(numericConstants_1.AMM_TO_QUOTE_PRECISION_RATIO)
49
+ .mul(numericConstants_1.MARK_PRICE_PRECISION)
50
+ .div(acquiredBaseReserve.abs());
51
+ let amm;
52
+ if (useSpread && market.amm.baseSpread > 0) {
53
+ const { baseAssetReserve, quoteAssetReserve, sqrtK, newPeg } = amm_1.calculateUpdatedAMMSpreadReserves(market.amm, direction, oraclePriceData);
54
+ amm = {
55
+ baseAssetReserve,
56
+ quoteAssetReserve,
57
+ sqrtK: sqrtK,
58
+ pegMultiplier: newPeg,
59
+ };
60
+ }
61
+ else {
62
+ amm = market.amm;
63
+ }
64
+ const newPrice = amm_1.calculatePrice(amm.baseAssetReserve.sub(acquiredBaseReserve), amm.quoteAssetReserve.sub(acquiredQuoteReserve), amm.pegMultiplier);
65
+ if (direction == types_1.PositionDirection.SHORT) {
66
+ assert_1.assert(newPrice.lte(oldPrice));
67
+ }
68
+ else {
69
+ assert_1.assert(oldPrice.lte(newPrice));
70
+ }
71
+ const pctMaxSlippage = newPrice
72
+ .sub(oldPrice)
73
+ .mul(numericConstants_1.MARK_PRICE_PRECISION)
74
+ .div(oldPrice)
75
+ .abs();
76
+ const pctAvgSlippage = entryPrice
77
+ .sub(oldPrice)
78
+ .mul(numericConstants_1.MARK_PRICE_PRECISION)
79
+ .div(oldPrice)
80
+ .abs();
81
+ return [pctAvgSlippage, pctMaxSlippage, entryPrice, newPrice];
82
+ }
83
+ exports.calculateTradeSlippage = calculateTradeSlippage;
84
+ /**
85
+ * Calculates acquired amounts for trade executed
86
+ * @param direction
87
+ * @param amount
88
+ * @param market
89
+ * @param inputAssetType
90
+ * @param useSpread
91
+ * @return
92
+ * | 'acquiredBase' => positive/negative change in user's base : BN AMM_RESERVE_PRECISION
93
+ * | 'acquiredQuote' => positive/negative change in user's quote : BN TODO-PRECISION
94
+ */
95
+ function calculateTradeAcquiredAmounts(direction, amount, market, inputAssetType = 'quote', oraclePriceData, useSpread = true) {
96
+ if (amount.eq(numericConstants_1.ZERO)) {
97
+ return [numericConstants_1.ZERO, numericConstants_1.ZERO, numericConstants_1.ZERO];
98
+ }
99
+ const swapDirection = amm_1.getSwapDirection(inputAssetType, direction);
100
+ let amm;
101
+ if (useSpread && market.amm.baseSpread > 0) {
102
+ const { baseAssetReserve, quoteAssetReserve, sqrtK, newPeg } = amm_1.calculateUpdatedAMMSpreadReserves(market.amm, direction, oraclePriceData);
103
+ amm = {
104
+ baseAssetReserve,
105
+ quoteAssetReserve,
106
+ sqrtK: sqrtK,
107
+ pegMultiplier: newPeg,
108
+ };
109
+ }
110
+ else {
111
+ amm = market.amm;
112
+ }
113
+ const [newQuoteAssetReserve, newBaseAssetReserve] = amm_1.calculateAmmReservesAfterSwap(amm, inputAssetType, amount, swapDirection);
114
+ const acquiredBase = amm.baseAssetReserve.sub(newBaseAssetReserve);
115
+ const acquiredQuote = amm.quoteAssetReserve.sub(newQuoteAssetReserve);
116
+ const acquiredQuoteAssetamount = amm_1.calculateQuoteAssetAmountSwapped(acquiredQuote.abs(), amm.pegMultiplier, swapDirection);
117
+ return [acquiredBase, acquiredQuote, acquiredQuoteAssetamount];
118
+ }
119
+ exports.calculateTradeAcquiredAmounts = calculateTradeAcquiredAmounts;
120
+ /**
121
+ * calculateTargetPriceTrade
122
+ * simple function for finding arbitraging trades
123
+ * @param market
124
+ * @param targetPrice
125
+ * @param pct optional default is 100% gap filling, can set smaller.
126
+ * @param outputAssetType which asset to trade.
127
+ * @param useSpread whether or not to consider the spread when calculating the trade size
128
+ * @returns trade direction/size in order to push price to a targetPrice,
129
+ *
130
+ * [
131
+ * direction => direction of trade required, PositionDirection
132
+ * tradeSize => size of trade required, TODO-PRECISION
133
+ * entryPrice => the entry price for the trade, MARK_PRICE_PRECISION
134
+ * targetPrice => the target price MARK_PRICE_PRECISION
135
+ * ]
136
+ */
137
+ function calculateTargetPriceTrade(market, targetPrice, pct = MAXPCT, outputAssetType = 'quote', oraclePriceData, useSpread = true) {
138
+ assert_1.assert(market.amm.baseAssetReserve.gt(numericConstants_1.ZERO));
139
+ assert_1.assert(targetPrice.gt(numericConstants_1.ZERO));
140
+ assert_1.assert(pct.lte(MAXPCT) && pct.gt(numericConstants_1.ZERO));
141
+ const markPriceBefore = market_1.calculateMarkPrice(market, oraclePriceData);
142
+ const bidPriceBefore = market_1.calculateBidPrice(market, oraclePriceData);
143
+ const askPriceBefore = market_1.calculateAskPrice(market, oraclePriceData);
144
+ let direction;
145
+ if (targetPrice.gt(markPriceBefore)) {
146
+ const priceGap = targetPrice.sub(markPriceBefore);
147
+ const priceGapScaled = priceGap.mul(pct).div(MAXPCT);
148
+ targetPrice = markPriceBefore.add(priceGapScaled);
149
+ direction = types_1.PositionDirection.LONG;
150
+ }
151
+ else {
152
+ const priceGap = markPriceBefore.sub(targetPrice);
153
+ const priceGapScaled = priceGap.mul(pct).div(MAXPCT);
154
+ targetPrice = markPriceBefore.sub(priceGapScaled);
155
+ direction = types_1.PositionDirection.SHORT;
156
+ }
157
+ let tradeSize;
158
+ let baseSize;
159
+ let baseAssetReserveBefore;
160
+ let quoteAssetReserveBefore;
161
+ let peg = market.amm.pegMultiplier;
162
+ if (useSpread && market.amm.baseSpread > 0) {
163
+ const { baseAssetReserve, quoteAssetReserve, newPeg } = amm_1.calculateUpdatedAMMSpreadReserves(market.amm, direction, oraclePriceData);
164
+ baseAssetReserveBefore = baseAssetReserve;
165
+ quoteAssetReserveBefore = quoteAssetReserve;
166
+ peg = newPeg;
167
+ }
168
+ else {
169
+ baseAssetReserveBefore = market.amm.baseAssetReserve;
170
+ quoteAssetReserveBefore = market.amm.quoteAssetReserve;
171
+ }
172
+ const invariant = market.amm.sqrtK.mul(market.amm.sqrtK);
173
+ const k = invariant.mul(numericConstants_1.MARK_PRICE_PRECISION);
174
+ let baseAssetReserveAfter;
175
+ let quoteAssetReserveAfter;
176
+ const biasModifier = new anchor_1.BN(1);
177
+ let markPriceAfter;
178
+ if (useSpread &&
179
+ targetPrice.lt(askPriceBefore) &&
180
+ targetPrice.gt(bidPriceBefore)) {
181
+ // no trade, market is at target
182
+ if (markPriceBefore.gt(targetPrice)) {
183
+ direction = types_1.PositionDirection.SHORT;
184
+ }
185
+ else {
186
+ direction = types_1.PositionDirection.LONG;
187
+ }
188
+ tradeSize = numericConstants_1.ZERO;
189
+ return [direction, tradeSize, targetPrice, targetPrice];
190
+ }
191
+ else if (markPriceBefore.gt(targetPrice)) {
192
+ // overestimate y2
193
+ baseAssetReserveAfter = utils_1.squareRootBN(k.div(targetPrice).mul(peg).div(numericConstants_1.PEG_PRECISION).sub(biasModifier)).sub(new anchor_1.BN(1));
194
+ quoteAssetReserveAfter = k
195
+ .div(numericConstants_1.MARK_PRICE_PRECISION)
196
+ .div(baseAssetReserveAfter);
197
+ markPriceAfter = amm_1.calculatePrice(baseAssetReserveAfter, quoteAssetReserveAfter, peg);
198
+ direction = types_1.PositionDirection.SHORT;
199
+ tradeSize = quoteAssetReserveBefore
200
+ .sub(quoteAssetReserveAfter)
201
+ .mul(peg)
202
+ .div(numericConstants_1.PEG_PRECISION)
203
+ .div(numericConstants_1.AMM_TO_QUOTE_PRECISION_RATIO);
204
+ baseSize = baseAssetReserveAfter.sub(baseAssetReserveBefore);
205
+ }
206
+ else if (markPriceBefore.lt(targetPrice)) {
207
+ // underestimate y2
208
+ baseAssetReserveAfter = utils_1.squareRootBN(k.div(targetPrice).mul(peg).div(numericConstants_1.PEG_PRECISION).add(biasModifier)).add(new anchor_1.BN(1));
209
+ quoteAssetReserveAfter = k
210
+ .div(numericConstants_1.MARK_PRICE_PRECISION)
211
+ .div(baseAssetReserveAfter);
212
+ markPriceAfter = amm_1.calculatePrice(baseAssetReserveAfter, quoteAssetReserveAfter, peg);
213
+ direction = types_1.PositionDirection.LONG;
214
+ tradeSize = quoteAssetReserveAfter
215
+ .sub(quoteAssetReserveBefore)
216
+ .mul(peg)
217
+ .div(numericConstants_1.PEG_PRECISION)
218
+ .div(numericConstants_1.AMM_TO_QUOTE_PRECISION_RATIO);
219
+ baseSize = baseAssetReserveBefore.sub(baseAssetReserveAfter);
220
+ }
221
+ else {
222
+ // no trade, market is at target
223
+ direction = types_1.PositionDirection.LONG;
224
+ tradeSize = numericConstants_1.ZERO;
225
+ return [direction, tradeSize, targetPrice, targetPrice];
226
+ }
227
+ let tp1 = targetPrice;
228
+ let tp2 = markPriceAfter;
229
+ let originalDiff = targetPrice.sub(markPriceBefore);
230
+ if (direction == types_1.PositionDirection.SHORT) {
231
+ tp1 = markPriceAfter;
232
+ tp2 = targetPrice;
233
+ originalDiff = markPriceBefore.sub(targetPrice);
234
+ }
235
+ const entryPrice = tradeSize
236
+ .mul(numericConstants_1.AMM_TO_QUOTE_PRECISION_RATIO)
237
+ .mul(numericConstants_1.MARK_PRICE_PRECISION)
238
+ .div(baseSize.abs());
239
+ assert_1.assert(tp1.sub(tp2).lte(originalDiff), 'Target Price Calculation incorrect');
240
+ assert_1.assert(tp2.lte(tp1) || tp2.sub(tp1).abs() < 100000, 'Target Price Calculation incorrect' +
241
+ tp2.toString() +
242
+ '>=' +
243
+ tp1.toString() +
244
+ 'err: ' +
245
+ tp2.sub(tp1).abs().toString());
246
+ if (outputAssetType == 'quote') {
247
+ return [direction, tradeSize, entryPrice, targetPrice];
248
+ }
249
+ else {
250
+ return [direction, baseSize, entryPrice, targetPrice];
251
+ }
252
+ }
253
+ exports.calculateTargetPriceTrade = calculateTargetPriceTrade;
package/src/math/trade.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { MarketAccount, PositionDirection, SwapDirection } from '../types';
1
+ import { MarketAccount, PositionDirection } from '../types';
2
2
  import { BN } from '@project-serum/anchor';
3
3
  import { assert } from '../assert/assert';
4
4
  import {
@@ -78,28 +78,20 @@ export function calculateTradeSlippage(
78
78
  if (amount.eq(ZERO)) {
79
79
  return [ZERO, ZERO, oldPrice, oldPrice];
80
80
  }
81
- const [acquiredBase, acquiredQuote] = calculateTradeAcquiredAmounts(
82
- direction,
83
- amount,
84
- market,
85
- inputAssetType,
86
- oraclePriceData,
87
- useSpread
88
- );
89
-
90
- const swapDirection = isVariant(direction, 'long')
91
- ? SwapDirection.REMOVE
92
- : SwapDirection.ADD;
93
- const quoteAssetAmountAcquired = calculateQuoteAssetAmountSwapped(
94
- acquiredQuote.abs(),
95
- market.amm.pegMultiplier,
96
- swapDirection
97
- );
81
+ const [acquiredBaseReserve, acquiredQuoteReserve, acquiredQuoteAssetAmount] =
82
+ calculateTradeAcquiredAmounts(
83
+ direction,
84
+ amount,
85
+ market,
86
+ inputAssetType,
87
+ oraclePriceData,
88
+ useSpread
89
+ );
98
90
 
99
- const entryPrice = quoteAssetAmountAcquired
91
+ const entryPrice = acquiredQuoteAssetAmount
100
92
  .mul(AMM_TO_QUOTE_PRECISION_RATIO)
101
93
  .mul(MARK_PRICE_PRECISION)
102
- .div(acquiredBase.abs());
94
+ .div(acquiredBaseReserve.abs());
103
95
 
104
96
  let amm: Parameters<typeof calculateAmmReservesAfterSwap>[0];
105
97
  if (useSpread && market.amm.baseSpread > 0) {
@@ -116,8 +108,8 @@ export function calculateTradeSlippage(
116
108
  }
117
109
 
118
110
  const newPrice = calculatePrice(
119
- amm.baseAssetReserve.sub(acquiredBase),
120
- amm.quoteAssetReserve.sub(acquiredQuote),
111
+ amm.baseAssetReserve.sub(acquiredBaseReserve),
112
+ amm.quoteAssetReserve.sub(acquiredQuoteReserve),
121
113
  amm.pegMultiplier
122
114
  );
123
115
 
@@ -159,9 +151,9 @@ export function calculateTradeAcquiredAmounts(
159
151
  inputAssetType: AssetType = 'quote',
160
152
  oraclePriceData: OraclePriceData,
161
153
  useSpread = true
162
- ): [BN, BN] {
154
+ ): [BN, BN, BN] {
163
155
  if (amount.eq(ZERO)) {
164
- return [ZERO, ZERO];
156
+ return [ZERO, ZERO, ZERO];
165
157
  }
166
158
 
167
159
  const swapDirection = getSwapDirection(inputAssetType, direction);
@@ -185,7 +177,13 @@ export function calculateTradeAcquiredAmounts(
185
177
 
186
178
  const acquiredBase = amm.baseAssetReserve.sub(newBaseAssetReserve);
187
179
  const acquiredQuote = amm.quoteAssetReserve.sub(newQuoteAssetReserve);
188
- return [acquiredBase, acquiredQuote];
180
+ const acquiredQuoteAssetamount = calculateQuoteAssetAmountSwapped(
181
+ acquiredQuote.abs(),
182
+ amm.pegMultiplier,
183
+ swapDirection
184
+ );
185
+
186
+ return [acquiredBase, acquiredQuote, acquiredQuoteAssetamount];
189
187
  }
190
188
 
191
189
  /**
package/src/math/utils.js CHANGED
@@ -24,4 +24,3 @@ const squareRootBN = (n, closeness = new __1.BN(1)) => {
24
24
  return root;
25
25
  };
26
26
  exports.squareRootBN = squareRootBN;
27
- //# sourceMappingURL=utils.js.map