ts build

Author: jordy25519

bun.lock

@@ -5,8 +5,8 @@
 	"author": "",
 	"license": "ISC",
 	"devDependencies": {
-		"@coral-xyz/anchor": "0.29.0",
-		"@coral-xyz/anchor-30": "npm:@coral-xyz/anchor@0.30.1",
+		"@coral-xyz/anchor": "npm:@coral-xyz/anchor@0.31.1",
+		"@coral-xyz/anchor-29": "npm:@coral-xyz/anchor@0.29.0",
 		"@project-serum/common": "0.0.1-beta.3",
 		"@project-serum/serum": "0.13.65",
 		"@pythnetwork/client": "2.21.0",
@@ -30,8 +30,8 @@
 	"dependencies": {
 		"@ellipsis-labs/phoenix-sdk": "1.4.2",
 		"@pythnetwork/pyth-solana-receiver": "0.8.0",
-		"@switchboard-xyz/common": "3.0.14",
-		"@switchboard-xyz/on-demand": "2.4.1",
+		"@switchboard-xyz/common": "5.5.0",
+		"@switchboard-xyz/on-demand": "3.7.3",
 		"anchor-bankrun": "0.3.0",
 		"chai-bn": "0.2.2",
 		"csvtojson": "2.0.10",
@@ -95,4 +95,4 @@
 		"supports-hyperlinks": "<4.1.1",
 		"has-ansi": "<6.0.1"
 	}
-}
+}

package.json

@@ -41,8 +41,8 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@coral-xyz/anchor": "0.29.0",
-		"@coral-xyz/anchor-30": "npm:@coral-xyz/anchor@0.30.1",
+		"@coral-xyz/anchor": "npm:@coral-xyz/anchor@0.31.1",
+		"@coral-xyz/anchor-29": "npm:@coral-xyz/anchor@0.29.0",
 		"@ellipsis-labs/phoenix-sdk": "1.4.5",
 		"@grpc/grpc-js": "1.14.0",
 		"@msgpack/msgpack": "^3.1.2",
@@ -53,11 +53,11 @@
 		"@pythnetwork/pyth-solana-receiver": "0.7.0",
 		"@solana/spl-token": "0.4.13",
 		"@solana/web3.js": "1.98.0",
-		"@switchboard-xyz/common": "3.0.14",
-		"@switchboard-xyz/on-demand": "2.4.1",
+		"@switchboard-xyz/common": "5.5.0",
+		"@switchboard-xyz/on-demand": "3.7.3",
 		"@triton-one/yellowstone-grpc": "1.4.1",
 		"anchor-bankrun": "0.3.0",
-		"gill": "^0.10.2",
+		"gill": "^0.10.3",
 		"helius-laserstream": "0.1.8",
 		"nanoid": "3.3.4",
 		"node-cache": "5.1.2",
@@ -147,4 +147,4 @@
 		"@grpc/grpc-js": false,
 		"zstddec": false
 	}
-}
+}

sdk/bun.lock

@@ -12,10 +12,11 @@ import {
 	getUserStatsAccountPublicKey,
 } from '../addresses/pda';
 import { Program } from '@coral-xyz/anchor';
+import { Drift } from '../idl/drift';
 
 export async function fetchUserAccounts(
 	connection: Connection,
-	program: Program,
+	program: Program<Drift>,
 	authority: PublicKey,
 	limit = 8
 ): Promise<(UserAccount | undefined)[]> {
@@ -31,7 +32,7 @@ export async function fetchUserAccounts(
 
 export async function fetchUserAccountsUsingKeys(
 	connection: Connection,
-	program: Program,
+	program: Program<Drift>,
 	userAccountPublicKeys: PublicKey[]
 ): Promise<(UserAccount | undefined)[]> {
 	const accountInfos = await connection.getMultipleAccountsInfo(
@@ -52,7 +53,7 @@ export async function fetchUserAccountsUsingKeys(
 
 export async function fetchUserStatsAccount(
 	connection: Connection,
-	program: Program,
+	program: Program<Drift>,
 	authority: PublicKey
 ): Promise<UserStatsAccount | undefined> {
 	const userStatsPublicKey = getUserStatsAccountPublicKey(
@@ -74,7 +75,7 @@ export async function fetchUserStatsAccount(
 
 export async function fetchRevenueShareAccount(
 	connection: Connection,
-	program: Program,
+	program: Program<Drift>,
 	authority: PublicKey
 ): Promise<RevenueShareAccount | null> {
 	const revenueShareAccountPublicKey = getRevenueShareAccountPublicKey(
@@ -93,7 +94,7 @@ export async function fetchRevenueShareAccount(
 
 export async function fetchRevenueShareEscrowAccount(
 	connection: Connection,
-	program: Program,
+	program: Program<Drift>,
 	authority: PublicKey
 ): Promise<RevenueShareEscrowAccount | null> {
 	const revenueShareEscrowPubKey = getRevenueShareEscrowAccountPublicKey(

sdk/package.json

@@ -12,6 +12,7 @@ import {
 	SubscribeRequest,
 	SubscribeUpdate,
 } from '../isomorphic/grpc';
+import { Drift } from '../idl/drift';
 
 export class grpcAccountSubscriber<T> extends WebSocketAccountSubscriber<T> {
 	private client: Client;
@@ -23,7 +24,7 @@ export class grpcAccountSubscriber<T> extends WebSocketAccountSubscriber<T> {
 		client: Client,
 		commitmentLevel: CommitmentLevel,
 		accountName: string,
-		program: Program,
+		program: Program<Drift>,
 		accountPublicKey: PublicKey,
 		decodeBuffer?: (buffer: Buffer) => T,
 		resubOpts?: ResubOpts
@@ -36,7 +37,7 @@ export class grpcAccountSubscriber<T> extends WebSocketAccountSubscriber<T> {
 	public static async create<U>(
 		grpcConfigs: GrpcConfigs,
 		accountName: string,
-		program: Program,
+		program: Program<Drift>,
 		accountPublicKey: PublicKey,
 		decodeBuffer?: (buffer: Buffer) => U,
 		resubOpts?: ResubOpts,

sdk/src/accounts/fetch.ts

@@ -11,13 +11,14 @@ import { DelistedMarketSetting, GrpcConfigs, ResubOpts } from './types';
 import { grpcAccountSubscriber } from './grpcAccountSubscriber';
 import { PerpMarketAccount, SpotMarketAccount, StateAccount } from '../types';
 import { getOracleId } from '../oracles/oracleId';
+import { Drift } from '../idl/drift';
 
 export class grpcDriftClientAccountSubscriber extends WebSocketDriftClientAccountSubscriber {
 	private grpcConfigs: GrpcConfigs;
 
 	constructor(
 		grpcConfigs: GrpcConfigs,
-		program: Program,
+		program: Program<Drift>,
 		perpMarketIndexes: number[],
 		spotMarketIndexes: number[],
 		oracleInfos: OracleInfo[],

sdk/src/accounts/grpcAccountSubscriber.ts

@@ -30,6 +30,7 @@ import {
 } from '../oracles/oracleId';
 import { OracleClientCache } from '../oracles/oracleClientCache';
 import { findDelistedPerpMarketsAndOracles } from './utils';
+import { Drift } from '../idl/drift';
 
 export class grpcDriftClientAccountSubscriberV2
 	implements DriftClientAccountSubscriber
@@ -51,7 +52,7 @@ export class grpcDriftClientAccountSubscriberV2
 	>;
 	public isSubscribed: boolean;
 	public isSubscribing: boolean;
-	public program: Program;
+	public program: Program<Drift>;
 	public perpMarketIndexes: number[];
 	public spotMarketIndexes: number[];
 	public shouldFindAllMarketsAndOracles: boolean;
@@ -76,7 +77,7 @@ export class grpcDriftClientAccountSubscriberV2
 
 	constructor(
 		grpcConfigs: GrpcConfigs,
-		program: Program,
+		program: Program<Drift>,
 		perpMarketIndexes: number[],
 		spotMarketIndexes: number[],
 		oracleInfos: OracleInfo[],

sdk/src/accounts/grpcDriftClientAccountSubscriber.ts

@@ -4,13 +4,14 @@ import { PublicKey } from '@solana/web3.js';
 import { InsuranceFundStake } from '../types';
 import { WebSocketInsuranceFundStakeAccountSubscriber } from './webSocketInsuranceFundStakeAccountSubscriber';
 import { grpcAccountSubscriber } from './grpcAccountSubscriber';
+import { Drift } from '../idl/drift';
 
 export class grpcInsuranceFundStakeAccountSubscriber extends WebSocketInsuranceFundStakeAccountSubscriber {
 	private grpcConfigs: GrpcConfigs;
 
 	public constructor(
 		grpcConfigs: GrpcConfigs,
-		program: Program,
+		program: Program<Drift>,
 		insuranceFundStakeAccountPublicKey: PublicKey,
 		resubTimeoutMs?: number
 	) {

sdk/src/accounts/grpcDriftClientAccountSubscriberV2.ts

@@ -12,6 +12,7 @@ import {
 	createClient,
 } from '../isomorphic/grpc';
 import { BufferAndSlot, DataAndSlot, GrpcConfigs, ResubOpts } from './types';
+import { Drift } from '../idl/drift';
 
 interface AccountInfoLike {
 	owner: PublicKey;
@@ -40,7 +41,7 @@ export class grpcMultiAccountSubscriber<T, U = undefined> {
 	private client: Client;
 	private stream: ClientDuplexStream<SubscribeRequest, SubscribeUpdate>;
 	private commitmentLevel: CommitmentLevel;
-	private program: Program;
+	private program: Program<Drift>;
 	private accountName: string;
 	private decodeBufferFn?: (
 		buffer: Buffer,
@@ -69,7 +70,7 @@ export class grpcMultiAccountSubscriber<T, U = undefined> {
 		client: Client,
 		commitmentLevel: CommitmentLevel,
 		accountName: string,
-		program: Program,
+		program: Program<Drift>,
 		decodeBuffer?: (buffer: Buffer, pubkey?: string) => T,
 		resubOpts?: ResubOpts,
 		onUnsubscribe?: () => Promise<void>,
@@ -88,7 +89,7 @@ export class grpcMultiAccountSubscriber<T, U = undefined> {
 	public static async create<T, U = undefined>(
 		grpcConfigs: GrpcConfigs,
 		accountName: string,
-		program: Program,
+		program: Program<Drift>,
 		decodeBuffer?: (buffer: Buffer, pubkey?: string, accountProps?: U) => T,
 		resubOpts?: ResubOpts,
 		clientProp?: Client,