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

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: '3v1iEjbSSLSSYyt1pmx4UB5rqJGurmz71RibXF7X6UF3',
+		CLEARING_HOUSE_PROGRAM_ID: 'CUowJP5Dea7pkc2mKrkX2RuZUrPXL3u419iBRXyZEWQz',
 		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.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/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/{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,
 };