@drift-labs/sdk 0.1.23-master.2 → 0.1.24

package/src/accounts/bulkAccountLoader.ts

@@ -20,6 +20,7 @@ export class BulkAccountLoader {
 	// to handle clients spamming load
 	loadPromise?: Promise<void>;
 	loadPromiseResolver: () => void;
+	loggingEnabled = false;
 
 	public constructor(
 		connection: Connection,
@@ -100,6 +101,10 @@ export class BulkAccountLoader {
 			this.loadPromiseResolver = resolver;
 		});
 
+		if (this.loggingEnabled) {
+			console.log('Loading accounts');
+		}
+
 		try {
 			const chunks = this.chunks(
 				Array.from(this.accountsToLoad.values()),
@@ -135,19 +140,11 @@ export class BulkAccountLoader {
 			{ commitment: this.commitment },
 		];
 
-		let rpcResponse;
-		try {
-			// @ts-ignore
-			rpcResponse = await this.connection._rpcRequest(
-				'getMultipleAccounts',
-				args
-			);
-		} catch (e) {
-			for (const [_, callback] of this.errorCallbacks) {
-				callback(e);
-			}
-			return;
-		}
+		// @ts-ignore
+		const rpcResponse = await this.connection._rpcRequest(
+			'getMultipleAccounts',
+			args
+		);
 
 		const newSlot = rpcResponse.result.context.slot;
 
@@ -203,6 +200,10 @@ export class BulkAccountLoader {
 			return;
 		}
 
+		if (this.loggingEnabled) {
+			console.log(`startPolling`);
+		}
+
 		this.intervalId = setInterval(this.load.bind(this), this.pollingFrequency);
 	}
 
@@ -210,6 +211,10 @@ export class BulkAccountLoader {
 		if (this.intervalId) {
 			clearInterval(this.intervalId);
 			this.intervalId = undefined;
+
+			if (this.loggingEnabled) {
+				console.log(`stopPolling`);
+			}
 		}
 	}
 }

package/src/accounts/types.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NotSubscribedError = void 0;
+class NotSubscribedError extends Error {
+    constructor() {
+        super(...arguments);
+        this.name = 'NotSubscribedError';
+    }
+}
+exports.NotSubscribedError = NotSubscribedError;

package/src/accounts/utils.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.capitalize = void 0;
+function capitalize(value) {
+    return value[0].toUpperCase() + value.slice(1);
+}
+exports.capitalize = capitalize;

package/src/accounts/webSocketAccountSubscriber.js

@@ -0,0 +1,76 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebSocketAccountSubscriber = void 0;
+const utils_1 = require("./utils");
+class WebSocketAccountSubscriber {
+    constructor(accountName, program, accountPublicKey) {
+        this.accountName = accountName;
+        this.program = program;
+        this.accountPublicKey = accountPublicKey;
+    }
+    subscribe(onChange) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.listenerId) {
+                return;
+            }
+            this.onChange = onChange;
+            yield this.fetch();
+            this.listenerId = this.program.provider.connection.onAccountChange(this.accountPublicKey, (accountInfo, context) => {
+                this.handleRpcResponse(context, accountInfo);
+            }, this.program.provider.opts.commitment);
+        });
+    }
+    fetch() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const rpcResponse = yield this.program.provider.connection.getAccountInfoAndContext(this.accountPublicKey, this.program.provider.opts.commitment);
+            this.handleRpcResponse(rpcResponse.context, rpcResponse === null || rpcResponse === void 0 ? void 0 : rpcResponse.value);
+        });
+    }
+    handleRpcResponse(context, accountInfo) {
+        const newSlot = context.slot;
+        let newBuffer = undefined;
+        if (accountInfo) {
+            newBuffer = accountInfo.data;
+        }
+        if (!this.accountData) {
+            this.accountData = {
+                buffer: newBuffer,
+                slot: newSlot,
+            };
+            if (newBuffer) {
+                this.data = this.program.account[this.accountName].coder.accounts.decode(utils_1.capitalize(this.accountName), newBuffer);
+                this.onChange(this.data);
+            }
+            return;
+        }
+        if (newSlot <= this.accountData.slot) {
+            return;
+        }
+        const oldBuffer = this.accountData.buffer;
+        if (newBuffer && (!oldBuffer || !newBuffer.equals(oldBuffer))) {
+            this.accountData = {
+                buffer: newBuffer,
+                slot: newSlot,
+            };
+            this.data = this.program.account[this.accountName].coder.accounts.decode(utils_1.capitalize(this.accountName), newBuffer);
+            this.onChange(this.data);
+        }
+    }
+    unsubscribe() {
+        if (this.listenerId) {
+            const promise = this.program.provider.connection.removeAccountChangeListener(this.listenerId);
+            this.listenerId = undefined;
+            return promise;
+        }
+    }
+}
+exports.WebSocketAccountSubscriber = WebSocketAccountSubscriber;

package/src/addresses.js

@@ -0,0 +1,83 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getUserOrdersAccountPublicKey = exports.getUserOrdersAccountPublicKeyAndNonce = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getClearingHouseStateAccountPublicKey = exports.getOrderStateAccountPublicKeyAndNonce = exports.getOrderStateAccountPublicKey = exports.getClearingHouseStateAccountPublicKeyAndNonce = void 0;
+const anchor = __importStar(require("@project-serum/anchor"));
+function getClearingHouseStateAccountPublicKeyAndNonce(programId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return anchor.web3.PublicKey.findProgramAddress([Buffer.from(anchor.utils.bytes.utf8.encode('clearing_house'))], programId);
+    });
+}
+exports.getClearingHouseStateAccountPublicKeyAndNonce = getClearingHouseStateAccountPublicKeyAndNonce;
+function getOrderStateAccountPublicKey(programId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return (yield getOrderStateAccountPublicKeyAndNonce(programId))[0];
+    });
+}
+exports.getOrderStateAccountPublicKey = getOrderStateAccountPublicKey;
+function getOrderStateAccountPublicKeyAndNonce(programId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return anchor.web3.PublicKey.findProgramAddress([Buffer.from(anchor.utils.bytes.utf8.encode('order_state'))], programId);
+    });
+}
+exports.getOrderStateAccountPublicKeyAndNonce = getOrderStateAccountPublicKeyAndNonce;
+function getClearingHouseStateAccountPublicKey(programId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return (yield getClearingHouseStateAccountPublicKeyAndNonce(programId))[0];
+    });
+}
+exports.getClearingHouseStateAccountPublicKey = getClearingHouseStateAccountPublicKey;
+function getUserAccountPublicKeyAndNonce(programId, authority) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return anchor.web3.PublicKey.findProgramAddress([Buffer.from(anchor.utils.bytes.utf8.encode('user')), authority.toBuffer()], programId);
+    });
+}
+exports.getUserAccountPublicKeyAndNonce = getUserAccountPublicKeyAndNonce;
+function getUserAccountPublicKey(programId, authority) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return (yield getUserAccountPublicKeyAndNonce(programId, authority))[0];
+    });
+}
+exports.getUserAccountPublicKey = getUserAccountPublicKey;
+function getUserOrdersAccountPublicKeyAndNonce(programId, userAccount) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return anchor.web3.PublicKey.findProgramAddress([
+            Buffer.from(anchor.utils.bytes.utf8.encode('user_orders')),
+            userAccount.toBuffer(),
+        ], programId);
+    });
+}
+exports.getUserOrdersAccountPublicKeyAndNonce = getUserOrdersAccountPublicKeyAndNonce;
+function getUserOrdersAccountPublicKey(programId, userAccount) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return (yield getUserOrdersAccountPublicKeyAndNonce(programId, userAccount))[0];
+    });
+}
+exports.getUserOrdersAccountPublicKey = getUserOrdersAccountPublicKey;

package/src/admin.ts

@@ -216,7 +216,10 @@ export class Admin extends ClearingHouse {
 		baseAssetReserve: BN,
 		quoteAssetReserve: BN,
 		periodicity: BN,
-		pegMultiplier: BN = PEG_PRECISION
+		pegMultiplier: BN = PEG_PRECISION,
+		marginRatioInitial = 2000,
+		marginRatioPartial = 625,
+		marginRatioMaintenance = 500
 	): Promise<TransactionSignature> {
 		if (this.getMarketsAccount().markets[marketIndex.toNumber()].initialized) {
 			throw Error(`MarketIndex ${marketIndex.toNumber()} already initialized`);
@@ -228,6 +231,9 @@ export class Admin extends ClearingHouse {
 			quoteAssetReserve,
 			periodicity,
 			pegMultiplier,
+			marginRatioInitial,
+			marginRatioPartial,
+			marginRatioMaintenance,
 			{
 				accounts: {
 					state: await this.getStatePublicKey(),
@@ -460,11 +466,13 @@ export class Admin extends ClearingHouse {
 	}
 
 	public async updateMarginRatio(
-		marginRatioInitial: BN,
-		marginRatioPartial: BN,
-		marginRatioMaintenance: BN
+		marketIndex: BN,
+		marginRatioInitial: number,
+		marginRatioPartial: number,
+		marginRatioMaintenance: number
 	): Promise<TransactionSignature> {
 		return await this.program.rpc.updateMarginRatio(
+			marketIndex,
 			marginRatioInitial,
 			marginRatioPartial,
 			marginRatioMaintenance,
@@ -472,6 +480,7 @@ export class Admin extends ClearingHouse {
 				accounts: {
 					admin: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
+					markets: this.getStateAccount().markets,
 				},
 			}
 		);