Merge pull request #2069 from drift-labs/revert-2063-jack/updated-triton-grpc

Revert "chore: update yellowstone to rust bindings version"

Author: jackwaller

sdk/package.json

@@ -45,6 +45,7 @@
 		"@coral-xyz/anchor": "0.29.0",
 		"@coral-xyz/anchor-30": "npm:@coral-xyz/anchor@0.30.1",
 		"@ellipsis-labs/phoenix-sdk": "1.4.5",
+		"@grpc/grpc-js": "1.14.0",
 		"@msgpack/msgpack": "^3.1.2",
 		"@openbook-dex/openbook-v2": "0.2.10",
 		"@project-serum/serum": "0.13.65",
@@ -55,7 +56,7 @@
 		"@solana/web3.js": "1.98.0",
 		"@switchboard-xyz/common": "3.0.14",
 		"@switchboard-xyz/on-demand": "2.4.1",
-		"@triton-one/yellowstone-grpc": "5.0.1-beta-12",
+		"@triton-one/yellowstone-grpc": "1.4.1",
 		"anchor-bankrun": "0.3.0",
 		"gill": "^0.10.2",
 		"helius-laserstream": "0.1.8",

sdk/src/accounts/grpcAccountSubscriber.ts

@@ -6,6 +6,7 @@ import * as Buffer from 'buffer';
 import { WebSocketAccountSubscriber } from './webSocketAccountSubscriber';
 import {
 	Client,
+	ClientDuplexStream,
 	CommitmentLevel,
 	createClient,
 	SubscribeRequest,
@@ -14,7 +15,7 @@ import {
 
 export class grpcAccountSubscriber<T> extends WebSocketAccountSubscriber<T> {
 	private client: Client;
-	private stream;
+	private stream: ClientDuplexStream<SubscribeRequest, SubscribeUpdate>;
 	private commitmentLevel: CommitmentLevel;
 	public listenerId?: number;
 

sdk/src/accounts/grpcMultiAccountSubscriber.ts

@@ -5,6 +5,7 @@ import bs58 from 'bs58';
 
 import {
 	Client,
+	ClientDuplexStream,
 	CommitmentLevel,
 	SubscribeRequest,
 	SubscribeUpdate,
@@ -37,7 +38,7 @@ function commitmentLevelToCommitment(
 
 export class grpcMultiAccountSubscriber<T, U = undefined> {
 	private client: Client;
-	private stream;
+	private stream: ClientDuplexStream<SubscribeRequest, SubscribeUpdate>;
 	private commitmentLevel: CommitmentLevel;
 	private program: Program;
 	private accountName: string;
@@ -224,7 +225,8 @@ export class grpcMultiAccountSubscriber<T, U = undefined> {
 			});
 		}
 
-		this.stream = await this.client.subscribe();
+		this.stream =
+			(await this.client.subscribe()) as unknown as typeof this.stream;
 		const request: SubscribeRequest = {
 			slots: {},
 			accounts: {

sdk/src/accounts/grpcProgramAccountSubscriber.ts

@@ -6,6 +6,7 @@ import * as Buffer from 'buffer';
 import { WebSocketProgramAccountSubscriber } from './webSocketProgramAccountSubscriber';
 import {
 	Client,
+	ClientDuplexStream,
 	CommitmentLevel,
 	createClient,
 	SubscribeRequest,
@@ -16,7 +17,7 @@ export class grpcProgramAccountSubscriber<
 	T,
 > extends WebSocketProgramAccountSubscriber<T> {
 	private client: Client;
-	private stream;
+	private stream: ClientDuplexStream<SubscribeRequest, SubscribeUpdate>;
 	private commitmentLevel: CommitmentLevel;
 	public listenerId?: number;
 
@@ -91,7 +92,8 @@ export class grpcProgramAccountSubscriber<
 		this.onChange = onChange;
 
 		// Subscribe with grpc
-		this.stream = await this.client.subscribe();
+		this.stream =
+			(await this.client.subscribe()) as unknown as typeof this.stream;
 		const filters = this.options.filters.map((filter) => {
 			return {
 				memcmp: {

sdk/src/isomorphic/grpc.node.ts

@@ -4,6 +4,8 @@ import type {
 	SubscribeUpdate,
 } from '@triton-one/yellowstone-grpc';
 import { CommitmentLevel } from '@triton-one/yellowstone-grpc';
+import type { ClientDuplexStream, ChannelOptions } from '@grpc/grpc-js';
+
 import {
 	CommitmentLevel as LaserCommitmentLevel,
 	subscribe as LaserSubscribe,
@@ -23,6 +25,8 @@ export {
 	CompressionAlgorithms,
 };
 export type {
+	ClientDuplexStream,
+	ChannelOptions,
 	SubscribeRequest,
 	SubscribeUpdate,
 	LaserstreamConfig,