@lucid-evolution/utils 0.1.56 → 0.1.59

package/dist/index.cjs

@@ -36,6 +36,7 @@ __export(src_exports, {
   addressFromHexOrBech32: () => addressFromHexOrBech32,
   applyDoubleCborEncoding: () => applyDoubleCborEncoding,
   applyParamsToScript: () => applyParamsToScript,
+  applySingleCborEncoding: () => applySingleCborEncoding,
   assetsToValue: () => assetsToValue,
   calculateMinLovelaceFromUTxO: () => calculateMinLovelaceFromUTxO,
   coreToOutRef: () => coreToOutRef,
@@ -207,6 +208,19 @@ var applyDoubleCborEncoding = (script) => {
     }
   }
 };
+var applySingleCborEncoding = (script) => {
+  try {
+    (0, import_cbor_x.decode)((0, import_cbor_x.decode)((0, import_core_utils.fromHex)(script)));
+    return (0, import_core_utils.toHex)((0, import_cbor_x.decode)((0, import_core_utils.fromHex)(script)));
+  } catch (error) {
+    try {
+      (0, import_cbor_x.decode)((0, import_core_utils.fromHex)(script));
+      return script;
+    } catch (error2) {
+      return (0, import_core_utils.toHex)(Uint8Array.from((0, import_cbor_x.encode)((0, import_core_utils.fromHex)(script).buffer)));
+    }
+  }
+};
 var CBOREncodingLevel = (script) => {
   try {
     (0, import_cbor_x.decode)((0, import_cbor_x.decode)((0, import_core_utils.fromHex)(script)));
@@ -293,15 +307,21 @@ function validatorToScriptHash(validator) {
       return CML.NativeScript.from_cbor_hex(validator.script).hash().to_hex();
     case "PlutusV1":
       return CML.PlutusScript.from_v1(
-        CML.PlutusV1Script.from_cbor_hex(validator.script)
+        CML.PlutusV1Script.from_cbor_hex(
+          applyDoubleCborEncoding(validator.script)
+        )
       ).hash().to_hex();
     case "PlutusV2":
       return CML.PlutusScript.from_v2(
-        CML.PlutusV2Script.from_cbor_hex(validator.script)
+        CML.PlutusV2Script.from_cbor_hex(
+          applyDoubleCborEncoding(validator.script)
+        )
       ).hash().to_hex();
     case "PlutusV3":
       return CML.PlutusScript.from_v3(
-        CML.PlutusV3Script.from_cbor_hex(validator.script)
+        CML.PlutusV3Script.from_cbor_hex(
+          applyDoubleCborEncoding(validator.script)
+        )
       ).hash().to_hex();
     default:
       throw new Error("No variant matched");
@@ -315,15 +335,21 @@ function toScriptRef(script) {
       );
     case "PlutusV1":
       return CML.Script.new_plutus_v1(
-        CML.PlutusV1Script.from_cbor_hex(script.script)
+        CML.PlutusV1Script.from_cbor_hex(
+          applyDoubleCborEncoding(script.script)
+        )
       );
     case "PlutusV2":
       return CML.Script.new_plutus_v2(
-        CML.PlutusV2Script.from_cbor_hex(script.script)
+        CML.PlutusV2Script.from_cbor_hex(
+          applyDoubleCborEncoding(script.script)
+        )
       );
     case "PlutusV3":
       return CML.Script.new_plutus_v3(
-        CML.PlutusV3Script.from_cbor_hex(script.script)
+        CML.PlutusV3Script.from_cbor_hex(
+          applyDoubleCborEncoding(script.script)
+        )
       );
     default:
       throw new Error("No variant matched.");
@@ -360,26 +386,21 @@ function mintingPolicyToId(mintingPolicy) {
   return validatorToScriptHash(mintingPolicy);
 }
 function applyParamsToScript(plutusScript, params, type) {
-  const encodingLevel = CBOREncodingLevel(plutusScript);
-  const program = encodingLevel === "double" ? (0, import_uplc.parseUPLC)((0, import_cbor_x2.decode)((0, import_cbor_x2.decode)((0, import_core_utils2.fromHex)(plutusScript))), "flat") : (0, import_uplc.parseUPLC)((0, import_cbor_x2.decode)((0, import_core_utils2.fromHex)(plutusScript)), "flat");
+  const program = (0, import_uplc.parseUPLC)(
+    (0, import_cbor_x2.decode)((0, import_cbor_x2.decode)((0, import_core_utils2.fromHex)(applyDoubleCborEncoding(plutusScript)))),
+    "flat"
+  );
   const parameters = type ? import_plutus.Data.castTo(params, type) : params;
-  const appliedProgram = parameters.reduce(
-    (body, currentParameter) => {
-      const data = import_uplc.UPLCConst.data((0, import_plutus_data.dataFromCbor)(import_plutus.Data.to(currentParameter)));
-      const appliedParameter = new import_uplc.Application(body, data);
-      return appliedParameter;
-    },
-    program.body
+  const appliedProgram = parameters.reduce((body, currentParameter) => {
+    const data = import_uplc.UPLCConst.data((0, import_plutus_data.dataFromCbor)(import_plutus.Data.to(currentParameter)));
+    const appliedParameter = new import_uplc.Application(body, data);
+    return appliedParameter;
+  }, program.body);
+  return applyDoubleCborEncoding(
+    (0, import_core_utils2.toHex)(
+      (0, import_uplc.encodeUPLC)(new import_uplc.UPLCProgram(program.version, appliedProgram)).toBuffer().buffer
+    )
   );
-  const compiledUPLC = (0, import_uplc.encodeUPLC)(
-    new import_uplc.UPLCProgram(program.version, appliedProgram)
-  ).toBuffer().buffer.buffer;
-  switch (encodingLevel) {
-    case "double":
-      return (0, import_core_utils2.toHex)((0, import_cbor_x2.encode)((0, import_cbor_x2.encode)(compiledUPLC)));
-    case "single":
-      return (0, import_core_utils2.toHex)((0, import_cbor_x2.encode)(compiledUPLC));
-  }
 }
 
 // src/address.ts
@@ -1669,6 +1690,7 @@ var fromCMLRedeemerTag = (tag) => {
   addressFromHexOrBech32,
   applyDoubleCborEncoding,
   applyParamsToScript,
+  applySingleCborEncoding,
   assetsToValue,
   calculateMinLovelaceFromUTxO,
   coreToOutRef,

package/dist/index.d.cts

@@ -66,6 +66,7 @@ declare function validatorToRewardAddress(network: Network, validator: Certifica
 declare function getAddressDetails(address: string): AddressDetails;
 
 declare const applyDoubleCborEncoding: (script: string) => string;
+declare const applySingleCborEncoding: (script: string) => string;
 declare const CBOREncodingLevel: (script: string) => "double" | "single";
 declare function datumJsonToCbor(json: DatumJson): Datum;
 
@@ -96,6 +97,8 @@ declare function fromScriptRef(scriptRef: CML.Script): Script;
 declare function mintingPolicyToId(mintingPolicy: MintingPolicy): PolicyId;
 /**
  * Applies a list of parameters, in the form of the `Data` type, to a CBOR encoded script.
+ *
+ * The `plutusScript` must be double CBOR encoded(bytes). Ensure to use the `applyDoubleCborEncoding` function.
  */
 declare function applyParamsToScript<T extends unknown[] = Data[]>(plutusScript: string, params: Exact<[...T]>, type?: T): string;
 
@@ -192,4 +195,4 @@ declare const stringify: (data: any) => string;
 declare const toCMLRedeemerTag: (tag: string) => CML.RedeemerTag;
 declare const fromCMLRedeemerTag: (tag: CML.RedeemerTag) => RedeemerTag;
 
-export { CBOREncodingLevel, type CMLNative, PROTOCOL_PARAMETERS_DEFAULT, type SortOrder, addAssets, addressFromHexOrBech32, applyDoubleCborEncoding, applyParamsToScript, assetsToValue, calculateMinLovelaceFromUTxO, coreToOutRef, coreToTxOutput, coreToUtxo, coresToOutRefs, coresToTxOutputs, coresToUtxos, createCostModels, credentialToAddress, credentialToRewardAddress, datumJsonToCbor, datumToHash, fromCMLRedeemerTag, fromLabel, fromScriptRef, fromUnit, generatePrivateKey, generateSeedPhrase, getAddressDetails, getInputIndices, getUniqueTokenName, isEqualUTxO, keyHashToCredential, mintingPolicyToId, networkToId, parseCMLNative, paymentCredentialOf, scriptFromCMLNative, scriptFromNative, scriptHashToCredential, selectUTxOs, slotToUnixTime, sortCanonical, sortUTxOs, stakeCredentialOf, stringify, toCMLNativeScript, toCMLRedeemerTag, toLabel, toPublicKey, toScriptRef, toUnit, unixTimeToSlot, utxoToCore, utxoToTransactionInput, utxoToTransactionOutput, utxosToCores, validatorToAddress, validatorToRewardAddress, validatorToScriptHash, valueToAssets };
+export { CBOREncodingLevel, type CMLNative, PROTOCOL_PARAMETERS_DEFAULT, type SortOrder, addAssets, addressFromHexOrBech32, applyDoubleCborEncoding, applyParamsToScript, applySingleCborEncoding, assetsToValue, calculateMinLovelaceFromUTxO, coreToOutRef, coreToTxOutput, coreToUtxo, coresToOutRefs, coresToTxOutputs, coresToUtxos, createCostModels, credentialToAddress, credentialToRewardAddress, datumJsonToCbor, datumToHash, fromCMLRedeemerTag, fromLabel, fromScriptRef, fromUnit, generatePrivateKey, generateSeedPhrase, getAddressDetails, getInputIndices, getUniqueTokenName, isEqualUTxO, keyHashToCredential, mintingPolicyToId, networkToId, parseCMLNative, paymentCredentialOf, scriptFromCMLNative, scriptFromNative, scriptHashToCredential, selectUTxOs, slotToUnixTime, sortCanonical, sortUTxOs, stakeCredentialOf, stringify, toCMLNativeScript, toCMLRedeemerTag, toLabel, toPublicKey, toScriptRef, toUnit, unixTimeToSlot, utxoToCore, utxoToTransactionInput, utxoToTransactionOutput, utxosToCores, validatorToAddress, validatorToRewardAddress, validatorToScriptHash, valueToAssets };

package/dist/index.d.ts

@@ -66,6 +66,7 @@ declare function validatorToRewardAddress(network: Network, validator: Certifica
 declare function getAddressDetails(address: string): AddressDetails;
 
 declare const applyDoubleCborEncoding: (script: string) => string;
+declare const applySingleCborEncoding: (script: string) => string;
 declare const CBOREncodingLevel: (script: string) => "double" | "single";
 declare function datumJsonToCbor(json: DatumJson): Datum;
 
@@ -96,6 +97,8 @@ declare function fromScriptRef(scriptRef: CML.Script): Script;
 declare function mintingPolicyToId(mintingPolicy: MintingPolicy): PolicyId;
 /**
  * Applies a list of parameters, in the form of the `Data` type, to a CBOR encoded script.
+ *
+ * The `plutusScript` must be double CBOR encoded(bytes). Ensure to use the `applyDoubleCborEncoding` function.
  */
 declare function applyParamsToScript<T extends unknown[] = Data[]>(plutusScript: string, params: Exact<[...T]>, type?: T): string;
 
@@ -192,4 +195,4 @@ declare const stringify: (data: any) => string;
 declare const toCMLRedeemerTag: (tag: string) => CML.RedeemerTag;
 declare const fromCMLRedeemerTag: (tag: CML.RedeemerTag) => RedeemerTag;
 
-export { CBOREncodingLevel, type CMLNative, PROTOCOL_PARAMETERS_DEFAULT, type SortOrder, addAssets, addressFromHexOrBech32, applyDoubleCborEncoding, applyParamsToScript, assetsToValue, calculateMinLovelaceFromUTxO, coreToOutRef, coreToTxOutput, coreToUtxo, coresToOutRefs, coresToTxOutputs, coresToUtxos, createCostModels, credentialToAddress, credentialToRewardAddress, datumJsonToCbor, datumToHash, fromCMLRedeemerTag, fromLabel, fromScriptRef, fromUnit, generatePrivateKey, generateSeedPhrase, getAddressDetails, getInputIndices, getUniqueTokenName, isEqualUTxO, keyHashToCredential, mintingPolicyToId, networkToId, parseCMLNative, paymentCredentialOf, scriptFromCMLNative, scriptFromNative, scriptHashToCredential, selectUTxOs, slotToUnixTime, sortCanonical, sortUTxOs, stakeCredentialOf, stringify, toCMLNativeScript, toCMLRedeemerTag, toLabel, toPublicKey, toScriptRef, toUnit, unixTimeToSlot, utxoToCore, utxoToTransactionInput, utxoToTransactionOutput, utxosToCores, validatorToAddress, validatorToRewardAddress, validatorToScriptHash, valueToAssets };
+export { CBOREncodingLevel, type CMLNative, PROTOCOL_PARAMETERS_DEFAULT, type SortOrder, addAssets, addressFromHexOrBech32, applyDoubleCborEncoding, applyParamsToScript, applySingleCborEncoding, assetsToValue, calculateMinLovelaceFromUTxO, coreToOutRef, coreToTxOutput, coreToUtxo, coresToOutRefs, coresToTxOutputs, coresToUtxos, createCostModels, credentialToAddress, credentialToRewardAddress, datumJsonToCbor, datumToHash, fromCMLRedeemerTag, fromLabel, fromScriptRef, fromUnit, generatePrivateKey, generateSeedPhrase, getAddressDetails, getInputIndices, getUniqueTokenName, isEqualUTxO, keyHashToCredential, mintingPolicyToId, networkToId, parseCMLNative, paymentCredentialOf, scriptFromCMLNative, scriptFromNative, scriptHashToCredential, selectUTxOs, slotToUnixTime, sortCanonical, sortUTxOs, stakeCredentialOf, stringify, toCMLNativeScript, toCMLRedeemerTag, toLabel, toPublicKey, toScriptRef, toUnit, unixTimeToSlot, utxoToCore, utxoToTransactionInput, utxoToTransactionOutput, utxosToCores, validatorToAddress, validatorToRewardAddress, validatorToScriptHash, valueToAssets };

package/dist/index.js

@@ -114,6 +114,19 @@ var applyDoubleCborEncoding = (script) => {
     }
   }
 };
+var applySingleCborEncoding = (script) => {
+  try {
+    decode(decode(fromHex(script)));
+    return toHex(decode(fromHex(script)));
+  } catch (error) {
+    try {
+      decode(fromHex(script));
+      return script;
+    } catch (error2) {
+      return toHex(Uint8Array.from(encode(fromHex(script).buffer)));
+    }
+  }
+};
 var CBOREncodingLevel = (script) => {
   try {
     decode(decode(fromHex(script)));
@@ -179,7 +192,7 @@ import {
   UPLCProgram
 } from "@harmoniclabs/uplc";
 import { fromHex as fromHex2, toHex as toHex2 } from "@lucid-evolution/core-utils";
-import { decode as decode2, encode as encode2 } from "cbor-x";
+import { decode as decode2 } from "cbor-x";
 import { dataFromCbor } from "@harmoniclabs/plutus-data";
 function validatorToAddress(network, validator, stakeCredential) {
   const validatorHash = validatorToScriptHash(validator);
@@ -206,15 +219,21 @@ function validatorToScriptHash(validator) {
       return CML.NativeScript.from_cbor_hex(validator.script).hash().to_hex();
     case "PlutusV1":
       return CML.PlutusScript.from_v1(
-        CML.PlutusV1Script.from_cbor_hex(validator.script)
+        CML.PlutusV1Script.from_cbor_hex(
+          applyDoubleCborEncoding(validator.script)
+        )
       ).hash().to_hex();
     case "PlutusV2":
       return CML.PlutusScript.from_v2(
-        CML.PlutusV2Script.from_cbor_hex(validator.script)
+        CML.PlutusV2Script.from_cbor_hex(
+          applyDoubleCborEncoding(validator.script)
+        )
       ).hash().to_hex();
     case "PlutusV3":
       return CML.PlutusScript.from_v3(
-        CML.PlutusV3Script.from_cbor_hex(validator.script)
+        CML.PlutusV3Script.from_cbor_hex(
+          applyDoubleCborEncoding(validator.script)
+        )
       ).hash().to_hex();
     default:
       throw new Error("No variant matched");
@@ -228,15 +247,21 @@ function toScriptRef(script) {
       );
     case "PlutusV1":
       return CML.Script.new_plutus_v1(
-        CML.PlutusV1Script.from_cbor_hex(script.script)
+        CML.PlutusV1Script.from_cbor_hex(
+          applyDoubleCborEncoding(script.script)
+        )
       );
     case "PlutusV2":
       return CML.Script.new_plutus_v2(
-        CML.PlutusV2Script.from_cbor_hex(script.script)
+        CML.PlutusV2Script.from_cbor_hex(
+          applyDoubleCborEncoding(script.script)
+        )
       );
     case "PlutusV3":
       return CML.Script.new_plutus_v3(
-        CML.PlutusV3Script.from_cbor_hex(script.script)
+        CML.PlutusV3Script.from_cbor_hex(
+          applyDoubleCborEncoding(script.script)
+        )
       );
     default:
       throw new Error("No variant matched.");
@@ -273,26 +298,21 @@ function mintingPolicyToId(mintingPolicy) {
   return validatorToScriptHash(mintingPolicy);
 }
 function applyParamsToScript(plutusScript, params, type) {
-  const encodingLevel = CBOREncodingLevel(plutusScript);
-  const program = encodingLevel === "double" ? parseUPLC(decode2(decode2(fromHex2(plutusScript))), "flat") : parseUPLC(decode2(fromHex2(plutusScript)), "flat");
+  const program = parseUPLC(
+    decode2(decode2(fromHex2(applyDoubleCborEncoding(plutusScript)))),
+    "flat"
+  );
   const parameters = type ? Data.castTo(params, type) : params;
-  const appliedProgram = parameters.reduce(
-    (body, currentParameter) => {
-      const data = UPLCConst.data(dataFromCbor(Data.to(currentParameter)));
-      const appliedParameter = new Application(body, data);
-      return appliedParameter;
-    },
-    program.body
+  const appliedProgram = parameters.reduce((body, currentParameter) => {
+    const data = UPLCConst.data(dataFromCbor(Data.to(currentParameter)));
+    const appliedParameter = new Application(body, data);
+    return appliedParameter;
+  }, program.body);
+  return applyDoubleCborEncoding(
+    toHex2(
+      encodeUPLC(new UPLCProgram(program.version, appliedProgram)).toBuffer().buffer
+    )
   );
-  const compiledUPLC = encodeUPLC(
-    new UPLCProgram(program.version, appliedProgram)
-  ).toBuffer().buffer.buffer;
-  switch (encodingLevel) {
-    case "double":
-      return toHex2(encode2(encode2(compiledUPLC)));
-    case "single":
-      return toHex2(encode2(compiledUPLC));
-  }
 }
 
 // src/address.ts
@@ -1585,6 +1605,7 @@ export {
   addressFromHexOrBech32,
   applyDoubleCborEncoding,
   applyParamsToScript,
+  applySingleCborEncoding,
   assetsToValue,
   calculateMinLovelaceFromUTxO,
   coreToOutRef,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lucid-evolution/utils",
-  "version": "0.1.56",
+  "version": "0.1.59",
   "description": "",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",