@drift-labs/sdk 2.103.0-beta.4 → 2.103.0-beta.6

package/VERSION

@@ -1 +1 @@
-2.103.0-beta.4
+2.103.0-beta.6

package/lib/browser/accounts/grpcDriftClientAccountSubscriber.js

@@ -5,6 +5,7 @@ const webSocketDriftClientAccountSubscriber_1 = require("./webSocketDriftClientA
 const config_1 = require("../config");
 const pda_1 = require("../addresses/pda");
 const grpcAccountSubscriber_1 = require("./grpcAccountSubscriber");
+const oracleId_1 = require("../oracles/oracleId");
 class gprcDriftClientAccountSubscriber extends webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber {
     constructor(grpcConfigs, program, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles, delistedMarketSetting, resubOpts) {
         super(program, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles, delistedMarketSetting, resubOpts);
@@ -80,17 +81,17 @@ class gprcDriftClientAccountSubscriber extends webSocketDriftClientAccountSubscr
         return true;
     }
     async subscribeToOracle(oracleInfo) {
-        const oracleString = oracleInfo.publicKey.toString();
+        const oracleId = (0, oracleId_1.getOracleId)(oracleInfo.publicKey, oracleInfo.source);
         const client = this.oracleClientCache.get(oracleInfo.source, this.program.provider.connection, this.program);
         const accountSubscriber = new grpcAccountSubscriber_1.grpcAccountSubscriber(this.grpcConfigs, 'oracle', this.program, oracleInfo.publicKey, (buffer) => {
             return client.getOraclePriceDataFromBuffer(buffer);
         }, this.resubOpts);
-        accountSubscriber.setData(this.initialOraclePriceData.get(oracleString));
+        accountSubscriber.setData(this.initialOraclePriceData.get(oracleId));
         await accountSubscriber.subscribe((data) => {
-            this.eventEmitter.emit('oraclePriceUpdate', oracleInfo.publicKey, data);
+            this.eventEmitter.emit('oraclePriceUpdate', oracleInfo.publicKey, oracleInfo.source, data);
             this.eventEmitter.emit('update');
         });
-        this.oracleSubscribers.set(oracleString, accountSubscriber);
+        this.oracleSubscribers.set(oracleId, accountSubscriber);
         return true;
     }
 }

package/lib/browser/accounts/pollingDriftClientAccountSubscriber.d.ts

@@ -62,7 +62,7 @@ export declare class PollingDriftClientAccountSubscriber implements DriftClientA
     getMarketAccountsAndSlots(): DataAndSlot<PerpMarketAccount>[];
     getSpotMarketAccountAndSlot(marketIndex: number): DataAndSlot<SpotMarketAccount> | undefined;
     getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[];
-    getOraclePriceDataAndSlot(oraclePublicKey: PublicKey | string): DataAndSlot<OraclePriceData> | undefined;
+    getOraclePriceDataAndSlot(oracleId: string): DataAndSlot<OraclePriceData> | undefined;
     getOraclePriceDataAndSlotForPerpMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
     getOraclePriceDataAndSlotForSpotMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
     updateAccountLoaderPollingFrequency(pollingFrequency: number): void;

package/lib/browser/accounts/pollingDriftClientAccountSubscriber.js

@@ -3,13 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PollingDriftClientAccountSubscriber = void 0;
 const types_1 = require("./types");
 const events_1 = require("events");
+const types_2 = require("../types");
 const pda_1 = require("../addresses/pda");
 const utils_1 = require("./utils");
 const web3_js_1 = require("@solana/web3.js");
 const oracleClientCache_1 = require("../oracles/oracleClientCache");
 const quoteAssetOracleClient_1 = require("../oracles/quoteAssetOracleClient");
 const config_1 = require("../config");
-const ORACLE_DEFAULT_KEY = web3_js_1.PublicKey.default.toBase58();
+const oracleId_1 = require("../oracles/oracleId");
+const ORACLE_DEFAULT_ID = (0, oracleId_1.getOracleId)(web3_js_1.PublicKey.default, types_2.OracleSource.QUOTE_ASSET);
 class PollingDriftClientAccountSubscriber {
     constructor(program, accountLoader, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles, delistedMarketSetting) {
         this.oracleClientCache = new oracleClientCache_1.OracleClientCache();
@@ -126,7 +128,7 @@ class PollingDriftClientAccountSubscriber {
         return true;
     }
     addOracleToPoll(oracleInfo) {
-        this.oraclesToPoll.set(oracleInfo.publicKey.toString(), {
+        this.oraclesToPoll.set((0, oracleId_1.getOracleId)(oracleInfo.publicKey, oracleInfo.source), {
             publicKey: oracleInfo.publicKey,
             source: oracleInfo.source,
         });
@@ -171,6 +173,7 @@ class PollingDriftClientAccountSubscriber {
     }
     async addOracleToAccountLoader(oracleToPoll) {
         const oracleClient = this.oracleClientCache.get(oracleToPoll.source, this.program.provider.connection, this.program);
+        const oracleId = (0, oracleId_1.getOracleId)(oracleToPoll.publicKey, oracleToPoll.source);
         oracleToPoll.callbackId = await this.accountLoader.addAccount(oracleToPoll.publicKey, (buffer, slot) => {
             if (!buffer)
                 return;
@@ -179,8 +182,8 @@ class PollingDriftClientAccountSubscriber {
                 data: oraclePriceData,
                 slot,
             };
-            this.oracles.set(oracleToPoll.publicKey.toString(), dataAndSlot);
-            this.eventEmitter.emit('oraclePriceUpdate', oracleToPoll.publicKey, oraclePriceData);
+            this.oracles.set(oracleId, dataAndSlot);
+            this.eventEmitter.emit('oraclePriceUpdate', oracleToPoll.publicKey, oracleToPoll.source, oraclePriceData);
             this.eventEmitter.emit('update');
         });
     }
@@ -217,7 +220,7 @@ class PollingDriftClientAccountSubscriber {
             if (buffer) {
                 const oracleClient = this.oracleClientCache.get(oracleToPoll.source, this.program.provider.connection, this.program);
                 const oraclePriceData = oracleClient.getOraclePriceDataFromBuffer(buffer);
-                this.oracles.set(oracleToPoll.publicKey.toString(), {
+                this.oracles.set((0, oracleId_1.getOracleId)(oracleToPoll.publicKey, oracleToPoll.source), {
                     data: oraclePriceData,
                     slot,
                 });
@@ -265,19 +268,19 @@ class PollingDriftClientAccountSubscriber {
         return true;
     }
     async addOracle(oracleInfo) {
+        const oracleId = (0, oracleId_1.getOracleId)(oracleInfo.publicKey, oracleInfo.source);
         if (oracleInfo.publicKey.equals(web3_js_1.PublicKey.default) ||
-            this.oracles.has(oracleInfo.publicKey.toBase58())) {
+            this.oracles.has(oracleId)) {
             return true;
         }
-        const oracleString = oracleInfo.publicKey.toBase58();
         // this func can be called multiple times before the first pauseForOracleToBeAdded finishes
         // avoid adding to oraclesToPoll multiple time
-        if (!this.oraclesToPoll.has(oracleString)) {
+        if (!this.oraclesToPoll.has(oracleId)) {
             this.addOracleToPoll(oracleInfo);
-            const oracleToPoll = this.oraclesToPoll.get(oracleString);
+            const oracleToPoll = this.oraclesToPoll.get(oracleId);
             await this.addOracleToAccountLoader(oracleToPoll);
         }
-        await this.pauseForOracleToBeAdded(3, oracleString);
+        await this.pauseForOracleToBeAdded(3, oracleInfo.publicKey.toBase58());
         return true;
     }
     async pauseForOracleToBeAdded(tries, oracle) {
@@ -298,14 +301,15 @@ class PollingDriftClientAccountSubscriber {
             const perpMarketAccount = perpMarket.data;
             const perpMarketIndex = perpMarketAccount.marketIndex;
             const oracle = perpMarketAccount.amm.oracle;
-            if (!this.oracles.has(oracle.toBase58())) {
+            const oracleId = (0, oracleId_1.getOracleId)(oracle, perpMarketAccount.amm.oracleSource);
+            if (!this.oracles.has(oracleId)) {
                 oraclePromises.push(this.addOracle({
                     publicKey: oracle,
                     source: perpMarketAccount.amm.oracleSource,
                 }));
             }
             this.perpOracleMap.set(perpMarketIndex, oracle);
-            this.perpOracleStringMap.set(perpMarketIndex, oracle.toBase58());
+            this.perpOracleStringMap.set(perpMarketIndex, oracleId);
         }
         await Promise.all(oraclePromises);
     }
@@ -316,14 +320,15 @@ class PollingDriftClientAccountSubscriber {
             const spotMarketAccount = spotMarket.data;
             const spotMarketIndex = spotMarketAccount.marketIndex;
             const oracle = spotMarketAccount.oracle;
-            if (!this.oracles.has(oracle.toBase58())) {
+            const oracleId = (0, oracleId_1.getOracleId)(oracle, spotMarketAccount.oracleSource);
+            if (!this.oracles.has(oracleId)) {
                 oraclePromises.push(this.addOracle({
                     publicKey: oracle,
                     source: spotMarketAccount.oracleSource,
                 }));
             }
             this.spotOracleMap.set(spotMarketIndex, oracle);
-            this.spotOracleStringMap.set(spotMarketIndex, oracle.toBase58());
+            this.spotOracleStringMap.set(spotMarketIndex, oracleId);
         }
         await Promise.all(oraclePromises);
     }
@@ -341,10 +346,11 @@ class PollingDriftClientAccountSubscriber {
             }
         }
         for (const oracle of oracles) {
-            const callbackId = this.oraclesToPoll.get(oracle.toBase58()).callbackId;
-            this.accountLoader.removeAccount(oracle, callbackId);
+            const oracleId = (0, oracleId_1.getOracleId)(oracle.publicKey, oracle.source);
+            const callbackId = this.oraclesToPoll.get(oracleId).callbackId;
+            this.accountLoader.removeAccount(oracle.publicKey, callbackId);
             if (this.delistedMarketSetting === types_1.DelistedMarketSetting.Discard) {
-                this.oracles.delete(oracle.toBase58());
+                this.oracles.delete(oracleId);
             }
         }
     }
@@ -369,23 +375,20 @@ class PollingDriftClientAccountSubscriber {
     getSpotMarketAccountsAndSlots() {
         return Array.from(this.spotMarket.values());
     }
-    getOraclePriceDataAndSlot(oraclePublicKey) {
+    getOraclePriceDataAndSlot(oracleId) {
         this.assertIsSubscribed();
-        const oracleString = typeof oraclePublicKey === 'string'
-            ? oraclePublicKey
-            : oraclePublicKey.toBase58();
-        if (oracleString === ORACLE_DEFAULT_KEY) {
+        if (oracleId === ORACLE_DEFAULT_ID) {
             return {
                 data: quoteAssetOracleClient_1.QUOTE_ORACLE_PRICE_DATA,
                 slot: 0,
             };
         }
-        return this.oracles.get(oracleString);
+        return this.oracles.get(oracleId);
     }
     getOraclePriceDataAndSlotForPerpMarket(marketIndex) {
         const perpMarketAccount = this.getMarketAccountAndSlot(marketIndex);
         const oracle = this.perpOracleMap.get(marketIndex);
-        const oracleString = this.perpOracleStringMap.get(marketIndex);
+        const oracleId = this.perpOracleStringMap.get(marketIndex);
         if (!perpMarketAccount || !oracle) {
             return undefined;
         }
@@ -393,12 +396,12 @@ class PollingDriftClientAccountSubscriber {
             // If the oracle has changed, we need to update the oracle map in background
             this.setPerpOracleMap();
         }
-        return this.getOraclePriceDataAndSlot(oracleString);
+        return this.getOraclePriceDataAndSlot(oracleId);
     }
     getOraclePriceDataAndSlotForSpotMarket(marketIndex) {
         const spotMarketAccount = this.getSpotMarketAccountAndSlot(marketIndex);
         const oracle = this.spotOracleMap.get(marketIndex);
-        const oracleString = this.spotOracleStringMap.get(marketIndex);
+        const oracleId = this.spotOracleStringMap.get(marketIndex);
         if (!spotMarketAccount || !oracle) {
             return undefined;
         }
@@ -406,7 +409,7 @@ class PollingDriftClientAccountSubscriber {
             // If the oracle has changed, we need to update the oracle map in background
             this.setSpotOracleMap();
         }
-        return this.getOraclePriceDataAndSlot(oracleString);
+        return this.getOraclePriceDataAndSlot(oracleId);
     }
     updateAccountLoaderPollingFrequency(pollingFrequency) {
         this.accountLoader.updatePollingFrequency(pollingFrequency);

package/lib/browser/accounts/types.d.ts

@@ -26,7 +26,7 @@ export interface DriftClientAccountEvents {
     stateAccountUpdate: (payload: StateAccount) => void;
     perpMarketAccountUpdate: (payload: PerpMarketAccount) => void;
     spotMarketAccountUpdate: (payload: SpotMarketAccount) => void;
-    oraclePriceUpdate: (publicKey: PublicKey, data: OraclePriceData) => void;
+    oraclePriceUpdate: (publicKey: PublicKey, oracleSource: OracleSource, data: OraclePriceData) => void;
     userAccountUpdate: (payload: UserAccount) => void;
     update: void;
     error: (e: Error) => void;
@@ -47,7 +47,7 @@ export interface DriftClientAccountSubscriber {
     getMarketAccountsAndSlots(): DataAndSlot<PerpMarketAccount>[];
     getSpotMarketAccountAndSlot(marketIndex: number): DataAndSlot<SpotMarketAccount> | undefined;
     getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[];
-    getOraclePriceDataAndSlot(oraclePublicKey: PublicKey | string): DataAndSlot<OraclePriceData> | undefined;
+    getOraclePriceDataAndSlot(oracleId: string): DataAndSlot<OraclePriceData> | undefined;
     getOraclePriceDataAndSlotForPerpMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
     getOraclePriceDataAndSlotForSpotMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
     updateAccountLoaderPollingFrequency?: (pollingFrequency: number) => void;

package/lib/browser/accounts/utils.d.ts

@@ -1,8 +1,8 @@
-import { PublicKey } from '@solana/web3.js';
 import { DataAndSlot } from './types';
 import { PerpMarketAccount, SpotMarketAccount } from '../types';
+import { OracleInfo } from '../oracles/types';
 export declare function capitalize(value: string): string;
 export declare function findDelistedPerpMarketsAndOracles(perpMarkets: DataAndSlot<PerpMarketAccount>[], spotMarkets: DataAndSlot<SpotMarketAccount>[]): {
     perpMarketIndexes: number[];
-    oracles: PublicKey[];
+    oracles: OracleInfo[];
 };

package/lib/browser/accounts/utils.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findDelistedPerpMarketsAndOracles = exports.capitalize = void 0;
 const types_1 = require("../types");
+const oracleId_1 = require("../oracles/oracleId");
 function capitalize(value) {
     return value[0].toUpperCase() + value.slice(1);
 }
@@ -15,21 +16,30 @@ function findDelistedPerpMarketsAndOracles(perpMarkets, spotMarkets) {
         }
         if ((0, types_1.isVariant)(perpMarket.data.status, 'delisted')) {
             delistedPerpMarketIndexes.push(perpMarket.data.marketIndex);
-            delistedOracles.push(perpMarket.data.amm.oracle);
+            delistedOracles.push({
+                publicKey: perpMarket.data.amm.oracle,
+                source: perpMarket.data.amm.oracleSource,
+            });
         }
     }
     // make sure oracle isn't used by spot market
     const filteredDelistedOracles = [];
     for (const delistedOracle of delistedOracles) {
+        let isUsedBySpotMarket = false;
         for (const spotMarket of spotMarkets) {
             if (!spotMarket.data) {
                 continue;
             }
-            if (spotMarket.data.oracle.equals(delistedOracle)) {
+            const delistedOracleId = (0, oracleId_1.getOracleId)(delistedOracle.publicKey, delistedOracle.source);
+            const spotMarketOracleId = (0, oracleId_1.getOracleId)(spotMarket.data.oracle, spotMarket.data.oracleSource);
+            if (spotMarketOracleId === delistedOracleId) {
+                isUsedBySpotMarket = true;
                 break;
             }
         }
-        filteredDelistedOracles.push(delistedOracle);
+        if (!isUsedBySpotMarket) {
+            filteredDelistedOracles.push(delistedOracle);
+        }
     }
     return {
         perpMarketIndexes: delistedPerpMarketIndexes,

package/lib/browser/accounts/webSocketDriftClientAccountSubscriber.d.ts

@@ -60,7 +60,7 @@ export declare class WebSocketDriftClientAccountSubscriber implements DriftClien
     getMarketAccountsAndSlots(): DataAndSlot<PerpMarketAccount>[];
     getSpotMarketAccountAndSlot(marketIndex: number): DataAndSlot<SpotMarketAccount> | undefined;
     getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[];
-    getOraclePriceDataAndSlot(oraclePublicKey: PublicKey | string): DataAndSlot<OraclePriceData> | undefined;
+    getOraclePriceDataAndSlot(oracleId: string): DataAndSlot<OraclePriceData> | undefined;
     getOraclePriceDataAndSlotForPerpMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
     getOraclePriceDataAndSlotForSpotMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
 }

package/lib/browser/accounts/webSocketDriftClientAccountSubscriber.js

@@ -10,7 +10,9 @@ const oracleClientCache_1 = require("../oracles/oracleClientCache");
 const quoteAssetOracleClient_1 = require("../oracles/quoteAssetOracleClient");
 const config_1 = require("../config");
 const utils_1 = require("./utils");
-const ORACLE_DEFAULT_KEY = web3_js_1.PublicKey.default.toBase58();
+const oracleId_1 = require("../oracles/oracleId");
+const types_2 = require("../types");
+const ORACLE_DEFAULT_ID = (0, oracleId_1.getOracleId)(web3_js_1.PublicKey.default, types_2.OracleSource.QUOTE_ASSET);
 class WebSocketDriftClientAccountSubscriber {
     constructor(program, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles, delistedMarketSetting, resubOpts, commitment) {
         this.oracleClientCache = new oracleClientCache_1.OracleClientCache();
@@ -109,7 +111,10 @@ class WebSocketDriftClientAccountSubscriber {
             }
             const oracleClient = this.oracleClientCache.get(oracleInfo.source, connection, this.program);
             const oraclePriceData = oracleClient.getOraclePriceDataFromBuffer(oracleAccountInfos[i].data);
-            result.push([oracleInfo.publicKey.toString(), oraclePriceData]);
+            result.push([
+                (0, oracleId_1.getOracleId)(oracleInfo.publicKey, oracleInfo.source),
+                oraclePriceData,
+            ]);
             return result;
         }, []));
     }
@@ -155,20 +160,20 @@ class WebSocketDriftClientAccountSubscriber {
         return true;
     }
     async subscribeToOracle(oracleInfo) {
-        const oracleString = oracleInfo.publicKey.toString();
+        const oracleId = (0, oracleId_1.getOracleId)(oracleInfo.publicKey, oracleInfo.source);
         const client = this.oracleClientCache.get(oracleInfo.source, this.program.provider.connection, this.program);
         const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('oracle', this.program, oracleInfo.publicKey, (buffer) => {
             return client.getOraclePriceDataFromBuffer(buffer);
         }, this.resubOpts, this.commitment);
-        const initialOraclePriceData = this.initialOraclePriceData.get(oracleString);
+        const initialOraclePriceData = this.initialOraclePriceData.get(oracleId);
         if (initialOraclePriceData) {
             accountSubscriber.setData(initialOraclePriceData);
         }
         await accountSubscriber.subscribe((data) => {
-            this.eventEmitter.emit('oraclePriceUpdate', oracleInfo.publicKey, data);
+            this.eventEmitter.emit('oraclePriceUpdate', oracleInfo.publicKey, oracleInfo.source, data);
             this.eventEmitter.emit('update');
         });
-        this.oracleSubscribers.set(oracleString, accountSubscriber);
+        this.oracleSubscribers.set(oracleId, accountSubscriber);
         return true;
     }
     async unsubscribeFromMarketAccounts() {
@@ -216,7 +221,8 @@ class WebSocketDriftClientAccountSubscriber {
         return subscriptionSuccess;
     }
     async addOracle(oracleInfo) {
-        if (this.oracleSubscribers.has(oracleInfo.publicKey.toString())) {
+        const oracleId = (0, oracleId_1.getOracleId)(oracleInfo.publicKey, oracleInfo.source);
+        if (this.oracleSubscribers.has(oracleId)) {
             return true;
         }
         if (oracleInfo.publicKey.equals(web3_js_1.PublicKey.default)) {
@@ -234,14 +240,15 @@ class WebSocketDriftClientAccountSubscriber {
             const perpMarketAccount = perpMarket.data;
             const perpMarketIndex = perpMarketAccount.marketIndex;
             const oracle = perpMarketAccount.amm.oracle;
-            if (!this.oracleSubscribers.has(oracle.toBase58())) {
+            const oracleId = (0, oracleId_1.getOracleId)(oracle, perpMarket.data.amm.oracleSource);
+            if (!this.oracleSubscribers.has(oracleId)) {
                 addOraclePromises.push(this.addOracle({
                     publicKey: oracle,
                     source: perpMarket.data.amm.oracleSource,
                 }));
             }
             this.perpOracleMap.set(perpMarketIndex, oracle);
-            this.perpOracleStringMap.set(perpMarketIndex, oracle.toBase58());
+            this.perpOracleStringMap.set(perpMarketIndex, oracleId);
         }
         await Promise.all(addOraclePromises);
     }
@@ -255,14 +262,15 @@ class WebSocketDriftClientAccountSubscriber {
             const spotMarketAccount = spotMarket.data;
             const spotMarketIndex = spotMarketAccount.marketIndex;
             const oracle = spotMarketAccount.oracle;
-            if (!this.oracleSubscribers.has(oracle.toBase58())) {
+            const oracleId = (0, oracleId_1.getOracleId)(oracle, spotMarketAccount.oracleSource);
+            if (!this.oracleSubscribers.has(oracleId)) {
                 addOraclePromises.push(this.addOracle({
                     publicKey: oracle,
                     source: spotMarketAccount.oracleSource,
                 }));
             }
             this.spotOracleMap.set(spotMarketIndex, oracle);
-            this.spotOracleStringMap.set(spotMarketIndex, oracle.toBase58());
+            this.spotOracleStringMap.set(spotMarketIndex, oracleId);
         }
         await Promise.all(addOraclePromises);
     }
@@ -280,9 +288,10 @@ class WebSocketDriftClientAccountSubscriber {
             }
         }
         for (const oracle of oracles) {
-            await this.oracleSubscribers.get(oracle.toBase58()).unsubscribe();
+            const oracleId = (0, oracleId_1.getOracleId)(oracle.publicKey, oracle.source);
+            await this.oracleSubscribers.get(oracleId).unsubscribe();
             if (this.delistedMarketSetting === types_1.DelistedMarketSetting.Discard) {
-                this.oracleSubscribers.delete(oracle.toBase58());
+                this.oracleSubscribers.delete(oracleId);
             }
         }
     }
@@ -309,44 +318,41 @@ class WebSocketDriftClientAccountSubscriber {
     getSpotMarketAccountsAndSlots() {
         return Array.from(this.spotMarketAccountSubscribers.values()).map((subscriber) => subscriber.dataAndSlot);
     }
-    getOraclePriceDataAndSlot(oraclePublicKey) {
+    getOraclePriceDataAndSlot(oracleId) {
         this.assertIsSubscribed();
-        const oracleString = typeof oraclePublicKey === 'string'
-            ? oraclePublicKey
-            : oraclePublicKey.toBase58();
-        if (oracleString === ORACLE_DEFAULT_KEY) {
+        if (oracleId === ORACLE_DEFAULT_ID) {
             return {
                 data: quoteAssetOracleClient_1.QUOTE_ORACLE_PRICE_DATA,
                 slot: 0,
             };
         }
-        return this.oracleSubscribers.get(oracleString).dataAndSlot;
+        return this.oracleSubscribers.get(oracleId).dataAndSlot;
     }
     getOraclePriceDataAndSlotForPerpMarket(marketIndex) {
         const perpMarketAccount = this.getMarketAccountAndSlot(marketIndex);
         const oracle = this.perpOracleMap.get(marketIndex);
-        const oracleString = this.perpOracleStringMap.get(marketIndex);
-        if (!perpMarketAccount || !oracle) {
+        const oracleId = this.perpOracleStringMap.get(marketIndex);
+        if (!perpMarketAccount || !oracleId) {
             return undefined;
         }
         if (!perpMarketAccount.data.amm.oracle.equals(oracle)) {
             // If the oracle has changed, we need to update the oracle map in background
             this.setPerpOracleMap();
         }
-        return this.getOraclePriceDataAndSlot(oracleString);
+        return this.getOraclePriceDataAndSlot(oracleId);
     }
     getOraclePriceDataAndSlotForSpotMarket(marketIndex) {
         const spotMarketAccount = this.getSpotMarketAccountAndSlot(marketIndex);
         const oracle = this.spotOracleMap.get(marketIndex);
-        const oracleString = this.spotOracleStringMap.get(marketIndex);
-        if (!spotMarketAccount || !oracle) {
+        const oracleId = this.spotOracleStringMap.get(marketIndex);
+        if (!spotMarketAccount || !oracleId) {
             return undefined;
         }
         if (!spotMarketAccount.data.oracle.equals(oracle)) {
             // If the oracle has changed, we need to update the oracle map in background
             this.setSpotOracleMap();
         }
-        return this.getOraclePriceDataAndSlot(oracleString);
+        return this.getOraclePriceDataAndSlot(oracleId);
     }
 }
 exports.WebSocketDriftClientAccountSubscriber = WebSocketDriftClientAccountSubscriber;

package/lib/browser/config.js

@@ -4,6 +4,7 @@ exports.findAllMarketAndOracles = exports.getMarketsAndOraclesForSubscription =
 const perpMarkets_1 = require("./constants/perpMarkets");
 const spotMarkets_1 = require("./constants/spotMarkets");
 const on_demand_1 = require("@switchboard-xyz/on-demand");
+const oracleId_1 = require("./oracles/oracleId");
 exports.DRIFT_PROGRAM_ID = 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH';
 exports.DRIFT_ORACLE_RECEIVER_ID = 'G6EoTTTgpkNBtVXo96EQp2m6uwwVh2Kt6YidjkmQqoha';
 exports.SWIFT_ID = 'SW1fThqrxLzVprnCMpiybiqYQfoNCdduC5uWsSUKChS';
@@ -74,14 +75,14 @@ function getMarketsAndOraclesForSubscription(env, perpMarkets, spotMarkets) {
     const oracleInfos = new Map();
     for (const market of perpMarketsToUse) {
         perpMarketIndexes.push(market.marketIndex);
-        oracleInfos.set(market.oracle.toString(), {
+        oracleInfos.set((0, oracleId_1.getOracleId)(market.oracle, market.oracleSource), {
             publicKey: market.oracle,
             source: market.oracleSource,
         });
     }
     for (const spotMarket of spotMarketsToUse) {
         spotMarketIndexes.push(spotMarket.marketIndex);
-        oracleInfos.set(spotMarket.oracle.toString(), {
+        oracleInfos.set((0, oracleId_1.getOracleId)(spotMarket.oracle, spotMarket.oracleSource), {
             publicKey: spotMarket.oracle,
             source: spotMarket.oracleSource,
         });
@@ -102,7 +103,7 @@ async function findAllMarketAndOracles(program) {
     for (const perpMarketProgramAccount of perpMarketProgramAccounts) {
         const perpMarket = perpMarketProgramAccount.account;
         perpMarketIndexes.push(perpMarket.marketIndex);
-        oracleInfos.set(perpMarket.amm.oracle.toString(), {
+        oracleInfos.set((0, oracleId_1.getOracleId)(perpMarket.amm.oracle, perpMarket.amm.oracleSource), {
             publicKey: perpMarket.amm.oracle,
             source: perpMarket.amm.oracleSource,
         });
@@ -110,7 +111,7 @@ async function findAllMarketAndOracles(program) {
     for (const spotMarketProgramAccount of spotMarketProgramAccounts) {
         const spotMarket = spotMarketProgramAccount.account;
         spotMarketIndexes.push(spotMarket.marketIndex);
-        oracleInfos.set(spotMarket.oracle.toString(), {
+        oracleInfos.set((0, oracleId_1.getOracleId)(spotMarket.oracle, spotMarket.oracleSource), {
             publicKey: spotMarket.oracle,
             source: spotMarket.oracleSource,
         });

package/lib/browser/driftClient.d.ts

@@ -5,7 +5,7 @@
 import * as anchor from '@coral-xyz/anchor';
 import { AnchorProvider, BN, Program, ProgramAccount } from '@coral-xyz/anchor';
 import { Idl as Idl30, Program as Program30 } from '@coral-xyz/anchor-30';
-import { DriftClientMetricsEvents, HighLeverageModeConfig, IWallet, MakerInfo, MappedRecord, MarketType, ModifyOrderPolicy, OpenbookV2FulfillmentConfigAccount, OptionalOrderParams, Order, OrderParams, OrderTriggerCondition, PerpMarketAccount, PerpMarketExtendedInfo, PhoenixV1FulfillmentConfigAccount, PlaceAndTakeOrderSuccessCondition, PositionDirection, ReferrerInfo, ReferrerNameAccount, RFQMakerOrderParams, RFQMatch, SerumV3FulfillmentConfigAccount, SettlePnlMode, SignedTxData, SpotMarketAccount, SpotPosition, StateAccount, SwapReduceOnly, SwiftOrderParamsMessage, SwiftServerMessage, TakerInfo, TxParams, UserAccount, UserStatsAccount } from './types';
+import { DriftClientMetricsEvents, HighLeverageModeConfig, IWallet, MakerInfo, MappedRecord, MarketType, ModifyOrderPolicy, OpenbookV2FulfillmentConfigAccount, OptionalOrderParams, OracleSource, Order, OrderParams, OrderTriggerCondition, PerpMarketAccount, PerpMarketExtendedInfo, PhoenixV1FulfillmentConfigAccount, PlaceAndTakeOrderSuccessCondition, PositionDirection, ReferrerInfo, ReferrerNameAccount, RFQMakerOrderParams, RFQMatch, SerumV3FulfillmentConfigAccount, SettlePnlMode, SignedTxData, SpotMarketAccount, SpotPosition, StateAccount, SwapReduceOnly, SwiftOrderParamsMessage, SwiftServerMessage, TakerInfo, TxParams, UserAccount, UserStatsAccount } from './types';
 import { AccountMeta, AddressLookupTableAccount, BlockhashWithExpiryBlockHeight, ConfirmOptions, Connection, Keypair, PublicKey, Signer, Transaction, TransactionInstruction, TransactionSignature, TransactionVersion, VersionedTransaction } from '@solana/web3.js';
 import { TokenFaucet } from './tokenFaucet';
 import { EventEmitter } from 'events';
@@ -109,7 +109,7 @@ export declare class DriftClient {
     forceGetSpotMarketAccount(marketIndex: number): Promise<SpotMarketAccount | undefined>;
     getSpotMarketAccounts(): SpotMarketAccount[];
     getQuoteSpotMarketAccount(): SpotMarketAccount;
-    getOraclePriceDataAndSlot(oraclePublicKey: PublicKey): DataAndSlot<OraclePriceData> | undefined;
+    getOraclePriceDataAndSlot(oraclePublicKey: PublicKey, oracleSource: OracleSource): DataAndSlot<OraclePriceData> | undefined;
     getSerumV3FulfillmentConfig(serumMarket: PublicKey): Promise<SerumV3FulfillmentConfigAccount>;
     getSerumV3FulfillmentConfigs(): Promise<SerumV3FulfillmentConfigAccount[]>;
     getPhoenixV1FulfillmentConfig(phoenixMarket: PublicKey): Promise<PhoenixV1FulfillmentConfigAccount>;

package/lib/browser/driftClient.js

@@ -70,6 +70,7 @@ const on_demand_1 = require("@switchboard-xyz/on-demand");
 const grpcDriftClientAccountSubscriber_1 = require("./accounts/grpcDriftClientAccountSubscriber");
 const tweetnacl_1 = __importDefault(require("tweetnacl"));
 const digest_1 = require("./util/digest");
+const oracleId_1 = require("./oracles/oracleId");
 /**
  * # DriftClient
  * This class is the main way to interact with Drift Protocol. It allows you to subscribe to the various accounts where the Market's state is stored, as well as: opening positions, liquidating, settling funding, depositing & withdrawing, and more.
@@ -338,8 +339,8 @@ class DriftClient {
     getQuoteSpotMarketAccount() {
         return this.accountSubscriber.getSpotMarketAccountAndSlot(numericConstants_1.QUOTE_SPOT_MARKET_INDEX).data;
     }
-    getOraclePriceDataAndSlot(oraclePublicKey) {
-        return this.accountSubscriber.getOraclePriceDataAndSlot(oraclePublicKey.toBase58());
+    getOraclePriceDataAndSlot(oraclePublicKey, oracleSource) {
+        return this.accountSubscriber.getOraclePriceDataAndSlot((0, oracleId_1.getOracleId)(oraclePublicKey, oracleSource));
     }
     async getSerumV3FulfillmentConfig(serumMarket) {
         const address = await (0, pda_1.getSerumFulfillmentConfigPublicKey)(this.program.programId, serumMarket);
@@ -3158,8 +3159,8 @@ class DriftClient {
         return this.signMessage(swiftServerMessage);
     }
     signSwiftOrderParamsMessage(orderParamsMessage) {
-        const takerOrderParamsMessage = Uint8Array.from((0, digest_1.digest)(this.encodeSwiftOrderParamsMessage(orderParamsMessage)));
-        return this.signMessage(takerOrderParamsMessage);
+        const takerOrderParamsMessage = this.encodeSwiftOrderParamsMessage(orderParamsMessage);
+        return this.signMessage(new TextEncoder().encode((0, digest_1.digest)(takerOrderParamsMessage).toString('hex')));
     }
     encodeSwiftOrderParamsMessage(orderParamsMessage) {
         return this.program.coder.types.encode('SwiftOrderParamsMessage', orderParamsMessage);
@@ -3189,7 +3190,7 @@ class DriftClient {
         const swiftOrderParamsSignatureIx = web3_js_1.Ed25519Program.createInstructionWithPublicKey({
             publicKey: takerInfo.takerUserAccount.authority.toBytes(),
             signature: Uint8Array.from(swiftOrderParamsSignature),
-            message: Uint8Array.from((0, digest_1.digest)(encodedSwiftOrderParamsMessage)),
+            message: new TextEncoder().encode((0, digest_1.digest)(encodedSwiftOrderParamsMessage).toString('hex')),
         });
         const placeTakerSwiftPerpOrderIx = await this.program.instruction.placeSwiftTakerOrder(encodedSwiftServerMessage, encodedSwiftOrderParamsMessage, {
             accounts: {

package/lib/browser/oracles/oracleId.d.ts

@@ -0,0 +1,4 @@
+import { PublicKey } from '@solana/web3.js';
+import { OracleSource } from '../types';
+export declare function getOracleSourceNum(source: OracleSource): number;
+export declare function getOracleId(publicKey: PublicKey, source: OracleSource): string;

package/lib/browser/oracles/oracleId.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getOracleId = exports.getOracleSourceNum = void 0;
+const types_1 = require("../types");
+function getOracleSourceNum(source) {
+    if ('pyth' in source)
+        return types_1.OracleSourceNum.PYTH;
+    if ('pyth1K' in source)
+        return types_1.OracleSourceNum.PYTH_1K;
+    if ('pyth1M' in source)
+        return types_1.OracleSourceNum.PYTH_1M;
+    if ('pythPull' in source)
+        return types_1.OracleSourceNum.PYTH_PULL;
+    if ('pyth1KPull' in source)
+        return types_1.OracleSourceNum.PYTH_1K_PULL;
+    if ('pyth1MPull' in source)
+        return types_1.OracleSourceNum.PYTH_1M_PULL;
+    if ('switchboard' in source)
+        return types_1.OracleSourceNum.SWITCHBOARD;
+    if ('quoteAsset' in source)
+        return types_1.OracleSourceNum.QUOTE_ASSET;
+    if ('pythStableCoin' in source)
+        return types_1.OracleSourceNum.PYTH_STABLE_COIN;
+    if ('pythStableCoinPull' in source)
+        return types_1.OracleSourceNum.PYTH_STABLE_COIN_PULL;
+    if ('prelaunch' in source)
+        return types_1.OracleSourceNum.PRELAUNCH;
+    if ('switchboardOnDemand' in source)
+        return types_1.OracleSourceNum.SWITCHBOARD_ON_DEMAND;
+    throw new Error('Invalid oracle source');
+}
+exports.getOracleSourceNum = getOracleSourceNum;
+function getOracleId(publicKey, source) {
+    return `${publicKey.toBase58()}-${getOracleSourceNum(source)}`;
+}
+exports.getOracleId = getOracleId;

package/lib/browser/types.d.ts

@@ -198,6 +198,20 @@ export declare class OracleSource {
         switchboardOnDemand: {};
     };
 }
+export declare class OracleSourceNum {
+    static readonly PYTH = 0;
+    static readonly PYTH_1K = 1;
+    static readonly PYTH_1M = 2;
+    static readonly PYTH_PULL = 3;
+    static readonly PYTH_1K_PULL = 4;
+    static readonly PYTH_1M_PULL = 5;
+    static readonly SWITCHBOARD = 6;
+    static readonly QUOTE_ASSET = 7;
+    static readonly PYTH_STABLE_COIN = 8;
+    static readonly PYTH_STABLE_COIN_PULL = 9;
+    static readonly PRELAUNCH = 10;
+    static readonly SWITCHBOARD_ON_DEMAND = 11;
+}
 export declare class OrderType {
     static readonly LIMIT: {
         limit: {};