Merge pull request #378 from hummingbot/fix/solana-fees

(fix) jupiter fees
hummingbot · Dec 26, 2024 · a392323 · a392323
2 parents 033a0ed + 47d6fa6
commit a392323
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 21 deletions.
diff --git a/src/chains/solana/solana.ts b/src/chains/solana/solana.ts
@@ -625,7 +625,7 @@ export class Solana implements Solanaish {
         unsafeMax: Math.max(Math.min(unsafeMax, maxPriorityFee), minPriorityFee),
       };
 
-      console.debug('[PRIORITY FEES] Calculated priority fees:', result);
+      console.log('[PRIORITY FEES] Calculated priority fees:', result);
 
       return result;
     } catch (error: any) {
@@ -985,22 +985,22 @@ export class Solana implements Solanaish {
   }
 
   private increasePriorityFeeMultiplier(): void {
-    priorityFeeMultiplier += 3;
-    console.debug(`[PRIORITY FEE] Increased priorityFeeMultiplier to: ${priorityFeeMultiplier}`);
+    priorityFeeMultiplier += 1;
+    console.log(`[PRIORITY FEE] Increased priorityFeeMultiplier to: ${priorityFeeMultiplier}`);
   }
 
   private decreasePriorityFeeMultiplier(): void {
     if (priorityFeeMultiplier <= 1) {
       priorityFeeMultiplier = 1;
-      console.debug(
+      console.log(
         `[PRIORITY FEE] Set priorityFeeMultiplier to minimum value: ${priorityFeeMultiplier}`,
       );
       return;
     }
 
     if (priorityFeeMultiplier > 1) {
       priorityFeeMultiplier -= 1;
-      console.debug(`[PRIORITY FEE] Decreased priorityFeeMultiplier to: ${priorityFeeMultiplier}`);
+      console.log(`[PRIORITY FEE] Decreased priorityFeeMultiplier to: ${priorityFeeMultiplier}`);
     }
   }
 

diff --git a/src/connectors/jupiter/jupiter.config.ts b/src/connectors/jupiter/jupiter.config.ts
@@ -7,15 +7,15 @@ export namespace JupiterConfig {
     tradingTypes: Array<string>;
     chainType: string;
     availableNetworks: Array<AvailableNetworks>;
-    gasLimitEstimate: number;
+    gasCost: number;
   }
 
   export const config: NetworkConfig = {
     allowedSlippage: ConfigManagerV2.getInstance().get(
       'jupiter.allowedSlippage',
     ),
-    gasLimitEstimate: ConfigManagerV2.getInstance().get(
-      'jupiter.gasLimitEstimate',
+    gasCost: ConfigManagerV2.getInstance().get(
+      'jupiter.gasCost',
     ),
     tradingTypes: ['AMM'],
     chainType: 'SOLANA',

diff --git a/src/connectors/jupiter/jupiter.controllers.ts b/src/connectors/jupiter/jupiter.controllers.ts
@@ -249,15 +249,12 @@ export async function estimateGas(
   jupiter: Jupiter,
 ): Promise<EstimateGasResponse> {
   // TODO: get gas price from the network
-  const gasPrice: number = 0.00001
-  const gasLimit: number = jupiter.gasLimit;
-  const gasCost: string = (gasPrice * gasLimit).toString()
   return {
     network: solanaish.network,
     timestamp: Date.now(),
-    gasPrice,
+    gasPrice: 0,
     gasPriceToken: solanaish.nativeTokenSymbol,
-    gasLimit: gasLimit,
-    gasCost: gasCost,
+    gasLimit: 0,
+    gasCost: jupiter.gasCost.toString(),
   };
 }
diff --git a/src/connectors/jupiter/jupiter.ts b/src/connectors/jupiter/jupiter.ts
@@ -18,12 +18,12 @@ export class Jupiter {
   private _ready: boolean = false;
   private _config: JupiterConfig.NetworkConfig;
   protected jupiterQuoteApi!: ReturnType<typeof createJupiterApiClient>;
-  public gasLimit: number = 0;
+  public gasCost: number = 0;
 
   private constructor(network: string) {
     this._config = JupiterConfig.config;
     this.chain = Solana.getInstance(network);
-    this.gasLimit = JupiterConfig.config.gasLimitEstimate;
+    this.gasCost = JupiterConfig.config.gasCost;
     this.loadJupiter();
   }
 
@@ -123,7 +123,7 @@ export class Jupiter {
         userPublicKey: wallet.publicKey.toBase58(),
         dynamicComputeUnitLimit: true,
         prioritizationFeeLamports: {
-          autoMultiplier: Math.max(priorityFeeMultiplier, 3),
+          autoMultiplier: Math.min(priorityFeeMultiplier, 3),
         },
       },
     });

diff --git a/src/services/schema/jupiter-schema.json b/src/services/schema/jupiter-schema.json
@@ -3,8 +3,8 @@
   "type": "object",
   "properties": {
     "allowedSlippage": { "type": "string" },
-    "gasLimitEstimate": { "type": "integer" }
+    "gasCost": { "type": "number" }
   },
   "additionalProperties": false,
-  "required": ["allowedSlippage", "gasLimitEstimate"]
+  "required": ["allowedSlippage", "gasCost"]
 }
diff --git a/src/templates/jupiter.yml b/src/templates/jupiter.yml
@@ -2,5 +2,5 @@
 # execution price. It uses a rational number for precision.
 allowedSlippage: '5/100'
 
-# the transaction gas amount used to estimate gasCost for a jupiter trade.
-gasLimitEstimate: 1
+# the default transaction gasCost in SOL for a jupiter trade.
+gasCost: 0.0005