@drift-labs/sdk 0.2.0-master.29 → 0.2.0-master.30

package/src/addresses/pda.ts

@@ -72,13 +72,13 @@ export function getUserStatsAccountPublicKey(
 
 export async function getMarketPublicKey(
 	programId: PublicKey,
-	marketIndex: BN
+	marketIndex: number
 ): Promise<PublicKey> {
 	return (
 		await anchor.web3.PublicKey.findProgramAddress(
 			[
 				Buffer.from(anchor.utils.bytes.utf8.encode('market')),
-				marketIndex.toArrayLike(Buffer, 'le', 8),
+				new anchor.BN(marketIndex).toArrayLike(Buffer, 'le', 2),
 			],
 			programId
 		)
@@ -87,13 +87,13 @@ export async function getMarketPublicKey(
 
 export async function getSpotMarketPublicKey(
 	programId: PublicKey,
-	marketIndex: BN
+	marketIndex: number
 ): Promise<PublicKey> {
 	return (
 		await anchor.web3.PublicKey.findProgramAddress(
 			[
 				Buffer.from(anchor.utils.bytes.utf8.encode('spot_market')),
-				marketIndex.toArrayLike(Buffer, 'le', 8),
+				new anchor.BN(marketIndex).toArrayLike(Buffer, 'le', 2),
 			],
 			programId
 		)
@@ -102,13 +102,13 @@ export async function getSpotMarketPublicKey(
 
 export async function getSpotMarketVaultPublicKey(
 	programId: PublicKey,
-	marketIndex: BN
+	marketIndex: number
 ): Promise<PublicKey> {
 	return (
 		await anchor.web3.PublicKey.findProgramAddress(
 			[
 				Buffer.from(anchor.utils.bytes.utf8.encode('spot_market_vault')),
-				marketIndex.toArrayLike(Buffer, 'le', 8),
+				new anchor.BN(marketIndex).toArrayLike(Buffer, 'le', 2),
 			],
 			programId
 		)
@@ -117,13 +117,13 @@ export async function getSpotMarketVaultPublicKey(
 
 export async function getInsuranceFundVaultPublicKey(
 	programId: PublicKey,
-	marketIndex: BN
+	marketIndex: number
 ): Promise<PublicKey> {
 	return (
 		await anchor.web3.PublicKey.findProgramAddress(
 			[
 				Buffer.from(anchor.utils.bytes.utf8.encode('insurance_fund_vault')),
-				marketIndex.toArrayLike(Buffer, 'le', 8),
+				new anchor.BN(marketIndex).toArrayLike(Buffer, 'le', 2),
 			],
 			programId
 		)
@@ -133,13 +133,13 @@ export async function getInsuranceFundVaultPublicKey(
 export function getInsuranceFundStakeAccountPublicKey(
 	programId: PublicKey,
 	authority: PublicKey,
-	marketIndex: BN
+	marketIndex: number
 ): PublicKey {
 	return anchor.web3.PublicKey.findProgramAddressSync(
 		[
 			Buffer.from(anchor.utils.bytes.utf8.encode('insurance_fund_stake')),
 			authority.toBuffer(),
-			marketIndex.toArrayLike(Buffer, 'le', 8),
+			new anchor.BN(marketIndex).toArrayLike(Buffer, 'le', 2),
 		],
 		programId
 	)[0];

package/src/admin.ts

@@ -39,11 +39,6 @@ export class Admin extends ClearingHouse {
 				this.program.programId
 			);
 
-		const [insuranceVaultPublicKey] = await PublicKey.findProgramAddress(
-			[Buffer.from(anchor.utils.bytes.utf8.encode('insurance_vault'))],
-			this.program.programId
-		);
-
 		const initializeTx = await this.program.transaction.initialize(
 			adminControlsPrices,
 			{
@@ -52,7 +47,6 @@ export class Admin extends ClearingHouse {
 					state: clearingHouseStatePublicKey,
 					quoteAssetMint: usdcMint,
 					rent: SYSVAR_RENT_PUBKEY,
-					insuranceVault: insuranceVaultPublicKey,
 					clearingHouseSigner: this.getSignerPublicKey(),
 					systemProgram: anchor.web3.SystemProgram.programId,
 					tokenProgram: TOKEN_PROGRAM_ID,
@@ -139,7 +133,7 @@ export class Admin extends ClearingHouse {
 	}
 
 	public async initializeSerumFulfillmentConfig(
-		marketIndex: BN,
+		marketIndex: number,
 		serumMarket: PublicKey,
 		serumProgram: PublicKey
 	): Promise<TransactionSignature> {
@@ -227,7 +221,7 @@ export class Admin extends ClearingHouse {
 	}
 
 	public async moveAmmPrice(
-		marketIndex: BN,
+		marketIndex: number,
 		baseAssetReserve: BN,
 		quoteAssetReserve: BN,
 		sqrtK?: BN
@@ -257,7 +251,7 @@ export class Admin extends ClearingHouse {
 
 	public async updateK(
 		sqrtK: BN,
-		marketIndex: BN
+		marketIndex: number
 	): Promise<TransactionSignature> {
 		return await this.program.rpc.updateK(sqrtK, {
 			accounts: {
@@ -270,7 +264,7 @@ export class Admin extends ClearingHouse {
 	}
 
 	public async updateConcentrationScale(
-		marketIndex: BN,
+		marketIndex: number,
 		concentrationScale: BN
 	): Promise<TransactionSignature> {
 		return await this.program.rpc.updateConcentrationCoef(concentrationScale, {
@@ -283,7 +277,7 @@ export class Admin extends ClearingHouse {
 	}
 
 	public async moveAmmToPrice(
-		perpMarketIndex: BN,
+		perpMarketIndex: number,
 		targetPrice: BN
 	): Promise<TransactionSignature> {
 		const market = this.getPerpMarketAccount(perpMarketIndex);
@@ -325,7 +319,7 @@ export class Admin extends ClearingHouse {
 
 	public async repegAmmCurve(
 		newPeg: BN,
-		marketIndex: BN
+		marketIndex: number
 	): Promise<TransactionSignature> {
 		const marketPublicKey = await getMarketPublicKey(
 			this.program.programId,
@@ -344,7 +338,7 @@ export class Admin extends ClearingHouse {
 	}
 
 	public async updateAmmOracleTwap(
-		marketIndex: BN
+		marketIndex: number
 	): Promise<TransactionSignature> {
 		const ammData = this.getPerpMarketAccount(marketIndex).amm;
 		const marketPublicKey = await getMarketPublicKey(
@@ -363,7 +357,7 @@ export class Admin extends ClearingHouse {
 	}
 
 	public async resetAmmOracleTwap(
-		marketIndex: BN
+		marketIndex: number
 	): Promise<TransactionSignature> {
 		const ammData = this.getPerpMarketAccount(marketIndex).amm;
 		const marketPublicKey = await getMarketPublicKey(
@@ -381,62 +375,19 @@ export class Admin extends ClearingHouse {
 		});
 	}
 
-	public async withdrawFromInsuranceVault(
+	public async depositIntoMarketFeePool(
+		marketIndex: number,
 		amount: BN,
-		recipient: PublicKey
+		sourceVault: PublicKey
 	): Promise<TransactionSignature> {
-		const state = await this.getStateAccount();
 		const spotMarket = this.getQuoteSpotMarketAccount();
-		return await this.program.rpc.withdrawFromInsuranceVault(amount, {
-			accounts: {
-				admin: this.wallet.publicKey,
-				state: await this.getStatePublicKey(),
-				spotMarket: spotMarket.pubkey,
-				insuranceVault: state.insuranceVault,
-				clearingHouseSigner: this.getSignerPublicKey(),
-				recipient: recipient,
-				tokenProgram: TOKEN_PROGRAM_ID,
-			},
-		});
-	}
 
-	public async withdrawFromMarketToInsuranceVault(
-		marketIndex: BN,
-		amount: BN,
-		recipient: PublicKey
-	): Promise<TransactionSignature> {
-		const marketPublicKey = await getMarketPublicKey(
-			this.program.programId,
-			marketIndex
-		);
-		const spotMarket = this.getQuoteSpotMarketAccount();
-		return await this.program.rpc.withdrawFromMarketToInsuranceVault(amount, {
-			accounts: {
-				admin: this.wallet.publicKey,
-				state: await this.getStatePublicKey(),
-				market: marketPublicKey,
-				spotMarket: spotMarket.pubkey,
-				spotMarketVault: spotMarket.vault,
-				clearingHouseSigner: this.getSignerPublicKey(),
-				recipient: recipient,
-				tokenProgram: TOKEN_PROGRAM_ID,
-			},
-		});
-	}
-
-	public async withdrawFromInsuranceVaultToMarket(
-		marketIndex: BN,
-		amount: BN
-	): Promise<TransactionSignature> {
-		const state = await this.getStateAccount();
-		const spotMarket = this.getQuoteSpotMarketAccount();
-
-		return await this.program.rpc.withdrawFromInsuranceVaultToMarket(amount, {
+		return await this.program.rpc.depositIntoMarketFeePool(amount, {
 			accounts: {
 				admin: this.wallet.publicKey,
 				state: await this.getStatePublicKey(),
 				market: await getMarketPublicKey(this.program.programId, marketIndex),
-				insuranceVault: state.insuranceVault,
+				sourceVault,
 				clearingHouseSigner: this.getSignerPublicKey(),
 				quoteSpotMarket: spotMarket.pubkey,
 				spotMarketVault: spotMarket.vault,
@@ -455,7 +406,7 @@ export class Admin extends ClearingHouse {
 	}
 
 	public async updateCurveUpdateIntensity(
-		marketIndex: BN,
+		marketIndex: number,
 		curveUpdateIntensity: number
 	): Promise<TransactionSignature> {
 		// assert(curveUpdateIntensity >= 0 && curveUpdateIntensity <= 100);
@@ -474,7 +425,7 @@ export class Admin extends ClearingHouse {
 	}
 
 	public async updateMarginRatio(
-		marketIndex: BN,
+		marketIndex: number,
 		marginRatioInitial: number,
 		marginRatioMaintenance: number
 	): Promise<TransactionSignature> {
@@ -492,7 +443,7 @@ export class Admin extends ClearingHouse {
 	}
 
 	public async updateMarketBaseSpread(
-		marketIndex: BN,
+		marketIndex: number,
 		baseSpread: number
 	): Promise<TransactionSignature> {
 		return await this.program.rpc.updateMarketBaseSpread(baseSpread, {
@@ -505,7 +456,7 @@ export class Admin extends ClearingHouse {
 	}
 
 	public async updateAmmJitIntensity(
-		marketIndex: BN,
+		marketIndex: number,
 		ammJitIntensity: number
 	): Promise<TransactionSignature> {
 		return await this.program.rpc.updateAmmJitIntensity(ammJitIntensity, {
@@ -518,7 +469,7 @@ export class Admin extends ClearingHouse {
 	}
 
 	public async updateMarketMaxSpread(
-		marketIndex: BN,
+		marketIndex: number,
 		maxSpread: number
 	): Promise<TransactionSignature> {
 		return await this.program.rpc.updateMarketMaxSpread(maxSpread, {
@@ -640,7 +591,7 @@ export class Admin extends ClearingHouse {
 	}
 
 	public async updateWithdrawGuardThreshold(
-		marketIndex: BN,
+		marketIndex: number,
 		withdrawGuardThreshold: BN
 	): Promise<TransactionSignature> {
 		return await this.program.rpc.updateWithdrawGuardThreshold(
@@ -659,7 +610,7 @@ export class Admin extends ClearingHouse {
 	}
 
 	public async updateSpotMarketIfFactor(
-		marketIndex: BN,
+		marketIndex: number,
 		userIfFactor: BN,
 		totalIfFactor: BN
 	): Promise<TransactionSignature> {
@@ -681,7 +632,7 @@ export class Admin extends ClearingHouse {
 	}
 
 	public async updateSpotMarketRevenueSettlePeriod(
-		marketIndex: BN,
+		marketIndex: number,
 		revenueSettlePeriod: BN
 	): Promise<TransactionSignature> {
 		return await this.program.rpc.updateSpotMarketRevenueSettlePeriod(
@@ -700,7 +651,7 @@ export class Admin extends ClearingHouse {
 	}
 
 	public async updateInsuranceWithdrawEscrowPeriod(
-		marketIndex: BN,
+		marketIndex: number,
 		insuranceWithdrawEscrowPeriod: BN
 	): Promise<TransactionSignature> {
 		return await this.program.rpc.updateInsuranceWithdrawEscrowPeriod(
@@ -719,7 +670,7 @@ export class Admin extends ClearingHouse {
 	}
 
 	public async updateLpCooldownTime(
-		marketIndex: BN,
+		marketIndex: number,
 		cooldownTime: BN
 	): Promise<TransactionSignature> {
 		return await this.program.rpc.updateLpCooldownTime(cooldownTime, {
@@ -732,7 +683,7 @@ export class Admin extends ClearingHouse {
 	}
 
 	public async updateMarketOracle(
-		marketIndex: BN,
+		marketIndex: number,
 		oracle: PublicKey,
 		oracleSource: OracleSource
 	): Promise<TransactionSignature> {
@@ -746,7 +697,7 @@ export class Admin extends ClearingHouse {
 	}
 
 	public async updateMarketMinimumQuoteAssetTradeSize(
-		marketIndex: BN,
+		marketIndex: number,
 		minimumTradeSize: BN
 	): Promise<TransactionSignature> {
 		return await this.program.rpc.updateMarketMinimumQuoteAssetTradeSize(
@@ -762,7 +713,7 @@ export class Admin extends ClearingHouse {
 	}
 
 	public async updateMarketBaseAssetAmountStepSize(
-		marketIndex: BN,
+		marketIndex: number,
 		stepSize: BN
 	): Promise<TransactionSignature> {
 		return await this.program.rpc.updateMarketBaseAssetAmountStepSize(
@@ -778,7 +729,7 @@ export class Admin extends ClearingHouse {
 	}
 
 	public async updateMarketExpiry(
-		perpMarketIndex: BN,
+		perpMarketIndex: number,
 		expiryTs: BN
 	): Promise<TransactionSignature> {
 		return await this.program.rpc.updateMarketExpiry(expiryTs, {
@@ -883,7 +834,7 @@ export class Admin extends ClearingHouse {
 	}
 
 	public async updateMaxBaseAssetAmountRatio(
-		marketIndex: BN,
+		marketIndex: number,
 		maxBaseAssetAmountRatio: number
 	): Promise<TransactionSignature> {
 		return await this.program.rpc.updateMaxBaseAssetAmountRatio(
@@ -899,7 +850,7 @@ export class Admin extends ClearingHouse {
 	}
 
 	public async updateMaxSlippageRatio(
-		marketIndex: BN,
+		marketIndex: number,
 		maxSlippageRatio: number
 	): Promise<TransactionSignature> {
 		return await this.program.rpc.updateMaxSlippageRatio(maxSlippageRatio, {
@@ -912,7 +863,7 @@ export class Admin extends ClearingHouse {
 	}
 
 	public async updateMarketMaxImbalances(
-		marketIndex: BN,
+		marketIndex: number,
 		unrealizedMaxImbalance: BN,
 		maxRevenueWithdrawPerPeriod: BN,
 		quoteMaxInsurance: BN
@@ -930,4 +881,16 @@ export class Admin extends ClearingHouse {
 			}
 		);
 	}
+
+	public async updateSerumVault(
+		srmVault: PublicKey
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.updateSerumVault({
+			accounts: {
+				admin: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+				srmVault: srmVault,
+			},
+		});
+	}
 }