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

package/src/clearingHouseUserConfig.js

@@ -0,0 +1,2 @@
+"use strict";
+exports.__esModule = true;

package/src/clearingHouseUserStats.js

@@ -0,0 +1,115 @@
+"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 __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;
+exports.ClearingHouseUserStats = void 0;
+var web3_js_1 = require("@solana/web3.js");
+var pollingUserStatsAccountSubscriber_1 = require("./accounts/pollingUserStatsAccountSubscriber");
+var webSocketUserStatsAccountSubsriber_1 = require("./accounts/webSocketUserStatsAccountSubsriber");
+var pda_1 = require("./addresses/pda");
+var ClearingHouseUserStats = /** @class */ (function () {
+    function ClearingHouseUserStats(config) {
+        var _a;
+        this.clearingHouse = config.clearingHouse;
+        this.userStatsAccountPublicKey = config.userStatsAccountPublicKey;
+        if (((_a = config.accountSubscription) === null || _a === void 0 ? void 0 : _a.type) === 'polling') {
+            this.accountSubscriber = new pollingUserStatsAccountSubscriber_1.PollingUserStatsAccountSubscriber(config.clearingHouse.program, config.userStatsAccountPublicKey, config.accountSubscription.accountLoader);
+        }
+        else {
+            this.accountSubscriber = new webSocketUserStatsAccountSubsriber_1.WebSocketUserStatsAccountSubscriber(config.clearingHouse.program, config.userStatsAccountPublicKey);
+        }
+    }
+    ClearingHouseUserStats.prototype.subscribe = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this;
+                        return [4 /*yield*/, this.accountSubscriber.subscribe()];
+                    case 1:
+                        _a.isSubscribed = _b.sent();
+                        return [2 /*return*/, this.isSubscribed];
+                }
+            });
+        });
+    };
+    ClearingHouseUserStats.prototype.fetchAccounts = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.accountSubscriber.fetch()];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    ClearingHouseUserStats.prototype.unsubscribe = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.accountSubscriber.unsubscribe()];
+                    case 1:
+                        _a.sent();
+                        this.isSubscribed = false;
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    ClearingHouseUserStats.prototype.getAccountAndSlot = function () {
+        return this.accountSubscriber.getUserStatsAccountAndSlot();
+    };
+    ClearingHouseUserStats.prototype.getAccount = function () {
+        return this.accountSubscriber.getUserStatsAccountAndSlot().data;
+    };
+    ClearingHouseUserStats.prototype.getReferrerInfo = function () {
+        if (this.getAccount().referrer.equals(web3_js_1.PublicKey["default"])) {
+            return undefined;
+        }
+        else {
+            return {
+                referrer: (0, pda_1.getUserAccountPublicKeySync)(this.clearingHouse.program.programId, this.getAccount().referrer, 0),
+                referrerStats: (0, pda_1.getUserStatsAccountPublicKey)(this.clearingHouse.program.programId, this.getAccount().referrer)
+            };
+        }
+    };
+    return ClearingHouseUserStats;
+}());
+exports.ClearingHouseUserStats = ClearingHouseUserStats;

package/src/clearingHouseUserStatsConfig.js

@@ -0,0 +1,2 @@
+"use strict";
+exports.__esModule = true;

package/src/config.js

@@ -0,0 +1,80 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+exports.__esModule = true;
+exports.getMarketsAndOraclesForSubscription = exports.initialize = exports.getConfig = exports.configs = void 0;
+var perpMarkets_1 = require("./constants/perpMarkets");
+var spotMarkets_1 = require("./constants/spotMarkets");
+exports.configs = {
+    devnet: {
+        ENV: 'devnet',
+        PYTH_ORACLE_MAPPING_ADDRESS: 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2',
+        CLEARING_HOUSE_PROGRAM_ID: '3v1iEjbSSLSSYyt1pmx4UB5rqJGurmz71RibXF7X6UF3',
+        USDC_MINT_ADDRESS: '8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2',
+        PERP_MARKETS: perpMarkets_1.DevnetPerpMarkets,
+        SPOT_MARKETS: spotMarkets_1.DevnetSpotMarkets
+    },
+    'mainnet-beta': {
+        ENV: 'mainnet-beta',
+        PYTH_ORACLE_MAPPING_ADDRESS: 'AHtgzX45WTKfkPG53L6WYhGEXwQkN1BVknET3sVsLL8J',
+        CLEARING_HOUSE_PROGRAM_ID: 'dammHkt7jmytvbS3nHTxQNEcP59aE57nxwV21YdqEDN',
+        USDC_MINT_ADDRESS: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
+        PERP_MARKETS: perpMarkets_1.MainnetMarkets,
+        SPOT_MARKETS: spotMarkets_1.MainnetSpotMarkets
+    }
+};
+var currentConfig = exports.configs.devnet;
+var getConfig = function () { return currentConfig; };
+exports.getConfig = getConfig;
+/**
+ * Allows customization of the SDK's environment and endpoints. You can pass individual settings to override the settings with your own presets.
+ *
+ * Defaults to master environment if you don't use this function.
+ * @param props
+ * @returns
+ */
+var initialize = function (props) {
+    var _a, _b;
+    //@ts-ignore
+    if (props.env === 'master')
+        return __assign(__assign({}, exports.configs['devnet']), ((_a = props.overrideEnv) !== null && _a !== void 0 ? _a : {}));
+    currentConfig = __assign(__assign({}, exports.configs[props.env]), ((_b = props.overrideEnv) !== null && _b !== void 0 ? _b : {}));
+    return currentConfig;
+};
+exports.initialize = initialize;
+function getMarketsAndOraclesForSubscription(env) {
+    var perpMarketIndexes = [];
+    var spotMarketIndexes = [];
+    var oracleInfos = new Map();
+    for (var _i = 0, _a = perpMarkets_1.PerpMarkets[env]; _i < _a.length; _i++) {
+        var market = _a[_i];
+        perpMarketIndexes.push(market.marketIndex);
+        oracleInfos.set(market.oracle.toString(), {
+            publicKey: market.oracle,
+            source: market.oracleSource
+        });
+    }
+    for (var _b = 0, _c = spotMarkets_1.SpotMarkets[env]; _b < _c.length; _b++) {
+        var spotMarket = _c[_b];
+        spotMarketIndexes.push(spotMarket.marketIndex);
+        oracleInfos.set(spotMarket.oracle.toString(), {
+            publicKey: spotMarket.oracle,
+            source: spotMarket.oracleSource
+        });
+    }
+    return {
+        perpMarketIndexes: perpMarketIndexes,
+        spotMarketIndexes: spotMarketIndexes,
+        oracleInfos: Array.from(oracleInfos.values())
+    };
+}
+exports.getMarketsAndOraclesForSubscription = getMarketsAndOraclesForSubscription;

package/src/config.ts

@@ -1,15 +1,15 @@
 import {
-	DevnetMarkets,
+	DevnetPerpMarkets,
 	MainnetMarkets,
-	MarketConfig,
-	Markets,
-} from './constants/markets';
+	PerpMarketConfig,
+	PerpMarkets,
+} from './constants/perpMarkets';
 import {
-	BankConfig,
-	Banks,
-	DevnetBanks,
-	MainnetBanks,
-} from './constants/banks';
+	SpotMarketConfig,
+	SpotMarkets,
+	DevnetSpotMarkets,
+	MainnetSpotMarkets,
+} from './constants/spotMarkets';
 import { BN } from '@project-serum/anchor';
 import { OracleInfo } from './oracles/types';
 
@@ -18,8 +18,8 @@ type DriftConfig = {
 	PYTH_ORACLE_MAPPING_ADDRESS: string;
 	CLEARING_HOUSE_PROGRAM_ID: string;
 	USDC_MINT_ADDRESS: string;
-	MARKETS: MarketConfig[];
-	BANKS: BankConfig[];
+	PERP_MARKETS: PerpMarketConfig[];
+	SPOT_MARKETS: SpotMarketConfig[];
 };
 
 export type DriftEnv = 'devnet' | 'mainnet-beta';
@@ -28,18 +28,18 @@ export const configs: { [key in DriftEnv]: DriftConfig } = {
 	devnet: {
 		ENV: 'devnet',
 		PYTH_ORACLE_MAPPING_ADDRESS: 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2',
-		CLEARING_HOUSE_PROGRAM_ID: 'HbUKwqFPjz9r7ZtT416AU8aaecDQMKKiDCTS3AdXnS6c',
+		CLEARING_HOUSE_PROGRAM_ID: '3v1iEjbSSLSSYyt1pmx4UB5rqJGurmz71RibXF7X6UF3',
 		USDC_MINT_ADDRESS: '8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2',
-		MARKETS: DevnetMarkets,
-		BANKS: DevnetBanks,
+		PERP_MARKETS: DevnetPerpMarkets,
+		SPOT_MARKETS: DevnetSpotMarkets,
 	},
 	'mainnet-beta': {
 		ENV: 'mainnet-beta',
 		PYTH_ORACLE_MAPPING_ADDRESS: 'AHtgzX45WTKfkPG53L6WYhGEXwQkN1BVknET3sVsLL8J',
 		CLEARING_HOUSE_PROGRAM_ID: 'dammHkt7jmytvbS3nHTxQNEcP59aE57nxwV21YdqEDN',
 		USDC_MINT_ADDRESS: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
-		MARKETS: MainnetMarkets,
-		BANKS: MainnetBanks,
+		PERP_MARKETS: MainnetMarkets,
+		SPOT_MARKETS: MainnetSpotMarkets,
 	},
 };
 
@@ -67,34 +67,34 @@ export const initialize = (props: {
 	return currentConfig;
 };
 
-export function getMarketsBanksAndOraclesForSubscription(env: DriftEnv): {
-	marketIndexes: BN[];
-	bankIndexes: BN[];
+export function getMarketsAndOraclesForSubscription(env: DriftEnv): {
+	perpMarketIndexes: BN[];
+	spotMarketIndexes: BN[];
 	oracleInfos: OracleInfo[];
 } {
-	const marketIndexes = [];
-	const bankIndexes = [];
+	const perpMarketIndexes = [];
+	const spotMarketIndexes = [];
 	const oracleInfos = new Map<string, OracleInfo>();
 
-	for (const market of Markets[env]) {
-		marketIndexes.push(market.marketIndex);
+	for (const market of PerpMarkets[env]) {
+		perpMarketIndexes.push(market.marketIndex);
 		oracleInfos.set(market.oracle.toString(), {
 			publicKey: market.oracle,
 			source: market.oracleSource,
 		});
 	}
 
-	for (const bank of Banks[env]) {
-		bankIndexes.push(bank.bankIndex);
-		oracleInfos.set(bank.oracle.toString(), {
-			publicKey: bank.oracle,
-			source: bank.oracleSource,
+	for (const spotMarket of SpotMarkets[env]) {
+		spotMarketIndexes.push(spotMarket.marketIndex);
+		oracleInfos.set(spotMarket.oracle.toString(), {
+			publicKey: spotMarket.oracle,
+			source: spotMarket.oracleSource,
 		});
 	}
 
 	return {
-		marketIndexes,
-		bankIndexes,
+		perpMarketIndexes: perpMarketIndexes,
+		spotMarketIndexes: spotMarketIndexes,
 		oracleInfos: Array.from(oracleInfos.values()),
 	};
 }

package/src/constants/numericConstants.js

@@ -1,7 +1,8 @@
 "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_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_INTEREST_PRECISION = 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 __1 = require("../");
+exports.__esModule = true;
+exports.LAMPORTS_EXP = exports.LAMPORTS_PRECISION = exports.QUOTE_SPOT_MARKET_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.SPOT_MARKET_IMF_PRECISION = exports.SPOT_MARKET_IMF_PRECISION_EXP = exports.SPOT_MARKET_BALANCE_PRECISION = exports.SPOT_MARKET_BALANCE_PRECISION_EXP = exports.SPOT_MARKET_WEIGHT_PRECISION = exports.SPOT_MARKET_RATE_PRECISION = exports.SPOT_MARKET_UTILIZATION_PRECISION = exports.SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION = exports.SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION_EXP = exports.SPOT_MARKET_INTEREST_PRECISION = exports.SPOT_MARKET_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;
+var web3_js_1 = require("@solana/web3.js");
+var __1 = require("../");
 exports.ZERO = new __1.BN(0);
 exports.ONE = new __1.BN(1);
 exports.TWO = new __1.BN(2);
@@ -16,13 +17,17 @@ exports.MARK_PRICE_PRECISION_EXP = new __1.BN(10);
 exports.FUNDING_RATE_PRECISION_EXP = exports.MARK_PRICE_PRECISION_EXP.mul(exports.FUNDING_PAYMENT_PRECISION_EXP);
 exports.PEG_PRECISION_EXP = new __1.BN(3);
 exports.AMM_RESERVE_PRECISION_EXP = new __1.BN(13);
-exports.BANK_INTEREST_PRECISION = new __1.BN(1000000);
-exports.BANK_CUMULATIVE_INTEREST_PRECISION = new __1.BN(10000000000);
-exports.BANK_UTILIZATION_PRECISION = new __1.BN(1000000);
-exports.BANK_RATE_PRECISION = new __1.BN(1000000);
-exports.BANK_WEIGHT_PRECISION = new __1.BN(100);
-exports.BANK_BALANCE_PRECISION_EXP = new __1.BN(6);
-exports.BANK_BALANCE_PRECISION = new __1.BN(10).pow(exports.BANK_BALANCE_PRECISION_EXP);
+exports.SPOT_MARKET_INTEREST_PRECISION_EXP = new __1.BN(6);
+exports.SPOT_MARKET_INTEREST_PRECISION = new __1.BN(10).pow(exports.SPOT_MARKET_INTEREST_PRECISION_EXP);
+exports.SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION_EXP = new __1.BN(10);
+exports.SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION = new __1.BN(10).pow(exports.SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION_EXP);
+exports.SPOT_MARKET_UTILIZATION_PRECISION = new __1.BN(1000000);
+exports.SPOT_MARKET_RATE_PRECISION = new __1.BN(1000000);
+exports.SPOT_MARKET_WEIGHT_PRECISION = new __1.BN(10000);
+exports.SPOT_MARKET_BALANCE_PRECISION_EXP = new __1.BN(6);
+exports.SPOT_MARKET_BALANCE_PRECISION = new __1.BN(10).pow(exports.SPOT_MARKET_BALANCE_PRECISION_EXP);
+exports.SPOT_MARKET_IMF_PRECISION_EXP = new __1.BN(6);
+exports.SPOT_MARKET_IMF_PRECISION = new __1.BN(10).pow(exports.SPOT_MARKET_IMF_PRECISION_EXP);
 exports.LIQUIDATION_FEE_PRECISION = new __1.BN(1000000);
 exports.QUOTE_PRECISION = new __1.BN(10).pow(exports.QUOTE_PRECISION_EXP);
 exports.MARK_PRICE_PRECISION = new __1.BN(10).pow(exports.MARK_PRICE_PRECISION_EXP);
@@ -38,4 +43,6 @@ exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.AMM_RESERVE_PRECISION.m
 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.QUOTE_SPOT_MARKET_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/src/constants/numericConstants.ts

@@ -20,26 +20,28 @@ export const FUNDING_RATE_PRECISION_EXP = MARK_PRICE_PRECISION_EXP.mul(
 export const PEG_PRECISION_EXP = new BN(3);
 export const AMM_RESERVE_PRECISION_EXP = new BN(13);
 
-export const BANK_INTEREST_PRECISION_EXP = new BN(6);
-export const BANK_INTEREST_PRECISION = new BN(10).pow(
-	BANK_INTEREST_PRECISION_EXP
+export const SPOT_MARKET_INTEREST_PRECISION_EXP = new BN(6);
+export const SPOT_MARKET_INTEREST_PRECISION = new BN(10).pow(
+	SPOT_MARKET_INTEREST_PRECISION_EXP
 );
 
-export const BANK_CUMULATIVE_INTEREST_PRECISION_EXP = new BN(10);
-export const BANK_CUMULATIVE_INTEREST_PRECISION = new BN(10).pow(
-	BANK_CUMULATIVE_INTEREST_PRECISION_EXP
+export const SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION_EXP = new BN(10);
+export const SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION = new BN(10).pow(
+	SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION_EXP
 );
 
-export const BANK_UTILIZATION_PRECISION = new BN(1000000);
-export const BANK_RATE_PRECISION = new BN(1000000);
-export const BANK_WEIGHT_PRECISION = new BN(100);
-export const BANK_BALANCE_PRECISION_EXP = new BN(6);
-export const BANK_BALANCE_PRECISION = new BN(10).pow(
-	BANK_BALANCE_PRECISION_EXP
+export const SPOT_MARKET_UTILIZATION_PRECISION = new BN(1000000);
+export const SPOT_MARKET_RATE_PRECISION = new BN(1000000);
+export const SPOT_MARKET_WEIGHT_PRECISION = new BN(10000);
+export const SPOT_MARKET_BALANCE_PRECISION_EXP = new BN(6);
+export const SPOT_MARKET_BALANCE_PRECISION = new BN(10).pow(
+	SPOT_MARKET_BALANCE_PRECISION_EXP
 );
-export const BANK_IMF_PRECISION_EXP = new BN(6);
+export const SPOT_MARKET_IMF_PRECISION_EXP = new BN(6);
 
-export const BANK_IMF_PRECISION = new BN(10).pow(BANK_IMF_PRECISION_EXP);
+export const SPOT_MARKET_IMF_PRECISION = new BN(10).pow(
+	SPOT_MARKET_IMF_PRECISION_EXP
+);
 export const LIQUIDATION_FEE_PRECISION = new BN(1000000);
 
 export const QUOTE_PRECISION = new BN(10).pow(QUOTE_PRECISION_EXP);
@@ -66,7 +68,7 @@ export const BID_ASK_SPREAD_PRECISION = new BN(1000000);
 
 export const ONE_YEAR = new BN(31536000);
 
-export const QUOTE_ASSET_BANK_INDEX = new BN(0);
+export const QUOTE_SPOT_MARKET_INDEX = new BN(0);
 
 export const LAMPORTS_PRECISION = new BN(LAMPORTS_PER_SOL);
 export const LAMPORTS_EXP = new BN(Math.log10(LAMPORTS_PER_SOL));

package/{lib/constants/markets.js → src/constants/perpMarkets.js}

@@ -1,9 +1,9 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Markets = exports.MainnetMarkets = exports.DevnetMarkets = void 0;
-const __1 = require("../");
-const web3_js_1 = require("@solana/web3.js");
-exports.DevnetMarkets = [
+exports.__esModule = true;
+exports.PerpMarkets = exports.MainnetMarkets = exports.DevnetPerpMarkets = void 0;
+var __1 = require("../");
+var web3_js_1 = require("@solana/web3.js");
+exports.DevnetPerpMarkets = [
     {
         fullName: 'Solana',
         category: ['L1', 'Infra'],
@@ -12,7 +12,7 @@ exports.DevnetMarkets = [
         marketIndex: new __1.BN(0),
         oracle: new web3_js_1.PublicKey('J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix'),
         launchTs: 1655751353000,
-        oracleSource: __1.OracleSource.PYTH,
+        oracleSource: __1.OracleSource.PYTH
     },
     {
         fullName: 'Bitcoin',
@@ -22,7 +22,7 @@ exports.DevnetMarkets = [
         marketIndex: new __1.BN(1),
         oracle: new web3_js_1.PublicKey('HovQMDrbAgAYPCmHVSrezcSmkMtXSSUsLDFANExrZh2J'),
         launchTs: 1655751353000,
-        oracleSource: __1.OracleSource.PYTH,
+        oracleSource: __1.OracleSource.PYTH
     },
     {
         fullName: 'Ethereum',
@@ -32,11 +32,11 @@ exports.DevnetMarkets = [
         marketIndex: new __1.BN(2),
         oracle: new web3_js_1.PublicKey('EdVCmQ9FSPcVe5YySXDPCRmc8aDQLKJ9xvYBMZPie1Vw'),
         launchTs: 1637691133472,
-        oracleSource: __1.OracleSource.PYTH,
+        oracleSource: __1.OracleSource.PYTH
     },
 ];
 exports.MainnetMarkets = [];
-exports.Markets = {
-    devnet: exports.DevnetMarkets,
-    'mainnet-beta': [],
+exports.PerpMarkets = {
+    devnet: exports.DevnetPerpMarkets,
+    'mainnet-beta': []
 };

package/src/constants/{markets.ts → perpMarkets.ts}

@@ -2,7 +2,7 @@ import { BN, OracleSource } from '../';
 import { DriftEnv } from '../';
 import { PublicKey } from '@solana/web3.js';
 
-export type MarketConfig = {
+export type PerpMarketConfig = {
 	fullName?: string;
 	category?: string[];
 	symbol: string;
@@ -13,7 +13,7 @@ export type MarketConfig = {
 	oracleSource: OracleSource;
 };
 
-export const DevnetMarkets: MarketConfig[] = [
+export const DevnetPerpMarkets: PerpMarketConfig[] = [
 	{
 		fullName: 'Solana',
 		category: ['L1', 'Infra'],
@@ -46,9 +46,9 @@ export const DevnetMarkets: MarketConfig[] = [
 	},
 ];
 
-export const MainnetMarkets: MarketConfig[] = [];
+export const MainnetMarkets: PerpMarketConfig[] = [];
 
-export const Markets: { [key in DriftEnv]: MarketConfig[] } = {
-	devnet: DevnetMarkets,
+export const PerpMarkets: { [key in DriftEnv]: PerpMarketConfig[] } = {
+	devnet: DevnetPerpMarkets,
 	'mainnet-beta': [],
 };

package/src/constants/spotMarkets.js

@@ -0,0 +1,51 @@
+"use strict";
+exports.__esModule = true;
+exports.SpotMarkets = exports.MainnetSpotMarkets = exports.DevnetSpotMarkets = exports.WRAPPED_SOL_MINT = void 0;
+var web3_js_1 = require("@solana/web3.js");
+var __1 = require("../");
+var numericConstants_1 = require("./numericConstants");
+exports.WRAPPED_SOL_MINT = new web3_js_1.PublicKey('So11111111111111111111111111111111111111112');
+exports.DevnetSpotMarkets = [
+    {
+        symbol: 'USDC',
+        marketIndex: new __1.BN(0),
+        oracle: web3_js_1.PublicKey["default"],
+        oracleSource: __1.OracleSource.QUOTE_ASSET,
+        mint: new web3_js_1.PublicKey('8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2'),
+        precision: numericConstants_1.SPOT_MARKET_BALANCE_PRECISION,
+        precisionExp: numericConstants_1.SPOT_MARKET_BALANCE_PRECISION_EXP
+    },
+    {
+        symbol: 'SOL',
+        marketIndex: new __1.BN(1),
+        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',
+        marketIndex: new __1.BN(2),
+        oracle: new web3_js_1.PublicKey('HovQMDrbAgAYPCmHVSrezcSmkMtXSSUsLDFANExrZh2J'),
+        oracleSource: __1.OracleSource.PYTH,
+        mint: new web3_js_1.PublicKey('3BZPwbcqB5kKScF3TEXxwNfx5ipV13kbRVDvfVp5c6fv'),
+        precision: numericConstants_1.SPOT_MARKET_BALANCE_PRECISION,
+        precisionExp: numericConstants_1.SPOT_MARKET_BALANCE_PRECISION_EXP
+    },
+];
+exports.MainnetSpotMarkets = [
+    {
+        symbol: 'USDC',
+        marketIndex: new __1.BN(0),
+        oracle: web3_js_1.PublicKey["default"],
+        oracleSource: __1.OracleSource.QUOTE_ASSET,
+        mint: new web3_js_1.PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'),
+        precision: numericConstants_1.SPOT_MARKET_BALANCE_PRECISION,
+        precisionExp: numericConstants_1.SPOT_MARKET_BALANCE_PRECISION_EXP
+    },
+];
+exports.SpotMarkets = {
+    devnet: exports.DevnetSpotMarkets,
+    'mainnet-beta': exports.MainnetSpotMarkets
+};

package/src/constants/{banks.ts → spotMarkets.ts}

@@ -1,15 +1,15 @@
 import { PublicKey } from '@solana/web3.js';
 import { BN, DriftEnv, OracleSource } from '../';
 import {
-	BANK_BALANCE_PRECISION,
-	BANK_BALANCE_PRECISION_EXP,
+	SPOT_MARKET_BALANCE_PRECISION,
+	SPOT_MARKET_BALANCE_PRECISION_EXP,
 	LAMPORTS_EXP,
 	LAMPORTS_PRECISION,
 } from './numericConstants';
 
-export type BankConfig = {
+export type SpotMarketConfig = {
 	symbol: string;
-	bankIndex: BN;
+	marketIndex: BN;
 	oracle: PublicKey;
 	mint: PublicKey;
 	oracleSource: OracleSource;
@@ -21,19 +21,19 @@ export const WRAPPED_SOL_MINT = new PublicKey(
 	'So11111111111111111111111111111111111111112'
 );
 
-export const DevnetBanks: BankConfig[] = [
+export const DevnetSpotMarkets: SpotMarketConfig[] = [
 	{
 		symbol: 'USDC',
-		bankIndex: new BN(0),
+		marketIndex: new BN(0),
 		oracle: PublicKey.default,
 		oracleSource: OracleSource.QUOTE_ASSET,
 		mint: new PublicKey('8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2'),
-		precision: BANK_BALANCE_PRECISION,
-		precisionExp: BANK_BALANCE_PRECISION_EXP,
+		precision: SPOT_MARKET_BALANCE_PRECISION,
+		precisionExp: SPOT_MARKET_BALANCE_PRECISION_EXP,
 	},
 	{
 		symbol: 'SOL',
-		bankIndex: new BN(1),
+		marketIndex: new BN(1),
 		oracle: new PublicKey('J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix'),
 		oracleSource: OracleSource.PYTH,
 		mint: new PublicKey(WRAPPED_SOL_MINT),
@@ -42,28 +42,28 @@ export const DevnetBanks: BankConfig[] = [
 	},
 	{
 		symbol: 'BTC',
-		bankIndex: new BN(2),
+		marketIndex: new BN(2),
 		oracle: new PublicKey('HovQMDrbAgAYPCmHVSrezcSmkMtXSSUsLDFANExrZh2J'),
 		oracleSource: OracleSource.PYTH,
 		mint: new PublicKey('3BZPwbcqB5kKScF3TEXxwNfx5ipV13kbRVDvfVp5c6fv'),
-		precision: BANK_BALANCE_PRECISION,
-		precisionExp: BANK_BALANCE_PRECISION_EXP,
+		precision: SPOT_MARKET_BALANCE_PRECISION,
+		precisionExp: SPOT_MARKET_BALANCE_PRECISION_EXP,
 	},
 ];
 
-export const MainnetBanks: BankConfig[] = [
+export const MainnetSpotMarkets: SpotMarketConfig[] = [
 	{
 		symbol: 'USDC',
-		bankIndex: new BN(0),
+		marketIndex: new BN(0),
 		oracle: PublicKey.default,
 		oracleSource: OracleSource.QUOTE_ASSET,
 		mint: new PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'),
-		precision: BANK_BALANCE_PRECISION,
-		precisionExp: BANK_BALANCE_PRECISION_EXP,
+		precision: SPOT_MARKET_BALANCE_PRECISION,
+		precisionExp: SPOT_MARKET_BALANCE_PRECISION_EXP,
 	},
 ];
 
-export const Banks: { [key in DriftEnv]: BankConfig[] } = {
-	devnet: DevnetBanks,
-	'mainnet-beta': MainnetBanks,
+export const SpotMarkets: { [key in DriftEnv]: SpotMarketConfig[] } = {
+	devnet: DevnetSpotMarkets,
+	'mainnet-beta': MainnetSpotMarkets,
 };