fix calculateBatcherFee

minswap · Sep 18, 2024 · ff87c55 · ff87c55
1 parent ccfa184
commit ff87c55
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/batcher-fee-reduction/calculate.ts b/src/batcher-fee-reduction/calculate.ts
@@ -2,7 +2,7 @@ import { Assets, UTxO } from "lucid-cardano";
 
 import { NetworkEnvironment } from "../types/network";
 import {
-  FIXED_BATCHER_FEE,
+  BATCHER_FEE_CONFIG,
   getActiveBatcherFee,
   getReducedBatcherFee,
 } from "./configs.internal";
@@ -23,10 +23,11 @@ export function calculateBatcherFee({
   reductionAssets: Assets;
 } {
   const reductionAssets: Assets = {};
+  const standardFee = BATCHER_FEE_CONFIG[networkEnv][dexVersion].standardFee;
   const activeBatcherFeeConfig = getActiveBatcherFee(networkEnv, dexVersion);
   if (!activeBatcherFeeConfig) {
     return {
-      batcherFee: FIXED_BATCHER_FEE,
+      batcherFee: standardFee,
       reductionAssets,
     };
   }
@@ -51,6 +52,7 @@ export function calculateBatcherFee({
   }
   return {
     batcherFee: getReducedBatcherFee(
+      standardFee,
       activeBatcherFeeConfig,
       eligibleReductionAssets
     ),

diff --git a/src/batcher-fee-reduction/configs.internal.ts b/src/batcher-fee-reduction/configs.internal.ts
@@ -33,6 +33,7 @@ export function getActiveBatcherFee(
 }
 
 export function getReducedBatcherFee(
+  standardFee: bigint,
   activeReductionConfig: BatcherFeeReductionConfig,
   reductionAssets: Assets
 ): bigint {
@@ -54,20 +55,20 @@ export function getReducedBatcherFee(
       ? new BigNumber(1)
       : totalReductionAmountRatio;
 
-  const maximumReduction = new BigNumber(FIXED_BATCHER_FEE.toString())
+  const maximumReduction = new BigNumber(standardFee.toString())
     .minus(minFee.toString())
-    .div(FIXED_BATCHER_FEE.toString())
+    .div(standardFee.toString())
     .multipliedBy(100);
 
   // Apply the ratio to calculate batcher fee reduction
   const totalReduction = new BigNumber(maximumReduction)
     .multipliedBy(maximumReductionAmountRatio)
     .div(100);
 
-  // New batcher fee = (1 - reduction) * DEFAULT BATCHER FEE
+  // New batcher fee = (1 - reduction) * standardFee
   const finalFee = new BigNumber(1)
     .minus(totalReduction)
-    .multipliedBy(new BigNumber(FIXED_BATCHER_FEE.toString()))
+    .multipliedBy(new BigNumber(standardFee.toString()))
     .toFixed(0);
   return BigInt(finalFee);
 }