@drift-labs/sdk 2.59.0-beta.1 → 2.59.0-beta.3

package/VERSION

@@ -1 +1 @@
-2.59.0-beta.1
+2.59.0-beta.3

package/lib/priorityFee/priorityFeeSubscriber.d.ts

@@ -12,6 +12,7 @@ export declare class PriorityFeeSubscriber {
     maxStrategy: MaxOverSlotsStrategy;
     priorityFeeMethod: PriorityFeeMethod;
     lookbackDistance: number;
+    maxFeeMicroLamports?: number;
     heliusRpcUrl?: string;
     lastHeliusSample?: HeliusPriorityFeeLevels;
     intervalId?: ReturnType<typeof setTimeout>;

package/lib/priorityFee/priorityFeeSubscriber.js

@@ -38,6 +38,9 @@ class PriorityFeeSubscriber {
                         throw new Error('Connection must be helius, or heliusRpcUrl must be provided to use PriorityFeeMethod.HELIUS');
                     }
                 }
+                else {
+                    this.heliusRpcUrl = config.heliusRpcUrl;
+                }
             }
         }
         if (this.priorityFeeMethod === types_1.PriorityFeeMethod.SOLANA) {
@@ -45,6 +48,7 @@ class PriorityFeeSubscriber {
                 throw new Error('connection must be provided to use SOLANA priority fee API');
             }
         }
+        this.maxFeeMicroLamports = config.maxFeeMicroLamports;
     }
     async subscribe() {
         if (this.intervalId) {
@@ -67,20 +71,41 @@ class PriorityFeeSubscriber {
         var _a, _b;
         const sample = await (0, heliusPriorityFeeMethod_1.fetchHeliusPriorityFee)(this.heliusRpcUrl, this.lookbackDistance, this.addresses);
         this.lastHeliusSample = (_b = (_a = sample === null || sample === void 0 ? void 0 : sample.result) === null || _a === void 0 ? void 0 : _a.priorityFeeLevels) !== null && _b !== void 0 ? _b : undefined;
+        if (this.lastHeliusSample) {
+            this.lastAvgStrategyResult =
+                this.heliusRpcUrl[heliusPriorityFeeMethod_1.HeliusPriorityLevel.MEDIUM];
+            this.lastMaxStrategyResult =
+                this.heliusRpcUrl[heliusPriorityFeeMethod_1.HeliusPriorityLevel.UNSAFE_MAX];
+            if (this.customStrategy) {
+                this.lastCustomStrategyResult = this.customStrategy.calculate(sample);
+            }
+        }
     }
     getHeliusPriorityFeeLevel(level = heliusPriorityFeeMethod_1.HeliusPriorityLevel.MEDIUM) {
         if (this.lastHeliusSample === undefined) {
             return 0;
         }
+        if (this.maxFeeMicroLamports !== undefined) {
+            return Math.max(this.maxFeeMicroLamports, this.lastHeliusSample[level]);
+        }
         return this.lastHeliusSample[level];
     }
     getCustomStrategyResult() {
+        if (this.maxFeeMicroLamports !== undefined) {
+            return Math.max(this.maxFeeMicroLamports, this.lastCustomStrategyResult);
+        }
         return this.lastCustomStrategyResult;
     }
     getAvgStrategyResult() {
+        if (this.maxFeeMicroLamports !== undefined) {
+            return Math.max(this.maxFeeMicroLamports, this.lastAvgStrategyResult);
+        }
         return this.lastAvgStrategyResult;
     }
     getMaxStrategyResult() {
+        if (this.maxFeeMicroLamports !== undefined) {
+            return Math.max(this.maxFeeMicroLamports, this.lastMaxStrategyResult);
+        }
         return this.lastMaxStrategyResult;
     }
     async load() {

package/lib/priorityFee/types.d.ts

@@ -16,4 +16,5 @@ export type PriorityFeeSubscriberConfig = {
     priorityFeeMethod?: PriorityFeeMethod;
     slotsToCheck?: number;
     heliusRpcUrl?: string;
+    maxFeeMicroLamports?: number;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.59.0-beta.1",
+	"version": "2.59.0-beta.3",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/priorityFee/priorityFeeSubscriber.ts

@@ -22,6 +22,7 @@ export class PriorityFeeSubscriber {
 	maxStrategy = new MaxOverSlotsStrategy();
 	priorityFeeMethod = PriorityFeeMethod.SOLANA;
 	lookbackDistance: number;
+	maxFeeMicroLamports?: number;
 
 	heliusRpcUrl?: string;
 	lastHeliusSample?: HeliusPriorityFeeLevels;
@@ -56,6 +57,8 @@ export class PriorityFeeSubscriber {
 							'Connection must be helius, or heliusRpcUrl must be provided to use PriorityFeeMethod.HELIUS'
 						);
 					}
+				} else {
+					this.heliusRpcUrl = config.heliusRpcUrl;
 				}
 			}
 		}
@@ -67,6 +70,8 @@ export class PriorityFeeSubscriber {
 				);
 			}
 		}
+
+		this.maxFeeMicroLamports = config.maxFeeMicroLamports;
 	}
 
 	public async subscribe(): Promise<void> {
@@ -101,6 +106,16 @@ export class PriorityFeeSubscriber {
 			this.addresses
 		);
 		this.lastHeliusSample = sample?.result?.priorityFeeLevels ?? undefined;
+
+		if (this.lastHeliusSample) {
+			this.lastAvgStrategyResult =
+				this.heliusRpcUrl[HeliusPriorityLevel.MEDIUM];
+			this.lastMaxStrategyResult =
+				this.heliusRpcUrl[HeliusPriorityLevel.UNSAFE_MAX];
+			if (this.customStrategy) {
+				this.lastCustomStrategyResult = this.customStrategy.calculate(sample!);
+			}
+		}
 	}
 
 	public getHeliusPriorityFeeLevel(
@@ -109,18 +124,30 @@ export class PriorityFeeSubscriber {
 		if (this.lastHeliusSample === undefined) {
 			return 0;
 		}
+		if (this.maxFeeMicroLamports !== undefined) {
+			return Math.max(this.maxFeeMicroLamports, this.lastHeliusSample[level]);
+		}
 		return this.lastHeliusSample[level];
 	}
 
 	public getCustomStrategyResult(): number {
+		if (this.maxFeeMicroLamports !== undefined) {
+			return Math.max(this.maxFeeMicroLamports, this.lastCustomStrategyResult);
+		}
 		return this.lastCustomStrategyResult;
 	}
 
 	public getAvgStrategyResult(): number {
+		if (this.maxFeeMicroLamports !== undefined) {
+			return Math.max(this.maxFeeMicroLamports, this.lastAvgStrategyResult);
+		}
 		return this.lastAvgStrategyResult;
 	}
 
 	public getMaxStrategyResult(): number {
+		if (this.maxFeeMicroLamports !== undefined) {
+			return Math.max(this.maxFeeMicroLamports, this.lastMaxStrategyResult);
+		}
 		return this.lastMaxStrategyResult;
 	}
 

package/src/priorityFee/types.ts

@@ -30,4 +30,6 @@ export type PriorityFeeSubscriberConfig = {
 	slotsToCheck?: number;
 	/// url for helius rpc, required if using priorityFeeMethod.HELIUS
 	heliusRpcUrl?: string;
+	/// clamp any returned priority fee value to this value.
+	maxFeeMicroLamports?: number;
 };