@drift-labs/sdk 2.74.0-beta.7 → 2.74.0-beta.9

package/VERSION

@@ -1 +1 @@
-2.74.0-beta.7
+2.74.0-beta.9

package/lib/adminClient.d.ts

@@ -83,4 +83,5 @@ export declare class AdminClient extends DriftClient {
     updateProtocolIfSharesTransferConfig(whitelistedSigners?: PublicKey[], maxTransferPerEpoch?: BN): Promise<TransactionSignature>;
     initializePrelaunchOracle(perpMarketIndex: number, price?: BN, maxPrice?: BN): Promise<TransactionSignature>;
     updatePrelaunchOracleParams(perpMarketIndex: number, price?: BN, maxPrice?: BN): Promise<TransactionSignature>;
+    deletePrelaunchOracle(perpMarketIndex: number): Promise<TransactionSignature>;
 }

package/lib/adminClient.js

@@ -1083,5 +1083,18 @@ class AdminClient extends driftClient_1.DriftClient {
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
+    async deletePrelaunchOracle(perpMarketIndex) {
+        const deletePrelaunchOracleIx = await this.program.instruction.deletePrelaunchOracle(perpMarketIndex, {
+            accounts: {
+                admin: this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                prelaunchOracle: await (0, pda_1.getPrelaunchOraclePublicKey)(this.program.programId, perpMarketIndex),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
+            },
+        });
+        const tx = await this.buildTransaction(deletePrelaunchOracleIx);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
 }
 exports.AdminClient = AdminClient;

package/lib/dlob/orderBookLevels.js

@@ -261,6 +261,31 @@ function groupL2Levels(levels, grouping, direction, depth) {
     }
     return groupedLevels;
 }
+/**
+ * Method to merge bids or asks by price
+ */
+const mergeByPrice = (bidsOrAsks) => {
+    const merged = new Map();
+    for (const level of bidsOrAsks) {
+        const key = level.price.toString();
+        if (merged.has(key)) {
+            const existing = merged.get(key);
+            existing.size = existing.size.add(level.size);
+            for (const [source, size] of Object.entries(level.sources)) {
+                if (existing.sources[source]) {
+                    existing.sources[source] = existing.sources[source].add(size);
+                }
+                else {
+                    existing.sources[source] = size;
+                }
+            }
+        }
+        else {
+            merged.set(key, cloneL2Level(level));
+        }
+    }
+    return Array.from(merged.values());
+};
 /**
  * The purpose of this function is uncross the L2 orderbook by modifying the bid/ask price at the top of the book
  * This will make the liquidity look worse but more intuitive (users familiar with clob get confused w temporarily
@@ -342,17 +367,17 @@ function uncrossL2(bids, asks, oraclePrice, oracleTwap5Min, markTwap5Min, groupi
             bidIndex++;
             continue;
         }
+        if (userBids.has(nextBid.price.toString())) {
+            newBids.push(nextBid);
+            bidIndex++;
+            continue;
+        }
+        if (userAsks.has(nextAsk.price.toString())) {
+            newAsks.push(nextAsk);
+            askIndex++;
+            continue;
+        }
         if (nextBid.price.gte(nextAsk.price)) {
-            if (userBids.has(nextBid.price.toString())) {
-                newBids.push(nextBid);
-                bidIndex++;
-                continue;
-            }
-            if (userAsks.has(nextAsk.price.toString())) {
-                newAsks.push(nextAsk);
-                askIndex++;
-                continue;
-            }
             if (nextBid.price.gt(referencePrice) &&
                 nextAsk.price.gt(referencePrice)) {
                 let newBidPrice = nextAsk.price.sub(grouping);
@@ -397,9 +422,13 @@ function uncrossL2(bids, asks, oraclePrice, oracleTwap5Min, markTwap5Min, groupi
             bidIndex++;
         }
     }
+    newBids.sort((a, b) => b.price.cmp(a.price));
+    newAsks.sort((a, b) => a.price.cmp(b.price));
+    const finalNewBids = mergeByPrice(newBids);
+    const finalNewAsks = mergeByPrice(newAsks);
     return {
-        bids: newBids,
-        asks: newAsks,
+        bids: finalNewBids,
+        asks: finalNewAsks,
     };
 }
 exports.uncrossL2 = uncrossL2;

package/lib/idl/drift.json

@@ -9119,6 +9119,9 @@
                     {
                         "name": "Speculative"
                     },
+                    {
+                        "name": "HighlySpeculative"
+                    },
                     {
                         "name": "Isolated"
                     }

package/lib/math/funding.js

@@ -148,12 +148,6 @@ function getMaxPriceDivergenceForFundingRate(market, oracleTwap) {
     else if ((0, types_1.isVariant)(market.contractTier, 'c')) {
         return oracleTwap.divn(20);
     }
-    else if ((0, types_1.isVariant)(market.contractTier, 'speculative')) {
-        return oracleTwap.divn(10);
-    }
-    else if ((0, types_1.isVariant)(market.contractTier, 'isolated')) {
-        return oracleTwap.divn(10);
-    }
     else {
         return oracleTwap.divn(10);
     }

package/lib/math/oracles.js

@@ -28,7 +28,7 @@ function getMaxConfidenceIntervalMultiplier(market) {
     else if ((0, types_1.isVariant)(market.contractTier, 'speculative')) {
         maxConfidenceIntervalMultiplier = new index_1.BN(10);
     }
-    else if ((0, types_1.isVariant)(market.contractTier, 'isolated')) {
+    else {
         maxConfidenceIntervalMultiplier = new index_1.BN(50);
     }
     return maxConfidenceIntervalMultiplier;

package/lib/math/tiers.js

@@ -15,7 +15,7 @@ function getPerpMarketTierNumber(perpMarket) {
     else if ((0, types_1.isVariant)(perpMarket.contractTier, 'speculative')) {
         return 3;
     }
-    else if ((0, types_1.isVariant)(perpMarket.contractTier, 'isolated')) {
+    else if ((0, types_1.isVariant)(perpMarket.contractTier, 'highlySpeculative')) {
         return 4;
     }
     else {

package/lib/oracles/prelaunchOracleClient.js

@@ -17,6 +17,7 @@ class PrelaunchOracleClient {
             slot: prelaunchOracle.ammLastUpdateSlot,
             confidence: prelaunchOracle.confidence,
             hasSufficientNumberOfDataPoints: true,
+            maxPrice: prelaunchOracle.maxPrice,
         };
     }
 }

package/lib/oracles/types.d.ts

@@ -10,6 +10,7 @@ export type OraclePriceData = {
     hasSufficientNumberOfDataPoints: boolean;
     twap?: BN;
     twapConfidence?: BN;
+    maxPrice?: BN;
 };
 export type OracleInfo = {
     publicKey: PublicKey;

package/lib/types.d.ts

@@ -80,6 +80,9 @@ export declare class ContractTier {
     static readonly SPECULATIVE: {
         speculative: {};
     };
+    static readonly HIGHLY_SPECULATIVE: {
+        highlySpeculative: {};
+    };
     static readonly ISOLATED: {
         isolated: {};
     };

package/lib/types.js

@@ -60,6 +60,7 @@ ContractTier.A = { a: {} };
 ContractTier.B = { b: {} };
 ContractTier.C = { c: {} };
 ContractTier.SPECULATIVE = { speculative: {} };
+ContractTier.HIGHLY_SPECULATIVE = { highlySpeculative: {} };
 ContractTier.ISOLATED = { isolated: {} };
 class AssetTier {
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.74.0-beta.7",
+	"version": "2.74.0-beta.9",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/adminClient.ts

@@ -2172,4 +2172,30 @@ export class AdminClient extends DriftClient {
 
 		return txSig;
 	}
+
+	public async deletePrelaunchOracle(
+		perpMarketIndex: number
+	): Promise<TransactionSignature> {
+		const deletePrelaunchOracleIx =
+			await this.program.instruction.deletePrelaunchOracle(perpMarketIndex, {
+				accounts: {
+					admin: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					prelaunchOracle: await getPrelaunchOraclePublicKey(
+						this.program.programId,
+						perpMarketIndex
+					),
+					perpMarket: await getPerpMarketPublicKey(
+						this.program.programId,
+						perpMarketIndex
+					),
+				},
+			});
+
+		const tx = await this.buildTransaction(deletePrelaunchOracleIx);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
+		return txSig;
+	}
 }

package/src/dlob/orderBookLevels.ts

@@ -429,6 +429,30 @@ function groupL2Levels(
 	return groupedLevels;
 }
 
+/**
+ * Method to merge bids or asks by price
+ */
+const mergeByPrice = (bidsOrAsks: L2Level[]) => {
+	const merged = new Map<string, L2Level>();
+	for (const level of bidsOrAsks) {
+		const key = level.price.toString();
+		if (merged.has(key)) {
+			const existing = merged.get(key);
+			existing.size = existing.size.add(level.size);
+			for (const [source, size] of Object.entries(level.sources)) {
+				if (existing.sources[source]) {
+					existing.sources[source] = existing.sources[source].add(size);
+				} else {
+					existing.sources[source] = size;
+				}
+			}
+		} else {
+			merged.set(key, cloneL2Level(level));
+		}
+	}
+	return Array.from(merged.values());
+};
+
 /**
  * The purpose of this function is uncross the L2 orderbook by modifying the bid/ask price at the top of the book
  * This will make the liquidity look worse but more intuitive (users familiar with clob get confused w temporarily
@@ -467,8 +491,8 @@ export function uncrossL2(
 		return { bids, asks };
 	}
 
-	const newBids = [];
-	const newAsks = [];
+	const newBids: L2Level[] = [];
+	const newAsks: L2Level[] = [];
 
 	const updateLevels = (newPrice: BN, oldLevel: L2Level, levels: L2Level[]) => {
 		if (levels.length > 0 && levels[levels.length - 1].price.eq(newPrice)) {
@@ -528,19 +552,19 @@ export function uncrossL2(
 			continue;
 		}
 
-		if (nextBid.price.gte(nextAsk.price)) {
-			if (userBids.has(nextBid.price.toString())) {
-				newBids.push(nextBid);
-				bidIndex++;
-				continue;
-			}
+		if (userBids.has(nextBid.price.toString())) {
+			newBids.push(nextBid);
+			bidIndex++;
+			continue;
+		}
 
-			if (userAsks.has(nextAsk.price.toString())) {
-				newAsks.push(nextAsk);
-				askIndex++;
-				continue;
-			}
+		if (userAsks.has(nextAsk.price.toString())) {
+			newAsks.push(nextAsk);
+			askIndex++;
+			continue;
+		}
 
+		if (nextBid.price.gte(nextAsk.price)) {
 			if (
 				nextBid.price.gt(referencePrice) &&
 				nextAsk.price.gt(referencePrice)
@@ -594,8 +618,14 @@ export function uncrossL2(
 		}
 	}
 
+	newBids.sort((a, b) => b.price.cmp(a.price));
+	newAsks.sort((a, b) => a.price.cmp(b.price));
+
+	const finalNewBids = mergeByPrice(newBids);
+	const finalNewAsks = mergeByPrice(newAsks);
+
 	return {
-		bids: newBids,
-		asks: newAsks,
+		bids: finalNewBids,
+		asks: finalNewAsks,
 	};
 }

package/src/idl/drift.json

@@ -9119,6 +9119,9 @@
           {
             "name": "Speculative"
           },
+          {
+            "name": "HighlySpeculative"
+          },
           {
             "name": "Isolated"
           }

package/src/math/funding.ts

@@ -252,10 +252,6 @@ function getMaxPriceDivergenceForFundingRate(
 		return oracleTwap.divn(33);
 	} else if (isVariant(market.contractTier, 'c')) {
 		return oracleTwap.divn(20);
-	} else if (isVariant(market.contractTier, 'speculative')) {
-		return oracleTwap.divn(10);
-	} else if (isVariant(market.contractTier, 'isolated')) {
-		return oracleTwap.divn(10);
 	} else {
 		return oracleTwap.divn(10);
 	}

package/src/math/oracles.ts

@@ -39,7 +39,7 @@ export function getMaxConfidenceIntervalMultiplier(
 		maxConfidenceIntervalMultiplier = new BN(2);
 	} else if (isVariant(market.contractTier, 'speculative')) {
 		maxConfidenceIntervalMultiplier = new BN(10);
-	} else if (isVariant(market.contractTier, 'isolated')) {
+	} else {
 		maxConfidenceIntervalMultiplier = new BN(50);
 	}
 	return maxConfidenceIntervalMultiplier;

package/src/math/tiers.ts

@@ -9,7 +9,7 @@ export function getPerpMarketTierNumber(perpMarket: PerpMarketAccount): number {
 		return 2;
 	} else if (isVariant(perpMarket.contractTier, 'speculative')) {
 		return 3;
-	} else if (isVariant(perpMarket.contractTier, 'isolated')) {
+	} else if (isVariant(perpMarket.contractTier, 'highlySpeculative')) {
 		return 4;
 	} else {
 		return 5;

package/src/oracles/prelaunchOracleClient.ts

@@ -31,6 +31,7 @@ export class PrelaunchOracleClient implements OracleClient {
 			slot: prelaunchOracle.ammLastUpdateSlot,
 			confidence: prelaunchOracle.confidence,
 			hasSufficientNumberOfDataPoints: true,
+			maxPrice: prelaunchOracle.maxPrice,
 		};
 	}
 }

package/src/oracles/types.ts

@@ -9,6 +9,7 @@ export type OraclePriceData = {
 	hasSufficientNumberOfDataPoints: boolean;
 	twap?: BN;
 	twapConfidence?: BN;
+	maxPrice?: BN; // pre-launch markets only
 };
 
 export type OracleInfo = {

package/src/types.ts

@@ -58,6 +58,7 @@ export class ContractTier {
 	static readonly B = { b: {} };
 	static readonly C = { c: {} };
 	static readonly SPECULATIVE = { speculative: {} };
+	static readonly HIGHLY_SPECULATIVE = { highlySpeculative: {} };
 	static readonly ISOLATED = { isolated: {} };
 }
 

package/tests/dlob/test.ts

@@ -6614,6 +6614,63 @@ describe('Uncross L2', () => {
 		);
 	});
 
+	it('Handles user crossing bid in second level', () => {
+		const oraclePrice = new BN(190.3843 * PRICE_PRECISION.toNumber());
+		const bids = [
+			[190.59, 2],
+			[190.588, 58.3],
+			[190.5557, 5],
+			[190.5547, 5],
+			[190.5508, 5],
+			[190.541, 2],
+			[190.5099, 49.1],
+			[190.5, 60],
+		].map(([price, size]) => ({
+			price: new BN(price * PRICE_PRECISION.toNumber()),
+			size: new BN(size * BASE_PRECISION.toNumber()),
+			sources: { vamm: new BN(size * BASE_PRECISION.toNumber()) },
+		}));
+
+		const asks = [
+			[190.5, 86.5],
+			[190.6159, 1],
+			[190.656, 10.5],
+			[190.6561, 1],
+			[190.6585, 5],
+			[190.6595, 5],
+			[190.6596, 5],
+		].map(([price, size]) => ({
+			price: new BN(price * PRICE_PRECISION.toNumber()),
+			size: new BN(size * BASE_PRECISION.toNumber()),
+			sources: { vamm: new BN(size * BASE_PRECISION.toNumber()) },
+		}));
+
+		expect(asksAreSortedAsc(asks), 'Input asks are ascending').to.be.true;
+		expect(bidsAreSortedDesc(bids), 'Input bids are descending').to.be.true;
+
+		const groupingSize = new BN('100');
+
+		const userBidPrice = new BN(190.588 * PRICE_PRECISION.toNumber());
+		const userBids = new Set<string>([userBidPrice.toString()]);
+
+		const { bids: newBids, asks: newAsks } = uncrossL2(
+			bids,
+			asks,
+			oraclePrice,
+			oraclePrice,
+			oraclePrice,
+			groupingSize,
+			userBids,
+			new Set<string>()
+		);
+
+		expect(asksAreSortedAsc(newAsks), 'Uncrossed asks are ascending').to.be
+			.true;
+		expect(bidsAreSortedDesc(newBids), 'Uncrossed bids are descending').to.be
+			.true;
+		expect(newBids[0].price.toString()).to.equal(userBidPrice.toString());
+	});
+
 	it('Handles edge case bide and asks with large cross and an overlapping level', () => {
 		const bids = [
 			'104411000',