@drift-labs/sdk 0.1.36-master.7 → 0.2.0-master.0

package/lib/slot/SlotSubscriber.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SlotSubscriber = void 0;
+class SlotSubscriber {
+    constructor(connection, _config) {
+        this.connection = connection;
+    }
+    async subscribe() {
+        this.currentSlot = await this.connection.getSlot('confirmed');
+        this.subscriptionId = this.connection.onSlotChange((slotInfo) => {
+            this.currentSlot = slotInfo.slot;
+        });
+    }
+    getSlot() {
+        return this.currentSlot;
+    }
+    async unsubscribe() {
+        if (this.subscriptionId) {
+            await this.connection.removeSlotChangeListener(this.subscriptionId);
+        }
+    }
+}
+exports.SlotSubscriber = SlotSubscriber;

package/lib/tx/retryTxSender.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { TxSender } from './types';
+import { TxSender, TxSigAndSlot } from './types';
 import { Commitment, ConfirmOptions, RpcResponseAndContext, Signer, SignatureResult, Transaction, TransactionSignature, Connection } from '@solana/web3.js';
 import { AnchorProvider } from '@project-serum/anchor';
 declare type ResolveReference = {
@@ -11,7 +11,7 @@ export declare class RetryTxSender implements TxSender {
     retrySleep: number;
     additionalConnections: Connection[];
     constructor(provider: AnchorProvider, timeout?: number, retrySleep?: number, additionalConnections?: Connection[]);
-    send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<TransactionSignature>;
+    send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<TxSigAndSlot>;
     prepareTx(tx: Transaction, additionalSigners: Array<Signer>, opts: ConfirmOptions): Promise<Transaction>;
     confirmTransaction(signature: TransactionSignature, commitment?: Commitment): Promise<RpcResponseAndContext<SignatureResult>>;
     getTimestamp(): number;

package/lib/tx/retryTxSender.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -24,133 +15,127 @@ class RetryTxSender {
         this.retrySleep = retrySleep !== null && retrySleep !== void 0 ? retrySleep : DEFAULT_RETRY;
         this.additionalConnections = additionalConnections;
     }
-    send(tx, additionalSigners, opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (additionalSigners === undefined) {
-                additionalSigners = [];
-            }
-            if (opts === undefined) {
-                opts = this.provider.opts;
+    async send(tx, additionalSigners, opts) {
+        if (additionalSigners === undefined) {
+            additionalSigners = [];
+        }
+        if (opts === undefined) {
+            opts = this.provider.opts;
+        }
+        await this.prepareTx(tx, additionalSigners, opts);
+        const rawTransaction = tx.serialize();
+        const startTime = this.getTimestamp();
+        const txid = await this.provider.connection.sendRawTransaction(rawTransaction, opts);
+        this.sendToAdditionalConnections(rawTransaction, opts);
+        let done = false;
+        const resolveReference = {
+            resolve: undefined,
+        };
+        const stopWaiting = () => {
+            done = true;
+            if (resolveReference.resolve) {
+                resolveReference.resolve();
             }
-            yield this.prepareTx(tx, additionalSigners, opts);
-            const rawTransaction = tx.serialize();
-            const startTime = this.getTimestamp();
-            const txid = yield this.provider.connection.sendRawTransaction(rawTransaction, opts);
-            this.sendToAdditionalConnections(rawTransaction, opts);
-            let done = false;
-            const resolveReference = {
-                resolve: undefined,
-            };
-            const stopWaiting = () => {
-                done = true;
-                if (resolveReference.resolve) {
-                    resolveReference.resolve();
+        };
+        (async () => {
+            while (!done && this.getTimestamp() - startTime < this.timeout) {
+                await this.sleep(resolveReference);
+                if (!done) {
+                    this.provider.connection
+                        .sendRawTransaction(rawTransaction, opts)
+                        .catch((e) => {
+                        console.error(e);
+                        stopWaiting();
+                    });
+                    this.sendToAdditionalConnections(rawTransaction, opts);
                 }
-            };
-            (() => __awaiter(this, void 0, void 0, function* () {
-                while (!done && this.getTimestamp() - startTime < this.timeout) {
-                    yield this.sleep(resolveReference);
-                    if (!done) {
-                        this.provider.connection
-                            .sendRawTransaction(rawTransaction, opts)
-                            .catch((e) => {
-                            console.error(e);
-                            stopWaiting();
-                        });
-                        this.sendToAdditionalConnections(rawTransaction, opts);
-                    }
-                }
-            }))();
-            try {
-                yield this.confirmTransaction(txid, opts.commitment);
-            }
-            catch (e) {
-                console.error(e);
-                throw e;
             }
-            finally {
-                stopWaiting();
-            }
-            return txid;
-        });
+        })();
+        let slot;
+        try {
+            const result = await this.confirmTransaction(txid, opts.commitment);
+            slot = result.context.slot;
+        }
+        catch (e) {
+            console.error(e);
+            throw e;
+        }
+        finally {
+            stopWaiting();
+        }
+        return { txSig: txid, slot };
     }
-    prepareTx(tx, additionalSigners, opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            tx.feePayer = this.provider.wallet.publicKey;
-            tx.recentBlockhash = (yield this.provider.connection.getRecentBlockhash(opts.preflightCommitment)).blockhash;
-            yield this.provider.wallet.signTransaction(tx);
-            additionalSigners
-                .filter((s) => s !== undefined)
-                .forEach((kp) => {
-                tx.partialSign(kp);
-            });
-            return tx;
+    async prepareTx(tx, additionalSigners, opts) {
+        tx.feePayer = this.provider.wallet.publicKey;
+        tx.recentBlockhash = (await this.provider.connection.getRecentBlockhash(opts.preflightCommitment)).blockhash;
+        await this.provider.wallet.signTransaction(tx);
+        additionalSigners
+            .filter((s) => s !== undefined)
+            .forEach((kp) => {
+            tx.partialSign(kp);
         });
+        return tx;
     }
-    confirmTransaction(signature, commitment) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let decodedSignature;
-            try {
-                decodedSignature = bs58_1.default.decode(signature);
-            }
-            catch (err) {
-                throw new Error('signature must be base58 encoded: ' + signature);
-            }
-            (0, assert_1.default)(decodedSignature.length === 64, 'signature has invalid length');
-            const start = Date.now();
-            const subscriptionCommitment = commitment || this.provider.opts.commitment;
-            const subscriptionIds = new Array();
-            const connections = [
-                this.provider.connection,
-                ...this.additionalConnections,
-            ];
-            let response = null;
-            const promises = connections.map((connection, i) => {
-                let subscriptionId;
-                const confirmPromise = new Promise((resolve, reject) => {
-                    try {
-                        subscriptionId = connection.onSignature(signature, (result, context) => {
-                            subscriptionIds[i] = undefined;
-                            response = {
-                                context,
-                                value: result,
-                            };
-                            resolve(null);
-                        }, subscriptionCommitment);
-                    }
-                    catch (err) {
-                        reject(err);
-                    }
-                });
-                subscriptionIds.push(subscriptionId);
-                return confirmPromise;
+    async confirmTransaction(signature, commitment) {
+        let decodedSignature;
+        try {
+            decodedSignature = bs58_1.default.decode(signature);
+        }
+        catch (err) {
+            throw new Error('signature must be base58 encoded: ' + signature);
+        }
+        (0, assert_1.default)(decodedSignature.length === 64, 'signature has invalid length');
+        const start = Date.now();
+        const subscriptionCommitment = commitment || this.provider.opts.commitment;
+        const subscriptionIds = new Array();
+        const connections = [
+            this.provider.connection,
+            ...this.additionalConnections,
+        ];
+        let response = null;
+        const promises = connections.map((connection, i) => {
+            let subscriptionId;
+            const confirmPromise = new Promise((resolve, reject) => {
+                try {
+                    subscriptionId = connection.onSignature(signature, (result, context) => {
+                        subscriptionIds[i] = undefined;
+                        response = {
+                            context,
+                            value: result,
+                        };
+                        resolve(null);
+                    }, subscriptionCommitment);
+                }
+                catch (err) {
+                    reject(err);
+                }
             });
-            try {
-                yield this.promiseTimeout(promises, this.timeout);
-            }
-            finally {
-                for (const [i, subscriptionId] of subscriptionIds.entries()) {
-                    if (subscriptionId) {
-                        connections[i].removeSignatureListener(subscriptionId);
-                    }
+            subscriptionIds.push(subscriptionId);
+            return confirmPromise;
+        });
+        try {
+            await this.promiseTimeout(promises, this.timeout);
+        }
+        finally {
+            for (const [i, subscriptionId] of subscriptionIds.entries()) {
+                if (subscriptionId) {
+                    connections[i].removeSignatureListener(subscriptionId);
                 }
             }
-            if (response === null) {
-                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;
-        });
+        }
+        if (response === null) {
+            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;
     }
     getTimestamp() {
         return new Date().getTime();
     }
-    sleep(reference) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve) => {
-                reference.resolve = resolve;
-                setTimeout(resolve, this.retrySleep);
-            });
+    async sleep(reference) {
+        return new Promise((resolve) => {
+            reference.resolve = resolve;
+            setTimeout(resolve, this.retrySleep);
         });
     }
     promiseTimeout(promises, timeoutMs) {

package/lib/tx/types.d.ts

@@ -1,6 +1,10 @@
 import { Provider } from '@project-serum/anchor';
 import { ConfirmOptions, Signer, Transaction, TransactionSignature } from '@solana/web3.js';
+export declare type TxSigAndSlot = {
+    txSig: TransactionSignature;
+    slot: number;
+};
 export interface TxSender {
     provider: Provider;
-    send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<TransactionSignature>;
+    send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<TxSigAndSlot>;
 }

package/lib/tx/utils.d.ts

@@ -1,2 +1,2 @@
 import { Transaction, TransactionInstruction } from '@solana/web3.js';
-export declare function wrapInTx(instruction: TransactionInstruction): Transaction;
+export declare function wrapInTx(instruction: TransactionInstruction, computeUnits?: number): Transaction;

package/lib/tx/utils.js

@@ -2,7 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.wrapInTx = void 0;
 const web3_js_1 = require("@solana/web3.js");
-function wrapInTx(instruction) {
-    return new web3_js_1.Transaction().add(instruction);
+const COMPUTE_UNITS_DEFAULT = 200000;
+function wrapInTx(instruction, computeUnits = 500000 // TODO, requires less code change
+) {
+    const tx = new web3_js_1.Transaction();
+    if (computeUnits != COMPUTE_UNITS_DEFAULT) {
+        tx.add(web3_js_1.ComputeBudgetProgram.requestUnits({
+            units: computeUnits,
+            additionalFee: 0,
+        }));
+    }
+    return tx.add(instruction);
 }
 exports.wrapInTx = wrapInTx;