@meshsdk/core-csl 1.9.0-beta.1 → 1.9.0-beta.3

package/dist/index.cjs

@@ -72,6 +72,7 @@ __export(index_exports, {
   fromUTF8: () => fromUTF8,
   getDRepIds: () => getDRepIds,
   getTransactionInputs: () => getTransactionInputs,
+  getTransactionOutputs: () => getTransactionOutputs,
   getV2ScriptHash: () => getV2ScriptHash,
   keyHashToRewardAddress: () => keyHashToRewardAddress,
   meshTxBuilderBodyToObj: () => meshTxBuilderBodyToObj,
@@ -507,6 +508,9 @@ var keyHashToRewardAddress = (keyHashHex, network = 1) => {
   return rewardAddress;
 };
 
+// src/utils/transaction.ts
+var import_sidan_csl_rs_nodejs = require("@sidan-lab/sidan-csl-rs-nodejs");
+
 // src/wasm.ts
 var parseWasmResult = (result) => {
   if (result.get_status() !== "success") {
@@ -534,13 +538,16 @@ var signTransaction = (txHex, signingKeys) => {
   const result = csl.js_sign_transaction(txHex, cslSigningKeys);
   return parseWasmResult(result);
 };
-var evaluateTransaction = (txHex, resolvedUtxos, network, slotConfig) => {
+var evaluateTransaction = (txHex, resolvedUtxos, chainedTxs, network, slotConfig) => {
   const additionalTxs = csl.JsVecString.new();
+  for (const tx of chainedTxs) {
+    additionalTxs.add(tx);
+  }
   const mappedUtxos = csl.JsVecString.new();
   for (const utxo of resolvedUtxos) {
     mappedUtxos.add(JSON.stringify(utxo));
   }
-  const result = csl.evaluate_tx_scripts_js(
+  const result = csl.js_evaluate_tx_scripts(
     txHex,
     mappedUtxos,
     additionalTxs,
@@ -605,7 +612,7 @@ var getTransactionInputs = (txHex) => {
     const input = cslInputs.get(i);
     inputs.push({
       txHash: input.transaction_id().to_hex(),
-      index: input.index()
+      outputIndex: input.index()
     });
   }
   const cslCollaterals = body.collateral();
@@ -614,7 +621,7 @@ var getTransactionInputs = (txHex) => {
       const collateral = cslCollaterals.get(i);
       inputs.push({
         txHash: collateral.transaction_id().to_hex(),
-        index: collateral.index()
+        outputIndex: collateral.index()
       });
     }
   }
@@ -624,12 +631,17 @@ var getTransactionInputs = (txHex) => {
       const refInput = cslRefInputs.get(i);
       inputs.push({
         txHash: refInput.transaction_id().to_hex(),
-        index: refInput.index()
+        outputIndex: refInput.index()
       });
     }
   }
   return inputs;
 };
+var getTransactionOutputs = (txHex) => {
+  const outputs = (0, import_sidan_csl_rs_nodejs.js_get_tx_outs_utxo)(txHex).get_data();
+  const utxos = JSON.parse(outputs);
+  return utxos;
+};
 
 // src/utils/aiken.ts
 var applyParamsToScript = (rawScript, params, type = "Mesh") => {
@@ -1489,36 +1501,47 @@ var OfflineEvaluator = class {
    *   - budget: Memory units and CPU steps required
    * @throws Error if any required UTXOs cannot be resolved or if script evaluation fails
    */
-  async evaluateTx(tx) {
-    const inputsToResolve = getTransactionInputs(tx);
+  async evaluateTx(tx, additionalUtxos, additionalTxs) {
+    const foundUtxos = /* @__PURE__ */ new Set();
+    for (const utxo of additionalUtxos) {
+      foundUtxos.add(`${utxo.input.txHash}:${utxo.input.outputIndex}`);
+    }
+    for (const tx2 of additionalTxs) {
+      const outputs = getTransactionOutputs(tx2);
+      for (const output of outputs) {
+        foundUtxos.add(`${output.input.txHash}:${output.input.outputIndex}`);
+      }
+    }
+    const inputsToResolve = getTransactionInputs(tx).filter(
+      (input) => !foundUtxos.has(`${input.txHash}:${input.outputIndex}`)
+    );
     const txHashesSet = new Set(inputsToResolve.map((input) => input.txHash));
-    const resolvedUTXOs = [];
     for (const txHash of txHashesSet) {
       const utxos = await this.fetcher.fetchUTxOs(txHash);
       for (const utxo of utxos) {
         if (utxo) {
           if (inputsToResolve.find(
-            (input) => input.txHash === txHash && input.index === utxo.input.outputIndex
+            (input) => input.txHash === txHash && input.outputIndex === utxo.input.outputIndex
           )) {
-            resolvedUTXOs.push(utxo);
+            additionalUtxos.push(utxo);
+            foundUtxos.add(`${utxo.input.txHash}:${utxo.input.outputIndex}`);
           }
         }
       }
     }
     const missing = inputsToResolve.filter(
-      (input) => !resolvedUTXOs.find(
-        (utxo) => utxo.input.txHash === input.txHash && utxo.input.outputIndex === input.index
-      )
+      (input) => !foundUtxos.has(`${input.txHash}:${input.outputIndex}`)
     );
     if (missing.length > 0) {
-      const missingList = missing.map((m) => `${m.txHash}:${m.index}`).join(", ");
+      const missingList = missing.map((m) => `${m.txHash}:${m.outputIndex}`).join(", ");
       throw new Error(
         `Can't resolve these UTXOs to execute plutus scripts: ${missingList}`
       );
     }
     return evaluateTransaction(
       tx,
-      resolvedUTXOs,
+      additionalUtxos,
+      additionalTxs,
       this.network,
       this.slotConfig
     );
@@ -1568,6 +1591,7 @@ var OfflineEvaluator = class {
   fromUTF8,
   getDRepIds,
   getTransactionInputs,
+  getTransactionOutputs,
   getV2ScriptHash,
   keyHashToRewardAddress,
   meshTxBuilderBodyToObj,

package/dist/index.d.cts

@@ -30,11 +30,12 @@ declare const keyHashToRewardAddress: (keyHashHex: string, network?: number) =>
 
 declare const calculateTxHash: (txHex: string) => string;
 declare const signTransaction: (txHex: string, signingKeys: string[]) => string;
-declare const evaluateTransaction: (txHex: string, resolvedUtxos: UTxO[], network: Network, slotConfig: Omit<Omit<SlotConfig, "startEpoch">, "epochLength">) => Omit<Action, "data">[];
+declare const evaluateTransaction: (txHex: string, resolvedUtxos: UTxO[], chainedTxs: string[], network: Network, slotConfig: Omit<Omit<SlotConfig, "startEpoch">, "epochLength">) => Omit<Action, "data">[];
 declare const getTransactionInputs: (txHex: string) => {
     txHash: string;
-    index: number;
+    outputIndex: number;
 }[];
+declare const getTransactionOutputs: (txHex: string) => UTxO[];
 
 /**
  * Apply parameters to a given script blueprint.
@@ -264,7 +265,7 @@ declare class OfflineEvaluator implements IEvaluator {
      *   - budget: Memory units and CPU steps required
      * @throws Error if any required UTXOs cannot be resolved or if script evaluation fails
      */
-    evaluateTx(tx: string): Promise<Omit<Action, "data">[]>;
+    evaluateTx(tx: string, additionalUtxos: UTxO[], additionalTxs: string[]): Promise<Omit<Action, "data">[]>;
 }
 
-export { CSLSerializer, LANGUAGE_VERSIONS, OfflineEvaluator, POLICY_ID_LENGTH, REDEEMER_TAGS, addrBech32ToPlutusDataHex, addrBech32ToPlutusDataObj, applyCborEncoding, applyParamsToScript, baseAddressToStakeAddress, baseCertToObj, builderDataToCbor, calculateTxHash, castDataToPlutusData, castRawDataToJsonString, certificateToObj, collateralTxInToObj, deserializeAddress, deserializeBech32Address, deserializeBip32PrivateKey, deserializeDataHash, deserializeEd25519KeyHash, deserializeEd25519Signature, deserializeNativeScript, deserializePlutusData, deserializePlutusScript, deserializePublicKey, deserializeScriptHash, deserializeScriptRef, deserializeTx, deserializeTxBody, deserializeTxHash, deserializeTxUnspentOutput, deserializeTxWitnessSet, deserializeValue, evaluateTransaction, fromBytes, fromLovelace, fromUTF8, getDRepIds, getTransactionInputs, getV2ScriptHash, keyHashToRewardAddress, meshTxBuilderBodyToObj, mintItemToObj, mintParametersObj, nativeMintItemToObj, outputToObj, parseDatumCbor, parseInlineDatum, plutusMintItemToObj, poolIdBech32ToHex, poolIdHexToBech32, poolMetadataToObj, poolParamsToObj, redeemerToObj, relayToObj, resolveDataHash, resolveEd25519KeyHash, resolveNativeScriptAddress, resolveNativeScriptHash, resolveNativeScriptHex, resolvePlutusScriptAddress, resolvePrivateKey, resolveRewardAddress, resolveScriptHashDRepId, resolveScriptRef, resolveStakeKeyHash, rewardAddressToKeyHash, scriptHashToBech32, scriptHashToRewardAddress, scriptSourceToObj, scriptTxInParameterToObj, serializeAddressObj, serializePlutusAddressToBech32, serializePoolId, serialzeAddress, signTransaction, simpleScriptSourceToObj, simpleScriptTxInParameterToObj, skeyToPubKeyHash, toAddress, toBaseAddress, toBytes, toEnterpriseAddress, toLovelace, toNativeScript, toPlutusData, toRewardAddress, toScriptRef, toUTF8, txInParameterToObj, txInToObj, utxoToObj, v2ScriptToBech32, withdrawalToObj };
+export { CSLSerializer, LANGUAGE_VERSIONS, OfflineEvaluator, POLICY_ID_LENGTH, REDEEMER_TAGS, addrBech32ToPlutusDataHex, addrBech32ToPlutusDataObj, applyCborEncoding, applyParamsToScript, baseAddressToStakeAddress, baseCertToObj, builderDataToCbor, calculateTxHash, castDataToPlutusData, castRawDataToJsonString, certificateToObj, collateralTxInToObj, deserializeAddress, deserializeBech32Address, deserializeBip32PrivateKey, deserializeDataHash, deserializeEd25519KeyHash, deserializeEd25519Signature, deserializeNativeScript, deserializePlutusData, deserializePlutusScript, deserializePublicKey, deserializeScriptHash, deserializeScriptRef, deserializeTx, deserializeTxBody, deserializeTxHash, deserializeTxUnspentOutput, deserializeTxWitnessSet, deserializeValue, evaluateTransaction, fromBytes, fromLovelace, fromUTF8, getDRepIds, getTransactionInputs, getTransactionOutputs, getV2ScriptHash, keyHashToRewardAddress, meshTxBuilderBodyToObj, mintItemToObj, mintParametersObj, nativeMintItemToObj, outputToObj, parseDatumCbor, parseInlineDatum, plutusMintItemToObj, poolIdBech32ToHex, poolIdHexToBech32, poolMetadataToObj, poolParamsToObj, redeemerToObj, relayToObj, resolveDataHash, resolveEd25519KeyHash, resolveNativeScriptAddress, resolveNativeScriptHash, resolveNativeScriptHex, resolvePlutusScriptAddress, resolvePrivateKey, resolveRewardAddress, resolveScriptHashDRepId, resolveScriptRef, resolveStakeKeyHash, rewardAddressToKeyHash, scriptHashToBech32, scriptHashToRewardAddress, scriptSourceToObj, scriptTxInParameterToObj, serializeAddressObj, serializePlutusAddressToBech32, serializePoolId, serialzeAddress, signTransaction, simpleScriptSourceToObj, simpleScriptTxInParameterToObj, skeyToPubKeyHash, toAddress, toBaseAddress, toBytes, toEnterpriseAddress, toLovelace, toNativeScript, toPlutusData, toRewardAddress, toScriptRef, toUTF8, txInParameterToObj, txInToObj, utxoToObj, v2ScriptToBech32, withdrawalToObj };

package/dist/index.d.ts

@@ -30,11 +30,12 @@ declare const keyHashToRewardAddress: (keyHashHex: string, network?: number) =>
 
 declare const calculateTxHash: (txHex: string) => string;
 declare const signTransaction: (txHex: string, signingKeys: string[]) => string;
-declare const evaluateTransaction: (txHex: string, resolvedUtxos: UTxO[], network: Network, slotConfig: Omit<Omit<SlotConfig, "startEpoch">, "epochLength">) => Omit<Action, "data">[];
+declare const evaluateTransaction: (txHex: string, resolvedUtxos: UTxO[], chainedTxs: string[], network: Network, slotConfig: Omit<Omit<SlotConfig, "startEpoch">, "epochLength">) => Omit<Action, "data">[];
 declare const getTransactionInputs: (txHex: string) => {
     txHash: string;
-    index: number;
+    outputIndex: number;
 }[];
+declare const getTransactionOutputs: (txHex: string) => UTxO[];
 
 /**
  * Apply parameters to a given script blueprint.
@@ -264,7 +265,7 @@ declare class OfflineEvaluator implements IEvaluator {
      *   - budget: Memory units and CPU steps required
      * @throws Error if any required UTXOs cannot be resolved or if script evaluation fails
      */
-    evaluateTx(tx: string): Promise<Omit<Action, "data">[]>;
+    evaluateTx(tx: string, additionalUtxos: UTxO[], additionalTxs: string[]): Promise<Omit<Action, "data">[]>;
 }
 
-export { CSLSerializer, LANGUAGE_VERSIONS, OfflineEvaluator, POLICY_ID_LENGTH, REDEEMER_TAGS, addrBech32ToPlutusDataHex, addrBech32ToPlutusDataObj, applyCborEncoding, applyParamsToScript, baseAddressToStakeAddress, baseCertToObj, builderDataToCbor, calculateTxHash, castDataToPlutusData, castRawDataToJsonString, certificateToObj, collateralTxInToObj, deserializeAddress, deserializeBech32Address, deserializeBip32PrivateKey, deserializeDataHash, deserializeEd25519KeyHash, deserializeEd25519Signature, deserializeNativeScript, deserializePlutusData, deserializePlutusScript, deserializePublicKey, deserializeScriptHash, deserializeScriptRef, deserializeTx, deserializeTxBody, deserializeTxHash, deserializeTxUnspentOutput, deserializeTxWitnessSet, deserializeValue, evaluateTransaction, fromBytes, fromLovelace, fromUTF8, getDRepIds, getTransactionInputs, getV2ScriptHash, keyHashToRewardAddress, meshTxBuilderBodyToObj, mintItemToObj, mintParametersObj, nativeMintItemToObj, outputToObj, parseDatumCbor, parseInlineDatum, plutusMintItemToObj, poolIdBech32ToHex, poolIdHexToBech32, poolMetadataToObj, poolParamsToObj, redeemerToObj, relayToObj, resolveDataHash, resolveEd25519KeyHash, resolveNativeScriptAddress, resolveNativeScriptHash, resolveNativeScriptHex, resolvePlutusScriptAddress, resolvePrivateKey, resolveRewardAddress, resolveScriptHashDRepId, resolveScriptRef, resolveStakeKeyHash, rewardAddressToKeyHash, scriptHashToBech32, scriptHashToRewardAddress, scriptSourceToObj, scriptTxInParameterToObj, serializeAddressObj, serializePlutusAddressToBech32, serializePoolId, serialzeAddress, signTransaction, simpleScriptSourceToObj, simpleScriptTxInParameterToObj, skeyToPubKeyHash, toAddress, toBaseAddress, toBytes, toEnterpriseAddress, toLovelace, toNativeScript, toPlutusData, toRewardAddress, toScriptRef, toUTF8, txInParameterToObj, txInToObj, utxoToObj, v2ScriptToBech32, withdrawalToObj };
+export { CSLSerializer, LANGUAGE_VERSIONS, OfflineEvaluator, POLICY_ID_LENGTH, REDEEMER_TAGS, addrBech32ToPlutusDataHex, addrBech32ToPlutusDataObj, applyCborEncoding, applyParamsToScript, baseAddressToStakeAddress, baseCertToObj, builderDataToCbor, calculateTxHash, castDataToPlutusData, castRawDataToJsonString, certificateToObj, collateralTxInToObj, deserializeAddress, deserializeBech32Address, deserializeBip32PrivateKey, deserializeDataHash, deserializeEd25519KeyHash, deserializeEd25519Signature, deserializeNativeScript, deserializePlutusData, deserializePlutusScript, deserializePublicKey, deserializeScriptHash, deserializeScriptRef, deserializeTx, deserializeTxBody, deserializeTxHash, deserializeTxUnspentOutput, deserializeTxWitnessSet, deserializeValue, evaluateTransaction, fromBytes, fromLovelace, fromUTF8, getDRepIds, getTransactionInputs, getTransactionOutputs, getV2ScriptHash, keyHashToRewardAddress, meshTxBuilderBodyToObj, mintItemToObj, mintParametersObj, nativeMintItemToObj, outputToObj, parseDatumCbor, parseInlineDatum, plutusMintItemToObj, poolIdBech32ToHex, poolIdHexToBech32, poolMetadataToObj, poolParamsToObj, redeemerToObj, relayToObj, resolveDataHash, resolveEd25519KeyHash, resolveNativeScriptAddress, resolveNativeScriptHash, resolveNativeScriptHex, resolvePlutusScriptAddress, resolvePrivateKey, resolveRewardAddress, resolveScriptHashDRepId, resolveScriptRef, resolveStakeKeyHash, rewardAddressToKeyHash, scriptHashToBech32, scriptHashToRewardAddress, scriptSourceToObj, scriptTxInParameterToObj, serializeAddressObj, serializePlutusAddressToBech32, serializePoolId, serialzeAddress, signTransaction, simpleScriptSourceToObj, simpleScriptTxInParameterToObj, skeyToPubKeyHash, toAddress, toBaseAddress, toBytes, toEnterpriseAddress, toLovelace, toNativeScript, toPlutusData, toRewardAddress, toScriptRef, toUTF8, txInParameterToObj, txInToObj, utxoToObj, v2ScriptToBech32, withdrawalToObj };

package/dist/index.js

@@ -380,6 +380,9 @@ var keyHashToRewardAddress = (keyHashHex, network = 1) => {
   return rewardAddress;
 };
 
+// src/utils/transaction.ts
+import { js_get_tx_outs_utxo } from "@sidan-lab/sidan-csl-rs-nodejs";
+
 // src/wasm.ts
 var parseWasmResult = (result) => {
   if (result.get_status() !== "success") {
@@ -407,13 +410,16 @@ var signTransaction = (txHex, signingKeys) => {
   const result = csl.js_sign_transaction(txHex, cslSigningKeys);
   return parseWasmResult(result);
 };
-var evaluateTransaction = (txHex, resolvedUtxos, network, slotConfig) => {
+var evaluateTransaction = (txHex, resolvedUtxos, chainedTxs, network, slotConfig) => {
   const additionalTxs = csl.JsVecString.new();
+  for (const tx of chainedTxs) {
+    additionalTxs.add(tx);
+  }
   const mappedUtxos = csl.JsVecString.new();
   for (const utxo of resolvedUtxos) {
     mappedUtxos.add(JSON.stringify(utxo));
   }
-  const result = csl.evaluate_tx_scripts_js(
+  const result = csl.js_evaluate_tx_scripts(
     txHex,
     mappedUtxos,
     additionalTxs,
@@ -478,7 +484,7 @@ var getTransactionInputs = (txHex) => {
     const input = cslInputs.get(i);
     inputs.push({
       txHash: input.transaction_id().to_hex(),
-      index: input.index()
+      outputIndex: input.index()
     });
   }
   const cslCollaterals = body.collateral();
@@ -487,7 +493,7 @@ var getTransactionInputs = (txHex) => {
       const collateral = cslCollaterals.get(i);
       inputs.push({
         txHash: collateral.transaction_id().to_hex(),
-        index: collateral.index()
+        outputIndex: collateral.index()
       });
     }
   }
@@ -497,12 +503,17 @@ var getTransactionInputs = (txHex) => {
       const refInput = cslRefInputs.get(i);
       inputs.push({
         txHash: refInput.transaction_id().to_hex(),
-        index: refInput.index()
+        outputIndex: refInput.index()
       });
     }
   }
   return inputs;
 };
+var getTransactionOutputs = (txHex) => {
+  const outputs = js_get_tx_outs_utxo(txHex).get_data();
+  const utxos = JSON.parse(outputs);
+  return utxos;
+};
 
 // src/utils/aiken.ts
 var applyParamsToScript = (rawScript, params, type = "Mesh") => {
@@ -1367,36 +1378,47 @@ var OfflineEvaluator = class {
    *   - budget: Memory units and CPU steps required
    * @throws Error if any required UTXOs cannot be resolved or if script evaluation fails
    */
-  async evaluateTx(tx) {
-    const inputsToResolve = getTransactionInputs(tx);
+  async evaluateTx(tx, additionalUtxos, additionalTxs) {
+    const foundUtxos = /* @__PURE__ */ new Set();
+    for (const utxo of additionalUtxos) {
+      foundUtxos.add(`${utxo.input.txHash}:${utxo.input.outputIndex}`);
+    }
+    for (const tx2 of additionalTxs) {
+      const outputs = getTransactionOutputs(tx2);
+      for (const output of outputs) {
+        foundUtxos.add(`${output.input.txHash}:${output.input.outputIndex}`);
+      }
+    }
+    const inputsToResolve = getTransactionInputs(tx).filter(
+      (input) => !foundUtxos.has(`${input.txHash}:${input.outputIndex}`)
+    );
     const txHashesSet = new Set(inputsToResolve.map((input) => input.txHash));
-    const resolvedUTXOs = [];
     for (const txHash of txHashesSet) {
       const utxos = await this.fetcher.fetchUTxOs(txHash);
       for (const utxo of utxos) {
         if (utxo) {
           if (inputsToResolve.find(
-            (input) => input.txHash === txHash && input.index === utxo.input.outputIndex
+            (input) => input.txHash === txHash && input.outputIndex === utxo.input.outputIndex
           )) {
-            resolvedUTXOs.push(utxo);
+            additionalUtxos.push(utxo);
+            foundUtxos.add(`${utxo.input.txHash}:${utxo.input.outputIndex}`);
           }
         }
       }
     }
     const missing = inputsToResolve.filter(
-      (input) => !resolvedUTXOs.find(
-        (utxo) => utxo.input.txHash === input.txHash && utxo.input.outputIndex === input.index
-      )
+      (input) => !foundUtxos.has(`${input.txHash}:${input.outputIndex}`)
     );
     if (missing.length > 0) {
-      const missingList = missing.map((m) => `${m.txHash}:${m.index}`).join(", ");
+      const missingList = missing.map((m) => `${m.txHash}:${m.outputIndex}`).join(", ");
       throw new Error(
         `Can't resolve these UTXOs to execute plutus scripts: ${missingList}`
       );
     }
     return evaluateTransaction(
       tx,
-      resolvedUTXOs,
+      additionalUtxos,
+      additionalTxs,
       this.network,
       this.slotConfig
     );
@@ -1445,6 +1467,7 @@ export {
   fromUTF8,
   getDRepIds,
   getTransactionInputs,
+  getTransactionOutputs,
   getV2ScriptHash,
   keyHashToRewardAddress,
   meshTxBuilderBodyToObj,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshsdk/core-csl",
-  "version": "1.9.0-beta.1",
+  "version": "1.9.0-beta.3",
   "description": "Types and utilities functions between Mesh and cardano-serialization-lib",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "@meshsdk/configs": "*",
-    "@meshsdk/provider": "1.9.0-beta.1",
+    "@meshsdk/provider": "1.9.0-beta.3",
     "@types/json-bigint": "^1.0.4",
     "eslint": "^8.57.0",
     "ts-jest": "^29.1.4",
@@ -39,9 +39,9 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@meshsdk/common": "1.9.0-beta.1",
-    "@sidan-lab/sidan-csl-rs-browser": "0.9.18",
-    "@sidan-lab/sidan-csl-rs-nodejs": "0.9.18",
+    "@meshsdk/common": "1.9.0-beta.3",
+    "@sidan-lab/sidan-csl-rs-browser": "0.9.21",
+    "@sidan-lab/sidan-csl-rs-nodejs": "0.9.21",
     "@types/base32-encoding": "^1.0.2",
     "base32-encoding": "^1.0.0",
     "bech32": "^2.0.0",
@@ -59,4 +59,4 @@
     "blockchain",
     "sdk"
   ]
-}
+}