@drift-labs/sdk-browser 2.157.0-beta.3 → 2.157.0-beta.5

package/VERSION

@@ -1 +1 @@
-2.157.0-beta.3
+2.157.0-beta.5

package/lib/browser/accounts/grpcProgramAccountSubscriber.js

@@ -22,12 +22,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.grpcProgramAccountSubscriber = void 0;
-const bs58_1 = __importDefault(require("bs58"));
 const web3_js_1 = require("@solana/web3.js");
 const Buffer = __importStar(require("buffer"));
 const webSocketProgramAccountSubscriber_1 = require("./webSocketProgramAccountSubscriber");
@@ -56,13 +52,12 @@ class grpcProgramAccountSubscriber extends webSocketProgramAccountSubscriber_1.W
         }
         this.onChange = onChange;
         // Subscribe with grpc
-        this.stream =
-            (await this.client.subscribe());
+        this.stream = await this.client.subscribe();
         const filters = this.options.filters.map((filter) => {
             return {
                 memcmp: {
-                    offset: filter.memcmp.offset.toString(),
-                    bytes: bs58_1.default.decode(filter.memcmp.bytes),
+                    offset: filter.memcmp.offset,
+                    base58: filter.memcmp.bytes,
                 },
             };
         });

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

@@ -1 +1 @@
-{"version":3,"file":"grpcProgramAccountSubscriber.d.ts","sourceRoot":"","sources":["../../../src/accounts/grpcProgramAccountSubscriber.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEnE,OAAO,EAAE,iCAAiC,EAAE,MAAM,qCAAqC,CAAC;AAUxF,qBAAa,4BAA4B,CACxC,CAAC,CACA,SAAQ,iCAAiC,CAAC,CAAC,CAAC;IAC7C,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,MAAM,CAAwD;IACtE,OAAO,CAAC,eAAe,CAAkB;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IAE3B,OAAO;WAwBa,MAAM,CAAC,CAAC,EAC3B,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,MAAM,EACxB,oBAAoB,EAAE,MAAM,EAC5B,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,KAAK,CAAC,EACtD,OAAO,GAAE;QAAE,OAAO,EAAE,YAAY,EAAE,CAAA;KAEjC,EACD,SAAS,CAAC,EAAE,SAAS,GACnB,OAAO,CAAC,4BAA4B,CAAC,CAAC,CAAC,CAAC;IAsBrC,SAAS,CACd,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;IA6FH,WAAW,CAAC,OAAO,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAsCxD"}
+{"version":3,"file":"grpcProgramAccountSubscriber.d.ts","sourceRoot":"","sources":["../../../src/accounts/grpcProgramAccountSubscriber.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEnE,OAAO,EAAE,iCAAiC,EAAE,MAAM,qCAAqC,CAAC;AASxF,qBAAa,4BAA4B,CACxC,CAAC,CACA,SAAQ,iCAAiC,CAAC,CAAC,CAAC;IAC7C,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,MAAM,CAA2C;IACzD,OAAO,CAAC,eAAe,CAAkB;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IAE3B,OAAO;WAwBa,MAAM,CAAC,CAAC,EAC3B,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,MAAM,EACxB,oBAAoB,EAAE,MAAM,EAC5B,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,KAAK,CAAC,EACtD,OAAO,GAAE;QAAE,OAAO,EAAE,YAAY,EAAE,CAAA;KAEjC,EACD,SAAS,CAAC,EAAE,SAAS,GACnB,OAAO,CAAC,4BAA4B,CAAC,CAAC,CAAC,CAAC;IAsBrC,SAAS,CACd,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+FH,WAAW,CAAC,OAAO,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAsCxD"}

package/lib/node/accounts/grpcProgramAccountSubscriber.js

@@ -22,12 +22,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.grpcProgramAccountSubscriber = void 0;
-const bs58_1 = __importDefault(require("bs58"));
 const web3_js_1 = require("@solana/web3.js");
 const Buffer = __importStar(require("buffer"));
 const webSocketProgramAccountSubscriber_1 = require("./webSocketProgramAccountSubscriber");
@@ -56,13 +52,12 @@ class grpcProgramAccountSubscriber extends webSocketProgramAccountSubscriber_1.W
         }
         this.onChange = onChange;
         // Subscribe with grpc
-        this.stream =
-            (await this.client.subscribe());
+        this.stream = await this.client.subscribe();
         const filters = this.options.filters.map((filter) => {
             return {
                 memcmp: {
-                    offset: filter.memcmp.offset.toString(),
-                    bytes: bs58_1.default.decode(filter.memcmp.bytes),
+                    offset: filter.memcmp.offset,
+                    base58: filter.memcmp.bytes,
                 },
             };
         });

package/lib/node/isomorphic/grpc.node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grpc.node.d.ts","sourceRoot":"","sources":["../../../src/isomorphic/grpc.node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,8BAA8B,CAAC;AACvD,OAAO,KAAK,EACX,gBAAgB,EAChB,eAAe,EACf,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAGxE,YAAY,EACX,iBAAiB,EACjB,gBAAgB,IAAI,qBAAqB,EACzC,eAAe,IAAI,oBAAoB,GACvC,MAAM,oBAAoB,CAAC;AA4B5B,eAAO,MAAM,oBAAoB;;;;CAahC,CAAC;AAEF,eAAO,MAAM,qBAAqB,2DAajC,CAAC;AAGF,wBAAsB,iBAAiB,IAAI,OAAO,CACjD,cAAc,oBAAoB,EAAE,SAAS,CAC7C,CAGA;AAGD,wBAAsB,uBAAuB,IAAI,OAAO,CACvD,cAAc,oBAAoB,EAAE,eAAe,CACnD,CAGA;AAGD,wBAAsB,6BAA6B,IAAI,OAAO,CAC7D,cAAc,oBAAoB,EAAE,qBAAqB,CACzD,CAGA;AAKD,wBAAgB,cAAc,CAC7B,GAAG,IAAI,EAAE,UAAU,CAAC,cAAc,oBAAoB,EAAE,SAAS,CAAC,GAChE,UAAU,CAAC,cAAc,oBAAoB,EAAE,SAAS,CAAC,CAQ3D;AAED,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,CAAC;AACnC,YAAY,EACX,kBAAkB,EAClB,cAAc,EACd,gBAAgB,EAChB,eAAe,GACf,CAAC;AAGF,wBAAsB,YAAY,CACjC,GAAG,IAAI,EAAE,qBAAqB,CAAC,OAAO,MAAM,CAAC,GAC3C,OAAO,CAAC,MAAM,CAAC,CAGjB"}
+{"version":3,"file":"grpc.node.d.ts","sourceRoot":"","sources":["../../../src/isomorphic/grpc.node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,8BAA8B,CAAC;AACvD,OAAO,KAAK,EACX,gBAAgB,EAChB,eAAe,EACf,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAGxE,YAAY,EACX,iBAAiB,EACjB,gBAAgB,IAAI,qBAAqB,EACzC,eAAe,IAAI,oBAAoB,GACvC,MAAM,oBAAoB,CAAC;AA4B5B,eAAO,MAAM,oBAAoB;;;;CAahC,CAAC;AAEF,eAAO,MAAM,qBAAqB,2DAajC,CAAC;AAGF,wBAAsB,iBAAiB,IAAI,OAAO,CACjD,cAAc,oBAAoB,EAAE,SAAS,CAC7C,CAGA;AAGD,wBAAsB,uBAAuB,IAAI,OAAO,CACvD,cAAc,oBAAoB,EAAE,eAAe,CACnD,CAGA;AAGD,wBAAsB,6BAA6B,IAAI,OAAO,CAC7D,cAAc,oBAAoB,EAAE,qBAAqB,CACzD,CAGA;AAKD,wBAAgB,cAAc,CAC7B,GAAG,IAAI,EAAE,UAAU,CAAC,cAAc,oBAAoB,EAAE,SAAS,CAAC,GAChE,UAAU,CAAC,cAAc,oBAAoB,EAAE,SAAS,CAAC,CAQ3D;AAED,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,CAAC;AACnC,YAAY,EACX,kBAAkB,EAClB,cAAc,EACd,gBAAgB,EAChB,eAAe,GACf,CAAC;AAGF,wBAAsB,YAAY,CACjC,GAAG,IAAI,EAAE,qBAAqB,CAAC,OAAO,MAAM,CAAC,GAC3C,OAAO,CAAC,MAAM,CAAC,CAKjB"}

package/package.json

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

package/src/accounts/grpcProgramAccountSubscriber.ts

@@ -1,12 +1,10 @@
 import { ResubOpts, GrpcConfigs } from './types';
 import { Program } from '@coral-xyz/anchor';
-import bs58 from 'bs58';
 import { Context, MemcmpFilter, PublicKey } from '@solana/web3.js';
 import * as Buffer from 'buffer';
 import { WebSocketProgramAccountSubscriber } from './webSocketProgramAccountSubscriber';
 import {
 	Client,
-	ClientDuplexStream,
 	CommitmentLevel,
 	createClient,
 	SubscribeRequest,
@@ -17,7 +15,7 @@ export class grpcProgramAccountSubscriber<
 	T,
 > extends WebSocketProgramAccountSubscriber<T> {
 	private client: Client;
-	private stream: ClientDuplexStream<SubscribeRequest, SubscribeUpdate>;
+	private stream: Awaited<ReturnType<Client['subscribe']>>;
 	private commitmentLevel: CommitmentLevel;
 	public listenerId?: number;
 
@@ -92,17 +90,18 @@ export class grpcProgramAccountSubscriber<
 		this.onChange = onChange;
 
 		// Subscribe with grpc
-		this.stream =
-			(await this.client.subscribe()) as unknown as typeof this.stream;
+		this.stream = await this.client.subscribe();
+
 		const filters = this.options.filters.map((filter) => {
 			return {
 				memcmp: {
-					offset: filter.memcmp.offset.toString(),
-					bytes: bs58.decode(filter.memcmp.bytes),
+					offset: filter.memcmp.offset,
+					base58: filter.memcmp.bytes,
 				},
 			};
 		});
-		const request: SubscribeRequest = {
+
+		const request = {
 			slots: {},
 			accounts: {
 				drift: {
@@ -119,6 +118,7 @@ export class grpcProgramAccountSubscriber<
 			entry: {},
 			transactionsStatus: {},
 		};
+
 		this.stream.on('data', (chunk: SubscribeUpdate) => {
 			if (!chunk.account) {
 				return;

package/src/isomorphic/grpc.node.ts

@@ -121,5 +121,7 @@ export async function createClient(
 	...args: ConstructorParameters<typeof Client>
 ): Promise<Client> {
 	const { default: Client_ } = await import('@triton-one/yellowstone-grpc');
-	return new Client_(...args);
+	const client = new Client_(...args);
+	await client.connect();
+	return client;
 }