@drift-labs/sdk 0.1.36-master.6 → 0.2.0-master.1

package/lib/accounts/webSocketUserAccountSubscriber.js

@@ -1,92 +1,47 @@
 "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.WebSocketUserAccountSubscriber = void 0;
 const types_1 = require("./types");
 const events_1 = require("events");
-const addresses_1 = require("../addresses");
 const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 class WebSocketUserAccountSubscriber {
-    constructor(program, authority) {
-        this.type = 'websocket';
+    constructor(program, userAccountPublicKey) {
         this.isSubscribed = false;
         this.program = program;
-        this.authority = authority;
+        this.userAccountPublicKey = userAccountPublicKey;
         this.eventEmitter = new events_1.EventEmitter();
     }
-    subscribe() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.isSubscribed) {
-                return true;
-            }
-            const userPublicKey = yield (0, addresses_1.getUserAccountPublicKey)(this.program.programId, this.authority);
-            this.userDataAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('user', this.program, userPublicKey);
-            yield this.userDataAccountSubscriber.subscribe((data) => {
-                this.eventEmitter.emit('userAccountData', data);
-                this.eventEmitter.emit('update');
-            });
-            const userAccountData = this.userDataAccountSubscriber.data;
-            this.userPositionsAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('userPositions', this.program, userAccountData.positions);
-            yield this.userPositionsAccountSubscriber.subscribe((data) => {
-                this.eventEmitter.emit('userPositionsData', data);
-                this.eventEmitter.emit('update');
-            });
-            const userOrdersPublicKey = yield (0, addresses_1.getUserOrdersAccountPublicKey)(this.program.programId, userPublicKey);
-            this.userOrdersAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('userOrders', this.program, userOrdersPublicKey);
-            yield this.userOrdersAccountSubscriber.subscribe((data) => {
-                this.eventEmitter.emit('userOrdersData', data);
-                this.eventEmitter.emit('update');
-            });
-            this.eventEmitter.emit('update');
-            this.isSubscribed = true;
+    async subscribe() {
+        if (this.isSubscribed) {
             return true;
+        }
+        this.userDataAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('user', this.program, this.userAccountPublicKey);
+        await this.userDataAccountSubscriber.subscribe((data) => {
+            this.eventEmitter.emit('userAccountUpdate', data);
+            this.eventEmitter.emit('update');
         });
+        this.eventEmitter.emit('update');
+        this.isSubscribed = true;
+        return true;
     }
-    fetch() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield Promise.all([
-                this.userDataAccountSubscriber.fetch(),
-                this.userPositionsAccountSubscriber.fetch(),
-                this.userOrdersAccountSubscriber.fetch(),
-            ]);
-        });
+    async fetch() {
+        await Promise.all([this.userDataAccountSubscriber.fetch()]);
     }
-    unsubscribe() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.isSubscribed) {
-                return;
-            }
-            yield Promise.all([
-                this.userDataAccountSubscriber.unsubscribe(),
-                this.userPositionsAccountSubscriber.unsubscribe(),
-                yield this.userOrdersAccountSubscriber.unsubscribe(),
-            ]);
-            this.isSubscribed = false;
-        });
+    async unsubscribe() {
+        if (!this.isSubscribed) {
+            return;
+        }
+        await Promise.all([this.userDataAccountSubscriber.unsubscribe()]);
+        this.isSubscribed = false;
     }
     assertIsSubscribed() {
         if (!this.isSubscribed) {
             throw new types_1.NotSubscribedError('You must call `subscribe` before using this function');
         }
     }
-    getUserAccount() {
+    getUserAccountAndSlot() {
         this.assertIsSubscribed();
-        return this.userDataAccountSubscriber.data;
-    }
-    getUserPositionsAccount() {
-        this.assertIsSubscribed();
-        return this.userPositionsAccountSubscriber.data;
-    }
-    getUserOrdersAccount() {
-        return this.userOrdersAccountSubscriber.data;
+        return this.userDataAccountSubscriber.dataAndSlot;
     }
 }
 exports.WebSocketUserAccountSubscriber = WebSocketUserAccountSubscriber;

package/lib/addresses/marketAddresses.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="bn.js" />
+import { PublicKey } from '@solana/web3.js';
+import { BN } from '@project-serum/anchor';
+export declare function getMarketAddress(programId: PublicKey, marketIndex: BN): Promise<PublicKey>;

package/lib/addresses/marketAddresses.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMarketAddress = void 0;
+const pda_1 = require("./pda");
+const CACHE = new Map();
+async function getMarketAddress(programId, marketIndex) {
+    const cacheKey = `${programId.toString()}-${marketIndex.toString()}`;
+    if (CACHE.has(cacheKey)) {
+        return CACHE.get(cacheKey);
+    }
+    const publicKey = await (0, pda_1.getMarketPublicKey)(programId, marketIndex);
+    CACHE.set(cacheKey, publicKey);
+    return publicKey;
+}
+exports.getMarketAddress = getMarketAddress;

package/lib/addresses/pda.d.ts

@@ -0,0 +1,12 @@
+/// <reference types="bn.js" />
+import { PublicKey } from '@solana/web3.js';
+import { BN } from '@project-serum/anchor';
+export declare function getClearingHouseStateAccountPublicKeyAndNonce(programId: PublicKey): Promise<[PublicKey, number]>;
+export declare function getClearingHouseStateAccountPublicKey(programId: PublicKey): Promise<PublicKey>;
+export declare function getUserAccountPublicKeyAndNonce(programId: PublicKey, authority: PublicKey, userId?: number): Promise<[PublicKey, number]>;
+export declare function getUserAccountPublicKey(programId: PublicKey, authority: PublicKey, userId?: number): Promise<PublicKey>;
+export declare function getUserAccountPublicKeySync(programId: PublicKey, authority: PublicKey, userId?: number): PublicKey;
+export declare function getMarketPublicKey(programId: PublicKey, marketIndex: BN): Promise<PublicKey>;
+export declare function getBankPublicKey(programId: PublicKey, bankIndex: BN): Promise<PublicKey>;
+export declare function getBankVaultPublicKey(programId: PublicKey, bankIndex: BN): Promise<PublicKey>;
+export declare function getBankVaultAuthorityPublicKey(programId: PublicKey, bankIndex: BN): Promise<PublicKey>;

package/lib/addresses/pda.js

@@ -0,0 +1,83 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getBankVaultAuthorityPublicKey = exports.getBankVaultPublicKey = exports.getBankPublicKey = exports.getMarketPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getClearingHouseStateAccountPublicKey = exports.getClearingHouseStateAccountPublicKeyAndNonce = void 0;
+const anchor = __importStar(require("@project-serum/anchor"));
+async function getClearingHouseStateAccountPublicKeyAndNonce(programId) {
+    return anchor.web3.PublicKey.findProgramAddress([Buffer.from(anchor.utils.bytes.utf8.encode('clearing_house'))], programId);
+}
+exports.getClearingHouseStateAccountPublicKeyAndNonce = getClearingHouseStateAccountPublicKeyAndNonce;
+async function getClearingHouseStateAccountPublicKey(programId) {
+    return (await getClearingHouseStateAccountPublicKeyAndNonce(programId))[0];
+}
+exports.getClearingHouseStateAccountPublicKey = getClearingHouseStateAccountPublicKey;
+async function getUserAccountPublicKeyAndNonce(programId, authority, userId = 0) {
+    return anchor.web3.PublicKey.findProgramAddress([
+        Buffer.from(anchor.utils.bytes.utf8.encode('user')),
+        authority.toBuffer(),
+        Uint8Array.from([userId]),
+    ], programId);
+}
+exports.getUserAccountPublicKeyAndNonce = getUserAccountPublicKeyAndNonce;
+async function getUserAccountPublicKey(programId, authority, userId = 0) {
+    return (await getUserAccountPublicKeyAndNonce(programId, authority, userId))[0];
+}
+exports.getUserAccountPublicKey = getUserAccountPublicKey;
+function getUserAccountPublicKeySync(programId, authority, userId = 0) {
+    return anchor.web3.PublicKey.findProgramAddressSync([
+        Buffer.from(anchor.utils.bytes.utf8.encode('user')),
+        authority.toBuffer(),
+        Uint8Array.from([userId]),
+    ], programId)[0];
+}
+exports.getUserAccountPublicKeySync = getUserAccountPublicKeySync;
+async function getMarketPublicKey(programId, marketIndex) {
+    return (await anchor.web3.PublicKey.findProgramAddress([
+        Buffer.from(anchor.utils.bytes.utf8.encode('market')),
+        marketIndex.toArrayLike(Buffer, 'le', 8),
+    ], programId))[0];
+}
+exports.getMarketPublicKey = getMarketPublicKey;
+async function getBankPublicKey(programId, bankIndex) {
+    return (await anchor.web3.PublicKey.findProgramAddress([
+        Buffer.from(anchor.utils.bytes.utf8.encode('bank')),
+        bankIndex.toArrayLike(Buffer, 'le', 8),
+    ], programId))[0];
+}
+exports.getBankPublicKey = getBankPublicKey;
+async function getBankVaultPublicKey(programId, bankIndex) {
+    return (await anchor.web3.PublicKey.findProgramAddress([
+        Buffer.from(anchor.utils.bytes.utf8.encode('bank_vault')),
+        bankIndex.toArrayLike(Buffer, 'le', 8),
+    ], programId))[0];
+}
+exports.getBankVaultPublicKey = getBankVaultPublicKey;
+async function getBankVaultAuthorityPublicKey(programId, bankIndex) {
+    return (await anchor.web3.PublicKey.findProgramAddress([
+        Buffer.from(anchor.utils.bytes.utf8.encode('bank_vault_authority')),
+        bankIndex.toArrayLike(Buffer, 'le', 8),
+    ], programId))[0];
+}
+exports.getBankVaultAuthorityPublicKey = getBankVaultAuthorityPublicKey;

package/lib/admin.d.ts

@@ -1,20 +1,14 @@
 /// <reference types="bn.js" />
-import { ConfirmOptions, Connection, PublicKey, TransactionSignature } from '@solana/web3.js';
-import { FeeStructure, IWallet, OracleGuardRails, OracleSource, OrderFillerRewardStructure } from './types';
+import { PublicKey, TransactionSignature } from '@solana/web3.js';
+import { FeeStructure, OracleGuardRails, OracleSource, OrderFillerRewardStructure } from './types';
 import { BN } from '@project-serum/anchor';
 import { ClearingHouse } from './clearingHouse';
 export declare class Admin extends ClearingHouse {
-    static from(connection: Connection, wallet: IWallet, clearingHouseProgramId: PublicKey, opts?: ConfirmOptions): Admin;
-    initialize(usdcMint: PublicKey, adminControlsPrices: boolean): Promise<[
-        TransactionSignature,
-        TransactionSignature,
-        TransactionSignature
-    ]>;
-    initializeOrderState(): Promise<TransactionSignature>;
-    initializeMarket(marketIndex: BN, priceOracle: PublicKey, baseAssetReserve: BN, quoteAssetReserve: BN, periodicity: BN, pegMultiplier?: BN, oracleSource?: OracleSource, marginRatioInitial?: number, marginRatioPartial?: number, marginRatioMaintenance?: number): Promise<TransactionSignature>;
+    initialize(usdcMint: PublicKey, adminControlsPrices: boolean): Promise<[TransactionSignature]>;
+    initializeBank(mint: PublicKey, optimalUtilization: BN, optimalRate: BN, maxRate: BN, oracle: PublicKey, oracleSource: OracleSource, initialAssetWeight: BN, maintenanceAssetWeight: BN, initialLiabilityWeight: BN, maintenanceLiabilityWeight: BN): Promise<TransactionSignature>;
+    initializeMarket(priceOracle: PublicKey, baseAssetReserve: BN, quoteAssetReserve: BN, periodicity: BN, pegMultiplier?: BN, oracleSource?: OracleSource, marginRatioInitial?: number, marginRatioPartial?: number, marginRatioMaintenance?: number): Promise<TransactionSignature>;
     moveAmmPrice(baseAssetReserve: BN, quoteAssetReserve: BN, marketIndex: BN): Promise<TransactionSignature>;
     updateK(sqrtK: BN, marketIndex: BN): Promise<TransactionSignature>;
-    updateCurveHistory(): Promise<TransactionSignature>;
     moveAmmToPrice(marketIndex: BN, targetPrice: BN): Promise<TransactionSignature>;
     repegAmmCurve(newPeg: BN, marketIndex: BN): Promise<TransactionSignature>;
     updateAmmOracleTwap(marketIndex: BN): Promise<TransactionSignature>;
@@ -23,6 +17,7 @@ export declare class Admin extends ClearingHouse {
     withdrawFees(marketIndex: BN, amount: BN, recipient: PublicKey): Promise<TransactionSignature>;
     withdrawFromInsuranceVaultToMarket(marketIndex: BN, amount: BN): Promise<TransactionSignature>;
     updateAdmin(admin: PublicKey): Promise<TransactionSignature>;
+    updateCurveUpdateIntensity(marketIndex: BN, curveUpdateIntensity: number): Promise<TransactionSignature>;
     updateMarginRatio(marketIndex: BN, marginRatioInitial: number, marginRatioPartial: number, marginRatioMaintenance: number): Promise<TransactionSignature>;
     updateMarketBaseSpread(marketIndex: BN, baseSpread: number): Promise<TransactionSignature>;
     updatePartialLiquidationClosePercentage(numerator: BN, denominator: BN): Promise<TransactionSignature>;
@@ -35,11 +30,12 @@ export declare class Admin extends ClearingHouse {
     updateOracleGuardRails(oracleGuardRails: OracleGuardRails): Promise<TransactionSignature>;
     updateMarketOracle(marketIndex: BN, oracle: PublicKey, oracleSource: OracleSource): Promise<TransactionSignature>;
     updateMarketMinimumQuoteAssetTradeSize(marketIndex: BN, minimumTradeSize: BN): Promise<TransactionSignature>;
-    updateMarketMinimumBaseAssetTradeSize(marketIndex: BN, minimumTradeSize: BN): Promise<TransactionSignature>;
+    updateMarketBaseAssetAmountStepSize(marketIndex: BN, stepSize: BN): Promise<TransactionSignature>;
     updateWhitelistMint(whitelistMint?: PublicKey): Promise<TransactionSignature>;
     updateDiscountMint(discountMint: PublicKey): Promise<TransactionSignature>;
     updateMaxDeposit(maxDeposit: BN): Promise<TransactionSignature>;
     updateFundingPaused(fundingPaused: boolean): Promise<TransactionSignature>;
     updateExchangePaused(exchangePaused: boolean): Promise<TransactionSignature>;
     disableAdminControlsPrices(): Promise<TransactionSignature>;
+    updateOrderAuctionTime(time: BN | number): Promise<TransactionSignature>;
 }