@drift-labs/sdk 0.1.34-master.5 → 0.1.36-master.1

package/lib/accounts/bulkAccountLoader.d.ts

@@ -15,7 +15,6 @@ export declare class BulkAccountLoader {
     intervalId?: NodeJS.Timer;
     loadPromise?: Promise<void>;
     loadPromiseResolver: () => void;
-    loggingEnabled: boolean;
     lastTimeLoadingPromiseCleared: number;
     constructor(connection: Connection, commitment: Commitment, pollingFrequency: number);
     addAccount(publicKey: PublicKey, callback: (buffer: Buffer) => void): string;
@@ -29,7 +28,7 @@ export declare class BulkAccountLoader {
     getAccountData(publicKey: PublicKey): Buffer | undefined;
     startPolling(): void;
     stopPolling(): void;
-    log(msg: string, force?: boolean): void;
+    log(msg: string): void;
     updatePollingFrequency(pollingFrequency: number): void;
 }
 export {};

package/lib/accounts/bulkAccountLoader.js

@@ -19,7 +19,6 @@ class BulkAccountLoader {
         this.accountsToLoad = new Map();
         this.accountData = new Map();
         this.errorCallbacks = new Map();
-        this.loggingEnabled = false;
         this.lastTimeLoadingPromiseCleared = Date.now();
         this.connection = connection;
         this.commitment = commitment;
@@ -28,14 +27,11 @@ class BulkAccountLoader {
     addAccount(publicKey, callback) {
         const existingSize = this.accountsToLoad.size;
         const callbackId = (0, uuid_1.v4)();
-        this.log(`Adding account ${publicKey.toString()} callback id ${callbackId}`);
         const existingAccountToLoad = this.accountsToLoad.get(publicKey.toString());
         if (existingAccountToLoad) {
-            this.log(`account already exists`);
             existingAccountToLoad.callbacks.set(callbackId, callback);
         }
         else {
-            this.log(`account doesn't already exist. creating new callback map`);
             const callbacks = new Map();
             callbacks.set(callbackId, callback);
             const newAccountToLoad = {
@@ -52,7 +48,6 @@ class BulkAccountLoader {
         return callbackId;
     }
     removeAccount(publicKey, callbackId) {
-        this.log(`Removing account ${publicKey.toString()} callback id ${callbackId}`);
         const existingAccountToLoad = this.accountsToLoad.get(publicKey.toString());
         if (existingAccountToLoad) {
             existingAccountToLoad.callbacks.delete(callbackId);
@@ -83,11 +78,9 @@ class BulkAccountLoader {
             if (this.loadPromise) {
                 const now = Date.now();
                 if (now - this.lastTimeLoadingPromiseCleared > oneMinute) {
-                    this.log(`Load promise hasnt been clearing for one minute. Clearing.`);
                     this.loadPromise = undefined;
                 }
                 else {
-                    this.log(`Load promise exists. Returning early`);
                     return this.loadPromise;
                 }
             }
@@ -95,10 +88,8 @@ class BulkAccountLoader {
                 this.loadPromiseResolver = resolver;
             });
             this.lastTimeLoadingPromiseCleared = Date.now();
-            this.log(`Loading`);
             try {
                 const chunks = this.chunks(Array.from(this.accountsToLoad.values()), GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE);
-                this.log(`${chunks.length} chunks`);
                 yield Promise.all(chunks.map((chunk) => {
                     return this.loadChunk(chunk);
                 }));
@@ -109,10 +100,8 @@ class BulkAccountLoader {
                 for (const [_, callback] of this.errorCallbacks) {
                     callback(e);
                 }
-                this.log('finished error callbacks');
             }
             finally {
-                this.log(`resetting load promise`);
                 this.loadPromiseResolver();
                 this.loadPromise = undefined;
             }
@@ -121,7 +110,6 @@ class BulkAccountLoader {
     loadChunk(accountsToLoad) {
         return __awaiter(this, void 0, void 0, function* () {
             if (accountsToLoad.length === 0) {
-                this.log(`no accounts in chunk`);
                 return;
             }
             const args = [
@@ -135,7 +123,7 @@ class BulkAccountLoader {
             this.connection._rpcRequest('getMultipleAccounts', args), 10 * 1000 // 30 second timeout
             );
             if (rpcResponse === null) {
-                this.log('request to rpc timed out', true);
+                this.log('request to rpc timed out');
                 return;
             }
             const newSlot = rpcResponse.result.context.slot;
@@ -150,7 +138,6 @@ class BulkAccountLoader {
                     newBuffer = Buffer.from(raw, dataType);
                 }
                 if (!oldRPCResponse) {
-                    this.log('No old rpc response, updating account data');
                     this.accountData.set(key, {
                         slot: newSlot,
                         buffer: newBuffer,
@@ -159,33 +146,23 @@ class BulkAccountLoader {
                     continue;
                 }
                 if (newSlot <= oldRPCResponse.slot) {
-                    this.log(`new slot ${newSlot} old slot ${oldRPCResponse.slot}`);
                     continue;
                 }
                 const oldBuffer = oldRPCResponse.buffer;
                 if (newBuffer && (!oldBuffer || !newBuffer.equals(oldBuffer))) {
-                    this.log('new buffer, updating account data');
                     this.accountData.set(key, {
                         slot: newSlot,
                         buffer: newBuffer,
                     });
                     this.handleAccountCallbacks(accountToLoad, newBuffer);
                 }
-                else {
-                    this.log('unable to update account for newest slot');
-                    this.log('oldBuffer ' + oldBuffer);
-                    this.log('newBuffer ' + newBuffer);
-                    this.log('buffers equal ' + (newBuffer === null || newBuffer === void 0 ? void 0 : newBuffer.equals(oldBuffer)));
-                }
             }
         });
     }
     handleAccountCallbacks(accountToLoad, buffer) {
-        this.log('handling account callbacks');
         for (const [_, callback] of accountToLoad.callbacks) {
             callback(buffer);
         }
-        this.log('finished account callbacks');
     }
     getAccountData(publicKey) {
         const accountData = this.accountData.get(publicKey.toString());
@@ -195,20 +172,16 @@ class BulkAccountLoader {
         if (this.intervalId) {
             return;
         }
-        this.log('startPolling');
         this.intervalId = setInterval(this.load.bind(this), this.pollingFrequency);
     }
     stopPolling() {
         if (this.intervalId) {
             clearInterval(this.intervalId);
             this.intervalId = undefined;
-            this.log('stopPolling');
         }
     }
-    log(msg, force = false) {
-        if (this.loggingEnabled || force) {
-            console.log(msg);
-        }
+    log(msg) {
+        console.log(msg);
     }
     updatePollingFrequency(pollingFrequency) {
         this.stopPolling();

package/lib/accounts/pollingClearingHouseAccountSubscriber.js

@@ -41,8 +41,13 @@ class PollingClearingHouseAccountSubscriber {
             });
             yield this.updateAccountsToPoll();
             yield this.addToAccountLoader();
-            yield this.fetch();
-            const subscriptionSucceeded = this.didSubscriptionSucceed();
+            let subscriptionSucceeded = false;
+            let retries = 0;
+            while (!subscriptionSucceeded && retries < 5) {
+                yield this.fetch();
+                subscriptionSucceeded = this.didSubscriptionSucceed();
+                retries++;
+            }
             if (subscriptionSucceeded) {
                 this.eventEmitter.emit('update');
             }
@@ -162,6 +167,9 @@ class PollingClearingHouseAccountSubscriber {
                     // @ts-ignore
                     this.eventEmitter.emit(accountToPoll.eventType, account);
                     this.eventEmitter.emit('update');
+                    if (!this.isSubscribed) {
+                        this.isSubscribed = this.didSubscriptionSucceed();
+                    }
                 });
             }
             this.errorCallbackId = this.accountLoader.addErrorCallbacks((error) => {

package/lib/accounts/pollingOracleSubscriber.d.ts

@@ -23,4 +23,5 @@ export declare class PollingOracleSubscriber implements OracleSubscriber {
     unsubscribe(): Promise<void>;
     assertIsSubscribed(): void;
     getOraclePriceData(): OraclePriceData;
+    didSubscriptionSucceed(): boolean;
 }

package/lib/accounts/pollingOracleSubscriber.js

@@ -26,10 +26,18 @@ class PollingOracleSubscriber {
                 return true;
             }
             this.addToAccountLoader();
-            yield this.fetch();
-            this.eventEmitter.emit('update');
-            this.isSubscribed = true;
-            return true;
+            let subscriptionSucceeded = false;
+            let retries = 0;
+            while (!subscriptionSucceeded && retries < 5) {
+                yield this.fetch();
+                subscriptionSucceeded = this.didSubscriptionSucceed();
+                retries++;
+            }
+            if (subscriptionSucceeded) {
+                this.eventEmitter.emit('update');
+            }
+            this.isSubscribed = subscriptionSucceeded;
+            return subscriptionSucceeded;
         });
     }
     addToAccountLoader() {
@@ -75,5 +83,8 @@ class PollingOracleSubscriber {
         this.assertIsSubscribed();
         return this.oraclePriceData;
     }
+    didSubscriptionSucceed() {
+        return !!this.oraclePriceData;
+    }
 }
 exports.PollingOracleSubscriber = PollingOracleSubscriber;

package/lib/accounts/pollingTokenAccountSubscriber.d.ts

@@ -22,4 +22,5 @@ export declare class PollingTokenAccountSubscriber implements TokenAccountSubscr
     unsubscribe(): Promise<void>;
     assertIsSubscribed(): void;
     getTokenAccount(): AccountInfo;
+    didSubscriptionSucceed(): boolean;
 }

package/lib/accounts/pollingTokenAccountSubscriber.js

@@ -26,10 +26,18 @@ class PollingTokenAccountSubscriber {
                 return true;
             }
             this.addToAccountLoader();
-            yield this.fetch();
-            this.eventEmitter.emit('update');
-            this.isSubscribed = true;
-            return true;
+            let subscriptionSucceeded = false;
+            let retries = 0;
+            while (!subscriptionSucceeded && retries < 5) {
+                yield this.fetch();
+                subscriptionSucceeded = this.didSubscriptionSucceed();
+                retries++;
+            }
+            if (subscriptionSucceeded) {
+                this.eventEmitter.emit('update');
+            }
+            this.isSubscribed = subscriptionSucceeded;
+            return subscriptionSucceeded;
         });
     }
     addToAccountLoader() {
@@ -75,5 +83,8 @@ class PollingTokenAccountSubscriber {
         this.assertIsSubscribed();
         return this.tokenAccount;
     }
+    didSubscriptionSucceed() {
+        return !!this.tokenAccount;
+    }
 }
 exports.PollingTokenAccountSubscriber = PollingTokenAccountSubscriber;

package/lib/accounts/pollingUserAccountSubscriber.js

@@ -30,8 +30,13 @@ class PollingUserAccountSubscriber {
                 return true;
             }
             yield this.addToAccountLoader();
-            yield this.fetchIfUnloaded();
-            const subscriptionSucceeded = this.didSubscriptionSucceed();
+            let subscriptionSucceeded = false;
+            let retries = 0;
+            while (!subscriptionSucceeded && retries < 5) {
+                yield this.fetchIfUnloaded();
+                subscriptionSucceeded = this.didSubscriptionSucceed();
+                retries++;
+            }
             if (subscriptionSucceeded) {
                 this.eventEmitter.emit('update');
             }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "0.1.34-master.5",
+	"version": "0.1.36-master.1",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/accounts/bulkAccountLoader.ts

@@ -23,7 +23,6 @@ export class BulkAccountLoader {
 	// to handle clients spamming load
 	loadPromise?: Promise<void>;
 	loadPromiseResolver: () => void;
-	loggingEnabled = false;
 	lastTimeLoadingPromiseCleared = Date.now();
 
 	public constructor(
@@ -43,15 +42,10 @@ export class BulkAccountLoader {
 		const existingSize = this.accountsToLoad.size;
 
 		const callbackId = uuidv4();
-		this.log(
-			`Adding account ${publicKey.toString()} callback id ${callbackId}`
-		);
 		const existingAccountToLoad = this.accountsToLoad.get(publicKey.toString());
 		if (existingAccountToLoad) {
-			this.log(`account already exists`);
 			existingAccountToLoad.callbacks.set(callbackId, callback);
 		} else {
-			this.log(`account doesn't already exist. creating new callback map`);
 			const callbacks = new Map<string, (buffer: Buffer) => void>();
 			callbacks.set(callbackId, callback);
 			const newAccountToLoad = {
@@ -72,9 +66,6 @@ export class BulkAccountLoader {
 	}
 
 	public removeAccount(publicKey: PublicKey, callbackId: string): void {
-		this.log(
-			`Removing account ${publicKey.toString()} callback id ${callbackId}`
-		);
 		const existingAccountToLoad = this.accountsToLoad.get(publicKey.toString());
 		if (existingAccountToLoad) {
 			existingAccountToLoad.callbacks.delete(callbackId);
@@ -109,10 +100,8 @@ export class BulkAccountLoader {
 		if (this.loadPromise) {
 			const now = Date.now();
 			if (now - this.lastTimeLoadingPromiseCleared > oneMinute) {
-				this.log(`Load promise hasnt been clearing for one minute. Clearing.`);
 				this.loadPromise = undefined;
 			} else {
-				this.log(`Load promise exists. Returning early`);
 				return this.loadPromise;
 			}
 		}
@@ -122,14 +111,11 @@ export class BulkAccountLoader {
 		});
 		this.lastTimeLoadingPromiseCleared = Date.now();
 
-		this.log(`Loading`);
-
 		try {
 			const chunks = this.chunks(
 				Array.from(this.accountsToLoad.values()),
 				GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE
 			);
-			this.log(`${chunks.length} chunks`);
 
 			await Promise.all(
 				chunks.map((chunk) => {
@@ -142,9 +128,7 @@ export class BulkAccountLoader {
 			for (const [_, callback] of this.errorCallbacks) {
 				callback(e);
 			}
-			this.log('finished error callbacks');
 		} finally {
-			this.log(`resetting load promise`);
 			this.loadPromiseResolver();
 			this.loadPromise = undefined;
 		}
@@ -152,7 +136,6 @@ export class BulkAccountLoader {
 
 	async loadChunk(accountsToLoad: AccountToLoad[]): Promise<void> {
 		if (accountsToLoad.length === 0) {
-			this.log(`no accounts in chunk`);
 			return;
 		}
 
@@ -170,7 +153,7 @@ export class BulkAccountLoader {
 		);
 
 		if (rpcResponse === null) {
-			this.log('request to rpc timed out', true);
+			this.log('request to rpc timed out');
 			return;
 		}
 
@@ -189,7 +172,6 @@ export class BulkAccountLoader {
 			}
 
 			if (!oldRPCResponse) {
-				this.log('No old rpc response, updating account data');
 				this.accountData.set(key, {
 					slot: newSlot,
 					buffer: newBuffer,
@@ -199,33 +181,24 @@ export class BulkAccountLoader {
 			}
 
 			if (newSlot <= oldRPCResponse.slot) {
-				this.log(`new slot ${newSlot} old slot ${oldRPCResponse.slot}`);
 				continue;
 			}
 
 			const oldBuffer = oldRPCResponse.buffer;
 			if (newBuffer && (!oldBuffer || !newBuffer.equals(oldBuffer))) {
-				this.log('new buffer, updating account data');
 				this.accountData.set(key, {
 					slot: newSlot,
 					buffer: newBuffer,
 				});
 				this.handleAccountCallbacks(accountToLoad, newBuffer);
-			} else {
-				this.log('unable to update account for newest slot');
-				this.log('oldBuffer ' + oldBuffer);
-				this.log('newBuffer ' + newBuffer);
-				this.log('buffers equal ' + newBuffer?.equals(oldBuffer));
 			}
 		}
 	}
 
 	handleAccountCallbacks(accountToLoad: AccountToLoad, buffer: Buffer): void {
-		this.log('handling account callbacks');
 		for (const [_, callback] of accountToLoad.callbacks) {
 			callback(buffer);
 		}
-		this.log('finished account callbacks');
 	}
 
 	public getAccountData(publicKey: PublicKey): Buffer | undefined {
@@ -238,8 +211,6 @@ export class BulkAccountLoader {
 			return;
 		}
 
-		this.log('startPolling');
-
 		this.intervalId = setInterval(this.load.bind(this), this.pollingFrequency);
 	}
 
@@ -247,15 +218,11 @@ export class BulkAccountLoader {
 		if (this.intervalId) {
 			clearInterval(this.intervalId);
 			this.intervalId = undefined;
-
-			this.log('stopPolling');
 		}
 	}
 
-	public log(msg: string, force = false): void {
-		if (this.loggingEnabled || force) {
-			console.log(msg);
-		}
+	public log(msg: string): void {
+		console.log(msg);
 	}
 
 	public updatePollingFrequency(pollingFrequency: number): void {

package/src/accounts/pollingClearingHouseAccountSubscriber.ts

@@ -85,8 +85,14 @@ export class PollingClearingHouseAccountSubscriber
 
 		await this.updateAccountsToPoll();
 		await this.addToAccountLoader();
-		await this.fetch();
-		const subscriptionSucceeded = this.didSubscriptionSucceed();
+
+		let subscriptionSucceeded = false;
+		let retries = 0;
+		while (!subscriptionSucceeded && retries < 5) {
+			await this.fetch();
+			subscriptionSucceeded = this.didSubscriptionSucceed();
+			retries++;
+		}
 
 		if (subscriptionSucceeded) {
 			this.eventEmitter.emit('update');
@@ -237,6 +243,10 @@ export class PollingClearingHouseAccountSubscriber
 					// @ts-ignore
 					this.eventEmitter.emit(accountToPoll.eventType, account);
 					this.eventEmitter.emit('update');
+
+					if (!this.isSubscribed) {
+						this.isSubscribed = this.didSubscriptionSucceed();
+					}
 				}
 			);
 		}

package/src/accounts/pollingOracleSubscriber.ts

@@ -37,11 +37,21 @@ export class PollingOracleSubscriber implements OracleSubscriber {
 		}
 
 		this.addToAccountLoader();
-		await this.fetch();
-		this.eventEmitter.emit('update');
 
-		this.isSubscribed = true;
-		return true;
+		let subscriptionSucceeded = false;
+		let retries = 0;
+		while (!subscriptionSucceeded && retries < 5) {
+			await this.fetch();
+			subscriptionSucceeded = this.didSubscriptionSucceed();
+			retries++;
+		}
+
+		if (subscriptionSucceeded) {
+			this.eventEmitter.emit('update');
+		}
+
+		this.isSubscribed = subscriptionSucceeded;
+		return subscriptionSucceeded;
 	}
 
 	addToAccountLoader(): void {
@@ -100,4 +110,8 @@ export class PollingOracleSubscriber implements OracleSubscriber {
 		this.assertIsSubscribed();
 		return this.oraclePriceData;
 	}
+
+	didSubscriptionSucceed(): boolean {
+		return !!this.oraclePriceData;
+	}
 }

package/src/accounts/pollingTokenAccountSubscriber.ts

@@ -36,11 +36,20 @@ export class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
 		}
 
 		this.addToAccountLoader();
-		await this.fetch();
-		this.eventEmitter.emit('update');
+		let subscriptionSucceeded = false;
+		let retries = 0;
+		while (!subscriptionSucceeded && retries < 5) {
+			await this.fetch();
+			subscriptionSucceeded = this.didSubscriptionSucceed();
+			retries++;
+		}
+
+		if (subscriptionSucceeded) {
+			this.eventEmitter.emit('update');
+		}
 
-		this.isSubscribed = true;
-		return true;
+		this.isSubscribed = subscriptionSucceeded;
+		return subscriptionSucceeded;
 	}
 
 	addToAccountLoader(): void {
@@ -96,4 +105,8 @@ export class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
 		this.assertIsSubscribed();
 		return this.tokenAccount;
 	}
+
+	didSubscriptionSucceed(): boolean {
+		return !!this.tokenAccount;
+	}
 }

package/src/accounts/pollingUserAccountSubscriber.ts

@@ -52,9 +52,14 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 		}
 
 		await this.addToAccountLoader();
-		await this.fetchIfUnloaded();
 
-		const subscriptionSucceeded = this.didSubscriptionSucceed();
+		let subscriptionSucceeded = false;
+		let retries = 0;
+		while (!subscriptionSucceeded && retries < 5) {
+			await this.fetchIfUnloaded();
+			subscriptionSucceeded = this.didSubscriptionSucceed();
+			retries++;
+		}
 
 		if (subscriptionSucceeded) {
 			this.eventEmitter.emit('update');