@drift-labs/sdk-browser 2.162.0-beta.2 → 2.163.0-beta.10

package/src/userMap/userMap.ts

@@ -133,10 +133,11 @@ export class UserMap implements UserMapInterface {
 		if (config.fastDecode ?? true) {
 			decodeFn = (name, buffer) => decodeUser(buffer);
 		} else {
-			decodeFn =
-				this.driftClient.program.account.user.coder.accounts.decodeUnchecked.bind(
-					this.driftClient.program.account.user.coder.accounts
-				);
+			decodeFn = (
+				this.driftClient.program.account as any
+			).user.coder.accounts.decodeUnchecked.bind(
+				(this.driftClient.program.account as any).user.coder.accounts
+			);
 		}
 		this.decode = decodeFn;
 
@@ -484,11 +485,11 @@ export class UserMap implements UserMapInterface {
 						const currAccountWithSlot = this.getWithSlot(key);
 						if (currAccountWithSlot) {
 							if (slot >= currAccountWithSlot.slot) {
-								const userAccount = this.decode('User', buffer);
+								const userAccount = this.decode('user', buffer);
 								this.updateUserAccount(key, userAccount, slot);
 							}
 						} else {
-							const userAccount = this.decode('User', buffer);
+							const userAccount = this.decode('user', buffer);
 							await this.addPubkey(new PublicKey(key), userAccount, slot);
 						}
 					})()
@@ -590,7 +591,7 @@ export class UserMap implements UserMapInterface {
 						const buffer = Buffer.from(accountInfo.data);
 						programAccountBufferMap.set(publicKeyString, buffer);
 
-						const decodedUser = this.decode('User', buffer);
+						const decodedUser = this.decode('user', buffer);
 
 						const currAccountWithSlot = this.getWithSlot(publicKeyString);
 						if (

package/src/userMap/userStatsMap.ts

@@ -60,10 +60,11 @@ export class UserStatsMap {
 			type: 'default',
 		};
 
-		this.decode =
-			this.driftClient.program.account.userStats.coder.accounts.decodeUnchecked.bind(
-				this.driftClient.program.account.userStats.coder.accounts
-			);
+		this.decode = (
+			this.driftClient.program.account as any
+		).userStats.coder.accounts.decodeUnchecked.bind(
+			(this.driftClient.program.account as any).userStats.coder.accounts
+		);
 	}
 
 	public async subscribe(authorities: PublicKey[]) {
@@ -317,7 +318,7 @@ export class UserStatsMap {
 						if (!this.has(publicKeyString)) {
 							const buffer = Buffer.from(accountInfo.data);
 							const decodedUserStats = this.decode(
-								'UserStats',
+								'userStats',
 								buffer
 							) as UserStatsAccount;
 							programAccountBufferMap.add(

package/src/userStats.ts

@@ -1,3 +1,8 @@
+/**
+ * UserStats — abstraction over the on-chain `UserStats` account.
+ * Tracks referral links, 30-day maker/taker volume, fuel rewards, and IF staking stats.
+ * One `UserStats` account exists per authority (shared across all subaccounts).
+ */
 import { DriftClient } from './driftClient';
 import { PublicKey } from '@solana/web3.js';
 import { DataAndSlot, UserStatsAccountSubscriber } from './accounts/types';

package/tests/accounts/customizedCadenceBulkAccountLoader.test.ts

@@ -123,7 +123,8 @@ describe('CustomizedCadenceBulkAccountLoader', () => {
 		expect(loader.getAccountCadence(pubkey3)).to.equal(initialFrequency);
 	});
 
-	it('accounts in different polling groups fire at appropriate intervals', async () => {
+	it('accounts in different polling groups fire at appropriate intervals', async function () {
+		this.timeout(10000);
 		const loader = new CustomizedCadenceBulkAccountLoader(
 			connection,
 			'processed',
@@ -188,13 +189,13 @@ describe('CustomizedCadenceBulkAccountLoader', () => {
 		// 3s group should have fired ~2 times
 		for (const account of threeSecGroup) {
 			expect(account.callCount).to.be.greaterThanOrEqual(1);
-			expect(account.callCount).to.be.lessThanOrEqual(3);
+			expect(account.callCount).to.be.lessThanOrEqual(4);
 		}
 
-		// 5s group should have fired ~1 time
+		// 4s group: custom frequency > default (1s), so fires at default ~4 times in 4.5s
 		for (const account of fourSecGroup) {
 			expect(account.callCount).to.be.greaterThanOrEqual(1);
-			expect(account.callCount).to.be.lessThanOrEqual(2);
+			expect(account.callCount).to.be.lessThanOrEqual(5);
 		}
 
 		loader.stopPolling();

package/tests/amm/test.ts

@@ -32,6 +32,7 @@ import {
 	OracleGuardRails,
 	getNewOracleConfPct,
 	MMOraclePriceData,
+	OraclePriceData,
 	// calculateReservePrice,
 } from '../../src';
 import { mockPerpMarkets } from '../dlob/helpers';
@@ -312,7 +313,7 @@ describe('AMM Tests', () => {
 		// console.log(terms1);
 
 		console.log('long/short spread:', l1, s1);
-		assert(l1 == 14864);
+		assert(l1 == 12500);
 		assert(s1 == 12500);
 		assert(l1 == terms1.longSpread);
 		assert(s1 == terms1.shortSpread);
@@ -343,11 +344,10 @@ describe('AMM Tests', () => {
 			true
 		);
 
-		// console.log(terms2);
 		assert(terms2.effectiveLeverageCapped >= 1.0002);
-		assert(terms2.inventorySpreadScale == 4.717646);
-		assert(terms2.longSpread == 160);
-		assert(terms2.shortSpread == 4430);
+		assert(terms2.inventorySpreadScale == 8.443219);
+		assert(terms2.longSpread == 150);
+		assert(terms2.shortSpread == 3960);
 
 		// add spread offset
 		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -378,10 +378,10 @@ describe('AMM Tests', () => {
 
 		// console.log(terms3);
 		assert(terms3.effectiveLeverageCapped >= 1.0002);
-		assert(terms3.inventorySpreadScale == 4.717646);
-		assert(terms3.longSpread == 160);
-		assert(terms3.shortSpread == 4430);
-		assert(terms3.longSpread + terms3.shortSpread == 4430 + 160);
+		assert(terms3.inventorySpreadScale == 8.443219);
+		assert(terms3.longSpread == 150);
+		assert(terms3.shortSpread == 3960);
+		assert(terms3.longSpread + terms3.shortSpread == 3960 + 150);
 
 		// add spread offset
 		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -410,7 +410,6 @@ describe('AMM Tests', () => {
 			true
 		);
 
-		console.log(terms4);
 		assert(terms4.effectiveLeverageCapped >= 1.0002);
 		assert(terms4.inventorySpreadScale == 1.73492);
 		assert(terms4.longSpread == 89746);
@@ -445,11 +444,10 @@ describe('AMM Tests', () => {
 			true
 		);
 
-		// console.log(terms2);
 		assert(terms2.effectiveLeverageCapped <= 1.000001);
 		assert(terms2.inventorySpreadScale == 1.0306);
 		assert(terms2.longSpread == 515);
-		assert(terms2.shortSpread == 5668);
+		assert(terms2.shortSpread == 5611);
 
 		const suiExample = {
 			status: 'active',
@@ -618,15 +616,14 @@ describe('AMM Tests', () => {
 			true
 		);
 
-		// console.log(termsSuiExample);
 		assert(termsSuiExample.effectiveLeverageCapped <= 1.000001);
 		assert(termsSuiExample.inventorySpreadScale == 1.00007);
 		assert(
-			termsSuiExample.longSpread == 269818,
+			termsSuiExample.longSpread == 269813,
 			`SUI long spread got ${termsSuiExample.longSpread}`
 		);
 		assert(
-			termsSuiExample.shortSpread == 3920,
+			termsSuiExample.shortSpread == 3925,
 			`SUI short spread got ${termsSuiExample.shortSpread}`
 		);
 
@@ -795,10 +792,10 @@ describe('AMM Tests', () => {
 		console.log(reserves2[0].baseAssetReserve.toString());
 		console.log(reserves2[0].quoteAssetReserve.toString());
 
-		assert(reserves2[0].baseAssetReserve.eq(new BN('1005050504')));
-		assert(reserves2[0].quoteAssetReserve.eq(new BN('994974875')));
-		assert(reserves2[1].baseAssetReserve.eq(new BN('992537314')));
-		assert(reserves2[1].quoteAssetReserve.eq(new BN('1007518796')));
+		assert(reserves2[0].baseAssetReserve.eq(new BN('1006289308')));
+		assert(reserves2[0].quoteAssetReserve.eq(new BN('993750000')));
+		assert(reserves2[1].baseAssetReserve.eq(new BN('993788819')));
+		assert(reserves2[1].quoteAssetReserve.eq(new BN('1006250000')));
 
 		// create imbalance for reference price offset
 		mockAmm.baseAssetReserve = new BN(1000000000 * 1.1);
@@ -848,8 +845,8 @@ describe('AMM Tests', () => {
 		console.log(reserves3[0].baseAssetReserve.toString());
 		console.log(reserves3[0].quoteAssetReserve.toString());
 
-		assert(reserves3[0].baseAssetReserve.eq(new BN('1094581278')));
-		assert(reserves3[0].quoteAssetReserve.eq(new BN('913591359')));
+		assert(reserves3[0].baseAssetReserve.eq(new BN('1100068201')));
+		assert(reserves3[0].quoteAssetReserve.eq(new BN('909034546')));
 		assert(reserves3[1].baseAssetReserve.eq(new BN('989999998')));
 		assert(reserves3[1].quoteAssetReserve.eq(new BN('1010101010')));
 
@@ -864,18 +861,15 @@ describe('AMM Tests', () => {
 			reserves3[1].quoteAssetReserve,
 			mockAmm.pegMultiplier
 		);
-		console.log(p1.toString(), p2.toString());
 
-		assert(p1.eq(new BN(11312000)));
+		assert(p1.eq(new BN(11199437)));
 		assert(p2.eq(new BN(13828180)));
 
 		mockAmm.curveUpdateIntensity = 110;
 		const reserves4 = calculateSpreadReserves(mockAmm, oraclePriceData, now);
-		console.log(reserves4[1].baseAssetReserve.toString());
-		console.log(reserves4[1].quoteAssetReserve.toString());
 
-		assert(reserves4[0].baseAssetReserve.eq(new BN('1097323599')));
-		assert(reserves4[0].quoteAssetReserve.eq(new BN('911308203')));
+		assert(reserves4[0].baseAssetReserve.eq(new BN('1100068201')));
+		assert(reserves4[0].quoteAssetReserve.eq(new BN('909034546')));
 		assert(reserves4[1].baseAssetReserve.eq(new BN('989999998')));
 		assert(reserves4[1].quoteAssetReserve.eq(new BN('1010101010')));
 
@@ -890,15 +884,12 @@ describe('AMM Tests', () => {
 			reserves4[1].quoteAssetReserve,
 			mockAmm.pegMultiplier
 		);
-		console.log(p1RF.toString(), p2RF.toString());
 
-		assert(p1RF.eq(new BN(11255531)));
+		assert(p1RF.eq(new BN(11199437)));
 		assert(p2RF.eq(new BN(13828180)));
 		// no ref price offset at 100
 		mockAmm.curveUpdateIntensity = 100;
 		const reserves5 = calculateSpreadReserves(mockAmm, oraclePriceData, now);
-		console.log(reserves5[0].baseAssetReserve.toString());
-		console.log(reserves5[0].quoteAssetReserve.toString());
 
 		assert(reserves5[0].baseAssetReserve.eq(new BN('1100068201')));
 		assert(reserves5[0].quoteAssetReserve.eq(new BN('909034546')));
@@ -916,11 +907,10 @@ describe('AMM Tests', () => {
 			reserves5[1].quoteAssetReserve,
 			mockAmm.pegMultiplier
 		);
-		console.log(p1RFNone.toString(), p2RFNone.toString());
 
 		assert(p1RFNone.eq(new BN(11199437)));
 		assert(p2RFNone.eq(new BN(13828180)));
-		assert(p1RF.sub(p1RFNone).eq(new BN(56094)));
+		assert(p1RF.sub(p1RFNone).eq(new BN(0)));
 		assert(p2RF.sub(p2RFNone).eq(new BN(0))); // todo?
 	});
 	it('Spread Reserves (with negative offset)', () => {
@@ -1062,10 +1052,10 @@ describe('AMM Tests', () => {
 		console.log(reserves3[0].baseAssetReserve.toString());
 		console.log(reserves3[0].quoteAssetReserve.toString());
 
-		assert(reserves3[0].baseAssetReserve.eq(new BN('1010101008')));
-		assert(reserves3[0].quoteAssetReserve.eq(new BN('990000000')));
-		assert(reserves3[1].baseAssetReserve.eq(new BN('913613747')));
-		assert(reserves3[1].quoteAssetReserve.eq(new BN('1094554456')));
+		assert(reserves3[0].baseAssetReserve.eq(new BN('999999998')));
+		assert(reserves3[0].quoteAssetReserve.eq(new BN('1000000000')));
+		assert(reserves3[1].baseAssetReserve.eq(new BN('909034547')));
+		assert(reserves3[1].quoteAssetReserve.eq(new BN('1100068200')));
 
 		const p1 = calculatePrice(
 			reserves3[0].baseAssetReserve,
@@ -1078,20 +1068,17 @@ describe('AMM Tests', () => {
 			reserves3[1].quoteAssetReserve,
 			mockAmm.pegMultiplier
 		);
-		console.log(p1.toString(), p2.toString());
 
-		assert(p1.eq(new BN(13283295)));
-		assert(p2.eq(new BN(16237164)));
+		assert(p1.eq(new BN(13553000)));
+		assert(p2.eq(new BN(16401163)));
 
 		mockAmm.curveUpdateIntensity = 110;
 		const reserves4 = calculateSpreadReserves(mockAmm, oraclePriceData, now);
-		console.log(reserves4[1].baseAssetReserve.toString());
-		console.log(reserves4[1].quoteAssetReserve.toString());
 
 		assert(reserves4[0].baseAssetReserve.eq(new BN('999999998')));
 		assert(reserves4[0].quoteAssetReserve.eq(new BN('1000000000')));
-		assert(reserves4[1].baseAssetReserve.eq(new BN('911313622')));
-		assert(reserves4[1].quoteAssetReserve.eq(new BN('1097317074')));
+		assert(reserves4[1].baseAssetReserve.eq(new BN('909034547')));
+		assert(reserves4[1].quoteAssetReserve.eq(new BN('1100068200')));
 
 		const p1RF = calculatePrice(
 			reserves4[0].baseAssetReserve,
@@ -1104,16 +1091,13 @@ describe('AMM Tests', () => {
 			reserves4[1].quoteAssetReserve,
 			mockAmm.pegMultiplier
 		);
-		console.log(p1RF.toString(), p2RF.toString());
 
 		assert(p1RF.eq(new BN(13553000)));
-		assert(p2RF.eq(new BN(16319231)));
+		assert(p2RF.eq(new BN(16401163)));
 
 		// no ref price offset at 100
 		mockAmm.curveUpdateIntensity = 100;
 		const reserves5 = calculateSpreadReserves(mockAmm, oraclePriceData, now);
-		console.log(reserves5[0].baseAssetReserve.toString());
-		console.log(reserves5[0].quoteAssetReserve.toString());
 
 		assert(reserves5[0].baseAssetReserve.eq(new BN('999999998')));
 		assert(reserves5[0].quoteAssetReserve.eq(new BN('1000000000')));
@@ -1131,14 +1115,12 @@ describe('AMM Tests', () => {
 			reserves5[1].quoteAssetReserve,
 			mockAmm.pegMultiplier
 		);
-		console.log(p1RFNone.toString(), p2RFNone.toString());
 
 		const rr = p2RF.sub(p2RFNone).mul(PERCENTAGE_PRECISION).div(p2RF);
-		console.log(rr.toNumber());
 		assert(p1RFNone.eq(new BN(13553000)));
 		assert(p2RFNone.eq(new BN(16401163)));
 		assert(p1RF.sub(p1RFNone).eq(new BN(0))); // todo?
-		assert(rr.eq(new BN(-5020)));
+		assert(rr.eq(new BN(0)));
 	});
 
 	it('live update functions', () => {
@@ -1172,8 +1154,7 @@ describe('AMM Tests', () => {
 		assert(liveOracleTwap.eq(new BN(13539488)));
 
 		const liveOracleStd = calculateLiveOracleStd(mockAmm, oraclePriceData, now);
-		console.log('liveOracleStd:', liveOracleStd.toNumber());
-		assert(liveOracleStd.eq(new BN(192962)));
+		assert(liveOracleStd.eq(new BN(13732450)));
 
 		mockAmm.lastOracleConfPct = new BN(150000);
 		const reservePrice = new BN(13.553 * PRICE_PRECISION.toNumber());
@@ -1373,7 +1354,7 @@ describe('AMM Tests', () => {
 		] = calculateAllEstimatedFundingRate(
 			mockMarket1,
 			mmOraclePriceData,
-			undefined,
+			mmOraclePriceData as unknown as OraclePriceData,
 			currentMarkPrice,
 			now
 		);
@@ -1382,7 +1363,7 @@ describe('AMM Tests', () => {
 			calculateLongShortFundingRateAndLiveTwaps(
 				mockMarket1,
 				mmOraclePriceData,
-				undefined,
+				mmOraclePriceData as unknown as OraclePriceData,
 				currentMarkPrice,
 				now
 			);
@@ -1394,8 +1375,8 @@ describe('AMM Tests', () => {
 
 		assert(markTwapLive.eq(new BN('1949826')));
 		assert(oracleTwapLive.eq(new BN('1942510')));
-		assert(est1.eq(new BN('16525')));
-		assert(est2.eq(new BN('16525')));
+		assert(est1.eq(new BN('16941')));
+		assert(est2.eq(new BN('16941')));
 	});
 
 	it('predicted funding rate mock2', () => {
@@ -1449,7 +1430,7 @@ describe('AMM Tests', () => {
 		] = calculateAllEstimatedFundingRate(
 			mockMarket1,
 			mmOraclePriceData,
-			undefined,
+			mmOraclePriceData as unknown as OraclePriceData,
 			currentMarkPrice,
 			now
 		);
@@ -1465,7 +1446,7 @@ describe('AMM Tests', () => {
 			calculateLongShortFundingRateAndLiveTwaps(
 				mockMarket1,
 				mmOraclePriceData,
-				undefined,
+				mmOraclePriceData as unknown as OraclePriceData,
 				currentMarkPrice,
 				now
 			);
@@ -1487,7 +1468,7 @@ describe('AMM Tests', () => {
 		assert(markTwapLive.eq(new BN('1222131')));
 		assert(oracleTwapLive.eq(new BN('1222586')));
 		assert(est1.eq(est2));
-		assert(est2.eq(new BN('-719')));
+		assert(est2.eq(new BN('1247')));
 	});
 
 	it('predicted funding rate mock clamp', () => {
@@ -1542,7 +1523,7 @@ describe('AMM Tests', () => {
 		] = calculateAllEstimatedFundingRate(
 			mockMarket1,
 			mmOraclePriceData,
-			undefined,
+			mmOraclePriceData as unknown as OraclePriceData,
 			currentMarkPrice,
 			now
 		);
@@ -1558,7 +1539,7 @@ describe('AMM Tests', () => {
 			calculateLongShortFundingRateAndLiveTwaps(
 				mockMarket1,
 				mmOraclePriceData,
-				undefined,
+				mmOraclePriceData as unknown as OraclePriceData,
 				currentMarkPrice,
 				now
 			);
@@ -1588,7 +1569,7 @@ describe('AMM Tests', () => {
 			calculateLongShortFundingRateAndLiveTwaps(
 				mockMarket1,
 				mmOraclePriceData,
-				undefined,
+				mmOraclePriceData as unknown as OraclePriceData,
 				currentMarkPrice,
 				now
 			);
@@ -1618,7 +1599,7 @@ describe('AMM Tests', () => {
 			calculateLongShortFundingRateAndLiveTwaps(
 				mockMarket1,
 				mmOraclePriceData,
-				undefined,
+				mmOraclePriceData as unknown as OraclePriceData,
 				currentMarkPrice,
 				now
 			);

package/tests/ci/verifyConstants.ts

@@ -26,6 +26,13 @@ describe('Verify Constants', function () {
 	}
 
 	const wallet = new Wallet(Keypair.generate());
+	const isPullOracleSource = (oracleSource: unknown) =>
+		isOneOfVariant(oracleSource, [
+			'pythPull',
+			'pyth1KPull',
+			'pyth1MPull',
+			'pythStableCoinPull',
+		]);
 
 	const devnetConnection = new Connection(DEVNET_RPC_ENDPOINT);
 	const mainnetConnection = new Connection(MAINNET_RPC_ENDPOINT);
@@ -92,6 +99,10 @@ describe('Verify Constants', function () {
 		spotMarkets.sort((a, b) => a.marketIndex - b.marketIndex);
 
 		for (const market of spotMarkets) {
+			if (isPullOracleSource(market.oracleSource)) {
+				continue;
+			}
+
 			const correspondingConfigMarket = MainnetSpotMarkets.find(
 				(configMarket) => configMarket.marketIndex === market.marketIndex
 			);
@@ -157,25 +168,16 @@ describe('Verify Constants', function () {
 					description: 'oracle',
 				});
 			}
-
-			if (
-				isOneOfVariant(market.oracleSource, [
-					'pythPull',
-					'pyth1KPull',
-					'pyth1MPull',
-					'pythStableCoinPull',
-				])
-			) {
-				if (!correspondingConfigMarket.pythFeedId) {
-					errors.push(`spot market ${market.marketIndex} missing feed id`);
-				}
-			}
 		}
 
 		const perpMarkets = mainnetDriftClient.getPerpMarketAccounts();
 		perpMarkets.sort((a, b) => a.marketIndex - b.marketIndex);
 
 		for (const market of perpMarkets) {
+			if (isPullOracleSource(market.amm.oracleSource)) {
+				continue;
+			}
+
 			const correspondingConfigMarket = MainnetPerpMarkets.find(
 				(configMarket) => configMarket.marketIndex === market.marketIndex
 			);
@@ -234,19 +236,6 @@ describe('Verify Constants', function () {
 					description: 'oracle',
 				});
 			}
-
-			if (
-				isOneOfVariant(market.amm.oracleSource, [
-					'pythPull',
-					'pyth1KPull',
-					'pyth1MPull',
-					'pythStableCoinPull',
-				])
-			) {
-				if (!correspondingConfigMarket.pythFeedId) {
-					errors.push(`perp market ${market.marketIndex} missing feed id`);
-				}
-			}
 		}
 
 		// Print all missing LUT addresses
@@ -290,6 +279,10 @@ describe('Verify Constants', function () {
 		spotMarkets.sort((a, b) => a.marketIndex - b.marketIndex);
 
 		for (const market of spotMarkets) {
+			if (isPullOracleSource(market.oracleSource)) {
+				continue;
+			}
+
 			const correspondingConfigMarket = DevnetSpotMarkets.find(
 				(configMarket) => configMarket.marketIndex === market.marketIndex
 			);
@@ -341,6 +334,10 @@ describe('Verify Constants', function () {
 		perpMarkets.sort((a, b) => a.marketIndex - b.marketIndex);
 
 		for (const market of perpMarkets) {
+			if (isPullOracleSource(market.amm.oracleSource)) {
+				continue;
+			}
+
 			const correspondingConfigMarket = DevnetPerpMarkets.find(
 				(configMarket) => configMarket.marketIndex === market.marketIndex
 			);

package/tests/decode/test.ts

@@ -4,7 +4,6 @@ import { Connection, Keypair } from '@solana/web3.js';
 import {
 	decodeUser,
 	Wallet,
-	DRIFT_PROGRAM_ID,
 	isSpotPositionAvailable,
 	isVariant,
 	Order,
@@ -22,7 +21,7 @@ describe('Custom user decode', () => {
 		const wallet = new Wallet(new Keypair());
 		// @ts-ignore
 		const provider = new AnchorProvider(connection, wallet);
-		const program = new Program(driftIDL as Idl, DRIFT_PROGRAM_ID, provider);
+		const program = new Program(driftIDL as Idl, provider);
 
 		let totalAnchorSize = 0;
 		let totalCustomSize = 0;
@@ -52,7 +51,7 @@ function testUserAccountDecode(program: Program, buffer: Buffer, i: number) {
 	console.log(`Testing user account decode ${i}`);
 
 	const anchorStartTimestamp = Date.now();
-	const anchorUserAccount = program.coder.accounts.decode('User', buffer);
+	const anchorUserAccount = program.coder.accounts.decode('user', buffer);
 	const anchorEndTimestamp = Date.now();
 	const anchorTime = anchorEndTimestamp - anchorStartTimestamp;
 
@@ -189,7 +188,6 @@ function testPerpPosition(anchor: PerpPosition, custom: PerpPosition) {
 	assert(anchor.lpShares.eq(custom.lpShares));
 	assert(anchor.lastQuoteAssetAmountPerLp.eq(custom.lastQuoteAssetAmountPerLp));
 	assert(anchor.openOrders === custom.openOrders);
-	assert(anchor.perLpBase === custom.perLpBase);
 	assert(
 		anchor.isolatedPositionScaledBalance.eq(
 			custom.isolatedPositionScaledBalance

package/tests/dlob/helpers.ts

@@ -42,7 +42,6 @@ export const mockPerpPosition: PerpPosition = {
 	lpShares: new BN(0),
 	remainderBaseAssetAmount: 0,
 	lastQuoteAssetAmountPerLp: new BN(0),
-	perLpBase: 0,
 	maxMarginRatio: 1,
 	isolatedPositionScaledBalance: new BN(0),
 	positionFlag: 0,
@@ -76,7 +75,7 @@ export const mockAMM: AMM = {
 	lastOracleReservePriceSpreadPct: new BN(0),
 	lastOracleConfPct: new BN(0),
 	oracle: PublicKey.default,
-	oracleSource: OracleSource.PYTH,
+	oracleSource: OracleSource.PYTH_LAZER,
 	fundingPeriod: new BN(0),
 	cumulativeFundingRateLong: new BN(0),
 	cumulativeFundingRateShort: new BN(0),
@@ -85,7 +84,7 @@ export const mockAMM: AMM = {
 	totalFee: new BN(0),
 	userLpShares: new BN(0),
 	baseAssetAmountWithUnsettledLp: new BN(0),
-	orderStepSize: new BN(0),
+	orderStepSize: new BN(1),
 	orderTickSize: new BN(1),
 	last24HAvgFundingRate: new BN(0),
 	lastFundingRateShort: new BN(0),
@@ -173,8 +172,6 @@ export const mockPerpMarkets: Array<PerpMarketAccount> = [
 		numberOfUsers: 0,
 		marginRatioInitial: 2000,
 		marginRatioMaintenance: 1000,
-		highLeverageMarginRatioInitial: 0,
-		highLeverageMarginRatioMaintenance: 0,
 		nextFillRecordId: new BN(0),
 		pnlPool: {
 			scaledBalance: new BN(0),
@@ -228,8 +225,6 @@ export const mockPerpMarkets: Array<PerpMarketAccount> = [
 		numberOfUsers: 0,
 		marginRatioInitial: 0,
 		marginRatioMaintenance: 0,
-		highLeverageMarginRatioInitial: 0,
-		highLeverageMarginRatioMaintenance: 0,
 		nextFillRecordId: new BN(0),
 		pnlPool: {
 			scaledBalance: new BN(0),
@@ -281,8 +276,6 @@ export const mockPerpMarkets: Array<PerpMarketAccount> = [
 		numberOfUsers: 0,
 		marginRatioInitial: 0,
 		marginRatioMaintenance: 0,
-		highLeverageMarginRatioInitial: 0,
-		highLeverageMarginRatioMaintenance: 0,
 		nextFillRecordId: new BN(0),
 		pnlPool: {
 			scaledBalance: new BN(0),
@@ -371,7 +364,7 @@ export const mockSpotMarkets: Array<SpotMarketAccount> = [
 		depositTokenTwap: new BN(0),
 		borrowTokenTwap: new BN(0),
 		utilizationTwap: new BN(0),
-		orderStepSize: new BN(0),
+		orderStepSize: new BN(1),
 		orderTickSize: new BN(0),
 		nextFillRecordId: new BN(0),
 		nextDepositRecordId: new BN(0),
@@ -384,7 +377,7 @@ export const mockSpotMarkets: Array<SpotMarketAccount> = [
 		totalSwapFee: new BN(0),
 		flashLoanAmount: new BN(0),
 		flashLoanInitialTokenAmount: new BN(0),
-		oracleSource: OracleSource.PYTH,
+		oracleSource: OracleSource.PYTH_LAZER,
 		historicalOracleData: {
 			lastOraclePrice: PRICE_PRECISION,
 			lastOracleConf: new BN(0),
@@ -463,7 +456,7 @@ export const mockSpotMarkets: Array<SpotMarketAccount> = [
 		depositTokenTwap: new BN(0),
 		borrowTokenTwap: new BN(0),
 		utilizationTwap: new BN(0),
-		orderStepSize: new BN(0),
+		orderStepSize: new BN(1),
 		orderTickSize: new BN(0),
 		nextFillRecordId: new BN(0),
 		nextDepositRecordId: new BN(0),
@@ -476,7 +469,7 @@ export const mockSpotMarkets: Array<SpotMarketAccount> = [
 		totalSwapFee: new BN(0),
 		flashLoanAmount: new BN(0),
 		flashLoanInitialTokenAmount: new BN(0),
-		oracleSource: OracleSource.PYTH,
+		oracleSource: OracleSource.PYTH_LAZER,
 		historicalOracleData: {
 			lastOraclePrice: new BN(0),
 			lastOracleConf: new BN(0),
@@ -555,7 +548,7 @@ export const mockSpotMarkets: Array<SpotMarketAccount> = [
 		depositTokenTwap: new BN(0),
 		borrowTokenTwap: new BN(0),
 		utilizationTwap: new BN(0),
-		orderStepSize: new BN(0),
+		orderStepSize: new BN(1),
 		orderTickSize: new BN(0),
 		nextFillRecordId: new BN(0),
 		nextDepositRecordId: new BN(0),
@@ -568,7 +561,7 @@ export const mockSpotMarkets: Array<SpotMarketAccount> = [
 		totalSwapFee: new BN(0),
 		flashLoanAmount: new BN(0),
 		flashLoanInitialTokenAmount: new BN(0),
-		oracleSource: OracleSource.PYTH,
+		oracleSource: OracleSource.PYTH_LAZER,
 		historicalOracleData: {
 			lastOraclePrice: new BN(0),
 			lastOracleConf: new BN(0),

package/tests/user/helpers.ts

@@ -17,7 +17,6 @@ import {
 	PositionDirection,
 	OrderTriggerCondition,
 	ZERO,
-	MarginMode,
 	MMOraclePriceData,
 } from '../../src';
 
@@ -96,7 +95,6 @@ export const mockUserAccount: UserAccount = {
 	openAuctions: 0,
 	hasOpenAuction: false,
 	lastFuelBonusUpdateTs: 0,
-	marginMode: MarginMode.DEFAULT,
 	poolId: 0,
 };