@velocity-exchange/sdk 0.0.3 → 0.1.0

package/src/dlob/orderBookLevels.ts

@@ -185,7 +185,11 @@ export function getVammL2Generator({
 	topOfBookQuoteAmounts?: BN[];
 	latestSlot?: BN;
 }): L2OrderBookGenerator {
-	const updatedAmm = calculateUpdatedAMM(marketAccount.amm, mmOraclePriceData);
+	const updatedAmm = calculateUpdatedAMM(
+		marketAccount.amm,
+		marketAccount.totalExchangeFee,
+		mmOraclePriceData
+	);
 	const paused = isOperationPaused(
 		marketAccount.pausedOperations,
 		PerpOperation.AMM_FILL
@@ -196,15 +200,17 @@ export function getVammL2Generator({
 				updatedAmm.baseAssetReserve,
 				updatedAmm.minBaseAssetReserve,
 				updatedAmm.maxBaseAssetReserve,
-				updatedAmm.orderStepSize
+				marketAccount.orderStepSize
 		  );
 
-	if (openBids.lt(marketAccount.amm.minOrderSize.muln(2))) openBids = ZERO;
-	if (openAsks.abs().lt(marketAccount.amm.minOrderSize.muln(2)))
+	if (openBids.lt(marketAccount.marketStats.minOrderSize.muln(2)))
+		openBids = ZERO;
+	if (openAsks.abs().lt(marketAccount.marketStats.minOrderSize.muln(2)))
 		openAsks = ZERO;
 
 	const [bidReserves, askReserves] = calculateSpreadReserves(
 		updatedAmm,
+		marketAccount.marketStats,
 		mmOraclePriceData,
 		now,
 		latestSlot
@@ -215,8 +221,8 @@ export function getVammL2Generator({
 		numOrders,
 		numBaseOrders,
 		mmOraclePriceData,
-		orderTickSize: marketAccount.amm.orderTickSize,
-		orderStepSize: marketAccount.amm.orderStepSize,
+		orderTickSize: marketAccount.orderTickSize,
+		orderStepSize: marketAccount.orderStepSize,
 		pegMultiplier: updatedAmm.pegMultiplier,
 		sqrtK: updatedAmm.sqrtK,
 		topOfBookQuoteAmounts,

package/src/dlob/types.ts

@@ -3,8 +3,6 @@ import { VelocityClient } from '../velocityClient';
 
 export type DLOBSubscriptionConfig = {
 	velocityClient?: VelocityClient;
-	/** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-	driftClient?: VelocityClient;
 	dlobSource: DLOBSource;
 	slotSource: SlotSource;
 	updateFrequency: number;

package/src/events/eventSubscriber.ts

@@ -1,5 +1,5 @@
 /**
- * EventSubscriber — streams and parses Drift program events from transaction logs.
+ * EventSubscriber — streams and parses Velocity program events from transaction logs.
  *
  * Decodes all program events (OrderActionRecord, DepositRecord, LiquidationRecord,
  * FundingPaymentRecord, etc.) from `state/events.rs` into typed TypeScript objects.

package/src/events/eventsServerLogProvider.ts

@@ -82,9 +82,9 @@ export class EventsServerLogProvider implements LogProvider {
 					event.txSig,
 					event.slot,
 					[
-						'Program dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH invoke [1]',
+						'Program vELoC1audYbSYVRXn1vPaV8Axoa9oU6BYmNGZZBDZ1P invoke [1]',
 						event.rawLog,
-						'Program dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH success',
+						'Program vELoC1audYbSYVRXn1vPaV8Axoa9oU6BYmNGZZBDZ1P success',
 					],
 					undefined,
 					event.txSigIndex

package/src/events/parse.ts

@@ -1,7 +1,7 @@
 import { Program, Event } from '../isomorphic/anchor';
 import { CuUsageEvent } from './types';
 
-const driftProgramId = 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH';
+const velocityProgramId = 'vELoC1audYbSYVRXn1vPaV8Axoa9oU6BYmNGZZBDZ1P';
 const PROGRAM_LOG = 'Program log: ';
 const PROGRAM_INSTRUCTION = 'Program log: Instruction: ';
 const PROGRAM_DATA = 'Program data: ';
@@ -12,7 +12,7 @@ const PROGRAM_INSTRUCTION_START_INDEX = PROGRAM_INSTRUCTION.length;
 export function parseLogs(
 	program: Program,
 	logs: string[],
-	programId = driftProgramId
+	programId = velocityProgramId
 ): Event[] {
 	const { events } = parseLogsWithRaw(program, logs, programId);
 	return events;
@@ -21,7 +21,7 @@ export function parseLogs(
 export function parseLogsWithRaw(
 	program: Program,
 	logs: string[],
-	programId = driftProgramId
+	programId = velocityProgramId
 ): { events: Event[]; rawLogs: string[] } {
 	const events = [];
 	const rawLogs = [];
@@ -55,23 +55,23 @@ function handleLog(
 	execution: ExecutionContext,
 	log: string,
 	program: Program,
-	programId = driftProgramId
+	programId = velocityProgramId
 ): [Event | null, string | null, boolean] {
-	// Executing program is drift program.
+	// Executing program is velocity program.
 	if (execution.stack.length > 0 && execution.program() === programId) {
 		return handleProgramLog(log, program, programId);
 	}
-	// Executing program is not drift program.
+	// Executing program is not velocity program.
 	else {
 		return [null, ...handleSystemLog(log, programId)];
 	}
 }
 
-// Handles logs from *drift* program.
+// Handles logs from *velocity* program.
 function handleProgramLog(
 	log: string,
 	program: Program,
-	programId = driftProgramId
+	programId = velocityProgramId
 ): [Event | null, string | null, boolean] {
 	// This is a `msg!` log or a `sol_log_data` log.
 	if (log.startsWith(PROGRAM_LOG)) {
@@ -87,10 +87,10 @@ function handleProgramLog(
 	}
 }
 
-// Handles logs when the current program being executing is *not* drift.
+// Handles logs when the current program being executing is *not* velocity.
 function handleSystemLog(
 	log: string,
-	programId = driftProgramId
+	programId = velocityProgramId
 ): [string | null, boolean] {
 	// System component.
 	const logStart = log.split(':')[0];
@@ -153,7 +153,7 @@ class ExecutionContext {
 
 export function parseLogsForCuUsage(
 	logs: string[],
-	programId = driftProgramId
+	programId = velocityProgramId
 ): Event<any, CuUsageEvent>[] {
 	const cuUsageEvents: Event<any, CuUsageEvent>[] = [];
 
@@ -194,7 +194,7 @@ export function parseLogsForCuUsage(
 function handleLogForCuUsage(
 	execution: ExecutionContext,
 	log: string,
-	programId = driftProgramId
+	programId = velocityProgramId
 ): [string | null, string | null, boolean, number | null] {
 	if (execution.stack.length > 0 && execution.program() === programId) {
 		return handleProgramLogForCuUsage(log, programId);
@@ -205,7 +205,7 @@ function handleLogForCuUsage(
 
 function handleProgramLogForCuUsage(
 	log: string,
-	programId = driftProgramId
+	programId = velocityProgramId
 ): [string | null, string | null, boolean, number | null] {
 	if (log.startsWith(PROGRAM_INSTRUCTION)) {
 		const ixStr = log.slice(PROGRAM_INSTRUCTION_START_INDEX);
@@ -217,7 +217,7 @@ function handleProgramLogForCuUsage(
 
 function handleSystemLogForCuUsage(
 	log: string,
-	programId = driftProgramId
+	programId = velocityProgramId
 ): [string | null, string | null, boolean, number | null] {
 	// System component.
 	const logStart = log.split(':')[0];

package/src/events/types.ts

@@ -11,7 +11,7 @@ import {
 	InsuranceFundRecord,
 	SpotInterestRecord,
 	InsuranceFundStakeRecord,
-	CurveRecord,
+	AmmCurveChanged,
 	SwapRecord,
 	SpotMarketVaultDepositRecord,
 	SignedMsgOrderRecord,
@@ -52,7 +52,7 @@ export const DefaultEventSubscriptionOptions: EventSubscriptionOptions = {
 		'InsuranceFundRecord',
 		'SpotInterestRecord',
 		'InsuranceFundStakeRecord',
-		'CurveRecord',
+		'AmmCurveChanged',
 		'SwapRecord',
 		'SpotMarketVaultDepositRecord',
 		'SignedMsgOrderRecord',
@@ -101,7 +101,7 @@ export type EventMap = {
 	InsuranceFundRecord: Event<InsuranceFundRecord>;
 	SpotInterestRecord: Event<SpotInterestRecord>;
 	InsuranceFundStakeRecord: Event<InsuranceFundStakeRecord>;
-	CurveRecord: Event<CurveRecord>;
+	AmmCurveChanged: Event<AmmCurveChanged>;
 	SwapRecord: Event<SwapRecord>;
 	SpotMarketVaultDepositRecord: Event<SpotMarketVaultDepositRecord>;
 	SignedMsgOrderRecord: Event<SignedMsgOrderRecord>;
@@ -127,7 +127,7 @@ export type VelocityEvent =
 	| Event<InsuranceFundRecord>
 	| Event<SpotInterestRecord>
 	| Event<InsuranceFundStakeRecord>
-	| Event<CurveRecord>
+	| Event<AmmCurveChanged>
 	| Event<SwapRecord>
 	| Event<SpotMarketVaultDepositRecord>
 	| Event<SignedMsgOrderRecord>
@@ -140,9 +140,6 @@ export type VelocityEvent =
 	| Event<LPBorrowLendDepositRecord>
 	| Event<CuUsage>;
 
-/** @deprecated Use `VelocityEvent` instead. `DriftEvent` will be removed in a future major. */
-export type DriftEvent = VelocityEvent;
-
 export interface EventSubscriberEvents {
 	newEvent: (event: WrappedEvent<EventType>) => void;
 }