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

package/src/orders.js

@@ -0,0 +1,134 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.calculateAmountToTradeForTriggerLimit = exports.calculateAmountToTradeForLimit = exports.calculateBaseAssetAmountMarketCanExecute = exports.calculateNewStateAfterOrder = void 0;
+const types_1 = require("./types");
+const _1 = require(".");
+const market_1 = require("./math/market");
+const numericConstants_1 = require("./constants/numericConstants");
+const amm_1 = require("./math/amm");
+const position_1 = require("./math/position");
+function calculateNewStateAfterOrder(userAccount, userPosition, market, order) {
+    if (types_1.isVariant(order.status, 'init')) {
+        return null;
+    }
+    const baseAssetAmountToTrade = calculateBaseAssetAmountMarketCanExecute(market, order);
+    if (baseAssetAmountToTrade.lt(market.amm.baseAssetAmountStepSize)) {
+        return null;
+    }
+    const userAccountAfter = Object.assign({}, userAccount);
+    const userPositionAfter = Object.assign({}, userPosition);
+    const currentPositionDirection = position_1.positionCurrentDirection(userPosition);
+    const increasePosition = userPosition.baseAssetAmount.eq(numericConstants_1.ZERO) ||
+        isSameDirection(order.direction, currentPositionDirection);
+    if (increasePosition) {
+        const marketAfter = market_1.calculateNewMarketAfterTrade(baseAssetAmountToTrade, order.direction, market);
+        const { quoteAssetAmountSwapped, baseAssetAmountSwapped } = calculateAmountSwapped(market, marketAfter);
+        userPositionAfter.baseAssetAmount = userPositionAfter.baseAssetAmount.add(baseAssetAmountSwapped);
+        userPositionAfter.quoteAssetAmount = userPositionAfter.quoteAssetAmount.add(quoteAssetAmountSwapped);
+        return [userAccountAfter, userPositionAfter, marketAfter];
+    }
+    else {
+        const reversePosition = baseAssetAmountToTrade.gt(userPosition.baseAssetAmount.abs());
+        if (reversePosition) {
+            const intermediateMarket = market_1.calculateNewMarketAfterTrade(userPosition.baseAssetAmount, position_1.findDirectionToClose(userPosition), market);
+            const { quoteAssetAmountSwapped: baseAssetValue } = calculateAmountSwapped(market, intermediateMarket);
+            let pnl;
+            if (types_1.isVariant(currentPositionDirection, 'long')) {
+                pnl = baseAssetValue.sub(userPosition.quoteAssetAmount);
+            }
+            else {
+                pnl = userPosition.quoteAssetAmount.sub(baseAssetValue);
+            }
+            userAccountAfter.collateral = userAccountAfter.collateral.add(pnl);
+            const baseAssetAmountLeft = baseAssetAmountToTrade.sub(userPosition.baseAssetAmount.abs());
+            const marketAfter = market_1.calculateNewMarketAfterTrade(baseAssetAmountLeft, order.direction, intermediateMarket);
+            const { quoteAssetAmountSwapped, baseAssetAmountSwapped } = calculateAmountSwapped(intermediateMarket, marketAfter);
+            userPositionAfter.quoteAssetAmount = quoteAssetAmountSwapped;
+            userPositionAfter.baseAssetAmount = baseAssetAmountSwapped;
+            return [userAccountAfter, userPositionAfter, marketAfter];
+        }
+        else {
+            const marketAfter = market_1.calculateNewMarketAfterTrade(baseAssetAmountToTrade, order.direction, market);
+            const { quoteAssetAmountSwapped: baseAssetValue, baseAssetAmountSwapped, } = calculateAmountSwapped(market, marketAfter);
+            const costBasisRealized = userPosition.quoteAssetAmount
+                .mul(baseAssetAmountSwapped.abs())
+                .div(userPosition.baseAssetAmount.abs());
+            let pnl;
+            if (types_1.isVariant(currentPositionDirection, 'long')) {
+                pnl = baseAssetValue.sub(costBasisRealized);
+            }
+            else {
+                pnl = costBasisRealized.sub(baseAssetValue);
+            }
+            userAccountAfter.collateral = userAccountAfter.collateral.add(pnl);
+            userPositionAfter.baseAssetAmount = userPositionAfter.baseAssetAmount.add(baseAssetAmountSwapped);
+            userPositionAfter.quoteAssetAmount =
+                userPositionAfter.quoteAssetAmount.sub(costBasisRealized);
+            return [userAccountAfter, userPositionAfter, marketAfter];
+        }
+    }
+}
+exports.calculateNewStateAfterOrder = calculateNewStateAfterOrder;
+function calculateAmountSwapped(marketBefore, marketAfter) {
+    return {
+        quoteAssetAmountSwapped: marketBefore.amm.quoteAssetReserve
+            .sub(marketAfter.amm.quoteAssetReserve)
+            .abs()
+            .mul(marketBefore.amm.pegMultiplier)
+            .div(numericConstants_1.PEG_PRECISION)
+            .div(numericConstants_1.AMM_TO_QUOTE_PRECISION_RATIO),
+        baseAssetAmountSwapped: marketBefore.amm.baseAssetReserve.sub(marketAfter.amm.baseAssetReserve),
+    };
+}
+function calculateBaseAssetAmountMarketCanExecute(market, order, oraclePriceData) {
+    if (types_1.isVariant(order.orderType, 'limit')) {
+        return calculateAmountToTradeForLimit(market, order, oraclePriceData);
+    }
+    else if (types_1.isVariant(order.orderType, 'triggerLimit')) {
+        return calculateAmountToTradeForTriggerLimit(market, order);
+    }
+    else if (types_1.isVariant(order.orderType, 'market')) {
+        return numericConstants_1.ZERO;
+    }
+    else {
+        return calculateAmountToTradeForTriggerMarket(market, order);
+    }
+}
+exports.calculateBaseAssetAmountMarketCanExecute = calculateBaseAssetAmountMarketCanExecute;
+function calculateAmountToTradeForLimit(market, order, oraclePriceData) {
+    let limitPrice = order.price;
+    if (!order.oraclePriceOffset.eq(numericConstants_1.ZERO)) {
+        if (!oraclePriceData) {
+            throw Error('Cant calculate limit price for oracle offset oracle without OraclePriceData');
+        }
+        limitPrice = oraclePriceData.price.add(order.oraclePriceOffset);
+    }
+    const [maxAmountToTrade, direction] = amm_1.calculateMaxBaseAssetAmountToTrade(market.amm, limitPrice, order.direction);
+    const baseAssetAmount = _1.standardizeBaseAssetAmount(maxAmountToTrade, market.amm.baseAssetAmountStepSize);
+    // Check that directions are the same
+    const sameDirection = isSameDirection(direction, order.direction);
+    if (!sameDirection) {
+        return numericConstants_1.ZERO;
+    }
+    return baseAssetAmount.gt(order.baseAssetAmount)
+        ? order.baseAssetAmount
+        : baseAssetAmount;
+}
+exports.calculateAmountToTradeForLimit = calculateAmountToTradeForLimit;
+function calculateAmountToTradeForTriggerLimit(market, order) {
+    if (!order.triggered) {
+        return numericConstants_1.ZERO;
+    }
+    return calculateAmountToTradeForLimit(market, order);
+}
+exports.calculateAmountToTradeForTriggerLimit = calculateAmountToTradeForTriggerLimit;
+function isSameDirection(firstDirection, secondDirection) {
+    return ((types_1.isVariant(firstDirection, 'long') && types_1.isVariant(secondDirection, 'long')) ||
+        (types_1.isVariant(firstDirection, 'short') && types_1.isVariant(secondDirection, 'short')));
+}
+function calculateAmountToTradeForTriggerMarket(market, order) {
+    if (!order.triggered) {
+        return numericConstants_1.ZERO;
+    }
+    return order.baseAssetAmount;
+}

package/src/orders.ts

@@ -3,27 +3,13 @@ import {
 	MarketAccount,
 	Order,
 	PositionDirection,
-	SwapDirection,
 	UserAccount,
 	UserPosition,
 } from './types';
-import {
-	BN,
-	calculateAmmReservesAfterSwap,
-	calculateBaseAssetValue,
-	calculateSpreadReserves,
-	ClearingHouseUser,
-	isOrderRiskIncreasingInSameDirection,
-	standardizeBaseAssetAmount,
-	TEN_THOUSAND,
-} from '.';
-import {
-	calculateMarkPrice,
-	calculateNewMarketAfterTrade,
-} from './math/market';
+import { BN, standardizeBaseAssetAmount } from '.';
+import { calculateNewMarketAfterTrade } from './math/market';
 import {
 	AMM_TO_QUOTE_PRECISION_RATIO,
-	TWO,
 	PEG_PRECISION,
 	ZERO,
 } from './constants/numericConstants';
@@ -182,7 +168,6 @@ export function calculateBaseAssetAmountMarketCanExecute(
 	} else if (isVariant(order.orderType, 'triggerLimit')) {
 		return calculateAmountToTradeForTriggerLimit(market, order);
 	} else if (isVariant(order.orderType, 'market')) {
-		// should never be a market order queued
 		return ZERO;
 	} else {
 		return calculateAmountToTradeForTriggerMarket(market, order);
@@ -201,14 +186,7 @@ export function calculateAmountToTradeForLimit(
 				'Cant calculate limit price for oracle offset oracle without OraclePriceData'
 			);
 		}
-		const floatingPrice = oraclePriceData.price.add(order.oraclePriceOffset);
-		if (order.postOnly) {
-			limitPrice = isVariant(order.direction, 'long')
-				? BN.min(order.price, floatingPrice)
-				: BN.max(order.price, floatingPrice);
-		} else {
-			limitPrice = floatingPrice;
-		}
+		limitPrice = oraclePriceData.price.add(order.oraclePriceOffset);
 	}
 
 	const [maxAmountToTrade, direction] = calculateMaxBaseAssetAmountToTrade(
@@ -237,14 +215,8 @@ export function calculateAmountToTradeForTriggerLimit(
 	market: MarketAccount,
 	order: Order
 ): BN {
-	if (order.baseAssetAmountFilled.eq(ZERO)) {
-		const baseAssetAmount = calculateAmountToTradeForTriggerMarket(
-			market,
-			order
-		);
-		if (baseAssetAmount.eq(ZERO)) {
-			return ZERO;
-		}
+	if (!order.triggered) {
+		return ZERO;
 	}
 
 	return calculateAmountToTradeForLimit(market, order);
@@ -264,105 +236,9 @@ function calculateAmountToTradeForTriggerMarket(
 	market: MarketAccount,
 	order: Order
 ): BN {
-	return isTriggerConditionSatisfied(market, order)
-		? order.baseAssetAmount
-		: ZERO;
-}
-
-function isTriggerConditionSatisfied(
-	market: MarketAccount,
-	order: Order,
-	oraclePriceData?: OraclePriceData
-): boolean {
-	const markPrice = calculateMarkPrice(market, oraclePriceData);
-	if (isVariant(order.triggerCondition, 'above')) {
-		return markPrice.gt(order.triggerPrice);
-	} else {
-		return markPrice.lt(order.triggerPrice);
-	}
-}
-
-export function calculateBaseAssetAmountUserCanExecute(
-	market: MarketAccount,
-	order: Order,
-	user: ClearingHouseUser,
-	oraclePriceData?: OraclePriceData
-): BN {
-	const maxLeverage = user.getMaxLeverage(order.marketIndex, 'Initial');
-	const freeCollateral = user.getFreeCollateral();
-	let quoteAssetAmount: BN;
-	if (isOrderRiskIncreasingInSameDirection(user, order)) {
-		quoteAssetAmount = freeCollateral.mul(maxLeverage).div(TEN_THOUSAND);
-	} else {
-		const position =
-			user.getUserPosition(order.marketIndex) ||
-			user.getEmptyPosition(order.marketIndex);
-		const positionValue = calculateBaseAssetValue(
-			market,
-			position,
-			oraclePriceData
-		);
-		quoteAssetAmount = freeCollateral
-			.mul(maxLeverage)
-			.div(TEN_THOUSAND)
-			.add(positionValue.mul(TWO));
-	}
-
-	if (quoteAssetAmount.lte(ZERO)) {
+	if (!order.triggered) {
 		return ZERO;
 	}
 
-	const swapDirection = isVariant(order.direction, 'long')
-		? SwapDirection.ADD
-		: SwapDirection.REMOVE;
-
-	const useSpread = !order.postOnly;
-	let amm: Parameters<typeof calculateAmmReservesAfterSwap>[0];
-	if (useSpread) {
-		const { baseAssetReserve, quoteAssetReserve } = calculateSpreadReserves(
-			market.amm,
-			order.direction,
-			oraclePriceData
-		);
-		amm = {
-			baseAssetReserve,
-			quoteAssetReserve,
-			sqrtK: market.amm.sqrtK,
-			pegMultiplier: market.amm.pegMultiplier,
-		};
-	} else {
-		amm = market.amm;
-	}
-
-	const baseAssetReservesBefore = amm.baseAssetReserve;
-	const [_, baseAssetReservesAfter] = calculateAmmReservesAfterSwap(
-		amm,
-		'quote',
-		quoteAssetAmount,
-		swapDirection
-	);
-
-	let baseAssetAmount = baseAssetReservesBefore
-		.sub(baseAssetReservesAfter)
-		.abs();
-	if (order.reduceOnly) {
-		const position =
-			user.getUserPosition(order.marketIndex) ||
-			user.getEmptyPosition(order.marketIndex);
-		if (
-			isVariant(order.direction, 'long') &&
-			position.baseAssetAmount.gte(ZERO)
-		) {
-			baseAssetAmount = ZERO;
-		} else if (
-			isVariant(order.direction, 'short') &&
-			position.baseAssetAmount.lte(ZERO)
-		) {
-			baseAssetAmount = ZERO;
-		} else {
-			BN.min(baseAssetAmount, position.baseAssetAmount.abs());
-		}
-	}
-
-	return baseAssetAmount;
+	return order.baseAssetAmount;
 }

package/src/slot/SlotSubscriber.js

@@ -0,0 +1,39 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SlotSubscriber = void 0;
+const events_1 = require("events");
+class SlotSubscriber {
+    constructor(connection, _config) {
+        this.connection = connection;
+        this.eventEmitter = new events_1.EventEmitter();
+    }
+    subscribe() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.currentSlot = yield this.connection.getSlot('confirmed');
+            this.subscriptionId = this.connection.onSlotChange((slotInfo) => {
+                this.currentSlot = slotInfo.slot;
+                this.eventEmitter.emit('newSlot', slotInfo.slot);
+            });
+        });
+    }
+    getSlot() {
+        return this.currentSlot;
+    }
+    unsubscribe() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.subscriptionId) {
+                yield this.connection.removeSlotChangeListener(this.subscriptionId);
+            }
+        });
+    }
+}
+exports.SlotSubscriber = SlotSubscriber;

package/src/slot/SlotSubscriber.ts

@@ -1,22 +1,32 @@
 import { Connection } from '@solana/web3.js';
+import { EventEmitter } from 'events';
+import StrictEventEmitter from 'strict-event-emitter-types/types/src';
 
 // eslint-disable-next-line @typescript-eslint/ban-types
 type SlotSubscriberConfig = {}; // for future customization
 
+export interface SlotSubscriberEvents {
+	newSlot: (newSlot: number) => void;
+}
+
 export class SlotSubscriber {
 	currentSlot: number;
 	subscriptionId: number;
+	eventEmitter: StrictEventEmitter<EventEmitter, SlotSubscriberEvents>;
 
 	public constructor(
 		private connection: Connection,
 		_config?: SlotSubscriberConfig
-	) {}
+	) {
+		this.eventEmitter = new EventEmitter();
+	}
 
 	public async subscribe(): Promise<void> {
 		this.currentSlot = await this.connection.getSlot('confirmed');
 
 		this.subscriptionId = this.connection.onSlotChange((slotInfo) => {
 			this.currentSlot = slotInfo.slot;
+			this.eventEmitter.emit('newSlot', slotInfo.slot);
 		});
 	}
 

package/src/token/index.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseTokenAccount = void 0;
+const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
+function parseTokenAccount(data) {
+    const accountInfo = spl_token_1.AccountLayout.decode(data);
+    accountInfo.mint = new web3_js_1.PublicKey(accountInfo.mint);
+    accountInfo.owner = new web3_js_1.PublicKey(accountInfo.owner);
+    accountInfo.amount = spl_token_1.u64.fromBuffer(accountInfo.amount);
+    if (accountInfo.delegateOption === 0) {
+        accountInfo.delegate = null;
+        // eslint-disable-next-line new-cap
+        accountInfo.delegatedAmount = new spl_token_1.u64(0);
+    }
+    else {
+        accountInfo.delegate = new web3_js_1.PublicKey(accountInfo.delegate);
+        accountInfo.delegatedAmount = spl_token_1.u64.fromBuffer(accountInfo.delegatedAmount);
+    }
+    accountInfo.isInitialized = accountInfo.state !== 0;
+    accountInfo.isFrozen = accountInfo.state === 2;
+    if (accountInfo.isNativeOption === 1) {
+        accountInfo.rentExemptReserve = spl_token_1.u64.fromBuffer(accountInfo.isNative);
+        accountInfo.isNative = true;
+    }
+    else {
+        accountInfo.rentExemptReserve = null;
+        accountInfo.isNative = false;
+    }
+    if (accountInfo.closeAuthorityOption === 0) {
+        accountInfo.closeAuthority = null;
+    }
+    else {
+        accountInfo.closeAuthority = new web3_js_1.PublicKey(accountInfo.closeAuthority);
+    }
+    return accountInfo;
+}
+exports.parseTokenAccount = parseTokenAccount;

package/src/{mockUSDCFaucet.ts → tokenFaucet.ts}

@@ -3,7 +3,6 @@ import { AnchorProvider, Idl, Program } from '@project-serum/anchor';
 import {
 	AccountInfo,
 	ASSOCIATED_TOKEN_PROGRAM_ID,
-	MintLayout,
 	Token,
 	TOKEN_PROGRAM_ID,
 } from '@solana/spl-token';
@@ -11,27 +10,28 @@ import {
 	ConfirmOptions,
 	Connection,
 	PublicKey,
-	SystemProgram,
 	SYSVAR_RENT_PUBKEY,
 	Transaction,
 	TransactionInstruction,
 	TransactionSignature,
 } from '@solana/web3.js';
 import { BN } from '.';
-import mockUSDCFaucetIDL from './idl/mock_usdc_faucet.json';
+import tokenFaucet from './idl/token_faucet.json';
 import { IWallet } from './types';
 
-export class MockUSDCFaucet {
+export class TokenFaucet {
 	connection: Connection;
 	wallet: IWallet;
 	public program: Program;
 	provider: AnchorProvider;
+	mint: PublicKey;
 	opts?: ConfirmOptions;
 
 	public constructor(
 		connection: Connection,
 		wallet: IWallet,
 		programId: PublicKey,
+		mint: PublicKey,
 		opts?: ConfirmOptions
 	) {
 		this.connection = connection;
@@ -39,78 +39,56 @@ export class MockUSDCFaucet {
 		this.opts = opts || AnchorProvider.defaultOptions();
 		const provider = new AnchorProvider(connection, wallet, this.opts);
 		this.provider = provider;
-		this.program = new Program(mockUSDCFaucetIDL as Idl, programId, provider);
+		this.program = new Program(tokenFaucet as Idl, programId, provider);
+		this.mint = mint;
 	}
 
-	public async getMockUSDCFaucetStatePublicKeyAndNonce(): Promise<
+	public async getFaucetConfigPublicKeyAndNonce(): Promise<
 		[PublicKey, number]
 	> {
 		return anchor.web3.PublicKey.findProgramAddress(
-			[Buffer.from(anchor.utils.bytes.utf8.encode('mock_usdc_faucet'))],
+			[
+				Buffer.from(anchor.utils.bytes.utf8.encode('faucet_config')),
+				this.mint.toBuffer(),
+			],
 			this.program.programId
 		);
 	}
 
-	mockUSDCFaucetStatePublicKey?: PublicKey;
-	public async getMockUSDCFaucetStatePublicKey(): Promise<PublicKey> {
-		if (this.mockUSDCFaucetStatePublicKey) {
-			return this.mockUSDCFaucetStatePublicKey;
-		}
-		this.mockUSDCFaucetStatePublicKey = (
-			await this.getMockUSDCFaucetStatePublicKeyAndNonce()
+	public async getMintAuthority(): Promise<PublicKey> {
+		return (
+			await anchor.web3.PublicKey.findProgramAddress(
+				[
+					Buffer.from(anchor.utils.bytes.utf8.encode('mint_authority')),
+					this.mint.toBuffer(),
+				],
+				this.program.programId
+			)
 		)[0];
-		return this.mockUSDCFaucetStatePublicKey;
 	}
 
-	public async initialize(): Promise<TransactionSignature> {
-		const stateAccountRPCResponse = await this.connection.getParsedAccountInfo(
-			await this.getMockUSDCFaucetStatePublicKey()
-		);
-		if (stateAccountRPCResponse.value !== null) {
-			throw new Error('Faucet already initialized');
-		}
-
-		const fakeUSDCMint = anchor.web3.Keypair.generate();
-		const createUSDCMintAccountIx = SystemProgram.createAccount({
-			fromPubkey: this.wallet.publicKey,
-			newAccountPubkey: fakeUSDCMint.publicKey,
-			lamports: await Token.getMinBalanceRentForExemptMint(this.connection),
-			space: MintLayout.span,
-			programId: TOKEN_PROGRAM_ID,
-		});
-
-		const [mintAuthority, _mintAuthorityNonce] =
-			await PublicKey.findProgramAddress(
-				[fakeUSDCMint.publicKey.toBuffer()],
-				this.program.programId
-			);
-
-		const initUSDCMintIx = Token.createInitMintInstruction(
-			TOKEN_PROGRAM_ID,
-			fakeUSDCMint.publicKey,
-			6,
-			mintAuthority,
-			null
-		);
+	public async getFaucetConfigPublicKey(): Promise<PublicKey> {
+		return (await this.getFaucetConfigPublicKeyAndNonce())[0];
+	}
 
-		const [mockUSDCFaucetStatePublicKey, mockUSDCFaucetStateNonce] =
-			await this.getMockUSDCFaucetStatePublicKeyAndNonce();
-		return await this.program.rpc.initialize(mockUSDCFaucetStateNonce, {
+	public async initialize(): Promise<TransactionSignature> {
+		const [faucetConfigPublicKey] =
+			await this.getFaucetConfigPublicKeyAndNonce();
+		return await this.program.rpc.initialize({
 			accounts: {
-				mockUsdcFaucetState: mockUSDCFaucetStatePublicKey,
+				faucetConfig: faucetConfigPublicKey,
 				admin: this.wallet.publicKey,
-				mintAccount: fakeUSDCMint.publicKey,
+				mintAccount: this.mint,
 				rent: SYSVAR_RENT_PUBKEY,
 				systemProgram: anchor.web3.SystemProgram.programId,
+				tokenProgram: TOKEN_PROGRAM_ID,
 			},
-			instructions: [createUSDCMintAccountIx, initUSDCMintIx],
-			signers: [fakeUSDCMint],
 		});
 	}
 
 	public async fetchState(): Promise<any> {
-		return await this.program.account.mockUsdcFaucetState.fetch(
-			await this.getMockUSDCFaucetStatePublicKey()
+		return await this.program.account.faucetConfig.fetch(
+			await this.getFaucetConfigPublicKey()
 		);
 	}
 
@@ -118,18 +96,29 @@ export class MockUSDCFaucet {
 		userTokenAccount: PublicKey,
 		amount: BN
 	): Promise<TransactionSignature> {
-		const state: any = await this.fetchState();
 		return await this.program.rpc.mintToUser(amount, {
 			accounts: {
-				mockUsdcFaucetState: await this.getMockUSDCFaucetStatePublicKey(),
-				mintAccount: state.mint,
+				faucetConfig: await this.getFaucetConfigPublicKey(),
+				mintAccount: this.mint,
 				userTokenAccount,
-				mintAuthority: state.mintAuthority,
+				mintAuthority: await this.getMintAuthority(),
 				tokenProgram: TOKEN_PROGRAM_ID,
 			},
 		});
 	}
 
+	public async transferMintAuthority(): Promise<TransactionSignature> {
+		return await this.program.rpc.transferMintAuthority({
+			accounts: {
+				faucetConfig: await this.getFaucetConfigPublicKey(),
+				mintAccount: this.mint,
+				mintAuthority: await this.getMintAuthority(),
+				tokenProgram: TOKEN_PROGRAM_ID,
+				admin: this.wallet.publicKey,
+			},
+		});
+	}
+
 	public async createAssociatedTokenAccountAndMintTo(
 		userPublicKey: PublicKey,
 		amount: BN
@@ -166,7 +155,7 @@ export class MockUSDCFaucet {
 
 		const mintToIx = await this.program.instruction.mintToUser(amount, {
 			accounts: {
-				mockUsdcFaucetState: await this.getMockUSDCFaucetStatePublicKey(),
+				faucetConfig: await this.getFaucetConfigPublicKey(),
 				mintAccount: state.mint,
 				userTokenAccount: associateTokenPublicKey,
 				mintAuthority: state.mintAuthority,