@drift-labs/sdk 2.84.0-beta.0 → 2.84.0-beta.2

package/VERSION

@@ -1 +1 @@
-2.84.0-beta.0
+2.84.0-beta.2

package/lib/constants/perpMarkets.js

@@ -576,6 +576,16 @@ exports.MainnetPerpMarkets = [
         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/driftClient.d.ts

@@ -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

@@ -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

@@ -9208,7 +9208,7 @@
                         "name": "Standard",
                         "fields": [
                             {
-                                "name": "track_open_orders_fraction",
+                                "name": "trackOpenOrdersFraction",
                                 "type": "bool"
                             }
                         ]
@@ -9217,7 +9217,7 @@
                         "name": "Liquidation",
                         "fields": [
                             {
-                                "name": "market_to_track_margin_requirement",
+                                "name": "marketToTrackMarginRequirement",
                                 "type": {
                                     "option": {
                                         "defined": "MarketIdentifier"

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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.84.0-beta.0",
+	"version": "2.84.0-beta.2",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -34,7 +34,7 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@coral-xyz/anchor": "0.28.1-beta.2",
+		"@coral-xyz/anchor": "0.29.0",
 		"@ellipsis-labs/phoenix-sdk": "^1.4.2",
 		"@project-serum/serum": "^0.13.38",
 		"@pythnetwork/client": "2.5.3",

package/src/constants/perpMarkets.ts

@@ -587,6 +587,16 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1717597648000,
 		oracleSource: OracleSource.Prelaunch,
 	},
+	{
+		fullName: 'IO',
+		category: ['DePIN', 'Solana'],
+		symbol: 'IO-PERP',
+		baseAssetSymbol: 'IO',
+		marketIndex: 32,
+		oracle: new PublicKey('5sAqMGidMtztNFdUukyguz6jMFS8DvTmSUr4p5u5zsSg'),
+		launchTs: 1718021389000,
+		oracleSource: OracleSource.Prelaunch,
+	},
 ];
 
 export const PerpMarkets: { [key in DriftEnv]: PerpMarketConfig[] } = {

package/src/driftClient.ts

@@ -6778,7 +6778,7 @@ export class DriftClient {
 		txVersion?: TransactionVersion,
 		lookupTables?: AddressLookupTableAccount[],
 		forceVersionedTransaction?: boolean,
-		recentBlockHash?: BlockhashWithExpiryBlockHeight
+		recentBlockhash?: BlockhashWithExpiryBlockHeight
 	): Promise<Transaction | VersionedTransaction> {
 		return this.txHandler.buildTransaction({
 			instructions,
@@ -6790,7 +6790,7 @@ export class DriftClient {
 				this.fetchMarketLookupTableAccount.bind(this),
 			lookupTables,
 			forceVersionedTransaction,
-			recentBlockHash,
+			recentBlockhash,
 		});
 	}
 

package/src/idl/drift.json

@@ -9208,7 +9208,7 @@
             "name": "Standard",
             "fields": [
               {
-                "name": "track_open_orders_fraction",
+                "name": "trackOpenOrdersFraction",
                 "type": "bool"
               }
             ]
@@ -9217,7 +9217,7 @@
             "name": "Liquidation",
             "fields": [
               {
-                "name": "market_to_track_margin_requirement",
+                "name": "marketToTrackMarginRequirement",
                 "type": {
                   "option": {
                     "defined": "MarketIdentifier"

package/src/tx/txHandler.ts

@@ -25,6 +25,14 @@ import {
 } from '../types';
 import { containsComputeUnitIxs } from '../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;
+
 export const COMPUTE_UNITS_DEFAULT = 200_000;
 
 export type TxBuildingProps = {
@@ -36,7 +44,7 @@ export type TxBuildingProps = {
 	lookupTables?: AddressLookupTableAccount[];
 	forceVersionedTransaction?: boolean;
 	txParams?: TxParams;
-	recentBlockHash?: BlockhashWithExpiryBlockHeight;
+	recentBlockhash?: BlockhashWithExpiryBlockHeight;
 	wallet?: IWallet;
 };
 
@@ -139,6 +147,9 @@ export class TxHandler {
 
 		const signedTx = await this.signTx(tx, additionalSigners);
 
+		// @ts-ignore
+		signedTx.SIGNATURE_BLOCK_AND_EXPIRY = recentBlockhash;
+
 		return signedTx;
 	}
 
@@ -202,15 +213,18 @@ export class TxHandler {
 	public async signVersionedTx(
 		tx: VersionedTransaction,
 		additionalSigners: Array<Signer>,
-		recentBlockHash?: BlockhashWithExpiryBlockHeight,
+		recentBlockhash?: BlockhashWithExpiryBlockHeight,
 		wallet?: IWallet
 	): Promise<VersionedTransaction> {
 		[wallet] = this.getProps(wallet);
 
-		if (recentBlockHash) {
-			tx.message.recentBlockhash = recentBlockHash.blockhash;
+		if (recentBlockhash) {
+			tx.message.recentBlockhash = recentBlockhash.blockhash;
 
-			this.addHashAndExpiryToLookup(recentBlockHash);
+			this.addHashAndExpiryToLookup(recentBlockhash);
+
+			// @ts-ignore
+			tx.SIGNATURE_BLOCK_AND_EXPIRY = recentBlockhash;
 		}
 
 		additionalSigners
@@ -305,10 +319,10 @@ export class TxHandler {
 	}
 
 	private _generateVersionedTransaction(
-		recentBlockHash: BlockhashWithExpiryBlockHeight,
+		recentBlockhash: BlockhashWithExpiryBlockHeight,
 		message: Message | MessageV0
 	) {
-		this.addHashAndExpiryToLookup(recentBlockHash);
+		this.addHashAndExpiryToLookup(recentBlockhash);
 
 		return new VersionedTransaction(message);
 	}
@@ -326,7 +340,12 @@ export class TxHandler {
 			instructions: ixs,
 		}).compileToLegacyMessage();
 
-		return this._generateVersionedTransaction(recentBlockhash, message);
+		const tx = this._generateVersionedTransaction(recentBlockhash, message);
+
+		// @ts-ignore
+		tx.SIGNATURE_BLOCK_AND_EXPIRY = recentBlockhash;
+
+		return tx;
 	}
 
 	public generateVersionedTransaction(
@@ -343,7 +362,12 @@ export class TxHandler {
 			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;
 	}
 
 	public generateLegacyTransaction(ixs: TransactionInstruction[]) {
@@ -360,8 +384,8 @@ export class TxHandler {
 			instructions: (TransactionInstruction | TransactionInstruction[])[];
 		}
 	) {
-		const recentBlockHash =
-			props?.recentBlockHash ?? (await this.getLatestBlockhashForTransaction());
+		const recentBlockhash =
+			props?.recentBlockhash ?? (await this.getLatestBlockhashForTransaction());
 
 		return await Promise.all(
 			props.instructions.map((ix) => {
@@ -369,7 +393,7 @@ export class TxHandler {
 				return this.buildTransaction({
 					...props,
 					instructions: ix,
-					recentBlockHash,
+					recentBlockhash,
 				});
 			})
 		);
@@ -433,7 +457,13 @@ export class TxHandler {
 
 		const computeUnitsPrice = baseTxParams?.computeUnitsPrice;
 
-		if (computeUnitsPrice > 0 && !hasSetComputeUnitPriceIx) {
+		if (process.env.DEV_TRY_FORCE_TX_TIMEOUTS || DEV_TRY_FORCE_TX_TIMEOUTS) {
+			allIx.push(
+				ComputeBudgetProgram.setComputeUnitPrice({
+					microLamports: 0,
+				})
+			);
+		} else if (computeUnitsPrice > 0 && !hasSetComputeUnitPriceIx) {
 			allIx.push(
 				ComputeBudgetProgram.setComputeUnitPrice({
 					microLamports: computeUnitsPrice,
@@ -443,13 +473,13 @@ export class TxHandler {
 
 		allIx.push(...instructionsArray);
 
-		const recentBlockHash =
-			props?.recentBlockHash ?? (await this.getLatestBlockhashForTransaction());
+		const recentBlockhash =
+			props?.recentBlockhash ?? (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);
 			}
@@ -461,7 +491,7 @@ export class TxHandler {
 				: [marketLookupTable];
 
 			return this.generateVersionedTransaction(
-				recentBlockHash,
+				recentBlockhash,
 				allIx,
 				lookupTables
 			);
@@ -482,7 +512,13 @@ export class TxHandler {
 			);
 		}
 
-		if (computeUnitsPrice != 0) {
+		if (process.env.DEV_TRY_FORCE_TX_TIMEOUTS || DEV_TRY_FORCE_TX_TIMEOUTS) {
+			tx.add(
+				ComputeBudgetProgram.setComputeUnitPrice({
+					microLamports: 0,
+				})
+			);
+		} else if (computeUnitsPrice != 0) {
 			tx.add(
 				ComputeBudgetProgram.setComputeUnitPrice({
 					microLamports: computeUnitsPrice,
@@ -506,18 +542,21 @@ export class TxHandler {
 		keys: string[],
 		wallet?: IWallet,
 		commitment?: Commitment,
-		recentBlockHash?: BlockhashWithExpiryBlockHeight
+		recentBlockhash?: BlockhashWithExpiryBlockHeight
 	) {
-		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 = wallet?.publicKey ?? this.wallet?.publicKey;
+
+			// @ts-ignore
+			tx.SIGNATURE_BLOCK_AND_EXPIRY = recentBlockhash;
 		}
 
 		return this.getSignedTransactionMap(txsToSign, keys, wallet);
@@ -536,18 +575,21 @@ export class TxHandler {
 		keys: string[],
 		wallet?: IWallet,
 		commitment?: Commitment,
-		recentBlockHash?: BlockhashWithExpiryBlockHeight
+		recentBlockhash?: BlockhashWithExpiryBlockHeight
 	) {
-		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 = wallet?.publicKey ?? this.wallet?.publicKey;
+
+			// @ts-ignore
+			tx.SIGNATURE_BLOCK_AND_EXPIRY = recentBlockhash;
 		}
 
 		return this.getSignedTransactionMap(txsToSign, keys, wallet);
@@ -584,13 +626,20 @@ export class TxHandler {
 
 		this.preSignedCb?.();
 
-		const signedTxs = await wallet.signAllTransactions(
-			txsToSign
-				.map((tx) => {
-					return tx as Transaction;
-				})
-				.filter((tx) => tx !== undefined)
-		);
+		const filteredTxs = txsToSign
+			.map((tx) => {
+				return tx as Transaction;
+			})
+			.filter((tx) => tx !== undefined);
+
+		const signedTxs = await wallet.signAllTransactions(filteredTxs);
+
+		signedTxs.forEach((signedTx, index) => {
+			// @ts-ignore
+			signedTx.SIGNATURE_BLOCK_AND_EXPIRY =
+				// @ts-ignore
+				txsToSign[index]?.SIGNATURE_BLOCK_AND_EXPIRY;
+		});
 
 		this.handleSignedTxData(
 			signedTxs.map((signedTx) => {
@@ -622,15 +671,14 @@ export class TxHandler {
 	) {
 		const transactions = await this.buildBulkTransactions(props);
 
-		const preppedTransactions =
-			props.txVersion === 'legacy'
-				? this.getPreparedAndSignedLegacyTransactionMap(
-						transactions as Transaction[],
-						props.keys,
-						props.wallet,
-						props.preFlightCommitment
-				  )
-				: this.getSignedTransactionMap(transactions, props.keys, props.wallet);
+		const preppedTransactions = await (props.txVersion === 'legacy'
+			? this.getPreparedAndSignedLegacyTransactionMap(
+					transactions as Transaction[],
+					props.keys,
+					props.wallet,
+					props.preFlightCommitment
+			  )
+			: this.getSignedTransactionMap(transactions, props.keys, props.wallet));
 
 		return preppedTransactions;
 	}

package/src/tx/whileValidTxSender.ts

@@ -15,6 +15,8 @@ import { IWallet } from '../types';
 
 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.
+
 type ResolveReference = {
 	resolve?: () => void;
 };
@@ -93,6 +95,13 @@ export class WhileValidTxSender extends BaseTxSender {
 			);
 		}
 
+		// 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.encode(
 			signedTx.signatures[0]?.signature || signedTx.signatures[0]
@@ -108,12 +117,20 @@ export class WhileValidTxSender extends BaseTxSender {
 		opts?: ConfirmOptions,
 		preSigned?: boolean
 	): Promise<TxSigAndSlot> {
-		const latestBlockhash =
+		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) {
 			tx.message.recentBlockhash = latestBlockhash.blockhash;
@@ -185,7 +202,8 @@ export class WhileValidTxSender extends BaseTxSender {
 			const result = await this.connection.confirmTransaction(
 				{
 					signature: txid,
-					lastValidBlockHeight,
+					lastValidBlockHeight:
+						lastValidBlockHeight + VALID_BLOCK_HEIGHT_OFFSET,
 					blockhash,
 				},
 				opts.commitment