@lucid-evolution/utils 0.1.3 → 0.1.5

package/dist/index.cjs

@@ -33,7 +33,7 @@ __export(src_exports, {
   PROTOCOL_PARAMETERS_DEFAULT: () => PROTOCOL_PARAMETERS_DEFAULT,
   addAssets: () => addAssets,
   addressFromHexOrBech32: () => addressFromHexOrBech32,
-  applyDoubleCborEncoding: () => import_lucid_cardano.applyDoubleCborEncoding,
+  applyDoubleCborEncoding: () => applyDoubleCborEncoding,
   assetsToValue: () => assetsToValue,
   coreToOutRef: () => coreToOutRef,
   coreToTxOutput: () => coreToTxOutput,
@@ -140,7 +140,16 @@ function networkToId(network) {
 var CML2 = __toESM(require("@dcspark/cardano-multiplatform-lib-nodejs"), 1);
 
 // src/cbor.ts
-var import_lucid_cardano = require("lucid-cardano");
+var import_core_utils = require("@lucid-evolution/core-utils");
+var import_cborg = require("cborg");
+var applyDoubleCborEncoding = (script) => {
+  try {
+    (0, import_cborg.decode)((0, import_cborg.decode)((0, import_core_utils.fromHex)(script)));
+    return script;
+  } catch (error) {
+    return (0, import_core_utils.toHex)((0, import_cborg.encode)((0, import_core_utils.fromHex)(script)));
+  }
+};
 
 // src/scripts.ts
 function validatorToAddress(network, validator, stakeCredential) {
@@ -169,13 +178,13 @@ function validatorToScriptHash(validator) {
     case "PlutusV1":
       return CML2.PlutusScript.from_v1(
         CML2.PlutusV1Script.from_cbor_hex(
-          (0, import_lucid_cardano.applyDoubleCborEncoding)(validator.script)
+          applyDoubleCborEncoding(validator.script)
         )
       ).hash().to_hex();
     case "PlutusV2":
       return CML2.PlutusScript.from_v2(
         CML2.PlutusV2Script.from_cbor_hex(
-          (0, import_lucid_cardano.applyDoubleCborEncoding)(validator.script)
+          applyDoubleCborEncoding(validator.script)
         )
       ).hash().to_hex();
     default:
@@ -191,13 +200,13 @@ function toScriptRef(script) {
     case "PlutusV1":
       return CML2.Script.new_plutus_v1(
         CML2.PlutusV1Script.from_cbor_hex(
-          (0, import_lucid_cardano.applyDoubleCborEncoding)(script.script)
+          applyDoubleCborEncoding(script.script)
         )
       );
     case "PlutusV2":
       return CML2.Script.new_plutus_v2(
         CML2.PlutusV2Script.from_cbor_hex(
-          (0, import_lucid_cardano.applyDoubleCborEncoding)(script.script)
+          applyDoubleCborEncoding(script.script)
         )
       );
     default:
@@ -871,7 +880,7 @@ function toPublicKey(privateKey) {
 }
 
 // src/label.ts
-var import_core_utils = require("@lucid-evolution/core-utils");
+var import_core_utils2 = require("@lucid-evolution/core-utils");
 var import_crc8 = require("@lucid-evolution/crc8");
 function toLabel(num) {
   if (num < 0 || num > 65535) {
@@ -892,7 +901,7 @@ function fromLabel(label) {
   return check === checksum(numHex) ? num : null;
 }
 function checksum(num) {
-  return (0, import_crc8.crc8)((0, import_core_utils.fromHex)(num)).toString(16).padStart(2, "0");
+  return (0, import_crc8.crc8)((0, import_core_utils2.fromHex)(num)).toString(16).padStart(2, "0");
 }
 
 // src/time.ts
@@ -908,7 +917,7 @@ function slotToUnixTime(network, slot) {
 var CML9 = __toESM(require("@dcspark/cardano-multiplatform-lib-nodejs"), 1);
 
 // src/value.ts
-var import_core_utils2 = require("@lucid-evolution/core-utils");
+var import_core_utils3 = require("@lucid-evolution/core-utils");
 var CML8 = __toESM(require("@dcspark/cardano-multiplatform-lib-nodejs"), 1);
 function valueToAssets(value) {
   const assets = {};
@@ -944,7 +953,7 @@ function assetsToValue(assets) {
     const assetsValue = CML8.MapAssetNameToCoin.new();
     policyUnits.forEach((unit) => {
       assetsValue.insert(
-        CML8.AssetName.from_str((0, import_core_utils2.toText)(unit.slice(56))),
+        CML8.AssetName.from_str((0, import_core_utils3.toText)(unit.slice(56))),
         BigInt(assets[unit])
       );
     });

package/dist/index.d.cts

@@ -1,6 +1,5 @@
 import { Native, Script, Network, Credential, RewardAddress, CertificateValidator, WithdrawalValidator, AddressDetails, CostModels, ProtocolParameters, Address, ScriptHash, KeyHash, Datum, DatumHash, PrivateKey, PublicKey, SpendingValidator, Validator, MintingPolicy, PolicyId, NativeScript, UnixTime, Slot, UTxO, OutRef, TxOutput, Assets, Unit } from '@lucid-evolution/core-types';
 import * as CML from '@dcspark/cardano-multiplatform-lib-nodejs';
-export { applyDoubleCborEncoding } from 'lucid-cardano';
 
 declare const toNativeScript: (native: Native) => CML.NativeScript;
 declare const nativeJSFromJson: (native: Native) => Script;
@@ -11,6 +10,8 @@ declare function validatorToRewardAddress(network: Network, validator: Certifica
 /** Address can be in Bech32 or Hex. */
 declare function getAddressDetails(address: string): AddressDetails;
 
+declare const applyDoubleCborEncoding: (script: string) => string;
+
 declare function createCostModels(costModels: CostModels): CML.CostModels;
 declare const PROTOCOL_PARAMETERS_DEFAULT: ProtocolParameters;
 
@@ -75,4 +76,4 @@ declare function fromUnit(unit: Unit): {
 declare function toUnit(policyId: PolicyId, name?: string | null, label?: number | null): Unit;
 declare function addAssets(...assets: Assets[]): Assets;
 
-export { PROTOCOL_PARAMETERS_DEFAULT, addAssets, addressFromHexOrBech32, assetsToValue, coreToOutRef, coreToTxOutput, coreToUtxo, coresToOutRefs, coresToTxOutputs, coresToUtxos, createCostModels, credentialToAddress, credentialToRewardAddress, datumToHash, fromLabel, fromScriptRef, fromUnit, generatePrivateKey, generateSeedPhrase, getAddressDetails, keyHashToCredential, mintingPolicyToId, nativeFromJson, nativeJSFromJson, nativeScriptFromJson, networkToId, paymentCredentialOf, scriptHashToCredential, slotToUnixTime, stakeCredentialOf, toLabel, toNativeScript, toPublicKey, toScriptRef, toUnit, unixTimeToSlot, utxoToCore, utxoToTransactionInput, utxoToTransactionOutput, utxosToCores, validatorToAddress, validatorToRewardAddress, validatorToScriptHash, valueToAssets };
+export { PROTOCOL_PARAMETERS_DEFAULT, addAssets, addressFromHexOrBech32, applyDoubleCborEncoding, assetsToValue, coreToOutRef, coreToTxOutput, coreToUtxo, coresToOutRefs, coresToTxOutputs, coresToUtxos, createCostModels, credentialToAddress, credentialToRewardAddress, datumToHash, fromLabel, fromScriptRef, fromUnit, generatePrivateKey, generateSeedPhrase, getAddressDetails, keyHashToCredential, mintingPolicyToId, nativeFromJson, nativeJSFromJson, nativeScriptFromJson, networkToId, paymentCredentialOf, scriptHashToCredential, slotToUnixTime, stakeCredentialOf, toLabel, toNativeScript, toPublicKey, toScriptRef, toUnit, unixTimeToSlot, utxoToCore, utxoToTransactionInput, utxoToTransactionOutput, utxosToCores, validatorToAddress, validatorToRewardAddress, validatorToScriptHash, valueToAssets };

package/dist/index.d.ts

@@ -1,6 +1,5 @@
 import { Native, Script, Network, Credential, RewardAddress, CertificateValidator, WithdrawalValidator, AddressDetails, CostModels, ProtocolParameters, Address, ScriptHash, KeyHash, Datum, DatumHash, PrivateKey, PublicKey, SpendingValidator, Validator, MintingPolicy, PolicyId, NativeScript, UnixTime, Slot, UTxO, OutRef, TxOutput, Assets, Unit } from '@lucid-evolution/core-types';
 import * as CML from '@dcspark/cardano-multiplatform-lib-nodejs';
-export { applyDoubleCborEncoding } from 'lucid-cardano';
 
 declare const toNativeScript: (native: Native) => CML.NativeScript;
 declare const nativeJSFromJson: (native: Native) => Script;
@@ -11,6 +10,8 @@ declare function validatorToRewardAddress(network: Network, validator: Certifica
 /** Address can be in Bech32 or Hex. */
 declare function getAddressDetails(address: string): AddressDetails;
 
+declare const applyDoubleCborEncoding: (script: string) => string;
+
 declare function createCostModels(costModels: CostModels): CML.CostModels;
 declare const PROTOCOL_PARAMETERS_DEFAULT: ProtocolParameters;
 
@@ -75,4 +76,4 @@ declare function fromUnit(unit: Unit): {
 declare function toUnit(policyId: PolicyId, name?: string | null, label?: number | null): Unit;
 declare function addAssets(...assets: Assets[]): Assets;
 
-export { PROTOCOL_PARAMETERS_DEFAULT, addAssets, addressFromHexOrBech32, assetsToValue, coreToOutRef, coreToTxOutput, coreToUtxo, coresToOutRefs, coresToTxOutputs, coresToUtxos, createCostModels, credentialToAddress, credentialToRewardAddress, datumToHash, fromLabel, fromScriptRef, fromUnit, generatePrivateKey, generateSeedPhrase, getAddressDetails, keyHashToCredential, mintingPolicyToId, nativeFromJson, nativeJSFromJson, nativeScriptFromJson, networkToId, paymentCredentialOf, scriptHashToCredential, slotToUnixTime, stakeCredentialOf, toLabel, toNativeScript, toPublicKey, toScriptRef, toUnit, unixTimeToSlot, utxoToCore, utxoToTransactionInput, utxoToTransactionOutput, utxosToCores, validatorToAddress, validatorToRewardAddress, validatorToScriptHash, valueToAssets };
+export { PROTOCOL_PARAMETERS_DEFAULT, addAssets, addressFromHexOrBech32, applyDoubleCborEncoding, assetsToValue, coreToOutRef, coreToTxOutput, coreToUtxo, coresToOutRefs, coresToTxOutputs, coresToUtxos, createCostModels, credentialToAddress, credentialToRewardAddress, datumToHash, fromLabel, fromScriptRef, fromUnit, generatePrivateKey, generateSeedPhrase, getAddressDetails, keyHashToCredential, mintingPolicyToId, nativeFromJson, nativeJSFromJson, nativeScriptFromJson, networkToId, paymentCredentialOf, scriptHashToCredential, slotToUnixTime, stakeCredentialOf, toLabel, toNativeScript, toPublicKey, toScriptRef, toUnit, unixTimeToSlot, utxoToCore, utxoToTransactionInput, utxoToTransactionOutput, utxosToCores, validatorToAddress, validatorToRewardAddress, validatorToScriptHash, valueToAssets };

package/dist/index.js

@@ -60,7 +60,16 @@ function networkToId(network) {
 import * as CML2 from "@dcspark/cardano-multiplatform-lib-nodejs";
 
 // src/cbor.ts
-import { applyDoubleCborEncoding } from "lucid-cardano";
+import { fromHex, toHex } from "@lucid-evolution/core-utils";
+import { decode, encode } from "cborg";
+var applyDoubleCborEncoding = (script) => {
+  try {
+    decode(decode(fromHex(script)));
+    return script;
+  } catch (error) {
+    return toHex(encode(fromHex(script)));
+  }
+};
 
 // src/scripts.ts
 function validatorToAddress(network, validator, stakeCredential) {
@@ -791,7 +800,7 @@ function toPublicKey(privateKey) {
 }
 
 // src/label.ts
-import { fromHex } from "@lucid-evolution/core-utils";
+import { fromHex as fromHex2 } from "@lucid-evolution/core-utils";
 import { crc8 } from "@lucid-evolution/crc8";
 function toLabel(num) {
   if (num < 0 || num > 65535) {
@@ -812,7 +821,7 @@ function fromLabel(label) {
   return check === checksum(numHex) ? num : null;
 }
 function checksum(num) {
-  return crc8(fromHex(num)).toString(16).padStart(2, "0");
+  return crc8(fromHex2(num)).toString(16).padStart(2, "0");
 }
 
 // src/time.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lucid-evolution/utils",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -23,8 +23,8 @@
   "license": "MIT",
   "dependencies": {
     "@dcspark/cardano-multiplatform-lib-nodejs": "^5.2.0",
-    "lucid-cardano": "^0.10.7",
-    "@lucid-evolution/bip39": "0.2.3",
+    "cborg": "^4.1.4",
+    "@lucid-evolution/bip39": "0.2.4",
     "@lucid-evolution/core-types": "0.1.3",
     "@lucid-evolution/core-utils": "0.1.3",
     "@lucid-evolution/crc8": "0.1.3",
@@ -32,12 +32,13 @@
   },
   "devDependencies": {
     "@types/node": "^20.11.24",
-    "cborg": "^4.1.4",
     "tsup": "^8.0.2",
-    "typescript": "^5.3.3"
+    "typescript": "^5.3.3",
+    "vitest": "^1.4.0"
   },
   "scripts": {
     "build": "tsup-node src/index.ts --format esm,cjs --dts --clean",
-    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist"
+    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist",
+    "test": "vitest run"
   }
 }