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

package/VERSION

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

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

@@ -14,6 +14,8 @@ export declare class grpcDriftClientAccountSubscriberV2 extends WebSocketDriftCl
     subscribe(): Promise<boolean>;
     getMarketAccountAndSlot(marketIndex: number): DataAndSlot<PerpMarketAccount> | undefined;
     getSpotMarketAccountAndSlot(marketIndex: number): DataAndSlot<SpotMarketAccount> | undefined;
+    setPerpOracleMap(): Promise<void>;
+    setSpotOracleMap(): Promise<void>;
     subscribeToPerpMarketAccounts(): Promise<boolean>;
     subscribeToSpotMarketAccounts(): Promise<boolean>;
     subscribeToOracles(): Promise<boolean>;

package/lib/browser/accounts/grpcDriftClientAccountSubscriberV2.js

@@ -69,6 +69,54 @@ class grpcDriftClientAccountSubscriberV2 extends webSocketDriftClientAccountSubs
         var _a;
         return (_a = this.spotMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountData(this.spotMarketIndexToAccountPubkeyMap.get(marketIndex));
     }
+    async setPerpOracleMap() {
+        var _a;
+        const perpMarketsMap = (_a = this.perpMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountDataMap();
+        const perpMarkets = Array.from(perpMarketsMap.values());
+        const addOraclePromises = [];
+        for (const perpMarket of perpMarkets) {
+            if (!perpMarket || !perpMarket.data) {
+                continue;
+            }
+            const perpMarketAccount = perpMarket.data;
+            const perpMarketIndex = perpMarketAccount.marketIndex;
+            const oracle = perpMarketAccount.amm.oracle;
+            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, oracleId);
+        }
+        await Promise.all(addOraclePromises);
+    }
+    async setSpotOracleMap() {
+        var _a;
+        const spotMarketsMap = (_a = this.spotMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountDataMap();
+        const spotMarkets = Array.from(spotMarketsMap.values());
+        const addOraclePromises = [];
+        for (const spotMarket of spotMarkets) {
+            if (!spotMarket || !spotMarket.data) {
+                continue;
+            }
+            const spotMarketAccount = spotMarket.data;
+            const spotMarketIndex = spotMarketAccount.marketIndex;
+            const oracle = spotMarketAccount.oracle;
+            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, oracleId);
+        }
+        await Promise.all(addOraclePromises);
+    }
     async subscribeToPerpMarketAccounts() {
         const perpMarketIndexToAccountPubkeys = await Promise.all(this.perpMarketIndexes.map(async (marketIndex) => [
             marketIndex,
@@ -167,7 +215,8 @@ class grpcDriftClientAccountSubscriberV2 extends webSocketDriftClientAccountSubs
                 }
             });
         for (const data of this.initialOraclePriceData.entries()) {
-            this.oracleMultiSubscriber.setAccountData(new web3_js_1.PublicKey(data[0]), data[1]);
+            const { publicKey } = (0, oracleId_1.getPublicKeyAndSourceFromOracleId)(data[0]);
+            this.oracleMultiSubscriber.setAccountData(publicKey, data[1]);
         }
         await this.oracleMultiSubscriber.subscribe(oraclePubkeys, (accountId, data) => {
             const source = pubkeyToSource.get(accountId.toBase58());

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

@@ -24,6 +24,7 @@ export declare class grpcMultiAccountSubscriber<T> {
     static create<U>(grpcConfigs: GrpcConfigs, accountName: string, program: Program, decodeBuffer?: (buffer: Buffer, pubkey?: string) => U, resubOpts?: ResubOpts, clientProp?: Client, onUnsubscribe?: () => Promise<void>): Promise<grpcMultiAccountSubscriber<U>>;
     setAccountData(accountPubkey: PublicKey, data: T, slot?: number): void;
     getAccountData(accountPubkey: PublicKey): DataAndSlot<T> | undefined;
+    getAccountDataMap(): Map<string, DataAndSlot<T>>;
     subscribe(accounts: PublicKey[], onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void): Promise<void>;
     addAccounts(accounts: PublicKey[]): Promise<void>;
     removeAccounts(accounts: PublicKey[]): Promise<void>;

package/lib/browser/accounts/grpcMultiAccountSubscriber.js

@@ -62,6 +62,9 @@ class grpcMultiAccountSubscriber {
     getAccountData(accountPubkey) {
         return this.dataMap.get(accountPubkey.toBase58());
     }
+    getAccountDataMap() {
+        return this.dataMap;
+    }
     async subscribe(accounts, onChange) {
         if (this.listenerId != null || this.isUnsubscribing) {
             return;

package/lib/node/accounts/grpcDriftClientAccountSubscriberV2.d.ts

@@ -14,6 +14,8 @@ export declare class grpcDriftClientAccountSubscriberV2 extends WebSocketDriftCl
     subscribe(): Promise<boolean>;
     getMarketAccountAndSlot(marketIndex: number): DataAndSlot<PerpMarketAccount> | undefined;
     getSpotMarketAccountAndSlot(marketIndex: number): DataAndSlot<SpotMarketAccount> | undefined;
+    setPerpOracleMap(): Promise<void>;
+    setSpotOracleMap(): Promise<void>;
     subscribeToPerpMarketAccounts(): Promise<boolean>;
     subscribeToSpotMarketAccounts(): Promise<boolean>;
     subscribeToOracles(): Promise<boolean>;

package/lib/node/accounts/grpcDriftClientAccountSubscriberV2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grpcDriftClientAccountSubscriberV2.d.ts","sourceRoot":"","sources":["../../../src/accounts/grpcDriftClientAccountSubscriberV2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qCAAqC,EAAE,MAAM,yCAAyC,CAAC;AAChG,OAAO,EAAE,UAAU,EAAmB,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAQ5C,OAAO,EACN,WAAW,EACX,qBAAqB,EACrB,WAAW,EACX,SAAS,EACT,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAgB,MAAM,UAAU,CAAC;AAG9E,qBAAa,kCAAmC,SAAQ,qCAAqC;IAC5F,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,qBAAqB,CAAC,CAAgD;IAC9E,OAAO,CAAC,qBAAqB,CAAC,CAAgD;IAC9E,OAAO,CAAC,qBAAqB,CAAC,CAA8C;IAC5E,OAAO,CAAC,iCAAiC,CAAgC;IACzE,OAAO,CAAC,iCAAiC,CAAgC;gBAGxE,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,OAAO,EAChB,iBAAiB,EAAE,MAAM,EAAE,EAC3B,iBAAiB,EAAE,MAAM,EAAE,EAC3B,WAAW,EAAE,UAAU,EAAE,EACzB,8BAA8B,EAAE,OAAO,EACvC,qBAAqB,EAAE,qBAAqB,EAC5C,SAAS,CAAC,EAAE,SAAS;IAcT,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAiFjC,uBAAuB,CAC/B,WAAW,EAAE,MAAM,GACjB,WAAW,CAAC,iBAAiB,CAAC,GAAG,SAAS;IAMpC,2BAA2B,CACnC,WAAW,EAAE,MAAM,GACjB,WAAW,CAAC,iBAAiB,CAAC,GAAG,SAAS;IAM9B,6BAA6B,IAAI,OAAO,CAAC,OAAO,CAAC;IA2DjD,6BAA6B,IAAI,OAAO,CAAC,OAAO,CAAC;IA2DjD,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC;IA2E/C,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAS9B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAO3C"}
+{"version":3,"file":"grpcDriftClientAccountSubscriberV2.d.ts","sourceRoot":"","sources":["../../../src/accounts/grpcDriftClientAccountSubscriberV2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qCAAqC,EAAE,MAAM,yCAAyC,CAAC;AAChG,OAAO,EAAE,UAAU,EAAmB,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAQ5C,OAAO,EACN,WAAW,EACX,qBAAqB,EACrB,WAAW,EACX,SAAS,EACT,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAgB,MAAM,UAAU,CAAC;AAM9E,qBAAa,kCAAmC,SAAQ,qCAAqC;IAC5F,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,qBAAqB,CAAC,CAAgD;IAC9E,OAAO,CAAC,qBAAqB,CAAC,CAAgD;IAC9E,OAAO,CAAC,qBAAqB,CAAC,CAA8C;IAC5E,OAAO,CAAC,iCAAiC,CAAgC;IACzE,OAAO,CAAC,iCAAiC,CAAgC;gBAGxE,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,OAAO,EAChB,iBAAiB,EAAE,MAAM,EAAE,EAC3B,iBAAiB,EAAE,MAAM,EAAE,EAC3B,WAAW,EAAE,UAAU,EAAE,EACzB,8BAA8B,EAAE,OAAO,EACvC,qBAAqB,EAAE,qBAAqB,EAC5C,SAAS,CAAC,EAAE,SAAS;IAcT,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAiFjC,uBAAuB,CAC/B,WAAW,EAAE,MAAM,GACjB,WAAW,CAAC,iBAAiB,CAAC,GAAG,SAAS;IAMpC,2BAA2B,CACnC,WAAW,EAAE,MAAM,GACjB,WAAW,CAAC,iBAAiB,CAAC,GAAG,SAAS;IAM9B,gBAAgB;IA0BhB,gBAAgB;IA0BhB,6BAA6B,IAAI,OAAO,CAAC,OAAO,CAAC;IA2DjD,6BAA6B,IAAI,OAAO,CAAC,OAAO,CAAC;IA2DjD,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC;IAyE/C,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAS9B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAO3C"}

package/lib/node/accounts/grpcDriftClientAccountSubscriberV2.js

@@ -69,6 +69,54 @@ class grpcDriftClientAccountSubscriberV2 extends webSocketDriftClientAccountSubs
         var _a;
         return (_a = this.spotMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountData(this.spotMarketIndexToAccountPubkeyMap.get(marketIndex));
     }
+    async setPerpOracleMap() {
+        var _a;
+        const perpMarketsMap = (_a = this.perpMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountDataMap();
+        const perpMarkets = Array.from(perpMarketsMap.values());
+        const addOraclePromises = [];
+        for (const perpMarket of perpMarkets) {
+            if (!perpMarket || !perpMarket.data) {
+                continue;
+            }
+            const perpMarketAccount = perpMarket.data;
+            const perpMarketIndex = perpMarketAccount.marketIndex;
+            const oracle = perpMarketAccount.amm.oracle;
+            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, oracleId);
+        }
+        await Promise.all(addOraclePromises);
+    }
+    async setSpotOracleMap() {
+        var _a;
+        const spotMarketsMap = (_a = this.spotMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountDataMap();
+        const spotMarkets = Array.from(spotMarketsMap.values());
+        const addOraclePromises = [];
+        for (const spotMarket of spotMarkets) {
+            if (!spotMarket || !spotMarket.data) {
+                continue;
+            }
+            const spotMarketAccount = spotMarket.data;
+            const spotMarketIndex = spotMarketAccount.marketIndex;
+            const oracle = spotMarketAccount.oracle;
+            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, oracleId);
+        }
+        await Promise.all(addOraclePromises);
+    }
     async subscribeToPerpMarketAccounts() {
         const perpMarketIndexToAccountPubkeys = await Promise.all(this.perpMarketIndexes.map(async (marketIndex) => [
             marketIndex,
@@ -167,7 +215,8 @@ class grpcDriftClientAccountSubscriberV2 extends webSocketDriftClientAccountSubs
                 }
             });
         for (const data of this.initialOraclePriceData.entries()) {
-            this.oracleMultiSubscriber.setAccountData(new web3_js_1.PublicKey(data[0]), data[1]);
+            const { publicKey } = (0, oracleId_1.getPublicKeyAndSourceFromOracleId)(data[0]);
+            this.oracleMultiSubscriber.setAccountData(publicKey, data[1]);
         }
         await this.oracleMultiSubscriber.subscribe(oraclePubkeys, (accountId, data) => {
             const source = pubkeyToSource.get(accountId.toBase58());

package/lib/node/accounts/grpcMultiAccountSubscriber.d.ts

@@ -24,6 +24,7 @@ export declare class grpcMultiAccountSubscriber<T> {
     static create<U>(grpcConfigs: GrpcConfigs, accountName: string, program: Program, decodeBuffer?: (buffer: Buffer, pubkey?: string) => U, resubOpts?: ResubOpts, clientProp?: Client, onUnsubscribe?: () => Promise<void>): Promise<grpcMultiAccountSubscriber<U>>;
     setAccountData(accountPubkey: PublicKey, data: T, slot?: number): void;
     getAccountData(accountPubkey: PublicKey): DataAndSlot<T> | undefined;
+    getAccountDataMap(): Map<string, DataAndSlot<T>>;
     subscribe(accounts: PublicKey[], onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void): Promise<void>;
     addAccounts(accounts: PublicKey[]): Promise<void>;
     removeAccounts(accounts: PublicKey[]): Promise<void>;

package/lib/node/accounts/grpcMultiAccountSubscriber.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grpcMultiAccountSubscriber.d.ts","sourceRoot":"","sources":["../../../src/accounts/grpcMultiAccountSubscriber.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAIrD,OAAO,EACN,MAAM,EAMN,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAU9D,qBAAa,0BAA0B,CAAC,CAAC;IACxC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,MAAM,CAAwD;IACtE,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,cAAc,CAAC,CAAyC;IAChE,OAAO,CAAC,SAAS,CAAC,CAAY;IAC9B,OAAO,CAAC,aAAa,CAAC,CAAsB;IAErC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,UAAS;IAC/B,OAAO,CAAC,SAAS,CAAC,CAAgC;IAClD,OAAO,CAAC,aAAa,CAAS;IAE9B,OAAO,CAAC,kBAAkB,CAAqB;IAC/C,OAAO,CAAC,WAAW,CAGf;IAEJ,OAAO,CAAC,OAAO,CAAqC;IAEpD,OAAO;WAkBa,MAAM,CAAC,CAAC,EAC3B,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,OAAO,EAChB,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,CAAC,EACrD,SAAS,CAAC,EAAE,SAAS,EACrB,UAAU,CAAC,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GACjC,OAAO,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC;IAuBzC,cAAc,CAAC,aAAa,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI;IAItE,cAAc,CAAC,aAAa,EAAE,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,SAAS;IAI9D,SAAS,CACd,QAAQ,EAAE,SAAS,EAAE,EACrB,QAAQ,EAAE,CACT,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,KACV,IAAI,GACP,OAAO,CAAC,IAAI,CAAC;IA+FV,WAAW,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiCjD,cAAc,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAmCpD,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IA4ClC,OAAO,CAAC,UAAU;IAelB,OAAO,CAAC,UAAU;CAIlB"}
+{"version":3,"file":"grpcMultiAccountSubscriber.d.ts","sourceRoot":"","sources":["../../../src/accounts/grpcMultiAccountSubscriber.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAIrD,OAAO,EACN,MAAM,EAMN,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAU9D,qBAAa,0BAA0B,CAAC,CAAC;IACxC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,MAAM,CAAwD;IACtE,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,cAAc,CAAC,CAAyC;IAChE,OAAO,CAAC,SAAS,CAAC,CAAY;IAC9B,OAAO,CAAC,aAAa,CAAC,CAAsB;IAErC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,UAAS;IAC/B,OAAO,CAAC,SAAS,CAAC,CAAgC;IAClD,OAAO,CAAC,aAAa,CAAS;IAE9B,OAAO,CAAC,kBAAkB,CAAqB;IAC/C,OAAO,CAAC,WAAW,CAGf;IAEJ,OAAO,CAAC,OAAO,CAAqC;IAEpD,OAAO;WAkBa,MAAM,CAAC,CAAC,EAC3B,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,OAAO,EAChB,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,CAAC,EACrD,SAAS,CAAC,EAAE,SAAS,EACrB,UAAU,CAAC,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GACjC,OAAO,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC;IAuBzC,cAAc,CAAC,aAAa,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI;IAItE,cAAc,CAAC,aAAa,EAAE,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,SAAS;IAIpE,iBAAiB,IAAI,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IAI1C,SAAS,CACd,QAAQ,EAAE,SAAS,EAAE,EACrB,QAAQ,EAAE,CACT,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,KACV,IAAI,GACP,OAAO,CAAC,IAAI,CAAC;IA+FV,WAAW,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiCjD,cAAc,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAmCpD,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IA4ClC,OAAO,CAAC,UAAU;IAelB,OAAO,CAAC,UAAU;CAIlB"}

package/lib/node/accounts/grpcMultiAccountSubscriber.js

@@ -62,6 +62,9 @@ class grpcMultiAccountSubscriber {
     getAccountData(accountPubkey) {
         return this.dataMap.get(accountPubkey.toBase58());
     }
+    getAccountDataMap() {
+        return this.dataMap;
+    }
     async subscribe(accounts, onChange) {
         if (this.listenerId != null || this.isUnsubscribing) {
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.142.0-beta.4",
+	"version": "2.142.0-beta.6",
 	"main": "lib/node/index.js",
 	"types": "lib/node/index.d.ts",
 	"browser": "./lib/browser/index.js",

package/scripts/client-test.ts

@@ -2,9 +2,21 @@ import { DriftClient } from '../src/driftClient';
 import { grpcDriftClientAccountSubscriberV2 } from '../src/accounts/grpcDriftClientAccountSubscriberV2';
 import { Connection, Keypair, PublicKey } from '@solana/web3.js';
 import { DriftClientConfig } from '../src/driftClientConfig';
-import { decodeName, DRIFT_PROGRAM_ID, Wallet } from '../src';
+import {
+	decodeName,
+	DRIFT_PROGRAM_ID,
+	PerpMarketAccount,
+	Wallet,
+} from '../src';
 import { CommitmentLevel } from '@triton-one/yellowstone-grpc';
 import dotenv from 'dotenv';
+import {
+	AnchorProvider,
+	Idl,
+	Program,
+	ProgramAccount,
+} from '@coral-xyz/anchor';
+import driftIDL from '../src/idl/drift.json';
 
 const GRPC_ENDPOINT = process.env.GRPC_ENDPOINT;
 const TOKEN = process.env.TOKEN;
@@ -13,6 +25,43 @@ async function initializeGrpcDriftClientV2() {
 	const connection = new Connection('https://api.mainnet-beta.solana.com');
 	const wallet = new Wallet(new Keypair());
 	dotenv.config({ path: '../' });
+
+	const programId = new PublicKey(DRIFT_PROGRAM_ID);
+	const provider = new AnchorProvider(
+		connection,
+		// @ts-ignore
+		wallet,
+		{
+			commitment: 'confirmed',
+		}
+	);
+
+	const program = new Program(driftIDL as Idl, programId, provider);
+
+	const perpMarketProgramAccounts =
+		(await program.account.perpMarket.all()) as ProgramAccount<PerpMarketAccount>[];
+	const solPerpMarket = perpMarketProgramAccounts.find(
+		(account) => account.account.marketIndex === 0
+	);
+	const solOracleInfo = {
+		publicKey: solPerpMarket.account.amm.oracle,
+		source: solPerpMarket.account.amm.oracleSource,
+	};
+	const ethPerpMarket = perpMarketProgramAccounts.find(
+		(account) => account.account.marketIndex === 2
+	);
+	const ethOracleInfo = {
+		publicKey: ethPerpMarket.account.amm.oracle,
+		source: ethPerpMarket.account.amm.oracleSource,
+	};
+	const btcPerpMarket = perpMarketProgramAccounts.find(
+		(account) => account.account.marketIndex === 1
+	);
+	const btcOracleInfo = {
+		publicKey: btcPerpMarket.account.amm.oracle,
+		source: btcPerpMarket.account.amm.oracleSource,
+	};
+
 	const config: DriftClientConfig = {
 		connection,
 		wallet,
@@ -31,9 +80,9 @@ async function initializeGrpcDriftClientV2() {
 			},
 			driftClientAccountSubscriber: grpcDriftClientAccountSubscriberV2,
 		},
-		perpMarketIndexes: [0, 1, 2], // Example market indexes
-		spotMarketIndexes: [0, 1, 2], // Example market indexes
-		oracleInfos: [], // Add oracle information if needed
+		perpMarketIndexes: [0, 1, 2],
+		spotMarketIndexes: [0, 1, 2],
+		oracleInfos: [solOracleInfo, ethOracleInfo, btcOracleInfo],
 	};
 
 	const driftClient = new DriftClient(config);
@@ -55,6 +104,12 @@ async function initializeGrpcDriftClientV2() {
 					'Perp market data market index:',
 					perpMarketData?.marketIndex
 				);
+				const oracle = driftClient.getOracleDataForPerpMarket(data.marketIndex);
+				const mmOracle = driftClient.getMMOracleDataForPerpMarket(
+					data.marketIndex
+				);
+				console.log('Perp oracle price:', oracle.price.toString());
+				console.log('Perp MM oracle price:', mmOracle.price.toString());
 				perpMarketUpdateCount++;
 				if (
 					perpMarketUpdateCount >= 10 &&
@@ -78,6 +133,8 @@ async function initializeGrpcDriftClientV2() {
 					'Spot market data market index:',
 					spotMarketData?.marketIndex
 				);
+				const oracle = driftClient.getOracleDataForSpotMarket(data.marketIndex);
+				console.log('Spot oracle price:', oracle.price.toString());
 				spotMarketUpdateCount++;
 				if (
 					perpMarketUpdateCount >= 10 &&
@@ -126,6 +183,21 @@ async function initializeGrpcDriftClientV2() {
 	await driftClient.subscribe();
 	console.log('DriftClient initialized and listening for updates.');
 
+	for (const marketIndex of config.perpMarketIndexes) {
+		const oracle = driftClient.getOracleDataForPerpMarket(marketIndex);
+		const mmOracle = driftClient.getMMOracleDataForPerpMarket(marketIndex);
+		console.log('Initial perp oracle price:', oracle.price.toString());
+		console.log('Initial perp MM oracle price:', mmOracle.price.toString());
+	}
+
+	for (const marketIndex of config.spotMarketIndexes) {
+		const oracle = driftClient.getOracleDataForSpotMarket(marketIndex);
+		console.log('Initial spot oracle price:', oracle.price.toString());
+	}
+
+	const stateAccount = driftClient.getStateAccount();
+	console.log('Initial state account:', stateAccount.toString());
+
 	await updatePromise;
 	console.log('Received required number of updates.');
 }

package/src/accounts/grpcDriftClientAccountSubscriberV2.ts

@@ -17,7 +17,10 @@ import {
 import { grpcAccountSubscriber } from './grpcAccountSubscriber';
 import { grpcMultiAccountSubscriber } from './grpcMultiAccountSubscriber';
 import { PerpMarketAccount, SpotMarketAccount, StateAccount } from '../types';
-import { getOracleId } from '../oracles/oracleId';
+import {
+	getOracleId,
+	getPublicKeyAndSourceFromOracleId,
+} from '../oracles/oracleId';
 
 export class grpcDriftClientAccountSubscriberV2 extends WebSocketDriftClientAccountSubscriber {
 	private grpcConfigs: GrpcConfigs;
@@ -146,6 +149,58 @@ export class grpcDriftClientAccountSubscriberV2 extends WebSocketDriftClientAcco
 		);
 	}
 
+	override async setPerpOracleMap() {
+		const perpMarketsMap = this.perpMarketsSubscriber?.getAccountDataMap();
+		const perpMarkets = Array.from(perpMarketsMap.values());
+		const addOraclePromises = [];
+		for (const perpMarket of perpMarkets) {
+			if (!perpMarket || !perpMarket.data) {
+				continue;
+			}
+			const perpMarketAccount = perpMarket.data;
+			const perpMarketIndex = perpMarketAccount.marketIndex;
+			const oracle = perpMarketAccount.amm.oracle;
+			const oracleId = 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, oracleId);
+		}
+		await Promise.all(addOraclePromises);
+	}
+
+	override async setSpotOracleMap() {
+		const spotMarketsMap = this.spotMarketsSubscriber?.getAccountDataMap();
+		const spotMarkets = Array.from(spotMarketsMap.values());
+		const addOraclePromises = [];
+		for (const spotMarket of spotMarkets) {
+			if (!spotMarket || !spotMarket.data) {
+				continue;
+			}
+			const spotMarketAccount = spotMarket.data;
+			const spotMarketIndex = spotMarketAccount.marketIndex;
+			const oracle = spotMarketAccount.oracle;
+			const oracleId = 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, oracleId);
+		}
+		await Promise.all(addOraclePromises);
+	}
+
 	override async subscribeToPerpMarketAccounts(): Promise<boolean> {
 		const perpMarketIndexToAccountPubkeys: Array<[number, PublicKey]> =
 			await Promise.all(
@@ -321,10 +376,8 @@ export class grpcDriftClientAccountSubscriberV2 extends WebSocketDriftClientAcco
 			);
 
 		for (const data of this.initialOraclePriceData.entries()) {
-			this.oracleMultiSubscriber.setAccountData(
-				new PublicKey(data[0]),
-				data[1]
-			);
+			const { publicKey } = getPublicKeyAndSourceFromOracleId(data[0]);
+			this.oracleMultiSubscriber.setAccountData(publicKey, data[1]);
 		}
 
 		await this.oracleMultiSubscriber.subscribe(

package/src/accounts/grpcMultiAccountSubscriber.ts

@@ -101,6 +101,10 @@ export class grpcMultiAccountSubscriber<T> {
 		return this.dataMap.get(accountPubkey.toBase58());
 	}
 
+	getAccountDataMap(): Map<string, DataAndSlot<T>> {
+		return this.dataMap;
+	}
+
 	async subscribe(
 		accounts: PublicKey[],
 		onChange: (