@drift-labs/sdk 0.1.24 → 0.1.25-master.0

package/lib/constants/markets.d.ts

@@ -1,12 +1,12 @@
 /// <reference types="bn.js" />
-import { BN } from '../';
-declare type Market = {
+import { BN, OracleSource } from '../';
+export declare type MarketConfig = {
     symbol: string;
     baseAssetSymbol: string;
     marketIndex: BN;
     devnetPythOracle: string;
     mainnetPythOracle: string;
     launchTs: number;
+    oracleSource: OracleSource;
 };
-export declare const Markets: Market[];
-export {};
+export declare const Markets: MarketConfig[];

package/lib/constants/markets.js

@@ -10,6 +10,7 @@ exports.Markets = [
         devnetPythOracle: 'J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix',
         mainnetPythOracle: 'H6ARHf6YXhGYeQfUzQNGk6rDNnLBQKrenN712K4AQJEG',
         launchTs: 1635209696886,
+        oracleSource: __1.OracleSource.PYTH,
     },
     {
         symbol: 'BTC-PERP',
@@ -18,6 +19,7 @@ exports.Markets = [
         devnetPythOracle: 'HovQMDrbAgAYPCmHVSrezcSmkMtXSSUsLDFANExrZh2J',
         mainnetPythOracle: 'GVXRSBjFk6e6J3NbVPXohDJetcTjaeeuykUpbQF8UoMU',
         launchTs: 1637691088868,
+        oracleSource: __1.OracleSource.PYTH,
     },
     {
         symbol: 'ETH-PERP',
@@ -26,6 +28,7 @@ exports.Markets = [
         devnetPythOracle: 'EdVCmQ9FSPcVe5YySXDPCRmc8aDQLKJ9xvYBMZPie1Vw',
         mainnetPythOracle: 'JBu1AL4obBcCMqKBBxhpWCNUt136ijcuMZLFvTP7iWdB',
         launchTs: 1637691133472,
+        oracleSource: __1.OracleSource.PYTH,
     },
     {
         symbol: 'LUNA-PERP',
@@ -34,6 +37,7 @@ exports.Markets = [
         devnetPythOracle: '8PugCXTAHLM9kfLSQWe2njE5pzAgUdpPk3Nx5zSm7BD3',
         mainnetPythOracle: '5bmWuR1dgP4avtGYMNKLuxumZTVKGgoN2BCMXWDNL9nY',
         launchTs: 1638821738525,
+        oracleSource: __1.OracleSource.PYTH,
     },
     {
         symbol: 'AVAX-PERP',
@@ -42,6 +46,7 @@ exports.Markets = [
         devnetPythOracle: 'FVb5h1VmHPfVb1RfqZckchq18GxRv4iKt8T4eVTQAqdz',
         mainnetPythOracle: 'Ax9ujW5B9oqcv59N8m6f1BpTBq2rGeGaBcpKjC5UYsXU',
         launchTs: 1639092501080,
+        oracleSource: __1.OracleSource.PYTH,
     },
     {
         symbol: 'BNB-PERP',
@@ -50,6 +55,7 @@ exports.Markets = [
         devnetPythOracle: 'GwzBgrXb4PG59zjce24SF2b9JXbLEjJJTBkmytuEZj1b',
         mainnetPythOracle: '4CkQJBxhU8EZ2UjhigbtdaPbpTe6mqf811fipYBFbSYN',
         launchTs: 1639523193012,
+        oracleSource: __1.OracleSource.PYTH,
     },
     {
         symbol: 'MATIC-PERP',
@@ -58,6 +64,7 @@ exports.Markets = [
         devnetPythOracle: 'FBirwuDFuRAu4iSGc7RGxN5koHB7EJM1wbCmyPuQoGur',
         mainnetPythOracle: '7KVswB9vkCgeM3SHP7aGDijvdRAHK8P5wi9JXViCrtYh',
         launchTs: 1641488603564,
+        oracleSource: __1.OracleSource.PYTH,
     },
     {
         symbol: 'ATOM-PERP',
@@ -66,6 +73,7 @@ exports.Markets = [
         devnetPythOracle: '7YAze8qFUMkBnyLVdKT4TFUUFui99EwS5gfRArMcrvFk',
         mainnetPythOracle: 'CrCpTerNqtZvqLcKqz1k13oVeXV9WkMD2zA9hBKXrsbN',
         launchTs: 1641920238195,
+        oracleSource: __1.OracleSource.PYTH,
     },
     {
         symbol: 'DOT-PERP',
@@ -74,6 +82,7 @@ exports.Markets = [
         devnetPythOracle: '4dqq5VBpN4EwYb7wyywjjfknvMKu7m78j9mKZRXTj462',
         mainnetPythOracle: 'EcV1X1gY2yb4KXxjVQtTHTbioum2gvmPnFk4zYAt7zne',
         launchTs: 1642629253786,
+        oracleSource: __1.OracleSource.PYTH,
     },
     {
         symbol: 'ADA-PERP',
@@ -82,6 +91,7 @@ exports.Markets = [
         devnetPythOracle: '8oGTURNmSQkrBS1AQ5NjB2p8qY34UVmMA9ojrw8vnHus',
         mainnetPythOracle: '3pyn4svBbxJ9Wnn3RVeafyLWfzie6yC5eTig2S62v9SC',
         launchTs: 1643084413000,
+        oracleSource: __1.OracleSource.PYTH,
     },
     {
         symbol: 'ALGO-PERP',
@@ -90,6 +100,7 @@ exports.Markets = [
         devnetPythOracle: 'c1A946dY5NHuVda77C8XXtXytyR3wK1SCP3eA9VRfC3',
         mainnetPythOracle: 'HqFyq1wh1xKvL7KDqqT7NJeSPdAqsDqnmBisUC2XdXAX',
         launchTs: 1643686767000,
+        oracleSource: __1.OracleSource.PYTH,
     },
     {
         symbol: 'FTT-PERP',
@@ -98,6 +109,7 @@ exports.Markets = [
         devnetPythOracle: '6vivTRs5ZPeeXbjo7dfburfaYDWoXjBtdtuYgQRuGfu',
         mainnetPythOracle: '8JPJJkmDScpcNmBRKGZuPuG2GYAveQgP3t5gFuMymwvF',
         launchTs: 1644382122000,
+        oracleSource: __1.OracleSource.PYTH,
     },
     {
         symbol: 'LTC-PERP',
@@ -106,6 +118,16 @@ exports.Markets = [
         devnetPythOracle: 'BLArYBCUYhdWiY8PCUTpvFE21iaJq85dvxLk9bYMobcU',
         mainnetPythOracle: '8RMnV1eD55iqUFJLMguPkYBkq8DCtx81XcmAja93LvRR',
         launchTs: 1645027429000,
+        oracleSource: __1.OracleSource.PYTH,
+    },
+    {
+        symbol: 'XRP-PERP',
+        baseAssetSymbol: 'XRP',
+        marketIndex: new __1.BN(13),
+        devnetPythOracle: 'WMW5xc3HypXwTnPesyUT49uLsyHwNURsWAEk39onKuk',
+        mainnetPythOracle: 'WMW5xc3HypXwTnPesyUT49uLsyHwNURsWAEk39onKuk',
+        launchTs: 1647543166000,
+        oracleSource: __1.OracleSource.SWITCHBOARD,
     },
     // {
     // 	symbol: 'mSOL-PERP',

package/lib/constants/numericConstants.d.ts

@@ -3,6 +3,7 @@ import { BN } from '../';
 export declare const ZERO: BN;
 export declare const ONE: BN;
 export declare const TWO: BN;
+export declare const TEN: BN;
 export declare const TEN_THOUSAND: BN;
 export declare const BN_MAX: BN;
 export declare const MAX_LEVERAGE: BN;

package/lib/constants/numericConstants.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MARGIN_PRECISION = exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.PRICE_TO_QUOTE_PRECISION = exports.AMM_TO_QUOTE_PRECISION_RATIO = exports.BASE_PRECISION = exports.AMM_RESERVE_PRECISION = exports.PEG_PRECISION = exports.FUNDING_PAYMENT_PRECISION = exports.MARK_PRICE_PRECISION = exports.QUOTE_PRECISION = exports.MAX_LEVERAGE = exports.BN_MAX = exports.TEN_THOUSAND = exports.TWO = exports.ONE = exports.ZERO = void 0;
+exports.MARGIN_PRECISION = exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.PRICE_TO_QUOTE_PRECISION = exports.AMM_TO_QUOTE_PRECISION_RATIO = exports.BASE_PRECISION = exports.AMM_RESERVE_PRECISION = exports.PEG_PRECISION = exports.FUNDING_PAYMENT_PRECISION = exports.MARK_PRICE_PRECISION = exports.QUOTE_PRECISION = exports.MAX_LEVERAGE = exports.BN_MAX = exports.TEN_THOUSAND = exports.TEN = exports.TWO = exports.ONE = exports.ZERO = void 0;
 const __1 = require("../");
 exports.ZERO = new __1.BN(0);
 exports.ONE = new __1.BN(1);
 exports.TWO = new __1.BN(2);
+exports.TEN = new __1.BN(10);
 exports.TEN_THOUSAND = new __1.BN(10000);
 exports.BN_MAX = new __1.BN(Number.MAX_SAFE_INTEGER);
 exports.MAX_LEVERAGE = new __1.BN(5);

package/lib/examples/makeTradeExample.js

@@ -21,7 +21,7 @@ const getTokenAddress = (mintAddress, userPubKey) => {
 exports.getTokenAddress = getTokenAddress;
 const main = () => __awaiter(void 0, void 0, void 0, function* () {
     // Initialize Drift SDK
-    const sdkConfig = __2.initialize({ env: 'devnet' });
+    const sdkConfig = (0, __2.initialize)({ env: 'devnet' });
     // Set up the Wallet and Provider
     const privateKey = process.env.BOT_PRIVATE_KEY; // stored as an array string
     const keypair = web3_js_1.Keypair.fromSecretKey(Uint8Array.from(JSON.parse(privateKey)));
@@ -35,7 +35,7 @@ const main = () => __awaiter(void 0, void 0, void 0, function* () {
     const lamportsBalance = yield connection.getBalance(wallet.publicKey);
     console.log('SOL balance:', lamportsBalance / Math.pow(10, 9));
     // Misc. other things to set up
-    const usdcTokenAddress = yield exports.getTokenAddress(sdkConfig.USDC_MINT_ADDRESS, wallet.publicKey.toString());
+    const usdcTokenAddress = yield (0, exports.getTokenAddress)(sdkConfig.USDC_MINT_ADDRESS, wallet.publicKey.toString());
     // Set up the Drift Clearing House
     const clearingHousePublicKey = new web3_js_1.PublicKey(sdkConfig.CLEARING_HOUSE_PROGRAM_ID);
     const clearingHouse = __2.ClearingHouse.from(connection, provider.wallet, clearingHousePublicKey);
@@ -47,18 +47,18 @@ const main = () => __awaiter(void 0, void 0, void 0, function* () {
     if (!userAccountExists) {
         //// Create a Clearing House account by Depositing some USDC ($10,000 in this case)
         const depositAmount = new anchor_1.BN(10000).mul(__2.QUOTE_PRECISION);
-        yield clearingHouse.initializeUserAccountAndDepositCollateral(depositAmount, yield exports.getTokenAddress(usdcTokenAddress.toString(), wallet.publicKey.toString()));
+        yield clearingHouse.initializeUserAccountAndDepositCollateral(depositAmount, yield (0, exports.getTokenAddress)(usdcTokenAddress.toString(), wallet.publicKey.toString()));
     }
     yield user.subscribe();
     // Get current price
     const solMarketInfo = __2.Markets.find((market) => market.baseAssetSymbol === 'SOL');
-    const currentMarketPrice = __2.calculateMarkPrice(clearingHouse.getMarket(solMarketInfo.marketIndex));
-    const formattedPrice = __2.convertToNumber(currentMarketPrice, __2.MARK_PRICE_PRECISION);
+    const currentMarketPrice = (0, __2.calculateMarkPrice)(clearingHouse.getMarket(solMarketInfo.marketIndex));
+    const formattedPrice = (0, __2.convertToNumber)(currentMarketPrice, __2.MARK_PRICE_PRECISION);
     console.log(`Current Market Price is $${formattedPrice}`);
     // Estimate the slippage for a $5000 LONG trade
     const solMarketAccount = clearingHouse.getMarket(solMarketInfo.marketIndex);
     const longAmount = new anchor_1.BN(5000).mul(__2.QUOTE_PRECISION);
-    const slippage = __2.convertToNumber(__2.calculateTradeSlippage(__2.PositionDirection.LONG, longAmount, solMarketAccount)[0], __2.MARK_PRICE_PRECISION);
+    const slippage = (0, __2.convertToNumber)((0, __2.calculateTradeSlippage)(__2.PositionDirection.LONG, longAmount, solMarketAccount)[0], __2.MARK_PRICE_PRECISION);
     console.log(`Slippage for a $5000 LONG on the SOL market would be $${slippage}`);
     // Make a $5000 LONG trade
     yield clearingHouse.openPosition(__2.PositionDirection.LONG, longAmount, solMarketInfo.marketIndex);

package/lib/factory/oracleClient.d.ts

@@ -0,0 +1,5 @@
+import { OracleSource } from '../types';
+import { Connection } from '@solana/web3.js';
+import { DriftEnv } from '../config';
+import { OracleClient } from '../oracles/types';
+export declare function getOracleClient(oracleSource: OracleSource, connection: Connection, env: DriftEnv): OracleClient;

package/lib/factory/oracleClient.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getOracleClient = void 0;
+const types_1 = require("../types");
+const pythClient_1 = require("../oracles/pythClient");
+const switchboardClient_1 = require("../oracles/switchboardClient");
+function getOracleClient(oracleSource, connection, env) {
+    if ((0, types_1.isVariant)(oracleSource, 'pyth')) {
+        return new pythClient_1.PythClient(connection);
+    }
+    if ((0, types_1.isVariant)(oracleSource, 'switchboard')) {
+        return new switchboardClient_1.SwitchboardClient(connection, env);
+    }
+    throw new Error(`Unknown oracle source ${oracleSource}`);
+}
+exports.getOracleClient = getOracleClient;

package/lib/idl/clearing_house.json

@@ -212,6 +212,12 @@
                     "name": "ammPegMultiplier",
                     "type": "u128"
                 },
+                {
+                    "name": "oracleSource",
+                    "type": {
+                        "defined": "OracleSource"
+                    }
+                },
                 {
                     "name": "marginRatioInitial",
                     "type": "u32"
@@ -3255,12 +3261,16 @@
                         "name": "fillerReward",
                         "type": "u128"
                     },
+                    {
+                        "name": "quoteAssetAmountSurplus",
+                        "type": "u128"
+                    },
                     {
                         "name": "padding",
                         "type": {
                             "array": [
                                 "u64",
-                                10
+                                8
                             ]
                         }
                     }