@drift-labs/sdk 0.1.36-master.5 → 0.2.0-master.0

package/src/tx/retryTxSender.ts

@@ -1,4 +1,4 @@
-import { TxSender } from './types';
+import { TxSender, TxSigAndSlot } from './types';
 import {
 	Commitment,
 	ConfirmOptions,
@@ -43,7 +43,7 @@ export class RetryTxSender implements TxSender {
 		tx: Transaction,
 		additionalSigners?: Array<Signer>,
 		opts?: ConfirmOptions
-	): Promise<TransactionSignature> {
+	): Promise<TxSigAndSlot> {
 		if (additionalSigners === undefined) {
 			additionalSigners = [];
 		}
@@ -86,8 +86,10 @@ export class RetryTxSender implements TxSender {
 			}
 		})();
 
+		let slot: number;
 		try {
-			await this.confirmTransaction(txid, opts.commitment);
+			const result = await this.confirmTransaction(txid, opts.commitment);
+			slot = result.context.slot;
 		} catch (e) {
 			console.error(e);
 			throw e;
@@ -95,7 +97,7 @@ export class RetryTxSender implements TxSender {
 			stopWaiting();
 		}
 
-		return txid;
+		return { txSig: txid, slot };
 	}
 
 	async prepareTx(

package/src/tx/types.ts

@@ -6,6 +6,11 @@ import {
 	TransactionSignature,
 } from '@solana/web3.js';
 
+export type TxSigAndSlot = {
+	txSig: TransactionSignature;
+	slot: number;
+};
+
 export interface TxSender {
 	provider: Provider;
 
@@ -13,5 +18,5 @@ export interface TxSender {
 		tx: Transaction,
 		additionalSigners?: Array<Signer>,
 		opts?: ConfirmOptions
-	): Promise<TransactionSignature>;
+	): Promise<TxSigAndSlot>;
 }

package/src/tx/utils.ts

@@ -1,5 +1,24 @@
-import { Transaction, TransactionInstruction } from '@solana/web3.js';
+import {
+	Transaction,
+	TransactionInstruction,
+	ComputeBudgetProgram,
+} from '@solana/web3.js';
 
-export function wrapInTx(instruction: TransactionInstruction): Transaction {
-	return new Transaction().add(instruction);
+const COMPUTE_UNITS_DEFAULT = 200_000;
+
+export function wrapInTx(
+	instruction: TransactionInstruction,
+	computeUnits = 500_000 // TODO, requires less code change
+): Transaction {
+	const tx = new Transaction();
+	if (computeUnits != COMPUTE_UNITS_DEFAULT) {
+		tx.add(
+			ComputeBudgetProgram.requestUnits({
+				units: computeUnits,
+				additionalFee: 0,
+			})
+		);
+	}
+
+	return tx.add(instruction);
 }

package/src/types.ts

@@ -7,6 +7,11 @@ export class SwapDirection {
 	static readonly REMOVE = { remove: {} };
 }
 
+export class BankBalanceType {
+	static readonly DEPOSIT = { deposit: {} };
+	static readonly BORROW = { borrow: {} };
+}
+
 export class PositionDirection {
 	static readonly LONG = { long: {} };
 	static readonly SHORT = { short: {} };
@@ -15,6 +20,7 @@ export class PositionDirection {
 export class OracleSource {
 	static readonly PYTH = { pyth: {} };
 	static readonly SWITCHBOARD = { switchboard: {} };
+	static readonly QUOTE_ASSET = { quoteAsset: {} };
 }
 
 export class OrderType {
@@ -53,6 +59,12 @@ export function isVariant(object: unknown, type: string) {
 	return object.hasOwnProperty(type);
 }
 
+export function isOneOfVariant(object: unknown, types: string[]) {
+	return types.reduce((result, type) => {
+		return result || object.hasOwnProperty(type);
+	}, false);
+}
+
 export enum TradeSide {
 	None = 0,
 	Buy = 1,
@@ -69,58 +81,21 @@ export type CandleResolution =
 	| 'W'
 	| 'M';
 
-// # ClearingHouse Account Types
-export type TradeHistoryAccount = {
-	head: BN;
-	tradeRecords: TradeRecord[];
-};
-
-export type DepositHistoryAccount = {
-	head: BN;
-	depositRecords: DepositRecord[];
-};
-
-export type ExtendedCurveHistoryAccount = {
-	head: BN;
-	curveRecords: ExtendedCurveRecord[];
-};
-
-export type FundingRateHistoryAccount = {
-	head: BN;
-	fundingRateRecords: FundingRateRecord[];
-};
-
-export type FundingPaymentHistoryAccount = {
-	head: BN;
-	fundingPaymentRecords: FundingPaymentRecord[];
-};
-
-export type LiquidationHistoryAccount = {
-	head: BN;
-	liquidationRecords: LiquidationRecord[];
-};
-
-export type OrderHistoryAccount = {
-	head: BN;
-	lastOrderId: BN;
-	orderRecords: OrderRecord[];
-};
-
 export type DepositRecord = {
 	ts: BN;
-	recordId: BN;
 	userAuthority: PublicKey;
 	user: PublicKey;
 	direction: {
 		deposit?: any;
 		withdraw?: any;
 	};
-	collateralBefore: BN;
-	cumulativeDepositsBefore: BN;
+	bankIndex: BN;
 	amount: BN;
+	from?: PublicKey;
+	to?: PublicKey;
 };
 
-export type ExtendedCurveRecord = {
+export type CurveRecord = {
 	ts: BN;
 	recordId: BN;
 	marketIndex: BN;
@@ -140,28 +115,6 @@ export type ExtendedCurveRecord = {
 	tradeId: BN;
 };
 
-export type TradeRecord = {
-	ts: BN;
-	recordId: BN;
-	userAuthority: PublicKey;
-	user: PublicKey;
-	direction: {
-		long?: any;
-		short?: any;
-	};
-	baseAssetAmount: BN;
-	quoteAssetAmount: BN;
-	markPriceBefore: BN;
-	markPriceAfter: BN;
-	fee: BN;
-	quoteAssetAmountSurplus: BN;
-	refereeDiscount: BN;
-	tokenDiscount: BN;
-	marketIndex: BN;
-	liquidation: boolean;
-	oraclePrice: BN;
-};
-
 export type FundingRateRecord = {
 	ts: BN;
 	recordId: BN;
@@ -175,7 +128,6 @@ export type FundingRateRecord = {
 
 export type FundingPaymentRecord = {
 	ts: BN;
-	recordId: BN;
 	userAuthority: PublicKey;
 	user: PublicKey;
 	marketIndex: BN;
@@ -207,18 +159,21 @@ export type LiquidationRecord = {
 
 export type OrderRecord = {
 	ts: BN;
-	recordId: BN;
-	order: Order;
-	user: PublicKey;
-	authority: PublicKey;
+	taker: PublicKey;
+	maker: PublicKey;
+	takerOrder: Order;
+	makerOrder: Order;
 	action: OrderAction;
 	filler: PublicKey;
+	fillRecordId: BN;
+	marketIndex: BN;
 	baseAssetAmountFilled: BN;
 	quoteAssetAmountFilled: BN;
-	fee: BN;
+	makerRebate: BN;
+	takerFee: BN;
 	fillerReward: BN;
-	tradeRecordId: BN;
 	quoteAssetAmountSurplus: BN;
+	oraclePrice: BN;
 };
 
 export type StateAccount = {
@@ -226,23 +181,12 @@ export type StateAccount = {
 	fundingPaused: boolean;
 	exchangePaused: boolean;
 	adminControlsPrices: boolean;
-	collateralMint: PublicKey;
-	collateralVault: PublicKey;
-	collateralVaultAuthority: PublicKey;
-	collateralVaultNonce: number;
 	insuranceVault: PublicKey;
 	insuranceVaultAuthority: PublicKey;
 	insuranceVaultNonce: number;
 	marginRatioInitial: BN;
 	marginRatioMaintenance: BN;
 	marginRatioPartial: BN;
-	markets: PublicKey;
-	curveHistory: PublicKey;
-	depositHistory: PublicKey;
-	fundingRateHistory: PublicKey;
-	fundingPaymentHistory: PublicKey;
-	tradeHistory: PublicKey;
-	liquidationHistory: PublicKey;
 	partialLiquidationClosePercentageNumerator: BN;
 	partialLiquidationClosePercentageDenominator: BN;
 	partialLiquidationPenaltyPercentageNumerator: BN;
@@ -258,30 +202,52 @@ export type StateAccount = {
 	discountMint: PublicKey;
 	oracleGuardRails: OracleGuardRails;
 	maxDeposit: BN;
-	orderState: PublicKey;
-	extendedCurveHistory: PublicKey;
-};
-
-export type OrderStateAccount = {
-	orderHistory: PublicKey;
-	orderFillerRewardStructure: OrderFillerRewardStructure;
+	numberOfMarkets: BN;
+	numberOfBanks: BN;
 	minOrderQuoteAssetAmount: BN;
 };
 
-export type MarketsAccount = {
-	markets: Market[];
-};
-
-export type Market = {
+export type MarketAccount = {
+	initialized: boolean;
+	marketIndex: BN;
+	pubkey: PublicKey;
 	amm: AMM;
 	baseAssetAmount: BN;
 	baseAssetAmountLong: BN;
 	baseAssetAmountShort: BN;
-	initialized: boolean;
 	openInterest: BN;
 	marginRatioInitial: number;
 	marginRatioMaintenance: number;
 	marginRatioPartial: number;
+	nextFillRecordId: BN;
+	pnlPool: PoolBalance;
+};
+
+export type BankAccount = {
+	bankIndex: BN;
+	pubkey: PublicKey;
+	mint: PublicKey;
+	vault: PublicKey;
+	vaultAuthority: PublicKey;
+	vaultAuthorityNonce: number;
+	decimals: number;
+	optimalUtilization: BN;
+	optimalBorrowRate: BN;
+	maxBorrowRate: BN;
+	cumulativeDepositInterest: BN;
+	cumulativeBorrowInterest: BN;
+	depositBalance: BN;
+	borrowBalance: BN;
+	lastUpdated: BN;
+	oracle: PublicKey;
+	initialAssetWeight: BN;
+	maintenanceAssetWeight: BN;
+	initialLiabilityWeight: BN;
+	maintenanceLiabilityWeight: BN;
+};
+
+export type PoolBalance = {
+	balance: BN;
 };
 
 export type AMM = {
@@ -307,9 +273,23 @@ export type AMM = {
 	totalFeeWithdrawn: BN;
 	totalFee: BN;
 	minimumQuoteAssetTradeSize: BN;
-	minimumBaseAssetTradeSize: BN;
+	baseAssetAmountStepSize: BN;
 	lastOraclePrice: BN;
 	baseSpread: number;
+	curveUpdateIntensity: number;
+	netBaseAssetAmount: BN;
+	quoteAssetAmountLong: BN;
+	quoteAssetAmountShort: BN;
+	terminalQuoteAssetReserve: BN;
+	feePool: PoolBalance;
+	totalExchangeFee: BN;
+	totalMmFee: BN;
+	netRevenueSinceLastFunding: BN;
+	lastUpdateSlot: BN;
+	lastBidPriceTwap: BN;
+	lastAskPriceTwap: BN;
+	longSpread: BN;
+	shortSpread: BN;
 };
 
 // # User Account Types
@@ -318,40 +298,46 @@ export type UserPosition = {
 	lastCumulativeFundingRate: BN;
 	marketIndex: BN;
 	quoteAssetAmount: BN;
+	quoteEntryAmount: BN;
 	openOrders: BN;
-};
-
-export type UserPositionsAccount = {
-	positions: UserPosition[];
-	user: PublicKey;
+	unsettledPnl: BN;
+	openBids: BN;
+	openAsks: BN;
 };
 
 export type UserAccount = {
 	authority: PublicKey;
+	name: number[];
+	userId: number;
+	bankBalances: UserBankBalance[];
 	collateral: BN;
 	cumulativeDeposits: BN;
-	positions: PublicKey;
-	totalFeePaid: BN;
-	totalFeeRebate: BN;
-	totalTokenDiscount: BN;
-	totalReferralReward: BN;
-	totalRefereeDiscount: BN;
+	fees: {
+		totalFeePaid: BN;
+		totalFeeRebate: BN;
+		totalTokenDiscount: BN;
+		totalReferralReward: BN;
+		totalRefereeDiscount: BN;
+	};
+	positions: UserPosition[];
+	orders: Order[];
 };
 
-export type UserOrdersAccount = {
-	orders: Order[];
-	user: PublicKey;
+export type UserBankBalance = {
+	bankIndex: BN;
+	balanceType: BankBalanceType;
+	balance: BN;
 };
 
 export type Order = {
 	status: OrderStatus;
 	orderType: OrderType;
 	ts: BN;
+	slot: BN;
 	orderId: BN;
 	userOrderId: number;
 	marketIndex: BN;
 	price: BN;
-	userBaseAssetAmount: BN;
 	baseAssetAmount: BN;
 	baseAssetAmountFilled: BN;
 	quoteAssetAmount: BN;
@@ -362,10 +348,14 @@ export type Order = {
 	triggerPrice: BN;
 	triggerCondition: OrderTriggerCondition;
 	discountTier: OrderDiscountTier;
+	existingPositionDirection: PositionDirection,
 	referrer: PublicKey;
 	postOnly: boolean;
 	immediateOrCancel: boolean;
 	oraclePriceOffset: BN;
+	auctionDuration: number;
+	auctionStartPrice: BN;
+	auctionEndPrice: BN;
 };
 
 export type OrderParams = {
@@ -391,6 +381,11 @@ export type OrderParams = {
 	};
 };
 
+export type MakerInfo = {
+	maker: PublicKey;
+	order: Order;
+};
+
 // # Misc Types
 export interface IWallet {
 	signTransaction(tx: Transaction): Promise<Transaction>;
@@ -429,6 +424,9 @@ export type FeeStructure = {
 		refereeDiscountNumerator: BN;
 		refereeDiscountDenominator: BN;
 	};
+	makerRebateNumerator: BN;
+	makerRebateDenominator: BN;
+	fillerRewardStructure: OrderFillerRewardStructure;
 };
 
 export type OracleGuardRails = {

package/src/userName.ts

@@ -0,0 +1,20 @@
+export const MAX_NAME_LENGTH = 32;
+
+export const DEFAULT_USER_NAME = 'Main Account';
+
+export function encodeName(name: string): number[] {
+	if (name.length > MAX_NAME_LENGTH) {
+		throw Error(`User name (${name}) longer than 32 characters`);
+	}
+
+	const buffer = Buffer.alloc(32);
+	buffer.fill(name);
+	buffer.fill(' ', name.length);
+
+	return Array(...buffer);
+}
+
+export function decodeName(bytes: number[]): string {
+	const buffer = Buffer.from(bytes);
+	return buffer.toString('utf8').trim();
+}

package/src/util/computeUnits.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findComputeUnitConsumption = void 0;
+async function findComputeUnitConsumption(programId, connection, txSignature, commitment = 'confirmed') {
+    const tx = await connection.getTransaction(txSignature, { commitment });
+    const computeUnits = [];
+    const regex = new RegExp(`Program ${programId.toString()} consumed ([0-9]{0,6}) of 200000 compute units`);
+    tx.meta.logMessages.forEach((logMessage) => {
+        const match = logMessage.match(regex);
+        if (match && match[1]) {
+            computeUnits.push(match[1]);
+        }
+    });
+    return computeUnits;
+}
+exports.findComputeUnitConsumption = findComputeUnitConsumption;
+//# sourceMappingURL=computeUnits.js.map

package/src/util/computeUnits.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"computeUnits.js","sourceRoot":"","sources":["computeUnits.ts"],"names":[],"mappings":";;;AAEO,KAAK,UAAU,0BAA0B,CAC/C,SAAoB,EACpB,UAAsB,EACtB,WAAmB,EACnB,aAAuB,WAAW;IAElC,MAAM,EAAE,GAAG,MAAM,UAAU,CAAC,cAAc,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;IACxE,MAAM,YAAY,GAAG,EAAE,CAAC;IACxB,MAAM,KAAK,GAAG,IAAI,MAAM,CACvB,WAAW,SAAS,CAAC,QAAQ,EAAE,gDAAgD,CAC/E,CAAC;IACF,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QAC1C,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACtC,IAAI,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;YACtB,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SAC5B;IACF,CAAC,CAAC,CAAC;IACH,OAAO,YAAY,CAAC;AACrB,CAAC;AAlBD,gEAkBC"}