@streamflow/common 8.0.0-alpha.p287.84ff30f → 8.0.1-alpha.p287.54fe41f

package/dist/cjs/index.cjs

@@ -31,7 +31,7 @@ var ContractError = class _ContractError extends Error {
    * @param code extracted code from the error if managed to parse it
    */
   constructor(error, code, description) {
-    super(error.message);
+    super(error.message, { cause: error });
     this.contractErrorCode = code ?? null;
     this.description = description ?? null;
     Object.setPrototypeOf(this, _ContractError.prototype);

package/dist/cjs/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../types.ts","../../lib/assertions.ts","../../lib/utils.ts"],"names":["ICluster","IChain","BN"],"mappings":"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","file":"index.cjs","sourcesContent":["import { type TransactionInstruction } from \"@solana/web3.js\";\n\nexport interface ITransactionResult {\n  ixs: TransactionInstruction[];\n  txId: string;\n}\n\n// Utility types\nexport enum ICluster {\n  Mainnet = \"mainnet\",\n  Devnet = \"devnet\",\n  Testnet = \"testnet\",\n  Local = \"local\",\n}\n\nexport enum IChain {\n  Solana = \"Solana\",\n  Aptos = \"Aptos\",\n  Ethereum = \"Ethereum\",\n  BNB = \"BNB\",\n  Polygon = \"Polygon\",\n  Sui = \"Sui\",\n}\n\n/**\n * Error wrapper for calls made to the contract on chain\n */\nexport class ContractError extends Error {\n  public contractErrorCode: string | null;\n\n  public description: string | null;\n\n  /**\n   * Constructs the Error Wrapper\n   * @param error Original error raised probably by the chain SDK\n   * @param code extracted code from the error if managed to parse it\n   */\n  constructor(error: Error, code?: string | null, description?: string | null) {\n    super(error.message); // Call the base class constructor with the error message\n    this.contractErrorCode = code ?? null;\n    this.description = description ?? null;\n    // Copy properties from the original error\n    Object.setPrototypeOf(this, ContractError.prototype);\n    this.name = \"ContractError\"; // Set the name property\n    this.stack = error.stack;\n  }\n}\n","const prefix = \"Assertion failed\";\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport const invariant: (condition: any, message?: string | (() => string)) => asserts condition = (\n  condition,\n  message,\n) => {\n  if (condition) {\n    return;\n  }\n  const provided: string | undefined = typeof message === \"function\" ? message() : message;\n  const value: string = provided ? `${prefix}: ${provided}` : prefix;\n  throw new Error(value);\n};\n","import BN from \"bn.js\";\n\nimport { ContractError } from \"../types.js\";\n\n/**\n * Used for conversion of token amounts to their Big Number representation.\n * Get Big Number representation in the smallest units from the same value in the highest units.\n * @param {number} value - Number of tokens you want to convert to its BN representation.\n * @param {number} decimals - Number of decimals the token has.\n */\nexport const getBN = (value: number, decimals: number): BN => {\n  const decimalPart = value - Math.trunc(value);\n  const integerPart = new BN(Math.trunc(value));\n\n  const decimalE = new BN(decimalPart * 1e9);\n\n  const sum = integerPart.mul(new BN(1e9)).add(decimalE);\n  const resultE = sum.mul(new BN(10).pow(new BN(decimals)));\n  return resultE.div(new BN(1e9));\n};\n\n/**\n * Used for token amounts conversion from their Big Number representation to number.\n * Get value in the highest units from BN representation of the same value in the smallest units.\n * @param {BN} value - Big Number representation of value in the smallest units.\n * @param {number} decimals - Number of decimals the token has.\n */\nexport const getNumberFromBN = (value: BN, decimals: number): number =>\n  value.gt(new BN(2 ** 53 - 1)) ? value.div(new BN(10 ** decimals)).toNumber() : value.toNumber() / 10 ** decimals;\n\n/**\n * Used to make on chain calls to the contract and wrap raised errors if any\n * @param func function that interacts with the contract\n * @param callback callback that may be used to extract error code\n * @returns {T}\n */\nexport async function handleContractError<T>(\n  func: () => Promise<T>,\n  callback?: (err: Error) => string | null,\n): Promise<T> {\n  try {\n    return await func();\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  } catch (err: any) {\n    if (err instanceof Error) {\n      if (callback) {\n        throw new ContractError(err, callback(err));\n      }\n      throw new ContractError(err);\n    }\n    throw err;\n  }\n}\n\n/**\n * Pause async function execution for given amount of milliseconds\n * @param ms millisecond to sleep for\n */\nexport function sleep(ms: number): Promise<void> {\n  return new Promise((resolve) => setTimeout(resolve, ms));\n}\n\nexport const divCeilN = (n: bigint, d: bigint): bigint => n / d + (n % d ? BigInt(1) : BigInt(0));\n"]}
+{"version":3,"sources":["../../types.ts","../../lib/assertions.ts","../../lib/utils.ts"],"names":["ICluster","IChain","BN"],"mappings":"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","file":"index.cjs","sourcesContent":["import { type TransactionInstruction } from \"@solana/web3.js\";\n\nexport interface ITransactionResult {\n  ixs: TransactionInstruction[];\n  txId: string;\n}\n\n// Utility types\nexport enum ICluster {\n  Mainnet = \"mainnet\",\n  Devnet = \"devnet\",\n  Testnet = \"testnet\",\n  Local = \"local\",\n}\n\nexport enum IChain {\n  Solana = \"Solana\",\n  Aptos = \"Aptos\",\n  Ethereum = \"Ethereum\",\n  BNB = \"BNB\",\n  Polygon = \"Polygon\",\n  Sui = \"Sui\",\n}\n\n/**\n * Error wrapper for calls made to the contract on chain\n */\nexport class ContractError extends Error {\n  public contractErrorCode: string | null;\n\n  public description: string | null;\n\n  /**\n   * Constructs the Error Wrapper\n   * @param error Original error raised probably by the chain SDK\n   * @param code extracted code from the error if managed to parse it\n   */\n  constructor(error: Error, code?: string | null, description?: string | null) {\n    super(error.message, { cause: error }); // Call the base class constructor with the error message\n    this.contractErrorCode = code ?? null;\n    this.description = description ?? null;\n    // Copy properties from the original error\n    Object.setPrototypeOf(this, ContractError.prototype);\n    this.name = \"ContractError\"; // Set the name property\n    this.stack = error.stack;\n  }\n}\n","const prefix = \"Assertion failed\";\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport const invariant: (condition: any, message?: string | (() => string)) => asserts condition = (\n  condition,\n  message,\n) => {\n  if (condition) {\n    return;\n  }\n  const provided: string | undefined = typeof message === \"function\" ? message() : message;\n  const value: string = provided ? `${prefix}: ${provided}` : prefix;\n  throw new Error(value);\n};\n","import BN from \"bn.js\";\n\nimport { ContractError } from \"../types.js\";\n\n/**\n * Used for conversion of token amounts to their Big Number representation.\n * Get Big Number representation in the smallest units from the same value in the highest units.\n * @param {number} value - Number of tokens you want to convert to its BN representation.\n * @param {number} decimals - Number of decimals the token has.\n */\nexport const getBN = (value: number, decimals: number): BN => {\n  const decimalPart = value - Math.trunc(value);\n  const integerPart = new BN(Math.trunc(value));\n\n  const decimalE = new BN(decimalPart * 1e9);\n\n  const sum = integerPart.mul(new BN(1e9)).add(decimalE);\n  const resultE = sum.mul(new BN(10).pow(new BN(decimals)));\n  return resultE.div(new BN(1e9));\n};\n\n/**\n * Used for token amounts conversion from their Big Number representation to number.\n * Get value in the highest units from BN representation of the same value in the smallest units.\n * @param {BN} value - Big Number representation of value in the smallest units.\n * @param {number} decimals - Number of decimals the token has.\n */\nexport const getNumberFromBN = (value: BN, decimals: number): number =>\n  value.gt(new BN(2 ** 53 - 1)) ? value.div(new BN(10 ** decimals)).toNumber() : value.toNumber() / 10 ** decimals;\n\n/**\n * Used to make on chain calls to the contract and wrap raised errors if any\n * @param func function that interacts with the contract\n * @param callback callback that may be used to extract error code\n * @returns {T}\n */\nexport async function handleContractError<T>(\n  func: () => Promise<T>,\n  callback?: (err: Error) => string | null,\n): Promise<T> {\n  try {\n    return await func();\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  } catch (err: any) {\n    if (err instanceof Error) {\n      if (callback) {\n        throw new ContractError(err, callback(err));\n      }\n      throw new ContractError(err);\n    }\n    throw err;\n  }\n}\n\n/**\n * Pause async function execution for given amount of milliseconds\n * @param ms millisecond to sleep for\n */\nexport function sleep(ms: number): Promise<void> {\n  return new Promise((resolve) => setTimeout(resolve, ms));\n}\n\nexport const divCeilN = (n: bigint, d: bigint): bigint => n / d + (n % d ? BigInt(1) : BigInt(0));\n"]}

package/dist/cjs/solana/index.cjs

@@ -245,9 +245,6 @@ var prepareWrappedAccount = async (connection, senderAddress, amount) => {
     splToken.createSyncNativeInstruction(tokenAccount)
   ];
 };
-var pk = (address) => {
-  return typeof address === "string" ? new web3_js.PublicKey(address) : address;
-};
 
 // solana/types.ts
 var TransactionFailedError = class _TransactionFailedError extends Error {
@@ -789,16 +786,18 @@ async function signTransaction(invoker, tx) {
   }
   return signedTx;
 }
-async function signAndExecuteTransaction(connection, invoker, tx, confirmationParams, throttleParams) {
+async function signAndExecuteTransaction(connection, invoker, tx, confirmationParams, transactionExecutionParams) {
   const signedTx = await signTransaction(invoker, tx);
-  return executeTransaction(connection, signedTx, confirmationParams, throttleParams);
+  return executeTransaction(connection, signedTx, confirmationParams, transactionExecutionParams);
 }
-async function executeTransaction(connection, tx, confirmationParams, throttleParams) {
+async function executeTransaction(connection, tx, confirmationParams, transactionExecutionParams) {
   if (tx.signatures.length === 0) {
     throw Error("Error with transaction parameters.");
   }
-  await simulateTransaction(connection, tx);
-  return sendAndConfirmTransaction(connection, tx, confirmationParams, throttleParams);
+  if (!transactionExecutionParams.skipSimulation) {
+    await simulateTransaction(connection, tx);
+  }
+  return sendAndConfirmTransaction(connection, tx, confirmationParams, transactionExecutionParams);
 }
 async function executeMultipleTransactions(connection, txs, confirmationParams, { sendRate = 1, sendThrottler, ...throttlingParams }) {
   if (!sendThrottler) {
@@ -995,10 +994,10 @@ async function checkOrCreateAtaBatch(connection, owners, mint, invoker, programI
 }
 function prepareBaseInstructions(connection, { computePrice, computeLimit }) {
   const ixs = [];
-  if (computePrice && typeof computePrice === "number") {
+  if (computePrice && typeof computePrice !== "function") {
     ixs.push(web3_js.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: computePrice }));
   }
-  if (computeLimit) {
+  if (computeLimit && typeof computeLimit === "number") {
     ixs.push(web3_js.ComputeBudgetProgram.setComputeUnitLimit({ units: computeLimit }));
   }
   return ixs;
@@ -1024,68 +1023,102 @@ async function getMultipleAccountsInfoBatched(connection, pubKeys, commitment) {
   const results = await Promise.all(batches);
   return results.flat();
 }
+function deserializeRawTransaction(serializedTx) {
+  const txBuffer = buffer.Buffer.from(serializedTx, "base64");
+  try {
+    const tx = web3_js.Transaction.from(txBuffer);
+    return resolveTransactionAccounts(tx);
+  } catch (error) {
+    try {
+      const vtx = web3_js.VersionedTransaction.deserialize(txBuffer);
+      return resolveTransactionAccounts(vtx);
+    } catch (vError) {
+      throw new Error("Failed to deserialize transaction: " + (vError instanceof Error ? vError.message : vError), {
+        cause: vError
+      });
+    }
+  }
+}
+var resolveTransactionAccounts = (tx) => {
+  if (tx instanceof web3_js.Transaction) {
+    const message2 = tx.compileMessage();
+    const accounts2 = message2.accountKeys;
+    const writableAccounts2 = accounts2.filter((_, idx) => message2.isAccountWritable(idx));
+    return {
+      type: "legacy",
+      transaction: tx,
+      accounts: accounts2,
+      writableAccounts: writableAccounts2
+    };
+  }
+  const message = tx.message;
+  const accounts = "staticAccountKeys" in message ? message.staticAccountKeys : message.accountKeys;
+  const writableAccounts = accounts.filter((_, idx) => message.isAccountWritable(idx));
+  return {
+    type: "versioned",
+    transaction: tx,
+    accounts,
+    writableAccounts
+  };
+};
+var pk = (address) => {
+  return typeof address === "string" ? new web3_js.PublicKey(address) : address;
+};
 
 // solana/lib/estimate.ts
-async function estimateComputeUnitPrice(estimate, ixs, payer, recentBlockhash, partialSigners) {
-  const tx = createVersionedTransaction(
-    ixs,
-    payer,
-    recentBlockhash ?? "11111111111111111111111111111111",
-    partialSigners
-  );
-  return estimate(Buffer.from(tx.serialize()).toString("base64"));
+var createTestTransaction = (ixs, payer, recentBlockhash, partialSigners) => {
+  return createVersionedTransaction(ixs, payer, "11111111111111111111111111111111", partialSigners);
+};
+async function estimateComputeUnitPrice(estimate, testTx) {
+  return estimate(resolveTransactionAccounts(testTx).writableAccounts);
 }
 async function createAndEstimateTransaction(createFn, extParams, select) {
   select = select ?? ((value) => value);
   const createResult = await createFn(extParams);
   const prepareIxs = select(createResult);
-  const priorityFee = extParams.computePrice;
-  if (priorityFee === void 0 || typeof priorityFee === "number") {
-    return createResult;
-  }
+  const { computePrice, computeLimit } = extParams;
   const invoker = extParams.invoker.publicKey;
   invariant(invoker, "Invoker's PublicKey is not available, check passed wallet adapter!");
-  const estimatedComputeUnitPrice = typeof priorityFee === "function" ? await estimateComputeUnitPrice(priorityFee, prepareIxs, pk(invoker)) : (
+  const testTx = createTestTransaction(prepareIxs, pk(invoker), void 0, void 0);
+  const estimatedComputeLimit = typeof computeLimit === "function" ? await computeLimit(testTx) : computeLimit;
+  if (typeof computePrice !== "function") {
+    if (typeof computeLimit !== "function") {
+      return createResult;
+    }
+    return createFn({
+      ...extParams,
+      computeLimit: estimatedComputeLimit
+    });
+  }
+  const estimatedComputeUnitPrice = typeof computePrice === "function" ? await estimateComputeUnitPrice(computePrice, testTx) : (
     // unachievable because we don't execute estimation for constant or undefined priority fee
-    priorityFee
+    computePrice
   );
   return createFn({
     ...extParams,
-    computePrice: estimatedComputeUnitPrice
+    computePrice: estimatedComputeUnitPrice,
+    computeLimit: estimatedComputeLimit
   });
 }
-function deserializeRawTransaction(serializedTx) {
-  const txBuffer = buffer.Buffer.from(serializedTx, "base64");
-  try {
-    const tx = web3_js.Transaction.from(txBuffer);
-    const message = tx.compileMessage();
-    const accounts = message.accountKeys;
-    const writableAccounts = accounts.filter((_, idx) => message.isAccountWritable(idx));
-    return {
-      type: "legacy",
-      transaction: tx,
-      accounts,
-      writableAccounts
-    };
-  } catch (error) {
-    try {
-      const vtx = web3_js.VersionedTransaction.deserialize(txBuffer);
-      const message = vtx.message;
-      const accounts = "staticAccountKeys" in message ? message.staticAccountKeys : message.accountKeys;
-      const writableAccounts = accounts.filter((_, idx) => message.isAccountWritable(idx));
-      return {
-        type: "versioned",
-        transaction: vtx,
-        accounts,
-        writableAccounts
-      };
-    } catch (vError) {
-      throw new Error("Failed to deserialize transaction: " + (vError instanceof Error ? vError.message : vError), {
-        cause: vError
-      });
-    }
-  }
-}
+
+// solana/rpc/consume-limit-estimate/estimate.ts
+var estimateConsumeLimit = async (connection, tx, options = {}) => {
+  const { multiplierPercent = 0.05 } = options;
+  const simulationResults = await connection.simulateTransaction(tx, {
+    sigVerify: false,
+    replaceRecentBlockhash: true
+  });
+  return {
+    unitsConsumed: simulationResults.value.unitsConsumed ? Math.ceil(simulationResults.value.unitsConsumed * (1 + multiplierPercent)) : simulationResults.value.unitsConsumed,
+    data: simulationResults
+  };
+};
+
+// solana/lib/unwrap-auto-simulate-ext.ts
+var unwrapExecutionParams = ({ computeLimit, ...rest }, connection) => {
+  const consumeLimitFn = computeLimit === "autoSimulate" ? (tx) => estimateConsumeLimit(connection, tx).then((limit) => limit.unitsConsumed ?? 0) : computeLimit;
+  return { ...rest, computeLimit: consumeLimitFn, skipSimulation: computeLimit === "autoSimulate" };
+};
 
 exports.TransactionFailedError = TransactionFailedError;
 exports.ata = ata;
@@ -1113,9 +1146,11 @@ exports.pk = pk;
 exports.prepareBaseInstructions = prepareBaseInstructions;
 exports.prepareTransaction = prepareTransaction;
 exports.prepareWrappedAccount = prepareWrappedAccount;
+exports.resolveTransactionAccounts = resolveTransactionAccounts;
 exports.sendAndConfirmTransaction = sendAndConfirmTransaction;
 exports.signAndExecuteTransaction = signAndExecuteTransaction;
 exports.signTransaction = signTransaction;
 exports.simulateTransaction = simulateTransaction;
+exports.unwrapExecutionParams = unwrapExecutionParams;
 //# sourceMappingURL=index.cjs.map
 //# sourceMappingURL=index.cjs.map