@drift-labs/sdk-browser 2.155.0-beta.1 → 2.155.0-beta.3

package/VERSION

@@ -1 +1 @@
-2.155.0-beta.1
+2.155.0-beta.3

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

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { ResubOpts, GrpcConfigs } from './types';
 import { Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';

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

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { Program } from '@coral-xyz/anchor';
 import { Context, PublicKey } from '@solana/web3.js';
 import { Client } from '../isomorphic/grpc';

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

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { ResubOpts, GrpcConfigs } from './types';
 import { Program } from '@coral-xyz/anchor';
 import { Context, MemcmpFilter, PublicKey } from '@solana/web3.js';

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

@@ -1,6 +1,5 @@
 /// <reference types="node" />
-/// <reference types="node" />
-import { LaserGrpcConfigs, ResubOpts } from './types';
+import { GrpcConfigs, ResubOpts } from './types';
 import { Program } from '@coral-xyz/anchor';
 import { Context, MemcmpFilter, PublicKey } from '@solana/web3.js';
 import { WebSocketProgramAccountSubscriber } from './webSocketProgramAccountSubscriber';
@@ -12,7 +11,7 @@ export declare class LaserstreamProgramAccountSubscriber<T> extends WebSocketPro
     listenerId?: number;
     private readonly laserConfig;
     private constructor();
-    static create<U>(grpcConfigs: LaserGrpcConfigs, subscriptionName: string, accountDiscriminator: string, program: Program, decodeBufferFn: (accountName: string, ix: Buffer) => U, options?: {
+    static create<U>(grpcConfigs: GrpcConfigs, subscriptionName: string, accountDiscriminator: string, program: Program, decodeBufferFn: (accountName: string, ix: Buffer) => U, options?: {
         filters: MemcmpFilter[];
     }, resubOpts?: ResubOpts): Promise<LaserstreamProgramAccountSubscriber<U>>;
     subscribe(onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void): Promise<void>;

package/lib/browser/accounts/laserProgramAccountSubscriber.js

@@ -37,19 +37,17 @@ class LaserstreamProgramAccountSubscriber extends webSocketProgramAccountSubscri
     static async create(grpcConfigs, subscriptionName, accountDiscriminator, program, decodeBufferFn, options = {
         filters: [],
     }, resubOpts) {
-        var _a, _b;
-        const channelOptions = {
-            'grpc.default_compression_algorithm': grpc_1.CompressionAlgorithms.zstd,
-            'grpc.max_receive_message_length': 1000000000,
-            ...((_a = grpcConfigs.channelOptions) !== null && _a !== void 0 ? _a : {}),
-        };
+        var _a;
         const laserConfig = {
             apiKey: grpcConfigs.token,
             endpoint: grpcConfigs.endpoint,
             maxReconnectAttempts: grpcConfigs.enableReconnect ? 10 : 0,
-            channelOptions,
+            channelOptions: {
+                'grpc.default_compression_algorithm': grpc_1.CompressionAlgorithms.zstd,
+                'grpc.max_receive_message_length': 1000000000,
+            },
         };
-        const commitmentLevel = (_b = grpcConfigs.commitmentLevel) !== null && _b !== void 0 ? _b : grpc_1.CommitmentLevel.CONFIRMED;
+        const commitmentLevel = (_a = grpcConfigs.commitmentLevel) !== null && _a !== void 0 ? _a : grpc_1.CommitmentLevel.CONFIRMED;
         return new LaserstreamProgramAccountSubscriber(laserConfig, commitmentLevel, subscriptionName, accountDiscriminator, program, decodeBufferFn, options, resubOpts);
     }
     async subscribe(onChange) {

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

@@ -8,7 +8,7 @@ import { Context, PublicKey } from '@solana/web3.js';
 import { Account } from '@solana/spl-token';
 import { OracleInfo, OraclePriceData } from '../oracles/types';
 import { User } from '../user';
-import { Client, CommitmentLevel, LaserstreamConfig } from '../isomorphic/grpc';
+import { ChannelOptions, CommitmentLevel } from '../isomorphic/grpc';
 export interface AccountSubscriber<T> {
     dataAndSlot?: DataAndSlot<T>;
     subscribe(onChange: (data: T) => void): Promise<void>;
@@ -155,25 +155,18 @@ export interface UserStatsAccountSubscriber {
     unsubscribe(): Promise<void>;
     getUserStatsAccountAndSlot(): DataAndSlot<UserStatsAccount>;
 }
-type BaseGrpcConfigs = {
+export type GrpcConfigs = {
     endpoint: string;
     token: string;
     commitmentLevel?: CommitmentLevel;
+    channelOptions?: ChannelOptions;
     /**
      * Whether to enable automatic reconnection on connection loss .
      * Defaults to false, will throw on connection loss.
      */
     enableReconnect?: boolean;
+    client?: 'yellowstone' | 'laser';
 };
-export type YellowstoneGrpcConfigs = BaseGrpcConfigs & {
-    client?: 'yellowstone';
-    channelOptions?: ConstructorParameters<typeof Client>[2];
-};
-export type LaserGrpcConfigs = BaseGrpcConfigs & {
-    client: 'laser';
-    channelOptions?: LaserstreamConfig['channelOptions'];
-};
-export type GrpcConfigs = YellowstoneGrpcConfigs | LaserGrpcConfigs;
 export interface HighLeverageModeConfigAccountSubscriber {
     eventEmitter: StrictEventEmitter<EventEmitter, HighLeverageModeConfigAccountEvents>;
     isSubscribed: boolean;
@@ -199,4 +192,3 @@ export interface ConstituentAccountEvents {
     update: void;
     error: (e: Error) => void;
 }
-export {};

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

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { DataAndSlot, BufferAndSlot, AccountSubscriber, ResubOpts } from './types';
 import { Program } from '@coral-xyz/anchor';
 import { AccountInfo, Commitment, Context, PublicKey } from '@solana/web3.js';

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

@@ -1,6 +1,5 @@
 /// <reference types="node" />
 /// <reference types="node" />
-/// <reference types="node" />
 import { AccountSubscriber, DataAndSlot, DelistedMarketSetting, DriftClientAccountEvents, DriftClientAccountSubscriber, ResubOpts } from './types';
 import { PerpMarketAccount, SpotMarketAccount, StateAccount } from '../types';
 import { Program } from '@coral-xyz/anchor';

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

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { BufferAndSlot, ProgramAccountSubscriber, ResubOpts } from './types';
 import { Program } from '@coral-xyz/anchor';
 import { Commitment, Context, KeyedAccountInfo, MemcmpFilter, PublicKey } from '@solana/web3.js';

package/lib/browser/driftClient.d.ts

@@ -22,14 +22,13 @@ import { JupiterClient, QuoteResponse } from './jupiter/jupiterClient';
 import { SwapMode, UnifiedQuoteResponse } from './swap/UnifiedSwapClient';
 import { UserStatsSubscriptionConfig } from './userStatsConfig';
 import { TxHandler } from './tx/txHandler';
-import { WormholeCoreBridgeSolana } from '@pythnetwork/pyth-solana-receiver/lib/idl/wormhole_core_bridge_solana';
-import { PythSolanaReceiver } from '@pythnetwork/pyth-solana-receiver/lib/idl/pyth_solana_receiver';
 import { Slothash } from './slot/SlothashSubscriber';
 import { SignedMsgOrderParams } from './types';
 import { ConstituentMap } from './constituentMap/constituentMap';
 import { RevenueShareEscrowMap } from './userMap/revenueShareEscrowMap';
 import { TitanClient } from './titan/titanClient';
 import { UnifiedSwapClient } from './swap/UnifiedSwapClient';
+import { WormholeCoreBridgeSolana, PythSolanaReceiver } from './pyth';
 /**
  * Union type for swap clients (Titan and Jupiter) - Legacy type
  * @deprecated Use UnifiedSwapClient class instead

package/lib/browser/driftClient.js

@@ -60,9 +60,7 @@ const utils_1 = require("./math/utils");
 const txParamProcessor_1 = require("./tx/txParamProcessor");
 const oracles_1 = require("./math/oracles");
 const txHandler_1 = require("./tx/txHandler");
-const pyth_solana_receiver_1 = require("@pythnetwork/pyth-solana-receiver");
 const price_service_sdk_1 = require("@pythnetwork/price-service-sdk");
-const address_1 = require("@pythnetwork/pyth-solana-receiver/lib/address");
 const pythOracleUtils_1 = require("./util/pythOracleUtils");
 const ed25519Utils_1 = require("./util/ed25519Utils");
 const utils_2 = require("./tx/utils");
@@ -77,6 +75,7 @@ const orders_1 = require("./math/orders");
 const builder_1 = require("./math/builder");
 const titanClient_1 = require("./titan/titanClient");
 const UnifiedSwapClient_1 = require("./swap/UnifiedSwapClient");
+const pyth_1 = require("./pyth");
 /**
  * # 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.
@@ -5666,7 +5665,7 @@ class DriftClient {
     }
     getReceiverProgram() {
         if (this.receiverProgram === undefined) {
-            this.receiverProgram = new anchor_1.Program(pyth_solana_receiver_json_1.default, pyth_solana_receiver_1.DEFAULT_RECEIVER_PROGRAM_ID, this.provider);
+            this.receiverProgram = new anchor_1.Program(pyth_solana_receiver_json_1.default, pyth_1.DEFAULT_RECEIVER_PROGRAM_ID, this.provider);
         }
         return this.receiverProgram;
     }
@@ -5691,7 +5690,7 @@ class DriftClient {
     async getPostPythPullOracleUpdateAtomicIxs(vaaString, feedIds, numSignatures = 2) {
         const accumulatorUpdateData = (0, price_service_sdk_1.parseAccumulatorUpdateData)(Buffer.from(vaaString, 'base64'));
         const guardianSetIndex = accumulatorUpdateData.vaa.readUInt32BE(1);
-        const guardianSet = (0, address_1.getGuardianSetPda)(guardianSetIndex, address_1.DEFAULT_WORMHOLE_PROGRAM_ID);
+        const guardianSet = (0, pyth_1.getGuardianSetPda)(guardianSetIndex, pyth_1.DEFAULT_WORMHOLE_PROGRAM_ID);
         const trimmedVaa = (0, oracles_1.trimVaaSignatures)(accumulatorUpdateData.vaa, numSignatures);
         const postIxs = [];
         if (accumulatorUpdateData.updates.length > 1) {
@@ -5746,7 +5745,7 @@ class DriftClient {
         feedId = (0, pythOracleUtils_1.trimFeedId)(feedId);
         const accumulatorUpdateData = (0, price_service_sdk_1.parseAccumulatorUpdateData)(Buffer.from(vaaString, 'base64'));
         const guardianSetIndex = accumulatorUpdateData.vaa.readUInt32BE(1);
-        const guardianSet = (0, address_1.getGuardianSetPda)(guardianSetIndex, address_1.DEFAULT_WORMHOLE_PROGRAM_ID);
+        const guardianSet = (0, pyth_1.getGuardianSetPda)(guardianSetIndex, pyth_1.DEFAULT_WORMHOLE_PROGRAM_ID);
         const [postIxs, encodedVaaAddress] = await this.getBuildEncodedVaaIxs(accumulatorUpdateData.vaa, guardianSet);
         for (const update of accumulatorUpdateData.updates) {
             postIxs.push(await this.getUpdatePythPullOracleIxs({
@@ -5857,7 +5856,7 @@ class DriftClient {
     async getBuildEncodedVaaIxs(vaa, guardianSet) {
         const postIxs = [];
         if (this.wormholeProgram === undefined) {
-            this.wormholeProgram = new anchor_1.Program(pyth_solana_receiver_1.wormholeCoreBridgeIdl, address_1.DEFAULT_WORMHOLE_PROGRAM_ID, this.provider);
+            this.wormholeProgram = new anchor_1.Program(pyth_1.WORMHOLE_CORE_BRIDGE_SOLANA_IDL, pyth_1.DEFAULT_WORMHOLE_PROGRAM_ID, this.provider);
         }
         const encodedVaaKeypair = new web3_js_1.Keypair();
         postIxs.push(await this.wormholeProgram.account.encodedVaa.createInstruction(encodedVaaKeypair, vaa.length + 46));

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

@@ -4,8 +4,8 @@
 import { Connection, PublicKey } from '@solana/web3.js';
 import { OracleClient, OraclePriceData } from './types';
 import { BN, Program } from '@coral-xyz/anchor';
-import { PythSolanaReceiverProgram } from '@pythnetwork/pyth-solana-receiver';
-import { PriceUpdateAccount } from '@pythnetwork/pyth-solana-receiver/lib/PythSolanaReceiver';
+import { PythSolanaReceiver as PythSolanaReceiverProgram } from '../pyth';
+import { PriceUpdateAccount } from '../pyth';
 export declare class PythPullClient implements OracleClient {
     private connection;
     private multiple;

package/lib/browser/oracles/pythPullClient.js

@@ -1,10 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertPythPrice = exports.PythPullClient = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const anchor_1 = require("@coral-xyz/anchor");
 const numericConstants_1 = require("../constants/numericConstants");
-const pyth_solana_receiver_1 = require("@pythnetwork/pyth-solana-receiver");
+const pyth_solana_receiver_json_1 = __importDefault(require("../idl/pyth_solana_receiver.json"));
 const config_1 = require("../config");
 const wallet_1 = require("../wallet");
 class PythPullClient {
@@ -17,7 +20,7 @@ class PythPullClient {
         new wallet_1.Wallet(new web3_js_1.Keypair()), {
             commitment: connection.commitment,
         });
-        this.receiver = new anchor_1.Program(pyth_solana_receiver_1.pythSolanaReceiverIdl, config_1.DRIFT_ORACLE_RECEIVER_ID, provider);
+        this.receiver = new anchor_1.Program(pyth_solana_receiver_json_1.default, config_1.DRIFT_ORACLE_RECEIVER_ID, provider);
         this.decodeFunc =
             this.receiver.account.priceUpdateV2.coder.accounts.decodeUnchecked.bind(this.receiver.account.priceUpdateV2.coder.accounts);
     }

package/lib/browser/pyth/constants.d.ts

@@ -0,0 +1,3 @@
+import { PublicKey } from '@solana/web3.js';
+export declare const DEFAULT_WORMHOLE_PROGRAM_ID: PublicKey;
+export declare const DEFAULT_RECEIVER_PROGRAM_ID: PublicKey;

package/lib/browser/pyth/constants.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_RECEIVER_PROGRAM_ID = exports.DEFAULT_WORMHOLE_PROGRAM_ID = void 0;
+const web3_js_1 = require("@solana/web3.js");
+exports.DEFAULT_WORMHOLE_PROGRAM_ID = new web3_js_1.PublicKey('HDwcJBJXjL9FpJ7UBsYBtaDjsBUhuLCUYoz3zr8SWWaQ');
+exports.DEFAULT_RECEIVER_PROGRAM_ID = new web3_js_1.PublicKey('rec5EKMGg6MxZYaMdyBfgwp4d5rB9T1VQH5pJv5LtFJ');

package/lib/browser/pyth/index.d.ts

@@ -0,0 +1,3 @@
+export { WormholeCoreBridgeSolana, WORMHOLE_CORE_BRIDGE_SOLANA_IDL, PythSolanaReceiver, PriceUpdateAccount, } from './types';
+export { DEFAULT_WORMHOLE_PROGRAM_ID, DEFAULT_RECEIVER_PROGRAM_ID, } from './constants';
+export { getGuardianSetPda } from './utils';

package/lib/browser/pyth/index.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGuardianSetPda = exports.DEFAULT_RECEIVER_PROGRAM_ID = exports.DEFAULT_WORMHOLE_PROGRAM_ID = exports.WORMHOLE_CORE_BRIDGE_SOLANA_IDL = void 0;
+var types_1 = require("./types");
+Object.defineProperty(exports, "WORMHOLE_CORE_BRIDGE_SOLANA_IDL", { enumerable: true, get: function () { return types_1.WORMHOLE_CORE_BRIDGE_SOLANA_IDL; } });
+var constants_1 = require("./constants");
+Object.defineProperty(exports, "DEFAULT_WORMHOLE_PROGRAM_ID", { enumerable: true, get: function () { return constants_1.DEFAULT_WORMHOLE_PROGRAM_ID; } });
+Object.defineProperty(exports, "DEFAULT_RECEIVER_PROGRAM_ID", { enumerable: true, get: function () { return constants_1.DEFAULT_RECEIVER_PROGRAM_ID; } });
+var utils_1 = require("./utils");
+Object.defineProperty(exports, "getGuardianSetPda", { enumerable: true, get: function () { return utils_1.getGuardianSetPda; } });