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

package/lib/tx/baseTxSender.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { TxSender, TxSigAndSlot } from './types';
+import { ConfirmationStrategy, TxSender, TxSigAndSlot } from './types';
 import { Commitment, ConfirmOptions, RpcResponseAndContext, Signer, SignatureResult, Transaction, TransactionSignature, Connection, VersionedTransaction, TransactionInstruction, AddressLookupTableAccount } from '@solana/web3.js';
 import { IWallet } from '../types';
 export declare abstract class BaseTxSender implements TxSender {
@@ -9,18 +9,22 @@ export declare abstract class BaseTxSender implements TxSender {
     timeout: number;
     additionalConnections: Connection[];
     timeoutCount: number;
-    constructor({ connection, wallet, opts, timeout, additionalConnections, }: {
+    confirmationStrategy: ConfirmationStrategy;
+    constructor({ connection, wallet, opts, timeout, additionalConnections, confirmationStrategy, }: {
         connection: Connection;
         wallet: IWallet;
         opts?: ConfirmOptions;
         timeout?: number;
         additionalConnections?: any;
+        confirmationStrategy?: ConfirmationStrategy;
     });
     send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     prepareTx(tx: Transaction, additionalSigners: Array<Signer>, opts: ConfirmOptions): Promise<Transaction>;
     getVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<VersionedTransaction>;
     sendVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;
+    confirmTransactionWebSocket(signature: TransactionSignature, commitment?: Commitment): Promise<RpcResponseAndContext<SignatureResult>>;
+    confirmTransactionPolling(signature: TransactionSignature, commitment?: Commitment): Promise<RpcResponseAndContext<SignatureResult> | undefined>;
     confirmTransaction(signature: TransactionSignature, commitment?: Commitment): Promise<RpcResponseAndContext<SignatureResult>>;
     getTimestamp(): number;
     promiseTimeout<T>(promises: Promise<T>[], timeoutMs: number): Promise<T | null>;

package/lib/tx/baseTxSender.js

@@ -4,19 +4,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseTxSender = void 0;
+const types_1 = require("./types");
 const web3_js_1 = require("@solana/web3.js");
 const anchor_1 = require("@coral-xyz/anchor");
 const assert_1 = __importDefault(require("assert"));
 const bs58_1 = __importDefault(require("bs58"));
 const DEFAULT_TIMEOUT = 35000;
 class BaseTxSender {
-    constructor({ connection, wallet, opts = anchor_1.AnchorProvider.defaultOptions(), timeout = DEFAULT_TIMEOUT, additionalConnections = new Array(), }) {
+    constructor({ connection, wallet, opts = anchor_1.AnchorProvider.defaultOptions(), timeout = DEFAULT_TIMEOUT, additionalConnections = new Array(), confirmationStrategy = types_1.ConfirmationStrategy.Combo, }) {
         this.timeoutCount = 0;
         this.connection = connection;
         this.wallet = wallet;
         this.opts = opts;
         this.timeout = timeout;
         this.additionalConnections = additionalConnections;
+        this.confirmationStrategy = confirmationStrategy;
     }
     async send(tx, additionalSigners, opts, preSigned) {
         if (additionalSigners === undefined) {
@@ -86,7 +88,8 @@ class BaseTxSender {
     opts) {
         throw new Error('Must be implemented by subclass');
     }
-    async confirmTransaction(signature, commitment) {
+    async confirmTransactionWebSocket(signature, commitment) {
+        var _a;
         let decodedSignature;
         try {
             decodedSignature = bs58_1.default.decode(signature);
@@ -131,12 +134,54 @@ class BaseTxSender {
             }
         }
         if (response === null) {
+            if (this.confirmationStrategy === types_1.ConfirmationStrategy.Combo) {
+                try {
+                    const rpcResponse = await this.connection.getSignatureStatus(signature);
+                    if ((_a = rpcResponse === null || rpcResponse === void 0 ? void 0 : rpcResponse.value) === null || _a === void 0 ? void 0 : _a.confirmationStatus) {
+                        response = {
+                            context: rpcResponse.context,
+                            value: { err: rpcResponse.value.err },
+                        };
+                        return response;
+                    }
+                }
+                catch (error) {
+                    // Ignore error to pass through to timeout error
+                }
+            }
             this.timeoutCount += 1;
             const duration = (Date.now() - start) / 1000;
             throw new Error(`Transaction was not confirmed in ${duration.toFixed(2)} seconds. It is unknown if it succeeded or failed. Check signature ${signature} using the Solana Explorer or CLI tools.`);
         }
         return response;
     }
+    async confirmTransactionPolling(signature, commitment = 'finalized') {
+        var _a;
+        let totalTime = 0;
+        let backoffTime = 400; // approx block time
+        while (totalTime < this.timeout) {
+            await new Promise((resolve) => setTimeout(resolve, backoffTime));
+            const response = await this.connection.getSignatureStatus(signature);
+            const result = response && ((_a = response.value) === null || _a === void 0 ? void 0 : _a[0]);
+            if (result && result.confirmationStatus === commitment) {
+                return { context: result.context, value: { err: null } };
+            }
+            totalTime += backoffTime;
+            backoffTime = Math.min(backoffTime * 2, 5000);
+        }
+        // Transaction not confirmed within 30 seconds
+        this.timeoutCount += 1;
+        throw new Error(`Transaction was not confirmed in 30 seconds. It is unknown if it succeeded or failed. Check signature ${signature} using the Solana Explorer or CLI tools.`);
+    }
+    async confirmTransaction(signature, commitment) {
+        if (this.confirmationStrategy === types_1.ConfirmationStrategy.WebSocket ||
+            this.confirmationStrategy === types_1.ConfirmationStrategy.Combo) {
+            return await this.confirmTransactionWebSocket(signature, commitment);
+        }
+        else if (this.confirmationStrategy === types_1.ConfirmationStrategy.Polling) {
+            return await this.confirmTransactionPolling(signature, commitment);
+        }
+    }
     getTimestamp() {
         return new Date().getTime();
     }

package/lib/tx/fastSingleTxSender.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { TxSigAndSlot } from './types';
+import { ConfirmationStrategy, TxSigAndSlot } from './types';
 import { ConfirmOptions, Signer, Transaction, Connection, VersionedTransaction, TransactionInstruction, AddressLookupTableAccount, Commitment } from '@solana/web3.js';
 import { IWallet } from '../types';
 import { BaseTxSender } from './baseTxSender';
@@ -14,7 +14,7 @@ export declare class FastSingleTxSender extends BaseTxSender {
     recentBlockhash: string;
     skipConfirmation: boolean;
     blockhashCommitment: Commitment;
-    constructor({ connection, wallet, opts, timeout, blockhashRefreshInterval, additionalConnections, skipConfirmation, blockhashCommitment, }: {
+    constructor({ connection, wallet, opts, timeout, blockhashRefreshInterval, additionalConnections, skipConfirmation, blockhashCommitment, confirmationStrategy, }: {
         connection: Connection;
         wallet: IWallet;
         opts?: ConfirmOptions;
@@ -23,6 +23,7 @@ export declare class FastSingleTxSender extends BaseTxSender {
         additionalConnections?: any;
         skipConfirmation?: boolean;
         blockhashCommitment?: Commitment;
+        confirmationStrategy?: ConfirmationStrategy;
     });
     startBlockhashRefreshLoop(): void;
     prepareTx(tx: Transaction, additionalSigners: Array<Signer>, _opts: ConfirmOptions): Promise<Transaction>;

package/lib/tx/fastSingleTxSender.js

@@ -1,14 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FastSingleTxSender = void 0;
+const types_1 = require("./types");
 const web3_js_1 = require("@solana/web3.js");
 const anchor_1 = require("@coral-xyz/anchor");
 const baseTxSender_1 = require("./baseTxSender");
 const DEFAULT_TIMEOUT = 35000;
 const DEFAULT_BLOCKHASH_REFRESH = 10000;
 class FastSingleTxSender extends baseTxSender_1.BaseTxSender {
-    constructor({ connection, wallet, opts = anchor_1.AnchorProvider.defaultOptions(), timeout = DEFAULT_TIMEOUT, blockhashRefreshInterval = DEFAULT_BLOCKHASH_REFRESH, additionalConnections = new Array(), skipConfirmation = false, blockhashCommitment = 'finalized', }) {
-        super({ connection, wallet, opts, timeout, additionalConnections });
+    constructor({ connection, wallet, opts = anchor_1.AnchorProvider.defaultOptions(), timeout = DEFAULT_TIMEOUT, blockhashRefreshInterval = DEFAULT_BLOCKHASH_REFRESH, additionalConnections = new Array(), skipConfirmation = false, blockhashCommitment = 'finalized', confirmationStrategy = types_1.ConfirmationStrategy.Combo, }) {
+        super({
+            connection,
+            wallet,
+            opts,
+            timeout,
+            additionalConnections,
+            confirmationStrategy,
+        });
         this.timoutCount = 0;
         this.connection = connection;
         this.wallet = wallet;

package/lib/tx/retryTxSender.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { TxSigAndSlot } from './types';
+import { ConfirmationStrategy, TxSigAndSlot } from './types';
 import { ConfirmOptions, Connection } from '@solana/web3.js';
 import { IWallet } from '../types';
 import { BaseTxSender } from './baseTxSender';
@@ -14,13 +14,14 @@ export declare class RetryTxSender extends BaseTxSender {
     retrySleep: number;
     additionalConnections: Connection[];
     timoutCount: number;
-    constructor({ connection, wallet, opts, timeout, retrySleep, additionalConnections, }: {
+    constructor({ connection, wallet, opts, timeout, retrySleep, additionalConnections, confirmationStrategy, }: {
         connection: Connection;
         wallet: IWallet;
         opts?: ConfirmOptions;
         timeout?: number;
         retrySleep?: number;
         additionalConnections?: any;
+        confirmationStrategy?: ConfirmationStrategy;
     });
     sleep(reference: ResolveReference): Promise<void>;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;

package/lib/tx/retryTxSender.js

@@ -1,13 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RetryTxSender = void 0;
+const types_1 = require("./types");
 const anchor_1 = require("@coral-xyz/anchor");
 const baseTxSender_1 = require("./baseTxSender");
 const DEFAULT_TIMEOUT = 35000;
 const DEFAULT_RETRY = 8000;
 class RetryTxSender extends baseTxSender_1.BaseTxSender {
-    constructor({ connection, wallet, opts = anchor_1.AnchorProvider.defaultOptions(), timeout = DEFAULT_TIMEOUT, retrySleep = DEFAULT_RETRY, additionalConnections = new Array(), }) {
-        super({ connection, wallet, opts, timeout, additionalConnections });
+    constructor({ connection, wallet, opts = anchor_1.AnchorProvider.defaultOptions(), timeout = DEFAULT_TIMEOUT, retrySleep = DEFAULT_RETRY, additionalConnections = new Array(), confirmationStrategy = types_1.ConfirmationStrategy.Combo, }) {
+        super({
+            connection,
+            wallet,
+            opts,
+            timeout,
+            additionalConnections,
+            confirmationStrategy,
+        });
         this.timoutCount = 0;
         this.connection = connection;
         this.wallet = wallet;
@@ -24,15 +32,8 @@ class RetryTxSender extends baseTxSender_1.BaseTxSender {
     }
     async sendRawTransaction(rawTransaction, opts) {
         const startTime = this.getTimestamp();
-        let txid;
-        try {
-            txid = await this.connection.sendRawTransaction(rawTransaction, opts);
-            this.sendToAdditionalConnections(rawTransaction, opts);
-        }
-        catch (e) {
-            console.error(e);
-            throw e;
-        }
+        const txid = await this.connection.sendRawTransaction(rawTransaction, opts);
+        this.sendToAdditionalConnections(rawTransaction, opts);
         let done = false;
         const resolveReference = {
             resolve: undefined,
@@ -57,18 +58,8 @@ class RetryTxSender extends baseTxSender_1.BaseTxSender {
                 }
             }
         })();
-        let slot;
-        try {
-            const result = await this.confirmTransaction(txid, opts.commitment);
-            slot = result.context.slot;
-        }
-        catch (e) {
-            console.error(e);
-            throw e;
-        }
-        finally {
-            stopWaiting();
-        }
+        const result = await this.confirmTransaction(txid, opts.commitment);
+        const slot = result.context.slot;
         return { txSig: txid, slot };
     }
 }

package/lib/tx/types.d.ts

@@ -1,6 +1,11 @@
 /// <reference types="node" />
 import { AddressLookupTableAccount, ConfirmOptions, Signer, Transaction, TransactionInstruction, TransactionSignature, VersionedTransaction } from '@solana/web3.js';
 import { IWallet } from '../types';
+export declare enum ConfirmationStrategy {
+    WebSocket = "websocket",
+    Polling = "polling",
+    Combo = "combo"
+}
 export type TxSigAndSlot = {
     txSig: TransactionSignature;
     slot: number;

package/lib/tx/types.js

@@ -1,2 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConfirmationStrategy = void 0;
+var ConfirmationStrategy;
+(function (ConfirmationStrategy) {
+    ConfirmationStrategy["WebSocket"] = "websocket";
+    ConfirmationStrategy["Polling"] = "polling";
+    ConfirmationStrategy["Combo"] = "combo";
+})(ConfirmationStrategy = exports.ConfirmationStrategy || (exports.ConfirmationStrategy = {}));

package/lib/tx/utils.d.ts

@@ -1,2 +1,6 @@
-import { Transaction, TransactionInstruction } from '@solana/web3.js';
+import { Wallet } from '@coral-xyz/anchor';
+import { Transaction, TransactionInstruction, VersionedTransaction } from '@solana/web3.js';
 export declare function wrapInTx(instruction: TransactionInstruction, computeUnits?: number, computeUnitsPrice?: number): Transaction;
+export declare function getSignedTransactionMap(wallet: Wallet, txsToSign: (Transaction | VersionedTransaction | undefined)[], keys: string[]): Promise<{
+    [key: string]: Transaction | VersionedTransaction | undefined;
+}>;

package/lib/tx/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.wrapInTx = void 0;
+exports.getSignedTransactionMap = exports.wrapInTx = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const COMPUTE_UNITS_DEFAULT = 200000;
 function wrapInTx(instruction, computeUnits = 600000, computeUnitsPrice = 0) {
@@ -18,3 +18,22 @@ function wrapInTx(instruction, computeUnits = 600000, computeUnitsPrice = 0) {
     return tx.add(instruction);
 }
 exports.wrapInTx = wrapInTx;
+/* Helper function for signing multiple transactions where some may be undefined and mapping the output */
+async function getSignedTransactionMap(wallet, txsToSign, keys) {
+    const signedTxMap = {};
+    const keysWithTx = [];
+    txsToSign.forEach((tx, index) => {
+        if (tx == undefined) {
+            signedTxMap[keys[index]] = undefined;
+        }
+        else {
+            keysWithTx.push(keys[index]);
+        }
+    });
+    const signedTxs = await wallet.signAllTransactions(txsToSign.filter((tx) => tx !== undefined));
+    signedTxs.forEach((signedTx, index) => {
+        signedTxMap[keysWithTx[index]] = signedTx;
+    });
+    return signedTxMap;
+}
+exports.getSignedTransactionMap = getSignedTransactionMap;

package/lib/userMap/userMap.js

@@ -236,6 +236,10 @@ class UserMap {
                     await this.addPubkey(new web3_js_1.PublicKey(key), userAccount);
                     this.userMap.get(key).accountSubscriber.updateData(userAccount, slot);
                 }
+                else {
+                    const userAccount = this.decode('User', buffer);
+                    this.userMap.get(key).accountSubscriber.updateData(userAccount, slot);
+                }
                 // give event loop a chance to breathe
                 await new Promise((resolve) => setTimeout(resolve, 0));
             }

package/package.json

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

package/src/accounts/pollingInsuranceFundStakeAccountSubscriber.ts

@@ -54,7 +54,6 @@ export class PollingInsuranceFundStakeAccountSubscriber
 
 		await this.addToAccountLoader();
 
-		await this.fetchIfUnloaded();
 		if (this.doesAccountExist()) {
 			this.eventEmitter.emit('update');
 		}

package/src/constants/perpMarkets.ts

@@ -234,6 +234,16 @@ export const DevnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1703173331000,
 		oracleSource: OracleSource.PYTH,
 	},
+	{
+		fullName: 'AVAX',
+		category: ['Rollup', 'Infra'],
+		symbol: 'AVAX-PERP',
+		baseAssetSymbol: 'AVAX',
+		marketIndex: 22,
+		oracle: new PublicKey('FVb5h1VmHPfVb1RfqZckchq18GxRv4iKt8T4eVTQAqdz'),
+		launchTs: 1704209558000,
+		oracleSource: OracleSource.PYTH,
+	},
 ];
 
 export const MainnetPerpMarkets: PerpMarketConfig[] = [
@@ -457,6 +467,16 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1703173331000,
 		oracleSource: OracleSource.PYTH,
 	},
+	{
+		fullName: 'AVAX',
+		category: ['Rollup', 'Infra'],
+		symbol: 'AVAX-PERP',
+		baseAssetSymbol: 'AVAX',
+		marketIndex: 22,
+		oracle: new PublicKey('Ax9ujW5B9oqcv59N8m6f1BpTBq2rGeGaBcpKjC5UYsXU'),
+		launchTs: 1704209558000,
+		oracleSource: OracleSource.PYTH,
+	},
 ];
 
 export const PerpMarkets: { [key in DriftEnv]: PerpMarketConfig[] } = {