@meshsdk/core-cst 1.9.0-beta.7 → 1.9.0-beta.9

package/dist/index.cjs

@@ -3683,7 +3683,9 @@ var import_util = require("@cardano-sdk/util");
 var Slot = import_core.Cardano.Slot;
 var Value = import_core.Serialization.Value;
 var Transaction = import_core.Serialization.Transaction;
-var TransactionId = import_core.Cardano.TransactionId;
+var TransactionId = (value) => {
+  return import_core.Cardano.TransactionId(value);
+};
 var TransactionBody = import_core.Serialization.TransactionBody;
 var TransactionWitnessSet = import_core.Serialization.TransactionWitnessSet;
 var AuxilliaryData = import_core.Serialization.AuxiliaryData;
@@ -3719,7 +3721,9 @@ var Ed25519PrivateExtendedKeyHex = (value) => (0, import_util.typedHex)(value, 1
 var Ed25519KeyHash2 = Crypto.Ed25519KeyHash;
 var Ed25519KeyHashHex2 = Crypto.Ed25519KeyHashHex;
 var Hash28ByteBase162 = Crypto.Hash28ByteBase16;
-var Hash32ByteBase162 = Crypto.Hash32ByteBase16;
+var Hash32ByteBase162 = (value) => {
+  return Crypto.Hash32ByteBase16(value);
+};
 var CredentialType = import_core.Cardano.CredentialType;
 var Certificate = import_core.Serialization.Certificate;
 var PoolId = import_core.Cardano.PoolId;
@@ -3749,7 +3753,9 @@ var CborWriter = import_core.Serialization.CborWriter;
 var ConstrPlutusData = import_core.Serialization.ConstrPlutusData;
 var RewardAccount = import_core.Cardano.RewardAccount;
 var Hash = import_core.Serialization.Hash;
-var DatumHash = Crypto.Hash32ByteBase16;
+var DatumHash = (value) => {
+  return Crypto.Hash32ByteBase16(value);
+};
 var Datum = import_core.Serialization.Datum;
 var ExUnits = import_core.Serialization.ExUnits;
 var NetworkId = import_core.Cardano.NetworkId;
@@ -4415,7 +4421,7 @@ var parseInlineDatum = (utxo) => {
   const datumCbor = utxo.inline_datum || "";
   return datumCborToJson(datumCbor);
 };
-var deserializeDataHash = (dataHash) => DatumHash.fromHexBlob((0, import_util3.HexBlob)(dataHash));
+var deserializeDataHash = (dataHash) => DatumHash(dataHash);
 var deserializePlutusData = (plutusData) => PlutusData.fromCbor((0, import_util3.HexBlob)(plutusData));
 
 // src/utils/deserializer.ts
@@ -4442,7 +4448,7 @@ var deserializeScriptRef = (scriptRef) => Script.fromCbor((0, import_util4.HexBl
 var deserializeTxUnspentOutput = (txUnspentOutput) => TransactionUnspentOutput.fromCbor((0, import_util4.HexBlob)(txUnspentOutput));
 var deserializeValue = (value) => Value.fromCbor((0, import_util4.HexBlob)(value));
 var deserializeTx = (tx) => Transaction.fromCbor(import_core2.Serialization.TxCBOR(tx));
-var deserializeTxHash = (txHash) => TransactionId.fromHexBlob((0, import_util4.HexBlob)(txHash));
+var deserializeTxHash = (txHash) => TransactionId(txHash);
 
 // src/utils/converter.ts
 var toAddress = (bech325) => Address.fromBech32(bech325);
@@ -5784,6 +5790,7 @@ var CardanoSDKSerializer = class {
   verbose;
   protocolParams;
   constructor(protocolParams, verbose = false) {
+    (0, import_core7.setInConwayEra)(true);
     this.protocolParams = protocolParams || import_common8.DEFAULT_PROTOCOL_PARAMETERS;
     this.verbose = verbose;
   }
@@ -6285,9 +6292,7 @@ var CardanoSDKSerializerCore = class {
     if (output.datum?.type === "Hash") {
       cardanoOutput.setDatum(
         Datum.newDataHash(
-          DatumHash.fromHexBlob(
-            (0, import_util9.HexBlob)(fromBuilderToPlutusData(output.datum.data).hash())
-          )
+          DatumHash(fromBuilderToPlutusData(output.datum.data).hash())
         )
       );
     } else if (output.datum?.type === "Inline") {
@@ -6343,7 +6348,7 @@ var CardanoSDKSerializerCore = class {
     let referenceInputsList = [...referenceInputs.values()];
     referenceInputsList.push(
       new TransactionInput(
-        TransactionId.fromHexBlob((0, import_util9.HexBlob)(refInput.txHash)),
+        TransactionId(refInput.txHash),
         BigInt(refInput.txIndex)
       )
     );
@@ -6859,7 +6864,7 @@ var CardanoSDKSerializerCore = class {
       toCardanoAddress(changeAddress),
       remainingValue
     );
-    let minUtxoValue = (160 + dummyChangeOutput.toCbor().length / 2 + 1) * this.protocolParams.coinsPerUtxoSize;
+    currentOutputs.push(dummyChangeOutput);
     this.txBody.setFee(BigInt("10000000"));
     const numberOfRequiredWitnesses = this.countNumberOfRequiredWitnesses();
     const dummyTx = this.createDummyTx(numberOfRequiredWitnesses);
@@ -6872,18 +6877,21 @@ var CardanoSDKSerializerCore = class {
       dummyTx,
       this.refScriptSize
     );
-    if (remainingValue.coin() >= fee + BigInt(minUtxoValue)) {
-      dummyChangeOutput.amount().setCoin(dummyChangeOutput.amount().coin() - fee);
-      currentOutputs.push(dummyChangeOutput);
-      this.txBody.setOutputs(currentOutputs);
-      remainingValue = new Value(BigInt(0));
-    } else if (remainingValue.coin() >= fee) {
+    let minUtxoValue = (160 + dummyChangeOutput.toCbor().length / 2 + 1) * this.protocolParams.coinsPerUtxoSize;
+    if (remainingValue.coin() <= fee + BigInt(minUtxoValue)) {
       if (remainingValue.multiasset() && remainingValue.multiasset().size > 0) {
         throw new Error(
           "Insufficient funds to create change output with tokens"
         );
       } else {
         fee = remainingValue.coin();
+        currentOutputs.pop();
+      }
+    } else {
+      const changeOutput = currentOutputs.pop();
+      if (changeOutput) {
+        changeOutput.amount().setCoin(changeOutput.amount().coin() - fee);
+        currentOutputs.push(changeOutput);
       }
     }
     this.txBody.setFee(fee);

package/dist/index.d.cts

@@ -2,7 +2,7 @@ import { Cardano, Serialization } from '@cardano-sdk/core';
 import * as core from '@cardano-sdk/core';
 export { core as CardanoSDK };
 export { Cardano, Serialization } from '@cardano-sdk/core';
-import { HexBlob as HexBlob$1, OpaqueString } from '@cardano-sdk/util';
+import { OpaqueString, HexBlob as HexBlob$1 } from '@cardano-sdk/util';
 import * as util from '@cardano-sdk/util';
 export { util as CardanoSDKUtil };
 import * as Crypto from '@cardano-sdk/crypto';
@@ -18,10 +18,7 @@ type Value = Serialization.Value;
 type TokenMap = Cardano.TokenMap;
 declare const Transaction: typeof Serialization.Transaction;
 type Transaction = Serialization.Transaction;
-declare const TransactionId: {
-    (value: string): Cardano.TransactionId;
-    fromHexBlob(value: HexBlob$1): Cardano.TransactionId;
-};
+declare const TransactionId: (value: string) => Cardano.TransactionId;
 type TransactionId = Cardano.TransactionId;
 declare const TransactionBody: typeof Serialization.TransactionBody;
 type TransactionBody = Serialization.TransactionBody;
@@ -113,10 +110,7 @@ declare const Hash28ByteBase16: {
     fromEd25519KeyHashHex(value: Crypto.Ed25519KeyHashHex): Crypto.Hash28ByteBase16;
 };
 type Hash28ByteBase16 = Crypto.Hash28ByteBase16;
-declare const Hash32ByteBase16: {
-    (value: string): Crypto.Hash32ByteBase16;
-    fromHexBlob<T>(value: HexBlob$1): T;
-};
+declare const Hash32ByteBase16: (value: string) => Crypto.Hash32ByteBase16;
 type Hash32ByteBase16 = Crypto.Hash32ByteBase16;
 declare const CredentialType: typeof Cardano.CredentialType;
 type CredentialType = Cardano.CredentialType;
@@ -186,10 +180,7 @@ declare const RewardAccount: {
 type RewardAccount = Cardano.RewardAccount;
 declare const Hash: typeof Serialization.Hash;
 type Hash<T extends string> = Serialization.Hash<T>;
-declare const DatumHash: {
-    (value: string): Crypto.Hash32ByteBase16;
-    fromHexBlob<T>(value: HexBlob$1): T;
-};
+declare const DatumHash: (value: string) => Crypto.Hash32ByteBase16;
 type DatumHash = Crypto.Hash32ByteBase16;
 declare const Datum: typeof Serialization.Datum;
 type Datum = PlutusData | DatumHash;

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import { Cardano, Serialization } from '@cardano-sdk/core';
 import * as core from '@cardano-sdk/core';
 export { core as CardanoSDK };
 export { Cardano, Serialization } from '@cardano-sdk/core';
-import { HexBlob as HexBlob$1, OpaqueString } from '@cardano-sdk/util';
+import { OpaqueString, HexBlob as HexBlob$1 } from '@cardano-sdk/util';
 import * as util from '@cardano-sdk/util';
 export { util as CardanoSDKUtil };
 import * as Crypto from '@cardano-sdk/crypto';
@@ -18,10 +18,7 @@ type Value = Serialization.Value;
 type TokenMap = Cardano.TokenMap;
 declare const Transaction: typeof Serialization.Transaction;
 type Transaction = Serialization.Transaction;
-declare const TransactionId: {
-    (value: string): Cardano.TransactionId;
-    fromHexBlob(value: HexBlob$1): Cardano.TransactionId;
-};
+declare const TransactionId: (value: string) => Cardano.TransactionId;
 type TransactionId = Cardano.TransactionId;
 declare const TransactionBody: typeof Serialization.TransactionBody;
 type TransactionBody = Serialization.TransactionBody;
@@ -113,10 +110,7 @@ declare const Hash28ByteBase16: {
     fromEd25519KeyHashHex(value: Crypto.Ed25519KeyHashHex): Crypto.Hash28ByteBase16;
 };
 type Hash28ByteBase16 = Crypto.Hash28ByteBase16;
-declare const Hash32ByteBase16: {
-    (value: string): Crypto.Hash32ByteBase16;
-    fromHexBlob<T>(value: HexBlob$1): T;
-};
+declare const Hash32ByteBase16: (value: string) => Crypto.Hash32ByteBase16;
 type Hash32ByteBase16 = Crypto.Hash32ByteBase16;
 declare const CredentialType: typeof Cardano.CredentialType;
 type CredentialType = Cardano.CredentialType;
@@ -186,10 +180,7 @@ declare const RewardAccount: {
 type RewardAccount = Cardano.RewardAccount;
 declare const Hash: typeof Serialization.Hash;
 type Hash<T extends string> = Serialization.Hash<T>;
-declare const DatumHash: {
-    (value: string): Crypto.Hash32ByteBase16;
-    fromHexBlob<T>(value: HexBlob$1): T;
-};
+declare const DatumHash: (value: string) => Crypto.Hash32ByteBase16;
 type DatumHash = Crypto.Hash32ByteBase16;
 declare const Datum: typeof Serialization.Datum;
 type Datum = PlutusData | DatumHash;

package/dist/index.js

@@ -3494,7 +3494,9 @@ import { HexBlob as CardanoHexBlob, typedHex } from "@cardano-sdk/util";
 var Slot = Cardano.Slot;
 var Value = Serialization.Value;
 var Transaction = Serialization.Transaction;
-var TransactionId = Cardano.TransactionId;
+var TransactionId = (value) => {
+  return Cardano.TransactionId(value);
+};
 var TransactionBody = Serialization.TransactionBody;
 var TransactionWitnessSet = Serialization.TransactionWitnessSet;
 var AuxilliaryData = Serialization.AuxiliaryData;
@@ -3530,7 +3532,9 @@ var Ed25519PrivateExtendedKeyHex = (value) => typedHex(value, 128);
 var Ed25519KeyHash2 = Crypto.Ed25519KeyHash;
 var Ed25519KeyHashHex2 = Crypto.Ed25519KeyHashHex;
 var Hash28ByteBase162 = Crypto.Hash28ByteBase16;
-var Hash32ByteBase162 = Crypto.Hash32ByteBase16;
+var Hash32ByteBase162 = (value) => {
+  return Crypto.Hash32ByteBase16(value);
+};
 var CredentialType = Cardano.CredentialType;
 var Certificate = Serialization.Certificate;
 var PoolId = Cardano.PoolId;
@@ -3560,7 +3564,9 @@ var CborWriter = Serialization.CborWriter;
 var ConstrPlutusData = Serialization.ConstrPlutusData;
 var RewardAccount = Cardano.RewardAccount;
 var Hash = Serialization.Hash;
-var DatumHash = Crypto.Hash32ByteBase16;
+var DatumHash = (value) => {
+  return Crypto.Hash32ByteBase16(value);
+};
 var Datum = Serialization.Datum;
 var ExUnits = Serialization.ExUnits;
 var NetworkId = Cardano.NetworkId;
@@ -4249,7 +4255,7 @@ var parseInlineDatum = (utxo) => {
   const datumCbor = utxo.inline_datum || "";
   return datumCborToJson(datumCbor);
 };
-var deserializeDataHash = (dataHash) => DatumHash.fromHexBlob(HexBlob3(dataHash));
+var deserializeDataHash = (dataHash) => DatumHash(dataHash);
 var deserializePlutusData = (plutusData) => PlutusData.fromCbor(HexBlob3(plutusData));
 
 // src/utils/deserializer.ts
@@ -4276,7 +4282,7 @@ var deserializeScriptRef = (scriptRef) => Script.fromCbor(HexBlob4(scriptRef));
 var deserializeTxUnspentOutput = (txUnspentOutput) => TransactionUnspentOutput.fromCbor(HexBlob4(txUnspentOutput));
 var deserializeValue = (value) => Value.fromCbor(HexBlob4(value));
 var deserializeTx = (tx) => Transaction.fromCbor(Serialization2.TxCBOR(tx));
-var deserializeTxHash = (txHash) => TransactionId.fromHexBlob(HexBlob4(txHash));
+var deserializeTxHash = (txHash) => TransactionId(txHash);
 
 // src/utils/converter.ts
 var toAddress = (bech325) => Address.fromBech32(bech325);
@@ -5117,7 +5123,7 @@ var resolveEd25519KeyHash = (bech325) => {
 };
 
 // src/serializer/index.ts
-import { Serialization as Serialization6 } from "@cardano-sdk/core";
+import { Serialization as Serialization6, setInConwayEra } from "@cardano-sdk/core";
 import { HexBlob as HexBlob9 } from "@cardano-sdk/util";
 import {
   Cbor as Cbor2,
@@ -5636,6 +5642,7 @@ var CardanoSDKSerializer = class {
   verbose;
   protocolParams;
   constructor(protocolParams, verbose = false) {
+    setInConwayEra(true);
     this.protocolParams = protocolParams || DEFAULT_PROTOCOL_PARAMETERS;
     this.verbose = verbose;
   }
@@ -6137,9 +6144,7 @@ var CardanoSDKSerializerCore = class {
     if (output.datum?.type === "Hash") {
       cardanoOutput.setDatum(
         Datum.newDataHash(
-          DatumHash.fromHexBlob(
-            HexBlob9(fromBuilderToPlutusData(output.datum.data).hash())
-          )
+          DatumHash(fromBuilderToPlutusData(output.datum.data).hash())
         )
       );
     } else if (output.datum?.type === "Inline") {
@@ -6195,7 +6200,7 @@ var CardanoSDKSerializerCore = class {
     let referenceInputsList = [...referenceInputs.values()];
     referenceInputsList.push(
       new TransactionInput(
-        TransactionId.fromHexBlob(HexBlob9(refInput.txHash)),
+        TransactionId(refInput.txHash),
         BigInt(refInput.txIndex)
       )
     );
@@ -6711,7 +6716,7 @@ var CardanoSDKSerializerCore = class {
       toCardanoAddress(changeAddress),
       remainingValue
     );
-    let minUtxoValue = (160 + dummyChangeOutput.toCbor().length / 2 + 1) * this.protocolParams.coinsPerUtxoSize;
+    currentOutputs.push(dummyChangeOutput);
     this.txBody.setFee(BigInt("10000000"));
     const numberOfRequiredWitnesses = this.countNumberOfRequiredWitnesses();
     const dummyTx = this.createDummyTx(numberOfRequiredWitnesses);
@@ -6724,18 +6729,21 @@ var CardanoSDKSerializerCore = class {
       dummyTx,
       this.refScriptSize
     );
-    if (remainingValue.coin() >= fee + BigInt(minUtxoValue)) {
-      dummyChangeOutput.amount().setCoin(dummyChangeOutput.amount().coin() - fee);
-      currentOutputs.push(dummyChangeOutput);
-      this.txBody.setOutputs(currentOutputs);
-      remainingValue = new Value(BigInt(0));
-    } else if (remainingValue.coin() >= fee) {
+    let minUtxoValue = (160 + dummyChangeOutput.toCbor().length / 2 + 1) * this.protocolParams.coinsPerUtxoSize;
+    if (remainingValue.coin() <= fee + BigInt(minUtxoValue)) {
       if (remainingValue.multiasset() && remainingValue.multiasset().size > 0) {
         throw new Error(
           "Insufficient funds to create change output with tokens"
         );
       } else {
         fee = remainingValue.coin();
+        currentOutputs.pop();
+      }
+    } else {
+      const changeOutput = currentOutputs.pop();
+      if (changeOutput) {
+        changeOutput.amount().setCoin(changeOutput.amount().coin() - fee);
+        currentOutputs.push(changeOutput);
       }
     }
     this.txBody.setFee(fee);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshsdk/core-cst",
-  "version": "1.9.0-beta.7",
+  "version": "1.9.0-beta.9",
   "description": "Types and utilities functions between Mesh and cardano-js-sdk",
   "main": "./dist/index.cjs",
   "browser": "./dist/index.js",
@@ -45,7 +45,7 @@
     "@harmoniclabs/pair": "1.0.0",
     "@harmoniclabs/plutus-data": "1.2.4",
     "@harmoniclabs/uplc": "1.2.4",
-    "@meshsdk/common": "1.9.0-beta.7",
+    "@meshsdk/common": "1.9.0-beta.9",
     "@types/base32-encoding": "^1.0.2",
     "base32-encoding": "^1.0.0",
     "bech32": "^2.0.0",