test implementation 2

convergence-rfq · Apr 24, 2024 · 58763bf · 58763bf
1 parent ffbb4fc
commit 58763bf
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 27 deletions.
diff --git a/packages/js/src/plugins/collateralModule/operations/fundCollateral.ts b/packages/js/src/plugins/collateralModule/operations/fundCollateral.ts
@@ -19,6 +19,7 @@ import { Convergence } from '../../../Convergence';
 import { protocolCache } from '../../protocolModule/cache';
 import { collateralMintCache } from '../cache';
 import {
+  addComputeBudgetIxsIfNeeded,
   getComputeUnitsToBeConsumed,
   getEstimatedPriorityFeeInMicorLamps,
 } from '@/utils/helpers';
@@ -181,32 +182,6 @@ export const fundCollateralBuilder = async (
       signers: [user],
       key: 'fundCollateral',
     });
-  const computeUnitsConsumed = await getComputeUnitsToBeConsumed(
-    txBuilder,
-    convergence.connection
-  );
-  if (!computeUnitsConsumed) {
-    return txBuilder;
-  }
-  if (convergence.transactionPriority === 'dynamic') {
-    const estimatedTxFeeWithComputeUnits =
-      await getEstimatedPriorityFeeInMicorLamps(
-        txBuilder,
-        convergence.connection
-      );
-
-    if (!estimatedTxFeeWithComputeUnits) {
-      return txBuilder;
-    }
-    txBuilder.addDynamicComputeBudgetIxs(
-      estimatedTxFeeWithComputeUnits.microLamports,
-      estimatedTxFeeWithComputeUnits.unitsConsumed
-    );
-  } else {
-    txBuilder.addStaticComputeBudgetIxs(
-      convergence,
-      computeUnitsConsumed.unitsConsumed
-    );
-  }
+  await addComputeBudgetIxsIfNeeded(txBuilder, convergence);
   return txBuilder;
 };
diff --git a/packages/js/src/utils/helpers.ts b/packages/js/src/utils/helpers.ts
@@ -5,6 +5,7 @@ import {
   VersionedTransaction,
 } from '@solana/web3.js';
 import { TransactionBuilder } from './TransactionBuilder';
+import { Convergence } from '@/Convergence';
 
 type EstimatedPriorityFee = {
   unitsConsumed: number;
@@ -99,3 +100,36 @@ export const getComputeUnitsToBeConsumed = async (
     return null;
   }
 };
+
+export const addComputeBudgetIxsIfNeeded = async (
+  txBuilder: TransactionBuilder,
+  convergence: Convergence
+) => {
+  const computeUnitsConsumed = await getComputeUnitsToBeConsumed(
+    txBuilder,
+    convergence.connection
+  );
+  if (!computeUnitsConsumed) {
+    return txBuilder;
+  }
+  if (convergence.transactionPriority === 'dynamic') {
+    const estimatedTxFeeWithComputeUnits =
+      await getEstimatedPriorityFeeInMicorLamps(
+        txBuilder,
+        convergence.connection
+      );
+
+    if (!estimatedTxFeeWithComputeUnits) {
+      return txBuilder;
+    }
+    txBuilder.addDynamicComputeBudgetIxs(
+      estimatedTxFeeWithComputeUnits.microLamports,
+      estimatedTxFeeWithComputeUnits.unitsConsumed
+    );
+  } else {
+    txBuilder.addStaticComputeBudgetIxs(
+      convergence,
+      computeUnitsConsumed.unitsConsumed
+    );
+  }
+};