@drift-labs/sdk 0.1.28 → 0.1.29

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 (64) hide show
  1. package/lib/accounts/bulkAccountLoader.js +13 -3
  2. package/lib/clearingHouse.d.ts +4 -1
  3. package/lib/clearingHouse.js +49 -0
  4. package/lib/constants/markets.js +11 -0
  5. package/lib/idl/clearing_house.json +63 -2
  6. package/lib/index.d.ts +1 -0
  7. package/lib/index.js +1 -0
  8. package/lib/math/amm.d.ts +0 -20
  9. package/lib/math/amm.js +1 -151
  10. package/lib/math/repeg.d.ts +32 -0
  11. package/lib/math/repeg.js +178 -0
  12. package/lib/oracles/pythClient.js +1 -1
  13. package/lib/orderParams.d.ts +1 -1
  14. package/lib/orderParams.js +2 -2
  15. package/package.json +1 -1
  16. package/src/accounts/bulkAccountLoader.ts +14 -4
  17. package/src/clearingHouse.ts +71 -0
  18. package/src/constants/markets.ts +12 -1
  19. package/src/idl/clearing_house.json +63 -2
  20. package/src/index.ts +1 -0
  21. package/src/math/amm.ts +1 -212
  22. package/src/math/repeg.ts +253 -0
  23. package/src/oracles/pythClient.ts +1 -1
  24. package/src/orderParams.ts +3 -2
  25. package/src/accounts/bulkAccountLoader.js +0 -180
  26. package/src/accounts/bulkAccountLoader.js.map +0 -1
  27. package/src/accounts/bulkUserSubscription.js +0 -56
  28. package/src/accounts/bulkUserSubscription.js.map +0 -1
  29. package/src/accounts/pollingUserAccountSubscriber.js +0 -139
  30. package/src/accounts/pollingUserAccountSubscriber.js.map +0 -1
  31. package/src/accounts/types.js +0 -11
  32. package/src/accounts/types.js.map +0 -1
  33. package/src/accounts/webSocketUserAccountSubscriber.js +0 -78
  34. package/src/accounts/webSocketUserAccountSubscriber.js.map +0 -1
  35. package/src/addresses.js +0 -59
  36. package/src/addresses.js.map +0 -1
  37. package/src/admin.js +0 -443
  38. package/src/admin.js.map +0 -1
  39. package/src/clearingHouseUser.js +0 -581
  40. package/src/clearingHouseUser.js.map +0 -1
  41. package/src/config.js +0 -37
  42. package/src/config.js.map +0 -1
  43. package/src/factory/clearingHouse.js +0 -65
  44. package/src/factory/clearingHouse.js.map +0 -1
  45. package/src/factory/clearingHouseUser.js +0 -35
  46. package/src/factory/clearingHouseUser.js.map +0 -1
  47. package/src/factory/oracleClient.js +0 -17
  48. package/src/factory/oracleClient.js.map +0 -1
  49. package/src/index.js +0 -56
  50. package/src/index.js.map +0 -1
  51. package/src/math/amm.js +0 -285
  52. package/src/math/amm.js.map +0 -1
  53. package/src/mockUSDCFaucet.js +0 -143
  54. package/src/mockUSDCFaucet.js.map +0 -1
  55. package/src/oracles/pythClient.js +0 -39
  56. package/src/oracles/pythClient.js.map +0 -1
  57. package/src/orderParams.js +0 -109
  58. package/src/orderParams.js.map +0 -1
  59. package/src/orders.js +0 -172
  60. package/src/orders.js.map +0 -1
  61. package/src/types.js +0 -61
  62. package/src/types.js.map +0 -1
  63. package/src/wallet.js +0 -23
  64. package/src/wallet.js.map +0 -1
package/src/math/amm.ts CHANGED
@@ -4,11 +4,7 @@ import {
4
4
  MARK_PRICE_PRECISION,
5
5
  PEG_PRECISION,
6
6
  ZERO,
7
- AMM_TO_QUOTE_PRECISION_RATIO,
8
- QUOTE_PRECISION,
9
- AMM_RESERVE_PRECISION,
10
7
  } from '../constants/numericConstants';
11
- import { calculateBaseAssetValue } from './position';
12
8
  import {
13
9
  AMM,
14
10
  PositionDirection,
@@ -17,12 +13,7 @@ import {
17
13
  isVariant,
18
14
  } from '../types';
19
15
  import { assert } from '../assert/assert';
20
- import {
21
- calculatePositionPNL,
22
- calculateMarkPrice,
23
- convertToNumber,
24
- squareRootBN,
25
- } from '..';
16
+ import { squareRootBN } from '..';
26
17
 
27
18
  /**
28
19
  * Calculates a price given an arbitrary base and quote amount (they must have the same precision)
@@ -139,125 +130,6 @@ export function getSwapDirection(
139
130
  return SwapDirection.ADD;
140
131
  }
141
132
 
142
- /**
143
- * Helper function calculating adjust k cost
144
- * @param market
145
- * @param marketIndex
146
- * @param numerator
147
- * @param denomenator
148
- * @returns cost : Precision QUOTE_ASSET_PRECISION
149
- */
150
- export function calculateAdjustKCost(
151
- market: Market,
152
- marketIndex: BN,
153
- numerator: BN,
154
- denomenator: BN
155
- ): BN {
156
- const netUserPosition = {
157
- baseAssetAmount: market.baseAssetAmount,
158
- lastCumulativeFundingRate: market.amm.cumulativeFundingRate,
159
- marketIndex: new BN(marketIndex),
160
- quoteAssetAmount: new BN(0),
161
- openOrders: new BN(0),
162
- };
163
-
164
- const currentValue = calculateBaseAssetValue(market, netUserPosition);
165
-
166
- const marketNewK = Object.assign({}, market);
167
- marketNewK.amm = Object.assign({}, market.amm);
168
-
169
- marketNewK.amm.baseAssetReserve = market.amm.baseAssetReserve
170
- .mul(numerator)
171
- .div(denomenator);
172
- marketNewK.amm.quoteAssetReserve = market.amm.quoteAssetReserve
173
- .mul(numerator)
174
- .div(denomenator);
175
- marketNewK.amm.sqrtK = market.amm.sqrtK.mul(numerator).div(denomenator);
176
-
177
- netUserPosition.quoteAssetAmount = currentValue;
178
-
179
- const cost = calculatePositionPNL(marketNewK, netUserPosition);
180
-
181
- const p = PEG_PRECISION.mul(numerator).div(denomenator);
182
- const x = market.amm.baseAssetReserve;
183
- const y = market.amm.quoteAssetReserve;
184
- const delta = market.baseAssetAmount;
185
- const k = market.amm.sqrtK.mul(market.amm.sqrtK);
186
-
187
- const numer1 = PEG_PRECISION.sub(p).mul(y).div(PEG_PRECISION);
188
- const numer20 = k
189
- .mul(p)
190
- .mul(p)
191
- .div(PEG_PRECISION)
192
- .div(PEG_PRECISION)
193
- .div(x.mul(p).div(PEG_PRECISION).add(delta));
194
- const numer21 = k.div(x.add(delta));
195
-
196
- const formulaCost = numer21
197
- .sub(numer20)
198
- .sub(numer1)
199
- .mul(market.amm.pegMultiplier)
200
- .div(AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO);
201
- console.log(convertToNumber(formulaCost, QUOTE_PRECISION));
202
-
203
- // p.div(p.mul(x).add(delta)).sub()
204
-
205
- return cost;
206
- }
207
-
208
- /**
209
- * Helper function calculating adjust pegMultiplier (repeg) cost
210
- *
211
- * @param market
212
- * @param marketIndex
213
- * @param newPeg
214
- * @returns cost : Precision QUOTE_ASSET_PRECISION
215
- */
216
- export function calculateRepegCost(
217
- market: Market,
218
- marketIndex: BN,
219
- newPeg: BN
220
- ): BN {
221
- const netUserPosition = {
222
- baseAssetAmount: market.baseAssetAmount,
223
- lastCumulativeFundingRate: market.amm.cumulativeFundingRate,
224
- marketIndex: new BN(marketIndex),
225
- quoteAssetAmount: new BN(0),
226
- openOrders: new BN(0),
227
- };
228
-
229
- const currentValue = calculateBaseAssetValue(market, netUserPosition);
230
- netUserPosition.quoteAssetAmount = currentValue;
231
- const prevMarketPrice = calculateMarkPrice(market);
232
- const marketNewPeg = Object.assign({}, market);
233
- marketNewPeg.amm = Object.assign({}, market.amm);
234
-
235
- // const marketNewPeg = JSON.parse(JSON.stringify(market));
236
- marketNewPeg.amm.pegMultiplier = newPeg;
237
-
238
- console.log(
239
- 'Price moves from',
240
- convertToNumber(prevMarketPrice),
241
- 'to',
242
- convertToNumber(calculateMarkPrice(marketNewPeg))
243
- );
244
-
245
- const cost = calculatePositionPNL(marketNewPeg, netUserPosition);
246
-
247
- const k = market.amm.sqrtK.mul(market.amm.sqrtK);
248
- const newQuoteAssetReserve = k.div(
249
- market.amm.baseAssetReserve.add(netUserPosition.baseAssetAmount)
250
- );
251
- const deltaQuoteAssetReserves = newQuoteAssetReserve.sub(
252
- market.amm.quoteAssetReserve
253
- );
254
- const cost2 = deltaQuoteAssetReserves
255
- .mul(market.amm.pegMultiplier.sub(newPeg))
256
- .div(AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO);
257
- console.log(convertToNumber(cost2, QUOTE_PRECISION));
258
- return cost;
259
- }
260
-
261
133
  /**
262
134
  * Helper function calculating terminal price of amm
263
135
  *
@@ -315,86 +187,3 @@ export function calculateMaxBaseAssetAmountToTrade(
315
187
  return [new BN(0), PositionDirection.LONG];
316
188
  }
317
189
  }
318
-
319
- export function calculateBudgetedK(market: Market, cost: BN): [BN, BN] {
320
- // wolframalpha.com
321
- // (1/(x+d) - p/(x*p+d))*y*d*Q = C solve for p
322
- // p = (d(y*d*Q - C(x+d))) / (C*x(x+d) + y*y*d*Q)
323
-
324
- // todo: assumes k = x * y
325
- // otherwise use: (y(1-p) + (kp^2/(x*p+d)) - k/(x+d)) * Q = C solve for p
326
-
327
- // const k = market.amm.sqrtK.mul(market.amm.sqrtK);
328
- const x = market.amm.baseAssetReserve;
329
- const y = market.amm.quoteAssetReserve;
330
-
331
- const d = market.baseAssetAmount;
332
- const Q = market.amm.pegMultiplier;
333
-
334
- const C = cost.mul(new BN(-1));
335
-
336
- const numer1 = y.mul(d).mul(Q).div(AMM_RESERVE_PRECISION).div(PEG_PRECISION);
337
- const numer2 = C.mul(x.add(d)).div(QUOTE_PRECISION);
338
- const denom1 = C.mul(x)
339
- .mul(x.add(d))
340
- .div(AMM_RESERVE_PRECISION)
341
- .div(QUOTE_PRECISION);
342
- const denom2 = y
343
- .mul(d)
344
- .mul(d)
345
- .mul(Q)
346
- .div(AMM_RESERVE_PRECISION)
347
- .div(AMM_RESERVE_PRECISION)
348
- .div(PEG_PRECISION);
349
-
350
- const numerator = d
351
- .mul(numer1.add(numer2))
352
- .div(AMM_RESERVE_PRECISION)
353
- .div(AMM_RESERVE_PRECISION)
354
- .div(AMM_TO_QUOTE_PRECISION_RATIO);
355
- const denominator = denom1
356
- .add(denom2)
357
- .div(AMM_RESERVE_PRECISION)
358
- .div(AMM_TO_QUOTE_PRECISION_RATIO);
359
- console.log(numerator, denominator);
360
- // const p = (numerator).div(denominator);
361
-
362
- // const formulaCost = (numer21.sub(numer20).sub(numer1)).mul(market.amm.pegMultiplier).div(AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO)
363
- // console.log(convertToNumber(formulaCost, QUOTE_PRECISION))
364
-
365
- return [numerator, denominator];
366
- }
367
-
368
- export function calculateBudgetedPeg(market: Market, cost: BN): BN {
369
- // wolframalpha.com
370
- // (1/(x+d) - p/(x*p+d))*y*d*Q = C solve for p
371
- // p = (d(y*d*Q - C(x+d))) / (C*x(x+d) + y*y*d*Q)
372
-
373
- // todo: assumes k = x * y
374
- // otherwise use: (y(1-p) + (kp^2/(x*p+d)) - k/(x+d)) * Q = C solve for p
375
-
376
- const k = market.amm.sqrtK.mul(market.amm.sqrtK);
377
- const x = market.amm.baseAssetReserve;
378
- const y = market.amm.quoteAssetReserve;
379
-
380
- const d = market.baseAssetAmount;
381
- const Q = market.amm.pegMultiplier;
382
-
383
- const C = cost.mul(new BN(-1));
384
-
385
- const deltaQuoteAssetReserves = y.sub(k.div(x.add(d)));
386
- const deltaPegMultiplier = C.mul(MARK_PRICE_PRECISION)
387
- .div(deltaQuoteAssetReserves.div(AMM_TO_QUOTE_PRECISION_RATIO))
388
- .mul(PEG_PRECISION)
389
- .div(QUOTE_PRECISION);
390
- console.log(
391
- Q.toNumber(),
392
- 'change by',
393
- deltaPegMultiplier.toNumber() / MARK_PRICE_PRECISION.toNumber()
394
- );
395
- const newPeg = Q.sub(
396
- deltaPegMultiplier.mul(PEG_PRECISION).div(MARK_PRICE_PRECISION)
397
- );
398
-
399
- return newPeg;
400
- }
@@ -0,0 +1,253 @@
1
+ import { BN } from '@project-serum/anchor';
2
+ import {
3
+ MARK_PRICE_PRECISION,
4
+ AMM_RESERVE_PRECISION,
5
+ PEG_PRECISION,
6
+ AMM_TO_QUOTE_PRECISION_RATIO,
7
+ QUOTE_PRECISION,
8
+ ZERO,
9
+ } from '../constants/numericConstants';
10
+ import { calculateBaseAssetValue } from './position';
11
+ import { calculateTerminalPrice } from './amm';
12
+
13
+ import { Market } from '../types';
14
+ import { calculatePositionPNL, calculateMarkPrice, convertToNumber } from '..';
15
+
16
+ /**
17
+ * Helper function calculating adjust k cost
18
+ * @param market
19
+ * @param marketIndex
20
+ * @param numerator
21
+ * @param denomenator
22
+ * @returns cost : Precision QUOTE_ASSET_PRECISION
23
+ */
24
+ export function calculateAdjustKCost(
25
+ market: Market,
26
+ marketIndex: BN,
27
+ numerator: BN,
28
+ denomenator: BN
29
+ ): BN {
30
+ const netUserPosition = {
31
+ baseAssetAmount: market.baseAssetAmount,
32
+ lastCumulativeFundingRate: market.amm.cumulativeFundingRate,
33
+ marketIndex: new BN(marketIndex),
34
+ quoteAssetAmount: ZERO,
35
+ openOrders: ZERO,
36
+ };
37
+
38
+ const currentValue = calculateBaseAssetValue(market, netUserPosition);
39
+
40
+ const marketNewK = Object.assign({}, market);
41
+ marketNewK.amm = Object.assign({}, market.amm);
42
+
43
+ marketNewK.amm.baseAssetReserve = market.amm.baseAssetReserve
44
+ .mul(numerator)
45
+ .div(denomenator);
46
+ marketNewK.amm.quoteAssetReserve = market.amm.quoteAssetReserve
47
+ .mul(numerator)
48
+ .div(denomenator);
49
+ marketNewK.amm.sqrtK = market.amm.sqrtK.mul(numerator).div(denomenator);
50
+
51
+ netUserPosition.quoteAssetAmount = currentValue;
52
+
53
+ const cost = calculatePositionPNL(marketNewK, netUserPosition);
54
+
55
+ return cost;
56
+ }
57
+
58
+ /**
59
+ * Helper function calculating adjust pegMultiplier (repeg) cost
60
+ *
61
+ * @param market
62
+ * @param marketIndex
63
+ * @param newPeg
64
+ * @returns cost : Precision QUOTE_ASSET_PRECISION
65
+ */
66
+ export function calculateRepegCost(
67
+ market: Market,
68
+ marketIndex: BN,
69
+ newPeg: BN
70
+ ): BN {
71
+ const netUserPosition = {
72
+ baseAssetAmount: market.baseAssetAmount,
73
+ lastCumulativeFundingRate: market.amm.cumulativeFundingRate,
74
+ marketIndex: new BN(marketIndex),
75
+ quoteAssetAmount: new BN(0),
76
+ openOrders: ZERO,
77
+ };
78
+
79
+ const currentValue = calculateBaseAssetValue(market, netUserPosition);
80
+ netUserPosition.quoteAssetAmount = currentValue;
81
+ const prevMarketPrice = calculateMarkPrice(market);
82
+ const marketNewPeg = Object.assign({}, market);
83
+ marketNewPeg.amm = Object.assign({}, market.amm);
84
+
85
+ // const marketNewPeg = JSON.parse(JSON.stringify(market));
86
+ marketNewPeg.amm.pegMultiplier = newPeg;
87
+
88
+ console.log(
89
+ 'Price moves from',
90
+ convertToNumber(prevMarketPrice),
91
+ 'to',
92
+ convertToNumber(calculateMarkPrice(marketNewPeg))
93
+ );
94
+
95
+ const cost = calculatePositionPNL(marketNewPeg, netUserPosition);
96
+
97
+ return cost;
98
+ }
99
+
100
+ /**
101
+ * Helper function calculating adjust pegMultiplier (repeg) cost
102
+ *
103
+ * @param market
104
+ * @param marketIndex
105
+ * @param newPeg
106
+ * @returns cost : Precision QUOTE_ASSET_PRECISION
107
+ */
108
+ export function calculateReserveRebalanceCost(
109
+ market: Market,
110
+ marketIndex: BN
111
+ ): BN {
112
+ const netUserPosition = {
113
+ baseAssetAmount: market.baseAssetAmount,
114
+ lastCumulativeFundingRate: market.amm.cumulativeFundingRate,
115
+ marketIndex: new BN(marketIndex),
116
+ quoteAssetAmount: new BN(0),
117
+ openOrders: ZERO,
118
+ };
119
+
120
+ const currentValue = calculateBaseAssetValue(market, netUserPosition);
121
+ netUserPosition.quoteAssetAmount = currentValue;
122
+ const prevMarketPrice = calculateMarkPrice(market);
123
+ const marketNewPeg = Object.assign({}, market);
124
+ marketNewPeg.amm = Object.assign({}, market.amm);
125
+
126
+ // const marketNewPeg = JSON.parse(JSON.stringify(market));
127
+ const newPeg = calculateTerminalPrice(market)
128
+ .mul(PEG_PRECISION)
129
+ .div(MARK_PRICE_PRECISION);
130
+ // const newPeg = prevMarketPrice.mul(PEG_PRECISION).div(MARK_PRICE_PRECISION);
131
+
132
+ const newBaseReserve = market.amm.baseAssetReserve.add(
133
+ market.baseAssetAmount
134
+ );
135
+ const newQuoteReserve = market.amm.sqrtK
136
+ .mul(market.amm.sqrtK)
137
+ .div(newBaseReserve);
138
+ console.log(
139
+ 'current reserves on close, quote:',
140
+ convertToNumber(newQuoteReserve, AMM_RESERVE_PRECISION),
141
+ 'base:',
142
+ convertToNumber(newBaseReserve, AMM_RESERVE_PRECISION)
143
+ );
144
+
145
+ let newSqrtK;
146
+ if (newPeg.lt(market.amm.pegMultiplier)) {
147
+ newSqrtK = newBaseReserve;
148
+ } else {
149
+ newSqrtK = newQuoteReserve;
150
+ }
151
+
152
+ marketNewPeg.amm.baseAssetReserve = newSqrtK.sub(market.baseAssetAmount); // newSqrtK.sub(market.baseAssetAmount);
153
+ marketNewPeg.amm.quoteAssetReserve = newSqrtK
154
+ .mul(newSqrtK)
155
+ .div(marketNewPeg.amm.baseAssetReserve);
156
+ marketNewPeg.amm.sqrtK = newSqrtK;
157
+ marketNewPeg.amm.pegMultiplier = newPeg;
158
+
159
+ console.log(
160
+ 'Price moves from',
161
+ convertToNumber(prevMarketPrice),
162
+ 'to',
163
+ convertToNumber(calculateMarkPrice(marketNewPeg))
164
+ );
165
+
166
+ const cost = calculatePositionPNL(marketNewPeg, netUserPosition);
167
+
168
+ return cost;
169
+ }
170
+
171
+ export function calculateBudgetedK(market: Market, cost: BN): [BN, BN] {
172
+ // wolframalpha.com
173
+ // (1/(x+d) - p/(x*p+d))*y*d*Q = C solve for p
174
+ // p = (d(y*d*Q - C(x+d))) / (C*x(x+d) + y*y*d*Q)
175
+
176
+ // todo: assumes k = x * y
177
+ // otherwise use: (y(1-p) + (kp^2/(x*p+d)) - k/(x+d)) * Q = C solve for p
178
+
179
+ // const k = market.amm.sqrtK.mul(market.amm.sqrtK);
180
+ const x = market.amm.baseAssetReserve;
181
+ const y = market.amm.quoteAssetReserve;
182
+
183
+ const d = market.baseAssetAmount;
184
+ const Q = market.amm.pegMultiplier;
185
+
186
+ const C = cost.mul(new BN(-1));
187
+
188
+ const numer1 = y.mul(d).mul(Q).div(AMM_RESERVE_PRECISION).div(PEG_PRECISION);
189
+ const numer2 = C.mul(x.add(d)).div(QUOTE_PRECISION);
190
+ const denom1 = C.mul(x)
191
+ .mul(x.add(d))
192
+ .div(AMM_RESERVE_PRECISION)
193
+ .div(QUOTE_PRECISION);
194
+ const denom2 = y
195
+ .mul(d)
196
+ .mul(d)
197
+ .mul(Q)
198
+ .div(AMM_RESERVE_PRECISION)
199
+ .div(AMM_RESERVE_PRECISION)
200
+ .div(PEG_PRECISION);
201
+
202
+ const numerator = d
203
+ .mul(numer1.add(numer2))
204
+ .div(AMM_RESERVE_PRECISION)
205
+ .div(AMM_RESERVE_PRECISION)
206
+ .div(AMM_TO_QUOTE_PRECISION_RATIO);
207
+ const denominator = denom1
208
+ .add(denom2)
209
+ .div(AMM_RESERVE_PRECISION)
210
+ .div(AMM_TO_QUOTE_PRECISION_RATIO);
211
+ console.log(numerator, denominator);
212
+ // const p = (numerator).div(denominator);
213
+
214
+ // const formulaCost = (numer21.sub(numer20).sub(numer1)).mul(market.amm.pegMultiplier).div(AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO)
215
+ // console.log(convertToNumber(formulaCost, QUOTE_PRECISION))
216
+
217
+ return [numerator, denominator];
218
+ }
219
+
220
+ export function calculateBudgetedPeg(market: Market, cost: BN): BN {
221
+ // wolframalpha.com
222
+ // (1/(x+d) - p/(x*p+d))*y*d*Q = C solve for p
223
+ // p = (d(y*d*Q - C(x+d))) / (C*x(x+d) + y*y*d*Q)
224
+
225
+ // todo: assumes k = x * y
226
+ // otherwise use: (y(1-p) + (kp^2/(x*p+d)) - k/(x+d)) * Q = C solve for p
227
+
228
+ const k = market.amm.sqrtK.mul(market.amm.sqrtK);
229
+ const x = market.amm.baseAssetReserve;
230
+ const y = market.amm.quoteAssetReserve;
231
+
232
+ const d = market.baseAssetAmount;
233
+ const Q = market.amm.pegMultiplier;
234
+
235
+ const C = cost.mul(new BN(-1));
236
+
237
+ const deltaQuoteAssetReserves = y.sub(k.div(x.add(d)));
238
+ const deltaPegMultiplier = C.mul(MARK_PRICE_PRECISION).div(
239
+ deltaQuoteAssetReserves.div(AMM_TO_QUOTE_PRECISION_RATIO)
240
+ );
241
+ // .mul(PEG_PRECISION)
242
+ // .div(QUOTE_PRECISION);
243
+ console.log(
244
+ Q.toNumber(),
245
+ 'change by',
246
+ deltaPegMultiplier.toNumber() / MARK_PRICE_PRECISION.toNumber()
247
+ );
248
+ const newPeg = Q.sub(
249
+ deltaPegMultiplier.mul(PEG_PRECISION).div(MARK_PRICE_PRECISION)
250
+ );
251
+
252
+ return newPeg;
253
+ }
@@ -28,7 +28,7 @@ export class PythClient {
28
28
  ): Promise<OraclePriceData> {
29
29
  const priceData = parsePriceData(buffer);
30
30
  return {
31
- price: convertPythPrice(priceData.price, priceData.exponent),
31
+ price: convertPythPrice(priceData.aggregate.price, priceData.exponent),
32
32
  slot: new BN(priceData.lastSlot.toString()),
33
33
  confidence: convertPythPrice(priceData.confidence, priceData.exponent),
34
34
  twap: convertPythPrice(priceData.twap.value, priceData.exponent),
@@ -17,7 +17,8 @@ export function getLimitOrderParams(
17
17
  referrer = false,
18
18
  userOrderId = 0,
19
19
  postOnly = false,
20
- oraclePriceOffset = ZERO
20
+ oraclePriceOffset = ZERO,
21
+ immediateOrCancel = false
21
22
  ): OrderParams {
22
23
  return {
23
24
  orderType: OrderType.LIMIT,
@@ -29,7 +30,7 @@ export function getLimitOrderParams(
29
30
  price,
30
31
  reduceOnly,
31
32
  postOnly,
32
- immediateOrCancel: false,
33
+ immediateOrCancel,
33
34
  positionLimit: ZERO,
34
35
  padding0: true,
35
36
  padding1: ZERO,
@@ -1,180 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.BulkAccountLoader = void 0;
4
- const web3_js_1 = require("@solana/web3.js");
5
- const uuid_1 = require("uuid");
6
- const GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE = 99;
7
- const fiveMinutes = 5 * 60 * 1000;
8
- class BulkAccountLoader {
9
- constructor(connection, commitment, pollingFrequency) {
10
- this.accountsToLoad = new Map();
11
- this.accountData = new Map();
12
- this.errorCallbacks = new Map();
13
- this.loggingEnabled = false;
14
- this.lastUpdate = Date.now();
15
- this.connection = connection;
16
- this.commitment = commitment;
17
- this.pollingFrequency = pollingFrequency;
18
- }
19
- addAccount(publicKey, callback) {
20
- const existingSize = this.accountsToLoad.size;
21
- const callbackId = (0, uuid_1.v4)();
22
- const existingAccountToLoad = this.accountsToLoad.get(publicKey.toString());
23
- if (existingAccountToLoad) {
24
- existingAccountToLoad.callbacks.set(callbackId, callback);
25
- }
26
- else {
27
- const callbacks = new Map();
28
- callbacks.set(callbackId, callback);
29
- const newAccountToLoad = {
30
- publicKey,
31
- callbacks,
32
- };
33
- this.accountsToLoad.set(publicKey.toString(), newAccountToLoad);
34
- }
35
- if (existingSize === 0) {
36
- this.startPolling();
37
- }
38
- // if a new account needs to be polled, remove the cached loadPromise in case client calls load immediately after
39
- this.loadPromise = undefined;
40
- return callbackId;
41
- }
42
- removeAccount(publicKey, callbackId) {
43
- const existingAccountToLoad = this.accountsToLoad.get(publicKey.toString());
44
- if (existingAccountToLoad) {
45
- existingAccountToLoad.callbacks.delete(callbackId);
46
- if (existingAccountToLoad.callbacks.size === 0) {
47
- this.accountsToLoad.delete(existingAccountToLoad.publicKey.toString());
48
- }
49
- }
50
- if (this.accountsToLoad.size === 0) {
51
- this.stopPolling();
52
- }
53
- }
54
- addErrorCallbacks(callback) {
55
- const callbackId = (0, uuid_1.v4)();
56
- this.errorCallbacks.set(callbackId, callback);
57
- return callbackId;
58
- }
59
- removeErrorCallbacks(callbackId) {
60
- this.errorCallbacks.delete(callbackId);
61
- }
62
- chunks(array, size) {
63
- return new Array(Math.ceil(array.length / size))
64
- .fill(null)
65
- .map((_, index) => index * size)
66
- .map((begin) => array.slice(begin, begin + size));
67
- }
68
- async load() {
69
- if (this.loadPromise) {
70
- return this.loadPromise;
71
- }
72
- this.loadPromise = new Promise((resolver) => {
73
- this.loadPromiseResolver = resolver;
74
- });
75
- if (this.loggingEnabled) {
76
- console.log('Loading accounts');
77
- }
78
- try {
79
- const chunks = this.chunks(Array.from(this.accountsToLoad.values()), GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE);
80
- await Promise.all(chunks.map((chunk) => {
81
- return this.loadChunk(chunk);
82
- }));
83
- }
84
- catch (e) {
85
- console.error(`Error in bulkAccountLoader.load()`);
86
- console.error(e);
87
- for (const [_, callback] of this.errorCallbacks) {
88
- callback(e);
89
- }
90
- }
91
- finally {
92
- this.loadPromiseResolver();
93
- this.loadPromise = undefined;
94
- const now = Date.now();
95
- if (now - this.lastUpdate > fiveMinutes) {
96
- if (this.loggingEnabled) {
97
- console.log("Haven't seen updated account in five minutes. Bulk account loader creating new Connection Object");
98
- }
99
- this.connection = new web3_js_1.Connection(
100
- // @ts-ignore
101
- this.connection._rpcEndpoint, this.connection.commitment);
102
- }
103
- }
104
- }
105
- async loadChunk(accountsToLoad) {
106
- if (accountsToLoad.length === 0) {
107
- return;
108
- }
109
- const args = [
110
- accountsToLoad.map((accountToLoad) => {
111
- return accountToLoad.publicKey.toBase58();
112
- }),
113
- { commitment: this.commitment },
114
- ];
115
- // @ts-ignore
116
- const rpcResponse = await this.connection._rpcRequest('getMultipleAccounts', args);
117
- const newSlot = rpcResponse.result.context.slot;
118
- for (const i in accountsToLoad) {
119
- const accountToLoad = accountsToLoad[i];
120
- const key = accountToLoad.publicKey.toString();
121
- const oldRPCResponse = this.accountData.get(key);
122
- let newBuffer = undefined;
123
- if (rpcResponse.result.value[i]) {
124
- const raw = rpcResponse.result.value[i].data[0];
125
- const dataType = rpcResponse.result.value[i].data[1];
126
- newBuffer = Buffer.from(raw, dataType);
127
- }
128
- if (!oldRPCResponse) {
129
- this.accountData.set(key, {
130
- slot: newSlot,
131
- buffer: newBuffer,
132
- });
133
- this.handleAccountCallbacks(accountToLoad, newBuffer);
134
- this.lastUpdate = Date.now();
135
- continue;
136
- }
137
- if (newSlot <= oldRPCResponse.slot) {
138
- continue;
139
- }
140
- const oldBuffer = oldRPCResponse.buffer;
141
- if (newBuffer && (!oldBuffer || !newBuffer.equals(oldBuffer))) {
142
- this.accountData.set(key, {
143
- slot: newSlot,
144
- buffer: newBuffer,
145
- });
146
- this.handleAccountCallbacks(accountToLoad, newBuffer);
147
- this.lastUpdate = Date.now();
148
- }
149
- }
150
- }
151
- handleAccountCallbacks(accountToLoad, buffer) {
152
- for (const [_, callback] of accountToLoad.callbacks) {
153
- callback(buffer);
154
- }
155
- }
156
- getAccountData(publicKey) {
157
- const accountData = this.accountData.get(publicKey.toString());
158
- return accountData === null || accountData === void 0 ? void 0 : accountData.buffer;
159
- }
160
- startPolling() {
161
- if (this.intervalId) {
162
- return;
163
- }
164
- if (this.loggingEnabled) {
165
- console.log(`startPolling`);
166
- }
167
- this.intervalId = setInterval(this.load.bind(this), this.pollingFrequency);
168
- }
169
- stopPolling() {
170
- if (this.intervalId) {
171
- clearInterval(this.intervalId);
172
- this.intervalId = undefined;
173
- if (this.loggingEnabled) {
174
- console.log(`stopPolling`);
175
- }
176
- }
177
- }
178
- }
179
- exports.BulkAccountLoader = BulkAccountLoader;
180
- //# sourceMappingURL=bulkAccountLoader.js.map