@drift-labs/sdk 0.2.0-master.20 → 0.2.0-master.23

package/lib/constants/banks.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Banks = exports.MainnetBanks = exports.DevnetBanks = exports.WRAPPED_SOL_MINT = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const __1 = require("../");
+const numericConstants_1 = require("./numericConstants");
 exports.WRAPPED_SOL_MINT = new web3_js_1.PublicKey('So11111111111111111111111111111111111111112');
 exports.DevnetBanks = [
     {
@@ -11,6 +12,8 @@ exports.DevnetBanks = [
         oracle: web3_js_1.PublicKey.default,
         oracleSource: __1.OracleSource.QUOTE_ASSET,
         mint: new web3_js_1.PublicKey('8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2'),
+        precision: numericConstants_1.BANK_BALANCE_PRECISION,
+        precisionExp: numericConstants_1.BANK_BALANCE_PRECISION_EXP,
     },
     {
         symbol: 'SOL',
@@ -18,6 +21,8 @@ exports.DevnetBanks = [
         oracle: new web3_js_1.PublicKey('J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix'),
         oracleSource: __1.OracleSource.PYTH,
         mint: new web3_js_1.PublicKey(exports.WRAPPED_SOL_MINT),
+        precision: numericConstants_1.LAMPORTS_PRECISION,
+        precisionExp: numericConstants_1.LAMPORTS_EXP,
     },
     {
         symbol: 'BTC',
@@ -25,6 +30,8 @@ exports.DevnetBanks = [
         oracle: new web3_js_1.PublicKey('HovQMDrbAgAYPCmHVSrezcSmkMtXSSUsLDFANExrZh2J'),
         oracleSource: __1.OracleSource.PYTH,
         mint: new web3_js_1.PublicKey('3BZPwbcqB5kKScF3TEXxwNfx5ipV13kbRVDvfVp5c6fv'),
+        precision: numericConstants_1.BANK_BALANCE_PRECISION,
+        precisionExp: numericConstants_1.BANK_BALANCE_PRECISION_EXP,
     },
 ];
 exports.MainnetBanks = [
@@ -34,6 +41,8 @@ exports.MainnetBanks = [
         oracle: web3_js_1.PublicKey.default,
         oracleSource: __1.OracleSource.QUOTE_ASSET,
         mint: new web3_js_1.PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'),
+        precision: numericConstants_1.BANK_BALANCE_PRECISION,
+        precisionExp: numericConstants_1.BANK_BALANCE_PRECISION_EXP,
     },
 ];
 exports.Banks = {

package/lib/constants/numericConstants.d.ts

@@ -41,3 +41,5 @@ export declare const MARGIN_PRECISION: BN;
 export declare const BID_ASK_SPREAD_PRECISION: BN;
 export declare const ONE_YEAR: BN;
 export declare const QUOTE_ASSET_BANK_INDEX: BN;
+export declare const LAMPORTS_PRECISION: BN;
+export declare const LAMPORTS_EXP: BN;

package/lib/constants/numericConstants.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QUOTE_ASSET_BANK_INDEX = exports.ONE_YEAR = exports.BID_ASK_SPREAD_PRECISION = exports.MARGIN_PRECISION = exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.PRICE_TO_QUOTE_PRECISION = exports.PRICE_DIV_PEG = exports.AMM_TO_QUOTE_PRECISION_RATIO = exports.BASE_PRECISION_EXP = exports.BASE_PRECISION = exports.AMM_RESERVE_PRECISION = exports.PEG_PRECISION = exports.FUNDING_PAYMENT_PRECISION = exports.MARK_PRICE_PRECISION = exports.QUOTE_PRECISION = exports.LIQUIDATION_FEE_PRECISION = exports.BANK_IMF_PRECISION = exports.BANK_IMF_PRECISION_EXP = exports.BANK_BALANCE_PRECISION = exports.BANK_BALANCE_PRECISION_EXP = exports.BANK_WEIGHT_PRECISION = exports.BANK_RATE_PRECISION = exports.BANK_UTILIZATION_PRECISION = exports.BANK_CUMULATIVE_INTEREST_PRECISION = exports.BANK_CUMULATIVE_INTEREST_PRECISION_EXP = exports.BANK_INTEREST_PRECISION = exports.BANK_INTEREST_PRECISION_EXP = exports.AMM_RESERVE_PRECISION_EXP = exports.PEG_PRECISION_EXP = exports.FUNDING_RATE_PRECISION_EXP = exports.MARK_PRICE_PRECISION_EXP = exports.FUNDING_PAYMENT_PRECISION_EXP = exports.QUOTE_PRECISION_EXP = exports.MAX_LEVERAGE = exports.TEN_MILLION = exports.BN_MAX = exports.TEN_THOUSAND = exports.TEN = exports.TWO = exports.ONE = exports.ZERO = void 0;
+exports.LAMPORTS_EXP = exports.LAMPORTS_PRECISION = exports.QUOTE_ASSET_BANK_INDEX = exports.ONE_YEAR = exports.BID_ASK_SPREAD_PRECISION = exports.MARGIN_PRECISION = exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.PRICE_TO_QUOTE_PRECISION = exports.PRICE_DIV_PEG = exports.AMM_TO_QUOTE_PRECISION_RATIO = exports.BASE_PRECISION_EXP = exports.BASE_PRECISION = exports.AMM_RESERVE_PRECISION = exports.PEG_PRECISION = exports.FUNDING_PAYMENT_PRECISION = exports.MARK_PRICE_PRECISION = exports.QUOTE_PRECISION = exports.LIQUIDATION_FEE_PRECISION = exports.BANK_IMF_PRECISION = exports.BANK_IMF_PRECISION_EXP = exports.BANK_BALANCE_PRECISION = exports.BANK_BALANCE_PRECISION_EXP = exports.BANK_WEIGHT_PRECISION = exports.BANK_RATE_PRECISION = exports.BANK_UTILIZATION_PRECISION = exports.BANK_CUMULATIVE_INTEREST_PRECISION = exports.BANK_CUMULATIVE_INTEREST_PRECISION_EXP = exports.BANK_INTEREST_PRECISION = exports.BANK_INTEREST_PRECISION_EXP = exports.AMM_RESERVE_PRECISION_EXP = exports.PEG_PRECISION_EXP = exports.FUNDING_RATE_PRECISION_EXP = exports.MARK_PRICE_PRECISION_EXP = exports.FUNDING_PAYMENT_PRECISION_EXP = exports.QUOTE_PRECISION_EXP = exports.MAX_LEVERAGE = exports.TEN_MILLION = exports.BN_MAX = exports.TEN_THOUSAND = exports.TEN = exports.TWO = exports.ONE = exports.ZERO = void 0;
+const web3_js_1 = require("@solana/web3.js");
 const __1 = require("../");
 exports.ZERO = new __1.BN(0);
 exports.ONE = new __1.BN(1);
@@ -43,3 +44,5 @@ exports.MARGIN_PRECISION = exports.TEN_THOUSAND;
 exports.BID_ASK_SPREAD_PRECISION = new __1.BN(1000000);
 exports.ONE_YEAR = new __1.BN(31536000);
 exports.QUOTE_ASSET_BANK_INDEX = new __1.BN(0);
+exports.LAMPORTS_PRECISION = new __1.BN(web3_js_1.LAMPORTS_PER_SOL);
+exports.LAMPORTS_EXP = new __1.BN(Math.log10(web3_js_1.LAMPORTS_PER_SOL));

package/lib/events/sort.js

@@ -11,17 +11,14 @@ function clientSortDescFn() {
 function defaultBlockchainSortFn(currentEvent, newEvent) {
     return currentEvent.slot <= newEvent.slot ? 'less than' : 'greater than';
 }
-function orderRecordSortFn(currentEvent, newEvent) {
-    const currentEventMarketIndex = !currentEvent.maker.equals(index_1.PublicKey.default)
-        ? currentEvent.makerOrder.marketIndex
-        : currentEvent.takerOrder.marketIndex;
-    const newEventMarketIndex = !newEvent.maker.equals(index_1.PublicKey.default)
-        ? newEvent.makerOrder.marketIndex
-        : newEvent.takerOrder.marketIndex;
+function orderActionRecordSortFn(currentEvent, newEvent) {
+    var _a, _b;
+    const currentEventMarketIndex = currentEvent.marketIndex;
+    const newEventMarketIndex = newEvent.marketIndex;
     if (!currentEventMarketIndex.eq(newEventMarketIndex)) {
         return currentEvent.ts.lte(newEvent.ts) ? 'less than' : 'greater than';
     }
-    if (currentEvent.fillRecordId.gt(index_1.ZERO) && newEvent.fillRecordId.gt(index_1.ZERO)) {
+    if (((_a = currentEvent.fillRecordId) === null || _a === void 0 ? void 0 : _a.gt(index_1.ZERO)) && ((_b = newEvent.fillRecordId) === null || _b === void 0 ? void 0 : _b.gt(index_1.ZERO))) {
         return currentEvent.fillRecordId.lte(newEvent.fillRecordId)
             ? 'less than'
             : 'greater than';
@@ -35,8 +32,8 @@ function getSortFn(orderBy, orderDir, eventType) {
         return orderDir === 'asc' ? clientSortAscFn : clientSortDescFn;
     }
     switch (eventType) {
-        case 'OrderRecord':
-            return orderRecordSortFn;
+        case 'OrderActionRecord':
+            return orderActionRecordSortFn;
         default:
             return defaultBlockchainSortFn;
     }

package/lib/events/types.d.ts

@@ -1,5 +1,5 @@
 import { Commitment, TransactionSignature } from '@solana/web3.js';
-import { DepositRecord, FundingPaymentRecord, FundingRateRecord, LiquidationRecord, NewUserRecord, OrderRecord, SettlePnlRecord } from '../index';
+import { DepositRecord, FundingPaymentRecord, FundingRateRecord, LiquidationRecord, NewUserRecord, OrderActionRecord, OrderRecord, SettlePnlRecord } from '../index';
 export declare type EventSubscriptionOptions = {
     eventTypes?: EventType[];
     maxEventsPerType?: number;
@@ -27,6 +27,7 @@ export declare type EventMap = {
     LiquidationRecord: Event<LiquidationRecord>;
     FundingRateRecord: Event<FundingRateRecord>;
     OrderRecord: Event<OrderRecord>;
+    OrderActionRecord: Event<OrderActionRecord>;
     SettlePnlRecord: Event<SettlePnlRecord>;
     NewUserRecord: Event<NewUserRecord>;
 };

package/lib/events/types.js

@@ -7,6 +7,7 @@ exports.DefaultEventSubscriptionOptions = {
         'FundingPaymentRecord',
         'LiquidationRecord',
         'OrderRecord',
+        'OrderActionRecord',
         'FundingRateRecord',
         'NewUserRecord',
         'SettlePnlRecord',