@drift-labs/sdk 2.74.0-beta.0 → 2.74.0-beta.10

package/VERSION

@@ -1 +1 @@
-2.74.0-beta.0
+2.74.0-beta.10

package/lib/adminClient.d.ts

@@ -5,10 +5,12 @@ import { BN } from '@coral-xyz/anchor';
 import { DriftClient } from './driftClient';
 export declare class AdminClient extends DriftClient {
     initialize(usdcMint: PublicKey, _adminControlsPrices: boolean): Promise<[TransactionSignature]>;
-    initializeSpotMarket(mint: PublicKey, optimalUtilization: number, optimalRate: number, maxRate: number, oracle: PublicKey, oracleSource: OracleSource, initialAssetWeight: number, maintenanceAssetWeight: number, initialLiabilityWeight: number, maintenanceLiabilityWeight: number, imfFactor?: number, liquidatorFee?: number, activeStatus?: boolean, name?: string): Promise<TransactionSignature>;
+    initializeSpotMarket(mint: PublicKey, optimalUtilization: number, optimalRate: number, maxRate: number, oracle: PublicKey, oracleSource: OracleSource, initialAssetWeight: number, maintenanceAssetWeight: number, initialLiabilityWeight: number, maintenanceLiabilityWeight: number, imfFactor?: number, liquidatorFee?: number, ifLiquidationFee?: number, activeStatus?: boolean, assetTier?: {
+        collateral: {};
+    }, scaleInitialAssetWeightStart?: BN, withdrawGuardThreshold?: BN, orderTickSize?: BN, orderStepSize?: BN, ifTotalFactor?: number, name?: string): Promise<TransactionSignature>;
     initializeSerumFulfillmentConfig(marketIndex: number, serumMarket: PublicKey, serumProgram: PublicKey): Promise<TransactionSignature>;
     initializePhoenixFulfillmentConfig(marketIndex: number, phoenixMarket: PublicKey): Promise<TransactionSignature>;
-    initializePerpMarket(marketIndex: number, priceOracle: PublicKey, baseAssetReserve: BN, quoteAssetReserve: BN, periodicity: BN, pegMultiplier?: BN, oracleSource?: OracleSource, marginRatioInitial?: number, marginRatioMaintenance?: number, liquidatorFee?: number, activeStatus?: boolean, name?: string): Promise<TransactionSignature>;
+    initializePerpMarket(marketIndex: number, priceOracle: PublicKey, baseAssetReserve: BN, quoteAssetReserve: BN, periodicity: BN, pegMultiplier?: BN, oracleSource?: OracleSource, marginRatioInitial?: number, marginRatioMaintenance?: number, liquidatorFee?: number, ifLiquidatorFee?: number, imfFactor?: number, activeStatus?: boolean, baseSpread?: number, maxSpread?: number, maxOpenInterest?: BN, maxRevenueWithdrawPerPeriod?: BN, quoteMaxInsurance?: BN, orderStepSize?: BN, orderTickSize?: BN, minOrderSize?: BN, concentrationCoefScale?: BN, curveUpdateIntensity?: number, ammJitIntensity?: number, name?: string): Promise<TransactionSignature>;
     deleteInitializedPerpMarket(marketIndex: number): Promise<TransactionSignature>;
     moveAmmPrice(perpMarketIndex: number, baseAssetReserve: BN, quoteAssetReserve: BN, sqrtK?: BN): Promise<TransactionSignature>;
     updateK(perpMarketIndex: number, sqrtK: BN): Promise<TransactionSignature>;
@@ -83,4 +85,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

@@ -59,13 +59,13 @@ class AdminClient extends driftClient_1.DriftClient {
         const { txSig } = await super.sendTransaction(tx, [], this.opts);
         return [txSig];
     }
-    async initializeSpotMarket(mint, optimalUtilization, optimalRate, maxRate, oracle, oracleSource, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor = 0, liquidatorFee = 0, activeStatus = true, name = userName_1.DEFAULT_MARKET_NAME) {
+    async initializeSpotMarket(mint, optimalUtilization, optimalRate, maxRate, oracle, oracleSource, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor = 0, liquidatorFee = 0, ifLiquidationFee = 0, activeStatus = true, assetTier = types_1.AssetTier.COLLATERAL, scaleInitialAssetWeightStart = numericConstants_1.ZERO, withdrawGuardThreshold = numericConstants_1.ZERO, orderTickSize = numericConstants_1.ONE, orderStepSize = numericConstants_1.ONE, ifTotalFactor = 0, name = userName_1.DEFAULT_MARKET_NAME) {
         const spotMarketIndex = this.getStateAccount().numberOfSpotMarkets;
         const spotMarket = await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex);
         const spotMarketVault = await (0, pda_1.getSpotMarketVaultPublicKey)(this.program.programId, spotMarketIndex);
         const insuranceFundVault = await (0, pda_1.getInsuranceFundVaultPublicKey)(this.program.programId, spotMarketIndex);
         const nameBuffer = (0, userName_1.encodeName)(name);
-        const initializeIx = await this.program.instruction.initializeSpotMarket(optimalUtilization, optimalRate, maxRate, oracleSource, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor, liquidatorFee, activeStatus, nameBuffer, {
+        const initializeIx = await this.program.instruction.initializeSpotMarket(optimalUtilization, optimalRate, maxRate, oracleSource, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor, liquidatorFee, ifLiquidationFee, activeStatus, assetTier, scaleInitialAssetWeightStart, withdrawGuardThreshold, orderTickSize, orderStepSize, ifTotalFactor, nameBuffer, {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
@@ -133,11 +133,11 @@ class AdminClient extends driftClient_1.DriftClient {
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async initializePerpMarket(marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION, oracleSource = types_1.OracleSource.PYTH, marginRatioInitial = 2000, marginRatioMaintenance = 500, liquidatorFee = 0, activeStatus = true, name = userName_1.DEFAULT_MARKET_NAME) {
+    async initializePerpMarket(marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION, oracleSource = types_1.OracleSource.PYTH, marginRatioInitial = 2000, marginRatioMaintenance = 500, liquidatorFee = 0, ifLiquidatorFee = 10000, imfFactor = 0, activeStatus = true, baseSpread = 0, maxSpread = 142500, maxOpenInterest = numericConstants_1.ZERO, maxRevenueWithdrawPerPeriod = numericConstants_1.ZERO, quoteMaxInsurance = numericConstants_1.ZERO, orderStepSize = numericConstants_1.BASE_PRECISION.divn(10000), orderTickSize = numericConstants_1.PRICE_PRECISION.divn(100000), minOrderSize = numericConstants_1.BASE_PRECISION.divn(10000), concentrationCoefScale = numericConstants_1.ONE, curveUpdateIntensity = 0, ammJitIntensity = 0, name = userName_1.DEFAULT_MARKET_NAME) {
         const currentPerpMarketIndex = this.getStateAccount().numberOfMarkets;
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, currentPerpMarketIndex);
         const nameBuffer = (0, userName_1.encodeName)(name);
-        const initializeMarketIx = await this.program.instruction.initializePerpMarket(marketIndex, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier, oracleSource, marginRatioInitial, marginRatioMaintenance, liquidatorFee, activeStatus, nameBuffer, {
+        const initializeMarketIx = await this.program.instruction.initializePerpMarket(marketIndex, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier, oracleSource, marginRatioInitial, marginRatioMaintenance, liquidatorFee, ifLiquidatorFee, imfFactor, activeStatus, baseSpread, maxSpread, maxOpenInterest, maxRevenueWithdrawPerPeriod, quoteMaxInsurance, orderStepSize, orderTickSize, minOrderSize, concentrationCoefScale, curveUpdateIntensity, ammJitIntensity, nameBuffer, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 admin: this.wallet.publicKey,
@@ -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/blockhashSubscriber/BlockhashSubscriber.d.ts

@@ -0,0 +1,21 @@
+import { BlockhashWithExpiryBlockHeight, Context } from '@solana/web3.js';
+import { BlockhashSubscriberConfig } from './types';
+export declare class BlockhashSubscriber {
+    private connection;
+    private isSubscribed;
+    private latestBlockHeight;
+    private latestBlockHeightContext;
+    private blockhashes;
+    private updateBlockhashIntervalId;
+    private commitment;
+    private updateIntervalMs;
+    constructor(config: BlockhashSubscriberConfig);
+    getBlockhashCacheSize(): number;
+    getLatestBlockHeight(): number;
+    getLatestBlockHeightContext(): Context | undefined;
+    getLatestBlockhash(offset?: number): BlockhashWithExpiryBlockHeight | undefined;
+    pruneBlockhashes(): void;
+    updateBlockhash(): Promise<void>;
+    subscribe(): Promise<void>;
+    unsubscribe(): void;
+}

package/lib/blockhashSubscriber/BlockhashSubscriber.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BlockhashSubscriber = void 0;
+const web3_js_1 = require("@solana/web3.js");
+class BlockhashSubscriber {
+    constructor(config) {
+        var _a, _b;
+        this.isSubscribed = false;
+        this.blockhashes = [];
+        if (!config.connection && !config.rpcUrl) {
+            throw new Error('BlockhashSubscriber requires one of connection or rpcUrl must be provided');
+        }
+        this.connection = config.connection || new web3_js_1.Connection(config.rpcUrl);
+        this.commitment = (_a = config.commitment) !== null && _a !== void 0 ? _a : 'confirmed';
+        this.updateIntervalMs = (_b = config.updateIntervalMs) !== null && _b !== void 0 ? _b : 1000;
+    }
+    getBlockhashCacheSize() {
+        return this.blockhashes.length;
+    }
+    getLatestBlockHeight() {
+        return this.latestBlockHeight;
+    }
+    getLatestBlockHeightContext() {
+        return this.latestBlockHeightContext;
+    }
+    getLatestBlockhash(offset) {
+        if (this.blockhashes.length === 0) {
+            return undefined;
+        }
+        const clampedOffset = Math.max(0, Math.min(this.blockhashes.length - 1, offset !== null && offset !== void 0 ? offset : 0));
+        return this.blockhashes[this.blockhashes.length - 1 - clampedOffset];
+    }
+    pruneBlockhashes() {
+        if (this.latestBlockHeight) {
+            this.blockhashes = this.blockhashes.filter((blockhash) => blockhash.lastValidBlockHeight > this.latestBlockHeight);
+        }
+    }
+    async updateBlockhash() {
+        const [resp, lastConfirmedBlockHeight] = await Promise.all([
+            this.connection.getLatestBlockhashAndContext({
+                commitment: this.commitment,
+            }),
+            this.connection.getBlockHeight({ commitment: this.commitment }),
+        ]);
+        this.latestBlockHeight = lastConfirmedBlockHeight;
+        this.latestBlockHeightContext = resp.context;
+        // avoid caching duplicate blockhashes
+        if (this.blockhashes.length > 0) {
+            if (resp.value.blockhash ===
+                this.blockhashes[this.blockhashes.length - 1].blockhash) {
+                return;
+            }
+        }
+        this.blockhashes.push(resp.value);
+        this.pruneBlockhashes();
+    }
+    async subscribe() {
+        if (this.isSubscribed) {
+            return;
+        }
+        this.isSubscribed = true;
+        await this.updateBlockhash();
+        this.updateBlockhashIntervalId = setInterval(this.updateBlockhash.bind(this), this.updateIntervalMs);
+    }
+    unsubscribe() {
+        if (this.updateBlockhashIntervalId) {
+            clearInterval(this.updateBlockhashIntervalId);
+            this.updateBlockhashIntervalId = undefined;
+        }
+        this.isSubscribed = false;
+    }
+}
+exports.BlockhashSubscriber = BlockhashSubscriber;

package/lib/blockhashSubscriber/index.d.ts

@@ -0,0 +1 @@
+export * from './BlockhashSubscriber';

package/lib/blockhashSubscriber/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./BlockhashSubscriber"), exports);

package/lib/blockhashSubscriber/types.d.ts

@@ -0,0 +1,7 @@
+import { Commitment, Connection } from '@solana/web3.js';
+export type BlockhashSubscriberConfig = {
+    rpcUrl?: string;
+    connection?: Connection;
+    commitment?: Commitment;
+    updateIntervalMs?: number;
+};

package/lib/blockhashSubscriber/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/dlob/orderBookLevels.js

@@ -122,6 +122,9 @@ function getVammL2Generator({ marketAccount, oraclePriceData, numOrders, now, to
                 [afterSwapQuoteReserves, afterSwapBaseReserves] =
                     (0, __1.calculateAmmReservesAfterSwap)(bidAmm, 'quote', quoteSwapped, __1.SwapDirection.REMOVE);
                 baseSwapped = bidAmm.baseAssetReserve.sub(afterSwapBaseReserves).abs();
+                if (baseSwapped.eq(__1.ZERO)) {
+                    return;
+                }
                 if (remainingBaseLiquidity.lt(baseSwapped)) {
                     baseSwapped = remainingBaseLiquidity;
                     [afterSwapQuoteReserves, afterSwapBaseReserves] =
@@ -170,6 +173,9 @@ function getVammL2Generator({ marketAccount, oraclePriceData, numOrders, now, to
                 [afterSwapQuoteReserves, afterSwapBaseReserves] =
                     (0, __1.calculateAmmReservesAfterSwap)(askAmm, 'quote', quoteSwapped, __1.SwapDirection.ADD);
                 baseSwapped = askAmm.baseAssetReserve.sub(afterSwapBaseReserves).abs();
+                if (baseSwapped.eq(__1.ZERO)) {
+                    return;
+                }
                 if (remainingBaseLiquidity.lt(baseSwapped)) {
                     baseSwapped = remainingBaseLiquidity;
                     [afterSwapQuoteReserves, afterSwapBaseReserves] =
@@ -255,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
@@ -336,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);
@@ -391,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/driftClient.d.ts

@@ -134,6 +134,11 @@ export declare class DriftClient {
         subAccountId: number;
     }[]): Promise<TransactionSignature>;
     getUpdateAdvancedDlpIx(advancedLp: boolean, subAccountId: number): Promise<anchor.web3.TransactionInstruction>;
+    updateUserReduceOnly(updates: {
+        reduceOnly: boolean;
+        subAccountId: number;
+    }[]): Promise<TransactionSignature>;
+    getUpdateUserReduceOnlyIx(reduceOnly: boolean, subAccountId: number): Promise<anchor.web3.TransactionInstruction>;
     fetchAllUserAccounts(includeIdle?: boolean): Promise<ProgramAccount<UserAccount>[]>;
     getUserAccountsForDelegate(delegate: PublicKey): Promise<UserAccount[]>;
     getUserAccountsAndAddressesForAuthority(authority: PublicKey): Promise<ProgramAccount<UserAccount>[]>;

package/lib/driftClient.js

@@ -627,6 +627,23 @@ class DriftClient {
         });
         return ix;
     }
+    async updateUserReduceOnly(updates) {
+        const ixs = await Promise.all(updates.map(async ({ reduceOnly, subAccountId }) => {
+            return await this.getUpdateUserReduceOnlyIx(reduceOnly, subAccountId);
+        }));
+        const tx = await this.buildTransaction(ixs, this.txParams);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getUpdateUserReduceOnlyIx(reduceOnly, subAccountId) {
+        const ix = await this.program.instruction.updateUserReduceOnly(subAccountId, reduceOnly, {
+            accounts: {
+                user: (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId),
+                authority: this.wallet.publicKey,
+            },
+        });
+        return ix;
+    }
     async fetchAllUserAccounts(includeIdle = true) {
         let filters = undefined;
         if (!includeIdle) {

package/lib/events/parse.d.ts

@@ -1,2 +1,2 @@
 import { Program, Event } from '@coral-xyz/anchor';
-export declare function parseLogs(program: Program, logs: string[]): Event[];
+export declare function parseLogs(program: Program, logs: string[], programId?: string): Event[];

package/lib/events/parse.js

@@ -2,19 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseLogs = void 0;
 const driftProgramId = 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH';
-const driftProgramStart = `Program ${driftProgramId} invoke`;
 const PROGRAM_LOG = 'Program log: ';
 const PROGRAM_DATA = 'Program data: ';
 const PROGRAM_LOG_START_INDEX = PROGRAM_LOG.length;
 const PROGRAM_DATA_START_INDEX = PROGRAM_DATA.length;
-function parseLogs(program, logs) {
+function parseLogs(program, logs, programId = driftProgramId) {
     const events = [];
     const execution = new ExecutionContext();
     for (const log of logs) {
         if (log.startsWith('Log truncated')) {
             break;
         }
-        const [event, newProgram, didPop] = handleLog(execution, log, program);
+        const [event, newProgram, didPop] = handleLog(execution, log, program, programId);
         if (event) {
             events.push(event);
         }
@@ -28,18 +27,18 @@ function parseLogs(program, logs) {
     return events;
 }
 exports.parseLogs = parseLogs;
-function handleLog(execution, log, program) {
+function handleLog(execution, log, program, programId = driftProgramId) {
     // Executing program is drift program.
-    if (execution.stack.length > 0 && execution.program() === driftProgramId) {
-        return handleProgramLog(log, program);
+    if (execution.stack.length > 0 && execution.program() === programId) {
+        return handleProgramLog(log, program, programId);
     }
     // Executing program is not drift program.
     else {
-        return [null, ...handleSystemLog(log)];
+        return [null, ...handleSystemLog(log, programId)];
     }
 }
 // Handles logs from *drift* program.
-function handleProgramLog(log, program) {
+function handleProgramLog(log, program, programId = driftProgramId) {
     // This is a `msg!` log or a `sol_log_data` log.
     if (log.startsWith(PROGRAM_LOG)) {
         const logStr = log.slice(PROGRAM_LOG_START_INDEX);
@@ -52,20 +51,21 @@ function handleProgramLog(log, program) {
         return [event, null, false];
     }
     else {
-        return [null, ...handleSystemLog(log)];
+        return [null, ...handleSystemLog(log, programId)];
     }
 }
 // Handles logs when the current program being executing is *not* drift.
-function handleSystemLog(log) {
+function handleSystemLog(log, programId = driftProgramId) {
     // System component.
     const logStart = log.split(':')[0];
+    const programStart = `Program ${programId} invoke`;
     // Did the program finish executing?
     if (logStart.match(/^Program (.*) success/g) !== null) {
         return [null, true];
         // Recursive call.
     }
-    else if (logStart.startsWith(driftProgramStart)) {
-        return [driftProgramId, false];
+    else if (logStart.startsWith(programStart)) {
+        return [programId, false];
     }
     // CPI call.
     else if (logStart.includes('invoke')) {

package/lib/idl/drift.json

@@ -2651,10 +2651,40 @@
                     "name": "liquidatorFee",
                     "type": "u32"
                 },
+                {
+                    "name": "ifLiquidationFee",
+                    "type": "u32"
+                },
                 {
                     "name": "activeStatus",
                     "type": "bool"
                 },
+                {
+                    "name": "assetTier",
+                    "type": {
+                        "defined": "AssetTier"
+                    }
+                },
+                {
+                    "name": "scaleInitialAssetWeightStart",
+                    "type": "u64"
+                },
+                {
+                    "name": "withdrawGuardThreshold",
+                    "type": "u64"
+                },
+                {
+                    "name": "orderTickSize",
+                    "type": "u64"
+                },
+                {
+                    "name": "orderStepSize",
+                    "type": "u64"
+                },
+                {
+                    "name": "ifTotalFactor",
+                    "type": "u32"
+                },
                 {
                     "name": "name",
                     "type": {
@@ -2943,10 +2973,62 @@
                     "name": "liquidatorFee",
                     "type": "u32"
                 },
+                {
+                    "name": "ifLiquidationFee",
+                    "type": "u32"
+                },
+                {
+                    "name": "imfFactor",
+                    "type": "u32"
+                },
                 {
                     "name": "activeStatus",
                     "type": "bool"
                 },
+                {
+                    "name": "baseSpread",
+                    "type": "u32"
+                },
+                {
+                    "name": "maxSpread",
+                    "type": "u32"
+                },
+                {
+                    "name": "maxOpenInterest",
+                    "type": "u128"
+                },
+                {
+                    "name": "maxRevenueWithdrawPerPeriod",
+                    "type": "u64"
+                },
+                {
+                    "name": "quoteMaxInsurance",
+                    "type": "u64"
+                },
+                {
+                    "name": "orderStepSize",
+                    "type": "u64"
+                },
+                {
+                    "name": "orderTickSize",
+                    "type": "u64"
+                },
+                {
+                    "name": "minOrderSize",
+                    "type": "u64"
+                },
+                {
+                    "name": "concentrationCoefScale",
+                    "type": "u128"
+                },
+                {
+                    "name": "curveUpdateIntensity",
+                    "type": "u16"
+                },
+                {
+                    "name": "ammJitUpdateIntensity",
+                    "type": "u16"
+                },
                 {
                     "name": "name",
                     "type": {
@@ -9119,6 +9201,9 @@
                     {
                         "name": "Speculative"
                     },
+                    {
+                        "name": "HighlySpeculative"
+                    },
                     {
                         "name": "Isolated"
                     }
@@ -11626,5 +11711,8 @@
             "name": "CantReclaimRent",
             "msg": "CantReclaimRent"
         }
-    ]
+    ],
+    "metadata": {
+        "address": "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
+    }
 }

package/lib/index.d.ts

@@ -98,4 +98,5 @@ export * from './auctionSubscriber';
 export * from './auctionSubscriber/types';
 export * from './memcmp';
 export * from './decode/user';
+export * from './blockhashSubscriber';
 export { BN, PublicKey, pyth };

package/lib/index.js

@@ -121,3 +121,4 @@ __exportStar(require("./auctionSubscriber"), exports);
 __exportStar(require("./auctionSubscriber/types"), exports);
 __exportStar(require("./memcmp"), exports);
 __exportStar(require("./decode/user"), exports);
+__exportStar(require("./blockhashSubscriber"), exports);

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/priorityFee/priorityFeeSubscriber.d.ts

@@ -27,6 +27,7 @@ export declare class PriorityFeeSubscriber {
     private loadForHelius;
     getMaxPriorityFee(): number | undefined;
     updateMaxPriorityFee(newMaxFee: number | undefined): void;
+    updateCustomStrategy(newStrategy: PriorityFeeStrategy): void;
     getHeliusPriorityFeeLevel(level?: HeliusPriorityLevel): number;
     getCustomStrategyResult(): number;
     getAvgStrategyResult(): number;

package/lib/priorityFee/priorityFeeSubscriber.js

@@ -87,6 +87,9 @@ class PriorityFeeSubscriber {
     updateMaxPriorityFee(newMaxFee) {
         this.maxFeeMicroLamports = newMaxFee;
     }
+    updateCustomStrategy(newStrategy) {
+        this.customStrategy = newStrategy;
+    }
     getHeliusPriorityFeeLevel(level = heliusPriorityFeeMethod_1.HeliusPriorityLevel.MEDIUM) {
         if (this.lastHeliusSample === undefined) {
             return 0;

package/lib/tx/baseTxSender.d.ts

@@ -22,7 +22,7 @@ export declare abstract class BaseTxSender implements TxSender {
     });
     send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean, extraConfirmationOptions?: ExtraConfirmationOptions): Promise<TxSigAndSlot>;
     prepareTx(tx: Transaction, additionalSigners: Array<Signer>, opts: ConfirmOptions): Promise<Transaction>;
-    getVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<VersionedTransaction>;
+    getVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions, blockhash?: string): Promise<VersionedTransaction>;
     sendVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean, extraConfirmationOptions?: ExtraConfirmationOptions): Promise<TxSigAndSlot>;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;
     simulateTransaction(tx: VersionedTransaction): Promise<boolean>;