@meshsdk/transaction 1.7.13 → 1.7.15

package/dist/index.cjs

@@ -71,9 +71,10 @@ var MeshTxBuilderCore = class {
    * @param txIndex The transaction index of the input UTxO
    * @param amount The asset amount of index of the input UTxO
    * @param address The address of the input UTxO
+   * @param scriptSize The size of the ref script at this input (if there isn't one, explicitly put 0 as scriptSize for offline tx building)
    * @returns The MeshTxBuilder instance
    */
-  txIn = (txHash, txIndex, amount, address) => {
+  txIn = (txHash, txIndex, amount, address, scriptSize) => {
     if (this.txInQueueItem) {
       this.queueInput();
     }
@@ -84,7 +85,8 @@ var MeshTxBuilderCore = class {
           txHash,
           txIndex,
           amount,
-          address
+          address,
+          scriptSize
         }
       };
     } else {
@@ -94,7 +96,8 @@ var MeshTxBuilderCore = class {
           txHash,
           txIndex,
           amount,
-          address
+          address,
+          scriptSize
         },
         scriptTxIn: {}
       };
@@ -1651,32 +1654,15 @@ var MeshTxBuilder = class extends MeshTxBuilderCore {
       this.queueAllLastItem();
     }
     this.removeDuplicateInputs();
+    for (let collateral of this.meshTxBuilderBody.collaterals) {
+      collateral.txIn.scriptSize = 0;
+    }
     const { inputs, collaterals, mints } = this.meshTxBuilderBody;
-    const incompleteTxIns = [...inputs, ...collaterals];
+    const incompleteTxIns = [...inputs, ...collaterals].filter(
+      (txIn) => !this.isInputComplete(txIn)
+    );
     const incompleteMints = mints.filter((mint) => !this.isMintComplete(mint));
     await this.queryAllTxInfo(incompleteTxIns, incompleteMints);
-    Object.values(this.queriedUTxOs).forEach((utxos) => {
-      for (let utxo of utxos) {
-        if (utxo.output.scriptRef !== void 0) {
-          this.utxosWithRefScripts.push(utxo);
-        }
-      }
-    });
-    const missingRefInput = this.utxosWithRefScripts.filter((utxo) => {
-      this.meshTxBuilderBody.referenceInputs.forEach((refInput) => {
-        if (refInput.txHash === utxo.input.txHash && refInput.txIndex === utxo.input.outputIndex) {
-          return false;
-        }
-      });
-      return true;
-    });
-    missingRefInput.forEach((utxo) => {
-      this.meshTxBuilderBody.referenceInputs.push({
-        txHash: utxo.input.txHash,
-        txIndex: utxo.input.outputIndex,
-        scriptSize: utxo.output.scriptRef.length / 2
-      });
-    });
     incompleteTxIns.forEach((txIn) => {
       this.completeTxInformation(txIn);
     });
@@ -1690,6 +1676,19 @@ var MeshTxBuilder = class extends MeshTxBuilderCore {
         this.completeSimpleScriptInfo(scriptSource);
       }
     });
+    this.meshTxBuilderBody.inputs.forEach((input) => {
+      if (input.txIn.scriptSize && input.txIn.scriptSize > 0) {
+        if (this.meshTxBuilderBody.referenceInputs.find((refTxIn) => {
+          refTxIn.txHash === input.txIn.txHash && refTxIn.txIndex === input.txIn.txIndex;
+        }) === void 0) {
+          this.meshTxBuilderBody.referenceInputs.push({
+            txHash: input.txIn.txHash,
+            txIndex: input.txIn.txIndex,
+            scriptSize: input.txIn.scriptSize
+          });
+        }
+      }
+    });
     this.addUtxosFromSelection();
     let txHex = this.serializer.serializeTxBody(
       this.meshTxBuilderBody,
@@ -1817,6 +1816,11 @@ var MeshTxBuilder = class extends MeshTxBuilderCore {
         );
       input.txIn.address = address;
     }
+    if (utxo?.output.scriptRef) {
+      input.txIn.scriptSize = utxo.output.scriptRef.length / 2;
+    } else {
+      input.txIn.scriptSize = 0;
+    }
   };
   completeScriptInfo = (scriptSource) => {
     if (scriptSource?.type != "Inline") return;
@@ -1852,8 +1856,8 @@ var MeshTxBuilder = class extends MeshTxBuilderCore {
     return true;
   };
   isInputInfoComplete = (txIn) => {
-    const { amount, address } = txIn.txIn;
-    if (!amount || !address) return false;
+    const { amount, address, scriptSize } = txIn.txIn;
+    if (!amount || !address || scriptSize === void 0) return false;
     return true;
   };
   isMintComplete = (mint) => {
@@ -1939,7 +1943,9 @@ var Transaction = class {
     const tx = (0, import_core_cst2.deserializeTx)(cborTx);
     const txAuxData = tx.auxiliaryData() ?? new import_core_cst2.Serialization.AuxiliaryData();
     txAuxData.setMetadata(
-      import_core_cst2.Serialization.GeneralTransactionMetadata.fromCbor(import_core_cst2.CardanoSDKUtil.HexBlob(cborTxMetadata))
+      import_core_cst2.Serialization.GeneralTransactionMetadata.fromCbor(
+        import_core_cst2.CardanoSDKUtil.HexBlob(cborTxMetadata)
+      )
     );
     if (import_core_cst2.Cardano.computeAuxiliaryDataHash(txAuxData.toCore())?.toString() !== tx.body().auxiliaryDataHash()?.toString()) {
       throw new Error(
@@ -1957,7 +1963,9 @@ var Transaction = class {
     const txMetadata = tx.auxiliaryData()?.metadata();
     if (txMetadata !== void 0) {
       const mockMetadata = /* @__PURE__ */ new Map();
-      txMetadata.metadata()?.forEach((metadatum, label) => mockMetadata.set(label, mask(metadatum)));
+      txMetadata.metadata()?.forEach(
+        (metadatum, label) => mockMetadata.set(label, mask(metadatum))
+      );
       const txAuxData = tx.auxiliaryData();
       txMetadata.setMetadata(mockMetadata);
       txAuxData?.setMetadata(txMetadata);
@@ -1973,7 +1981,9 @@ var Transaction = class {
     const tx = (0, import_core_cst2.deserializeTx)(cborTx);
     const txAuxData = tx.auxiliaryData() ?? new import_core_cst2.Serialization.AuxiliaryData();
     txAuxData.setMetadata(
-      import_core_cst2.Serialization.GeneralTransactionMetadata.fromCbor(import_core_cst2.CardanoSDKUtil.HexBlob(cborTxMetadata))
+      import_core_cst2.Serialization.GeneralTransactionMetadata.fromCbor(
+        import_core_cst2.CardanoSDKUtil.HexBlob(cborTxMetadata)
+      )
     );
     return new import_core_cst2.Transaction(tx.body(), tx.witnessSet(), txAuxData).toCbor().toString();
   }
@@ -2076,7 +2086,8 @@ var Transaction = class {
         input.input.txHash,
         input.input.outputIndex,
         input.output.amount,
-        input.output.address
+        input.output.address,
+        input.output.scriptRef ? input.output.scriptRef.length / 2 : 0
       );
     });
     return this;
@@ -2465,7 +2476,9 @@ var Transaction = class {
 function mask(metadatum) {
   switch (metadatum.getKind()) {
     case import_core_cst2.Serialization.TransactionMetadatumKind.Text:
-      return import_core_cst2.Serialization.TransactionMetadatum.newText("0".repeat(metadatum.asText()?.length ?? 0));
+      return import_core_cst2.Serialization.TransactionMetadatum.newText(
+        "0".repeat(metadatum.asText()?.length ?? 0)
+      );
     case import_core_cst2.Serialization.TransactionMetadatumKind.Bytes:
     case import_core_cst2.Serialization.TransactionMetadatumKind.Integer:
       return metadatum;

package/dist/index.d.cts

@@ -26,9 +26,10 @@ declare class MeshTxBuilderCore {
      * @param txIndex The transaction index of the input UTxO
      * @param amount The asset amount of index of the input UTxO
      * @param address The address of the input UTxO
+     * @param scriptSize The size of the ref script at this input (if there isn't one, explicitly put 0 as scriptSize for offline tx building)
      * @returns The MeshTxBuilder instance
      */
-    txIn: (txHash: string, txIndex: number, amount?: Asset[], address?: string) => this;
+    txIn: (txHash: string, txIndex: number, amount?: Asset[], address?: string, scriptSize?: number) => this;
     /**
      * Set the script for transaction input
      * @param {string} scriptCbor The CborHex of the script

package/dist/index.d.ts

@@ -26,9 +26,10 @@ declare class MeshTxBuilderCore {
      * @param txIndex The transaction index of the input UTxO
      * @param amount The asset amount of index of the input UTxO
      * @param address The address of the input UTxO
+     * @param scriptSize The size of the ref script at this input (if there isn't one, explicitly put 0 as scriptSize for offline tx building)
      * @returns The MeshTxBuilder instance
      */
-    txIn: (txHash: string, txIndex: number, amount?: Asset[], address?: string) => this;
+    txIn: (txHash: string, txIndex: number, amount?: Asset[], address?: string, scriptSize?: number) => this;
     /**
      * Set the script for transaction input
      * @param {string} scriptCbor The CborHex of the script

package/dist/index.js

@@ -38,9 +38,10 @@ var MeshTxBuilderCore = class {
    * @param txIndex The transaction index of the input UTxO
    * @param amount The asset amount of index of the input UTxO
    * @param address The address of the input UTxO
+   * @param scriptSize The size of the ref script at this input (if there isn't one, explicitly put 0 as scriptSize for offline tx building)
    * @returns The MeshTxBuilder instance
    */
-  txIn = (txHash, txIndex, amount, address) => {
+  txIn = (txHash, txIndex, amount, address, scriptSize) => {
     if (this.txInQueueItem) {
       this.queueInput();
     }
@@ -51,7 +52,8 @@ var MeshTxBuilderCore = class {
           txHash,
           txIndex,
           amount,
-          address
+          address,
+          scriptSize
         }
       };
     } else {
@@ -61,7 +63,8 @@ var MeshTxBuilderCore = class {
           txHash,
           txIndex,
           amount,
-          address
+          address,
+          scriptSize
         },
         scriptTxIn: {}
       };
@@ -1618,32 +1621,15 @@ var MeshTxBuilder = class extends MeshTxBuilderCore {
       this.queueAllLastItem();
     }
     this.removeDuplicateInputs();
+    for (let collateral of this.meshTxBuilderBody.collaterals) {
+      collateral.txIn.scriptSize = 0;
+    }
     const { inputs, collaterals, mints } = this.meshTxBuilderBody;
-    const incompleteTxIns = [...inputs, ...collaterals];
+    const incompleteTxIns = [...inputs, ...collaterals].filter(
+      (txIn) => !this.isInputComplete(txIn)
+    );
     const incompleteMints = mints.filter((mint) => !this.isMintComplete(mint));
     await this.queryAllTxInfo(incompleteTxIns, incompleteMints);
-    Object.values(this.queriedUTxOs).forEach((utxos) => {
-      for (let utxo of utxos) {
-        if (utxo.output.scriptRef !== void 0) {
-          this.utxosWithRefScripts.push(utxo);
-        }
-      }
-    });
-    const missingRefInput = this.utxosWithRefScripts.filter((utxo) => {
-      this.meshTxBuilderBody.referenceInputs.forEach((refInput) => {
-        if (refInput.txHash === utxo.input.txHash && refInput.txIndex === utxo.input.outputIndex) {
-          return false;
-        }
-      });
-      return true;
-    });
-    missingRefInput.forEach((utxo) => {
-      this.meshTxBuilderBody.referenceInputs.push({
-        txHash: utxo.input.txHash,
-        txIndex: utxo.input.outputIndex,
-        scriptSize: utxo.output.scriptRef.length / 2
-      });
-    });
     incompleteTxIns.forEach((txIn) => {
       this.completeTxInformation(txIn);
     });
@@ -1657,6 +1643,19 @@ var MeshTxBuilder = class extends MeshTxBuilderCore {
         this.completeSimpleScriptInfo(scriptSource);
       }
     });
+    this.meshTxBuilderBody.inputs.forEach((input) => {
+      if (input.txIn.scriptSize && input.txIn.scriptSize > 0) {
+        if (this.meshTxBuilderBody.referenceInputs.find((refTxIn) => {
+          refTxIn.txHash === input.txIn.txHash && refTxIn.txIndex === input.txIn.txIndex;
+        }) === void 0) {
+          this.meshTxBuilderBody.referenceInputs.push({
+            txHash: input.txIn.txHash,
+            txIndex: input.txIn.txIndex,
+            scriptSize: input.txIn.scriptSize
+          });
+        }
+      }
+    });
     this.addUtxosFromSelection();
     let txHex = this.serializer.serializeTxBody(
       this.meshTxBuilderBody,
@@ -1784,6 +1783,11 @@ var MeshTxBuilder = class extends MeshTxBuilderCore {
         );
       input.txIn.address = address;
     }
+    if (utxo?.output.scriptRef) {
+      input.txIn.scriptSize = utxo.output.scriptRef.length / 2;
+    } else {
+      input.txIn.scriptSize = 0;
+    }
   };
   completeScriptInfo = (scriptSource) => {
     if (scriptSource?.type != "Inline") return;
@@ -1819,8 +1823,8 @@ var MeshTxBuilder = class extends MeshTxBuilderCore {
     return true;
   };
   isInputInfoComplete = (txIn) => {
-    const { amount, address } = txIn.txIn;
-    if (!amount || !address) return false;
+    const { amount, address, scriptSize } = txIn.txIn;
+    if (!amount || !address || scriptSize === void 0) return false;
     return true;
   };
   isMintComplete = (mint) => {
@@ -1910,9 +1914,9 @@ import {
 import {
   Cardano,
   CardanoSDKUtil,
-  deserializeTx,
   deserializeNativeScript,
   deserializePlutusScript,
+  deserializeTx,
   fromScriptRef,
   Serialization,
   Transaction as Tx
@@ -1929,7 +1933,9 @@ var Transaction = class {
     const tx = deserializeTx(cborTx);
     const txAuxData = tx.auxiliaryData() ?? new Serialization.AuxiliaryData();
     txAuxData.setMetadata(
-      Serialization.GeneralTransactionMetadata.fromCbor(CardanoSDKUtil.HexBlob(cborTxMetadata))
+      Serialization.GeneralTransactionMetadata.fromCbor(
+        CardanoSDKUtil.HexBlob(cborTxMetadata)
+      )
     );
     if (Cardano.computeAuxiliaryDataHash(txAuxData.toCore())?.toString() !== tx.body().auxiliaryDataHash()?.toString()) {
       throw new Error(
@@ -1947,7 +1953,9 @@ var Transaction = class {
     const txMetadata = tx.auxiliaryData()?.metadata();
     if (txMetadata !== void 0) {
       const mockMetadata = /* @__PURE__ */ new Map();
-      txMetadata.metadata()?.forEach((metadatum, label) => mockMetadata.set(label, mask(metadatum)));
+      txMetadata.metadata()?.forEach(
+        (metadatum, label) => mockMetadata.set(label, mask(metadatum))
+      );
       const txAuxData = tx.auxiliaryData();
       txMetadata.setMetadata(mockMetadata);
       txAuxData?.setMetadata(txMetadata);
@@ -1963,7 +1971,9 @@ var Transaction = class {
     const tx = deserializeTx(cborTx);
     const txAuxData = tx.auxiliaryData() ?? new Serialization.AuxiliaryData();
     txAuxData.setMetadata(
-      Serialization.GeneralTransactionMetadata.fromCbor(CardanoSDKUtil.HexBlob(cborTxMetadata))
+      Serialization.GeneralTransactionMetadata.fromCbor(
+        CardanoSDKUtil.HexBlob(cborTxMetadata)
+      )
     );
     return new Tx(tx.body(), tx.witnessSet(), txAuxData).toCbor().toString();
   }
@@ -2066,7 +2076,8 @@ var Transaction = class {
         input.input.txHash,
         input.input.outputIndex,
         input.output.amount,
-        input.output.address
+        input.output.address,
+        input.output.scriptRef ? input.output.scriptRef.length / 2 : 0
       );
     });
     return this;
@@ -2455,7 +2466,9 @@ var Transaction = class {
 function mask(metadatum) {
   switch (metadatum.getKind()) {
     case Serialization.TransactionMetadatumKind.Text:
-      return Serialization.TransactionMetadatum.newText("0".repeat(metadatum.asText()?.length ?? 0));
+      return Serialization.TransactionMetadatum.newText(
+        "0".repeat(metadatum.asText()?.length ?? 0)
+      );
     case Serialization.TransactionMetadatumKind.Bytes:
     case Serialization.TransactionMetadatumKind.Integer:
       return metadatum;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshsdk/transaction",
-  "version": "1.7.13",
+  "version": "1.7.15",
   "description": "",
   "main": "./dist/index.cjs",
   "browser": "./dist/index.js",
@@ -35,9 +35,9 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@meshsdk/common": "1.7.13",
-    "@meshsdk/core-csl": "1.7.13",
-    "@meshsdk/core-cst": "1.7.13",
+    "@meshsdk/common": "1.7.15",
+    "@meshsdk/core-csl": "1.7.15",
+    "@meshsdk/core-cst": "1.7.15",
     "json-bigint": "^1.0.0"
   },
   "prettier": "@meshsdk/configs/prettier",