@drift-labs/sdk 2.108.0-beta.6 → 2.108.0-beta.8

package/VERSION

@@ -1 +1 @@
-2.108.0-beta.6
+2.108.0-beta.8

package/lib/browser/driftClient.d.ts

@@ -389,8 +389,8 @@ export declare class DriftClient {
         marketIndex?: number;
         direction?: PositionDirection;
     }, placeOrderParams: OrderParams[], txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
-    placeOrders(params: OrderParams[], txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
-    preparePlaceOrdersTx(params: OrderParams[], txParams?: TxParams, subAccountId?: number): Promise<{
+    placeOrders(params: OrderParams[], txParams?: TxParams, subAccountId?: number, optionalIxs?: TransactionInstruction[]): Promise<TransactionSignature>;
+    preparePlaceOrdersTx(params: OrderParams[], txParams?: TxParams, subAccountId?: number, optionalIxs?: TransactionInstruction[]): Promise<{
         placeOrdersTx: anchor.web3.Transaction | anchor.web3.VersionedTransaction;
     }>;
     getPlaceOrdersIx(params: OptionalOrderParams[], subAccountId?: number): Promise<TransactionInstruction>;
@@ -520,7 +520,7 @@ export declare class DriftClient {
     updateUserOpenOrdersCount(userAccountPublicKey: PublicKey, user: UserAccount, txParams?: TxParams, fillerPublicKey?: PublicKey): Promise<TransactionSignature>;
     getUpdateUserOpenOrdersCountIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, fillerPublicKey?: PublicKey): Promise<TransactionInstruction>;
     placeAndTakePerpOrder(orderParams: OptionalOrderParams, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, successCondition?: PlaceAndTakeOrderSuccessCondition, auctionDurationPercentage?: number, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
-    preparePlaceAndTakePerpOrderWithAdditionalOrders(orderParams: OptionalOrderParams, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, bracketOrdersParams?: OptionalOrderParams[], txParams?: TxParams, subAccountId?: number, cancelExistingOrders?: boolean, settlePnl?: boolean, exitEarlyIfSimFails?: boolean, auctionDurationPercentage?: number): Promise<{
+    preparePlaceAndTakePerpOrderWithAdditionalOrders(orderParams: OptionalOrderParams, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, bracketOrdersParams?: OptionalOrderParams[], txParams?: TxParams, subAccountId?: number, cancelExistingOrders?: boolean, settlePnl?: boolean, exitEarlyIfSimFails?: boolean, auctionDurationPercentage?: number, optionalIxs?: TransactionInstruction[]): Promise<{
         placeAndTakeTx: Transaction | VersionedTransaction;
         cancelExistingOrdersTx: Transaction | VersionedTransaction;
         settlePnlTx: Transaction | VersionedTransaction;
@@ -706,7 +706,7 @@ export declare class DriftClient {
         settleeUserAccountPublicKey: PublicKey;
         settleeUserAccount: UserAccount;
     }[], marketIndexes: number[]): Promise<Array<TransactionInstruction>>;
-    settlePNL(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
+    settlePNL(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndex: number, txParams?: TxParams, optionalIxs?: TransactionInstruction[]): Promise<TransactionSignature>;
     settlePNLIx(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndex: number): Promise<TransactionInstruction>;
     settleMultiplePNLs(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndexes: number[], mode: SettlePnlMode, txParams?: TxParams): Promise<TransactionSignature>;
     settleMultiplePNLsMultipleTxs(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndexes: number[], mode: SettlePnlMode, txParams?: TxParams): Promise<TransactionSignature[]>;
@@ -896,7 +896,7 @@ export declare class DriftClient {
      * @returns
      */
     sendTransaction(tx: Transaction | VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
-    buildTransaction(instructions: TransactionInstruction | TransactionInstruction[], txParams?: TxParams, txVersion?: TransactionVersion, lookupTables?: AddressLookupTableAccount[], forceVersionedTransaction?: boolean, recentBlockhash?: BlockhashWithExpiryBlockHeight): Promise<Transaction | VersionedTransaction>;
+    buildTransaction(instructions: TransactionInstruction | TransactionInstruction[], txParams?: TxParams, txVersion?: TransactionVersion, lookupTables?: AddressLookupTableAccount[], forceVersionedTransaction?: boolean, recentBlockhash?: BlockhashWithExpiryBlockHeight, optionalIxs?: TransactionInstruction[]): Promise<Transaction | VersionedTransaction>;
     buildBulkTransactions(instructions: (TransactionInstruction | TransactionInstruction[])[], txParams?: TxParams, txVersion?: TransactionVersion, lookupTables?: AddressLookupTableAccount[], forceVersionedTransaction?: boolean): Promise<(Transaction | VersionedTransaction)[]>;
     buildTransactionsMap(instructionsMap: Record<string, TransactionInstruction | TransactionInstruction[]>, txParams?: TxParams, txVersion?: TransactionVersion, lookupTables?: AddressLookupTableAccount[], forceVersionedTransaction?: boolean): Promise<MappedRecord<Record<string, anchor.web3.TransactionInstruction | anchor.web3.TransactionInstruction[]>, anchor.web3.Transaction | anchor.web3.VersionedTransaction>>;
     buildAndSignTransactionsMap(instructionsMap: Record<string, TransactionInstruction | TransactionInstruction[]>, txParams?: TxParams, txVersion?: TransactionVersion, lookupTables?: AddressLookupTableAccount[], forceVersionedTransaction?: boolean): Promise<{

package/lib/browser/driftClient.js

@@ -2069,13 +2069,13 @@ class DriftClient {
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async placeOrders(params, txParams, subAccountId) {
-        const { txSig } = await this.sendTransaction((await this.preparePlaceOrdersTx(params, txParams, subAccountId))
-            .placeOrdersTx, [], this.opts, false);
+    async placeOrders(params, txParams, subAccountId, optionalIxs) {
+        const { txSig } = await this.sendTransaction((await this.preparePlaceOrdersTx(params, txParams, subAccountId, optionalIxs)).placeOrdersTx, [], this.opts, false);
         return txSig;
     }
-    async preparePlaceOrdersTx(params, txParams, subAccountId) {
-        const tx = await this.buildTransaction(await this.getPlaceOrdersIx(params, subAccountId), txParams);
+    async preparePlaceOrdersTx(params, txParams, subAccountId, optionalIxs) {
+        const lookupTableAccount = await this.fetchMarketLookupTableAccount();
+        const tx = await this.buildTransaction(await this.getPlaceOrdersIx(params, subAccountId), txParams, undefined, [lookupTableAccount], undefined, undefined, optionalIxs);
         return {
             placeOrdersTx: tx,
         };
@@ -2989,7 +2989,7 @@ class DriftClient {
         this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
         return txSig;
     }
-    async preparePlaceAndTakePerpOrderWithAdditionalOrders(orderParams, makerInfo, referrerInfo, bracketOrdersParams = new Array(), txParams, subAccountId, cancelExistingOrders, settlePnl, exitEarlyIfSimFails, auctionDurationPercentage) {
+    async preparePlaceAndTakePerpOrderWithAdditionalOrders(orderParams, makerInfo, referrerInfo, bracketOrdersParams = new Array(), txParams, subAccountId, cancelExistingOrders, settlePnl, exitEarlyIfSimFails, auctionDurationPercentage, optionalIxs) {
         const placeAndTakeIxs = [];
         const txsToSign = {
             placeAndTakeTx: undefined,
@@ -2998,6 +2998,7 @@ class DriftClient {
         };
         // Get recent block hash so that we can re-use it for all transactions. Makes this logic run faster with fewer RPC requests
         const recentBlockHash = await this.txHandler.getLatestBlockhashForTransaction();
+        const lookupTableAccount = await this.fetchMarketLookupTableAccount();
         let earlyExitFailedPlaceAndTakeSim = false;
         const prepPlaceAndTakeTx = async () => {
             var _a;
@@ -3014,7 +3015,7 @@ class DriftClient {
                 useSimulatedComputeUnits: false,
             };
             if (shouldUseSimulationComputeUnits || shouldExitIfSimulationFails) {
-                const placeAndTakeTxToSim = (await this.buildTransaction(placeAndTakeIxs, txParams, undefined, undefined, true, recentBlockHash));
+                const placeAndTakeTxToSim = (await this.buildTransaction(placeAndTakeIxs, txParams, undefined, [lookupTableAccount], true, recentBlockHash, optionalIxs));
                 const simulationResult = await txParamProcessor_1.TransactionParamProcessor.getTxSimComputeUnits(placeAndTakeTxToSim, this.connection, (_a = txParams.computeUnitsBufferMultiplier) !== null && _a !== void 0 ? _a : 1.2, txParams.lowerBoundCu);
                 if (shouldExitIfSimulationFails && !simulationResult.success) {
                     earlyExitFailedPlaceAndTakeSim = true;
@@ -3023,17 +3024,17 @@ class DriftClient {
                 txsToSign.placeAndTakeTx = await this.buildTransaction(placeAndTakeIxs, {
                     ...txParamsWithoutImplicitSimulation,
                     computeUnits: simulationResult.computeUnits,
-                }, undefined, undefined, undefined, recentBlockHash);
+                }, undefined, [lookupTableAccount], undefined, recentBlockHash, optionalIxs);
             }
             else {
-                txsToSign.placeAndTakeTx = await this.buildTransaction(placeAndTakeIxs, txParams, undefined, undefined, undefined, recentBlockHash);
+                txsToSign.placeAndTakeTx = await this.buildTransaction(placeAndTakeIxs, txParams, undefined, [lookupTableAccount], undefined, recentBlockHash, optionalIxs);
             }
             return;
         };
         const prepCancelOrderTx = async () => {
             if (cancelExistingOrders && (0, types_1.isVariant)(orderParams.marketType, 'perp')) {
                 const cancelOrdersIx = await this.getCancelOrdersIx(orderParams.marketType, orderParams.marketIndex, null, subAccountId);
-                txsToSign.cancelExistingOrdersTx = await this.buildTransaction([cancelOrdersIx], txParams, this.txVersion, undefined, undefined, recentBlockHash);
+                txsToSign.cancelExistingOrdersTx = await this.buildTransaction([cancelOrdersIx], txParams, this.txVersion, [lookupTableAccount], undefined, recentBlockHash, optionalIxs);
             }
             return;
         };
@@ -3041,7 +3042,7 @@ class DriftClient {
             if (settlePnl && (0, types_1.isVariant)(orderParams.marketType, 'perp')) {
                 const userAccountPublicKey = await this.getUserAccountPublicKey(subAccountId);
                 const settlePnlIx = await this.settlePNLIx(userAccountPublicKey, this.getUserAccount(subAccountId), orderParams.marketIndex);
-                txsToSign.settlePnlTx = await this.buildTransaction([settlePnlIx], txParams, this.txVersion, undefined, undefined, recentBlockHash);
+                txsToSign.settlePnlTx = await this.buildTransaction([settlePnlIx], txParams, this.txVersion, [lookupTableAccount], undefined, recentBlockHash, optionalIxs);
             }
             return;
         };
@@ -3647,8 +3648,9 @@ class DriftClient {
         }
         return ixs;
     }
-    async settlePNL(settleeUserAccountPublicKey, settleeUserAccount, marketIndex, txParams) {
-        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.settlePNLIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndex), txParams), [], this.opts);
+    async settlePNL(settleeUserAccountPublicKey, settleeUserAccount, marketIndex, txParams, optionalIxs) {
+        const lookupTableAccount = await this.fetchMarketLookupTableAccount();
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.settlePNLIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndex), txParams, undefined, [lookupTableAccount], undefined, undefined, optionalIxs), [], this.opts);
         return txSig;
     }
     async settlePNLIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndex) {
@@ -4894,7 +4896,7 @@ class DriftClient {
             return this.txSender.send(tx, additionalSigners, opts !== null && opts !== void 0 ? opts : this.opts, preSigned);
         }
     }
-    async buildTransaction(instructions, txParams, txVersion, lookupTables, forceVersionedTransaction, recentBlockhash) {
+    async buildTransaction(instructions, txParams, txVersion, lookupTables, forceVersionedTransaction, recentBlockhash, optionalIxs) {
         return this.txHandler.buildTransaction({
             instructions,
             txVersion: txVersion !== null && txVersion !== void 0 ? txVersion : this.txVersion,
@@ -4905,6 +4907,7 @@ class DriftClient {
             lookupTables,
             forceVersionedTransaction,
             recentBlockhash,
+            optionalIxs,
         });
     }
     async buildBulkTransactions(instructions, txParams, txVersion, lookupTables, forceVersionedTransaction) {

package/lib/browser/index.d.ts

@@ -86,6 +86,7 @@ export * from './oracles/pythClient';
 export * from './oracles/pythPullClient';
 export * from './oracles/pythLazerClient';
 export * from './oracles/switchboardOnDemandClient';
+export * from './oracles/oracleId';
 export * from './swift/swiftOrderSubscriber';
 export * from './tx/fastSingleTxSender';
 export * from './tx/retryTxSender';

package/lib/browser/index.js

@@ -109,6 +109,7 @@ __exportStar(require("./oracles/pythClient"), exports);
 __exportStar(require("./oracles/pythPullClient"), exports);
 __exportStar(require("./oracles/pythLazerClient"), exports);
 __exportStar(require("./oracles/switchboardOnDemandClient"), exports);
+__exportStar(require("./oracles/oracleId"), exports);
 __exportStar(require("./swift/swiftOrderSubscriber"), exports);
 __exportStar(require("./tx/fastSingleTxSender"), exports);
 __exportStar(require("./tx/retryTxSender"), exports);

package/lib/browser/math/oracles.js

@@ -149,6 +149,22 @@ function getMultipleBetweenOracleSources(firstOracleSource, secondOracleSource)
         (0, types_1.isVariant)(secondOracleSource, 'pythPull')) {
         return { numerator: new index_1.BN(1), denominator: new index_1.BN(1000) };
     }
+    if ((0, types_1.isVariant)(firstOracleSource, 'pythLazer') &&
+        (0, types_1.isVariant)(secondOracleSource, 'pythLazer1M')) {
+        return { numerator: new index_1.BN(1000000), denominator: new index_1.BN(1) };
+    }
+    if ((0, types_1.isVariant)(firstOracleSource, 'pythLazer') &&
+        (0, types_1.isVariant)(secondOracleSource, 'pythLazer1K')) {
+        return { numerator: new index_1.BN(1000), denominator: new index_1.BN(1) };
+    }
+    if ((0, types_1.isVariant)(firstOracleSource, 'pythLazer1M') &&
+        (0, types_1.isVariant)(secondOracleSource, 'pythLazer')) {
+        return { numerator: new index_1.BN(1), denominator: new index_1.BN(1000000) };
+    }
+    if ((0, types_1.isVariant)(firstOracleSource, 'pythLazer1K') &&
+        (0, types_1.isVariant)(secondOracleSource, 'pythLazer')) {
+        return { numerator: new index_1.BN(1), denominator: new index_1.BN(1000) };
+    }
     return { numerator: new index_1.BN(1), denominator: new index_1.BN(1) };
 }
 exports.getMultipleBetweenOracleSources = getMultipleBetweenOracleSources;

package/lib/browser/tx/txHandler.d.ts

@@ -12,6 +12,7 @@ export type TxBuildingProps = {
     txParams?: TxParams;
     recentBlockhash?: BlockhashWithExpiryBlockHeight;
     wallet?: IWallet;
+    optionalIxs?: TransactionInstruction[];
 };
 export type TxHandlerConfig = {
     blockhashCachingEnabled?: boolean;

package/lib/browser/tx/txHandler.js

@@ -277,24 +277,35 @@ class TxHandler {
      */
     async buildTransaction(props) {
         var _a;
-        const { instructions, txVersion, txParams, connection: _connection, preFlightCommitment: _preFlightCommitment, fetchMarketLookupTableAccount, forceVersionedTransaction, } = props;
+        const { txVersion, txParams, connection: _connection, preFlightCommitment: _preFlightCommitment, fetchMarketLookupTableAccount, forceVersionedTransaction, instructions, } = props;
         let { lookupTables } = props;
         // # Collect and process Tx Params
         let baseTxParams = {
             computeUnits: txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits,
             computeUnitsPrice: txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice,
         };
+        const instructionsArray = Array.isArray(instructions)
+            ? instructions
+            : [instructions];
+        let instructionsToUse;
+        // add optional ixs if there's room (usually oracle cranks)
+        if (props.optionalIxs && txVersion === 0) {
+            instructionsToUse = (0, utils_1.getCombinedInstructions)(instructionsArray, props.optionalIxs, txVersion === 0, lookupTables);
+        }
+        else {
+            instructionsToUse = instructionsArray;
+        }
         if (txParams === null || txParams === void 0 ? void 0 : txParams.useSimulatedComputeUnits) {
-            const processedTxParams = await this.getProcessedTransactionParams(props);
+            const processedTxParams = await this.getProcessedTransactionParams({
+                ...props,
+                instructions: instructionsToUse,
+            });
             baseTxParams = {
                 ...baseTxParams,
                 ...processedTxParams,
             };
         }
-        const instructionsArray = Array.isArray(instructions)
-            ? instructions
-            : [instructions];
-        const { hasSetComputeUnitLimitIx, hasSetComputeUnitPriceIx } = (0, computeUnits_1.containsComputeUnitIxs)(instructionsArray);
+        const { hasSetComputeUnitLimitIx, hasSetComputeUnitPriceIx } = (0, computeUnits_1.containsComputeUnitIxs)(instructionsToUse);
         // # Create Tx Instructions
         const allIx = [];
         const computeUnits = baseTxParams === null || baseTxParams === void 0 ? void 0 : baseTxParams.computeUnits;
@@ -314,7 +325,7 @@ class TxHandler {
                 microLamports: computeUnitsPrice,
             }));
         }
-        allIx.push(...instructionsArray);
+        allIx.push(...instructionsToUse);
         const recentBlockhash = (_a = props === null || props === void 0 ? void 0 : props.recentBlockhash) !== null && _a !== void 0 ? _a : (await this.getLatestBlockhashForTransaction());
         // # Create and return Transaction
         if (txVersion === 'legacy') {

package/lib/browser/tx/utils.d.ts

@@ -1,2 +1,4 @@
-import { Transaction, VersionedTransaction } from '@solana/web3.js';
+import { AddressLookupTableAccount, Transaction, TransactionInstruction, VersionedTransaction } from '@solana/web3.js';
 export declare const isVersionedTransaction: (tx: Transaction | VersionedTransaction) => boolean;
+export declare const getSizeOfTransaction: (instructions: TransactionInstruction[], versionedTransaction?: boolean, addressLookupTables?: AddressLookupTableAccount[]) => number;
+export declare const getCombinedInstructions: (baseInstructions: TransactionInstruction[], optionalInstructions?: TransactionInstruction[], versionedTransaction?: boolean, addressLookupTables?: AddressLookupTableAccount[]) => TransactionInstruction[];

package/lib/browser/tx/utils.js

@@ -1,10 +1,82 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isVersionedTransaction = void 0;
+exports.getCombinedInstructions = exports.getSizeOfTransaction = exports.isVersionedTransaction = void 0;
 const web3_js_1 = require("@solana/web3.js");
+const MAX_SIZE = 1232;
 const isVersionedTransaction = (tx) => {
     const version = tx === null || tx === void 0 ? void 0 : tx.version;
     const isVersionedTx = tx instanceof web3_js_1.VersionedTransaction || version !== undefined;
     return isVersionedTx;
 };
 exports.isVersionedTransaction = isVersionedTransaction;
+const getSizeOfTransaction = (instructions, versionedTransaction = true, addressLookupTables = []) => {
+    const programs = new Set();
+    const signers = new Set();
+    let accounts = new Set();
+    instructions.forEach((ix) => {
+        try {
+            if (ix.programId) {
+                programs.add(ix.programId.toBase58());
+                accounts.add(ix.programId.toBase58());
+            }
+            if (ix.keys) {
+                ix.keys.forEach((key) => {
+                    if (key.isSigner) {
+                        signers.add(key.pubkey.toBase58());
+                    }
+                    accounts.add(key.pubkey.toBase58());
+                });
+            }
+        }
+        catch (e) {
+            console.log(e);
+        }
+    });
+    const instructionSizes = instructions
+        .map((ix) => 1 +
+        getSizeOfCompressedU16(ix.keys.length) +
+        ix.keys.length +
+        getSizeOfCompressedU16(ix.data.length) +
+        ix.data.length)
+        .reduce((a, b) => a + b, 0);
+    let numberOfAddressLookups = 0;
+    if (addressLookupTables.length > 0) {
+        const lookupTableAddresses = addressLookupTables
+            .map((addressLookupTable) => addressLookupTable.state.addresses.map((address) => address.toBase58()))
+            .flat();
+        const totalNumberOfAccounts = accounts.size;
+        accounts = new Set([...accounts].filter((account) => !lookupTableAddresses.includes(account)));
+        accounts = new Set([...accounts, ...programs, ...signers]);
+        numberOfAddressLookups = totalNumberOfAccounts - accounts.size;
+    }
+    return (getSizeOfCompressedU16(signers.size) +
+        signers.size * 64 + // array of signatures
+        3 +
+        getSizeOfCompressedU16(accounts.size) +
+        32 * accounts.size + // array of account addresses
+        32 + // recent blockhash
+        getSizeOfCompressedU16(instructions.length) +
+        instructionSizes + // array of instructions
+        (versionedTransaction ? 1 + getSizeOfCompressedU16(0) : 0) +
+        (versionedTransaction ? 32 * addressLookupTables.length : 0) +
+        (versionedTransaction && addressLookupTables.length > 0 ? 2 : 0) +
+        numberOfAddressLookups);
+};
+exports.getSizeOfTransaction = getSizeOfTransaction;
+const getCombinedInstructions = (baseInstructions, optionalInstructions = [], versionedTransaction = true, addressLookupTables = []) => {
+    if (optionalInstructions.length === 0) {
+        return baseInstructions;
+    }
+    let allInstructions = [...optionalInstructions, ...baseInstructions];
+    let txSize = (0, exports.getSizeOfTransaction)(allInstructions, versionedTransaction, addressLookupTables);
+    while (txSize > MAX_SIZE &&
+        allInstructions.length > baseInstructions.length) {
+        allInstructions = allInstructions.slice(1);
+        txSize = (0, exports.getSizeOfTransaction)(allInstructions, versionedTransaction, addressLookupTables);
+    }
+    return allInstructions;
+};
+exports.getCombinedInstructions = getCombinedInstructions;
+function getSizeOfCompressedU16(n) {
+    return 1 + Number(n >= 128) + Number(n >= 16384);
+}

package/lib/node/driftClient.d.ts

@@ -389,8 +389,8 @@ export declare class DriftClient {
         marketIndex?: number;
         direction?: PositionDirection;
     }, placeOrderParams: OrderParams[], txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
-    placeOrders(params: OrderParams[], txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
-    preparePlaceOrdersTx(params: OrderParams[], txParams?: TxParams, subAccountId?: number): Promise<{
+    placeOrders(params: OrderParams[], txParams?: TxParams, subAccountId?: number, optionalIxs?: TransactionInstruction[]): Promise<TransactionSignature>;
+    preparePlaceOrdersTx(params: OrderParams[], txParams?: TxParams, subAccountId?: number, optionalIxs?: TransactionInstruction[]): Promise<{
         placeOrdersTx: anchor.web3.Transaction | anchor.web3.VersionedTransaction;
     }>;
     getPlaceOrdersIx(params: OptionalOrderParams[], subAccountId?: number): Promise<TransactionInstruction>;
@@ -520,7 +520,7 @@ export declare class DriftClient {
     updateUserOpenOrdersCount(userAccountPublicKey: PublicKey, user: UserAccount, txParams?: TxParams, fillerPublicKey?: PublicKey): Promise<TransactionSignature>;
     getUpdateUserOpenOrdersCountIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, fillerPublicKey?: PublicKey): Promise<TransactionInstruction>;
     placeAndTakePerpOrder(orderParams: OptionalOrderParams, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, successCondition?: PlaceAndTakeOrderSuccessCondition, auctionDurationPercentage?: number, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
-    preparePlaceAndTakePerpOrderWithAdditionalOrders(orderParams: OptionalOrderParams, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, bracketOrdersParams?: OptionalOrderParams[], txParams?: TxParams, subAccountId?: number, cancelExistingOrders?: boolean, settlePnl?: boolean, exitEarlyIfSimFails?: boolean, auctionDurationPercentage?: number): Promise<{
+    preparePlaceAndTakePerpOrderWithAdditionalOrders(orderParams: OptionalOrderParams, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, bracketOrdersParams?: OptionalOrderParams[], txParams?: TxParams, subAccountId?: number, cancelExistingOrders?: boolean, settlePnl?: boolean, exitEarlyIfSimFails?: boolean, auctionDurationPercentage?: number, optionalIxs?: TransactionInstruction[]): Promise<{
         placeAndTakeTx: Transaction | VersionedTransaction;
         cancelExistingOrdersTx: Transaction | VersionedTransaction;
         settlePnlTx: Transaction | VersionedTransaction;
@@ -706,7 +706,7 @@ export declare class DriftClient {
         settleeUserAccountPublicKey: PublicKey;
         settleeUserAccount: UserAccount;
     }[], marketIndexes: number[]): Promise<Array<TransactionInstruction>>;
-    settlePNL(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
+    settlePNL(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndex: number, txParams?: TxParams, optionalIxs?: TransactionInstruction[]): Promise<TransactionSignature>;
     settlePNLIx(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndex: number): Promise<TransactionInstruction>;
     settleMultiplePNLs(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndexes: number[], mode: SettlePnlMode, txParams?: TxParams): Promise<TransactionSignature>;
     settleMultiplePNLsMultipleTxs(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndexes: number[], mode: SettlePnlMode, txParams?: TxParams): Promise<TransactionSignature[]>;
@@ -896,7 +896,7 @@ export declare class DriftClient {
      * @returns
      */
     sendTransaction(tx: Transaction | VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
-    buildTransaction(instructions: TransactionInstruction | TransactionInstruction[], txParams?: TxParams, txVersion?: TransactionVersion, lookupTables?: AddressLookupTableAccount[], forceVersionedTransaction?: boolean, recentBlockhash?: BlockhashWithExpiryBlockHeight): Promise<Transaction | VersionedTransaction>;
+    buildTransaction(instructions: TransactionInstruction | TransactionInstruction[], txParams?: TxParams, txVersion?: TransactionVersion, lookupTables?: AddressLookupTableAccount[], forceVersionedTransaction?: boolean, recentBlockhash?: BlockhashWithExpiryBlockHeight, optionalIxs?: TransactionInstruction[]): Promise<Transaction | VersionedTransaction>;
     buildBulkTransactions(instructions: (TransactionInstruction | TransactionInstruction[])[], txParams?: TxParams, txVersion?: TransactionVersion, lookupTables?: AddressLookupTableAccount[], forceVersionedTransaction?: boolean): Promise<(Transaction | VersionedTransaction)[]>;
     buildTransactionsMap(instructionsMap: Record<string, TransactionInstruction | TransactionInstruction[]>, txParams?: TxParams, txVersion?: TransactionVersion, lookupTables?: AddressLookupTableAccount[], forceVersionedTransaction?: boolean): Promise<MappedRecord<Record<string, anchor.web3.TransactionInstruction | anchor.web3.TransactionInstruction[]>, anchor.web3.Transaction | anchor.web3.VersionedTransaction>>;
     buildAndSignTransactionsMap(instructionsMap: Record<string, TransactionInstruction | TransactionInstruction[]>, txParams?: TxParams, txVersion?: TransactionVersion, lookupTables?: AddressLookupTableAccount[], forceVersionedTransaction?: boolean): Promise<{

package/lib/node/driftClient.js

@@ -2069,13 +2069,13 @@ class DriftClient {
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async placeOrders(params, txParams, subAccountId) {
-        const { txSig } = await this.sendTransaction((await this.preparePlaceOrdersTx(params, txParams, subAccountId))
-            .placeOrdersTx, [], this.opts, false);
+    async placeOrders(params, txParams, subAccountId, optionalIxs) {
+        const { txSig } = await this.sendTransaction((await this.preparePlaceOrdersTx(params, txParams, subAccountId, optionalIxs)).placeOrdersTx, [], this.opts, false);
         return txSig;
     }
-    async preparePlaceOrdersTx(params, txParams, subAccountId) {
-        const tx = await this.buildTransaction(await this.getPlaceOrdersIx(params, subAccountId), txParams);
+    async preparePlaceOrdersTx(params, txParams, subAccountId, optionalIxs) {
+        const lookupTableAccount = await this.fetchMarketLookupTableAccount();
+        const tx = await this.buildTransaction(await this.getPlaceOrdersIx(params, subAccountId), txParams, undefined, [lookupTableAccount], undefined, undefined, optionalIxs);
         return {
             placeOrdersTx: tx,
         };
@@ -2989,7 +2989,7 @@ class DriftClient {
         this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
         return txSig;
     }
-    async preparePlaceAndTakePerpOrderWithAdditionalOrders(orderParams, makerInfo, referrerInfo, bracketOrdersParams = new Array(), txParams, subAccountId, cancelExistingOrders, settlePnl, exitEarlyIfSimFails, auctionDurationPercentage) {
+    async preparePlaceAndTakePerpOrderWithAdditionalOrders(orderParams, makerInfo, referrerInfo, bracketOrdersParams = new Array(), txParams, subAccountId, cancelExistingOrders, settlePnl, exitEarlyIfSimFails, auctionDurationPercentage, optionalIxs) {
         const placeAndTakeIxs = [];
         const txsToSign = {
             placeAndTakeTx: undefined,
@@ -2998,6 +2998,7 @@ class DriftClient {
         };
         // Get recent block hash so that we can re-use it for all transactions. Makes this logic run faster with fewer RPC requests
         const recentBlockHash = await this.txHandler.getLatestBlockhashForTransaction();
+        const lookupTableAccount = await this.fetchMarketLookupTableAccount();
         let earlyExitFailedPlaceAndTakeSim = false;
         const prepPlaceAndTakeTx = async () => {
             var _a;
@@ -3014,7 +3015,7 @@ class DriftClient {
                 useSimulatedComputeUnits: false,
             };
             if (shouldUseSimulationComputeUnits || shouldExitIfSimulationFails) {
-                const placeAndTakeTxToSim = (await this.buildTransaction(placeAndTakeIxs, txParams, undefined, undefined, true, recentBlockHash));
+                const placeAndTakeTxToSim = (await this.buildTransaction(placeAndTakeIxs, txParams, undefined, [lookupTableAccount], true, recentBlockHash, optionalIxs));
                 const simulationResult = await txParamProcessor_1.TransactionParamProcessor.getTxSimComputeUnits(placeAndTakeTxToSim, this.connection, (_a = txParams.computeUnitsBufferMultiplier) !== null && _a !== void 0 ? _a : 1.2, txParams.lowerBoundCu);
                 if (shouldExitIfSimulationFails && !simulationResult.success) {
                     earlyExitFailedPlaceAndTakeSim = true;
@@ -3023,17 +3024,17 @@ class DriftClient {
                 txsToSign.placeAndTakeTx = await this.buildTransaction(placeAndTakeIxs, {
                     ...txParamsWithoutImplicitSimulation,
                     computeUnits: simulationResult.computeUnits,
-                }, undefined, undefined, undefined, recentBlockHash);
+                }, undefined, [lookupTableAccount], undefined, recentBlockHash, optionalIxs);
             }
             else {
-                txsToSign.placeAndTakeTx = await this.buildTransaction(placeAndTakeIxs, txParams, undefined, undefined, undefined, recentBlockHash);
+                txsToSign.placeAndTakeTx = await this.buildTransaction(placeAndTakeIxs, txParams, undefined, [lookupTableAccount], undefined, recentBlockHash, optionalIxs);
             }
             return;
         };
         const prepCancelOrderTx = async () => {
             if (cancelExistingOrders && (0, types_1.isVariant)(orderParams.marketType, 'perp')) {
                 const cancelOrdersIx = await this.getCancelOrdersIx(orderParams.marketType, orderParams.marketIndex, null, subAccountId);
-                txsToSign.cancelExistingOrdersTx = await this.buildTransaction([cancelOrdersIx], txParams, this.txVersion, undefined, undefined, recentBlockHash);
+                txsToSign.cancelExistingOrdersTx = await this.buildTransaction([cancelOrdersIx], txParams, this.txVersion, [lookupTableAccount], undefined, recentBlockHash, optionalIxs);
             }
             return;
         };
@@ -3041,7 +3042,7 @@ class DriftClient {
             if (settlePnl && (0, types_1.isVariant)(orderParams.marketType, 'perp')) {
                 const userAccountPublicKey = await this.getUserAccountPublicKey(subAccountId);
                 const settlePnlIx = await this.settlePNLIx(userAccountPublicKey, this.getUserAccount(subAccountId), orderParams.marketIndex);
-                txsToSign.settlePnlTx = await this.buildTransaction([settlePnlIx], txParams, this.txVersion, undefined, undefined, recentBlockHash);
+                txsToSign.settlePnlTx = await this.buildTransaction([settlePnlIx], txParams, this.txVersion, [lookupTableAccount], undefined, recentBlockHash, optionalIxs);
             }
             return;
         };
@@ -3647,8 +3648,9 @@ class DriftClient {
         }
         return ixs;
     }
-    async settlePNL(settleeUserAccountPublicKey, settleeUserAccount, marketIndex, txParams) {
-        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.settlePNLIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndex), txParams), [], this.opts);
+    async settlePNL(settleeUserAccountPublicKey, settleeUserAccount, marketIndex, txParams, optionalIxs) {
+        const lookupTableAccount = await this.fetchMarketLookupTableAccount();
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.settlePNLIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndex), txParams, undefined, [lookupTableAccount], undefined, undefined, optionalIxs), [], this.opts);
         return txSig;
     }
     async settlePNLIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndex) {
@@ -4894,7 +4896,7 @@ class DriftClient {
             return this.txSender.send(tx, additionalSigners, opts !== null && opts !== void 0 ? opts : this.opts, preSigned);
         }
     }
-    async buildTransaction(instructions, txParams, txVersion, lookupTables, forceVersionedTransaction, recentBlockhash) {
+    async buildTransaction(instructions, txParams, txVersion, lookupTables, forceVersionedTransaction, recentBlockhash, optionalIxs) {
         return this.txHandler.buildTransaction({
             instructions,
             txVersion: txVersion !== null && txVersion !== void 0 ? txVersion : this.txVersion,
@@ -4905,6 +4907,7 @@ class DriftClient {
             lookupTables,
             forceVersionedTransaction,
             recentBlockhash,
+            optionalIxs,
         });
     }
     async buildBulkTransactions(instructions, txParams, txVersion, lookupTables, forceVersionedTransaction) {

package/lib/node/index.d.ts

@@ -86,6 +86,7 @@ export * from './oracles/pythClient';
 export * from './oracles/pythPullClient';
 export * from './oracles/pythLazerClient';
 export * from './oracles/switchboardOnDemandClient';
+export * from './oracles/oracleId';
 export * from './swift/swiftOrderSubscriber';
 export * from './tx/fastSingleTxSender';
 export * from './tx/retryTxSender';

package/lib/node/index.js

@@ -109,6 +109,7 @@ __exportStar(require("./oracles/pythClient"), exports);
 __exportStar(require("./oracles/pythPullClient"), exports);
 __exportStar(require("./oracles/pythLazerClient"), exports);
 __exportStar(require("./oracles/switchboardOnDemandClient"), exports);
+__exportStar(require("./oracles/oracleId"), exports);
 __exportStar(require("./swift/swiftOrderSubscriber"), exports);
 __exportStar(require("./tx/fastSingleTxSender"), exports);
 __exportStar(require("./tx/retryTxSender"), exports);

package/lib/node/math/oracles.js

@@ -149,6 +149,22 @@ function getMultipleBetweenOracleSources(firstOracleSource, secondOracleSource)
         (0, types_1.isVariant)(secondOracleSource, 'pythPull')) {
         return { numerator: new index_1.BN(1), denominator: new index_1.BN(1000) };
     }
+    if ((0, types_1.isVariant)(firstOracleSource, 'pythLazer') &&
+        (0, types_1.isVariant)(secondOracleSource, 'pythLazer1M')) {
+        return { numerator: new index_1.BN(1000000), denominator: new index_1.BN(1) };
+    }
+    if ((0, types_1.isVariant)(firstOracleSource, 'pythLazer') &&
+        (0, types_1.isVariant)(secondOracleSource, 'pythLazer1K')) {
+        return { numerator: new index_1.BN(1000), denominator: new index_1.BN(1) };
+    }
+    if ((0, types_1.isVariant)(firstOracleSource, 'pythLazer1M') &&
+        (0, types_1.isVariant)(secondOracleSource, 'pythLazer')) {
+        return { numerator: new index_1.BN(1), denominator: new index_1.BN(1000000) };
+    }
+    if ((0, types_1.isVariant)(firstOracleSource, 'pythLazer1K') &&
+        (0, types_1.isVariant)(secondOracleSource, 'pythLazer')) {
+        return { numerator: new index_1.BN(1), denominator: new index_1.BN(1000) };
+    }
     return { numerator: new index_1.BN(1), denominator: new index_1.BN(1) };
 }
 exports.getMultipleBetweenOracleSources = getMultipleBetweenOracleSources;

package/lib/node/tx/txHandler.d.ts

@@ -12,6 +12,7 @@ export type TxBuildingProps = {
     txParams?: TxParams;
     recentBlockhash?: BlockhashWithExpiryBlockHeight;
     wallet?: IWallet;
+    optionalIxs?: TransactionInstruction[];
 };
 export type TxHandlerConfig = {
     blockhashCachingEnabled?: boolean;

package/lib/node/tx/txHandler.js

@@ -277,24 +277,35 @@ class TxHandler {
      */
     async buildTransaction(props) {
         var _a;
-        const { instructions, txVersion, txParams, connection: _connection, preFlightCommitment: _preFlightCommitment, fetchMarketLookupTableAccount, forceVersionedTransaction, } = props;
+        const { txVersion, txParams, connection: _connection, preFlightCommitment: _preFlightCommitment, fetchMarketLookupTableAccount, forceVersionedTransaction, instructions, } = props;
         let { lookupTables } = props;
         // # Collect and process Tx Params
         let baseTxParams = {
             computeUnits: txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits,
             computeUnitsPrice: txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice,
         };
+        const instructionsArray = Array.isArray(instructions)
+            ? instructions
+            : [instructions];
+        let instructionsToUse;
+        // add optional ixs if there's room (usually oracle cranks)
+        if (props.optionalIxs && txVersion === 0) {
+            instructionsToUse = (0, utils_1.getCombinedInstructions)(instructionsArray, props.optionalIxs, txVersion === 0, lookupTables);
+        }
+        else {
+            instructionsToUse = instructionsArray;
+        }
         if (txParams === null || txParams === void 0 ? void 0 : txParams.useSimulatedComputeUnits) {
-            const processedTxParams = await this.getProcessedTransactionParams(props);
+            const processedTxParams = await this.getProcessedTransactionParams({
+                ...props,
+                instructions: instructionsToUse,
+            });
             baseTxParams = {
                 ...baseTxParams,
                 ...processedTxParams,
             };
         }
-        const instructionsArray = Array.isArray(instructions)
-            ? instructions
-            : [instructions];
-        const { hasSetComputeUnitLimitIx, hasSetComputeUnitPriceIx } = (0, computeUnits_1.containsComputeUnitIxs)(instructionsArray);
+        const { hasSetComputeUnitLimitIx, hasSetComputeUnitPriceIx } = (0, computeUnits_1.containsComputeUnitIxs)(instructionsToUse);
         // # Create Tx Instructions
         const allIx = [];
         const computeUnits = baseTxParams === null || baseTxParams === void 0 ? void 0 : baseTxParams.computeUnits;
@@ -314,7 +325,7 @@ class TxHandler {
                 microLamports: computeUnitsPrice,
             }));
         }
-        allIx.push(...instructionsArray);
+        allIx.push(...instructionsToUse);
         const recentBlockhash = (_a = props === null || props === void 0 ? void 0 : props.recentBlockhash) !== null && _a !== void 0 ? _a : (await this.getLatestBlockhashForTransaction());
         // # Create and return Transaction
         if (txVersion === 'legacy') {

package/lib/node/tx/utils.d.ts

@@ -1,2 +1,4 @@
-import { Transaction, VersionedTransaction } from '@solana/web3.js';
+import { AddressLookupTableAccount, Transaction, TransactionInstruction, VersionedTransaction } from '@solana/web3.js';
 export declare const isVersionedTransaction: (tx: Transaction | VersionedTransaction) => boolean;
+export declare const getSizeOfTransaction: (instructions: TransactionInstruction[], versionedTransaction?: boolean, addressLookupTables?: AddressLookupTableAccount[]) => number;
+export declare const getCombinedInstructions: (baseInstructions: TransactionInstruction[], optionalInstructions?: TransactionInstruction[], versionedTransaction?: boolean, addressLookupTables?: AddressLookupTableAccount[]) => TransactionInstruction[];

package/lib/node/tx/utils.js

@@ -1,10 +1,82 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isVersionedTransaction = void 0;
+exports.getCombinedInstructions = exports.getSizeOfTransaction = exports.isVersionedTransaction = void 0;
 const web3_js_1 = require("@solana/web3.js");
+const MAX_SIZE = 1232;
 const isVersionedTransaction = (tx) => {
     const version = tx === null || tx === void 0 ? void 0 : tx.version;
     const isVersionedTx = tx instanceof web3_js_1.VersionedTransaction || version !== undefined;
     return isVersionedTx;
 };
 exports.isVersionedTransaction = isVersionedTransaction;
+const getSizeOfTransaction = (instructions, versionedTransaction = true, addressLookupTables = []) => {
+    const programs = new Set();
+    const signers = new Set();
+    let accounts = new Set();
+    instructions.forEach((ix) => {
+        try {
+            if (ix.programId) {
+                programs.add(ix.programId.toBase58());
+                accounts.add(ix.programId.toBase58());
+            }
+            if (ix.keys) {
+                ix.keys.forEach((key) => {
+                    if (key.isSigner) {
+                        signers.add(key.pubkey.toBase58());
+                    }
+                    accounts.add(key.pubkey.toBase58());
+                });
+            }
+        }
+        catch (e) {
+            console.log(e);
+        }
+    });
+    const instructionSizes = instructions
+        .map((ix) => 1 +
+        getSizeOfCompressedU16(ix.keys.length) +
+        ix.keys.length +
+        getSizeOfCompressedU16(ix.data.length) +
+        ix.data.length)
+        .reduce((a, b) => a + b, 0);
+    let numberOfAddressLookups = 0;
+    if (addressLookupTables.length > 0) {
+        const lookupTableAddresses = addressLookupTables
+            .map((addressLookupTable) => addressLookupTable.state.addresses.map((address) => address.toBase58()))
+            .flat();
+        const totalNumberOfAccounts = accounts.size;
+        accounts = new Set([...accounts].filter((account) => !lookupTableAddresses.includes(account)));
+        accounts = new Set([...accounts, ...programs, ...signers]);
+        numberOfAddressLookups = totalNumberOfAccounts - accounts.size;
+    }
+    return (getSizeOfCompressedU16(signers.size) +
+        signers.size * 64 + // array of signatures
+        3 +
+        getSizeOfCompressedU16(accounts.size) +
+        32 * accounts.size + // array of account addresses
+        32 + // recent blockhash
+        getSizeOfCompressedU16(instructions.length) +
+        instructionSizes + // array of instructions
+        (versionedTransaction ? 1 + getSizeOfCompressedU16(0) : 0) +
+        (versionedTransaction ? 32 * addressLookupTables.length : 0) +
+        (versionedTransaction && addressLookupTables.length > 0 ? 2 : 0) +
+        numberOfAddressLookups);
+};
+exports.getSizeOfTransaction = getSizeOfTransaction;
+const getCombinedInstructions = (baseInstructions, optionalInstructions = [], versionedTransaction = true, addressLookupTables = []) => {
+    if (optionalInstructions.length === 0) {
+        return baseInstructions;
+    }
+    let allInstructions = [...optionalInstructions, ...baseInstructions];
+    let txSize = (0, exports.getSizeOfTransaction)(allInstructions, versionedTransaction, addressLookupTables);
+    while (txSize > MAX_SIZE &&
+        allInstructions.length > baseInstructions.length) {
+        allInstructions = allInstructions.slice(1);
+        txSize = (0, exports.getSizeOfTransaction)(allInstructions, versionedTransaction, addressLookupTables);
+    }
+    return allInstructions;
+};
+exports.getCombinedInstructions = getCombinedInstructions;
+function getSizeOfCompressedU16(n) {
+    return 1 + Number(n >= 128) + Number(n >= 16384);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.108.0-beta.6",
+	"version": "2.108.0-beta.8",
 	"main": "lib/node/index.js",
 	"types": "lib/node/index.d.ts",
 	"browser": "./lib/browser/index.js",

package/src/driftClient.ts

@@ -3919,11 +3919,18 @@ export class DriftClient {
 	public async placeOrders(
 		params: OrderParams[],
 		txParams?: TxParams,
-		subAccountId?: number
+		subAccountId?: number,
+		optionalIxs?: TransactionInstruction[]
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
-			(await this.preparePlaceOrdersTx(params, txParams, subAccountId))
-				.placeOrdersTx,
+			(
+				await this.preparePlaceOrdersTx(
+					params,
+					txParams,
+					subAccountId,
+					optionalIxs
+				)
+			).placeOrdersTx,
 			[],
 			this.opts,
 			false
@@ -3934,11 +3941,19 @@ export class DriftClient {
 	public async preparePlaceOrdersTx(
 		params: OrderParams[],
 		txParams?: TxParams,
-		subAccountId?: number
+		subAccountId?: number,
+		optionalIxs?: TransactionInstruction[]
 	) {
+		const lookupTableAccount = await this.fetchMarketLookupTableAccount();
+
 		const tx = await this.buildTransaction(
 			await this.getPlaceOrdersIx(params, subAccountId),
-			txParams
+			txParams,
+			undefined,
+			[lookupTableAccount],
+			undefined,
+			undefined,
+			optionalIxs
 		);
 
 		return {
@@ -5494,7 +5509,8 @@ export class DriftClient {
 		cancelExistingOrders?: boolean,
 		settlePnl?: boolean,
 		exitEarlyIfSimFails?: boolean,
-		auctionDurationPercentage?: number
+		auctionDurationPercentage?: number,
+		optionalIxs?: TransactionInstruction[]
 	): Promise<{
 		placeAndTakeTx: Transaction | VersionedTransaction;
 		cancelExistingOrdersTx: Transaction | VersionedTransaction;
@@ -5514,6 +5530,8 @@ export class DriftClient {
 		const recentBlockHash =
 			await this.txHandler.getLatestBlockhashForTransaction();
 
+		const lookupTableAccount = await this.fetchMarketLookupTableAccount();
+
 		let earlyExitFailedPlaceAndTakeSim = false;
 
 		const prepPlaceAndTakeTx = async () => {
@@ -5550,9 +5568,10 @@ export class DriftClient {
 					placeAndTakeIxs,
 					txParams,
 					undefined,
-					undefined,
+					[lookupTableAccount],
 					true,
-					recentBlockHash
+					recentBlockHash,
+					optionalIxs
 				)) as VersionedTransaction;
 
 				const simulationResult =
@@ -5575,18 +5594,20 @@ export class DriftClient {
 						computeUnits: simulationResult.computeUnits,
 					},
 					undefined,
+					[lookupTableAccount],
 					undefined,
-					undefined,
-					recentBlockHash
+					recentBlockHash,
+					optionalIxs
 				);
 			} else {
 				txsToSign.placeAndTakeTx = await this.buildTransaction(
 					placeAndTakeIxs,
 					txParams,
 					undefined,
+					[lookupTableAccount],
 					undefined,
-					undefined,
-					recentBlockHash
+					recentBlockHash,
+					optionalIxs
 				);
 			}
 
@@ -5606,9 +5627,10 @@ export class DriftClient {
 					[cancelOrdersIx],
 					txParams,
 					this.txVersion,
+					[lookupTableAccount],
 					undefined,
-					undefined,
-					recentBlockHash
+					recentBlockHash,
+					optionalIxs
 				);
 			}
 
@@ -5631,9 +5653,10 @@ export class DriftClient {
 					[settlePnlIx],
 					txParams,
 					this.txVersion,
+					[lookupTableAccount],
 					undefined,
-					undefined,
-					recentBlockHash
+					recentBlockHash,
+					optionalIxs
 				);
 			}
 			return;
@@ -6818,8 +6841,11 @@ export class DriftClient {
 		settleeUserAccountPublicKey: PublicKey,
 		settleeUserAccount: UserAccount,
 		marketIndex: number,
-		txParams?: TxParams
+		txParams?: TxParams,
+		optionalIxs?: TransactionInstruction[]
 	): Promise<TransactionSignature> {
+		const lookupTableAccount = await this.fetchMarketLookupTableAccount();
+
 		const { txSig } = await this.sendTransaction(
 			await this.buildTransaction(
 				await this.settlePNLIx(
@@ -6827,7 +6853,12 @@ export class DriftClient {
 					settleeUserAccount,
 					marketIndex
 				),
-				txParams
+				txParams,
+				undefined,
+				[lookupTableAccount],
+				undefined,
+				undefined,
+				optionalIxs
 			),
 			[],
 			this.opts
@@ -8700,6 +8731,7 @@ export class DriftClient {
 			guardianSetIndex,
 			DEFAULT_WORMHOLE_PROGRAM_ID
 		);
+
 		const trimmedVaa = trimVaaSignatures(
 			accumulatorUpdateData.vaa,
 			numSignatures
@@ -9287,7 +9319,8 @@ export class DriftClient {
 		txVersion?: TransactionVersion,
 		lookupTables?: AddressLookupTableAccount[],
 		forceVersionedTransaction?: boolean,
-		recentBlockhash?: BlockhashWithExpiryBlockHeight
+		recentBlockhash?: BlockhashWithExpiryBlockHeight,
+		optionalIxs?: TransactionInstruction[]
 	): Promise<Transaction | VersionedTransaction> {
 		return this.txHandler.buildTransaction({
 			instructions,
@@ -9300,6 +9333,7 @@ export class DriftClient {
 			lookupTables,
 			forceVersionedTransaction,
 			recentBlockhash,
+			optionalIxs,
 		});
 	}
 

package/src/index.ts

@@ -87,6 +87,7 @@ export * from './oracles/pythClient';
 export * from './oracles/pythPullClient';
 export * from './oracles/pythLazerClient';
 export * from './oracles/switchboardOnDemandClient';
+export * from './oracles/oracleId';
 export * from './swift/swiftOrderSubscriber';
 export * from './tx/fastSingleTxSender';
 export * from './tx/retryTxSender';

package/src/math/oracles.ts

@@ -264,5 +264,33 @@ export function getMultipleBetweenOracleSources(
 		return { numerator: new BN(1), denominator: new BN(1000) };
 	}
 
+	if (
+		isVariant(firstOracleSource, 'pythLazer') &&
+		isVariant(secondOracleSource, 'pythLazer1M')
+	) {
+		return { numerator: new BN(1000000), denominator: new BN(1) };
+	}
+
+	if (
+		isVariant(firstOracleSource, 'pythLazer') &&
+		isVariant(secondOracleSource, 'pythLazer1K')
+	) {
+		return { numerator: new BN(1000), denominator: new BN(1) };
+	}
+
+	if (
+		isVariant(firstOracleSource, 'pythLazer1M') &&
+		isVariant(secondOracleSource, 'pythLazer')
+	) {
+		return { numerator: new BN(1), denominator: new BN(1000000) };
+	}
+
+	if (
+		isVariant(firstOracleSource, 'pythLazer1K') &&
+		isVariant(secondOracleSource, 'pythLazer')
+	) {
+		return { numerator: new BN(1), denominator: new BN(1000) };
+	}
+
 	return { numerator: new BN(1), denominator: new BN(1) };
 }

package/src/tx/txHandler.ts

@@ -28,7 +28,7 @@ import { containsComputeUnitIxs } from '../util/computeUnits';
 import { CachedBlockhashFetcher } from './blockhashFetcher/cachedBlockhashFetcher';
 import { BaseBlockhashFetcher } from './blockhashFetcher/baseBlockhashFetcher';
 import { BlockhashFetcher } from './blockhashFetcher/types';
-import { isVersionedTransaction } from './utils';
+import { getCombinedInstructions, isVersionedTransaction } from './utils';
 import { DEFAULT_CONFIRMATION_OPTS } from '../config';
 
 /**
@@ -57,6 +57,7 @@ export type TxBuildingProps = {
 	txParams?: TxParams;
 	recentBlockhash?: BlockhashWithExpiryBlockHeight;
 	wallet?: IWallet;
+	optionalIxs?: TransactionInstruction[]; // additional instructions to add to the front of ixs if there's enough room, such as oracle cranks
 };
 
 export type TxHandlerConfig = {
@@ -470,13 +471,13 @@ export class TxHandler {
 		props: TxBuildingProps
 	): Promise<Transaction | VersionedTransaction> {
 		const {
-			instructions,
 			txVersion,
 			txParams,
 			connection: _connection,
 			preFlightCommitment: _preFlightCommitment,
 			fetchMarketLookupTableAccount,
 			forceVersionedTransaction,
+			instructions,
 		} = props;
 
 		let { lookupTables } = props;
@@ -487,8 +488,29 @@ export class TxHandler {
 			computeUnitsPrice: txParams?.computeUnitsPrice,
 		};
 
+		const instructionsArray = Array.isArray(instructions)
+			? instructions
+			: [instructions];
+
+		let instructionsToUse: TransactionInstruction[];
+
+		// add optional ixs if there's room (usually oracle cranks)
+		if (props.optionalIxs && txVersion === 0) {
+			instructionsToUse = getCombinedInstructions(
+				instructionsArray,
+				props.optionalIxs,
+				txVersion === 0,
+				lookupTables
+			);
+		} else {
+			instructionsToUse = instructionsArray;
+		}
+
 		if (txParams?.useSimulatedComputeUnits) {
-			const processedTxParams = await this.getProcessedTransactionParams(props);
+			const processedTxParams = await this.getProcessedTransactionParams({
+				...props,
+				instructions: instructionsToUse,
+			});
 
 			baseTxParams = {
 				...baseTxParams,
@@ -496,11 +518,8 @@ export class TxHandler {
 			};
 		}
 
-		const instructionsArray = Array.isArray(instructions)
-			? instructions
-			: [instructions];
 		const { hasSetComputeUnitLimitIx, hasSetComputeUnitPriceIx } =
-			containsComputeUnitIxs(instructionsArray);
+			containsComputeUnitIxs(instructionsToUse);
 
 		// # Create Tx Instructions
 		const allIx = [];
@@ -529,7 +548,7 @@ export class TxHandler {
 			);
 		}
 
-		allIx.push(...instructionsArray);
+		allIx.push(...instructionsToUse);
 
 		const recentBlockhash =
 			props?.recentBlockhash ?? (await this.getLatestBlockhashForTransaction());

package/src/tx/utils.ts

@@ -1,4 +1,11 @@
-import { Transaction, VersionedTransaction } from '@solana/web3.js';
+import {
+	AddressLookupTableAccount,
+	Transaction,
+	TransactionInstruction,
+	VersionedTransaction,
+} from '@solana/web3.js';
+
+const MAX_SIZE = 1232;
 
 export const isVersionedTransaction = (
 	tx: Transaction | VersionedTransaction
@@ -9,3 +16,110 @@ export const isVersionedTransaction = (
 
 	return isVersionedTx;
 };
+
+export const getSizeOfTransaction = (
+	instructions: TransactionInstruction[],
+	versionedTransaction = true,
+	addressLookupTables: AddressLookupTableAccount[] = []
+): number => {
+	const programs = new Set<string>();
+	const signers = new Set<string>();
+	let accounts = new Set<string>();
+
+	instructions.forEach((ix) => {
+		try {
+			if (ix.programId) {
+				programs.add(ix.programId.toBase58());
+				accounts.add(ix.programId.toBase58());
+			}
+			if (ix.keys) {
+				ix.keys.forEach((key) => {
+					if (key.isSigner) {
+						signers.add(key.pubkey.toBase58());
+					}
+					accounts.add(key.pubkey.toBase58());
+				});
+			}
+		} catch (e) {
+			console.log(e);
+		}
+	});
+
+	const instructionSizes: number = instructions
+		.map(
+			(ix) =>
+				1 +
+				getSizeOfCompressedU16(ix.keys.length) +
+				ix.keys.length +
+				getSizeOfCompressedU16(ix.data.length) +
+				ix.data.length
+		)
+		.reduce((a, b) => a + b, 0);
+
+	let numberOfAddressLookups = 0;
+	if (addressLookupTables.length > 0) {
+		const lookupTableAddresses = addressLookupTables
+			.map((addressLookupTable) =>
+				addressLookupTable.state.addresses.map((address) => address.toBase58())
+			)
+			.flat();
+		const totalNumberOfAccounts = accounts.size;
+		accounts = new Set(
+			[...accounts].filter((account) => !lookupTableAddresses.includes(account))
+		);
+		accounts = new Set([...accounts, ...programs, ...signers]);
+		numberOfAddressLookups = totalNumberOfAccounts - accounts.size;
+	}
+
+	return (
+		getSizeOfCompressedU16(signers.size) +
+		signers.size * 64 + // array of signatures
+		3 +
+		getSizeOfCompressedU16(accounts.size) +
+		32 * accounts.size + // array of account addresses
+		32 + // recent blockhash
+		getSizeOfCompressedU16(instructions.length) +
+		instructionSizes + // array of instructions
+		(versionedTransaction ? 1 + getSizeOfCompressedU16(0) : 0) +
+		(versionedTransaction ? 32 * addressLookupTables.length : 0) +
+		(versionedTransaction && addressLookupTables.length > 0 ? 2 : 0) +
+		numberOfAddressLookups
+	);
+};
+
+export const getCombinedInstructions = (
+	baseInstructions: TransactionInstruction[],
+	optionalInstructions: TransactionInstruction[] = [],
+	versionedTransaction = true,
+	addressLookupTables: AddressLookupTableAccount[] = []
+): TransactionInstruction[] => {
+	if (optionalInstructions.length === 0) {
+		return baseInstructions;
+	}
+
+	let allInstructions = [...optionalInstructions, ...baseInstructions];
+
+	let txSize = getSizeOfTransaction(
+		allInstructions,
+		versionedTransaction,
+		addressLookupTables
+	);
+
+	while (
+		txSize > MAX_SIZE &&
+		allInstructions.length > baseInstructions.length
+	) {
+		allInstructions = allInstructions.slice(1);
+		txSize = getSizeOfTransaction(
+			allInstructions,
+			versionedTransaction,
+			addressLookupTables
+		);
+	}
+
+	return allInstructions;
+};
+
+function getSizeOfCompressedU16(n: number) {
+	return 1 + Number(n >= 128) + Number(n >= 16384);
+}