@drift-labs/sdk 2.85.0-beta.0 → 2.85.0-beta.10

package/lib/driftClient.js

@@ -2267,6 +2267,9 @@ class DriftClient {
     async getJupiterSwapIxV6({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, onlyDirectRoutes, quote, reduceOnly, userAccountPublicKey, }) {
         const outMarket = this.getSpotMarketAccount(outMarketIndex);
         const inMarket = this.getSpotMarketAccount(inMarketIndex);
+        const isExactOut = swapMode === 'ExactOut' || quote.swapMode === 'ExactOut';
+        const amountIn = new anchor_1.BN(quote.inAmount);
+        const exactOutBufferedAmountIn = amountIn.muln(1001).divn(1000); // Add 10bp buffer
         if (!quote) {
             const fetchedQuote = await jupiterClient.getQuote({
                 inputMint: inMarket.mint,
@@ -2312,7 +2315,7 @@ class DriftClient {
         const { beginSwapIx, endSwapIx } = await this.getSwapIx({
             outMarketIndex,
             inMarketIndex,
-            amountIn: new anchor_1.BN(quote.inAmount),
+            amountIn: isExactOut ? exactOutBufferedAmountIn : amountIn,
             inTokenAccount: inAssociatedTokenAccount,
             outTokenAccount: outAssociatedTokenAccount,
             reduceOnly,
@@ -2544,7 +2547,7 @@ class DriftClient {
             };
             if (shouldUseSimulationComputeUnits || shouldExitIfSimulationFails) {
                 const placeAndTakeTxToSim = (await this.buildTransaction(placeAndTakeIxs, txParams, undefined, undefined, true, recentBlockHash));
-                const simulationResult = await txParamProcessor_1.TransactionParamProcessor.getTxSimComputeUnits(placeAndTakeTxToSim, this.connection, (_a = txParams.computeUnitsBufferMultiplier) !== null && _a !== void 0 ? _a : 1.2);
+                const simulationResult = await txParamProcessor_1.TransactionParamProcessor.getTxSimComputeUnits(placeAndTakeTxToSim, this.connection, (_a = txParams.computeUnitsBufferMultiplier) !== null && _a !== void 0 ? _a : 1.2, txParams.lowerBoundCu);
                 if (shouldExitIfSimulationFails && !simulationResult.success) {
                     earlyExitFailedPlaceAndTakeSim = true;
                     return;
@@ -2586,6 +2589,9 @@ class DriftClient {
     }
     async placeAndTakePerpWithAdditionalOrders(orderParams, makerInfo, referrerInfo, bracketOrdersParams = new Array(), txParams, subAccountId, cancelExistingOrders, settlePnl, exitEarlyIfSimFails) {
         const txsToSign = await this.preparePlaceAndTakePerpOrderWithAdditionalOrders(orderParams, makerInfo, referrerInfo, bracketOrdersParams, txParams, subAccountId, cancelExistingOrders, settlePnl, exitEarlyIfSimFails);
+        if (!txsToSign) {
+            return null;
+        }
         const signedTxs = (await this.txHandler.getSignedTransactionMap(txsToSign, this.provider.wallet)).signedTxMap;
         const { txSig, slot } = await this.sendTransaction(signedTxs.placeAndTakeTx, [], this.opts, true);
         this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
@@ -3318,12 +3324,12 @@ class DriftClient {
             },
         });
     }
-    async getAddInsuranceFundStakeIx(marketIndex, amount, collateralAccountPublicKey) {
+    async getAddInsuranceFundStakeIx(marketIndex, amount, collateralAccountPublicKey, fromSubAccount) {
         const spotMarket = this.getSpotMarketAccount(marketIndex);
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount()],
-            useMarketLastSlotCache: true,
+            userAccounts: fromSubAccount ? [this.getUserAccount()] : [],
+            useMarketLastSlotCache: fromSubAccount ? true : false,
             writableSpotMarketIndexes: [marketIndex],
         });
         const ix = this.program.instruction.addInsuranceFundStake(marketIndex, amount, {
@@ -3371,7 +3377,7 @@ class DriftClient {
             const initializeIx = await this.getInitializeInsuranceFundStakeIx(marketIndex);
             addIfStakeIxs.push(initializeIx);
         }
-        const addFundsIx = await this.getAddInsuranceFundStakeIx(marketIndex, amount, tokenAccount);
+        const addFundsIx = await this.getAddInsuranceFundStakeIx(marketIndex, amount, tokenAccount, fromSubaccount);
         addIfStakeIxs.push(addFundsIx);
         if (createWSOLTokenAccount) {
             addIfStakeIxs.push((0, spl_token_1.createCloseAccountInstruction)(tokenAccount, this.wallet.publicKey, this.wallet.publicKey, []));
@@ -3384,8 +3390,7 @@ class DriftClient {
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount()],
-            useMarketLastSlotCache: true,
+            userAccounts: [],
             writableSpotMarketIndexes: [marketIndex],
         });
         const ix = await this.program.instruction.requestRemoveInsuranceFundStake(marketIndex, amount, {
@@ -3427,7 +3432,6 @@ class DriftClient {
         return txSig;
     }
     async removeInsuranceFundStake(marketIndex, collateralAccountPublicKey, txParams) {
-        var _a, _b;
         const removeIfStakeIxs = [];
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
@@ -3450,11 +3454,8 @@ class DriftClient {
                 removeIfStakeIxs.push(createTokenAccountIx);
             }
         }
-        const userAccountExists = !!((_b = (_a = this.getUser()) === null || _a === void 0 ? void 0 : _a.accountSubscriber) === null || _b === void 0 ? void 0 : _b.isSubscribed) &&
-            (await this.checkIfAccountExists(this.getUser().userAccountPublicKey));
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: userAccountExists ? [this.getUserAccount()] : [],
-            useMarketLastSlotCache: false,
+            userAccounts: [],
             writableSpotMarketIndexes: [marketIndex],
         });
         const removeStakeIx = await this.program.instruction.removeInsuranceFundStake(marketIndex, {

package/lib/events/eventSubscriber.js

@@ -24,10 +24,14 @@ class EventSubscriber {
         this.eventListMap = new Map();
         this.eventEmitter = new events_1.EventEmitter();
         if (this.options.logProviderConfig.type === 'websocket') {
-            this.logProvider = new webSocketLogProvider_1.WebSocketLogProvider(this.connection, this.address, this.options.commitment, this.options.logProviderConfig.resubTimeoutMs);
+            this.logProvider = new webSocketLogProvider_1.WebSocketLogProvider(
+            // @ts-ignore
+            this.connection, this.address, this.options.commitment, this.options.logProviderConfig.resubTimeoutMs);
         }
         else {
-            this.logProvider = new pollingLogProvider_1.PollingLogProvider(this.connection, this.address, options.commitment, this.options.logProviderConfig.frequency, this.options.logProviderConfig.batchSize);
+            this.logProvider = new pollingLogProvider_1.PollingLogProvider(
+            // @ts-ignore
+            this.connection, this.address, options.commitment, this.options.logProviderConfig.frequency, this.options.logProviderConfig.batchSize);
         }
     }
     populateInitialEventListMap() {
@@ -52,7 +56,9 @@ class EventSubscriber {
                                 console.log('Failing over to polling');
                                 this.logProvider.eventEmitter.removeAllListeners('reconnect');
                                 this.unsubscribe().then(() => {
-                                    this.logProvider = new pollingLogProvider_1.PollingLogProvider(this.connection, this.address, this.options.commitment, logProviderConfig.fallbackFrequency, logProviderConfig.fallbackBatchSize);
+                                    this.logProvider = new pollingLogProvider_1.PollingLogProvider(
+                                    // @ts-ignore
+                                    this.connection, this.address, this.options.commitment, logProviderConfig.fallbackFrequency, logProviderConfig.fallbackBatchSize);
                                     this.logProvider.subscribe((txSig, slot, logs, mostRecentBlockTime) => {
                                         this.handleTxLogs(txSig, slot, logs, mostRecentBlockTime);
                                     }, true);
@@ -108,7 +114,9 @@ class EventSubscriber {
         let beforeTx = undefined;
         const untilTx = this.options.untilTx;
         while (txFetched < this.options.maxTx) {
-            const response = await (0, fetchLogs_1.fetchLogs)(this.connection, this.address, this.options.commitment === 'finalized' ? 'finalized' : 'confirmed', beforeTx, untilTx);
+            const response = await (0, fetchLogs_1.fetchLogs)(
+            // @ts-ignore
+            this.connection, this.address, this.options.commitment === 'finalized' ? 'finalized' : 'confirmed', beforeTx, untilTx);
             if (response === undefined) {
                 break;
             }

package/lib/idl/drift.json

@@ -3934,6 +3934,12 @@
                 {
                     "name": "maxBorrowRate",
                     "type": "u32"
+                },
+                {
+                    "name": "minBorrowRate",
+                    "type": {
+                        "option": "u8"
+                    }
                 }
             ]
         },
@@ -6198,13 +6204,13 @@
                         "type": "i16"
                     },
                     {
-                        "name": "padding1",
-                        "type": {
-                            "array": [
-                                "u8",
-                                2
-                            ]
-                        }
+                        "name": "maxTokenBorrowsFraction",
+                        "docs": [
+                            "What fraction of max_token_deposits",
+                            "disabled when 0, 1 => 1/10000 => .01% of max_token_deposits",
+                            "precision: X/10000"
+                        ],
+                        "type": "u16"
                     },
                     {
                         "name": "flashLoanAmount",
@@ -6240,12 +6246,21 @@
                         ],
                         "type": "u64"
                     },
+                    {
+                        "name": "minBorrowRate",
+                        "docs": [
+                            "The min borrow rate for this market when the market regardless of utilization",
+                            "1 => 1/200 => .5%",
+                            "precision: X/200"
+                        ],
+                        "type": "u8"
+                    },
                     {
                         "name": "padding",
                         "type": {
                             "array": [
                                 "u8",
-                                48
+                                47
                             ]
                         }
                     }
@@ -12009,6 +12024,11 @@
             "code": 6267,
             "name": "UnableToParsePullOracleMessage",
             "msg": "Unable to parse pull oracle message"
+        },
+        {
+            "code": 6268,
+            "name": "MaxBorrows",
+            "msg": "Can not borow more than max borrows"
         }
     ]
 }

package/lib/testClient.js

@@ -8,12 +8,11 @@ class TestClient extends adminClient_1.AdminClient {
             throw new Error('Test client must be polling');
         }
         super(config);
-        // @ts-ignore
-        this.txHandler.blockhashCommitment = 'recent';
     }
     async sendTransaction(tx, additionalSigners, opts, preSigned) {
         const { txSig, slot } = await super.sendTransaction(tx, additionalSigners, opts, preSigned);
         let lastFetchedSlot = this.accountSubscriber.accountLoader.mostRecentSlot;
+        await this.fetchAccounts();
         while (lastFetchedSlot < slot) {
             await this.fetchAccounts();
             lastFetchedSlot = this.accountSubscriber.accountLoader.mostRecentSlot;

package/lib/tokenFaucet.d.ts

@@ -5,14 +5,16 @@ import { Account } from '@solana/spl-token';
 import { ConfirmOptions, Connection, PublicKey, TransactionInstruction, TransactionSignature } from '@solana/web3.js';
 import { BN } from '.';
 import { IWallet } from './types';
+import { BankrunContextWrapper } from './bankrun/bankrunConnection';
 export declare class TokenFaucet {
+    context?: BankrunContextWrapper;
     connection: Connection;
     wallet: IWallet;
     program: Program;
     provider: AnchorProvider;
     mint: PublicKey;
     opts?: ConfirmOptions;
-    constructor(connection: Connection, wallet: IWallet, programId: PublicKey, mint: PublicKey, opts?: ConfirmOptions);
+    constructor(connection: Connection, wallet: IWallet, programId: PublicKey, mint: PublicKey, opts?: ConfirmOptions, context?: BankrunContextWrapper);
     getFaucetConfigPublicKeyAndNonce(): Promise<[
         PublicKey,
         number

package/lib/tokenFaucet.js

@@ -33,12 +33,15 @@ const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const token_faucet_json_1 = __importDefault(require("./idl/token_faucet.json"));
 class TokenFaucet {
-    constructor(connection, wallet, programId, mint, opts) {
+    constructor(connection, wallet, programId, mint, opts, context) {
         this.connection = connection;
+        this.context = context;
         this.wallet = wallet;
         this.opts = opts || anchor_1.AnchorProvider.defaultOptions();
         // @ts-ignore
-        const provider = new anchor_1.AnchorProvider(connection, wallet, this.opts);
+        const provider = new anchor_1.AnchorProvider(context ? context.connection.toConnection() : this.connection, 
+        // @ts-ignore
+        wallet, this.opts);
         this.provider = provider;
         this.program = new anchor_1.Program(token_faucet_json_1.default, programId, provider);
         this.mint = mint;
@@ -60,7 +63,7 @@ class TokenFaucet {
     }
     async initialize() {
         const [faucetConfigPublicKey] = await this.getFaucetConfigPublicKeyAndNonce();
-        return await this.program.rpc.initialize({
+        const ix = this.program.instruction.initialize({
             accounts: {
                 faucetConfig: faucetConfigPublicKey,
                 admin: this.wallet.publicKey,
@@ -70,6 +73,9 @@ class TokenFaucet {
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
         });
+        const tx = new web3_js_1.Transaction().add(ix);
+        const txSig = await this.context.sendTransaction(tx);
+        return txSig;
     }
     async fetchState() {
         return await this.program.account.faucetConfig.fetch(await this.getFaucetConfigPublicKey());
@@ -88,10 +94,28 @@ class TokenFaucet {
     async mintToUser(userTokenAccount, amount) {
         const mintIx = await this.mintToUserIx(userTokenAccount, amount);
         const tx = new web3_js_1.Transaction().add(mintIx);
-        const txSig = await this.program.provider.sendAndConfirm(tx, [], this.opts);
-        return txSig;
+        if (this.context) {
+            return await this.context.sendTransaction(tx);
+        }
+        else {
+            return await this.program.provider.sendAndConfirm(tx, [], this.opts);
+        }
     }
     async transferMintAuthority() {
+        if (this.context) {
+            const ix = this.program.instruction.transferMintAuthority({
+                accounts: {
+                    faucetConfig: await this.getFaucetConfigPublicKey(),
+                    mintAccount: this.mint,
+                    mintAuthority: await this.getMintAuthority(),
+                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                    admin: this.wallet.publicKey,
+                },
+            });
+            const tx = new web3_js_1.Transaction().add(ix);
+            const txSig = await this.context.sendTransaction(tx);
+            return txSig;
+        }
         return await this.program.rpc.transferMintAuthority({
             accounts: {
                 faucetConfig: await this.getFaucetConfigPublicKey(),
@@ -107,7 +131,7 @@ class TokenFaucet {
         const [associatedTokenPublicKey, createAssociatedAccountIx, mintToTx] = await this.createAssociatedTokenAccountAndMintToInstructions(userPublicKey, amount);
         let associatedTokenAccountExists = false;
         try {
-            const assosciatedTokenAccount = await this.connection.getAccountInfo(associatedTokenPublicKey);
+            const assosciatedTokenAccount = await this.context.connection.getAccountInfo(associatedTokenPublicKey);
             associatedTokenAccountExists = !!assosciatedTokenAccount;
         }
         catch (e) {
@@ -118,7 +142,13 @@ class TokenFaucet {
         if (!skipAccountCreation)
             tx.add(createAssociatedAccountIx);
         tx.add(mintToTx);
-        const txSig = await this.program.provider.sendAndConfirm(tx, [], this.opts);
+        let txSig;
+        if (this.context) {
+            txSig = await this.context.sendTransaction(tx);
+        }
+        else {
+            txSig = await this.program.provider.sendAndConfirm(tx, [], this.opts);
+        }
         return [associatedTokenPublicKey, txSig];
     }
     async createAssociatedTokenAccountAndMintToInstructions(userPublicKey, amount) {
@@ -134,6 +164,9 @@ class TokenFaucet {
     }
     async getTokenAccountInfo(props) {
         const associatedKey = await this.getAssosciatedMockUSDMintAddress(props);
+        if (this.context) {
+            return await this.context.connection.getTokenAccount(associatedKey);
+        }
         return await (0, spl_token_1.getAccount)(this.connection, associatedKey);
     }
     async subscribeToTokenAccount(props) {
@@ -141,7 +174,7 @@ class TokenFaucet {
             const tokenAccountKey = await this.getAssosciatedMockUSDMintAddress(props);
             props.callback(await this.getTokenAccountInfo(props));
             // Couldn't find a way to do it using anchor framework subscription, someone on serum discord recommended this way
-            this.connection.onAccountChange(tokenAccountKey, async (_accountInfo /* accountInfo is a buffer which we don't know how to deserialize */) => {
+            this.context.connection.onAccountChange(tokenAccountKey, async (_accountInfo /* accountInfo is a buffer which we don't know how to deserialize */) => {
                 props.callback(await this.getTokenAccountInfo(props));
             });
             return true;

package/lib/tx/txParamProcessor.d.ts

@@ -8,7 +8,8 @@ type TransactionBuildingProps = {
  */
 export declare class TransactionParamProcessor {
     private static getComputeUnitsFromSim;
-    static getTxSimComputeUnits(tx: VersionedTransaction, connection: Connection, bufferMultiplier: number): Promise<{
+    static getTxSimComputeUnits(tx: VersionedTransaction, connection: Connection, bufferMultiplier: number, // Making this a mandatory param to force the user to remember that simulated CU's can be inaccurate and a buffer should be applied
+    lowerBoundCu?: number): Promise<{
         success: boolean;
         computeUnits: number;
     }>;

package/lib/tx/txParamProcessor.js

@@ -15,8 +15,8 @@ class TransactionParamProcessor {
         }
         return undefined;
     }
-    static async getTxSimComputeUnits(tx, connection, bufferMultiplier // Making this a mandatory param to force the user to remember that simulated CU's can be inaccurate and a buffer should be applied
-    ) {
+    static async getTxSimComputeUnits(tx, connection, bufferMultiplier, // Making this a mandatory param to force the user to remember that simulated CU's can be inaccurate and a buffer should be applied
+    lowerBoundCu) {
         var _a, _b, _c;
         try {
             if (TEST_SIMS_ALWAYS_FAIL)
@@ -29,7 +29,11 @@ class TransactionParamProcessor {
             }
             const computeUnits = await this.getComputeUnitsFromSim(simTxResult);
             // Apply the buffer, but round down to the MAX_COMPUTE_UNITS, and round up to the nearest whole number
-            const bufferedComputeUnits = Math.ceil(Math.min(computeUnits * bufferMultiplier, MAX_COMPUTE_UNITS));
+            let bufferedComputeUnits = Math.ceil(Math.min(computeUnits * bufferMultiplier, MAX_COMPUTE_UNITS));
+            // If a lower bound CU is passed then enforce it
+            if (lowerBoundCu) {
+                bufferedComputeUnits = Math.max(bufferedComputeUnits, Math.min(lowerBoundCu, MAX_COMPUTE_UNITS));
+            }
             return {
                 success: true,
                 computeUnits: bufferedComputeUnits,

package/lib/types.d.ts

@@ -1085,6 +1085,7 @@ export type ProcessingTxParams = {
     computeUnitsBufferMultiplier?: number;
     useSimulatedComputeUnitsForCUPriceCalculation?: boolean;
     getCUPriceFromComputeUnits?: (computeUnits: number) => number;
+    lowerBoundCu?: number;
 };
 export type TxParams = BaseTxParams & ProcessingTxParams;
 export declare class SwapReduceOnly {

package/lib/user.js

@@ -27,7 +27,7 @@ class User {
         this.driftClient = config.driftClient;
         this.userAccountPublicKey = config.userAccountPublicKey;
         if (((_a = config.accountSubscription) === null || _a === void 0 ? void 0 : _a.type) === 'polling') {
-            this.accountSubscriber = new pollingUserAccountSubscriber_1.PollingUserAccountSubscriber(config.driftClient.program, config.userAccountPublicKey, config.accountSubscription.accountLoader);
+            this.accountSubscriber = new pollingUserAccountSubscriber_1.PollingUserAccountSubscriber(config.driftClient.connection, config.userAccountPublicKey, config.accountSubscription.accountLoader, this.driftClient.program.account.user.coder.accounts.decodeUnchecked.bind(this.driftClient.program.account.user.coder.accounts));
         }
         else if (((_b = config.accountSubscription) === null || _b === void 0 ? void 0 : _b.type) === 'custom') {
             this.accountSubscriber = config.accountSubscription.userAccountSubscriber;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.85.0-beta.0",
+	"version": "2.85.0-beta.10",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -41,7 +41,9 @@
 		"@pythnetwork/pyth-solana-receiver": "^0.7.0",
 		"@solana/spl-token": "0.3.7",
 		"@solana/web3.js": "1.92.3",
+		"anchor-bankrun": "^0.3.0",
 		"rpc-websockets": "7.5.1",
+		"solana-bankrun": "^0.3.0",
 		"strict-event-emitter-types": "^2.0.0",
 		"uuid": "^8.3.2",
 		"zstddec": "^0.1.0"

package/src/accounts/bulkAccountLoader.ts

@@ -1,9 +1,10 @@
-import { Commitment, Connection, PublicKey } from '@solana/web3.js';
+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';
 
-type AccountToLoad = {
+export type AccountToLoad = {
 	publicKey: PublicKey;
 	callbacks: Map<string, (buffer: Buffer, slot: number) => void>;
 };

package/src/accounts/pollingDriftClientAccountSubscriber.ts

@@ -288,14 +288,20 @@ export class PollingDriftClientAccountSubscriber
 	public async fetch(): Promise<void> {
 		await this.accountLoader.load();
 		for (const [_, accountToPoll] of this.accountsToPoll) {
-			const { buffer, slot } = this.accountLoader.getBufferAndSlot(
+			const bufferAndSlot = this.accountLoader.getBufferAndSlot(
 				accountToPoll.publicKey
 			);
+
+			if (!bufferAndSlot) {
+				continue;
+			}
+
+			const { buffer, slot } = bufferAndSlot;
+
 			if (buffer) {
 				const account = this.program.account[
 					accountToPoll.key
 				].coder.accounts.decodeUnchecked(capitalize(accountToPoll.key), buffer);
-
 				if (accountToPoll.mapKey != undefined) {
 					this[accountToPoll.key].set(accountToPoll.mapKey, {
 						data: account,
@@ -311,9 +317,16 @@ export class PollingDriftClientAccountSubscriber
 		}
 
 		for (const [_, oracleToPoll] of this.oraclesToPoll) {
-			const { buffer, slot } = this.accountLoader.getBufferAndSlot(
+			const bufferAndSlot = this.accountLoader.getBufferAndSlot(
 				oracleToPoll.publicKey
 			);
+
+			if (!bufferAndSlot) {
+				continue;
+			}
+
+			const { buffer, slot } = bufferAndSlot;
+
 			if (buffer) {
 				const oracleClient = this.oracleClientCache.get(
 					oracleToPoll.source,

package/src/accounts/pollingUserAccountSubscriber.ts

@@ -4,7 +4,7 @@ import {
 	UserAccountEvents,
 	UserAccountSubscriber,
 } from './types';
-import { Program } from '@coral-xyz/anchor';
+import { Connection } from '../bankrun/bankrunConnection';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
@@ -13,7 +13,7 @@ import { BulkAccountLoader } from './bulkAccountLoader';
 
 export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 	isSubscribed: boolean;
-	program: Program;
+	connection: Connection;
 	eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
 	userAccountPublicKey: PublicKey;
 
@@ -21,18 +21,22 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 	callbackId?: string;
 	errorCallbackId?: string;
 
+	decode: (name, buffer) => UserAccount;
+
 	user?: DataAndSlot<UserAccount>;
 
 	public constructor(
-		program: Program,
+		connection: Connection,
 		userAccountPublicKey: PublicKey,
-		accountLoader: BulkAccountLoader
+		accountLoader: BulkAccountLoader,
+		decode: (name, buffer) => UserAccount
 	) {
 		this.isSubscribed = false;
-		this.program = program;
+		this.connection = connection;
 		this.accountLoader = accountLoader;
 		this.eventEmitter = new EventEmitter();
 		this.userAccountPublicKey = userAccountPublicKey;
+		this.decode = decode;
 	}
 
 	async subscribe(userAccount?: UserAccount): Promise<boolean> {
@@ -71,10 +75,7 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 					return;
 				}
 
-				const account = this.program.account.user.coder.accounts.decode(
-					'User',
-					buffer
-				);
+				const account = this.decode('User', buffer);
 				this.user = { data: account, slot };
 				this.eventEmitter.emit('userAccountUpdate', account);
 				this.eventEmitter.emit('update');
@@ -94,19 +95,19 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 
 	async fetch(): Promise<void> {
 		try {
-			const dataAndContext = await this.program.account.user.fetchAndContext(
+			const dataAndContext = await this.connection.getAccountInfoAndContext(
 				this.userAccountPublicKey,
 				this.accountLoader.commitment
 			);
 			if (dataAndContext.context.slot > (this.user?.slot ?? 0)) {
 				this.user = {
-					data: dataAndContext.data as UserAccount,
+					data: this.decode('User', dataAndContext.value.data),
 					slot: dataAndContext.context.slot,
 				};
 			}
 		} catch (e) {
 			console.log(
-				`PollingUserAccountSubscriber.fetch() UserAccount does not exist: ${e.message}`
+				`PollingUserAccountSubscriber.fetch() UserAccount does not exist: ${e.message}-${e.stack}`
 			);
 		}
 	}

package/src/accounts/testBulkAccountLoader.ts

@@ -0,0 +1,53 @@
+import { AccountToLoad, BulkAccountLoader } from './bulkAccountLoader';
+
+export class TestBulkAccountLoader extends BulkAccountLoader {
+	async loadChunk(accountsToLoadChunks: AccountToLoad[][]): Promise<void> {
+		if (accountsToLoadChunks.length === 0) {
+			return;
+		}
+
+		const accounts = [];
+		for (const accountsToLoadChunk of accountsToLoadChunks) {
+			for (const accountToLoad of accountsToLoadChunk) {
+				const account = await this.connection.getAccountInfoAndContext(
+					accountToLoad.publicKey,
+					this.commitment
+				);
+				accounts.push(account);
+				const newSlot = account.context.slot;
+				if (newSlot > this.mostRecentSlot) {
+					this.mostRecentSlot = newSlot;
+				}
+
+				if (accountToLoad.callbacks.size === 0) {
+					return;
+				}
+
+				const key = accountToLoad.publicKey.toBase58();
+				const prev = this.bufferAndSlotMap.get(key);
+
+				if (prev && newSlot < prev.slot) {
+					return;
+				}
+
+				let newBuffer: Buffer | undefined = undefined;
+
+				if (account.value) {
+					newBuffer = account.value.data;
+				}
+
+				if (!prev) {
+					this.bufferAndSlotMap.set(key, { slot: newSlot, buffer: newBuffer });
+					this.handleAccountCallbacks(accountToLoad, newBuffer, newSlot);
+					return;
+				}
+
+				const oldBuffer = prev.buffer;
+				if (newBuffer && (!oldBuffer || !newBuffer.equals(oldBuffer))) {
+					this.bufferAndSlotMap.set(key, { slot: newSlot, buffer: newBuffer });
+					this.handleAccountCallbacks(accountToLoad, newBuffer, newSlot);
+				}
+			}
+		}
+	}
+}