@velocity-exchange/sdk 0.2.3 → 0.2.5

package/src/types.ts

@@ -371,6 +371,8 @@ export type DepositRecord = {
 	depositRecordId: BN;
 	explanation: DepositExplanation;
 	transferUser?: PublicKey;
+	signer?: PublicKey;
+	userTokenAmountAfter: BN;
 };
 
 export type SpotInterestRecord = {
@@ -465,13 +467,14 @@ export type LiquidationRecord = {
 	marginFreed: BN;
 	liquidationId: number;
 	bankrupt: boolean;
-	canceledOrderIds: BN[];
+	canceledOrderIds: number[];
 	liquidatePerp: LiquidatePerpRecord;
 	liquidateSpot: LiquidateSpotRecord;
 	liquidateBorrowForPerpPnl: LiquidateBorrowForPerpPnlRecord;
 	liquidatePerpPnlForDeposit: LiquidatePerpPnlForDepositRecord;
 	perpBankruptcy: PerpBankruptcyRecord;
 	spotBankruptcy: SpotBankruptcyRecord;
+	bitFlags: number;
 };
 
 export class LiquidationType {
@@ -498,11 +501,12 @@ export type LiquidatePerpRecord = {
 	oraclePrice: BN;
 	baseAssetAmount: BN;
 	quoteAssetAmount: BN;
-	userOrderId: BN;
-	liquidatorOrderId: BN;
+	userOrderId: number;
+	liquidatorOrderId: number;
 	fillRecordId: BN;
 	liquidatorFee: BN;
 	ifFee: BN;
+	protocolFee: BN;
 };
 
 export type LiquidateSpotRecord = {
@@ -513,6 +517,7 @@ export type LiquidateSpotRecord = {
 	liabilityPrice: BN;
 	liabilityTransfer: BN;
 	ifFee: BN;
+	protocolFee: BN;
 };
 
 export type LiquidateBorrowForPerpPnlRecord = {
@@ -615,6 +620,9 @@ export type OrderActionRecord = {
 	takerExistingBaseAssetAmount: BN | null;
 	makerExistingQuoteEntryAmount: BN | null;
 	makerExistingBaseAssetAmount: BN | null;
+	triggerPrice: BN | null;
+	builderIdx: number | null;
+	builderFee: BN | null;
 };
 
 export type SwapRecord = {
@@ -661,8 +669,6 @@ export type LPSwapRecord = {
 	inConstituentIndex: number;
 	outOraclePrice: BN;
 	inOraclePrice: BN;
-	outMint: PublicKey;
-	inMint: PublicKey;
 	lastAum: BN;
 	lastAumSlot: BN;
 	inMarketCurrentWeight: BN;
@@ -685,7 +691,6 @@ export type LPMintRedeemRecord = {
 	constituentIndex: number;
 	oraclePrice: BN;
 	mint: PublicKey;
-	lpMint: PublicKey;
 	lpAmount: BN;
 	lpFee: BN;
 	lpPrice: BN;
@@ -728,6 +733,7 @@ export type LPBorrowLendDepositRecord = {
 export type StateAccount = {
 	coldAdmin: PublicKey;
 	warmAdmin: PublicKey;
+	pauseAdmin: PublicKey;
 	hotAmmCrank: PublicKey;
 	hotLpCache: PublicKey;
 	hotLpSwap: PublicKey;
@@ -764,6 +770,7 @@ export type StateAccount = {
 	liquidationDuration: number;
 	maxInitializeUserFee: number;
 	featureBitFlags: number;
+	lpPoolFeatureBitFlags: number;
 };
 
 export type PerpMarketAccount = {
@@ -807,6 +814,7 @@ export type PerpMarketAccount = {
 	pausedOperations: number;
 
 	lastFillPrice: BN;
+	poolId: number;
 
 	hedgeConfig: {
 		poolId: number;
@@ -908,6 +916,7 @@ export type SpotMarketAccount = {
 
 	lastInterestTs: BN;
 	lastTwapTs: BN;
+	expiryTs: BN;
 	initialAssetWeight: number;
 	maintenanceAssetWeight: number;
 	initialLiabilityWeight: number;
@@ -988,12 +997,21 @@ export type AMM = {
 	totalFeeMinusDistributions: BN;
 	/// @deprecated frozen pre-isolation analytics counter
 	totalFeeWithdrawn: BN;
+	askBaseAssetReserve: BN;
+	askQuoteAssetReserve: BN;
+	bidBaseAssetReserve: BN;
+	bidQuoteAssetReserve: BN;
 	lastUpdateSlot: BN;
 	netRevenueSinceLastFunding: BN;
 	lastCumulativeFundingRateLong: BN;
 	lastCumulativeFundingRateShort: BN;
+	lastOracleReservePriceSpreadPct: BN;
+	lastSpreadUpdateSlot: BN;
 	baseSpread: number;
 	maxSpread: number;
+	longSpread: number;
+	shortSpread: number;
+	referencePriceOffset: number;
 	maxFillReserveFraction: number;
 	maxSlippageRatio: number;
 	curveUpdateIntensity: number;
@@ -1066,6 +1084,8 @@ export type UserStatsAccount = {
 	};
 	referrer: PublicKey;
 	referrerStatus: number;
+	disableUpdatePerpBidAskTwap: number;
+	pausedOperations: number;
 	authority: PublicKey;
 	ifStakedQuoteAssetAmount: BN;
 	delegatePermissions: number;
@@ -1388,8 +1408,8 @@ export type FeeTier = {
 };
 
 export type OrderFillerRewardStructure = {
-	rewardNumerator: BN;
-	rewardDenominator: BN;
+	rewardNumerator: number;
+	rewardDenominator: number;
 	timeBasedRewardLowerBound: BN;
 };
 
@@ -1426,6 +1446,25 @@ export type PrelaunchOracle = {
 	perpMarketIndex: number;
 };
 
+export type PrelaunchOracleParams = {
+	perpMarketIndex: number;
+	price: BN | null;
+	maxPrice: BN | null;
+};
+
+export type PythLazerOracle = {
+	price: BN;
+	publishTime: BN;
+	postedSlot: BN;
+	exponent: number;
+	conf: BN;
+};
+
+export type UpdatePerpMarketSummaryStatsParams = {
+	netUnsettledFundingPnl: BN | null;
+	updateAmmSummaryStats: boolean | null;
+};
+
 export type MarginCategory = 'Initial' | 'Maintenance';
 
 export type InsuranceFundStake = {
@@ -1436,6 +1475,7 @@ export type InsuranceFundStake = {
 
 	ifShares: BN;
 	ifBase: BN;
+	lastValidTs: BN;
 
 	lastWithdrawRequestShares: BN;
 	lastWithdrawRequestValue: BN;
@@ -1523,6 +1563,10 @@ export type SignedMsgUserOrdersAccount = {
 	signedMsgOrderData: SignedMsgOrderId[];
 };
 
+export type SignedMsgWsDelegatesAccount = {
+	delegates: PublicKey[];
+};
+
 export type RevenueShareAccount = {
 	authority: PublicKey;
 	totalReferrerRewards: BN;
@@ -1557,8 +1601,25 @@ export type BuilderInfo = {
 	padding: number[];
 };
 
+export type PerpMarketFeeSweepRecord = {
+	ts: BN;
+	marketIndex: number;
+	ifSwept: BN;
+	protocolSwept: BN;
+	ammProvisionTokenized: BN;
+};
+
+export type ProtocolFeeWithdrawRecord = {
+	ts: BN;
+	marketIndex: number;
+	isPerp: boolean;
+	spotMarketIndex: number;
+	amount: BN;
+	recipientTokenAccount: PublicKey;
+};
+
 export type RevenueShareSettleRecord = {
-	ts: number;
+	ts: BN;
 	builder: PublicKey | null;
 	referrer: PublicKey | null;
 	feeSettled: BN;
@@ -1628,6 +1689,8 @@ export type LPPoolAccount = {
 	bump: number;
 	gammaExecution: number;
 	xi: number;
+	targetOracleDelayFeeBpsPer10Slots: number;
+	targetPositionDelayFeeBpsPer10Slots: number;
 };
 
 export type ConstituentSpotBalance = {
@@ -1726,6 +1789,7 @@ export type CacheInfo = {
 };
 
 export type AmmCache = {
+	bump: number;
 	cache: CacheInfo[];
 };
 
@@ -1739,3 +1803,12 @@ export class TransferFeeAndPnlPoolDirection {
 	static readonly FEE_TO_PNL_POOL = { feeToPnlPool: {} };
 	static readonly PNL_TO_FEE_POOL = { pnlToFeePool: {} };
 }
+
+export type TransferFeeAndPnlPoolRecord = {
+	ts: BN;
+	slot: BN;
+	perpMarketIndexWithFeePool: number;
+	perpMarketIndexWithPnlPool: number;
+	direction: TransferFeeAndPnlPoolDirection;
+	amount: BN;
+};

package/src/user.ts

@@ -225,20 +225,35 @@ export class User {
 		this.isSubscribed = false;
 	}
 
+	/**
+	 * Returns the cached user account.
+	 *
+	 * - **Throws** `NotSubscribedError` if the subscriber has not been subscribed
+	 *   yet — reading the account before {@link subscribe} resolves is a
+	 *   programming error, not a missing-account condition.
+	 * - Returns `undefined` when subscribed but no account was found on chain.
+	 *   Because `subscribe()` awaits the initial fetch, an `undefined` here means
+	 *   the account does not exist (or has not yet been observed), not that data
+	 *   is "still loading".
+	 */
 	public getUserAccount(): UserAccount | undefined {
 		return this.accountSubscriber.getUserAccountAndSlot()?.data;
 	}
 
 	/**
-	 * Like {@link getUserAccount} but throws a named error instead of returning
-	 * `undefined` when the account has not been loaded yet. Use at call sites
-	 * that structurally require a loaded account.
+	 * Like {@link getUserAccount} but throws instead of returning `undefined`
+	 * when the account was not found. Use at call sites that structurally
+	 * require the account to exist. (Still propagates `NotSubscribedError` when
+	 * called before subscribing.)
+	 *
+	 * Delegates to {@link getUserAccount} (rather than the subscriber directly)
+	 * so callers that override `getUserAccount` see the override here too.
 	 */
 	public getUserAccountOrThrow(): UserAccount {
 		const userAccount = this.getUserAccount();
 		if (!userAccount) {
 			throw new Error(
-				`User account not loaded: ${this.getUserAccountPublicKey().toString()}`
+				`User account not found: ${this.getUserAccountPublicKey().toString()}`
 			);
 		}
 		return userAccount;
@@ -255,14 +270,15 @@ export class User {
 	}
 
 	/**
-	 * Like {@link getUserAccountAndSlot} but throws a named error instead of
-	 * returning `undefined` when the account has not been loaded yet. Use at
-	 * call sites that structurally require a loaded account.
+	 * Like {@link getUserAccountAndSlot} but throws instead of returning
+	 * `undefined` when the account was not found. Use at call sites that
+	 * structurally require the account to exist. (Still propagates
+	 * `NotSubscribedError` when called before subscribing.)
 	 */
 	public getUserAccountAndSlotOrThrow(): DataAndSlot<UserAccount> {
 		return assertDataAndSlot(
 			this.accountSubscriber.getUserAccountAndSlot(),
-			`User account not loaded: ${this.getUserAccountPublicKey().toString()}`
+			`User account not found: ${this.getUserAccountPublicKey().toString()}`
 		);
 	}
 

package/src/userMap/userMap.ts

@@ -44,7 +44,11 @@ import { grpcSubscription } from './grpcSubscription';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 
-const MAX_USER_ACCOUNT_SIZE_BYTES = 4376;
+// Velocity's User account is 4496 bytes (8-byte discriminator + 4488 struct);
+// drift's was 4376. This caps the zstd-decompressed buffer in defaultSync — if it's
+// smaller than the real account, the buffer is truncated and decodeUser reads past
+// the end (RangeError: ERR_BUFFER_OUT_OF_BOUNDS). Must be >= the on-chain User size.
+const MAX_USER_ACCOUNT_SIZE_BYTES = 4496;
 
 export interface UserMapInterface {
 	eventEmitter: StrictEventEmitter<EventEmitter, UserEvents>;

package/src/velocityClient.ts

@@ -1297,37 +1297,6 @@ export class VelocityClient {
 		});
 	}
 
-	public async migrateReferrer(
-		authority: PublicKey,
-		txParams?: TxParams
-	): Promise<TransactionSignature> {
-		const ix = await this.getMigrateReferrerIx(authority);
-		const tx = await this.buildTransaction([ix], txParams);
-		const { txSig } = await this.sendTransaction(tx, [], this.opts);
-		return txSig;
-	}
-
-	public async getMigrateReferrerIx(
-		authority: PublicKey
-	): Promise<TransactionInstruction> {
-		const escrow = getRevenueShareEscrowAccountPublicKey(
-			this.program.programId,
-			authority
-		);
-		return (this.program.instruction as any).migrateReferrer({
-			accounts: {
-				escrow,
-				authority,
-				userStats: getUserStatsAccountPublicKey(
-					this.program.programId,
-					authority
-				),
-				state: await this.getStatePublicKey(),
-				payer: this.wallet.publicKey,
-			},
-		});
-	}
-
 	public async resizeRevenueShareEscrowOrders(
 		authority: PublicKey,
 		numOrders: number,

package/tests/dlob/helpers.ts

@@ -52,9 +52,23 @@ export const mockAMM: AMM = {
 	quoteAssetReserve: new BN(12)
 		.mul(QUOTE_PRECISION)
 		.mul(AMM_TO_QUOTE_PRECISION_RATIO),
+	// zero-spread mock: bid/ask reserves mirror the base/quote reserves
+	askBaseAssetReserve: new BN(1).mul(BASE_PRECISION),
+	askQuoteAssetReserve: new BN(12)
+		.mul(QUOTE_PRECISION)
+		.mul(AMM_TO_QUOTE_PRECISION_RATIO),
+	bidBaseAssetReserve: new BN(1).mul(BASE_PRECISION),
+	bidQuoteAssetReserve: new BN(12)
+		.mul(QUOTE_PRECISION)
+		.mul(AMM_TO_QUOTE_PRECISION_RATIO),
 	sqrtK: new BN(1),
 	pegMultiplier: new BN(1),
 	maxSlippageRatio: 1_000_000,
+	lastOracleReservePriceSpreadPct: new BN(0),
+	lastSpreadUpdateSlot: new BN(0),
+	longSpread: 0,
+	shortSpread: 0,
+	referencePriceOffset: 0,
 
 	feePool: {
 		scaledBalance: new BN(0),
@@ -177,6 +191,7 @@ function mockPerpMarketCommon(): Omit<
 		},
 		quoteSpotMarketIndex: 0,
 		feeAdjustment: 0,
+		poolId: 0,
 		pausedOperations: 0,
 		hedgeConfig: {
 			poolId: 0,
@@ -285,6 +300,7 @@ export const mockSpotMarkets: Array<SpotMarketAccount> = [
 		borrowBalance: new BN(0),
 		lastInterestTs: new BN(0),
 		lastTwapTs: new BN(0),
+		expiryTs: new BN(0),
 		oracle: PublicKey.default,
 		initialAssetWeight: SPOT_MARKET_WEIGHT_PRECISION.toNumber(),
 		maintenanceAssetWeight: SPOT_MARKET_WEIGHT_PRECISION.toNumber(),
@@ -378,6 +394,7 @@ export const mockSpotMarkets: Array<SpotMarketAccount> = [
 		borrowBalance: new BN(0),
 		lastInterestTs: new BN(0),
 		lastTwapTs: new BN(0),
+		expiryTs: new BN(0),
 		oracle: PublicKey.default,
 		initialAssetWeight: 0,
 		maintenanceAssetWeight: 0,
@@ -473,6 +490,7 @@ export const mockSpotMarkets: Array<SpotMarketAccount> = [
 		borrowBalance: new BN(0),
 		lastInterestTs: new BN(0),
 		lastTwapTs: new BN(0),
+		expiryTs: new BN(0),
 		oracle: PublicKey.default,
 		initialAssetWeight: 0,
 		maintenanceAssetWeight: 0,
@@ -526,6 +544,7 @@ export const mockSpotMarkets: Array<SpotMarketAccount> = [
 export const mockStateAccount: StateAccount = {
 	coldAdmin: PublicKey.default,
 	warmAdmin: PublicKey.default,
+	pauseAdmin: PublicKey.default,
 	hotAmmCrank: PublicKey.default,
 	hotLpCache: PublicKey.default,
 	hotLpSwap: PublicKey.default,
@@ -540,6 +559,7 @@ export const mockStateAccount: StateAccount = {
 	protocolFeeRecipientPerp: PublicKey.default,
 	protocolFeeRecipientSpot: PublicKey.default,
 	featureBitFlags: 0,
+	lpPoolFeatureBitFlags: 0,
 	defaultMarketOrderTimeInForce: 0,
 	defaultSpotAuctionDuration: 0,
 	discountMint: PublicKey.default,
@@ -578,8 +598,8 @@ export const mockStateAccount: StateAccount = {
 			},
 		],
 		fillerRewardStructure: {
-			rewardNumerator: new BN(0),
-			rewardDenominator: new BN(0),
+			rewardNumerator: 0,
+			rewardDenominator: 0,
 			timeBasedRewardLowerBound: new BN(0),
 		},
 		flatFillerFee: new BN(0),
@@ -603,8 +623,8 @@ export const mockStateAccount: StateAccount = {
 			},
 		],
 		fillerRewardStructure: {
-			rewardNumerator: new BN(0),
-			rewardDenominator: new BN(0),
+			rewardNumerator: 0,
+			rewardDenominator: 0,
 			timeBasedRewardLowerBound: new BN(0),
 		},
 		flatFillerFee: new BN(0),