@drift-labs/sdk 2.83.0-beta.9 → 2.84.0-beta.1

package/VERSION

@@ -1 +1 @@
-2.83.0-beta.9
+2.84.0-beta.1

package/lib/adminClient.d.ts

@@ -7,10 +7,10 @@ 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, ifLiquidationFee?: number, activeStatus?: boolean, assetTier?: {
         collateral: {};
-    }, scaleInitialAssetWeightStart?: BN, withdrawGuardThreshold?: BN, orderTickSize?: BN, orderStepSize?: BN, ifTotalFactor?: number, name?: string): Promise<TransactionSignature>;
+    }, scaleInitialAssetWeightStart?: BN, withdrawGuardThreshold?: BN, orderTickSize?: BN, orderStepSize?: BN, ifTotalFactor?: number, name?: string, marketIndex?: number): Promise<TransactionSignature>;
     getInitializeSpotMarketIx(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<TransactionInstruction>;
+    }, scaleInitialAssetWeightStart?: BN, withdrawGuardThreshold?: BN, orderTickSize?: BN, orderStepSize?: BN, ifTotalFactor?: number, name?: string, marketIndex?: number): Promise<TransactionInstruction>;
     deleteInitializedSpotMarket(marketIndex: number): Promise<TransactionSignature>;
     getDeleteInitializedSpotMarketIx(marketIndex: number): Promise<TransactionInstruction>;
     initializeSerumFulfillmentConfig(marketIndex: number, serumMarket: PublicKey, serumProgram: PublicKey): Promise<TransactionSignature>;

package/lib/adminClient.js

@@ -61,12 +61,11 @@ 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, 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 initializeIx = await this.getInitializeSpotMarketIx(mint, optimalUtilization, optimalRate, maxRate, oracle, oracleSource, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor, liquidatorFee, ifLiquidationFee, activeStatus, assetTier, scaleInitialAssetWeightStart, withdrawGuardThreshold, orderTickSize, orderStepSize, ifTotalFactor, 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, marketIndex) {
+        const spotMarketIndex = marketIndex !== null && marketIndex !== void 0 ? marketIndex : this.getStateAccount().numberOfSpotMarkets;
+        const initializeIx = await this.getInitializeSpotMarketIx(mint, optimalUtilization, optimalRate, maxRate, oracle, oracleSource, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor, liquidatorFee, ifLiquidationFee, activeStatus, assetTier, scaleInitialAssetWeightStart, withdrawGuardThreshold, orderTickSize, orderStepSize, ifTotalFactor, name, marketIndex);
         const tx = await this.buildTransaction(initializeIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
-        // const { txSig } = await this.sendTransaction(initializeTx, [], this.opts);
         await this.accountSubscriber.addSpotMarket(spotMarketIndex);
         await this.accountSubscriber.addOracle({
             source: oracleSource,
@@ -75,8 +74,8 @@ class AdminClient extends driftClient_1.DriftClient {
         await this.accountSubscriber.setSpotOracleMap();
         return txSig;
     }
-    async getInitializeSpotMarketIx(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;
+    async getInitializeSpotMarketIx(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, marketIndex) {
+        const spotMarketIndex = marketIndex !== null && marketIndex !== void 0 ? marketIndex : 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);
@@ -184,7 +183,7 @@ class AdminClient extends driftClient_1.DriftClient {
         while (this.getStateAccount().numberOfMarkets <= currentPerpMarketIndex) {
             await this.fetchAccounts();
         }
-        await this.accountSubscriber.addPerpMarket(currentPerpMarketIndex);
+        await this.accountSubscriber.addPerpMarket(marketIndex);
         await this.accountSubscriber.addOracle({
             source: oracleSource,
             publicKey: priceOracle,
@@ -193,8 +192,7 @@ class AdminClient extends driftClient_1.DriftClient {
         return txSig;
     }
     async getInitializePerpMarketIx(marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION, oracleSource = types_1.OracleSource.PYTH, contractTier = types_1.ContractTier.SPECULATIVE, 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 perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, marketIndex);
         const nameBuffer = (0, userName_1.encodeName)(name);
         return await this.program.instruction.initializePerpMarket(marketIndex, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier, oracleSource, contractTier, marginRatioInitial, marginRatioMaintenance, liquidatorFee, ifLiquidatorFee, imfFactor, activeStatus, baseSpread, maxSpread, maxOpenInterest, maxRevenueWithdrawPerPeriod, quoteMaxInsurance, orderStepSize, orderTickSize, minOrderSize, concentrationCoefScale, curveUpdateIntensity, ammJitIntensity, nameBuffer, {
             accounts: {

package/lib/constants/perpMarkets.js

@@ -566,6 +566,26 @@ exports.MainnetPerpMarkets = [
         launchTs: 1716595200000,
         oracleSource: __1.OracleSource.SWITCHBOARD,
     },
+    {
+        fullName: 'Sanctum',
+        category: ['LST', 'Solana'],
+        symbol: 'CLOUD-PERP',
+        baseAssetSymbol: 'CLOUD',
+        marketIndex: 31,
+        oracle: new web3_js_1.PublicKey('C7UxgCodaEy4yqwTe3a4QXfsG7LnpMGGQdEqaxDae4b8'),
+        launchTs: 1717597648000,
+        oracleSource: __1.OracleSource.Prelaunch,
+    },
+    {
+        fullName: 'IO',
+        category: ['DePIN', 'Solana'],
+        symbol: 'IO-PERP',
+        baseAssetSymbol: 'IO',
+        marketIndex: 32,
+        oracle: new web3_js_1.PublicKey('5sAqMGidMtztNFdUukyguz6jMFS8DvTmSUr4p5u5zsSg'),
+        launchTs: 1718021389000,
+        oracleSource: __1.OracleSource.Prelaunch,
+    },
 ];
 exports.PerpMarkets = {
     devnet: exports.DevnetPerpMarkets,

package/lib/dlob/DLOB.d.ts

@@ -31,7 +31,7 @@ type OrderBookCallback = () => void;
  *  Receives a DLOBNode and is expected to return true if the node should
  *  be taken into account when generating, or false otherwise.
  *
- * Currently used in getRestingLimitBids and getRestingLimitAsks.
+ * Currently used in functions that rely on getBestNode
  */
 export type DLOBFilterFcn = (node: DLOBNode) => boolean;
 export type NodeToFill = {
@@ -79,13 +79,13 @@ export declare class DLOB {
     findNodesCrossingFallbackLiquidity(marketType: MarketType, slot: number, oraclePriceData: OraclePriceData, nodeGenerator: Generator<DLOBNode>, doesCross: (nodePrice: BN | undefined) => boolean, minAuctionDuration: number): NodeToFill[];
     findExpiredNodesToFill(marketIndex: number, ts: number, marketType: MarketType): NodeToFill[];
     findJitAuctionNodesToFill(marketIndex: number, slot: number, oraclePriceData: OraclePriceData, marketType: MarketType): NodeToFill[];
-    getTakingBids(marketIndex: number, marketType: MarketType, slot: number, oraclePriceData: OraclePriceData): Generator<DLOBNode>;
-    getTakingAsks(marketIndex: number, marketType: MarketType, slot: number, oraclePriceData: OraclePriceData): Generator<DLOBNode>;
+    getTakingBids(marketIndex: number, marketType: MarketType, slot: number, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
+    getTakingAsks(marketIndex: number, marketType: MarketType, slot: number, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
     private getBestNode;
     getRestingLimitAsks(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
     getRestingLimitBids(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
-    getAsks(marketIndex: number, fallbackAsk: BN | undefined, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData): Generator<DLOBNode>;
-    getBids(marketIndex: number, fallbackBid: BN | undefined, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData): Generator<DLOBNode>;
+    getAsks(marketIndex: number, fallbackAsk: BN | undefined, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
+    getBids(marketIndex: number, fallbackBid: BN | undefined, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
     findCrossingRestingLimitOrders(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData): NodeToFill[];
     determineMakerAndTaker(askNode: DLOBNode, bidNode: DLOBNode): {
         takerNode: DLOBNode;

package/lib/dlob/DLOB.js

@@ -565,7 +565,7 @@ class DLOB {
         }
         return nodesToFill;
     }
-    *getTakingBids(marketIndex, marketType, slot, oraclePriceData) {
+    *getTakingBids(marketIndex, marketType, slot, oraclePriceData, filterFcn) {
         const marketTypeStr = (0, __1.getVariant)(marketType);
         const orderLists = this.orderLists.get(marketTypeStr).get(marketIndex);
         if (!orderLists) {
@@ -578,9 +578,9 @@ class DLOB {
         ];
         yield* this.getBestNode(generatorList, oraclePriceData, slot, (bestNode, currentNode) => {
             return bestNode.order.slot.lt(currentNode.order.slot);
-        });
+        }, filterFcn);
     }
-    *getTakingAsks(marketIndex, marketType, slot, oraclePriceData) {
+    *getTakingAsks(marketIndex, marketType, slot, oraclePriceData, filterFcn) {
         const marketTypeStr = (0, __1.getVariant)(marketType);
         const orderLists = this.orderLists.get(marketTypeStr).get(marketIndex);
         if (!orderLists) {
@@ -593,7 +593,7 @@ class DLOB {
         ];
         yield* this.getBestNode(generatorList, oraclePriceData, slot, (bestNode, currentNode) => {
             return bestNode.order.slot.lt(currentNode.order.slot);
-        });
+        }, filterFcn);
     }
     *getBestNode(generatorList, oraclePriceData, slot, compareFcn, filterFcn) {
         const generators = generatorList.map((generator) => {
@@ -675,7 +675,7 @@ class DLOB {
                 .gt(currentNode.getPrice(oraclePriceData, slot));
         }, filterFcn);
     }
-    *getAsks(marketIndex, fallbackAsk, slot, marketType, oraclePriceData) {
+    *getAsks(marketIndex, fallbackAsk, slot, marketType, oraclePriceData, filterFcn) {
         if ((0, __1.isVariant)(marketType, 'spot') && !oraclePriceData) {
             throw new Error('Must provide OraclePriceData to get spot asks');
         }
@@ -706,9 +706,9 @@ class DLOB {
             return bestNode
                 .getPrice(oraclePriceData, slot)
                 .lt(currentNode.getPrice(oraclePriceData, slot));
-        });
+        }, filterFcn);
     }
-    *getBids(marketIndex, fallbackBid, slot, marketType, oraclePriceData) {
+    *getBids(marketIndex, fallbackBid, slot, marketType, oraclePriceData, filterFcn) {
         if ((0, __1.isVariant)(marketType, 'spot') && !oraclePriceData) {
             throw new Error('Must provide OraclePriceData to get spot bids');
         }
@@ -739,7 +739,7 @@ class DLOB {
             return bestNode
                 .getPrice(oraclePriceData, slot)
                 .gt(currentNode.getPrice(oraclePriceData, slot));
-        });
+        }, filterFcn);
     }
     findCrossingRestingLimitOrders(marketIndex, slot, marketType, oraclePriceData) {
         const nodesToFill = new Array();

package/lib/driftClient.d.ts

@@ -593,7 +593,7 @@ export declare class DriftClient {
         settleeUserAccount: UserAccount;
     }[], marketIndexes: number[], opts?: {
         filterInvalidMarkets?: boolean;
-    }): Promise<TransactionSignature>;
+    }, txParams?: TxParams): Promise<TransactionSignature>;
     getSettlePNLsIxs(users: {
         settleeUserAccountPublicKey: PublicKey;
         settleeUserAccount: UserAccount;
@@ -685,7 +685,7 @@ export declare class DriftClient {
     private handlePreSignedTransaction;
     private isVersionedTransaction;
     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): Promise<Transaction | VersionedTransaction>;
     buildBulkTransactions(instructions: (TransactionInstruction | TransactionInstruction[])[], txParams?: TxParams, txVersion?: TransactionVersion, lookupTables?: AddressLookupTableAccount[], forceVersionedTransaction?: boolean): Promise<(Transaction | VersionedTransaction)[]>;
     buildAndSignBulkTransactions(instructions: (TransactionInstruction | TransactionInstruction[])[], keys: string[], txParams?: TxParams, txVersion?: TransactionVersion, lookupTables?: AddressLookupTableAccount[], forceVersionedTransaction?: boolean): Promise<{
         [key: string]: anchor.web3.Transaction | anchor.web3.VersionedTransaction;

package/lib/driftClient.js

@@ -2949,7 +2949,7 @@ class DriftClient {
             remainingAccounts,
         });
     }
-    async settlePNLs(users, marketIndexes, opts) {
+    async settlePNLs(users, marketIndexes, opts, txParams) {
         const filterInvalidMarkets = opts === null || opts === void 0 ? void 0 : opts.filterInvalidMarkets;
         // # Filter market indexes by markets with valid oracle
         const marketIndexToSettle = filterInvalidMarkets
@@ -2969,7 +2969,7 @@ class DriftClient {
         }
         // # Settle filtered market indexes
         const ixs = await this.getSettlePNLsIxs(users, marketIndexToSettle);
-        const tx = await this.buildTransaction(ixs, {
+        const tx = await this.buildTransaction(ixs, txParams !== null && txParams !== void 0 ? txParams : {
             computeUnits: 1400000,
         });
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
@@ -3633,7 +3633,7 @@ class DriftClient {
             return this.txSender.send(tx, additionalSigners, opts, preSigned);
         }
     }
-    async buildTransaction(instructions, txParams, txVersion, lookupTables, forceVersionedTransaction, recentBlockHash) {
+    async buildTransaction(instructions, txParams, txVersion, lookupTables, forceVersionedTransaction, recentBlockhash) {
         return this.txHandler.buildTransaction({
             instructions,
             txVersion: txVersion !== null && txVersion !== void 0 ? txVersion : this.txVersion,
@@ -3643,7 +3643,7 @@ class DriftClient {
             fetchMarketLookupTableAccount: this.fetchMarketLookupTableAccount.bind(this),
             lookupTables,
             forceVersionedTransaction,
-            recentBlockHash,
+            recentBlockhash,
         });
     }
     async buildBulkTransactions(instructions, txParams, txVersion, lookupTables, forceVersionedTransaction) {

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.82.0",
+    "version": "2.83.0",
     "name": "drift",
     "instructions": [
         {

package/lib/math/auction.js

@@ -69,7 +69,7 @@ function getAuctionPriceForOracleOffsetAuction(order, slot, oraclePrice) {
     const deltaDenominator = new _1.BN(order.auctionDuration);
     const deltaNumerator = _1.BN.min(slotsElapsed, deltaDenominator);
     if (deltaDenominator.eq(_1.ZERO)) {
-        return oraclePrice.add(order.auctionEndPrice);
+        return _1.BN.max(oraclePrice.add(order.auctionEndPrice), _1.ONE);
     }
     let priceOffsetDelta;
     if ((0, types_1.isVariant)(order.direction, 'long')) {
@@ -91,7 +91,7 @@ function getAuctionPriceForOracleOffsetAuction(order, slot, oraclePrice) {
     else {
         priceOffset = order.auctionStartPrice.sub(priceOffsetDelta);
     }
-    return oraclePrice.add(priceOffset);
+    return _1.BN.max(oraclePrice.add(priceOffset), _1.ONE);
 }
 exports.getAuctionPriceForOracleOffsetAuction = getAuctionPriceForOracleOffsetAuction;
 function deriveOracleAuctionParams({ direction, oraclePrice, auctionStartPrice, auctionEndPrice, limitPrice, }) {

package/lib/math/orders.js

@@ -102,7 +102,7 @@ function getLimitPrice(order, oraclePriceData, slot, fallbackPrice) {
         limitPrice = (0, auction_1.getAuctionPrice)(order, slot, oraclePriceData.price);
     }
     else if (order.oraclePriceOffset !== 0) {
-        limitPrice = oraclePriceData.price.add(new anchor_1.BN(order.oraclePriceOffset));
+        limitPrice = anchor_1.BN.max(oraclePriceData.price.add(new anchor_1.BN(order.oraclePriceOffset)), numericConstants_1.ONE);
     }
     else if (order.price.eq(numericConstants_1.ZERO)) {
         limitPrice = fallbackPrice;

package/lib/tx/txHandler.d.ts

@@ -10,7 +10,7 @@ export type TxBuildingProps = {
     lookupTables?: AddressLookupTableAccount[];
     forceVersionedTransaction?: boolean;
     txParams?: TxParams;
-    recentBlockHash?: BlockhashWithExpiryBlockHeight;
+    recentBlockhash?: BlockhashWithExpiryBlockHeight;
     wallet?: IWallet;
 };
 /**
@@ -63,7 +63,7 @@ export declare class TxHandler {
     private getTxSigFromSignedTx;
     private getBlockhashFromSignedTx;
     private signTx;
-    signVersionedTx(tx: VersionedTransaction, additionalSigners: Array<Signer>, recentBlockHash?: BlockhashWithExpiryBlockHeight, wallet?: IWallet): Promise<VersionedTransaction>;
+    signVersionedTx(tx: VersionedTransaction, additionalSigners: Array<Signer>, recentBlockhash?: BlockhashWithExpiryBlockHeight, wallet?: IWallet): Promise<VersionedTransaction>;
     private handleSignedTxData;
     /**
      * Gets transaction params with extra processing applied, like using the simulated compute units or using a dynamically calculated compute unit price.
@@ -102,7 +102,7 @@ export declare class TxHandler {
      * @param commitment
      * @returns
      */
-    buildTransactionMap(txsToSign: (Transaction | undefined)[], keys: string[], wallet?: IWallet, commitment?: Commitment, recentBlockHash?: BlockhashWithExpiryBlockHeight): Promise<{
+    buildTransactionMap(txsToSign: (Transaction | undefined)[], keys: string[], wallet?: IWallet, commitment?: Commitment, recentBlockhash?: BlockhashWithExpiryBlockHeight): Promise<{
         [key: string]: Transaction | VersionedTransaction;
     }>;
     /**
@@ -113,7 +113,7 @@ export declare class TxHandler {
      * @param commitment
      * @returns
      */
-    getPreparedAndSignedLegacyTransactionMap(txsToSign: (Transaction | undefined)[], keys: string[], wallet?: IWallet, commitment?: Commitment, recentBlockHash?: BlockhashWithExpiryBlockHeight): Promise<{
+    getPreparedAndSignedLegacyTransactionMap(txsToSign: (Transaction | undefined)[], keys: string[], wallet?: IWallet, commitment?: Commitment, recentBlockhash?: BlockhashWithExpiryBlockHeight): Promise<{
         [key: string]: Transaction | VersionedTransaction;
     }>;
     /**

package/lib/tx/txHandler.js

@@ -8,6 +8,12 @@ const web3_js_1 = require("@solana/web3.js");
 const txParamProcessor_1 = require("./txParamProcessor");
 const bs58_1 = __importDefault(require("bs58"));
 const computeUnits_1 = require("../util/computeUnits");
+/**
+ * Explanation for SIGNATURE_BLOCK_AND_EXPIRY:
+ *
+ * When the whileValidTxSender waits for confirmation of a given transaction, it needs the last available blockheight and blockhash used in the signature to do so. For pre-signed transactions, these values aren't attached to the transaction object by default. For a "scrappy" workaround which doesn't break backwards compatibility, the SIGNATURE_BLOCK_AND_EXPIRY property is simply attached to the transaction objects as they are created or signed in this handler despite a mismatch in the typescript types. If the values are attached to the transaction when they reach the whileValidTxSender, it can opt-in to use these values.
+ */
+const DEV_TRY_FORCE_TX_TIMEOUTS = false;
 exports.COMPUTE_UNITS_DEFAULT = 200000;
 /**
  * This class is responsible for creating and signing transactions.
@@ -68,6 +74,8 @@ class TxHandler {
         tx.recentBlockhash = recentBlockhash.blockhash;
         this.addHashAndExpiryToLookup(recentBlockhash);
         const signedTx = await this.signTx(tx, additionalSigners);
+        // @ts-ignore
+        signedTx.SIGNATURE_BLOCK_AND_EXPIRY = recentBlockhash;
         return signedTx;
     }
     isVersionedTransaction(tx) {
@@ -110,12 +118,14 @@ class TxHandler {
         ]);
         return signedTx;
     }
-    async signVersionedTx(tx, additionalSigners, recentBlockHash, wallet) {
+    async signVersionedTx(tx, additionalSigners, recentBlockhash, wallet) {
         var _a;
         [wallet] = this.getProps(wallet);
-        if (recentBlockHash) {
-            tx.message.recentBlockhash = recentBlockHash.blockhash;
-            this.addHashAndExpiryToLookup(recentBlockHash);
+        if (recentBlockhash) {
+            tx.message.recentBlockhash = recentBlockhash.blockhash;
+            this.addHashAndExpiryToLookup(recentBlockhash);
+            // @ts-ignore
+            tx.SIGNATURE_BLOCK_AND_EXPIRY = recentBlockhash;
         }
         additionalSigners === null || additionalSigners === void 0 ? void 0 : additionalSigners.filter((s) => s !== undefined).forEach((kp) => {
             tx.sign([kp]);
@@ -186,8 +196,8 @@ class TxHandler {
         });
         return processedTxParams;
     }
-    _generateVersionedTransaction(recentBlockHash, message) {
-        this.addHashAndExpiryToLookup(recentBlockHash);
+    _generateVersionedTransaction(recentBlockhash, message) {
+        this.addHashAndExpiryToLookup(recentBlockhash);
         return new web3_js_1.VersionedTransaction(message);
     }
     generateLegacyVersionedTransaction(recentBlockhash, ixs, wallet) {
@@ -197,7 +207,10 @@ class TxHandler {
             recentBlockhash: recentBlockhash.blockhash,
             instructions: ixs,
         }).compileToLegacyMessage();
-        return this._generateVersionedTransaction(recentBlockhash, message);
+        const tx = this._generateVersionedTransaction(recentBlockhash, message);
+        // @ts-ignore
+        tx.SIGNATURE_BLOCK_AND_EXPIRY = recentBlockhash;
+        return tx;
     }
     generateVersionedTransaction(recentBlockhash, ixs, lookupTableAccounts, wallet) {
         [wallet] = this.getProps(wallet);
@@ -206,7 +219,10 @@ class TxHandler {
             recentBlockhash: recentBlockhash.blockhash,
             instructions: ixs,
         }).compileToV0Message(lookupTableAccounts);
-        return this._generateVersionedTransaction(recentBlockhash, message);
+        const tx = this._generateVersionedTransaction(recentBlockhash, message);
+        // @ts-ignore
+        tx.SIGNATURE_BLOCK_AND_EXPIRY = recentBlockhash;
+        return tx;
     }
     generateLegacyTransaction(ixs) {
         return new web3_js_1.Transaction().add(...ixs);
@@ -218,14 +234,14 @@ class TxHandler {
      */
     async buildBulkTransactions(props) {
         var _a;
-        const recentBlockHash = (_a = props === null || props === void 0 ? void 0 : props.recentBlockHash) !== null && _a !== void 0 ? _a : (await this.getLatestBlockhashForTransaction());
+        const recentBlockhash = (_a = props === null || props === void 0 ? void 0 : props.recentBlockhash) !== null && _a !== void 0 ? _a : (await this.getLatestBlockhashForTransaction());
         return await Promise.all(props.instructions.map((ix) => {
             if (!ix)
                 return undefined;
             return this.buildTransaction({
                 ...props,
                 instructions: ix,
-                recentBlockHash,
+                recentBlockhash,
             });
         }));
     }
@@ -267,17 +283,22 @@ class TxHandler {
             }));
         }
         const computeUnitsPrice = baseTxParams === null || baseTxParams === void 0 ? void 0 : baseTxParams.computeUnitsPrice;
-        if (computeUnitsPrice > 0 && !hasSetComputeUnitPriceIx) {
+        if (process.env.DEV_TRY_FORCE_TX_TIMEOUTS || DEV_TRY_FORCE_TX_TIMEOUTS) {
+            allIx.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+                microLamports: 0,
+            }));
+        }
+        else if (computeUnitsPrice > 0 && !hasSetComputeUnitPriceIx) {
             allIx.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
                 microLamports: computeUnitsPrice,
             }));
         }
         allIx.push(...instructionsArray);
-        const recentBlockHash = (_a = props === null || props === void 0 ? void 0 : props.recentBlockHash) !== null && _a !== void 0 ? _a : (await this.getLatestBlockhashForTransaction());
+        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') {
             if (forceVersionedTransaction) {
-                return this.generateLegacyVersionedTransaction(recentBlockHash, allIx);
+                return this.generateLegacyVersionedTransaction(recentBlockhash, allIx);
             }
             else {
                 return this.generateLegacyTransaction(allIx);
@@ -288,7 +309,7 @@ class TxHandler {
             lookupTables = lookupTables
                 ? [...lookupTables, marketLookupTable]
                 : [marketLookupTable];
-            return this.generateVersionedTransaction(recentBlockHash, allIx, lookupTables);
+            return this.generateVersionedTransaction(recentBlockhash, allIx, lookupTables);
         }
     }
     wrapInTx(instruction, computeUnits = 600000, computeUnitsPrice = 0) {
@@ -298,7 +319,12 @@ class TxHandler {
                 units: computeUnits,
             }));
         }
-        if (computeUnitsPrice != 0) {
+        if (process.env.DEV_TRY_FORCE_TX_TIMEOUTS || DEV_TRY_FORCE_TX_TIMEOUTS) {
+            tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+                microLamports: 0,
+            }));
+        }
+        else if (computeUnitsPrice != 0) {
             tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
                 microLamports: computeUnitsPrice,
             }));
@@ -313,17 +339,19 @@ class TxHandler {
      * @param commitment
      * @returns
      */
-    async buildTransactionMap(txsToSign, keys, wallet, commitment, recentBlockHash) {
+    async buildTransactionMap(txsToSign, keys, wallet, commitment, recentBlockhash) {
         var _a, _b;
-        recentBlockHash = recentBlockHash
-            ? recentBlockHash
+        recentBlockhash = recentBlockhash
+            ? recentBlockhash
             : await this.getLatestBlockhashForTransaction();
-        this.addHashAndExpiryToLookup(recentBlockHash);
+        this.addHashAndExpiryToLookup(recentBlockhash);
         for (const tx of txsToSign) {
             if (!tx)
                 continue;
-            tx.recentBlockhash = recentBlockHash.blockhash;
+            tx.recentBlockhash = recentBlockhash.blockhash;
             tx.feePayer = (_a = wallet === null || wallet === void 0 ? void 0 : wallet.publicKey) !== null && _a !== void 0 ? _a : (_b = this.wallet) === null || _b === void 0 ? void 0 : _b.publicKey;
+            // @ts-ignore
+            tx.SIGNATURE_BLOCK_AND_EXPIRY = recentBlockhash;
         }
         return this.getSignedTransactionMap(txsToSign, keys, wallet);
     }
@@ -335,17 +363,19 @@ class TxHandler {
      * @param commitment
      * @returns
      */
-    async getPreparedAndSignedLegacyTransactionMap(txsToSign, keys, wallet, commitment, recentBlockHash) {
+    async getPreparedAndSignedLegacyTransactionMap(txsToSign, keys, wallet, commitment, recentBlockhash) {
         var _a, _b;
-        recentBlockHash = recentBlockHash
-            ? recentBlockHash
+        recentBlockhash = recentBlockhash
+            ? recentBlockhash
             : await this.getLatestBlockhashForTransaction();
-        this.addHashAndExpiryToLookup(recentBlockHash);
+        this.addHashAndExpiryToLookup(recentBlockhash);
         for (const tx of txsToSign) {
             if (!tx)
                 continue;
-            tx.recentBlockhash = recentBlockHash.blockhash;
+            tx.recentBlockhash = recentBlockhash.blockhash;
             tx.feePayer = (_a = wallet === null || wallet === void 0 ? void 0 : wallet.publicKey) !== null && _a !== void 0 ? _a : (_b = this.wallet) === null || _b === void 0 ? void 0 : _b.publicKey;
+            // @ts-ignore
+            tx.SIGNATURE_BLOCK_AND_EXPIRY = recentBlockhash;
         }
         return this.getSignedTransactionMap(txsToSign, keys, wallet);
     }
@@ -370,11 +400,19 @@ class TxHandler {
             }
         });
         (_a = this.preSignedCb) === null || _a === void 0 ? void 0 : _a.call(this);
-        const signedTxs = await wallet.signAllTransactions(txsToSign
+        const filteredTxs = txsToSign
             .map((tx) => {
             return tx;
         })
-            .filter((tx) => tx !== undefined));
+            .filter((tx) => tx !== undefined);
+        const signedTxs = await wallet.signAllTransactions(filteredTxs);
+        signedTxs.forEach((signedTx, index) => {
+            var _a;
+            // @ts-ignore
+            signedTx.SIGNATURE_BLOCK_AND_EXPIRY =
+                // @ts-ignore
+                (_a = txsToSign[index]) === null || _a === void 0 ? void 0 : _a.SIGNATURE_BLOCK_AND_EXPIRY;
+        });
         this.handleSignedTxData(signedTxs.map((signedTx) => {
             return {
                 txSig: this.getTxSigFromSignedTx(signedTx),
@@ -394,9 +432,9 @@ class TxHandler {
      */
     async buildAndSignTransactionMap(props) {
         const transactions = await this.buildBulkTransactions(props);
-        const preppedTransactions = props.txVersion === 'legacy'
+        const preppedTransactions = await (props.txVersion === 'legacy'
             ? this.getPreparedAndSignedLegacyTransactionMap(transactions, props.keys, props.wallet, props.preFlightCommitment)
-            : this.getSignedTransactionMap(transactions, props.keys, props.wallet);
+            : this.getSignedTransactionMap(transactions, props.keys, props.wallet));
         return preppedTransactions;
     }
 }

package/lib/tx/whileValidTxSender.js

@@ -8,6 +8,7 @@ const anchor_1 = require("@coral-xyz/anchor");
 const baseTxSender_1 = require("./baseTxSender");
 const bs58_1 = __importDefault(require("bs58"));
 const DEFAULT_RETRY = 2000;
+const VALID_BLOCK_HEIGHT_OFFSET = -150; // This is a bit of weirdness but the lastValidBlockHeight value returned from connection.getLatestBlockhash is always 300 blocks ahead of the current block, even though the transaction actually expires after 150 blocks. This accounts for that so that we can at least accuractely estimate the transaction expiry.
 class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
     constructor({ connection, wallet, opts = { ...anchor_1.AnchorProvider.defaultOptions(), maxRetries: 0 }, retrySleep = DEFAULT_RETRY, additionalConnections = new Array(), additionalTxSenderCallbacks = [], blockhashCommitment = 'finalized', txHandler, }) {
         super({
@@ -37,16 +38,28 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
         if (!preSigned) {
             signedTx = await this.txHandler.prepareTx(tx, additionalSigners, undefined, opts, false, latestBlockhash);
         }
+        // See SIGNATURE_BLOCK_AND_EXPIRY explanation in txHandler.ts if this is confusing
+        // @ts-ignore
+        if (preSigned && tx.SIGNATURE_BLOCK_AND_EXPIRY) {
+            // @ts-ignore
+            latestBlockhash = tx.SIGNATURE_BLOCK_AND_EXPIRY;
+        }
         // handle subclass-specific side effects
         const txSig = bs58_1.default.encode(((_a = signedTx.signatures[0]) === null || _a === void 0 ? void 0 : _a.signature) || signedTx.signatures[0]);
         this.untilValid.set(txSig, latestBlockhash);
         return signedTx;
     }
     async sendVersionedTransaction(tx, additionalSigners, opts, preSigned) {
-        const latestBlockhash = await this.txHandler.getLatestBlockhashForTransaction();
+        let latestBlockhash = await this.txHandler.getLatestBlockhashForTransaction();
         let signedTx;
         if (preSigned) {
             signedTx = tx;
+            // See SIGNATURE_BLOCK_AND_EXPIRY explanation in txHandler.ts if this is confusing
+            // @ts-ignore
+            if (tx.SIGNATURE_BLOCK_AND_EXPIRY) {
+                // @ts-ignore
+                latestBlockhash = tx.SIGNATURE_BLOCK_AND_EXPIRY;
+            }
             // @ts-ignore
         }
         else if (this.wallet.payer) {
@@ -102,7 +115,7 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
             const { blockhash, lastValidBlockHeight } = this.untilValid.get(txid);
             const result = await this.connection.confirmTransaction({
                 signature: txid,
-                lastValidBlockHeight,
+                lastValidBlockHeight: lastValidBlockHeight + VALID_BLOCK_HEIGHT_OFFSET,
                 blockhash,
             }, opts.commitment);
             await this.checkConfirmationResultForError(txid, result);

package/lib/userMap/userMap.d.ts

@@ -29,6 +29,7 @@ export declare class UserMap implements UserMapInterface {
     private stateAccountUpdateCallback;
     private decode;
     private mostRecentSlot;
+    private syncConfig;
     private syncPromise?;
     private syncPromiseResolver;
     /**
@@ -78,6 +79,8 @@ export declare class UserMap implements UserMapInterface {
      */
     getUniqueAuthorities(filterCriteria?: UserFilterCriteria): PublicKey[];
     sync(): Promise<void>;
+    private defaultSync;
+    private paginatedSync;
     unsubscribe(): Promise<void>;
     updateUserAccount(key: string, userAccount: UserAccount, slot: number): Promise<void>;
     updateLatestSlot(slot: number): void;