TransactionBuilder should include computeBudgetLimit for fixed budget…

… option (#97)
orca-so · Dec 10, 2024 · 340564e · 340564e
1 parent e938793
commit 340564e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/packages/common-sdk/package.json b/packages/common-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orca-so/common-sdk",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "description": "Common Typescript components across Orca",
   "repository": "https://github.com/orca-so/orca-sdks",
   "author": "Orca Foundation",

diff --git a/packages/common-sdk/src/web3/transactions/transactions-builder.ts b/packages/common-sdk/src/web3/transactions/transactions-builder.ts
@@ -259,10 +259,12 @@ export class TransactionBuilder {
         ComputeBudgetProgram.setComputeUnitLimit({
           units: computeLimit,
         }),
-        ComputeBudgetProgram.setComputeUnitPrice({
-          microLamports,
-        }),
       ];
+      if (microLamports > 0) {
+        prependInstructions.push(ComputeBudgetProgram.setComputeUnitPrice({
+          microLamports,
+        }));
+      }
       if (computeBudgetOption.jitoTipLamports && computeBudgetOption.jitoTipLamports > 0) {
         prependInstructions.push(
           SystemProgram.transfer({
@@ -397,18 +399,19 @@ export class TransactionBuilder {
       recentBlockhash = await this.connection.getLatestBlockhash(blockhashCommitment);
     }
     let finalComputeBudgetOption = computeBudgetOption ?? { type: "none" };
-    if (finalComputeBudgetOption.type === "auto") {
-      const margin = finalComputeBudgetOption.computeLimitMargin ?? 0.1;
-      const lookupTableAccounts =
+
+    const lookupTableAccounts =
         finalOptions.maxSupportedTransactionVersion === "legacy"
           ? undefined
           : finalOptions.lookupTableAccounts;
+
+    if (finalComputeBudgetOption.type === "auto") {
       const computeBudgetLimit = await estimateComputeBudgetLimit(
         this.connection,
         this.instructions,
         lookupTableAccounts,
         this.wallet.publicKey,
-        margin,
+        finalComputeBudgetOption.computeLimitMargin ?? 0.1,
       );
       const percentile =
         finalComputeBudgetOption.computePricePercentile ?? DEFAULT_PRIORITY_FEE_PERCENTILE;
@@ -433,6 +436,18 @@ export class TransactionBuilder {
         computeBudgetLimit,
         jitoTipLamports: finalComputeBudgetOption.jitoTipLamports,
       };
+    } else if (finalComputeBudgetOption.type === "fixed" && finalComputeBudgetOption.computeBudgetLimit === undefined) {
+      const computeBudgetLimit = await estimateComputeBudgetLimit(
+        this.connection,
+        this.instructions,
+        lookupTableAccounts,
+        this.wallet.publicKey,
+        0.1,
+      );
+      finalComputeBudgetOption = {
+        ...finalComputeBudgetOption,
+        computeBudgetLimit,
+      };
     }
     return this.buildSync({
       ...finalOptions,