@drift-labs/sdk 2.126.0-beta.0 → 2.126.0-beta.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/VERSION +1 -1
- package/lib/browser/adminClient.d.ts +2 -0
- package/lib/browser/adminClient.js +18 -0
- package/lib/browser/bankrun/bankrunConnection.d.ts +1 -1
- package/lib/browser/bankrun/bankrunConnection.js +20 -4
- package/lib/browser/constants/spotMarkets.js +12 -0
- package/lib/browser/dlob/DLOB.d.ts +1 -0
- package/lib/browser/dlob/DLOB.js +11 -2
- package/lib/browser/driftClient.d.ts +22 -0
- package/lib/browser/driftClient.js +35 -17
- package/lib/browser/idl/drift.json +50 -1
- package/lib/browser/math/amm.js +1 -1
- package/lib/browser/user.js +3 -1
- package/lib/node/adminClient.d.ts +2 -0
- package/lib/node/adminClient.d.ts.map +1 -1
- package/lib/node/adminClient.js +18 -0
- package/lib/node/bankrun/bankrunConnection.d.ts +1 -1
- package/lib/node/bankrun/bankrunConnection.d.ts.map +1 -1
- package/lib/node/bankrun/bankrunConnection.js +20 -4
- package/lib/node/constants/spotMarkets.d.ts.map +1 -1
- package/lib/node/constants/spotMarkets.js +12 -0
- package/lib/node/dlob/DLOB.d.ts +1 -0
- package/lib/node/dlob/DLOB.d.ts.map +1 -1
- package/lib/node/dlob/DLOB.js +11 -2
- package/lib/node/driftClient.d.ts +22 -0
- package/lib/node/driftClient.d.ts.map +1 -1
- package/lib/node/driftClient.js +35 -17
- package/lib/node/idl/drift.json +50 -1
- package/lib/node/math/amm.js +1 -1
- package/lib/node/user.d.ts.map +1 -1
- package/lib/node/user.js +3 -1
- package/package.json +1 -1
- package/src/adminClient.ts +39 -0
- package/src/bankrun/bankrunConnection.ts +31 -5
- package/src/constants/spotMarkets.ts +13 -0
- package/src/dlob/DLOB.ts +25 -2
- package/src/driftClient.ts +78 -23
- package/src/idl/drift.json +51 -2
- package/src/math/amm.ts +1 -1
- package/src/user.ts +5 -1
- package/tests/dlob/helpers.ts +1 -0
- package/tests/dlob/test.ts +283 -0
package/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
2.126.0-beta.
|
|
1
|
+
2.126.0-beta.10
|
|
@@ -31,6 +31,8 @@ export declare class AdminClient extends DriftClient {
|
|
|
31
31
|
getUpdateKIx(perpMarketIndex: number, sqrtK: BN): Promise<TransactionInstruction>;
|
|
32
32
|
recenterPerpMarketAmm(perpMarketIndex: number, pegMultiplier: BN, sqrtK: BN): Promise<TransactionSignature>;
|
|
33
33
|
getRecenterPerpMarketAmmIx(perpMarketIndex: number, pegMultiplier: BN, sqrtK: BN): Promise<TransactionInstruction>;
|
|
34
|
+
recenterPerpMarketAmmCrank(perpMarketIndex: number, depth?: BN): Promise<TransactionSignature>;
|
|
35
|
+
getRecenterPerpMarketAmmCrankIx(perpMarketIndex: number, depth: BN): Promise<TransactionInstruction>;
|
|
34
36
|
updatePerpMarketConcentrationScale(perpMarketIndex: number, concentrationScale: BN): Promise<TransactionSignature>;
|
|
35
37
|
getUpdatePerpMarketConcentrationScaleIx(perpMarketIndex: number, concentrationScale: BN): Promise<TransactionInstruction>;
|
|
36
38
|
moveAmmToPrice(perpMarketIndex: number, targetPrice: BN): Promise<TransactionSignature>;
|
|
@@ -329,6 +329,24 @@ class AdminClient extends driftClient_1.DriftClient {
|
|
|
329
329
|
},
|
|
330
330
|
});
|
|
331
331
|
}
|
|
332
|
+
async recenterPerpMarketAmmCrank(perpMarketIndex, depth) {
|
|
333
|
+
const recenterPerpMarketAmmIx = await this.getRecenterPerpMarketAmmCrankIx(perpMarketIndex, depth);
|
|
334
|
+
const tx = await this.buildTransaction(recenterPerpMarketAmmIx);
|
|
335
|
+
const { txSig } = await this.sendTransaction(tx, [], this.opts);
|
|
336
|
+
return txSig;
|
|
337
|
+
}
|
|
338
|
+
async getRecenterPerpMarketAmmCrankIx(perpMarketIndex, depth) {
|
|
339
|
+
const marketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
|
|
340
|
+
return await this.program.instruction.recenterPerpMarketAmmCrank(depth !== null && depth !== void 0 ? depth : null, {
|
|
341
|
+
accounts: {
|
|
342
|
+
state: await this.getStatePublicKey(),
|
|
343
|
+
admin: this.useHotWalletAdmin
|
|
344
|
+
? this.wallet.publicKey
|
|
345
|
+
: this.getStateAccount().admin,
|
|
346
|
+
perpMarket: marketPublicKey,
|
|
347
|
+
},
|
|
348
|
+
});
|
|
349
|
+
}
|
|
332
350
|
async updatePerpMarketConcentrationScale(perpMarketIndex, concentrationScale) {
|
|
333
351
|
const updatePerpMarketConcentrationCoefIx = await this.getUpdatePerpMarketConcentrationScaleIx(perpMarketIndex, concentrationScale);
|
|
334
352
|
const tx = await this.buildTransaction(updatePerpMarketConcentrationCoefIx);
|
|
@@ -47,7 +47,7 @@ export declare class BankrunConnection {
|
|
|
47
47
|
getAccountInfoAndContext(publicKey: PublicKey, _commitment?: Commitment): Promise<RpcResponseAndContext<null | AccountInfo<Buffer>>>;
|
|
48
48
|
sendRawTransaction(rawTransaction: Buffer | Uint8Array | Array<number>, _options?: any): Promise<TransactionSignature>;
|
|
49
49
|
sendTransaction(tx: Transaction | VersionedTransaction): Promise<TransactionSignature>;
|
|
50
|
-
|
|
50
|
+
updateSlotAndClock(): Promise<void>;
|
|
51
51
|
getTime(): number;
|
|
52
52
|
getParsedAccountInfo(publicKey: PublicKey): Promise<RpcResponseAndContext<AccountInfo<Buffer>>>;
|
|
53
53
|
getLatestBlockhash(commitment?: Commitment): Promise<Readonly<{
|
|
@@ -61,6 +61,9 @@ class BankrunContextWrapper {
|
|
|
61
61
|
this.connection.printTxLogs(signature);
|
|
62
62
|
}
|
|
63
63
|
async moveTimeForward(increment) {
|
|
64
|
+
const approxSlots = increment / 0.4;
|
|
65
|
+
const slot = await this.connection.getSlot();
|
|
66
|
+
this.context.warpToSlot(BigInt(Math.floor(Number(slot) + approxSlots)));
|
|
64
67
|
const currentClock = await this.context.banksClient.getClock();
|
|
65
68
|
const newUnixTimestamp = currentClock.unixTimestamp + BigInt(increment);
|
|
66
69
|
const newClock = new solana_bankrun_1.Clock(currentClock.slot, currentClock.epochStartTimestamp, currentClock.epoch, currentClock.leaderScheduleEpoch, newUnixTimestamp);
|
|
@@ -129,13 +132,23 @@ class BankrunConnection {
|
|
|
129
132
|
? await internal.tryProcessVersionedTransaction(serialized)
|
|
130
133
|
: await internal.tryProcessLegacyTransaction(serialized);
|
|
131
134
|
const banksTransactionMeta = new solana_bankrun_1.BanksTransactionResultWithMeta(inner);
|
|
132
|
-
if (banksTransactionMeta.result) {
|
|
133
|
-
throw new Error(banksTransactionMeta.result);
|
|
134
|
-
}
|
|
135
135
|
const signature = isVersioned
|
|
136
136
|
? bs58_1.default.encode(tx.signatures[0])
|
|
137
137
|
: bs58_1.default.encode(tx.signatures[0].signature);
|
|
138
|
-
|
|
138
|
+
if (banksTransactionMeta.result) {
|
|
139
|
+
if (!banksTransactionMeta.result
|
|
140
|
+
.toString()
|
|
141
|
+
.includes('This transaction has already been processed')) {
|
|
142
|
+
throw new Error(banksTransactionMeta.result);
|
|
143
|
+
}
|
|
144
|
+
else {
|
|
145
|
+
console.log(`Tx already processed (sig: ${signature}): ${JSON.stringify(banksTransactionMeta)}`, banksTransactionMeta, banksTransactionMeta.result);
|
|
146
|
+
console.log(tx);
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
if (!this.transactionToMeta.has(signature)) {
|
|
150
|
+
this.transactionToMeta.set(signature, banksTransactionMeta);
|
|
151
|
+
}
|
|
139
152
|
let finalizedCount = 0;
|
|
140
153
|
while (finalizedCount < 10) {
|
|
141
154
|
const signatureStatus = (await this.getSignatureStatus(signature)).value
|
|
@@ -245,6 +258,9 @@ class BankrunConnection {
|
|
|
245
258
|
return null;
|
|
246
259
|
}
|
|
247
260
|
const transactionStatus = await this._banksClient.getTransactionStatus(signature);
|
|
261
|
+
if (txMeta.meta === null) {
|
|
262
|
+
throw new Error(`tx has no meta: ${JSON.stringify(txMeta)}`);
|
|
263
|
+
}
|
|
248
264
|
const meta = {
|
|
249
265
|
logMessages: txMeta.meta.logMessages,
|
|
250
266
|
err: txMeta.result,
|
|
@@ -753,6 +753,18 @@ exports.MainnetSpotMarkets = [
|
|
|
753
753
|
precision: new __1.BN(10).pow(numericConstants_1.SIX),
|
|
754
754
|
precisionExp: numericConstants_1.SIX,
|
|
755
755
|
},
|
|
756
|
+
{
|
|
757
|
+
symbol: 'EURC',
|
|
758
|
+
marketIndex: 54,
|
|
759
|
+
poolId: 0,
|
|
760
|
+
oracle: new web3_js_1.PublicKey('BkdSPLmw4W6twrJjAePw2bJAwDTBtxJ9t6LvNHfcBKg1'),
|
|
761
|
+
oracleSource: __1.OracleSource.PYTH_LAZER,
|
|
762
|
+
mint: new web3_js_1.PublicKey('HzwqbKZw8HxMN6bF2yFZNrht3c2iXXzpKcFu7uBEDKtr'),
|
|
763
|
+
precision: new __1.BN(10).pow(numericConstants_1.SIX),
|
|
764
|
+
precisionExp: numericConstants_1.SIX,
|
|
765
|
+
pythFeedId: '0x76fa85158bf14ede77087fe3ae472f66213f6ea2f5b411cb2de472794990fa5c',
|
|
766
|
+
pythLazerId: 240,
|
|
767
|
+
},
|
|
756
768
|
];
|
|
757
769
|
exports.SpotMarkets = {
|
|
758
770
|
devnet: exports.DevnetSpotMarkets,
|
|
@@ -89,6 +89,7 @@ export declare class DLOB {
|
|
|
89
89
|
findExpiredNodesToFill(marketIndex: number, ts: number, marketType: MarketType, slot?: BN): NodeToFill[];
|
|
90
90
|
getTakingBids(marketIndex: number, marketType: MarketType, slot: number, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
|
|
91
91
|
getTakingAsks(marketIndex: number, marketType: MarketType, slot: number, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
|
|
92
|
+
protected signedMsgGenerator(signedMsgOrderList: NodeList<'signedMsg'>, filter: (x: DLOBNode) => boolean): Generator<DLOBNode>;
|
|
92
93
|
protected getBestNode(generatorList: Array<Generator<DLOBNode>>, oraclePriceData: OraclePriceData, slot: number, compareFcn: (bestDLOBNode: DLOBNode, currentDLOBNode: DLOBNode, slot: number, oraclePriceData: OraclePriceData) => boolean, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
|
|
93
94
|
getRestingLimitAsks(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
|
|
94
95
|
getRestingLimitBids(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
|
package/lib/browser/dlob/DLOB.js
CHANGED
|
@@ -517,7 +517,7 @@ class DLOB {
|
|
|
517
517
|
const generatorList = [
|
|
518
518
|
orderLists.market.bid.getGenerator(),
|
|
519
519
|
orderLists.takingLimit.bid.getGenerator(),
|
|
520
|
-
orderLists.signedMsg.bid.
|
|
520
|
+
this.signedMsgGenerator(orderLists.signedMsg.bid, (x) => !(0, __1.isRestingLimitOrder)(x.order, slot)),
|
|
521
521
|
];
|
|
522
522
|
yield* this.getBestNode(generatorList, oraclePriceData, slot, (bestNode, currentNode) => {
|
|
523
523
|
return bestNode.order.slot.lt(currentNode.order.slot);
|
|
@@ -533,12 +533,19 @@ class DLOB {
|
|
|
533
533
|
const generatorList = [
|
|
534
534
|
orderLists.market.ask.getGenerator(),
|
|
535
535
|
orderLists.takingLimit.ask.getGenerator(),
|
|
536
|
-
orderLists.signedMsg.ask.
|
|
536
|
+
this.signedMsgGenerator(orderLists.signedMsg.ask, (x) => !(0, __1.isRestingLimitOrder)(x.order, slot)),
|
|
537
537
|
];
|
|
538
538
|
yield* this.getBestNode(generatorList, oraclePriceData, slot, (bestNode, currentNode) => {
|
|
539
539
|
return bestNode.order.slot.lt(currentNode.order.slot);
|
|
540
540
|
}, filterFcn);
|
|
541
541
|
}
|
|
542
|
+
*signedMsgGenerator(signedMsgOrderList, filter) {
|
|
543
|
+
for (const signedMsgOrder of signedMsgOrderList.getGenerator()) {
|
|
544
|
+
if (filter(signedMsgOrder)) {
|
|
545
|
+
yield signedMsgOrder;
|
|
546
|
+
}
|
|
547
|
+
}
|
|
548
|
+
}
|
|
542
549
|
*getBestNode(generatorList, oraclePriceData, slot, compareFcn, filterFcn) {
|
|
543
550
|
const generators = generatorList.map((generator) => {
|
|
544
551
|
return {
|
|
@@ -593,6 +600,7 @@ class DLOB {
|
|
|
593
600
|
nodeLists.restingLimit.ask.getGenerator(),
|
|
594
601
|
nodeLists.floatingLimit.ask.getGenerator(),
|
|
595
602
|
nodeLists.protectedFloatingLimit.ask.getGenerator(),
|
|
603
|
+
this.signedMsgGenerator(nodeLists.signedMsg.ask, (x) => (0, __1.isRestingLimitOrder)(x.order, slot)),
|
|
596
604
|
];
|
|
597
605
|
yield* this.getBestNode(generatorList, oraclePriceData, slot, (bestNode, currentNode, slot, oraclePriceData) => {
|
|
598
606
|
return bestNode
|
|
@@ -614,6 +622,7 @@ class DLOB {
|
|
|
614
622
|
nodeLists.restingLimit.bid.getGenerator(),
|
|
615
623
|
nodeLists.floatingLimit.bid.getGenerator(),
|
|
616
624
|
nodeLists.protectedFloatingLimit.bid.getGenerator(),
|
|
625
|
+
this.signedMsgGenerator(nodeLists.signedMsg.bid, (x) => (0, __1.isRestingLimitOrder)(x.order, slot)),
|
|
617
626
|
];
|
|
618
627
|
yield* this.getBestNode(generatorList, oraclePriceData, slot, (bestNode, currentNode, slot, oraclePriceData) => {
|
|
619
628
|
return bestNode
|
|
@@ -850,6 +850,28 @@ export declare class DriftClient {
|
|
|
850
850
|
fromSubaccount?: boolean;
|
|
851
851
|
txParams?: TxParams;
|
|
852
852
|
}): Promise<TransactionSignature>;
|
|
853
|
+
/**
|
|
854
|
+
* Get instructions to add to an insurance fund stake and optionally initialize the account
|
|
855
|
+
*/
|
|
856
|
+
getAddInsuranceFundStakeIxs({ marketIndex, amount, collateralAccountPublicKey, initializeStakeAccount, fromSubaccount, }: {
|
|
857
|
+
/**
|
|
858
|
+
* Spot market index
|
|
859
|
+
*/
|
|
860
|
+
marketIndex: number;
|
|
861
|
+
amount: BN;
|
|
862
|
+
/**
|
|
863
|
+
* The account where the funds to stake come from. Usually an associated token account
|
|
864
|
+
*/
|
|
865
|
+
collateralAccountPublicKey: PublicKey;
|
|
866
|
+
/**
|
|
867
|
+
* Add instructions to initialize the staking account -- required if its the first time the currrent authority has staked in this market
|
|
868
|
+
*/
|
|
869
|
+
initializeStakeAccount?: boolean;
|
|
870
|
+
/**
|
|
871
|
+
* Optional -- withdraw from current subaccount to fund stake amount, instead of wallet balance
|
|
872
|
+
*/
|
|
873
|
+
fromSubaccount?: boolean;
|
|
874
|
+
}): Promise<TransactionInstruction[]>;
|
|
853
875
|
requestRemoveInsuranceFundStake(marketIndex: number, amount: BN, txParams?: TxParams): Promise<TransactionSignature>;
|
|
854
876
|
cancelRequestRemoveInsuranceFundStake(marketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
|
|
855
877
|
removeInsuranceFundStake(marketIndex: number, collateralAccountPublicKey: PublicKey, txParams?: TxParams): Promise<TransactionSignature>;
|
|
@@ -619,7 +619,8 @@ class DriftClient {
|
|
|
619
619
|
async getInitializeUserStatsIx() {
|
|
620
620
|
return await this.program.instruction.initializeUserStats({
|
|
621
621
|
accounts: {
|
|
622
|
-
userStats:
|
|
622
|
+
userStats: (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, this.wallet.publicKey // only allow payer to initialize own user stats account
|
|
623
|
+
),
|
|
623
624
|
authority: this.wallet.publicKey,
|
|
624
625
|
payer: this.wallet.publicKey,
|
|
625
626
|
rent: anchor.web3.SYSVAR_RENT_PUBKEY,
|
|
@@ -4356,17 +4357,19 @@ class DriftClient {
|
|
|
4356
4357
|
}
|
|
4357
4358
|
async getInitializeInsuranceFundStakeIx(marketIndex) {
|
|
4358
4359
|
const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
|
|
4360
|
+
const accounts = {
|
|
4361
|
+
insuranceFundStake: ifStakeAccountPublicKey,
|
|
4362
|
+
spotMarket: this.getSpotMarketAccount(marketIndex).pubkey,
|
|
4363
|
+
userStats: (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, this.wallet.publicKey // only allow payer to initialize own insurance fund stake account
|
|
4364
|
+
),
|
|
4365
|
+
authority: this.wallet.publicKey,
|
|
4366
|
+
payer: this.wallet.publicKey,
|
|
4367
|
+
rent: anchor.web3.SYSVAR_RENT_PUBKEY,
|
|
4368
|
+
systemProgram: anchor.web3.SystemProgram.programId,
|
|
4369
|
+
state: await this.getStatePublicKey(),
|
|
4370
|
+
};
|
|
4359
4371
|
return await this.program.instruction.initializeInsuranceFundStake(marketIndex, {
|
|
4360
|
-
accounts
|
|
4361
|
-
insuranceFundStake: ifStakeAccountPublicKey,
|
|
4362
|
-
spotMarket: this.getSpotMarketAccount(marketIndex).pubkey,
|
|
4363
|
-
userStats: this.getUserStatsAccountPublicKey(),
|
|
4364
|
-
authority: this.wallet.publicKey,
|
|
4365
|
-
payer: this.wallet.publicKey,
|
|
4366
|
-
rent: anchor.web3.SYSVAR_RENT_PUBKEY,
|
|
4367
|
-
systemProgram: anchor.web3.SystemProgram.programId,
|
|
4368
|
-
state: await this.getStatePublicKey(),
|
|
4369
|
-
},
|
|
4372
|
+
accounts,
|
|
4370
4373
|
});
|
|
4371
4374
|
}
|
|
4372
4375
|
async getAddInsuranceFundStakeIx(marketIndex, amount, collateralAccountPublicKey) {
|
|
@@ -4380,7 +4383,8 @@ class DriftClient {
|
|
|
4380
4383
|
state: await this.getStatePublicKey(),
|
|
4381
4384
|
spotMarket: spotMarket.pubkey,
|
|
4382
4385
|
insuranceFundStake: ifStakeAccountPublicKey,
|
|
4383
|
-
userStats:
|
|
4386
|
+
userStats: (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, this.wallet.publicKey // only allow payer to add to own insurance fund stake account
|
|
4387
|
+
),
|
|
4384
4388
|
authority: this.wallet.publicKey,
|
|
4385
4389
|
spotMarketVault: spotMarket.vault,
|
|
4386
4390
|
insuranceFundVault: spotMarket.insuranceFund.vault,
|
|
@@ -4396,8 +4400,23 @@ class DriftClient {
|
|
|
4396
4400
|
* Add to an insurance fund stake and optionally initialize the account
|
|
4397
4401
|
*/
|
|
4398
4402
|
async addInsuranceFundStake({ marketIndex, amount, collateralAccountPublicKey, initializeStakeAccount, fromSubaccount, txParams, }) {
|
|
4399
|
-
const addIfStakeIxs =
|
|
4403
|
+
const addIfStakeIxs = await this.getAddInsuranceFundStakeIxs({
|
|
4404
|
+
marketIndex,
|
|
4405
|
+
amount,
|
|
4406
|
+
collateralAccountPublicKey,
|
|
4407
|
+
initializeStakeAccount,
|
|
4408
|
+
fromSubaccount,
|
|
4409
|
+
});
|
|
4400
4410
|
const additionalSigners = [];
|
|
4411
|
+
const tx = await this.buildTransaction(addIfStakeIxs, txParams);
|
|
4412
|
+
const { txSig } = await this.sendTransaction(tx, additionalSigners, this.opts);
|
|
4413
|
+
return txSig;
|
|
4414
|
+
}
|
|
4415
|
+
/**
|
|
4416
|
+
* Get instructions to add to an insurance fund stake and optionally initialize the account
|
|
4417
|
+
*/
|
|
4418
|
+
async getAddInsuranceFundStakeIxs({ marketIndex, amount, collateralAccountPublicKey, initializeStakeAccount, fromSubaccount, }) {
|
|
4419
|
+
const addIfStakeIxs = [];
|
|
4401
4420
|
const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
|
|
4402
4421
|
const isSolMarket = spotMarketAccount.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
|
|
4403
4422
|
const createWSOLTokenAccount = isSolMarket && collateralAccountPublicKey.equals(this.wallet.publicKey);
|
|
@@ -4406,7 +4425,8 @@ class DriftClient {
|
|
|
4406
4425
|
const associatedTokenAccountPublicKey = (0, spl_token_1.getAssociatedTokenAddressSync)(spotMarketAccount.mint, this.wallet.publicKey, true, tokenProgramId);
|
|
4407
4426
|
addIfStakeIxs.push(await (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(this.wallet.publicKey, associatedTokenAccountPublicKey, this.wallet.publicKey, spotMarketAccount.mint, tokenProgramId));
|
|
4408
4427
|
let tokenAccount;
|
|
4409
|
-
if (!(await this.checkIfAccountExists(
|
|
4428
|
+
if (!(await this.checkIfAccountExists((0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, this.wallet.publicKey // only allow payer to initialize own user stats account
|
|
4429
|
+
)))) {
|
|
4410
4430
|
addIfStakeIxs.push(await this.getInitializeUserStatsIx());
|
|
4411
4431
|
}
|
|
4412
4432
|
if (createWSOLTokenAccount) {
|
|
@@ -4432,9 +4452,7 @@ class DriftClient {
|
|
|
4432
4452
|
if (createWSOLTokenAccount) {
|
|
4433
4453
|
addIfStakeIxs.push((0, spl_token_1.createCloseAccountInstruction)(tokenAccount, this.wallet.publicKey, this.wallet.publicKey, []));
|
|
4434
4454
|
}
|
|
4435
|
-
|
|
4436
|
-
const { txSig } = await this.sendTransaction(tx, additionalSigners, this.opts);
|
|
4437
|
-
return txSig;
|
|
4455
|
+
return addIfStakeIxs;
|
|
4438
4456
|
}
|
|
4439
4457
|
async requestRemoveInsuranceFundStake(marketIndex, amount, txParams) {
|
|
4440
4458
|
const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
|
|
@@ -4646,6 +4646,44 @@
|
|
|
4646
4646
|
}
|
|
4647
4647
|
]
|
|
4648
4648
|
},
|
|
4649
|
+
{
|
|
4650
|
+
"name": "recenterPerpMarketAmmCrank",
|
|
4651
|
+
"accounts": [
|
|
4652
|
+
{
|
|
4653
|
+
"name": "admin",
|
|
4654
|
+
"isMut": false,
|
|
4655
|
+
"isSigner": true
|
|
4656
|
+
},
|
|
4657
|
+
{
|
|
4658
|
+
"name": "state",
|
|
4659
|
+
"isMut": false,
|
|
4660
|
+
"isSigner": false
|
|
4661
|
+
},
|
|
4662
|
+
{
|
|
4663
|
+
"name": "perpMarket",
|
|
4664
|
+
"isMut": true,
|
|
4665
|
+
"isSigner": false
|
|
4666
|
+
},
|
|
4667
|
+
{
|
|
4668
|
+
"name": "spotMarket",
|
|
4669
|
+
"isMut": false,
|
|
4670
|
+
"isSigner": false
|
|
4671
|
+
},
|
|
4672
|
+
{
|
|
4673
|
+
"name": "oracle",
|
|
4674
|
+
"isMut": false,
|
|
4675
|
+
"isSigner": false
|
|
4676
|
+
}
|
|
4677
|
+
],
|
|
4678
|
+
"args": [
|
|
4679
|
+
{
|
|
4680
|
+
"name": "depth",
|
|
4681
|
+
"type": {
|
|
4682
|
+
"option": "u128"
|
|
4683
|
+
}
|
|
4684
|
+
}
|
|
4685
|
+
]
|
|
4686
|
+
},
|
|
4649
4687
|
{
|
|
4650
4688
|
"name": "updatePerpMarketAmmSummaryStats",
|
|
4651
4689
|
"accounts": [
|
|
@@ -6688,6 +6726,10 @@
|
|
|
6688
6726
|
{
|
|
6689
6727
|
"name": "ammSpreadAdjustment",
|
|
6690
6728
|
"type": "i8"
|
|
6729
|
+
},
|
|
6730
|
+
{
|
|
6731
|
+
"name": "ammInventorySpreadAdjustment",
|
|
6732
|
+
"type": "i8"
|
|
6691
6733
|
}
|
|
6692
6734
|
]
|
|
6693
6735
|
},
|
|
@@ -10979,12 +11021,19 @@
|
|
|
10979
11021
|
"name": "referencePriceOffset",
|
|
10980
11022
|
"type": "i32"
|
|
10981
11023
|
},
|
|
11024
|
+
{
|
|
11025
|
+
"name": "ammInventorySpreadAdjustment",
|
|
11026
|
+
"docs": [
|
|
11027
|
+
"signed scale amm_spread similar to fee_adjustment logic (-100 = 0, 100 = double)"
|
|
11028
|
+
],
|
|
11029
|
+
"type": "i8"
|
|
11030
|
+
},
|
|
10982
11031
|
{
|
|
10983
11032
|
"name": "padding",
|
|
10984
11033
|
"type": {
|
|
10985
11034
|
"array": [
|
|
10986
11035
|
"u8",
|
|
10987
|
-
|
|
11036
|
+
11
|
|
10988
11037
|
]
|
|
10989
11038
|
}
|
|
10990
11039
|
}
|
package/lib/browser/math/amm.js
CHANGED
|
@@ -519,7 +519,7 @@ function calculateSpreadReserves(amm, oraclePriceData, now, isPrediction = false
|
|
|
519
519
|
};
|
|
520
520
|
}
|
|
521
521
|
const reservePrice = calculatePrice(amm.baseAssetReserve, amm.quoteAssetReserve, amm.pegMultiplier);
|
|
522
|
-
// always allow 10 bps of price offset, up to a
|
|
522
|
+
// always allow 10 bps of price offset, up to a half of the market's max_spread
|
|
523
523
|
let maxOffset = 0;
|
|
524
524
|
let referencePriceOffset = numericConstants_1.ZERO;
|
|
525
525
|
if (amm.curveUpdateIntensity > 100) {
|
package/lib/browser/user.js
CHANGED
|
@@ -1202,7 +1202,9 @@ class User {
|
|
|
1202
1202
|
calculateEntriesEffectOnFreeCollateral(market, oraclePrice, perpPosition, positionBaseSizeChange, estimatedEntryPrice, includeOpenOrders, enteringHighLeverage = false, marginCategory = 'Maintenance') {
|
|
1203
1203
|
let freeCollateralChange = numericConstants_1.ZERO;
|
|
1204
1204
|
// update free collateral to account for change in pnl from new position
|
|
1205
|
-
if (!estimatedEntryPrice.eq(numericConstants_1.ZERO) &&
|
|
1205
|
+
if (!estimatedEntryPrice.eq(numericConstants_1.ZERO) &&
|
|
1206
|
+
!positionBaseSizeChange.eq(numericConstants_1.ZERO) &&
|
|
1207
|
+
marginCategory === 'Maintenance') {
|
|
1206
1208
|
const costBasis = oraclePrice
|
|
1207
1209
|
.mul(positionBaseSizeChange.abs())
|
|
1208
1210
|
.div(numericConstants_1.BASE_PRECISION);
|
|
@@ -31,6 +31,8 @@ export declare class AdminClient extends DriftClient {
|
|
|
31
31
|
getUpdateKIx(perpMarketIndex: number, sqrtK: BN): Promise<TransactionInstruction>;
|
|
32
32
|
recenterPerpMarketAmm(perpMarketIndex: number, pegMultiplier: BN, sqrtK: BN): Promise<TransactionSignature>;
|
|
33
33
|
getRecenterPerpMarketAmmIx(perpMarketIndex: number, pegMultiplier: BN, sqrtK: BN): Promise<TransactionInstruction>;
|
|
34
|
+
recenterPerpMarketAmmCrank(perpMarketIndex: number, depth?: BN): Promise<TransactionSignature>;
|
|
35
|
+
getRecenterPerpMarketAmmCrankIx(perpMarketIndex: number, depth: BN): Promise<TransactionInstruction>;
|
|
34
36
|
updatePerpMarketConcentrationScale(perpMarketIndex: number, concentrationScale: BN): Promise<TransactionSignature>;
|
|
35
37
|
getUpdatePerpMarketConcentrationScaleIx(perpMarketIndex: number, concentrationScale: BN): Promise<TransactionInstruction>;
|
|
36
38
|
moveAmmToPrice(perpMarketIndex: number, targetPrice: BN): Promise<TransactionSignature>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adminClient.d.ts","sourceRoot":"","sources":["../../src/adminClient.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"adminClient.d.ts","sourceRoot":"","sources":["../../src/adminClient.ts"],"names":[],"mappings":"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"}
|
package/lib/node/adminClient.js
CHANGED
|
@@ -329,6 +329,24 @@ class AdminClient extends driftClient_1.DriftClient {
|
|
|
329
329
|
},
|
|
330
330
|
});
|
|
331
331
|
}
|
|
332
|
+
async recenterPerpMarketAmmCrank(perpMarketIndex, depth) {
|
|
333
|
+
const recenterPerpMarketAmmIx = await this.getRecenterPerpMarketAmmCrankIx(perpMarketIndex, depth);
|
|
334
|
+
const tx = await this.buildTransaction(recenterPerpMarketAmmIx);
|
|
335
|
+
const { txSig } = await this.sendTransaction(tx, [], this.opts);
|
|
336
|
+
return txSig;
|
|
337
|
+
}
|
|
338
|
+
async getRecenterPerpMarketAmmCrankIx(perpMarketIndex, depth) {
|
|
339
|
+
const marketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
|
|
340
|
+
return await this.program.instruction.recenterPerpMarketAmmCrank(depth !== null && depth !== void 0 ? depth : null, {
|
|
341
|
+
accounts: {
|
|
342
|
+
state: await this.getStatePublicKey(),
|
|
343
|
+
admin: this.useHotWalletAdmin
|
|
344
|
+
? this.wallet.publicKey
|
|
345
|
+
: this.getStateAccount().admin,
|
|
346
|
+
perpMarket: marketPublicKey,
|
|
347
|
+
},
|
|
348
|
+
});
|
|
349
|
+
}
|
|
332
350
|
async updatePerpMarketConcentrationScale(perpMarketIndex, concentrationScale) {
|
|
333
351
|
const updatePerpMarketConcentrationCoefIx = await this.getUpdatePerpMarketConcentrationScaleIx(perpMarketIndex, concentrationScale);
|
|
334
352
|
const tx = await this.buildTransaction(updatePerpMarketConcentrationCoefIx);
|
|
@@ -47,7 +47,7 @@ export declare class BankrunConnection {
|
|
|
47
47
|
getAccountInfoAndContext(publicKey: PublicKey, _commitment?: Commitment): Promise<RpcResponseAndContext<null | AccountInfo<Buffer>>>;
|
|
48
48
|
sendRawTransaction(rawTransaction: Buffer | Uint8Array | Array<number>, _options?: any): Promise<TransactionSignature>;
|
|
49
49
|
sendTransaction(tx: Transaction | VersionedTransaction): Promise<TransactionSignature>;
|
|
50
|
-
|
|
50
|
+
updateSlotAndClock(): Promise<void>;
|
|
51
51
|
getTime(): number;
|
|
52
52
|
getParsedAccountInfo(publicKey: PublicKey): Promise<RpcResponseAndContext<AccountInfo<Buffer>>>;
|
|
53
53
|
getLatestBlockhash(commitment?: Commitment): Promise<Readonly<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bankrunConnection.d.ts","sourceRoot":"","sources":["../../../src/bankrun/bankrunConnection.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAEN,WAAW,EACX,OAAO,EACP,SAAS,EACT,WAAW,EACX,qBAAqB,EACrB,UAAU,EACV,oBAAoB,EACpB,qBAAqB,EACrB,eAAe,EACf,6BAA6B,EAC7B,oBAAoB,EACpB,oBAAoB,EACpB,yBAAyB,EACzB,4BAA4B,EAE5B,gBAAgB,EAChB,uBAAuB,EACvB,oBAAoB,EACpB,UAAU,IAAI,gBAAgB,EAE9B,SAAS,EACT,UAAU,EACV,YAAY,EACZ,qBAAqB,EAErB,yBAAyB,EACzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACN,kBAAkB,EAClB,WAAW,EAGX,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAiB,MAAM,mBAAmB,CAAC;AAG3D,MAAM,MAAM,UAAU,GAAG,gBAAgB,GAAG,iBAAiB,CAAC;AAE9D,KAAK,gCAAgC,GAAG;IACvC,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,GAAG,EAAE,gBAAgB,CAAC;CACtB,CAAC;AAEF,KAAK,yBAAyB,GAAG;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,gCAAgC,CAAC;CACvC,CAAC;AAEF,qBAAa,qBAAqB;IACjC,SAAgB,UAAU,EAAE,iBAAiB,CAAC;IAC9C,SAAgB,OAAO,EAAE,kBAAkB,CAAC;IAC5C,SAAgB,QAAQ,EAAE,eAAe,CAAC;IAC1C,SAAgB,UAAU,EAAE,UAAU,CAAe;gBAEzC,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,UAAO;IAU1D,eAAe,CACpB,EAAE,EAAE,WAAW,GAAG,oBAAoB,EACtC,iBAAiB,CAAC,EAAE,OAAO,EAAE,GAC3B,OAAO,CAAC,oBAAoB,CAAC;IAqB1B,iCAAiC,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI7D,WAAW,CAChB,OAAO,EAAE,OAAO,GAAG,MAAM,EACzB,QAAQ,EAAE,MAAM,GAAG,MAAM,GACvB,OAAO,CAAC,oBAAoB,CAAC;IAY1B,kBAAkB,IAAI,OAAO,CAAC,SAAS,CAAC;IAM9C,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAI9B,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"bankrunConnection.d.ts","sourceRoot":"","sources":["../../../src/bankrun/bankrunConnection.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,6 +61,9 @@ class BankrunContextWrapper {
|
|
|
61
61
|
this.connection.printTxLogs(signature);
|
|
62
62
|
}
|
|
63
63
|
async moveTimeForward(increment) {
|
|
64
|
+
const approxSlots = increment / 0.4;
|
|
65
|
+
const slot = await this.connection.getSlot();
|
|
66
|
+
this.context.warpToSlot(BigInt(Math.floor(Number(slot) + approxSlots)));
|
|
64
67
|
const currentClock = await this.context.banksClient.getClock();
|
|
65
68
|
const newUnixTimestamp = currentClock.unixTimestamp + BigInt(increment);
|
|
66
69
|
const newClock = new solana_bankrun_1.Clock(currentClock.slot, currentClock.epochStartTimestamp, currentClock.epoch, currentClock.leaderScheduleEpoch, newUnixTimestamp);
|
|
@@ -129,13 +132,23 @@ class BankrunConnection {
|
|
|
129
132
|
? await internal.tryProcessVersionedTransaction(serialized)
|
|
130
133
|
: await internal.tryProcessLegacyTransaction(serialized);
|
|
131
134
|
const banksTransactionMeta = new solana_bankrun_1.BanksTransactionResultWithMeta(inner);
|
|
132
|
-
if (banksTransactionMeta.result) {
|
|
133
|
-
throw new Error(banksTransactionMeta.result);
|
|
134
|
-
}
|
|
135
135
|
const signature = isVersioned
|
|
136
136
|
? bs58_1.default.encode(tx.signatures[0])
|
|
137
137
|
: bs58_1.default.encode(tx.signatures[0].signature);
|
|
138
|
-
|
|
138
|
+
if (banksTransactionMeta.result) {
|
|
139
|
+
if (!banksTransactionMeta.result
|
|
140
|
+
.toString()
|
|
141
|
+
.includes('This transaction has already been processed')) {
|
|
142
|
+
throw new Error(banksTransactionMeta.result);
|
|
143
|
+
}
|
|
144
|
+
else {
|
|
145
|
+
console.log(`Tx already processed (sig: ${signature}): ${JSON.stringify(banksTransactionMeta)}`, banksTransactionMeta, banksTransactionMeta.result);
|
|
146
|
+
console.log(tx);
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
if (!this.transactionToMeta.has(signature)) {
|
|
150
|
+
this.transactionToMeta.set(signature, banksTransactionMeta);
|
|
151
|
+
}
|
|
139
152
|
let finalizedCount = 0;
|
|
140
153
|
while (finalizedCount < 10) {
|
|
141
154
|
const signatureStatus = (await this.getSignatureStatus(signature)).value
|
|
@@ -245,6 +258,9 @@ class BankrunConnection {
|
|
|
245
258
|
return null;
|
|
246
259
|
}
|
|
247
260
|
const transactionStatus = await this._banksClient.getTransactionStatus(signature);
|
|
261
|
+
if (txMeta.meta === null) {
|
|
262
|
+
throw new Error(`tx has no meta: ${JSON.stringify(txMeta)}`);
|
|
263
|
+
}
|
|
248
264
|
const meta = {
|
|
249
265
|
logMessages: txMeta.meta.logMessages,
|
|
250
266
|
err: txMeta.result,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spotMarkets.d.ts","sourceRoot":"","sources":["../../../src/constants/spotMarkets.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,KAAK,CAAC;AAYjD,MAAM,MAAM,gBAAgB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,SAAS,CAAC;IAClB,IAAI,EAAE,SAAS,CAAC;IAChB,YAAY,EAAE,YAAY,CAAC;IAC3B,SAAS,EAAE,EAAE,CAAC;IACd,YAAY,EAAE,EAAE,CAAC;IACjB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,aAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,cAAc,CAAC,EAAE,SAAS,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,gBAAgB,WAE5B,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,gBAAgB,EA+F/C,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"spotMarkets.d.ts","sourceRoot":"","sources":["../../../src/constants/spotMarkets.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,KAAK,CAAC;AAYjD,MAAM,MAAM,gBAAgB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,SAAS,CAAC;IAClB,IAAI,EAAE,SAAS,CAAC;IAChB,YAAY,EAAE,YAAY,CAAC;IAC3B,SAAS,EAAE,EAAE,CAAC;IACd,YAAY,EAAE,EAAE,CAAC;IACjB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,aAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,cAAc,CAAC,EAAE,SAAS,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,gBAAgB,WAE5B,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,gBAAgB,EA+F/C,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,gBAAgB,EA8uBhD,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE;KAAG,GAAG,IAAI,QAAQ,GAAG,gBAAgB,EAAE;CAGhE,CAAC"}
|