@drift-labs/sdk 0.2.0-master.1 → 0.2.0-master.10
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.
- package/lib/accounts/types.d.ts +1 -0
- package/lib/admin.d.ts +6 -3
- package/lib/admin.js +39 -7
- package/lib/clearingHouse.d.ts +13 -14
- package/lib/clearingHouse.js +166 -106
- package/lib/config.js +1 -1
- package/lib/constants/banks.js +8 -1
- package/lib/constants/numericConstants.d.ts +1 -0
- package/lib/constants/numericConstants.js +2 -1
- package/lib/factory/bigNum.d.ts +8 -2
- package/lib/factory/bigNum.js +14 -6
- package/lib/idl/clearing_house.json +277 -55
- package/lib/index.d.ts +2 -1
- package/lib/index.js +6 -1
- package/lib/math/amm.d.ts +6 -1
- package/lib/math/amm.js +124 -41
- package/lib/math/auction.js +4 -1
- package/lib/math/orders.d.ts +2 -2
- package/lib/math/orders.js +18 -11
- package/lib/math/position.js +3 -1
- package/lib/math/repeg.js +1 -1
- package/lib/math/trade.d.ts +1 -1
- package/lib/math/trade.js +7 -10
- package/lib/orderParams.d.ts +14 -5
- package/lib/orderParams.js +8 -96
- package/lib/orders.d.ts +1 -2
- package/lib/orders.js +6 -85
- package/lib/slot/SlotSubscriber.d.ts +7 -0
- package/lib/slot/SlotSubscriber.js +3 -0
- package/lib/tx/utils.js +1 -1
- package/lib/types.d.ts +75 -1
- package/lib/types.js +42 -1
- package/package.json +3 -3
- package/src/accounts/bulkAccountLoader.js +197 -0
- package/src/accounts/bulkUserSubscription.js +33 -0
- package/src/accounts/fetch.js +29 -0
- package/src/accounts/pollingClearingHouseAccountSubscriber.js +311 -0
- package/src/accounts/pollingOracleSubscriber.js +93 -0
- package/src/accounts/pollingTokenAccountSubscriber.js +90 -0
- package/src/accounts/pollingUserAccountSubscriber.js +132 -0
- package/src/accounts/types.js +10 -0
- package/src/accounts/utils.js +7 -0
- package/src/accounts/webSocketAccountSubscriber.js +93 -0
- package/src/accounts/webSocketClearingHouseAccountSubscriber.js +233 -0
- package/src/accounts/webSocketUserAccountSubscriber.js +62 -0
- package/src/addresses/marketAddresses.js +26 -0
- package/src/addresses/pda.js +104 -0
- package/src/admin.ts +60 -8
- package/src/assert/assert.js +9 -0
- package/src/clearingHouse.ts +223 -183
- package/src/config.ts +1 -1
- package/src/constants/banks.ts +8 -1
- package/src/constants/numericConstants.ts +1 -0
- package/src/events/eventList.js +77 -0
- package/src/events/eventSubscriber.js +139 -0
- package/src/events/fetchLogs.js +50 -0
- package/src/events/pollingLogProvider.js +64 -0
- package/src/events/sort.js +44 -0
- package/src/events/txEventCache.js +71 -0
- package/src/events/types.js +20 -0
- package/src/events/webSocketLogProvider.js +41 -0
- package/src/examples/makeTradeExample.js +80 -0
- package/src/factory/bigNum.js +364 -0
- package/src/factory/bigNum.ts +26 -9
- package/src/factory/oracleClient.js +20 -0
- package/src/idl/clearing_house.json +277 -55
- package/src/index.js +69 -0
- package/src/index.ts +2 -1
- package/src/math/amm.js +369 -0
- package/src/math/amm.ts +207 -52
- package/src/math/auction.js +42 -0
- package/src/math/auction.ts +5 -1
- package/src/math/bankBalance.js +75 -0
- package/src/math/conversion.js +11 -0
- package/src/math/funding.js +248 -0
- package/src/math/market.js +57 -0
- package/src/math/oracles.js +26 -0
- package/src/math/orders.js +110 -0
- package/src/math/orders.ts +17 -13
- package/src/math/position.js +140 -0
- package/src/math/position.ts +5 -1
- package/src/math/repeg.js +128 -0
- package/src/math/repeg.ts +2 -1
- package/src/math/state.js +15 -0
- package/src/math/trade.js +253 -0
- package/src/math/trade.ts +23 -25
- package/src/math/utils.js +0 -1
- package/src/mockUSDCFaucet.js +171 -0
- package/src/oracles/oracleClientCache.js +19 -0
- package/src/oracles/pythClient.js +46 -0
- package/src/oracles/quoteAssetOracleClient.js +32 -0
- package/src/oracles/switchboardClient.js +69 -0
- package/src/oracles/types.js +2 -0
- package/src/orderParams.js +20 -0
- package/src/orderParams.ts +20 -141
- package/src/orders.js +134 -0
- package/src/orders.ts +7 -131
- package/src/slot/SlotSubscriber.js +39 -0
- package/src/slot/SlotSubscriber.ts +11 -1
- package/src/token/index.js +38 -0
- package/src/tx/retryTxSender.js +188 -0
- package/src/tx/types.js +2 -0
- package/src/tx/utils.js +17 -0
- package/src/tx/utils.ts +1 -1
- package/src/types.js +114 -0
- package/src/types.ts +69 -3
- package/src/userName.js +20 -0
- package/src/util/promiseTimeout.js +14 -0
- package/src/util/tps.js +27 -0
- package/src/wallet.js +35 -0
- package/src/util/computeUnits.js +0 -17
- package/src/util/computeUnits.js.map +0 -1
package/src/orders.ts
CHANGED
|
@@ -3,27 +3,13 @@ import {
|
|
|
3
3
|
MarketAccount,
|
|
4
4
|
Order,
|
|
5
5
|
PositionDirection,
|
|
6
|
-
SwapDirection,
|
|
7
6
|
UserAccount,
|
|
8
7
|
UserPosition,
|
|
9
8
|
} from './types';
|
|
10
|
-
import {
|
|
11
|
-
|
|
12
|
-
calculateAmmReservesAfterSwap,
|
|
13
|
-
calculateBaseAssetValue,
|
|
14
|
-
calculateSpreadReserves,
|
|
15
|
-
ClearingHouseUser,
|
|
16
|
-
isOrderRiskIncreasingInSameDirection,
|
|
17
|
-
standardizeBaseAssetAmount,
|
|
18
|
-
TEN_THOUSAND,
|
|
19
|
-
} from '.';
|
|
20
|
-
import {
|
|
21
|
-
calculateMarkPrice,
|
|
22
|
-
calculateNewMarketAfterTrade,
|
|
23
|
-
} from './math/market';
|
|
9
|
+
import { BN, standardizeBaseAssetAmount } from '.';
|
|
10
|
+
import { calculateNewMarketAfterTrade } from './math/market';
|
|
24
11
|
import {
|
|
25
12
|
AMM_TO_QUOTE_PRECISION_RATIO,
|
|
26
|
-
TWO,
|
|
27
13
|
PEG_PRECISION,
|
|
28
14
|
ZERO,
|
|
29
15
|
} from './constants/numericConstants';
|
|
@@ -182,7 +168,6 @@ export function calculateBaseAssetAmountMarketCanExecute(
|
|
|
182
168
|
} else if (isVariant(order.orderType, 'triggerLimit')) {
|
|
183
169
|
return calculateAmountToTradeForTriggerLimit(market, order);
|
|
184
170
|
} else if (isVariant(order.orderType, 'market')) {
|
|
185
|
-
// should never be a market order queued
|
|
186
171
|
return ZERO;
|
|
187
172
|
} else {
|
|
188
173
|
return calculateAmountToTradeForTriggerMarket(market, order);
|
|
@@ -201,14 +186,7 @@ export function calculateAmountToTradeForLimit(
|
|
|
201
186
|
'Cant calculate limit price for oracle offset oracle without OraclePriceData'
|
|
202
187
|
);
|
|
203
188
|
}
|
|
204
|
-
|
|
205
|
-
if (order.postOnly) {
|
|
206
|
-
limitPrice = isVariant(order.direction, 'long')
|
|
207
|
-
? BN.min(order.price, floatingPrice)
|
|
208
|
-
: BN.max(order.price, floatingPrice);
|
|
209
|
-
} else {
|
|
210
|
-
limitPrice = floatingPrice;
|
|
211
|
-
}
|
|
189
|
+
limitPrice = oraclePriceData.price.add(order.oraclePriceOffset);
|
|
212
190
|
}
|
|
213
191
|
|
|
214
192
|
const [maxAmountToTrade, direction] = calculateMaxBaseAssetAmountToTrade(
|
|
@@ -237,14 +215,8 @@ export function calculateAmountToTradeForTriggerLimit(
|
|
|
237
215
|
market: MarketAccount,
|
|
238
216
|
order: Order
|
|
239
217
|
): BN {
|
|
240
|
-
if (order.
|
|
241
|
-
|
|
242
|
-
market,
|
|
243
|
-
order
|
|
244
|
-
);
|
|
245
|
-
if (baseAssetAmount.eq(ZERO)) {
|
|
246
|
-
return ZERO;
|
|
247
|
-
}
|
|
218
|
+
if (!order.triggered) {
|
|
219
|
+
return ZERO;
|
|
248
220
|
}
|
|
249
221
|
|
|
250
222
|
return calculateAmountToTradeForLimit(market, order);
|
|
@@ -264,105 +236,9 @@ function calculateAmountToTradeForTriggerMarket(
|
|
|
264
236
|
market: MarketAccount,
|
|
265
237
|
order: Order
|
|
266
238
|
): BN {
|
|
267
|
-
|
|
268
|
-
? order.baseAssetAmount
|
|
269
|
-
: ZERO;
|
|
270
|
-
}
|
|
271
|
-
|
|
272
|
-
function isTriggerConditionSatisfied(
|
|
273
|
-
market: MarketAccount,
|
|
274
|
-
order: Order,
|
|
275
|
-
oraclePriceData?: OraclePriceData
|
|
276
|
-
): boolean {
|
|
277
|
-
const markPrice = calculateMarkPrice(market, oraclePriceData);
|
|
278
|
-
if (isVariant(order.triggerCondition, 'above')) {
|
|
279
|
-
return markPrice.gt(order.triggerPrice);
|
|
280
|
-
} else {
|
|
281
|
-
return markPrice.lt(order.triggerPrice);
|
|
282
|
-
}
|
|
283
|
-
}
|
|
284
|
-
|
|
285
|
-
export function calculateBaseAssetAmountUserCanExecute(
|
|
286
|
-
market: MarketAccount,
|
|
287
|
-
order: Order,
|
|
288
|
-
user: ClearingHouseUser,
|
|
289
|
-
oraclePriceData?: OraclePriceData
|
|
290
|
-
): BN {
|
|
291
|
-
const maxLeverage = user.getMaxLeverage(order.marketIndex, 'Initial');
|
|
292
|
-
const freeCollateral = user.getFreeCollateral();
|
|
293
|
-
let quoteAssetAmount: BN;
|
|
294
|
-
if (isOrderRiskIncreasingInSameDirection(user, order)) {
|
|
295
|
-
quoteAssetAmount = freeCollateral.mul(maxLeverage).div(TEN_THOUSAND);
|
|
296
|
-
} else {
|
|
297
|
-
const position =
|
|
298
|
-
user.getUserPosition(order.marketIndex) ||
|
|
299
|
-
user.getEmptyPosition(order.marketIndex);
|
|
300
|
-
const positionValue = calculateBaseAssetValue(
|
|
301
|
-
market,
|
|
302
|
-
position,
|
|
303
|
-
oraclePriceData
|
|
304
|
-
);
|
|
305
|
-
quoteAssetAmount = freeCollateral
|
|
306
|
-
.mul(maxLeverage)
|
|
307
|
-
.div(TEN_THOUSAND)
|
|
308
|
-
.add(positionValue.mul(TWO));
|
|
309
|
-
}
|
|
310
|
-
|
|
311
|
-
if (quoteAssetAmount.lte(ZERO)) {
|
|
239
|
+
if (!order.triggered) {
|
|
312
240
|
return ZERO;
|
|
313
241
|
}
|
|
314
242
|
|
|
315
|
-
|
|
316
|
-
? SwapDirection.ADD
|
|
317
|
-
: SwapDirection.REMOVE;
|
|
318
|
-
|
|
319
|
-
const useSpread = !order.postOnly;
|
|
320
|
-
let amm: Parameters<typeof calculateAmmReservesAfterSwap>[0];
|
|
321
|
-
if (useSpread) {
|
|
322
|
-
const { baseAssetReserve, quoteAssetReserve } = calculateSpreadReserves(
|
|
323
|
-
market.amm,
|
|
324
|
-
order.direction,
|
|
325
|
-
oraclePriceData
|
|
326
|
-
);
|
|
327
|
-
amm = {
|
|
328
|
-
baseAssetReserve,
|
|
329
|
-
quoteAssetReserve,
|
|
330
|
-
sqrtK: market.amm.sqrtK,
|
|
331
|
-
pegMultiplier: market.amm.pegMultiplier,
|
|
332
|
-
};
|
|
333
|
-
} else {
|
|
334
|
-
amm = market.amm;
|
|
335
|
-
}
|
|
336
|
-
|
|
337
|
-
const baseAssetReservesBefore = amm.baseAssetReserve;
|
|
338
|
-
const [_, baseAssetReservesAfter] = calculateAmmReservesAfterSwap(
|
|
339
|
-
amm,
|
|
340
|
-
'quote',
|
|
341
|
-
quoteAssetAmount,
|
|
342
|
-
swapDirection
|
|
343
|
-
);
|
|
344
|
-
|
|
345
|
-
let baseAssetAmount = baseAssetReservesBefore
|
|
346
|
-
.sub(baseAssetReservesAfter)
|
|
347
|
-
.abs();
|
|
348
|
-
if (order.reduceOnly) {
|
|
349
|
-
const position =
|
|
350
|
-
user.getUserPosition(order.marketIndex) ||
|
|
351
|
-
user.getEmptyPosition(order.marketIndex);
|
|
352
|
-
if (
|
|
353
|
-
isVariant(order.direction, 'long') &&
|
|
354
|
-
position.baseAssetAmount.gte(ZERO)
|
|
355
|
-
) {
|
|
356
|
-
baseAssetAmount = ZERO;
|
|
357
|
-
} else if (
|
|
358
|
-
isVariant(order.direction, 'short') &&
|
|
359
|
-
position.baseAssetAmount.lte(ZERO)
|
|
360
|
-
) {
|
|
361
|
-
baseAssetAmount = ZERO;
|
|
362
|
-
} else {
|
|
363
|
-
BN.min(baseAssetAmount, position.baseAssetAmount.abs());
|
|
364
|
-
}
|
|
365
|
-
}
|
|
366
|
-
|
|
367
|
-
return baseAssetAmount;
|
|
243
|
+
return order.baseAssetAmount;
|
|
368
244
|
}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.SlotSubscriber = void 0;
|
|
13
|
+
const events_1 = require("events");
|
|
14
|
+
class SlotSubscriber {
|
|
15
|
+
constructor(connection, _config) {
|
|
16
|
+
this.connection = connection;
|
|
17
|
+
this.eventEmitter = new events_1.EventEmitter();
|
|
18
|
+
}
|
|
19
|
+
subscribe() {
|
|
20
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
21
|
+
this.currentSlot = yield this.connection.getSlot('confirmed');
|
|
22
|
+
this.subscriptionId = this.connection.onSlotChange((slotInfo) => {
|
|
23
|
+
this.currentSlot = slotInfo.slot;
|
|
24
|
+
this.eventEmitter.emit('newSlot', slotInfo.slot);
|
|
25
|
+
});
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
getSlot() {
|
|
29
|
+
return this.currentSlot;
|
|
30
|
+
}
|
|
31
|
+
unsubscribe() {
|
|
32
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
33
|
+
if (this.subscriptionId) {
|
|
34
|
+
yield this.connection.removeSlotChangeListener(this.subscriptionId);
|
|
35
|
+
}
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
exports.SlotSubscriber = SlotSubscriber;
|
|
@@ -1,22 +1,32 @@
|
|
|
1
1
|
import { Connection } from '@solana/web3.js';
|
|
2
|
+
import { EventEmitter } from 'events';
|
|
3
|
+
import StrictEventEmitter from 'strict-event-emitter-types/types/src';
|
|
2
4
|
|
|
3
5
|
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
4
6
|
type SlotSubscriberConfig = {}; // for future customization
|
|
5
7
|
|
|
8
|
+
export interface SlotSubscriberEvents {
|
|
9
|
+
newSlot: (newSlot: number) => void;
|
|
10
|
+
}
|
|
11
|
+
|
|
6
12
|
export class SlotSubscriber {
|
|
7
13
|
currentSlot: number;
|
|
8
14
|
subscriptionId: number;
|
|
15
|
+
eventEmitter: StrictEventEmitter<EventEmitter, SlotSubscriberEvents>;
|
|
9
16
|
|
|
10
17
|
public constructor(
|
|
11
18
|
private connection: Connection,
|
|
12
19
|
_config?: SlotSubscriberConfig
|
|
13
|
-
) {
|
|
20
|
+
) {
|
|
21
|
+
this.eventEmitter = new EventEmitter();
|
|
22
|
+
}
|
|
14
23
|
|
|
15
24
|
public async subscribe(): Promise<void> {
|
|
16
25
|
this.currentSlot = await this.connection.getSlot('confirmed');
|
|
17
26
|
|
|
18
27
|
this.subscriptionId = this.connection.onSlotChange((slotInfo) => {
|
|
19
28
|
this.currentSlot = slotInfo.slot;
|
|
29
|
+
this.eventEmitter.emit('newSlot', slotInfo.slot);
|
|
20
30
|
});
|
|
21
31
|
}
|
|
22
32
|
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.parseTokenAccount = void 0;
|
|
4
|
+
const spl_token_1 = require("@solana/spl-token");
|
|
5
|
+
const web3_js_1 = require("@solana/web3.js");
|
|
6
|
+
function parseTokenAccount(data) {
|
|
7
|
+
const accountInfo = spl_token_1.AccountLayout.decode(data);
|
|
8
|
+
accountInfo.mint = new web3_js_1.PublicKey(accountInfo.mint);
|
|
9
|
+
accountInfo.owner = new web3_js_1.PublicKey(accountInfo.owner);
|
|
10
|
+
accountInfo.amount = spl_token_1.u64.fromBuffer(accountInfo.amount);
|
|
11
|
+
if (accountInfo.delegateOption === 0) {
|
|
12
|
+
accountInfo.delegate = null;
|
|
13
|
+
// eslint-disable-next-line new-cap
|
|
14
|
+
accountInfo.delegatedAmount = new spl_token_1.u64(0);
|
|
15
|
+
}
|
|
16
|
+
else {
|
|
17
|
+
accountInfo.delegate = new web3_js_1.PublicKey(accountInfo.delegate);
|
|
18
|
+
accountInfo.delegatedAmount = spl_token_1.u64.fromBuffer(accountInfo.delegatedAmount);
|
|
19
|
+
}
|
|
20
|
+
accountInfo.isInitialized = accountInfo.state !== 0;
|
|
21
|
+
accountInfo.isFrozen = accountInfo.state === 2;
|
|
22
|
+
if (accountInfo.isNativeOption === 1) {
|
|
23
|
+
accountInfo.rentExemptReserve = spl_token_1.u64.fromBuffer(accountInfo.isNative);
|
|
24
|
+
accountInfo.isNative = true;
|
|
25
|
+
}
|
|
26
|
+
else {
|
|
27
|
+
accountInfo.rentExemptReserve = null;
|
|
28
|
+
accountInfo.isNative = false;
|
|
29
|
+
}
|
|
30
|
+
if (accountInfo.closeAuthorityOption === 0) {
|
|
31
|
+
accountInfo.closeAuthority = null;
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
accountInfo.closeAuthority = new web3_js_1.PublicKey(accountInfo.closeAuthority);
|
|
35
|
+
}
|
|
36
|
+
return accountInfo;
|
|
37
|
+
}
|
|
38
|
+
exports.parseTokenAccount = parseTokenAccount;
|
|
@@ -0,0 +1,188 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.RetryTxSender = void 0;
|
|
16
|
+
const assert_1 = __importDefault(require("assert"));
|
|
17
|
+
const bs58_1 = __importDefault(require("bs58"));
|
|
18
|
+
const DEFAULT_TIMEOUT = 35000;
|
|
19
|
+
const DEFAULT_RETRY = 8000;
|
|
20
|
+
class RetryTxSender {
|
|
21
|
+
constructor(provider, timeout, retrySleep, additionalConnections = new Array()) {
|
|
22
|
+
this.provider = provider;
|
|
23
|
+
this.timeout = timeout !== null && timeout !== void 0 ? timeout : DEFAULT_TIMEOUT;
|
|
24
|
+
this.retrySleep = retrySleep !== null && retrySleep !== void 0 ? retrySleep : DEFAULT_RETRY;
|
|
25
|
+
this.additionalConnections = additionalConnections;
|
|
26
|
+
}
|
|
27
|
+
send(tx, additionalSigners, opts) {
|
|
28
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
29
|
+
if (additionalSigners === undefined) {
|
|
30
|
+
additionalSigners = [];
|
|
31
|
+
}
|
|
32
|
+
if (opts === undefined) {
|
|
33
|
+
opts = this.provider.opts;
|
|
34
|
+
}
|
|
35
|
+
yield this.prepareTx(tx, additionalSigners, opts);
|
|
36
|
+
const rawTransaction = tx.serialize();
|
|
37
|
+
const startTime = this.getTimestamp();
|
|
38
|
+
const txid = yield this.provider.connection.sendRawTransaction(rawTransaction, opts);
|
|
39
|
+
this.sendToAdditionalConnections(rawTransaction, opts);
|
|
40
|
+
let done = false;
|
|
41
|
+
const resolveReference = {
|
|
42
|
+
resolve: undefined,
|
|
43
|
+
};
|
|
44
|
+
const stopWaiting = () => {
|
|
45
|
+
done = true;
|
|
46
|
+
if (resolveReference.resolve) {
|
|
47
|
+
resolveReference.resolve();
|
|
48
|
+
}
|
|
49
|
+
};
|
|
50
|
+
(() => __awaiter(this, void 0, void 0, function* () {
|
|
51
|
+
while (!done && this.getTimestamp() - startTime < this.timeout) {
|
|
52
|
+
yield this.sleep(resolveReference);
|
|
53
|
+
if (!done) {
|
|
54
|
+
this.provider.connection
|
|
55
|
+
.sendRawTransaction(rawTransaction, opts)
|
|
56
|
+
.catch((e) => {
|
|
57
|
+
console.error(e);
|
|
58
|
+
stopWaiting();
|
|
59
|
+
});
|
|
60
|
+
this.sendToAdditionalConnections(rawTransaction, opts);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
}))();
|
|
64
|
+
let slot;
|
|
65
|
+
try {
|
|
66
|
+
const result = yield this.confirmTransaction(txid, opts.commitment);
|
|
67
|
+
slot = result.context.slot;
|
|
68
|
+
}
|
|
69
|
+
catch (e) {
|
|
70
|
+
console.error(e);
|
|
71
|
+
throw e;
|
|
72
|
+
}
|
|
73
|
+
finally {
|
|
74
|
+
stopWaiting();
|
|
75
|
+
}
|
|
76
|
+
return { txSig: txid, slot };
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
prepareTx(tx, additionalSigners, opts) {
|
|
80
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
81
|
+
tx.feePayer = this.provider.wallet.publicKey;
|
|
82
|
+
tx.recentBlockhash = (yield this.provider.connection.getRecentBlockhash(opts.preflightCommitment)).blockhash;
|
|
83
|
+
yield this.provider.wallet.signTransaction(tx);
|
|
84
|
+
additionalSigners
|
|
85
|
+
.filter((s) => s !== undefined)
|
|
86
|
+
.forEach((kp) => {
|
|
87
|
+
tx.partialSign(kp);
|
|
88
|
+
});
|
|
89
|
+
return tx;
|
|
90
|
+
});
|
|
91
|
+
}
|
|
92
|
+
confirmTransaction(signature, commitment) {
|
|
93
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
94
|
+
let decodedSignature;
|
|
95
|
+
try {
|
|
96
|
+
decodedSignature = bs58_1.default.decode(signature);
|
|
97
|
+
}
|
|
98
|
+
catch (err) {
|
|
99
|
+
throw new Error('signature must be base58 encoded: ' + signature);
|
|
100
|
+
}
|
|
101
|
+
assert_1.default(decodedSignature.length === 64, 'signature has invalid length');
|
|
102
|
+
const start = Date.now();
|
|
103
|
+
const subscriptionCommitment = commitment || this.provider.opts.commitment;
|
|
104
|
+
const subscriptionIds = new Array();
|
|
105
|
+
const connections = [
|
|
106
|
+
this.provider.connection,
|
|
107
|
+
...this.additionalConnections,
|
|
108
|
+
];
|
|
109
|
+
let response = null;
|
|
110
|
+
const promises = connections.map((connection, i) => {
|
|
111
|
+
let subscriptionId;
|
|
112
|
+
const confirmPromise = new Promise((resolve, reject) => {
|
|
113
|
+
try {
|
|
114
|
+
subscriptionId = connection.onSignature(signature, (result, context) => {
|
|
115
|
+
subscriptionIds[i] = undefined;
|
|
116
|
+
response = {
|
|
117
|
+
context,
|
|
118
|
+
value: result,
|
|
119
|
+
};
|
|
120
|
+
resolve(null);
|
|
121
|
+
}, subscriptionCommitment);
|
|
122
|
+
}
|
|
123
|
+
catch (err) {
|
|
124
|
+
reject(err);
|
|
125
|
+
}
|
|
126
|
+
});
|
|
127
|
+
subscriptionIds.push(subscriptionId);
|
|
128
|
+
return confirmPromise;
|
|
129
|
+
});
|
|
130
|
+
try {
|
|
131
|
+
yield this.promiseTimeout(promises, this.timeout);
|
|
132
|
+
}
|
|
133
|
+
finally {
|
|
134
|
+
for (const [i, subscriptionId] of subscriptionIds.entries()) {
|
|
135
|
+
if (subscriptionId) {
|
|
136
|
+
connections[i].removeSignatureListener(subscriptionId);
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
if (response === null) {
|
|
141
|
+
const duration = (Date.now() - start) / 1000;
|
|
142
|
+
throw new Error(`Transaction was not confirmed in ${duration.toFixed(2)} seconds. It is unknown if it succeeded or failed. Check signature ${signature} using the Solana Explorer or CLI tools.`);
|
|
143
|
+
}
|
|
144
|
+
return response;
|
|
145
|
+
});
|
|
146
|
+
}
|
|
147
|
+
getTimestamp() {
|
|
148
|
+
return new Date().getTime();
|
|
149
|
+
}
|
|
150
|
+
sleep(reference) {
|
|
151
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
152
|
+
return new Promise((resolve) => {
|
|
153
|
+
reference.resolve = resolve;
|
|
154
|
+
setTimeout(resolve, this.retrySleep);
|
|
155
|
+
});
|
|
156
|
+
});
|
|
157
|
+
}
|
|
158
|
+
promiseTimeout(promises, timeoutMs) {
|
|
159
|
+
let timeoutId;
|
|
160
|
+
const timeoutPromise = new Promise((resolve) => {
|
|
161
|
+
timeoutId = setTimeout(() => resolve(null), timeoutMs);
|
|
162
|
+
});
|
|
163
|
+
return Promise.race([...promises, timeoutPromise]).then((result) => {
|
|
164
|
+
clearTimeout(timeoutId);
|
|
165
|
+
return result;
|
|
166
|
+
});
|
|
167
|
+
}
|
|
168
|
+
sendToAdditionalConnections(rawTx, opts) {
|
|
169
|
+
this.additionalConnections.map((connection) => {
|
|
170
|
+
connection.sendRawTransaction(rawTx, opts).catch((e) => {
|
|
171
|
+
console.error(
|
|
172
|
+
// @ts-ignore
|
|
173
|
+
`error sending tx to additional connection ${connection._rpcEndpoint}`);
|
|
174
|
+
console.error(e);
|
|
175
|
+
});
|
|
176
|
+
});
|
|
177
|
+
}
|
|
178
|
+
addAdditionalConnection(newConnection) {
|
|
179
|
+
const alreadyUsingConnection = this.additionalConnections.filter((connection) => {
|
|
180
|
+
// @ts-ignore
|
|
181
|
+
return connection._rpcEndpoint === newConnection.rpcEndpoint;
|
|
182
|
+
}).length > 0;
|
|
183
|
+
if (!alreadyUsingConnection) {
|
|
184
|
+
this.additionalConnections.push(newConnection);
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
exports.RetryTxSender = RetryTxSender;
|
package/src/tx/types.js
ADDED
package/src/tx/utils.js
ADDED
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.wrapInTx = void 0;
|
|
4
|
+
const web3_js_1 = require("@solana/web3.js");
|
|
5
|
+
const COMPUTE_UNITS_DEFAULT = 200000;
|
|
6
|
+
function wrapInTx(instruction, computeUnits = 600000 // TODO, requires less code change
|
|
7
|
+
) {
|
|
8
|
+
const tx = new web3_js_1.Transaction();
|
|
9
|
+
if (computeUnits != COMPUTE_UNITS_DEFAULT) {
|
|
10
|
+
tx.add(web3_js_1.ComputeBudgetProgram.requestUnits({
|
|
11
|
+
units: computeUnits,
|
|
12
|
+
additionalFee: 0,
|
|
13
|
+
}));
|
|
14
|
+
}
|
|
15
|
+
return tx.add(instruction);
|
|
16
|
+
}
|
|
17
|
+
exports.wrapInTx = wrapInTx;
|
package/src/tx/utils.ts
CHANGED
|
@@ -8,7 +8,7 @@ const COMPUTE_UNITS_DEFAULT = 200_000;
|
|
|
8
8
|
|
|
9
9
|
export function wrapInTx(
|
|
10
10
|
instruction: TransactionInstruction,
|
|
11
|
-
computeUnits =
|
|
11
|
+
computeUnits = 600_000 // TODO, requires less code change
|
|
12
12
|
): Transaction {
|
|
13
13
|
const tx = new Transaction();
|
|
14
14
|
if (computeUnits != COMPUTE_UNITS_DEFAULT) {
|
package/src/types.js
ADDED
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DefaultOrderParams = exports.TradeSide = exports.isOneOfVariant = exports.isVariant = exports.OrderTriggerCondition = exports.OrderActionExplanation = exports.OrderAction = exports.OrderDiscountTier = exports.OrderStatus = exports.OrderType = exports.OracleSource = exports.DepositDirection = exports.PositionDirection = exports.BankBalanceType = exports.SwapDirection = void 0;
|
|
4
|
+
const _1 = require(".");
|
|
5
|
+
// # Utility Types / Enums / Constants
|
|
6
|
+
class SwapDirection {
|
|
7
|
+
}
|
|
8
|
+
exports.SwapDirection = SwapDirection;
|
|
9
|
+
SwapDirection.ADD = { add: {} };
|
|
10
|
+
SwapDirection.REMOVE = { remove: {} };
|
|
11
|
+
class BankBalanceType {
|
|
12
|
+
}
|
|
13
|
+
exports.BankBalanceType = BankBalanceType;
|
|
14
|
+
BankBalanceType.DEPOSIT = { deposit: {} };
|
|
15
|
+
BankBalanceType.BORROW = { borrow: {} };
|
|
16
|
+
class PositionDirection {
|
|
17
|
+
}
|
|
18
|
+
exports.PositionDirection = PositionDirection;
|
|
19
|
+
PositionDirection.LONG = { long: {} };
|
|
20
|
+
PositionDirection.SHORT = { short: {} };
|
|
21
|
+
class DepositDirection {
|
|
22
|
+
}
|
|
23
|
+
exports.DepositDirection = DepositDirection;
|
|
24
|
+
DepositDirection.DEPOSIT = { deposit: {} };
|
|
25
|
+
DepositDirection.WITHDRAW = { withdraw: {} };
|
|
26
|
+
class OracleSource {
|
|
27
|
+
}
|
|
28
|
+
exports.OracleSource = OracleSource;
|
|
29
|
+
OracleSource.PYTH = { pyth: {} };
|
|
30
|
+
OracleSource.SWITCHBOARD = { switchboard: {} };
|
|
31
|
+
OracleSource.QUOTE_ASSET = { quoteAsset: {} };
|
|
32
|
+
class OrderType {
|
|
33
|
+
}
|
|
34
|
+
exports.OrderType = OrderType;
|
|
35
|
+
OrderType.LIMIT = { limit: {} };
|
|
36
|
+
OrderType.TRIGGER_MARKET = { triggerMarket: {} };
|
|
37
|
+
OrderType.TRIGGER_LIMIT = { triggerLimit: {} };
|
|
38
|
+
OrderType.MARKET = { market: {} };
|
|
39
|
+
class OrderStatus {
|
|
40
|
+
}
|
|
41
|
+
exports.OrderStatus = OrderStatus;
|
|
42
|
+
OrderStatus.INIT = { init: {} };
|
|
43
|
+
OrderStatus.OPEN = { open: {} };
|
|
44
|
+
class OrderDiscountTier {
|
|
45
|
+
}
|
|
46
|
+
exports.OrderDiscountTier = OrderDiscountTier;
|
|
47
|
+
OrderDiscountTier.NONE = { none: {} };
|
|
48
|
+
OrderDiscountTier.FIRST = { first: {} };
|
|
49
|
+
OrderDiscountTier.SECOND = { second: {} };
|
|
50
|
+
OrderDiscountTier.THIRD = { third: {} };
|
|
51
|
+
OrderDiscountTier.FOURTH = { fourth: {} };
|
|
52
|
+
class OrderAction {
|
|
53
|
+
}
|
|
54
|
+
exports.OrderAction = OrderAction;
|
|
55
|
+
OrderAction.PLACE = { place: {} };
|
|
56
|
+
OrderAction.CANCEL = { cancel: {} };
|
|
57
|
+
OrderAction.EXPIRE = { expire: {} };
|
|
58
|
+
OrderAction.FILL = { fill: {} };
|
|
59
|
+
OrderAction.TRIGGER = { trigger: {} };
|
|
60
|
+
class OrderActionExplanation {
|
|
61
|
+
}
|
|
62
|
+
exports.OrderActionExplanation = OrderActionExplanation;
|
|
63
|
+
OrderActionExplanation.NONE = { none: {} };
|
|
64
|
+
OrderActionExplanation.BREACHED_MARGIN_REQUIREMENT = {
|
|
65
|
+
breachedMarginRequirement: {},
|
|
66
|
+
};
|
|
67
|
+
OrderActionExplanation.ORACLE_PRICE_BREACHED_LIMIT_PRICE = {
|
|
68
|
+
oraclePriceBreachedLimitPrice: {},
|
|
69
|
+
};
|
|
70
|
+
OrderActionExplanation.MARKET_ORDER_FILLED_TO_LIMIT_PRICE = {
|
|
71
|
+
marketOrderFilledToLimitPrice: {},
|
|
72
|
+
};
|
|
73
|
+
class OrderTriggerCondition {
|
|
74
|
+
}
|
|
75
|
+
exports.OrderTriggerCondition = OrderTriggerCondition;
|
|
76
|
+
OrderTriggerCondition.ABOVE = { above: {} };
|
|
77
|
+
OrderTriggerCondition.BELOW = { below: {} };
|
|
78
|
+
function isVariant(object, type) {
|
|
79
|
+
return object.hasOwnProperty(type);
|
|
80
|
+
}
|
|
81
|
+
exports.isVariant = isVariant;
|
|
82
|
+
function isOneOfVariant(object, types) {
|
|
83
|
+
return types.reduce((result, type) => {
|
|
84
|
+
return result || object.hasOwnProperty(type);
|
|
85
|
+
}, false);
|
|
86
|
+
}
|
|
87
|
+
exports.isOneOfVariant = isOneOfVariant;
|
|
88
|
+
var TradeSide;
|
|
89
|
+
(function (TradeSide) {
|
|
90
|
+
TradeSide[TradeSide["None"] = 0] = "None";
|
|
91
|
+
TradeSide[TradeSide["Buy"] = 1] = "Buy";
|
|
92
|
+
TradeSide[TradeSide["Sell"] = 2] = "Sell";
|
|
93
|
+
})(TradeSide = exports.TradeSide || (exports.TradeSide = {}));
|
|
94
|
+
exports.DefaultOrderParams = {
|
|
95
|
+
orderType: OrderType.MARKET,
|
|
96
|
+
userOrderId: 0,
|
|
97
|
+
direction: PositionDirection.LONG,
|
|
98
|
+
baseAssetAmount: _1.ZERO,
|
|
99
|
+
price: _1.ZERO,
|
|
100
|
+
marketIndex: _1.ZERO,
|
|
101
|
+
reduceOnly: false,
|
|
102
|
+
postOnly: false,
|
|
103
|
+
immediateOrCancel: false,
|
|
104
|
+
triggerPrice: _1.ZERO,
|
|
105
|
+
triggerCondition: OrderTriggerCondition.ABOVE,
|
|
106
|
+
positionLimit: _1.ZERO,
|
|
107
|
+
oraclePriceOffset: _1.ZERO,
|
|
108
|
+
padding0: _1.ZERO,
|
|
109
|
+
padding1: _1.ZERO,
|
|
110
|
+
optionalAccounts: {
|
|
111
|
+
discountToken: false,
|
|
112
|
+
referrer: false,
|
|
113
|
+
},
|
|
114
|
+
};
|