@drift-labs/sdk 0.2.0-master.26 → 0.2.0-master.27

package/src/userMap/userStatsMap.ts

@@ -0,0 +1,110 @@
+import {
+	ClearingHouse,
+	getUserStatsAccountPublicKey,
+	OrderRecord,
+	UserStatsAccount,
+	ClearingHouseUserStats,
+	ClearingHouseUserStatsAccountSubscriptionConfig,
+	bulkPollingUserStatsSubscribe,
+} from '..';
+import { ProgramAccount } from '@project-serum/anchor';
+import { PublicKey } from '@solana/web3.js';
+
+import { UserMap } from './userMap';
+
+export class UserStatsMap {
+	/**
+	 * map from authority pubkey to ClearingHouseUserStats
+	 */
+	private userStatsMap = new Map<string, ClearingHouseUserStats>();
+	private clearingHouse: ClearingHouse;
+	private accountSubscription: ClearingHouseUserStatsAccountSubscriptionConfig;
+
+	constructor(
+		clearingHouse: ClearingHouse,
+		accountSubscription: ClearingHouseUserStatsAccountSubscriptionConfig
+	) {
+		this.clearingHouse = clearingHouse;
+		this.accountSubscription = accountSubscription;
+	}
+
+	public async fetchAllUserStats() {
+		const userStatArray: ClearingHouseUserStats[] = [];
+
+		const programUserAccounts =
+			(await this.clearingHouse.program.account.userStats.all()) as ProgramAccount<UserStatsAccount>[];
+
+		for (const programUserAccount of programUserAccounts) {
+			const userStat: UserStatsAccount = programUserAccount.account;
+			if (this.userStatsMap.has(userStat.authority.toString())) {
+				continue;
+			}
+
+			const chUserStat = new ClearingHouseUserStats({
+				clearingHouse: this.clearingHouse,
+				userStatsAccountPublicKey: getUserStatsAccountPublicKey(
+					this.clearingHouse.program.programId,
+					userStat.authority
+				),
+				accountSubscription: this.accountSubscription,
+			});
+			userStatArray.push(chUserStat);
+		}
+
+		if (this.accountSubscription.type === 'polling') {
+			await bulkPollingUserStatsSubscribe(
+				userStatArray,
+				this.accountSubscription.accountLoader
+			);
+		}
+
+		for (const userStat of userStatArray) {
+			this.userStatsMap.set(
+				userStat.getAccount().authority.toString(),
+				userStat
+			);
+		}
+	}
+
+	public async addUserStat(authority: PublicKey) {
+		const userStat = new ClearingHouseUserStats({
+			clearingHouse: this.clearingHouse,
+			userStatsAccountPublicKey: getUserStatsAccountPublicKey(
+				this.clearingHouse.program.programId,
+				authority
+			),
+			accountSubscription: this.accountSubscription,
+		});
+		await userStat.subscribe();
+
+		this.userStatsMap.set(authority.toString(), userStat);
+	}
+
+	public async updateWithOrderRecord(record: OrderRecord, userMap: UserMap) {
+		if (!this.has(record.user.toString())) {
+			const takerUserAccount = await userMap.mustGet(record.user.toString());
+			this.addUserStat(takerUserAccount.getUserAccount().authority);
+		}
+	}
+
+	public has(authorityPublicKey: string): boolean {
+		return this.userStatsMap.has(authorityPublicKey);
+	}
+
+	public get(authorityPublicKey: string): ClearingHouseUserStats {
+		return this.userStatsMap.get(authorityPublicKey);
+	}
+
+	public async mustGet(
+		authorityPublicKey: string
+	): Promise<ClearingHouseUserStats> {
+		if (!this.has(authorityPublicKey)) {
+			await this.addUserStat(new PublicKey(authorityPublicKey));
+		}
+		return this.get(authorityPublicKey);
+	}
+
+	public values(): IterableIterator<ClearingHouseUserStats> {
+		return this.userStatsMap.values();
+	}
+}

package/src/userName.js

@@ -1,20 +1,20 @@
 "use strict";
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.decodeName = exports.encodeName = exports.DEFAULT_USER_NAME = exports.MAX_NAME_LENGTH = void 0;
 exports.MAX_NAME_LENGTH = 32;
 exports.DEFAULT_USER_NAME = 'Main Account';
 function encodeName(name) {
     if (name.length > exports.MAX_NAME_LENGTH) {
-        throw Error("User name (".concat(name, ") longer than 32 characters"));
+        throw Error(`User name (${name}) longer than 32 characters`);
     }
-    var buffer = Buffer.alloc(32);
+    const buffer = Buffer.alloc(32);
     buffer.fill(name);
     buffer.fill(' ', name.length);
-    return Array.apply(void 0, buffer);
+    return Array(...buffer);
 }
 exports.encodeName = encodeName;
 function decodeName(bytes) {
-    var buffer = Buffer.from(bytes);
+    const buffer = Buffer.from(bytes);
     return buffer.toString('utf8').trim();
 }
 exports.decodeName = decodeName;

package/src/util/computeUnits.js

@@ -8,55 +8,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.findComputeUnitConsumption = void 0;
-function findComputeUnitConsumption(programId, connection, txSignature, commitment) {
-    if (commitment === void 0) { commitment = 'confirmed'; }
-    return __awaiter(this, void 0, void 0, function () {
-        var tx, computeUnits, regex;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, connection.getTransaction(txSignature, { commitment: commitment })];
-                case 1:
-                    tx = _a.sent();
-                    computeUnits = [];
-                    regex = new RegExp("Program ".concat(programId.toString(), " consumed ([0-9]{0,6}) of ([0-9]{0,7}) compute units"));
-                    tx.meta.logMessages.forEach(function (logMessage) {
-                        var match = logMessage.match(regex);
-                        if (match && match[1]) {
-                            computeUnits.push(match[1]);
-                        }
-                    });
-                    return [2 /*return*/, computeUnits];
+function findComputeUnitConsumption(programId, connection, txSignature, commitment = 'confirmed') {
+    return __awaiter(this, void 0, void 0, function* () {
+        const tx = yield connection.getTransaction(txSignature, { commitment });
+        const computeUnits = [];
+        const regex = new RegExp(`Program ${programId.toString()} consumed ([0-9]{0,6}) of ([0-9]{0,7}) compute units`);
+        tx.meta.logMessages.forEach((logMessage) => {
+            const match = logMessage.match(regex);
+            if (match && match[1]) {
+                computeUnits.push(match[1]);
             }
         });
+        return computeUnits;
     });
 }
 exports.findComputeUnitConsumption = findComputeUnitConsumption;

package/src/util/getTokenAddress.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTokenAddress = void 0;
+const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
+const getTokenAddress = (mintAddress, userPubKey) => {
+    return spl_token_1.Token.getAssociatedTokenAddress(spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, spl_token_1.TOKEN_PROGRAM_ID, new web3_js_1.PublicKey(mintAddress), new web3_js_1.PublicKey(userPubKey));
+};
+exports.getTokenAddress = getTokenAddress;

package/src/util/promiseTimeout.js

@@ -1,12 +1,12 @@
 "use strict";
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.promiseTimeout = void 0;
 function promiseTimeout(promise, timeoutMs) {
-    var timeoutId;
-    var timeoutPromise = new Promise(function (resolve) {
-        timeoutId = setTimeout(function () { return resolve(null); }, timeoutMs);
+    let timeoutId;
+    const timeoutPromise = new Promise((resolve) => {
+        timeoutId = setTimeout(() => resolve(null), timeoutMs);
     });
-    return Promise.race([promise, timeoutPromise]).then(function (result) {
+    return Promise.race([promise, timeoutPromise]).then((result) => {
         clearTimeout(timeoutId);
         return result;
     });

package/src/util/tps.js

@@ -8,54 +8,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.estimateTps = void 0;
 function estimateTps(programId, connection, failed) {
-    return __awaiter(this, void 0, void 0, function () {
-        var signatures, numberOfSignatures;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, connection.getSignaturesForAddress(programId, undefined, 'finalized')];
-                case 1:
-                    signatures = _a.sent();
-                    if (failed) {
-                        signatures = signatures.filter(function (signature) { return signature.err; });
-                    }
-                    numberOfSignatures = signatures.length;
-                    if (numberOfSignatures === 0) {
-                        return [2 /*return*/, 0];
-                    }
-                    return [2 /*return*/, (numberOfSignatures /
-                            (signatures[0].blockTime - signatures[numberOfSignatures - 1].blockTime))];
-            }
-        });
+    return __awaiter(this, void 0, void 0, function* () {
+        let signatures = yield connection.getSignaturesForAddress(programId, undefined, 'finalized');
+        if (failed) {
+            signatures = signatures.filter((signature) => signature.err);
+        }
+        const numberOfSignatures = signatures.length;
+        if (numberOfSignatures === 0) {
+            return 0;
+        }
+        return (numberOfSignatures /
+            (signatures[0].blockTime - signatures[numberOfSignatures - 1].blockTime));
     });
 }
 exports.estimateTps = estimateTps;

package/src/wallet.js

@@ -8,65 +8,28 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.Wallet = void 0;
-var Wallet = /** @class */ (function () {
-    function Wallet(payer) {
+class Wallet {
+    constructor(payer) {
         this.payer = payer;
     }
-    Wallet.prototype.signTransaction = function (tx) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                tx.partialSign(this.payer);
-                return [2 /*return*/, tx];
-            });
+    signTransaction(tx) {
+        return __awaiter(this, void 0, void 0, function* () {
+            tx.partialSign(this.payer);
+            return tx;
         });
-    };
-    Wallet.prototype.signAllTransactions = function (txs) {
-        return __awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return __generator(this, function (_a) {
-                return [2 /*return*/, txs.map(function (t) {
-                        t.partialSign(_this.payer);
-                        return t;
-                    })];
+    }
+    signAllTransactions(txs) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return txs.map((t) => {
+                t.partialSign(this.payer);
+                return t;
             });
         });
-    };
-    Object.defineProperty(Wallet.prototype, "publicKey", {
-        get: function () {
-            return this.payer.publicKey;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    return Wallet;
-}());
+    }
+    get publicKey() {
+        return this.payer.publicKey;
+    }
+}
 exports.Wallet = Wallet;

package/tests/bn/test.ts

@@ -70,8 +70,7 @@ describe('BigNum Tests', () => {
 
 		expect(val.print()).to.equal('1234.56789');
 
-		expect(val.toFixed(3)).to.equal('1234.567');
-
+		expect(val.toNum().toFixed(3)).to.equal('1234.568');
 		expect(val.toPrecision(1)).to.equal('1e3');
 		expect(val.toPrecision(3)).to.equal('123e1');
 		expect(val.toPrecision(4)).to.equal('1234');
@@ -102,7 +101,7 @@ describe('BigNum Tests', () => {
 
 		expect(val4.toString()).to.equal('250000000000');
 		expect(val4.print()).to.equal('0.0250000000000');
-		expect(val4.toFixed(3)).to.equal('0.025');
+		expect(val4.toNum().toFixed(3)).to.equal('0.025');
 		expect(val4.toPrecision(4)).to.equal('0.025');
 
 		// Case 5