@meshsdk/core-cst 1.9.0-beta.17 → 1.9.0-beta.18

package/dist/index.cjs

@@ -3600,6 +3600,7 @@ __export(index_exports, {
   buildRewardAddress: () => buildRewardAddress,
   buildScriptPubkey: () => buildScriptPubkey,
   bytesToHex: () => bytesToHex,
+  calculateFees: () => calculateFees,
   checkSignature: () => checkSignature,
   clampScalar: () => clampScalar,
   computeAuxiliaryDataHash: () => computeAuxiliaryDataHash,
@@ -5170,6 +5171,54 @@ var addVKeyWitnessSetToTransaction = (txHex, vkeyWitnessSet) => {
   return tx.toCbor();
 };
 
+// src/utils/fee.ts
+var calculateFees = (minFeeA, minFeeB, minFeeRefScriptCostPerByte, priceMem, priceStep, tx, refScriptSize) => {
+  let fee = minFeeB + tx.toCbor().length / 2 * minFeeA;
+  fee += calculateRefScriptFees(refScriptSize, minFeeRefScriptCostPerByte);
+  let scriptFee = BigInt(0);
+  let priceMemNumerator = priceMem;
+  let priceMemDenominator = 1;
+  while (priceMemNumerator % 1) {
+    priceMemNumerator *= 10;
+    priceMemDenominator *= 10;
+  }
+  let priceStepNumerator = priceStep;
+  let priceStepDenominator = 1;
+  while (priceStepNumerator % 1) {
+    priceStepNumerator *= 10;
+    priceStepDenominator *= 10;
+  }
+  if (tx.witnessSet().redeemers()) {
+    for (const redeemer of tx.witnessSet().redeemers().values()) {
+      scriptFee += redeemer.exUnits().mem() * BigInt(priceMemNumerator.toString()) / BigInt(priceMemDenominator.toString());
+      scriptFee += redeemer.exUnits().steps() * BigInt(priceStepNumerator.toString()) / BigInt(priceStepDenominator.toString());
+      if (priceMemNumerator % priceMemDenominator !== 0) {
+        scriptFee += BigInt(1);
+      }
+      if (priceStepNumerator % priceStepDenominator !== 0) {
+        scriptFee += BigInt(1);
+      }
+    }
+  }
+  return BigInt(fee) + scriptFee;
+};
+var calculateRefScriptFees = (refScriptSize, minFeeRefScriptCostPerByte, tierMultiplier = 1.2) => {
+  let fee = 0;
+  const tierSize = 25600;
+  let currentRefScriptSize = refScriptSize;
+  let multiplier = 1;
+  while (currentRefScriptSize >= tierSize) {
+    fee += tierSize * multiplier * minFeeRefScriptCostPerByte;
+    currentRefScriptSize -= tierSize;
+    multiplier *= tierMultiplier;
+  }
+  if (currentRefScriptSize > 0) {
+    fee += currentRefScriptSize * multiplier * minFeeRefScriptCostPerByte;
+  }
+  fee = Math.ceil(fee);
+  return fee;
+};
+
 // src/resolvers/index.ts
 var resolveDataHash = (data) => {
   const plutusData = toPlutusData(data);
@@ -5401,7 +5450,7 @@ var toCardanoCert = (cert) => {
       return Certificate.newStakeDelegation(
         new import_core5.Serialization.StakeDelegation(
           rewardAddress.getPaymentCredential(),
-          Ed25519KeyHashHex2(cert.poolId)
+          cert.poolId.startsWith("pool1") ? import_core5.Cardano.PoolId.toKeyHash(import_core5.Cardano.PoolId(cert.poolId)) : Ed25519KeyHashHex2(cert.poolId)
         )
       );
     }
@@ -5423,7 +5472,7 @@ var toCardanoCert = (cert) => {
     case "RetirePool": {
       return Certificate.newPoolRetirement(
         new import_core5.Serialization.PoolRetirement(
-          Ed25519KeyHashHex2(cert.poolId),
+          cert.poolId.startsWith("pool1") ? import_core5.Cardano.PoolId.toKeyHash(import_core5.Cardano.PoolId(cert.poolId)) : Ed25519KeyHashHex2(cert.poolId),
           import_core5.Cardano.EpochNo(cert.epoch)
         )
       );
@@ -5676,54 +5725,6 @@ var toCardanoCert = (cert) => {
   }
 };
 
-// src/utils/fee.ts
-var calculateFees = (minFeeA, minFeeB, minFeeRefScriptCostPerByte, priceMem, priceStep, tx, refScriptSize) => {
-  let fee = minFeeB + tx.toCbor().length / 2 * minFeeA;
-  fee += calculateRefScriptFees(refScriptSize, minFeeRefScriptCostPerByte);
-  let scriptFee = BigInt(0);
-  let priceMemNumerator = priceMem;
-  let priceMemDenominator = 1;
-  while (priceMemNumerator % 1) {
-    priceMemNumerator *= 10;
-    priceMemDenominator *= 10;
-  }
-  let priceStepNumerator = priceStep;
-  let priceStepDenominator = 1;
-  while (priceStepNumerator % 1) {
-    priceStepNumerator *= 10;
-    priceStepDenominator *= 10;
-  }
-  if (tx.witnessSet().redeemers()) {
-    for (const redeemer of tx.witnessSet().redeemers().values()) {
-      scriptFee += redeemer.exUnits().mem() * BigInt(priceMemNumerator.toString()) / BigInt(priceMemDenominator.toString());
-      scriptFee += redeemer.exUnits().steps() * BigInt(priceStepNumerator.toString()) / BigInt(priceStepDenominator.toString());
-      if (priceMemNumerator % priceMemDenominator !== 0) {
-        scriptFee += BigInt(1);
-      }
-      if (priceStepNumerator % priceStepDenominator !== 0) {
-        scriptFee += BigInt(1);
-      }
-    }
-  }
-  return BigInt(fee) + scriptFee;
-};
-var calculateRefScriptFees = (refScriptSize, minFeeRefScriptCostPerByte, tierMultiplier = 1.2) => {
-  let fee = 0;
-  const tierSize = 25600;
-  let currentRefScriptSize = refScriptSize;
-  let multiplier = 1;
-  while (currentRefScriptSize >= tierSize) {
-    fee += tierSize * multiplier * minFeeRefScriptCostPerByte;
-    currentRefScriptSize -= tierSize;
-    multiplier *= tierMultiplier;
-  }
-  if (currentRefScriptSize > 0) {
-    fee += currentRefScriptSize * multiplier * minFeeRefScriptCostPerByte;
-  }
-  fee = Math.ceil(fee);
-  return fee;
-};
-
 // src/utils/metadata.ts
 var toCardanoMetadataMap = (metadata) => {
   let cardanoMetadataMap = /* @__PURE__ */ new Map();
@@ -6207,6 +6208,10 @@ var CardanoSDKSerializerCore = class {
       withdrawals,
       votes
     } = txBuilderBody;
+    const uniqueRefInputs = this.removeBodyInputRefInputOverlap(
+      inputs,
+      referenceInputs
+    );
     this.addAllInputs(inputs);
     this.sanitizeOutputs(outputs);
     this.addAllOutputs(outputs);
@@ -6215,7 +6220,7 @@ var CardanoSDKSerializerCore = class {
     this.addAllWithdrawals(withdrawals);
     this.addAllVotes(votes);
     this.addAllCollateralInputs(collaterals);
-    this.addAllReferenceInputs(referenceInputs);
+    this.addAllReferenceInputs(uniqueRefInputs);
     this.removeInputRefInputOverlap();
     this.setValidityInterval(validityRange);
     this.addAllRequiredSignatures(requiredSignatures);
@@ -6334,16 +6339,10 @@ var CardanoSDKSerializerCore = class {
         fromBuilderToPlutusData(currentTxIn.scriptTxIn.datumSource.data)
       );
     } else if (currentTxIn.scriptTxIn.datumSource.type === "Inline") {
-      let referenceInputs = this.txBody.referenceInputs() ?? import_core8.Serialization.CborSet.fromCore([], TransactionInput.fromCore);
-      let referenceInputsList = [...referenceInputs.values()];
-      referenceInputsList.push(
-        new TransactionInput(
-          TransactionId(currentTxIn.txIn.txHash),
-          BigInt(currentTxIn.txIn.txIndex)
-        )
-      );
-      referenceInputs.setValues(referenceInputsList);
-      this.txBody.setReferenceInputs(referenceInputs);
+      this.addReferenceInput({
+        txHash: currentTxIn.txIn.txHash,
+        txIndex: currentTxIn.txIn.txIndex
+      });
     }
     let exUnits = currentTxIn.scriptTxIn.redeemer.exUnits;
     let redeemers = this.txWitnessSet.redeemers() ?? Redeemers.fromCore([]);
@@ -6451,6 +6450,10 @@ var CardanoSDKSerializerCore = class {
   addReferenceInput = (refInput) => {
     let referenceInputs = this.txBody.referenceInputs() ?? import_core8.Serialization.CborSet.fromCore([], TransactionInput.fromCore);
     let referenceInputsList = [...referenceInputs.values()];
+    if (referenceInputsList.some(
+      (input) => input.transactionId().toString() === refInput.txHash && input.index().toString() === refInput.txIndex.toString()
+    ))
+      return;
     referenceInputsList.push(
       new TransactionInput(
         TransactionId(refInput.txHash),
@@ -6458,6 +6461,9 @@ var CardanoSDKSerializerCore = class {
       )
     );
     referenceInputs.setValues(referenceInputsList);
+    if (refInput.scriptSize) {
+      this.refScriptSize += refInput.scriptSize;
+    }
     this.txBody.setReferenceInputs(referenceInputs);
   };
   addAllMints = (mints) => {
@@ -6835,6 +6841,18 @@ var CardanoSDKSerializerCore = class {
       );
     }
   };
+  removeBodyInputRefInputOverlap = (inputs, refInputs) => {
+    let finalRefInputs = [];
+    for (let i = 0; i < refInputs.length; i++) {
+      let refInput = refInputs[i];
+      if (!inputs.some(
+        (input) => input.txIn.txHash === refInput.txHash && input.txIn.txIndex === refInput.txIndex
+      )) {
+        finalRefInputs.push(refInput);
+      }
+    }
+    return finalRefInputs;
+  };
   balanceTx = (changeAddress) => {
     if (changeAddress === "") {
       throw new Error("Can't balance tx without a change address");
@@ -7024,16 +7042,16 @@ var CardanoSDKSerializerCore = class {
     if (scriptSource.type !== "Inline") {
       return;
     }
-    let referenceInputs = this.txBody.referenceInputs() ?? import_core8.Serialization.CborSet.fromCore([], TransactionInput.fromCore);
-    let referenceInputsList = [...referenceInputs.values()];
-    referenceInputsList.push(
-      new TransactionInput(
-        TransactionId(scriptSource.txHash),
-        BigInt(scriptSource.txIndex)
-      )
-    );
-    referenceInputs.setValues(referenceInputsList);
-    this.txBody.setReferenceInputs(referenceInputs);
+    if (!scriptSource.scriptSize) {
+      throw new Error(
+        "A reference script was used without providing its size, this must be provided as fee calculations are based on it"
+      );
+    }
+    this.addReferenceInput({
+      txHash: scriptSource.txHash,
+      txIndex: scriptSource.txIndex,
+      scriptSize: Number(scriptSource.scriptSize)
+    });
     switch (scriptSource.version) {
       case "V1": {
         this.usedLanguages[PlutusLanguageVersion.V1] = true;
@@ -7048,35 +7066,21 @@ var CardanoSDKSerializerCore = class {
         break;
       }
     }
-    if (scriptSource.scriptSize) {
-      this.refScriptSize += Number(scriptSource.scriptSize);
-    } else {
-      throw new Error(
-        "A reference script was used without providing its size, this must be provided as fee calculations are based on it"
-      );
-    }
   };
   addSimpleScriptRef = (simpleScriptSource) => {
     if (simpleScriptSource.type !== "Inline") {
       return;
     }
-    let referenceInputs = this.txBody.referenceInputs() ?? import_core8.Serialization.CborSet.fromCore([], TransactionInput.fromCore);
-    let referenceInputsList = [...referenceInputs.values()];
-    referenceInputsList.push(
-      new TransactionInput(
-        TransactionId(simpleScriptSource.txHash),
-        BigInt(simpleScriptSource.txIndex)
-      )
-    );
-    if (simpleScriptSource.scriptSize) {
-      this.refScriptSize += Number(simpleScriptSource.scriptSize);
-    } else {
+    if (!simpleScriptSource.scriptSize) {
       throw new Error(
         "A reference script was used without providing its size, this must be provided as fee calculations are based on it"
       );
     }
-    referenceInputs.setValues(referenceInputsList);
-    this.txBody.setReferenceInputs(referenceInputs);
+    this.addReferenceInput({
+      txHash: simpleScriptSource.txHash,
+      txIndex: simpleScriptSource.txIndex,
+      scriptSize: Number(simpleScriptSource.scriptSize)
+    });
   };
   countNumberOfRequiredWitnesses() {
     let requiredWitnesses = /* @__PURE__ */ new Set();
@@ -7608,6 +7612,7 @@ var CardanoSDK = __toESM(require("@cardano-sdk/core"), 1);
   buildRewardAddress,
   buildScriptPubkey,
   bytesToHex,
+  calculateFees,
   checkSignature,
   clampScalar,
   computeAuxiliaryDataHash,

package/dist/index.d.cts

@@ -406,6 +406,8 @@ declare const hexToBech32: (prefix: string, hex: string) => string;
 
 declare const addVKeyWitnessSetToTransaction: (txHex: string, vkeyWitnessSet: string) => string;
 
+declare const calculateFees: (minFeeA: number, minFeeB: number, minFeeRefScriptCostPerByte: number, priceMem: number, priceStep: number, tx: Transaction, refScriptSize: number) => bigint;
+
 /**
  * MIT License
  *
@@ -451,4 +453,4 @@ declare const normalizePlutusScript: (plutusScript: string, encoding: OutputEnco
 declare const applyEncoding: (plutusScript: Uint8Array, outputEncoding: OutputEncoding) => Uint8Array;
 declare const applyParamsToScript: (rawScript: string, params: object[] | Data[], type?: PlutusDataType) => string;
 
-export { Address, AddressType, AssetFingerprint, AssetId, AssetName, type AuxiliaryData, AuxilliaryData, BaseAddress, Bip32PrivateKey, Bip32PrivateKeyHex, Bip32PublicKey, Bip32PublicKeyHex, CardanoSDKSerializer, CborSet, CborWriter, CertIndex, Certificate, CertificateType, ConstrPlutusData, CoseSign1, CostModel, type CostModels, Costmdls, Credential, type CredentialCore, CredentialType, DRep, DRepID, Datum, DatumHash, DatumKind, Ed25519KeyHash, Ed25519KeyHashHex, Ed25519PrivateExtendedKeyHex, Ed25519PrivateKey, Ed25519PrivateNormalKeyHex, Ed25519PublicKey, Ed25519PublicKeyHex, Ed25519Signature, Ed25519SignatureHex, EnterpriseAddress, ExUnits, Hash, Hash28ByteBase16, Hash32ByteBase16, HexBlob, type Metadatum, MetadatumList, MetadatumMap, NativeScript, NetworkId, type OutputEncoding, PaymentAddress, PlutusData, PlutusDataKind, PlutusLanguageVersion, PlutusList, PlutusMap, PlutusV1Script, PlutusV2Script, PlutusV3Script, PointerAddress, PolicyId, PoolId, Redeemer, RedeemerPurpose, RedeemerTag, Redeemers, RequireAllOf, RequireAnyOf, RequireNOf, RequireSignature, RequireTimeAfter, RequireTimeBefore, RewardAccount, RewardAddress, Script, ScriptHash, ScriptPubkey, type Signatures, type Signer, Slot, StakeCredentialStatus, StakeDelegation, type StakeDelegationCertificate, StakeRegistration, type TokenMap, Transaction, TransactionBody, TransactionId, TransactionInput, type TransactionInputSet, TransactionMetadatum, TransactionOutput, TransactionUnspentOutput, type TransactionWitnessPlutusData, TransactionWitnessSet, TxCBOR, TxIndex, Value, VkeyWitness, VrfVkBech32, type Witness, addVKeyWitnessSetToTransaction, addrBech32ToPlutusDataHex, addrBech32ToPlutusDataObj, addressToBech32, applyEncoding, applyParamsToScript, assetTypes, blake2b, buildBaseAddress, buildBip32PrivateKey, buildDRepID, buildEd25519PrivateKeyFromSecretKey, buildEnterpriseAddress, buildKeys, buildRewardAddress, buildScriptPubkey, bytesToHex, checkSignature, clampScalar, computeAuxiliaryDataHash, deserializeAddress, deserializeBech32Address, deserializeDataHash, deserializeEd25519KeyHash, deserializeNativeScript, deserializePlutusData, deserializePlutusScript, deserializeScriptHash, deserializeScriptRef, deserializeTx, deserializeTxHash, deserializeTxUnspentOutput, deserializeValue, empty, fromBuilderToPlutusData, fromJsonToPlutusData, fromNativeScript, fromPlutusDataToJson, fromScriptRef, fromTxUnspentOutput, fromValue, generateNonce, getCoseKeyFromPublicKey, getDRepIds, getPublicKeyFromCoseKey, hexToBech32, hexToBytes, keyHashToRewardAddress, mergeValue, negateValue, negatives, normalizePlutusScript, parseDatumCbor, parseInlineDatum, resolveDataHash, resolveEd25519KeyHash, resolveNativeScriptAddress, resolveNativeScriptHash, resolvePaymentKeyHash, resolvePlutusScriptAddress, resolvePlutusScriptHash, resolvePoolId, resolvePrivateKey, resolveRewardAddress, resolveScriptHashDRepId, resolveScriptRef, resolveStakeKeyHash, resolveTxHash, scriptHashToBech32, scriptHashToRewardAddress, serializeAddressObj, serializePlutusAddressToBech32, serialzeAddress, signData, subValue, toAddress, toBaseAddress, toCardanoAddress, toDRep, toEnterpriseAddress, toNativeScript, toPlutusData, toRewardAddress, toScriptRef, toTxUnspentOutput, toValue, utf8ToBytes, utf8ToHex, v2ScriptToBech32 };
+export { Address, AddressType, AssetFingerprint, AssetId, AssetName, type AuxiliaryData, AuxilliaryData, BaseAddress, Bip32PrivateKey, Bip32PrivateKeyHex, Bip32PublicKey, Bip32PublicKeyHex, CardanoSDKSerializer, CborSet, CborWriter, CertIndex, Certificate, CertificateType, ConstrPlutusData, CoseSign1, CostModel, type CostModels, Costmdls, Credential, type CredentialCore, CredentialType, DRep, DRepID, Datum, DatumHash, DatumKind, Ed25519KeyHash, Ed25519KeyHashHex, Ed25519PrivateExtendedKeyHex, Ed25519PrivateKey, Ed25519PrivateNormalKeyHex, Ed25519PublicKey, Ed25519PublicKeyHex, Ed25519Signature, Ed25519SignatureHex, EnterpriseAddress, ExUnits, Hash, Hash28ByteBase16, Hash32ByteBase16, HexBlob, type Metadatum, MetadatumList, MetadatumMap, NativeScript, NetworkId, type OutputEncoding, PaymentAddress, PlutusData, PlutusDataKind, PlutusLanguageVersion, PlutusList, PlutusMap, PlutusV1Script, PlutusV2Script, PlutusV3Script, PointerAddress, PolicyId, PoolId, Redeemer, RedeemerPurpose, RedeemerTag, Redeemers, RequireAllOf, RequireAnyOf, RequireNOf, RequireSignature, RequireTimeAfter, RequireTimeBefore, RewardAccount, RewardAddress, Script, ScriptHash, ScriptPubkey, type Signatures, type Signer, Slot, StakeCredentialStatus, StakeDelegation, type StakeDelegationCertificate, StakeRegistration, type TokenMap, Transaction, TransactionBody, TransactionId, TransactionInput, type TransactionInputSet, TransactionMetadatum, TransactionOutput, TransactionUnspentOutput, type TransactionWitnessPlutusData, TransactionWitnessSet, TxCBOR, TxIndex, Value, VkeyWitness, VrfVkBech32, type Witness, addVKeyWitnessSetToTransaction, addrBech32ToPlutusDataHex, addrBech32ToPlutusDataObj, addressToBech32, applyEncoding, applyParamsToScript, assetTypes, blake2b, buildBaseAddress, buildBip32PrivateKey, buildDRepID, buildEd25519PrivateKeyFromSecretKey, buildEnterpriseAddress, buildKeys, buildRewardAddress, buildScriptPubkey, bytesToHex, calculateFees, checkSignature, clampScalar, computeAuxiliaryDataHash, deserializeAddress, deserializeBech32Address, deserializeDataHash, deserializeEd25519KeyHash, deserializeNativeScript, deserializePlutusData, deserializePlutusScript, deserializeScriptHash, deserializeScriptRef, deserializeTx, deserializeTxHash, deserializeTxUnspentOutput, deserializeValue, empty, fromBuilderToPlutusData, fromJsonToPlutusData, fromNativeScript, fromPlutusDataToJson, fromScriptRef, fromTxUnspentOutput, fromValue, generateNonce, getCoseKeyFromPublicKey, getDRepIds, getPublicKeyFromCoseKey, hexToBech32, hexToBytes, keyHashToRewardAddress, mergeValue, negateValue, negatives, normalizePlutusScript, parseDatumCbor, parseInlineDatum, resolveDataHash, resolveEd25519KeyHash, resolveNativeScriptAddress, resolveNativeScriptHash, resolvePaymentKeyHash, resolvePlutusScriptAddress, resolvePlutusScriptHash, resolvePoolId, resolvePrivateKey, resolveRewardAddress, resolveScriptHashDRepId, resolveScriptRef, resolveStakeKeyHash, resolveTxHash, scriptHashToBech32, scriptHashToRewardAddress, serializeAddressObj, serializePlutusAddressToBech32, serialzeAddress, signData, subValue, toAddress, toBaseAddress, toCardanoAddress, toDRep, toEnterpriseAddress, toNativeScript, toPlutusData, toRewardAddress, toScriptRef, toTxUnspentOutput, toValue, utf8ToBytes, utf8ToHex, v2ScriptToBech32 };

package/dist/index.d.ts

@@ -406,6 +406,8 @@ declare const hexToBech32: (prefix: string, hex: string) => string;
 
 declare const addVKeyWitnessSetToTransaction: (txHex: string, vkeyWitnessSet: string) => string;
 
+declare const calculateFees: (minFeeA: number, minFeeB: number, minFeeRefScriptCostPerByte: number, priceMem: number, priceStep: number, tx: Transaction, refScriptSize: number) => bigint;
+
 /**
  * MIT License
  *
@@ -451,4 +453,4 @@ declare const normalizePlutusScript: (plutusScript: string, encoding: OutputEnco
 declare const applyEncoding: (plutusScript: Uint8Array, outputEncoding: OutputEncoding) => Uint8Array;
 declare const applyParamsToScript: (rawScript: string, params: object[] | Data[], type?: PlutusDataType) => string;
 
-export { Address, AddressType, AssetFingerprint, AssetId, AssetName, type AuxiliaryData, AuxilliaryData, BaseAddress, Bip32PrivateKey, Bip32PrivateKeyHex, Bip32PublicKey, Bip32PublicKeyHex, CardanoSDKSerializer, CborSet, CborWriter, CertIndex, Certificate, CertificateType, ConstrPlutusData, CoseSign1, CostModel, type CostModels, Costmdls, Credential, type CredentialCore, CredentialType, DRep, DRepID, Datum, DatumHash, DatumKind, Ed25519KeyHash, Ed25519KeyHashHex, Ed25519PrivateExtendedKeyHex, Ed25519PrivateKey, Ed25519PrivateNormalKeyHex, Ed25519PublicKey, Ed25519PublicKeyHex, Ed25519Signature, Ed25519SignatureHex, EnterpriseAddress, ExUnits, Hash, Hash28ByteBase16, Hash32ByteBase16, HexBlob, type Metadatum, MetadatumList, MetadatumMap, NativeScript, NetworkId, type OutputEncoding, PaymentAddress, PlutusData, PlutusDataKind, PlutusLanguageVersion, PlutusList, PlutusMap, PlutusV1Script, PlutusV2Script, PlutusV3Script, PointerAddress, PolicyId, PoolId, Redeemer, RedeemerPurpose, RedeemerTag, Redeemers, RequireAllOf, RequireAnyOf, RequireNOf, RequireSignature, RequireTimeAfter, RequireTimeBefore, RewardAccount, RewardAddress, Script, ScriptHash, ScriptPubkey, type Signatures, type Signer, Slot, StakeCredentialStatus, StakeDelegation, type StakeDelegationCertificate, StakeRegistration, type TokenMap, Transaction, TransactionBody, TransactionId, TransactionInput, type TransactionInputSet, TransactionMetadatum, TransactionOutput, TransactionUnspentOutput, type TransactionWitnessPlutusData, TransactionWitnessSet, TxCBOR, TxIndex, Value, VkeyWitness, VrfVkBech32, type Witness, addVKeyWitnessSetToTransaction, addrBech32ToPlutusDataHex, addrBech32ToPlutusDataObj, addressToBech32, applyEncoding, applyParamsToScript, assetTypes, blake2b, buildBaseAddress, buildBip32PrivateKey, buildDRepID, buildEd25519PrivateKeyFromSecretKey, buildEnterpriseAddress, buildKeys, buildRewardAddress, buildScriptPubkey, bytesToHex, checkSignature, clampScalar, computeAuxiliaryDataHash, deserializeAddress, deserializeBech32Address, deserializeDataHash, deserializeEd25519KeyHash, deserializeNativeScript, deserializePlutusData, deserializePlutusScript, deserializeScriptHash, deserializeScriptRef, deserializeTx, deserializeTxHash, deserializeTxUnspentOutput, deserializeValue, empty, fromBuilderToPlutusData, fromJsonToPlutusData, fromNativeScript, fromPlutusDataToJson, fromScriptRef, fromTxUnspentOutput, fromValue, generateNonce, getCoseKeyFromPublicKey, getDRepIds, getPublicKeyFromCoseKey, hexToBech32, hexToBytes, keyHashToRewardAddress, mergeValue, negateValue, negatives, normalizePlutusScript, parseDatumCbor, parseInlineDatum, resolveDataHash, resolveEd25519KeyHash, resolveNativeScriptAddress, resolveNativeScriptHash, resolvePaymentKeyHash, resolvePlutusScriptAddress, resolvePlutusScriptHash, resolvePoolId, resolvePrivateKey, resolveRewardAddress, resolveScriptHashDRepId, resolveScriptRef, resolveStakeKeyHash, resolveTxHash, scriptHashToBech32, scriptHashToRewardAddress, serializeAddressObj, serializePlutusAddressToBech32, serialzeAddress, signData, subValue, toAddress, toBaseAddress, toCardanoAddress, toDRep, toEnterpriseAddress, toNativeScript, toPlutusData, toRewardAddress, toScriptRef, toTxUnspentOutput, toValue, utf8ToBytes, utf8ToHex, v2ScriptToBech32 };
+export { Address, AddressType, AssetFingerprint, AssetId, AssetName, type AuxiliaryData, AuxilliaryData, BaseAddress, Bip32PrivateKey, Bip32PrivateKeyHex, Bip32PublicKey, Bip32PublicKeyHex, CardanoSDKSerializer, CborSet, CborWriter, CertIndex, Certificate, CertificateType, ConstrPlutusData, CoseSign1, CostModel, type CostModels, Costmdls, Credential, type CredentialCore, CredentialType, DRep, DRepID, Datum, DatumHash, DatumKind, Ed25519KeyHash, Ed25519KeyHashHex, Ed25519PrivateExtendedKeyHex, Ed25519PrivateKey, Ed25519PrivateNormalKeyHex, Ed25519PublicKey, Ed25519PublicKeyHex, Ed25519Signature, Ed25519SignatureHex, EnterpriseAddress, ExUnits, Hash, Hash28ByteBase16, Hash32ByteBase16, HexBlob, type Metadatum, MetadatumList, MetadatumMap, NativeScript, NetworkId, type OutputEncoding, PaymentAddress, PlutusData, PlutusDataKind, PlutusLanguageVersion, PlutusList, PlutusMap, PlutusV1Script, PlutusV2Script, PlutusV3Script, PointerAddress, PolicyId, PoolId, Redeemer, RedeemerPurpose, RedeemerTag, Redeemers, RequireAllOf, RequireAnyOf, RequireNOf, RequireSignature, RequireTimeAfter, RequireTimeBefore, RewardAccount, RewardAddress, Script, ScriptHash, ScriptPubkey, type Signatures, type Signer, Slot, StakeCredentialStatus, StakeDelegation, type StakeDelegationCertificate, StakeRegistration, type TokenMap, Transaction, TransactionBody, TransactionId, TransactionInput, type TransactionInputSet, TransactionMetadatum, TransactionOutput, TransactionUnspentOutput, type TransactionWitnessPlutusData, TransactionWitnessSet, TxCBOR, TxIndex, Value, VkeyWitness, VrfVkBech32, type Witness, addVKeyWitnessSetToTransaction, addrBech32ToPlutusDataHex, addrBech32ToPlutusDataObj, addressToBech32, applyEncoding, applyParamsToScript, assetTypes, blake2b, buildBaseAddress, buildBip32PrivateKey, buildDRepID, buildEd25519PrivateKeyFromSecretKey, buildEnterpriseAddress, buildKeys, buildRewardAddress, buildScriptPubkey, bytesToHex, calculateFees, checkSignature, clampScalar, computeAuxiliaryDataHash, deserializeAddress, deserializeBech32Address, deserializeDataHash, deserializeEd25519KeyHash, deserializeNativeScript, deserializePlutusData, deserializePlutusScript, deserializeScriptHash, deserializeScriptRef, deserializeTx, deserializeTxHash, deserializeTxUnspentOutput, deserializeValue, empty, fromBuilderToPlutusData, fromJsonToPlutusData, fromNativeScript, fromPlutusDataToJson, fromScriptRef, fromTxUnspentOutput, fromValue, generateNonce, getCoseKeyFromPublicKey, getDRepIds, getPublicKeyFromCoseKey, hexToBech32, hexToBytes, keyHashToRewardAddress, mergeValue, negateValue, negatives, normalizePlutusScript, parseDatumCbor, parseInlineDatum, resolveDataHash, resolveEd25519KeyHash, resolveNativeScriptAddress, resolveNativeScriptHash, resolvePaymentKeyHash, resolvePlutusScriptAddress, resolvePlutusScriptHash, resolvePoolId, resolvePrivateKey, resolveRewardAddress, resolveScriptHashDRepId, resolveScriptRef, resolveStakeKeyHash, resolveTxHash, scriptHashToBech32, scriptHashToRewardAddress, serializeAddressObj, serializePlutusAddressToBech32, serialzeAddress, signData, subValue, toAddress, toBaseAddress, toCardanoAddress, toDRep, toEnterpriseAddress, toNativeScript, toPlutusData, toRewardAddress, toScriptRef, toTxUnspentOutput, toValue, utf8ToBytes, utf8ToHex, v2ScriptToBech32 };

package/dist/index.js

@@ -5007,6 +5007,54 @@ var addVKeyWitnessSetToTransaction = (txHex, vkeyWitnessSet) => {
   return tx.toCbor();
 };
 
+// src/utils/fee.ts
+var calculateFees = (minFeeA, minFeeB, minFeeRefScriptCostPerByte, priceMem, priceStep, tx, refScriptSize) => {
+  let fee = minFeeB + tx.toCbor().length / 2 * minFeeA;
+  fee += calculateRefScriptFees(refScriptSize, minFeeRefScriptCostPerByte);
+  let scriptFee = BigInt(0);
+  let priceMemNumerator = priceMem;
+  let priceMemDenominator = 1;
+  while (priceMemNumerator % 1) {
+    priceMemNumerator *= 10;
+    priceMemDenominator *= 10;
+  }
+  let priceStepNumerator = priceStep;
+  let priceStepDenominator = 1;
+  while (priceStepNumerator % 1) {
+    priceStepNumerator *= 10;
+    priceStepDenominator *= 10;
+  }
+  if (tx.witnessSet().redeemers()) {
+    for (const redeemer of tx.witnessSet().redeemers().values()) {
+      scriptFee += redeemer.exUnits().mem() * BigInt(priceMemNumerator.toString()) / BigInt(priceMemDenominator.toString());
+      scriptFee += redeemer.exUnits().steps() * BigInt(priceStepNumerator.toString()) / BigInt(priceStepDenominator.toString());
+      if (priceMemNumerator % priceMemDenominator !== 0) {
+        scriptFee += BigInt(1);
+      }
+      if (priceStepNumerator % priceStepDenominator !== 0) {
+        scriptFee += BigInt(1);
+      }
+    }
+  }
+  return BigInt(fee) + scriptFee;
+};
+var calculateRefScriptFees = (refScriptSize, minFeeRefScriptCostPerByte, tierMultiplier = 1.2) => {
+  let fee = 0;
+  const tierSize = 25600;
+  let currentRefScriptSize = refScriptSize;
+  let multiplier = 1;
+  while (currentRefScriptSize >= tierSize) {
+    fee += tierSize * multiplier * minFeeRefScriptCostPerByte;
+    currentRefScriptSize -= tierSize;
+    multiplier *= tierMultiplier;
+  }
+  if (currentRefScriptSize > 0) {
+    fee += currentRefScriptSize * multiplier * minFeeRefScriptCostPerByte;
+  }
+  fee = Math.ceil(fee);
+  return fee;
+};
+
 // src/resolvers/index.ts
 var resolveDataHash = (data) => {
   const plutusData = toPlutusData(data);
@@ -5253,7 +5301,7 @@ var toCardanoCert = (cert) => {
       return Certificate.newStakeDelegation(
         new Serialization4.StakeDelegation(
           rewardAddress.getPaymentCredential(),
-          Ed25519KeyHashHex2(cert.poolId)
+          cert.poolId.startsWith("pool1") ? Cardano3.PoolId.toKeyHash(Cardano3.PoolId(cert.poolId)) : Ed25519KeyHashHex2(cert.poolId)
         )
       );
     }
@@ -5275,7 +5323,7 @@ var toCardanoCert = (cert) => {
     case "RetirePool": {
       return Certificate.newPoolRetirement(
         new Serialization4.PoolRetirement(
-          Ed25519KeyHashHex2(cert.poolId),
+          cert.poolId.startsWith("pool1") ? Cardano3.PoolId.toKeyHash(Cardano3.PoolId(cert.poolId)) : Ed25519KeyHashHex2(cert.poolId),
           Cardano3.EpochNo(cert.epoch)
         )
       );
@@ -5528,54 +5576,6 @@ var toCardanoCert = (cert) => {
   }
 };
 
-// src/utils/fee.ts
-var calculateFees = (minFeeA, minFeeB, minFeeRefScriptCostPerByte, priceMem, priceStep, tx, refScriptSize) => {
-  let fee = minFeeB + tx.toCbor().length / 2 * minFeeA;
-  fee += calculateRefScriptFees(refScriptSize, minFeeRefScriptCostPerByte);
-  let scriptFee = BigInt(0);
-  let priceMemNumerator = priceMem;
-  let priceMemDenominator = 1;
-  while (priceMemNumerator % 1) {
-    priceMemNumerator *= 10;
-    priceMemDenominator *= 10;
-  }
-  let priceStepNumerator = priceStep;
-  let priceStepDenominator = 1;
-  while (priceStepNumerator % 1) {
-    priceStepNumerator *= 10;
-    priceStepDenominator *= 10;
-  }
-  if (tx.witnessSet().redeemers()) {
-    for (const redeemer of tx.witnessSet().redeemers().values()) {
-      scriptFee += redeemer.exUnits().mem() * BigInt(priceMemNumerator.toString()) / BigInt(priceMemDenominator.toString());
-      scriptFee += redeemer.exUnits().steps() * BigInt(priceStepNumerator.toString()) / BigInt(priceStepDenominator.toString());
-      if (priceMemNumerator % priceMemDenominator !== 0) {
-        scriptFee += BigInt(1);
-      }
-      if (priceStepNumerator % priceStepDenominator !== 0) {
-        scriptFee += BigInt(1);
-      }
-    }
-  }
-  return BigInt(fee) + scriptFee;
-};
-var calculateRefScriptFees = (refScriptSize, minFeeRefScriptCostPerByte, tierMultiplier = 1.2) => {
-  let fee = 0;
-  const tierSize = 25600;
-  let currentRefScriptSize = refScriptSize;
-  let multiplier = 1;
-  while (currentRefScriptSize >= tierSize) {
-    fee += tierSize * multiplier * minFeeRefScriptCostPerByte;
-    currentRefScriptSize -= tierSize;
-    multiplier *= tierMultiplier;
-  }
-  if (currentRefScriptSize > 0) {
-    fee += currentRefScriptSize * multiplier * minFeeRefScriptCostPerByte;
-  }
-  fee = Math.ceil(fee);
-  return fee;
-};
-
 // src/utils/metadata.ts
 var toCardanoMetadataMap = (metadata) => {
   let cardanoMetadataMap = /* @__PURE__ */ new Map();
@@ -6059,6 +6059,10 @@ var CardanoSDKSerializerCore = class {
       withdrawals,
       votes
     } = txBuilderBody;
+    const uniqueRefInputs = this.removeBodyInputRefInputOverlap(
+      inputs,
+      referenceInputs
+    );
     this.addAllInputs(inputs);
     this.sanitizeOutputs(outputs);
     this.addAllOutputs(outputs);
@@ -6067,7 +6071,7 @@ var CardanoSDKSerializerCore = class {
     this.addAllWithdrawals(withdrawals);
     this.addAllVotes(votes);
     this.addAllCollateralInputs(collaterals);
-    this.addAllReferenceInputs(referenceInputs);
+    this.addAllReferenceInputs(uniqueRefInputs);
     this.removeInputRefInputOverlap();
     this.setValidityInterval(validityRange);
     this.addAllRequiredSignatures(requiredSignatures);
@@ -6186,16 +6190,10 @@ var CardanoSDKSerializerCore = class {
         fromBuilderToPlutusData(currentTxIn.scriptTxIn.datumSource.data)
       );
     } else if (currentTxIn.scriptTxIn.datumSource.type === "Inline") {
-      let referenceInputs = this.txBody.referenceInputs() ?? Serialization7.CborSet.fromCore([], TransactionInput.fromCore);
-      let referenceInputsList = [...referenceInputs.values()];
-      referenceInputsList.push(
-        new TransactionInput(
-          TransactionId(currentTxIn.txIn.txHash),
-          BigInt(currentTxIn.txIn.txIndex)
-        )
-      );
-      referenceInputs.setValues(referenceInputsList);
-      this.txBody.setReferenceInputs(referenceInputs);
+      this.addReferenceInput({
+        txHash: currentTxIn.txIn.txHash,
+        txIndex: currentTxIn.txIn.txIndex
+      });
     }
     let exUnits = currentTxIn.scriptTxIn.redeemer.exUnits;
     let redeemers = this.txWitnessSet.redeemers() ?? Redeemers.fromCore([]);
@@ -6303,6 +6301,10 @@ var CardanoSDKSerializerCore = class {
   addReferenceInput = (refInput) => {
     let referenceInputs = this.txBody.referenceInputs() ?? Serialization7.CborSet.fromCore([], TransactionInput.fromCore);
     let referenceInputsList = [...referenceInputs.values()];
+    if (referenceInputsList.some(
+      (input) => input.transactionId().toString() === refInput.txHash && input.index().toString() === refInput.txIndex.toString()
+    ))
+      return;
     referenceInputsList.push(
       new TransactionInput(
         TransactionId(refInput.txHash),
@@ -6310,6 +6312,9 @@ var CardanoSDKSerializerCore = class {
       )
     );
     referenceInputs.setValues(referenceInputsList);
+    if (refInput.scriptSize) {
+      this.refScriptSize += refInput.scriptSize;
+    }
     this.txBody.setReferenceInputs(referenceInputs);
   };
   addAllMints = (mints) => {
@@ -6687,6 +6692,18 @@ var CardanoSDKSerializerCore = class {
       );
     }
   };
+  removeBodyInputRefInputOverlap = (inputs, refInputs) => {
+    let finalRefInputs = [];
+    for (let i = 0; i < refInputs.length; i++) {
+      let refInput = refInputs[i];
+      if (!inputs.some(
+        (input) => input.txIn.txHash === refInput.txHash && input.txIn.txIndex === refInput.txIndex
+      )) {
+        finalRefInputs.push(refInput);
+      }
+    }
+    return finalRefInputs;
+  };
   balanceTx = (changeAddress) => {
     if (changeAddress === "") {
       throw new Error("Can't balance tx without a change address");
@@ -6876,16 +6893,16 @@ var CardanoSDKSerializerCore = class {
     if (scriptSource.type !== "Inline") {
       return;
     }
-    let referenceInputs = this.txBody.referenceInputs() ?? Serialization7.CborSet.fromCore([], TransactionInput.fromCore);
-    let referenceInputsList = [...referenceInputs.values()];
-    referenceInputsList.push(
-      new TransactionInput(
-        TransactionId(scriptSource.txHash),
-        BigInt(scriptSource.txIndex)
-      )
-    );
-    referenceInputs.setValues(referenceInputsList);
-    this.txBody.setReferenceInputs(referenceInputs);
+    if (!scriptSource.scriptSize) {
+      throw new Error(
+        "A reference script was used without providing its size, this must be provided as fee calculations are based on it"
+      );
+    }
+    this.addReferenceInput({
+      txHash: scriptSource.txHash,
+      txIndex: scriptSource.txIndex,
+      scriptSize: Number(scriptSource.scriptSize)
+    });
     switch (scriptSource.version) {
       case "V1": {
         this.usedLanguages[PlutusLanguageVersion.V1] = true;
@@ -6900,35 +6917,21 @@ var CardanoSDKSerializerCore = class {
         break;
       }
     }
-    if (scriptSource.scriptSize) {
-      this.refScriptSize += Number(scriptSource.scriptSize);
-    } else {
-      throw new Error(
-        "A reference script was used without providing its size, this must be provided as fee calculations are based on it"
-      );
-    }
   };
   addSimpleScriptRef = (simpleScriptSource) => {
     if (simpleScriptSource.type !== "Inline") {
       return;
     }
-    let referenceInputs = this.txBody.referenceInputs() ?? Serialization7.CborSet.fromCore([], TransactionInput.fromCore);
-    let referenceInputsList = [...referenceInputs.values()];
-    referenceInputsList.push(
-      new TransactionInput(
-        TransactionId(simpleScriptSource.txHash),
-        BigInt(simpleScriptSource.txIndex)
-      )
-    );
-    if (simpleScriptSource.scriptSize) {
-      this.refScriptSize += Number(simpleScriptSource.scriptSize);
-    } else {
+    if (!simpleScriptSource.scriptSize) {
       throw new Error(
         "A reference script was used without providing its size, this must be provided as fee calculations are based on it"
       );
     }
-    referenceInputs.setValues(referenceInputsList);
-    this.txBody.setReferenceInputs(referenceInputs);
+    this.addReferenceInput({
+      txHash: simpleScriptSource.txHash,
+      txIndex: simpleScriptSource.txIndex,
+      scriptSize: Number(simpleScriptSource.scriptSize)
+    });
   };
   countNumberOfRequiredWitnesses() {
     let requiredWitnesses = /* @__PURE__ */ new Set();
@@ -7465,6 +7468,7 @@ export {
   buildRewardAddress,
   buildScriptPubkey,
   bytesToHex,
+  calculateFees,
   checkSignature,
   clampScalar,
   computeAuxiliaryDataHash,

package/package.json

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