@drift-labs/sdk 2.0.16 → 2.0.18

package/tests/dlob/test.ts

@@ -22,12 +22,9 @@ import {
 	ZERO,
 } from '../../src';
 
-import {
-	mockPerpMarkets,
-	mockSpotMarkets,
-	mockStateAccount,
-	MockUserMap,
-} from './helpers';
+import { mockPerpMarkets, mockSpotMarkets, mockStateAccount } from './helpers';
+import { isVariant } from '../../lib';
+import { DLOBOrdersCoder } from '../../src/dlob/DLOBOrders';
 
 function insertOrderToDLOB(
 	dlob: DLOB,
@@ -234,15 +231,7 @@ function printCrossedNodes(n: NodeToFill, slot: number) {
 
 describe('DLOB Tests', () => {
 	it('Fresh DLOB is empty', () => {
-		const mockUserMap = new MockUserMap();
-
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+		const dlob = new DLOB();
 		const vAsk = new BN(11);
 		const vBid = new BN(10);
 		const slot = 12;
@@ -311,30 +300,11 @@ describe('DLOB Tests', () => {
 		const vAsk = new BN(15);
 		const vBid = new BN(10);
 
-		const mockUserMap = new MockUserMap();
 		const user0 = Keypair.generate();
-		const user0Auth = Keypair.generate();
 		const user1 = Keypair.generate();
-		const user1Auth = Keypair.generate();
 		const user2 = Keypair.generate();
-		const user2Auth = Keypair.generate();
-		const user3 = Keypair.generate();
-		const user3Auth = Keypair.generate();
-		const user4 = Keypair.generate();
-		const user4Auth = Keypair.generate();
-		mockUserMap.addUserAccountAuthority(user0.publicKey, user0Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user1.publicKey, user1Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user2.publicKey, user2Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user3.publicKey, user3Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user4.publicKey, user4Auth.publicKey);
-
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+
+		const dlob = new DLOB();
 		const marketIndex = 0;
 
 		const slot = 12;
@@ -408,20 +378,177 @@ describe('DLOB Tests', () => {
 		}
 		expect(thrown, 'should throw after clearing').to.equal(true);
 	});
+
+	it('DLOB orders', () => {
+		const vAsk = new BN(15);
+		const vBid = new BN(10);
+
+		const user0 = Keypair.generate();
+		const user1 = Keypair.generate();
+		const user2 = Keypair.generate();
+		const user3 = Keypair.generate();
+		const user4 = Keypair.generate();
+
+		const dlob = new DLOB();
+		const marketIndex = 0;
+
+		insertOrderToDLOB(
+			dlob,
+			user0.publicKey,
+			OrderType.LIMIT,
+			MarketType.PERP,
+			1, // orderId
+			marketIndex,
+			new BN(11), // price
+			BASE_PRECISION, // quantity
+			PositionDirection.LONG,
+			vBid,
+			vAsk
+		);
+		insertOrderToDLOB(
+			dlob,
+			user1.publicKey,
+			OrderType.LIMIT,
+			MarketType.PERP,
+			2, // orderId
+			marketIndex,
+			new BN(12), // price
+			BASE_PRECISION, // quantity
+			PositionDirection.LONG,
+			vBid,
+			vAsk
+		);
+		insertOrderToDLOB(
+			dlob,
+			user2.publicKey,
+			OrderType.LIMIT,
+			MarketType.PERP,
+			3, // orderId
+			marketIndex,
+			new BN(13), // price
+			BASE_PRECISION, // quantity
+			PositionDirection.LONG,
+			vBid,
+			vAsk
+		);
+
+		insertOrderToDLOB(
+			dlob,
+			user3.publicKey,
+			OrderType.MARKET,
+			MarketType.PERP,
+			4, // orderId
+			marketIndex,
+			new BN(12), // price
+			new BN(1).mul(BASE_PRECISION), // quantity
+			PositionDirection.SHORT,
+			vBid,
+			vAsk
+		);
+		insertOrderToDLOB(
+			dlob,
+			user4.publicKey,
+			OrderType.MARKET,
+			MarketType.PERP,
+			5, // orderId
+			marketIndex,
+			new BN(12), // price
+			new BN(1).mul(BASE_PRECISION), // quantity
+			PositionDirection.SHORT,
+			vBid,
+			vAsk
+		);
+		// insert some limit buys above vamm bid, below ask
+		insertOrderToDLOB(
+			dlob,
+			user0.publicKey,
+			OrderType.LIMIT,
+			MarketType.SPOT,
+			6, // orderId
+			marketIndex,
+			new BN(11), // price
+			BASE_PRECISION, // quantity
+			PositionDirection.LONG,
+			vBid,
+			vAsk
+		);
+		insertOrderToDLOB(
+			dlob,
+			user1.publicKey,
+			OrderType.LIMIT,
+			MarketType.SPOT,
+			7, // orderId
+			marketIndex,
+			new BN(12), // price
+			BASE_PRECISION, // quantity
+			PositionDirection.LONG,
+			vBid,
+			vAsk
+		);
+		insertOrderToDLOB(
+			dlob,
+			user2.publicKey,
+			OrderType.LIMIT,
+			MarketType.SPOT,
+			8, // orderId
+			marketIndex,
+			new BN(13), // price
+			BASE_PRECISION, // quantity
+			PositionDirection.LONG,
+			vBid,
+			vAsk
+		);
+
+		insertOrderToDLOB(
+			dlob,
+			user3.publicKey,
+			OrderType.MARKET,
+			MarketType.SPOT,
+			9, // orderId
+			marketIndex,
+			new BN(12), // price
+			new BN(1).mul(BASE_PRECISION), // quantity
+			PositionDirection.SHORT,
+			vBid,
+			vAsk
+		);
+		insertOrderToDLOB(
+			dlob,
+			user4.publicKey,
+			OrderType.MARKET,
+			MarketType.SPOT,
+			10, // orderId
+			marketIndex,
+			new BN(12), // price
+			new BN(1).mul(BASE_PRECISION), // quantity
+			PositionDirection.SHORT,
+			vBid,
+			vAsk
+		);
+
+		const dlobOrders = dlob.getDLOBOrders();
+		expect(dlobOrders.length).to.equal(10);
+		expect(isVariant(dlobOrders[0].order.marketType, 'perp')).to.equal(true);
+		expect(isVariant(dlobOrders[5].order.marketType, 'spot')).to.equal(true);
+
+		const coder = DLOBOrdersCoder.create();
+		const encodedOrders = coder.encode(dlobOrders);
+		const decodedDLOBOrders = coder.decode(encodedOrders);
+		expect(decodedDLOBOrders.length).to.equal(10);
+		expect(isVariant(decodedDLOBOrders[0].order.marketType, 'perp')).to.equal(
+			true
+		);
+		expect(isVariant(decodedDLOBOrders[5].order.marketType, 'spot')).to.equal(
+			true
+		);
+	});
 });
 
 describe('DLOB Perp Tests', () => {
 	it('Test proper bids', () => {
 		const vAsk = new BN(15);
 		const vBid = new BN(10);
-		const mockUserMap = new MockUserMap();
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+		const dlob = new DLOB();
 		const marketIndex = 0;
 
 		const slot = 12;
@@ -504,8 +631,6 @@ describe('DLOB Perp Tests', () => {
 			}
 
 			const user = Keypair.generate();
-			const userAuth = Keypair.generate();
-			mockUserMap.addUserAccountAuthority(user.publicKey, userAuth.publicKey);
 
 			insertOrderToDLOB(
 				dlob,
@@ -612,14 +737,7 @@ describe('DLOB Perp Tests', () => {
 	it('Test proper bids on multiple markets', () => {
 		const vAsk = new BN(15);
 		const vBid = new BN(10);
-		const mockUserMap = new MockUserMap();
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+		const dlob = new DLOB();
 		const marketIndex0 = 0;
 		const marketIndex1 = 1;
 
@@ -702,8 +820,6 @@ describe('DLOB Perp Tests', () => {
 			}
 
 			const user = Keypair.generate();
-			const userAuth = Keypair.generate();
-			mockUserMap.addUserAccountAuthority(user.publicKey, userAuth.publicKey);
 
 			insertOrderToDLOB(
 				dlob,
@@ -767,14 +883,7 @@ describe('DLOB Perp Tests', () => {
 	it('Test proper asks', () => {
 		const vAsk = new BN(15);
 		const vBid = new BN(10);
-		const mockUserMap = new MockUserMap();
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+		const dlob = new DLOB();
 		const marketIndex = 0;
 
 		const slot = 12;
@@ -857,8 +966,6 @@ describe('DLOB Perp Tests', () => {
 			}
 
 			const user = Keypair.generate();
-			const userAuth = Keypair.generate();
-			mockUserMap.addUserAccountAuthority(user.publicKey, userAuth.publicKey);
 
 			insertOrderToDLOB(
 				dlob,
@@ -954,14 +1061,7 @@ describe('DLOB Perp Tests', () => {
 	it('Test insert market orders', () => {
 		const vAsk = new BN(11);
 		const vBid = new BN(10);
-		const mockUserMap = new MockUserMap();
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+		const dlob = new DLOB();
 		const marketIndex = 0;
 		const oracle = {
 			price: vBid.add(vAsk).div(new BN(2)),
@@ -973,8 +1073,6 @@ describe('DLOB Perp Tests', () => {
 		// 3 mkt buys
 		for (let i = 0; i < 3; i++) {
 			const user = Keypair.generate();
-			const userAuth = Keypair.generate();
-			mockUserMap.addUserAccountAuthority(user.publicKey, userAuth.publicKey);
 
 			insertOrderToDLOB(
 				dlob,
@@ -994,8 +1092,6 @@ describe('DLOB Perp Tests', () => {
 		// 3 mkt sells
 		for (let i = 0; i < 3; i++) {
 			const user = Keypair.generate();
-			const userAuth = Keypair.generate();
-			mockUserMap.addUserAccountAuthority(user.publicKey, userAuth.publicKey);
 
 			insertOrderToDLOB(
 				dlob,
@@ -1066,34 +1162,14 @@ describe('DLOB Perp Tests', () => {
 			hasSufficientNumberOfDataPoints: true,
 		};
 
-		const mockUserMap = new MockUserMap();
 		const user0 = Keypair.generate();
-		const userAuth0 = Keypair.generate();
 		const user1 = Keypair.generate();
-		const userAuth1 = Keypair.generate();
 		const user2 = Keypair.generate();
-		const userAuth2 = Keypair.generate();
 		const user3 = Keypair.generate();
-		const userAuth3 = Keypair.generate();
 		const user4 = Keypair.generate();
-		const userAuth4 = Keypair.generate();
 		const user5 = Keypair.generate();
-		const userAuth5 = Keypair.generate();
-
-		mockUserMap.addUserAccountAuthority(user0.publicKey, userAuth0.publicKey);
-		mockUserMap.addUserAccountAuthority(user1.publicKey, userAuth1.publicKey);
-		mockUserMap.addUserAccountAuthority(user2.publicKey, userAuth2.publicKey);
-		mockUserMap.addUserAccountAuthority(user3.publicKey, userAuth3.publicKey);
-		mockUserMap.addUserAccountAuthority(user4.publicKey, userAuth4.publicKey);
-		mockUserMap.addUserAccountAuthority(user5.publicKey, userAuth5.publicKey);
-
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+
+		const dlob = new DLOB();
 		const marketIndex = 0;
 		insertOrderToDLOB(
 			dlob,
@@ -1238,34 +1314,14 @@ describe('DLOB Perp Tests', () => {
 			hasSufficientNumberOfDataPoints: true,
 		};
 
-		const mockUserMap = new MockUserMap();
 		const user0 = Keypair.generate();
-		const userAuth0 = Keypair.generate();
 		const user1 = Keypair.generate();
-		const userAuth1 = Keypair.generate();
 		const user2 = Keypair.generate();
-		const userAuth2 = Keypair.generate();
 		const user3 = Keypair.generate();
-		const userAuth3 = Keypair.generate();
 		const user4 = Keypair.generate();
-		const userAuth4 = Keypair.generate();
 		const user5 = Keypair.generate();
-		const userAuth5 = Keypair.generate();
-
-		mockUserMap.addUserAccountAuthority(user0.publicKey, userAuth0.publicKey);
-		mockUserMap.addUserAccountAuthority(user1.publicKey, userAuth1.publicKey);
-		mockUserMap.addUserAccountAuthority(user2.publicKey, userAuth2.publicKey);
-		mockUserMap.addUserAccountAuthority(user3.publicKey, userAuth3.publicKey);
-		mockUserMap.addUserAccountAuthority(user4.publicKey, userAuth4.publicKey);
-		mockUserMap.addUserAccountAuthority(user5.publicKey, userAuth5.publicKey);
-
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+
+		const dlob = new DLOB();
 		const marketIndex = 0;
 
 		// insert floating bids
@@ -1430,30 +1486,13 @@ describe('DLOB Perp Tests', () => {
 		const vAsk = new BN(15);
 		const vBid = new BN(10);
 
-		const mockUserMap = new MockUserMap();
 		const user0 = Keypair.generate();
-		const user0Auth = Keypair.generate();
 		const user1 = Keypair.generate();
-		const user1Auth = Keypair.generate();
 		const user2 = Keypair.generate();
-		const user2Auth = Keypair.generate();
 		const user3 = Keypair.generate();
-		const user3Auth = Keypair.generate();
 		const user4 = Keypair.generate();
-		const user4Auth = Keypair.generate();
-		mockUserMap.addUserAccountAuthority(user0.publicKey, user0Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user1.publicKey, user1Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user2.publicKey, user2Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user3.publicKey, user3Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user4.publicKey, user4Auth.publicKey);
-
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+
+		const dlob = new DLOB();
 		const marketIndex = 0;
 
 		// insert some limit buys above vamm bid, below ask
@@ -1554,7 +1593,9 @@ describe('DLOB Perp Tests', () => {
 				slot: new BN(12),
 				confidence: new BN(1),
 				hasSufficientNumberOfDataPoints: true,
-			}
+			},
+			mockStateAccount,
+			mockPerpMarkets[marketIndex]
 		);
 		console.log(`Filled nodes: ${nodesToFillAfter.length}`);
 		for (const n of nodesToFillAfter) {
@@ -1575,27 +1616,12 @@ describe('DLOB Perp Tests', () => {
 		const vAsk = new BN(15);
 		const vBid = new BN(10);
 
-		const mockUserMap = new MockUserMap();
 		const user0 = Keypair.generate();
-		const user0Auth = Keypair.generate();
 		const user1 = Keypair.generate();
-		const user1Auth = Keypair.generate();
 		const user2 = Keypair.generate();
-		const user2Auth = Keypair.generate();
 		const user3 = Keypair.generate();
-		const user3Auth = Keypair.generate();
-		mockUserMap.addUserAccountAuthority(user0.publicKey, user0Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user1.publicKey, user1Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user2.publicKey, user2Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user3.publicKey, user3Auth.publicKey);
-
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+
+		const dlob = new DLOB();
 		const marketIndex = 0;
 
 		// insert some limit sells below vAMM ask, above bid
@@ -1686,7 +1712,9 @@ describe('DLOB Perp Tests', () => {
 				slot: new BN(endSlot),
 				confidence: new BN(1),
 				hasSufficientNumberOfDataPoints: true,
-			}
+			},
+			mockStateAccount,
+			mockPerpMarkets[marketIndex]
 		);
 		console.log(`Filled nodes: ${nodesToFillAfter.length}`);
 		for (const n of nodesToFillAfter) {
@@ -1719,30 +1747,13 @@ describe('DLOB Perp Tests', () => {
 		const vAsk = new BN(15);
 		const vBid = new BN(8);
 
-		const mockUserMap = new MockUserMap();
 		const user0 = Keypair.generate();
-		const user0Auth = Keypair.generate();
 		const user1 = Keypair.generate();
-		const user1Auth = Keypair.generate();
 		const user2 = Keypair.generate();
-		const user2Auth = Keypair.generate();
 		const user3 = Keypair.generate();
-		const user3Auth = Keypair.generate();
 		const user4 = Keypair.generate();
-		const user4Auth = Keypair.generate();
-		mockUserMap.addUserAccountAuthority(user0.publicKey, user0Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user1.publicKey, user1Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user2.publicKey, user2Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user3.publicKey, user3Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user4.publicKey, user4Auth.publicKey);
-
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+
+		const dlob = new DLOB();
 		const marketIndex = 0;
 
 		const slot = 12;
@@ -1801,7 +1812,9 @@ describe('DLOB Perp Tests', () => {
 			slot, // auction over
 			Date.now(),
 			MarketType.PERP,
-			oracle
+			oracle,
+			mockStateAccount,
+			mockPerpMarkets[marketIndex]
 		);
 		expect(nodesToFillBefore.length).to.equal(0);
 
@@ -1840,7 +1853,9 @@ describe('DLOB Perp Tests', () => {
 			slot, // auction over
 			Date.now(),
 			MarketType.PERP,
-			oracle
+			oracle,
+			mockStateAccount,
+			mockPerpMarkets[marketIndex]
 		);
 		const mktNodes = dlob.findExpiredNodesToFill(
 			marketIndex,
@@ -1870,51 +1885,20 @@ describe('DLOB Perp Tests', () => {
 		const vAsk = new BN(15);
 		const vBid = new BN(8);
 
-		const mockUserMap = new MockUserMap();
 		const user0 = Keypair.generate();
-		const user0Auth = Keypair.generate();
 		const user1 = Keypair.generate();
-		const user1Auth = Keypair.generate();
 		const user2 = Keypair.generate();
-		const user2Auth = Keypair.generate();
 		const user3 = Keypair.generate();
-		const user3Auth = Keypair.generate();
 		const user4 = Keypair.generate();
-		const user4Auth = Keypair.generate();
 		const user5 = Keypair.generate();
-		const user5Auth = Keypair.generate();
 		const user6 = Keypair.generate();
-		const user6Auth = Keypair.generate();
 		const user7 = Keypair.generate();
-		const user7Auth = Keypair.generate();
 		const user8 = Keypair.generate();
-		const user8Auth = Keypair.generate();
 		const user9 = Keypair.generate();
-		const user9Auth = Keypair.generate();
 		const user10 = Keypair.generate();
-		const user10Auth = Keypair.generate();
 		const user11 = Keypair.generate();
-		const user11Auth = Keypair.generate();
-		mockUserMap.addUserAccountAuthority(user0.publicKey, user0Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user1.publicKey, user1Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user2.publicKey, user2Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user3.publicKey, user3Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user4.publicKey, user4Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user5.publicKey, user5Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user6.publicKey, user6Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user7.publicKey, user7Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user8.publicKey, user8Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user9.publicKey, user9Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user10.publicKey, user10Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user11.publicKey, user11Auth.publicKey);
-
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+
+		const dlob = new DLOB();
 		const marketIndex = 0;
 
 		const slot = 20;
@@ -2126,7 +2110,8 @@ describe('DLOB Perp Tests', () => {
 			marketIndex,
 			slot,
 			oracle.price,
-			MarketType.PERP
+			MarketType.PERP,
+			mockStateAccount
 		);
 		console.log(`nodesToTriggeR: ${nodesToTrigger.length}`);
 		for (const [idx, n] of nodesToTrigger.entries()) {
@@ -2138,21 +2123,10 @@ describe('DLOB Perp Tests', () => {
 		const vAsk = new BN(15);
 		const vBid = new BN(8);
 
-		const mockUserMap = new MockUserMap();
 		const user0 = Keypair.generate();
-		const user0Auth = Keypair.generate();
 		const user1 = Keypair.generate();
-		const user1Auth = Keypair.generate();
-		mockUserMap.addUserAccountAuthority(user0.publicKey, user0Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user1.publicKey, user1Auth.publicKey);
 
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+		const dlob = new DLOB();
 		const marketIndex = 0;
 
 		const slot = 20;
@@ -2206,7 +2180,9 @@ describe('DLOB Perp Tests', () => {
 				slot: new BN(slot0),
 				confidence: new BN(1),
 				hasSufficientNumberOfDataPoints: true,
-			}
+			},
+			mockStateAccount,
+			mockPerpMarkets[marketIndex]
 		);
 		expect(nodesToFillBefore.length).to.equal(0);
 
@@ -2225,7 +2201,9 @@ describe('DLOB Perp Tests', () => {
 				slot: new BN(slot1),
 				confidence: new BN(1),
 				hasSufficientNumberOfDataPoints: true,
-			}
+			},
+			mockStateAccount,
+			mockPerpMarkets[marketIndex]
 		);
 		console.log(`Filled nodes: ${nodesToFillAfter.length}`);
 		for (const n of nodesToFillAfter) {
@@ -2242,30 +2220,13 @@ describe('DLOB Perp Tests', () => {
 		const vAsk = new BN(15).mul(PRICE_PRECISION);
 		const vBid = new BN(8).mul(PRICE_PRECISION);
 
-		const mockUserMap = new MockUserMap();
 		const user0 = Keypair.generate();
-		const user0Auth = Keypair.generate();
 		const user1 = Keypair.generate();
-		const user1Auth = Keypair.generate();
 		const user2 = Keypair.generate();
-		const user2Auth = Keypair.generate();
 		const user3 = Keypair.generate();
-		const user3Auth = Keypair.generate();
 		const user4 = Keypair.generate();
-		const user4Auth = Keypair.generate();
-		mockUserMap.addUserAccountAuthority(user0.publicKey, user0Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user1.publicKey, user1Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user2.publicKey, user2Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user3.publicKey, user3Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user4.publicKey, user4Auth.publicKey);
-
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+
+		const dlob = new DLOB();
 		const marketIndex = 0;
 
 		const slot = 12;
@@ -2340,7 +2301,9 @@ describe('DLOB Perp Tests', () => {
 				slot: new BN(slot),
 				confidence: new BN(1),
 				hasSufficientNumberOfDataPoints: true,
-			}
+			},
+			mockStateAccount,
+			mockPerpMarkets[marketIndex]
 		);
 		expect(nodesToFillBefore.length).to.equal(0);
 
@@ -2384,7 +2347,9 @@ describe('DLOB Perp Tests', () => {
 				slot: new BN(slot),
 				confidence: new BN(1),
 				hasSufficientNumberOfDataPoints: true,
-			}
+			},
+			mockStateAccount,
+			mockPerpMarkets[marketIndex]
 		);
 		const mktNodes = dlob.findExpiredNodesToFill(
 			marketIndex,
@@ -2418,30 +2383,13 @@ describe('DLOB Perp Tests', () => {
 		const vAsk = new BN(15).mul(PRICE_PRECISION);
 		const vBid = new BN(8).mul(PRICE_PRECISION);
 
-		const mockUserMap = new MockUserMap();
 		const user0 = Keypair.generate();
-		const user0Auth = Keypair.generate();
 		const user1 = Keypair.generate();
-		const user1Auth = Keypair.generate();
 		const user2 = Keypair.generate();
-		const user2Auth = Keypair.generate();
 		const user3 = Keypair.generate();
-		const user3Auth = Keypair.generate();
 		const user4 = Keypair.generate();
-		const user4Auth = Keypair.generate();
-		mockUserMap.addUserAccountAuthority(user0.publicKey, user0Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user1.publicKey, user1Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user2.publicKey, user2Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user3.publicKey, user3Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user4.publicKey, user4Auth.publicKey);
-
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+
+		const dlob = new DLOB();
 		const marketIndex = 0;
 
 		const slot = 12;
@@ -2556,7 +2504,9 @@ describe('DLOB Perp Tests', () => {
 			auctionOverTs, // auction in progress
 			ts,
 			MarketType.PERP,
-			oracle
+			oracle,
+			mockStateAccount,
+			mockPerpMarkets[marketIndex]
 		);
 
 		console.log(`Filled nodes: ${nodesToFillAfter.length}`);
@@ -2578,30 +2528,13 @@ describe('DLOB Perp Tests', () => {
 		const vAsk = new BN(15).mul(PRICE_PRECISION);
 		const vBid = new BN(8).mul(PRICE_PRECISION);
 
-		const mockUserMap = new MockUserMap();
 		const user0 = Keypair.generate();
-		const user0Auth = Keypair.generate();
 		const user1 = Keypair.generate();
-		const user1Auth = Keypair.generate();
 		const user2 = Keypair.generate();
-		const user2Auth = Keypair.generate();
 		const user3 = Keypair.generate();
-		const user3Auth = Keypair.generate();
 		const user4 = Keypair.generate();
-		const user4Auth = Keypair.generate();
-		mockUserMap.addUserAccountAuthority(user0.publicKey, user0Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user1.publicKey, user1Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user2.publicKey, user2Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user3.publicKey, user3Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user4.publicKey, user4Auth.publicKey);
-
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+
+		const dlob = new DLOB();
 		const marketIndex = 0;
 
 		const slot = 12;
@@ -2670,7 +2603,9 @@ describe('DLOB Perp Tests', () => {
 			slot,
 			Date.now(),
 			MarketType.PERP,
-			oracle
+			oracle,
+			mockStateAccount,
+			mockPerpMarkets[marketIndex]
 		);
 		expect(nodesToFillBefore.length).to.equal(0);
 
@@ -2709,7 +2644,9 @@ describe('DLOB Perp Tests', () => {
 			slot, // auction in progress
 			Date.now(),
 			MarketType.PERP,
-			oracle
+			oracle,
+			mockStateAccount,
+			mockPerpMarkets[marketIndex]
 		);
 		const mktNodes = dlob.findExpiredNodesToFill(
 			marketIndex,
@@ -2761,30 +2698,13 @@ describe('DLOB Perp Tests', () => {
 		const vAsk = new BN(15).mul(PRICE_PRECISION);
 		const vBid = new BN(8).mul(PRICE_PRECISION);
 
-		const mockUserMap = new MockUserMap();
 		const user0 = Keypair.generate();
-		const user0Auth = Keypair.generate();
 		const user1 = Keypair.generate();
-		const user1Auth = Keypair.generate();
 		const user2 = Keypair.generate();
-		const user2Auth = Keypair.generate();
 		const user3 = Keypair.generate();
-		const user3Auth = Keypair.generate();
 		const user4 = Keypair.generate();
-		const user4Auth = Keypair.generate();
-		mockUserMap.addUserAccountAuthority(user0.publicKey, user0Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user1.publicKey, user1Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user2.publicKey, user2Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user3.publicKey, user3Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user4.publicKey, user4Auth.publicKey);
-
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+
+		const dlob = new DLOB();
 		const marketIndex = 0;
 
 		const slot = 12;
@@ -2856,7 +2776,9 @@ describe('DLOB Perp Tests', () => {
 			slot,
 			ts,
 			MarketType.PERP,
-			oracle
+			oracle,
+			mockStateAccount,
+			mockPerpMarkets[marketIndex]
 		);
 		expect(nodesToFillBefore.length).to.equal(0);
 
@@ -2903,7 +2825,9 @@ describe('DLOB Perp Tests', () => {
 			afterAuctionSlot,
 			afterAuctionTs,
 			MarketType.PERP,
-			oracle
+			oracle,
+			mockStateAccount,
+			mockPerpMarkets[marketIndex]
 		);
 
 		console.log(`Filled nodes: ${nodesToFillAfter.length}`);
@@ -2938,24 +2862,11 @@ describe('DLOB Perp Tests', () => {
 		const vAsk = new BN(15).mul(PRICE_PRECISION);
 		const vBid = new BN(8).mul(PRICE_PRECISION);
 
-		const mockUserMap = new MockUserMap();
 		const user0 = Keypair.generate();
-		const user0Auth = Keypair.generate();
 		const user1 = Keypair.generate();
-		const user1Auth = Keypair.generate();
 		const user2 = Keypair.generate();
-		const user2Auth = Keypair.generate();
-		mockUserMap.addUserAccountAuthority(user0.publicKey, user0Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user1.publicKey, user1Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user2.publicKey, user2Auth.publicKey);
-
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+
+		const dlob = new DLOB();
 		const marketIndex = 0;
 
 		const slot = 12;
@@ -3023,7 +2934,9 @@ describe('DLOB Perp Tests', () => {
 			slot,
 			ts,
 			MarketType.PERP,
-			oracle
+			oracle,
+			mockStateAccount,
+			mockPerpMarkets[marketIndex]
 		);
 		expect(nodesToFillBefore.length).to.equal(0);
 
@@ -3038,7 +2951,9 @@ describe('DLOB Perp Tests', () => {
 			afterAuctionSlot,
 			afterAuctionTs,
 			MarketType.PERP,
-			oracle
+			oracle,
+			mockStateAccount,
+			mockPerpMarkets[marketIndex]
 		);
 
 		console.log(`Book state after fill:`);
@@ -3076,21 +2991,10 @@ describe('DLOB Perp Tests', () => {
 		const vAsk = new BN(20).mul(PRICE_PRECISION);
 		const vBid = new BN(5).mul(PRICE_PRECISION);
 
-		const mockUserMap = new MockUserMap();
 		const user0 = Keypair.generate();
-		const user0Auth = Keypair.generate();
 		const user1 = Keypair.generate();
-		const user1Auth = Keypair.generate();
-		mockUserMap.addUserAccountAuthority(user0.publicKey, user0Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user1.publicKey, user1Auth.publicKey);
 
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+		const dlob = new DLOB();
 		const marketIndex = 0;
 
 		const slot = 12;
@@ -3145,7 +3049,9 @@ describe('DLOB Perp Tests', () => {
 			slot,
 			ts,
 			MarketType.PERP,
-			oracle
+			oracle,
+			mockStateAccount,
+			mockPerpMarkets[marketIndex]
 		);
 		console.log(`Filled nodes: ${nodesToFillBefore.length}`);
 		for (const n of nodesToFillBefore) {
@@ -3164,107 +3070,14 @@ describe('DLOB Perp Tests', () => {
 		).to.equal(3);
 	});
 
-	it('Test will not fill two limit orders by same authority', () => {
-		const vAsk = new BN(20).mul(PRICE_PRECISION);
-		const vBid = new BN(5).mul(PRICE_PRECISION);
-
-		const mockUserMap = new MockUserMap();
-		const user0 = Keypair.generate();
-		const user0Auth = Keypair.generate();
-		const user1 = Keypair.generate();
-		mockUserMap.addUserAccountAuthority(user0.publicKey, user0Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user1.publicKey, user0Auth.publicKey);
-
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
-		const marketIndex = 0;
-
-		const slot = 12;
-		const ts = 12;
-		const oracle = {
-			price: vBid.add(vAsk).div(new BN(2)), // 11.5
-			slot: new BN(slot),
-			confidence: new BN(1),
-			hasSufficientNumberOfDataPoints: true,
-		};
-
-		// insert a sell below the bid, but above vBid
-		insertOrderToDLOB(
-			dlob,
-			user0.publicKey,
-			OrderType.LIMIT,
-			MarketType.PERP,
-			3, // orderId
-			marketIndex,
-			new BN(10).mul(PRICE_PRECISION), // price; crosses bid
-			new BN(1).mul(BASE_PRECISION), // quantity
-			PositionDirection.SHORT,
-			vAsk,
-			vBid,
-			new BN(slot),
-			new BN(200)
-		);
-		// insert a buy above the vBid
-		insertOrderToDLOB(
-			dlob,
-			user1.publicKey,
-			OrderType.LIMIT,
-			MarketType.PERP,
-			2, // orderId
-			marketIndex,
-			new BN(15).mul(PRICE_PRECISION), // price,
-			new BN(8768).mul(BASE_PRECISION).div(new BN(10000)), // quantity
-			PositionDirection.LONG,
-			vBid,
-			vAsk,
-			new BN(slot),
-			new BN(200)
-		);
-
-		console.log(`Book state before fill:`);
-		printBookState(dlob, marketIndex, vBid, vAsk, slot, oracle);
-
-		const nodesToFillBefore = dlob.findNodesToFill(
-			marketIndex,
-			vBid,
-			vAsk,
-			slot,
-			ts,
-			MarketType.PERP,
-			oracle
-		);
-		console.log(`Filled nodes: ${nodesToFillBefore.length}`);
-		for (const n of nodesToFillBefore) {
-			printCrossedNodes(n, slot);
-		}
-
-		expect(nodesToFillBefore.length).to.equal(0);
-	});
-
 	it('Test fills 0 price market order with limit orders better than vAMM', () => {
 		const vAsk = new BN(20).mul(PRICE_PRECISION);
 		const vBid = new BN(5).mul(PRICE_PRECISION);
 
-		const mockUserMap = new MockUserMap();
 		const user0 = Keypair.generate();
-		const user0Auth = Keypair.generate();
 		const user1 = Keypair.generate();
-		const user1Auth = Keypair.generate();
-		mockUserMap.addUserAccountAuthority(user0.publicKey, user0Auth.publicKey);
-		mockUserMap.addUserAccountAuthority(user1.publicKey, user1Auth.publicKey);
 
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+		const dlob = new DLOB();
 		const marketIndex = 0;
 
 		const slot = 12;
@@ -3325,7 +3138,9 @@ describe('DLOB Perp Tests', () => {
 			auctionEndSlot, // auction ends
 			ts,
 			MarketType.PERP,
-			oracle
+			oracle,
+			mockStateAccount,
+			mockPerpMarkets[marketIndex]
 		);
 		console.log(`Nodes to fill: ${nodesToFillBefore.length}`);
 		for (const n of nodesToFillBefore) {
@@ -3349,14 +3164,7 @@ describe('DLOB Spot Tests', () => {
 	it('Test proper bids', () => {
 		const vAsk = new BN(115);
 		const vBid = new BN(100);
-		const mockUserMap = new MockUserMap();
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+		const dlob = new DLOB();
 		const marketIndex = 0;
 
 		const slot = 12;
@@ -3420,8 +3228,6 @@ describe('DLOB Spot Tests', () => {
 
 		for (const t of testCases) {
 			const user0 = Keypair.generate();
-			const user0Auth = Keypair.generate();
-			mockUserMap.addUserAccountAuthority(user0.publicKey, user0Auth.publicKey);
 
 			insertOrderToDLOB(
 				dlob,
@@ -3474,14 +3280,7 @@ describe('DLOB Spot Tests', () => {
 	it('Test proper bids on multiple markets', () => {
 		const vAsk = new BN(15);
 		const vBid = new BN(10);
-		const mockUserMap = new MockUserMap();
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+		const dlob = new DLOB();
 		const marketIndex0 = 0;
 		const marketIndex1 = 1;
 
@@ -3553,8 +3352,6 @@ describe('DLOB Spot Tests', () => {
 
 		for (const t of testCases) {
 			const user0 = Keypair.generate();
-			const user0Auth = Keypair.generate();
-			mockUserMap.addUserAccountAuthority(user0.publicKey, user0Auth.publicKey);
 
 			insertOrderToDLOB(
 				dlob,
@@ -3618,14 +3415,7 @@ describe('DLOB Spot Tests', () => {
 	it('Test proper asks', () => {
 		const vAsk = new BN(15);
 		const vBid = new BN(10);
-		const mockUserMap = new MockUserMap();
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+		const dlob = new DLOB();
 		const marketIndex = 0;
 
 		const slot = 12;
@@ -3689,8 +3479,6 @@ describe('DLOB Spot Tests', () => {
 
 		for (const t of testCases) {
 			const user0 = Keypair.generate();
-			const user0Auth = Keypair.generate();
-			mockUserMap.addUserAccountAuthority(user0.publicKey, user0Auth.publicKey);
 
 			insertOrderToDLOB(
 				dlob,
@@ -3751,21 +3539,12 @@ describe('DLOB Spot Tests', () => {
 			confidence: new BN(1),
 			hasSufficientNumberOfDataPoints: true,
 		};
-		const mockUserMap = new MockUserMap();
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+		const dlob = new DLOB();
 		const marketIndex = 0;
 
 		// 3 mkt buys
 		for (let i = 0; i < 3; i++) {
 			const user0 = Keypair.generate();
-			const user0Auth = Keypair.generate();
-			mockUserMap.addUserAccountAuthority(user0.publicKey, user0Auth.publicKey);
 
 			insertOrderToDLOB(
 				dlob,
@@ -3785,8 +3564,6 @@ describe('DLOB Spot Tests', () => {
 		// 3 mkt sells
 		for (let i = 0; i < 3; i++) {
 			const user0 = Keypair.generate();
-			const user0Auth = Keypair.generate();
-			mockUserMap.addUserAccountAuthority(user0.publicKey, user0Auth.publicKey);
 
 			insertOrderToDLOB(
 				dlob,
@@ -3853,34 +3630,14 @@ describe('DLOB Spot Tests', () => {
 			hasSufficientNumberOfDataPoints: true,
 		};
 
-		const mockUserMap = new MockUserMap();
 		const user0 = Keypair.generate();
-		const userAuth0 = Keypair.generate();
 		const user1 = Keypair.generate();
-		const userAuth1 = Keypair.generate();
 		const user2 = Keypair.generate();
-		const userAuth2 = Keypair.generate();
 		const user3 = Keypair.generate();
-		const userAuth3 = Keypair.generate();
 		const user4 = Keypair.generate();
-		const userAuth4 = Keypair.generate();
 		const user5 = Keypair.generate();
-		const userAuth5 = Keypair.generate();
-
-		mockUserMap.addUserAccountAuthority(user0.publicKey, userAuth0.publicKey);
-		mockUserMap.addUserAccountAuthority(user1.publicKey, userAuth1.publicKey);
-		mockUserMap.addUserAccountAuthority(user2.publicKey, userAuth2.publicKey);
-		mockUserMap.addUserAccountAuthority(user3.publicKey, userAuth3.publicKey);
-		mockUserMap.addUserAccountAuthority(user4.publicKey, userAuth4.publicKey);
-		mockUserMap.addUserAccountAuthority(user5.publicKey, userAuth5.publicKey);
-
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+
+		const dlob = new DLOB();
 		const marketIndex = 0;
 		insertOrderToDLOB(
 			dlob,
@@ -4017,34 +3774,13 @@ describe('DLOB Spot Tests', () => {
 		const vAsk = new BN(15);
 		const vBid = new BN(10);
 
-		const mockUserMap = new MockUserMap();
 		const user0 = Keypair.generate();
-		const userAuth0 = Keypair.generate();
 		const user1 = Keypair.generate();
-		const userAuth1 = Keypair.generate();
 		const user2 = Keypair.generate();
-		const userAuth2 = Keypair.generate();
-		const user3 = Keypair.generate();
-		const userAuth3 = Keypair.generate();
 		const user4 = Keypair.generate();
-		const userAuth4 = Keypair.generate();
 		const user5 = Keypair.generate();
-		const userAuth5 = Keypair.generate();
-
-		mockUserMap.addUserAccountAuthority(user0.publicKey, userAuth0.publicKey);
-		mockUserMap.addUserAccountAuthority(user1.publicKey, userAuth1.publicKey);
-		mockUserMap.addUserAccountAuthority(user2.publicKey, userAuth2.publicKey);
-		mockUserMap.addUserAccountAuthority(user3.publicKey, userAuth3.publicKey);
-		mockUserMap.addUserAccountAuthority(user4.publicKey, userAuth4.publicKey);
-		mockUserMap.addUserAccountAuthority(user5.publicKey, userAuth5.publicKey);
-
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+
+		const dlob = new DLOB();
 		const marketIndex = 0;
 
 		// insert some limit buys above vamm bid, below ask
@@ -4101,7 +3837,9 @@ describe('DLOB Spot Tests', () => {
 				slot: new BN(12),
 				confidence: new BN(1),
 				hasSufficientNumberOfDataPoints: true,
-			}
+			},
+			mockStateAccount,
+			mockSpotMarkets[marketIndex]
 		);
 		expect(nodesToFillBefore.length).to.equal(0);
 
@@ -4145,7 +3883,9 @@ describe('DLOB Spot Tests', () => {
 				slot: new BN(12),
 				confidence: new BN(1),
 				hasSufficientNumberOfDataPoints: true,
-			}
+			},
+			mockStateAccount,
+			mockSpotMarkets[marketIndex]
 		);
 		for (const n of nodesToFillAfter) {
 			console.log(
@@ -4167,28 +3907,12 @@ describe('DLOB Spot Tests', () => {
 		const vAsk = new BN(15);
 		const vBid = new BN(10);
 
-		const mockUserMap = new MockUserMap();
 		const user0 = Keypair.generate();
-		const userAuth0 = Keypair.generate();
 		const user1 = Keypair.generate();
-		const userAuth1 = Keypair.generate();
 		const user2 = Keypair.generate();
-		const userAuth2 = Keypair.generate();
 		const user3 = Keypair.generate();
-		const userAuth3 = Keypair.generate();
 
-		mockUserMap.addUserAccountAuthority(user0.publicKey, userAuth0.publicKey);
-		mockUserMap.addUserAccountAuthority(user1.publicKey, userAuth1.publicKey);
-		mockUserMap.addUserAccountAuthority(user2.publicKey, userAuth2.publicKey);
-		mockUserMap.addUserAccountAuthority(user3.publicKey, userAuth3.publicKey);
-
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+		const dlob = new DLOB();
 		const marketIndex = 0;
 
 		// insert some limit sells below vAMM ask, above bid
@@ -4245,7 +3969,9 @@ describe('DLOB Spot Tests', () => {
 				slot: new BN(12),
 				confidence: new BN(1),
 				hasSufficientNumberOfDataPoints: true,
-			}
+			},
+			mockStateAccount,
+			mockSpotMarkets[marketIndex]
 		);
 		expect(nodesToFillBefore.length).to.equal(0);
 
@@ -4276,7 +4002,9 @@ describe('DLOB Spot Tests', () => {
 				slot: new BN(12),
 				confidence: new BN(1),
 				hasSufficientNumberOfDataPoints: true,
-			}
+			},
+			mockStateAccount,
+			mockSpotMarkets[marketIndex]
 		);
 		for (const n of nodesToFillAfter) {
 			console.log(
@@ -4298,31 +4026,13 @@ describe('DLOB Spot Tests', () => {
 		const vAsk = new BN(15);
 		const vBid = new BN(8);
 
-		const mockUserMap = new MockUserMap();
 		const user0 = Keypair.generate();
-		const userAuth0 = Keypair.generate();
 		const user1 = Keypair.generate();
-		const userAuth1 = Keypair.generate();
 		const user2 = Keypair.generate();
-		const userAuth2 = Keypair.generate();
 		const user3 = Keypair.generate();
-		const userAuth3 = Keypair.generate();
 		const user4 = Keypair.generate();
-		const userAuth4 = Keypair.generate();
-
-		mockUserMap.addUserAccountAuthority(user0.publicKey, userAuth0.publicKey);
-		mockUserMap.addUserAccountAuthority(user1.publicKey, userAuth1.publicKey);
-		mockUserMap.addUserAccountAuthority(user2.publicKey, userAuth2.publicKey);
-		mockUserMap.addUserAccountAuthority(user3.publicKey, userAuth3.publicKey);
-		mockUserMap.addUserAccountAuthority(user4.publicKey, userAuth4.publicKey);
 
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+		const dlob = new DLOB();
 		const marketIndex = 0;
 
 		const slot = 12;
@@ -4382,7 +4092,9 @@ describe('DLOB Spot Tests', () => {
 			12, // auction over
 			Date.now(),
 			MarketType.SPOT,
-			oracle
+			oracle,
+			mockStateAccount,
+			mockSpotMarkets[marketIndex]
 		);
 		expect(nodesToFillBefore.length).to.equal(0);
 
@@ -4421,7 +4133,9 @@ describe('DLOB Spot Tests', () => {
 			slot, // auction over
 			Date.now(),
 			MarketType.SPOT,
-			oracle
+			oracle,
+			mockStateAccount,
+			mockSpotMarkets[marketIndex]
 		);
 		const mktNodes = dlob.findExpiredNodesToFill(
 			marketIndex,
@@ -4452,22 +4166,10 @@ describe('DLOB Spot Tests', () => {
 		const vAsk = new BN(15);
 		const vBid = new BN(8);
 
-		const mockUserMap = new MockUserMap();
 		const user0 = Keypair.generate();
-		const userAuth0 = Keypair.generate();
 		const user1 = Keypair.generate();
-		const userAuth1 = Keypair.generate();
-
-		mockUserMap.addUserAccountAuthority(user0.publicKey, userAuth0.publicKey);
-		mockUserMap.addUserAccountAuthority(user1.publicKey, userAuth1.publicKey);
 
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+		const dlob = new DLOB();
 		const marketIndex = 0;
 
 		const slot = 12;
@@ -4514,7 +4216,9 @@ describe('DLOB Spot Tests', () => {
 			12, // auction over
 			Date.now(),
 			MarketType.PERP,
-			oracle
+			oracle,
+			mockStateAccount,
+			mockPerpMarkets[marketIndex]
 		);
 		expect(nodesToFillBefore.length).to.equal(0);
 
@@ -4553,7 +4257,9 @@ describe('DLOB Spot Tests', () => {
 			slot, // auction over
 			Date.now(),
 			MarketType.PERP,
-			oracle
+			oracle,
+			mockStateAccount,
+			mockPerpMarkets[marketIndex]
 		);
 
 		printBookState(dlob, marketIndex, vBid, vAsk, slot, oracle);
@@ -4578,22 +4284,10 @@ describe('DLOB Spot Tests', () => {
 		const vAsk = new BN(15);
 		const vBid = new BN(8);
 
-		const mockUserMap = new MockUserMap();
 		const user0 = Keypair.generate();
-		const userAuth0 = Keypair.generate();
 		const user1 = Keypair.generate();
-		const userAuth1 = Keypair.generate();
-
-		mockUserMap.addUserAccountAuthority(user0.publicKey, userAuth0.publicKey);
-		mockUserMap.addUserAccountAuthority(user1.publicKey, userAuth1.publicKey);
 
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+		const dlob = new DLOB();
 		const marketIndex = 0;
 
 		const slot = 12;
@@ -4640,7 +4334,9 @@ describe('DLOB Spot Tests', () => {
 			12, // auction over
 			Date.now(),
 			MarketType.PERP,
-			oracle
+			oracle,
+			mockStateAccount,
+			mockPerpMarkets[marketIndex]
 		);
 		expect(nodesToFillBefore.length).to.equal(0);
 
@@ -4679,7 +4375,9 @@ describe('DLOB Spot Tests', () => {
 			slot, // auction over
 			Date.now(),
 			MarketType.PERP,
-			oracle
+			oracle,
+			mockStateAccount,
+			mockPerpMarkets[marketIndex]
 		);
 
 		printBookState(dlob, marketIndex, vBid, vAsk, slot, oracle);
@@ -4704,52 +4402,20 @@ describe('DLOB Spot Tests', () => {
 		const vAsk = new BN(15);
 		const vBid = new BN(8);
 
-		const mockUserMap = new MockUserMap();
 		const user0 = Keypair.generate();
-		const userAuth0 = Keypair.generate();
 		const user1 = Keypair.generate();
-		const userAuth1 = Keypair.generate();
 		const user2 = Keypair.generate();
-		const userAuth2 = Keypair.generate();
 		const user3 = Keypair.generate();
-		const userAuth3 = Keypair.generate();
 		const user4 = Keypair.generate();
-		const userAuth4 = Keypair.generate();
 		const user5 = Keypair.generate();
-		const userAuth5 = Keypair.generate();
 		const user6 = Keypair.generate();
-		const userAuth6 = Keypair.generate();
 		const user7 = Keypair.generate();
-		const userAuth7 = Keypair.generate();
 		const user8 = Keypair.generate();
-		const userAuth8 = Keypair.generate();
 		const user9 = Keypair.generate();
-		const userAuth9 = Keypair.generate();
 		const user10 = Keypair.generate();
-		const userAuth10 = Keypair.generate();
 		const user11 = Keypair.generate();
-		const userAuth11 = Keypair.generate();
-
-		mockUserMap.addUserAccountAuthority(user0.publicKey, userAuth0.publicKey);
-		mockUserMap.addUserAccountAuthority(user1.publicKey, userAuth1.publicKey);
-		mockUserMap.addUserAccountAuthority(user2.publicKey, userAuth2.publicKey);
-		mockUserMap.addUserAccountAuthority(user3.publicKey, userAuth3.publicKey);
-		mockUserMap.addUserAccountAuthority(user4.publicKey, userAuth4.publicKey);
-		mockUserMap.addUserAccountAuthority(user5.publicKey, userAuth5.publicKey);
-		mockUserMap.addUserAccountAuthority(user6.publicKey, userAuth6.publicKey);
-		mockUserMap.addUserAccountAuthority(user7.publicKey, userAuth7.publicKey);
-		mockUserMap.addUserAccountAuthority(user8.publicKey, userAuth8.publicKey);
-		mockUserMap.addUserAccountAuthority(user9.publicKey, userAuth9.publicKey);
-		mockUserMap.addUserAccountAuthority(user10.publicKey, userAuth10.publicKey);
-		mockUserMap.addUserAccountAuthority(user11.publicKey, userAuth11.publicKey);
-
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+
+		const dlob = new DLOB();
 		const marketIndex = 0;
 
 		const slot = 20;
@@ -4961,7 +4627,8 @@ describe('DLOB Spot Tests', () => {
 			marketIndex,
 			slot,
 			oracle.price,
-			MarketType.SPOT
+			MarketType.SPOT,
+			mockStateAccount
 		);
 		for (const [idx, n] of nodesToTrigger.entries()) {
 			expect(n.node.order?.orderId).to.equal(orderIdsToTrigger[idx]);
@@ -4972,21 +4639,10 @@ describe('DLOB Spot Tests', () => {
 		const vAsk = new BN(15);
 		const vBid = new BN(8);
 
-		const mockUserMap = new MockUserMap();
 		const user0 = Keypair.generate();
-		const userAuth0 = Keypair.generate();
 		const user1 = Keypair.generate();
-		const userAuth1 = Keypair.generate();
-		mockUserMap.addUserAccountAuthority(user0.publicKey, userAuth0.publicKey);
-		mockUserMap.addUserAccountAuthority(user1.publicKey, userAuth1.publicKey);
 
-		const dlob = new DLOB(
-			mockPerpMarkets,
-			mockSpotMarkets,
-			mockStateAccount,
-			mockUserMap,
-			false
-		);
+		const dlob = new DLOB();
 		const marketIndex = 0;
 
 		const slot = 20;
@@ -5040,7 +4696,9 @@ describe('DLOB Spot Tests', () => {
 				slot: new BN(slot0),
 				confidence: new BN(1),
 				hasSufficientNumberOfDataPoints: true,
-			}
+			},
+			mockStateAccount,
+			mockSpotMarkets[marketIndex]
 		);
 		expect(nodesToFillBefore.length).to.equal(0);
 
@@ -5059,7 +4717,9 @@ describe('DLOB Spot Tests', () => {
 				slot: new BN(slot1),
 				confidence: new BN(1),
 				hasSufficientNumberOfDataPoints: true,
-			}
+			},
+			mockStateAccount,
+			mockSpotMarkets[marketIndex]
 		);
 		expect(nodesToFillAfter.length).to.equal(2);