@solana/client 0.0.2 → 0.1.0

package/dist/index.browser.mjs

@@ -1,4 +1,4 @@
-import { createSolanaRpc, createSolanaRpcSubscriptions, address, getBase64EncodedWireTransaction, compileTransaction, partiallySignTransactionMessageWithSigners, appendTransactionMessageInstruction, setTransactionMessageLifetimeUsingBlockhash, isTransactionSendingSigner, getMessagePackerInstructionPlanFromInstructions, signature, AccountRole, pipe, createTransactionMessage, setTransactionMessageFeePayer, singleTransactionPlan, signAndSendTransactionMessageWithSigners, createTransactionPlanExecutor, signTransactionMessageWithSigners, isSolanaError, SOLANA_ERROR__TRANSACTION_ERROR__ALREADY_PROCESSED, createTransactionPlanner, setTransactionMessageFeePayerSigner, isTransactionPartialSigner, isInstructionForProgram, isInstructionWithData, SolanaError, SOLANA_ERROR__INSTRUCTION_ERROR__GENERIC_ERROR, airdropFactory, signatureBytes } from '@solana/kit';
+import { createSolanaRpc, createSolanaRpcSubscriptions, address, getBase64EncodedWireTransaction, compileTransaction, partiallySignTransactionMessageWithSigners, appendTransactionMessageInstruction, setTransactionMessageLifetimeUsingBlockhash, isTransactionSendingSigner, getMessagePackerInstructionPlanFromInstructions, signature, AccountRole, pipe, createTransactionMessage, setTransactionMessageFeePayer, singleTransactionPlan, signAndSendTransactionMessageWithSigners, createTransactionPlanExecutor, signTransactionMessageWithSigners, isSolanaError, SOLANA_ERROR__TRANSACTION_ERROR__ALREADY_PROCESSED, createTransactionPlanner, setTransactionMessageFeePayerSigner, isTransactionPartialSigner, SOLANA_ERROR__INSTRUCTION_ERROR__COMPUTATIONAL_BUDGET_EXCEEDED, isInstructionForProgram, isInstructionWithData, SolanaError, SOLANA_ERROR__INSTRUCTION_ERROR__GENERIC_ERROR, airdropFactory, signatureBytes } from '@solana/kit';
 import { createBlockHeightExceedencePromiseFactory, createRecentSignatureConfirmationPromiseFactory, waitForRecentTransactionConfirmation } from '@solana/transaction-confirmation';
 import { getBase58Decoder, getBase58Encoder } from '@solana/codecs-strings';
 import { getTransferSolInstruction } from '@solana-program/system';
@@ -1356,10 +1356,23 @@ __name(transactionToBase64WithSigners, "transactionToBase64WithSigners");
 
 // src/transactions/prepareTransaction.ts
 var DEFAULT_COMPUTE_UNIT_LIMIT_MULTIPLIER = 1.1;
+var DEFAULT_COMPUTE_UNIT_LIMIT = 2e5;
+var MAX_COMPUTE_UNIT_LIMIT = 14e5;
 function isComputeUnitLimitInstruction(instruction) {
   return instruction.programAddress === COMPUTE_BUDGET_PROGRAM_ADDRESS && instruction.data?.[0] === 2;
 }
 __name(isComputeUnitLimitInstruction, "isComputeUnitLimitInstruction");
+function didExceedComputeBudget(error) {
+  let current = error;
+  while (isSolanaError(current)) {
+    if (isSolanaError(current, SOLANA_ERROR__INSTRUCTION_ERROR__COMPUTATIONAL_BUDGET_EXCEEDED)) {
+      return true;
+    }
+    current = current.cause;
+  }
+  return false;
+}
+__name(didExceedComputeBudget, "didExceedComputeBudget");
 async function estimateComputeUnits(rpc, transaction) {
   let target = transaction;
   const hasLifetime = transaction.lifetimeConstraint !== void 0;
@@ -1371,12 +1384,19 @@ async function estimateComputeUnits(rpc, transaction) {
     );
   }
   const base64Transaction = transactionToBase64(target);
-  const { value } = await rpc.simulateTransaction(base64Transaction, {
-    encoding: "base64",
-    replaceRecentBlockhash: false,
-    sigVerify: false
-  }).send();
-  return Number(value.unitsConsumed ?? 0) || 0;
+  try {
+    const { value } = await rpc.simulateTransaction(base64Transaction, {
+      encoding: "base64",
+      replaceRecentBlockhash: false,
+      sigVerify: false
+    }).send();
+    return Number(value.unitsConsumed ?? 0) || 0;
+  } catch (error) {
+    if (didExceedComputeBudget(error)) {
+      return MAX_COMPUTE_UNIT_LIMIT;
+    }
+    throw error;
+  }
 }
 __name(estimateComputeUnits, "estimateComputeUnits");
 async function prepareTransaction(config) {
@@ -1387,7 +1407,11 @@ async function prepareTransaction(config) {
   const computeLimitIndex = transaction.instructions.findIndex(isComputeUnitLimitInstruction);
   if (computeLimitIndex === -1 || shouldResetComputeUnits) {
     const unitsFromSimulation = await estimateComputeUnits(config.rpc, transaction);
-    const units = Math.max(1, unitsFromSimulation ? Math.ceil(unitsFromSimulation * multiplier) : 2e5);
+    const estimatedUnits = unitsFromSimulation ? Math.ceil(unitsFromSimulation * multiplier) : DEFAULT_COMPUTE_UNIT_LIMIT;
+    const units = Math.min(
+      MAX_COMPUTE_UNIT_LIMIT,
+      Math.max(DEFAULT_COMPUTE_UNIT_LIMIT, Math.max(1, estimatedUnits))
+    );
     const instruction = getSetComputeUnitLimitInstruction({ units });
     if (computeLimitIndex === -1) {
       transaction = appendTransactionMessageInstruction(instruction, transaction);