sdk: revert drift interface (#1784)

* Revert "Remove Circular Dependencies 3 (#1779)"

This reverts commit 697ce50.

* Revert "Improve Circular Dependencies 2 (#1778)"

This reverts commit f09b59d.

* Revert "Improve circular dependencies 1 (#1776)"

This reverts commit f4e3333.

* prettify:fix

Author: crispheaney

bun.lock

@@ -1,12 +1,8 @@
-import {
-	DataAndSlot,
-	UserAccountEvents,
-	UserAccountSubscriber,
-} from '../types';
+import { DataAndSlot, UserAccountEvents, UserAccountSubscriber } from './types';
 import { PublicKey } from '@solana/web3.js';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
-import { UserAccount } from '../../types';
+import { UserAccount } from '../types';
 
 /**
  * Basic implementation of UserAccountSubscriber. It will only take in UserAccount

sdk/src/accounts/userAccount/basicUserAccountSubscriber.ts renamed to sdk/src/accounts/basicUserAccountSubscriber.ts

@@ -1,9 +1,9 @@
 import { Commitment, PublicKey } from '@solana/web3.js';
 import { v4 as uuidv4 } from 'uuid';
-import { BufferAndSlot } from '../types';
-import { promiseTimeout } from '../../util/promiseTimeout';
-import { Connection } from '../../bankrun/bankrunConnection';
-import { GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE } from '../../constants/numericConstants';
+import { BufferAndSlot } from './types';
+import { promiseTimeout } from '../util/promiseTimeout';
+import { Connection } from '../bankrun/bankrunConnection';
+import { GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE } from '../constants/numericConstants';
 
 export type AccountToLoad = {
 	publicKey: PublicKey;

sdk/src/accounts/bulkAccountLoader/bulkAccountLoader.ts renamed to sdk/src/accounts/bulkAccountLoader.ts

@@ -1,6 +1,6 @@
 import { UserStats } from '../userStats';
-import { BulkAccountLoader } from './bulkAccountLoader/bulkAccountLoader';
-import { PollingUserStatsAccountSubscriber } from './userStatsAccount/pollingUserStatsAccountSubscriber';
+import { BulkAccountLoader } from './bulkAccountLoader';
+import { PollingUserStatsAccountSubscriber } from './pollingUserStatsAccountSubscriber';
 
 /**
  * @param userStats

sdk/src/accounts/bulkUserStatsSubscription.ts

@@ -1,6 +1,6 @@
 import { User } from '../user';
-import { BulkAccountLoader } from './bulkAccountLoader/bulkAccountLoader';
-import { PollingUserAccountSubscriber } from './userAccount/pollingUserAccountSubscriber';
+import { BulkAccountLoader } from './bulkAccountLoader';
+import { PollingUserAccountSubscriber } from './pollingUserAccountSubscriber';
 
 /**
  * @param users

sdk/src/accounts/bulkUserSubscription.ts

@@ -1,4 +1,4 @@
-import { GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE } from '../../constants/numericConstants';
+import { GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE } from '../constants/numericConstants';
 import { BulkAccountLoader } from './bulkAccountLoader';
 import { Commitment, Connection, PublicKey } from '@solana/web3.js';
 import { v4 as uuidv4 } from 'uuid';

sdk/src/accounts/bulkAccountLoader/customizedCadenceBulkAccountLoader.ts renamed to sdk/src/accounts/customizedCadenceBulkAccountLoader.ts

@@ -1,4 +1,4 @@
-import { ResubOpts, GrpcConfigs } from '../types';
+import { ResubOpts, GrpcConfigs } from './types';
 import { Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import * as Buffer from 'buffer';
@@ -11,7 +11,7 @@ import {
 	createClient,
 	SubscribeRequest,
 	SubscribeUpdate,
-} from '../../isomorphic/grpc';
+} from '../isomorphic/grpc';
 
 export class grpcAccountSubscriber<T> extends WebSocketAccountSubscriber<T> {
 	private client: Client;

sdk/src/accounts/baseSubscribers/grpcAccountSubscriber.ts renamed to sdk/src/accounts/grpcAccountSubscriber.ts

@@ -1,20 +1,16 @@
 import { WebSocketDriftClientAccountSubscriber } from './webSocketDriftClientAccountSubscriber';
-import { OracleInfo, OraclePriceData } from '../../oracles/types';
+import { OracleInfo, OraclePriceData } from '../oracles/types';
 import { Program } from '@coral-xyz/anchor';
-import { findAllMarketAndOracles } from '../../config';
+import { findAllMarketAndOracles } from '../config';
 import {
 	getDriftStateAccountPublicKey,
 	getPerpMarketPublicKey,
 	getSpotMarketPublicKey,
-} from '../../addresses/pda';
-import { DelistedMarketSetting, GrpcConfigs, ResubOpts } from '../types';
-import { grpcAccountSubscriber } from '../baseSubscribers/grpcAccountSubscriber';
-import {
-	PerpMarketAccount,
-	SpotMarketAccount,
-	StateAccount,
-} from '../../types';
-import { getOracleId } from '../../oracles/oracleId';
+} from '../addresses/pda';
+import { DelistedMarketSetting, GrpcConfigs, ResubOpts } from './types';
+import { grpcAccountSubscriber } from './grpcAccountSubscriber';
+import { PerpMarketAccount, SpotMarketAccount, StateAccount } from '../types';
+import { getOracleId } from '../oracles/oracleId';
 
 export class gprcDriftClientAccountSubscriber extends WebSocketDriftClientAccountSubscriber {
 	private grpcConfigs: GrpcConfigs;

sdk/src/accounts/driftClientAccount/grpcDriftClientAccountSubscriber.ts renamed to sdk/src/accounts/grpcDriftClientAccountSubscriber.ts

@@ -1,9 +1,9 @@
-import { GrpcConfigs } from '../types';
+import { GrpcConfigs } from './types';
 import { Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
-import { InsuranceFundStake } from '../../types';
+import { InsuranceFundStake } from '../types';
 import { WebSocketInsuranceFundStakeAccountSubscriber } from './webSocketInsuranceFundStakeAccountSubscriber';
-import { grpcAccountSubscriber } from '../baseSubscribers/grpcAccountSubscriber';
+import { grpcAccountSubscriber } from './grpcAccountSubscriber';
 
 export class grpcInsuranceFundStakeAccountSubscriber extends WebSocketInsuranceFundStakeAccountSubscriber {
 	private grpcConfigs: GrpcConfigs;

sdk/src/accounts/insuranceFundStakeAccount/grpcInsuranceFundStakeAccountSubscriber.ts renamed to sdk/src/accounts/grpcInsuranceFundStakeAccountSubscriber.ts

@@ -1,4 +1,4 @@
-import { ResubOpts, GrpcConfigs } from '../types';
+import { ResubOpts, GrpcConfigs } from './types';
 import { Program } from '@coral-xyz/anchor';
 import bs58 from 'bs58';
 import { Context, MemcmpFilter, PublicKey } from '@solana/web3.js';
@@ -11,7 +11,7 @@ import {
 	createClient,
 	SubscribeRequest,
 	SubscribeUpdate,
-} from '../../isomorphic/grpc';
+} from '../isomorphic/grpc';
 
 export class grpcProgramAccountSubscriber<
 	T,