@meshsdk/core-cst 1.9.0-beta.54 → 1.9.0-beta.55

package/dist/index.cjs

@@ -3783,6 +3783,7 @@ var BootstrapWitness = import_core.Serialization.BootstrapWitness;
 
 // src/message-signing/check-signature.ts
 var import_crypto = require("@cardano-sdk/crypto");
+var import_common = require("@meshsdk/common");
 
 // src/message-signing/cose-sign1.ts
 var import_buffer = require("buffer");
@@ -4006,7 +4007,8 @@ var checkSignature = async (data, { key, signature }, address) => {
   if (builder.getPayload() === null) {
     return false;
   }
-  if (Buffer.from(data, "hex").compare(builder.getPayload()) !== 0) {
+  const hexData = (0, import_common.isHexString)(data) ? data : (0, import_common.stringToHex)(data);
+  if (Buffer.from(hexData, "hex").compare(builder.getPayload()) !== 0) {
     return false;
   }
   return builder.verifySignature({
@@ -4052,7 +4054,7 @@ var customRandom = (alphabet, defaultSize, getRandom) => {
 var customAlphabet = (alphabet, size = 21) => customRandom(alphabet, size, random);
 
 // src/message-signing/generate-nonce.ts
-var import_common = require("@meshsdk/common");
+var import_common2 = require("@meshsdk/common");
 var generateNonce = (label = "", length = 32) => {
   if (length <= 0 || length > 2048) {
     throw new Error("Length must be bewteen 1 and 2048");
@@ -4061,13 +4063,15 @@ var generateNonce = (label = "", length = 32) => {
     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
   );
   const payload = randomString(length);
-  return (0, import_common.stringToHex)(`${label}${payload}`);
+  return (0, import_common2.stringToHex)(`${label}${payload}`);
 };
 
 // src/message-signing/sign-data.ts
 var import_cbor2 = require("@harmoniclabs/cbor");
+var import_common3 = require("@meshsdk/common");
 var signData = (data, signer) => {
-  const payload = Buffer.from(data, "hex");
+  const hexData = (0, import_common3.isHexString)(data) ? data : (0, import_common3.stringToHex)(data);
+  const payload = Buffer.from(hexData, "hex");
   const publicKey = Buffer.from(signer.key.toPublic().bytes());
   const protectedMap = [];
   protectedMap.push({ k: new import_cbor2.CborUInt(1), v: new import_cbor2.CborNegInt(-8) });
@@ -4097,14 +4101,14 @@ var import_crypto7 = require("@cardano-sdk/crypto");
 var import_util7 = require("@cardano-sdk/util");
 var import_base32_encoding3 = __toESM(require("base32-encoding"), 1);
 var import_bech323 = require("bech32");
-var import_common7 = require("@meshsdk/common");
+var import_common9 = require("@meshsdk/common");
 
 // src/utils/builder.ts
 var import_crypto3 = require("crypto");
 var import_crypto4 = require("@cardano-sdk/crypto");
 var import_util2 = require("@cardano-sdk/util");
 var import_hash = __toESM(require_hash(), 1);
-var import_common2 = require("@meshsdk/common");
+var import_common4 = require("@meshsdk/common");
 var buildBaseAddress = (networkId, paymentKeyHash, stakeKeyHash) => {
   return BaseAddress.fromCredentials(
     networkId,
@@ -4161,11 +4165,11 @@ var buildKeys = (privateKeyHex, accountIndex, keyIndex = 0) => {
       Bip32PrivateKeyHex2(privateKeyHex)
     );
     const accountKey = privateKey.derive([
-      import_common2.HARDENED_KEY_START + 1852,
+      import_common4.HARDENED_KEY_START + 1852,
       // purpose
-      import_common2.HARDENED_KEY_START + 1815,
+      import_common4.HARDENED_KEY_START + 1815,
       // coin type
-      import_common2.HARDENED_KEY_START + accountIndex
+      import_common4.HARDENED_KEY_START + accountIndex
       // account index
     ]);
     const paymentKey = accountKey.derive([0, keyIndex]).toRawKey();
@@ -4220,11 +4224,11 @@ var import_crypto6 = require("@cardano-sdk/crypto");
 var import_util5 = require("@cardano-sdk/util");
 var import_base32_encoding = __toESM(require("base32-encoding"), 1);
 var import_bech32 = require("bech32");
-var import_common5 = require("@meshsdk/common");
+var import_common7 = require("@meshsdk/common");
 
 // src/utils/data.ts
 var import_util3 = require("@cardano-sdk/util");
-var import_common3 = require("@meshsdk/common");
+var import_common5 = require("@meshsdk/common");
 var toPlutusData = (data) => {
   const toPlutusList = (data2) => {
     const plutusList = new PlutusList();
@@ -4235,7 +4239,7 @@ var toPlutusData = (data) => {
   };
   switch (typeof data) {
     case "string":
-      return PlutusData.newBytes((0, import_common3.toBytes)(data));
+      return PlutusData.newBytes((0, import_common5.toBytes)(data));
     case "number":
       return PlutusData.newInteger(BigInt(data));
     case "bigint":
@@ -4435,8 +4439,8 @@ var deserializePlutusData = (plutusData) => PlutusData.fromCbor((0, import_util3
 var import_core2 = require("@cardano-sdk/core");
 var import_crypto5 = require("@cardano-sdk/crypto");
 var import_util4 = require("@cardano-sdk/util");
-var import_common4 = require("@meshsdk/common");
-var deserializeEd25519KeyHash = (ed25519KeyHash) => Ed25519KeyHash2.fromBytes((0, import_common4.toBytes)(ed25519KeyHash));
+var import_common6 = require("@meshsdk/common");
+var deserializeEd25519KeyHash = (ed25519KeyHash) => Ed25519KeyHash2.fromBytes((0, import_common6.toBytes)(ed25519KeyHash));
 var deserializePlutusScript = (plutusScript, version) => {
   switch (version) {
     case "V1":
@@ -4682,7 +4686,7 @@ var toNativeScript = (script) => {
     case "sig":
       return NativeScript.newScriptPubkey(
         new import_core3.Serialization.ScriptPubkey(
-          import_crypto6.Ed25519KeyHash.fromBytes((0, import_common5.toBytes)(script.keyHash)).hex()
+          import_crypto6.Ed25519KeyHash.fromBytes((0, import_common7.toBytes)(script.keyHash)).hex()
         )
       );
   }
@@ -4854,7 +4858,7 @@ function empty(v) {
 
 // src/utils/address.ts
 var import_util6 = require("@cardano-sdk/util");
-var import_common6 = require("@meshsdk/common");
+var import_common8 = require("@meshsdk/common");
 var serialzeAddress = (deserializedAddress, networkId = 0) => {
   const {
     pubKeyHash,
@@ -4870,7 +4874,7 @@ var serialzeAddress = (deserializedAddress, networkId = 0) => {
     throw new Error(
       "Error: serializeAddress: Address must contain a payment part"
     );
-  const addressObj = isPaymentScript ? (0, import_common6.scriptAddress)(paymentHash, stakeHash, isStakeScript) : (0, import_common6.pubKeyAddress)(paymentHash, stakeHash, isStakeScript);
+  const addressObj = isPaymentScript ? (0, import_common8.scriptAddress)(paymentHash, stakeHash, isStakeScript) : (0, import_common8.pubKeyAddress)(paymentHash, stakeHash, isStakeScript);
   return serializeAddressObj(addressObj, networkId);
 };
 var addrBech32ToPlutusData = (bech325) => {
@@ -5292,11 +5296,11 @@ var resolvePoolId = (hash2) => {
 var resolvePrivateKey = (words) => {
   const buildBip32PrivateKey2 = (entropy2, password = "") => {
     return Bip32PrivateKey2.fromBip39Entropy(
-      Buffer.from((0, import_common7.toBytes)(entropy2)),
-      (0, import_common7.fromUTF8)(password)
+      Buffer.from((0, import_common9.toBytes)(entropy2)),
+      (0, import_common9.fromUTF8)(password)
     );
   };
-  const entropy = (0, import_common7.mnemonicToEntropy)(words.join(" "));
+  const entropy = (0, import_common9.mnemonicToEntropy)(words.join(" "));
   const bip32PrivateKey = buildBip32PrivateKey2(entropy);
   const bytes = import_base32_encoding3.default.encode(bip32PrivateKey.bytes());
   const bech32PrivateKey = import_bech323.bech32.encode("xprv", bytes, 1023);
@@ -5362,7 +5366,7 @@ var import_util9 = require("@cardano-sdk/util");
 var import_cbor3 = require("@harmoniclabs/cbor");
 var import_base32_encoding4 = __toESM(require("base32-encoding"), 1);
 var import_bech324 = require("bech32");
-var import_common8 = require("@meshsdk/common");
+var import_common10 = require("@meshsdk/common");
 
 // src/utils/certificate.ts
 var import_core5 = require("@cardano-sdk/core");
@@ -5889,7 +5893,7 @@ var CardanoSDKSerializer = class {
   protocolParams;
   constructor(protocolParams) {
     (0, import_core8.setInConwayEra)(true);
-    this.protocolParams = protocolParams || import_common8.DEFAULT_PROTOCOL_PARAMETERS;
+    this.protocolParams = protocolParams || import_common10.DEFAULT_PROTOCOL_PARAMETERS;
   }
   serializeRewardAddress(stakeKeyHash, isScriptHash, network_id) {
     return RewardAddress.fromCredentials(network_id ?? 0, {
@@ -6019,11 +6023,11 @@ var CardanoSDKSerializer = class {
       resolvePrivateKey: function(words) {
         const buildBip32PrivateKey2 = (entropy2, password = "") => {
           return Bip32PrivateKey2.fromBip39Entropy(
-            import_buffer2.Buffer.from((0, import_common8.toBytes)(entropy2)),
-            (0, import_common8.fromUTF8)(password)
+            import_buffer2.Buffer.from((0, import_common10.toBytes)(entropy2)),
+            (0, import_common10.fromUTF8)(password)
           );
         };
-        const entropy = (0, import_common8.mnemonicToEntropy)(words.join(" "));
+        const entropy = (0, import_common10.mnemonicToEntropy)(words.join(" "));
         const bip32PrivateKey = buildBip32PrivateKey2(entropy);
         const bytes = import_base32_encoding4.default.encode(bip32PrivateKey.bytes());
         const bech32PrivateKey = import_bech324.bech32.encode("xprv", bytes, 1023);
@@ -6229,7 +6233,7 @@ var CardanoSDKSerializerCore = class {
   protocolParams;
   refScriptSize;
   constructor(protocolParams) {
-    this.protocolParams = protocolParams || import_common8.DEFAULT_PROTOCOL_PARAMETERS;
+    this.protocolParams = protocolParams || import_common10.DEFAULT_PROTOCOL_PARAMETERS;
     this.txBody = new TransactionBody(
       import_core8.Serialization.CborSet.fromCore([], TransactionInput.fromCore),
       [],
@@ -6969,13 +6973,13 @@ var CardanoSDKSerializerCore = class {
     datums.setValues(datumsList);
     this.txWitnessSet.setPlutusData(datums);
     let costModelV1 = import_core8.Serialization.CostModel.newPlutusV1(
-      import_common8.DEFAULT_V1_COST_MODEL_LIST
+      import_common10.DEFAULT_V1_COST_MODEL_LIST
     );
     let costModelV2 = import_core8.Serialization.CostModel.newPlutusV2(
-      import_common8.DEFAULT_V2_COST_MODEL_LIST
+      import_common10.DEFAULT_V2_COST_MODEL_LIST
     );
     let costModelV3 = import_core8.Serialization.CostModel.newPlutusV3(
-      import_common8.DEFAULT_V3_COST_MODEL_LIST
+      import_common10.DEFAULT_V3_COST_MODEL_LIST
     );
     let costModels = new import_core8.Serialization.Costmdls();
     if (this.usedLanguages[PlutusLanguageVersion.V1]) {

package/dist/index.js

@@ -3592,6 +3592,7 @@ var BootstrapWitness = Serialization.BootstrapWitness;
 
 // src/message-signing/check-signature.ts
 import { ready } from "@cardano-sdk/crypto";
+import { isHexString, stringToHex } from "@meshsdk/common";
 
 // src/message-signing/cose-sign1.ts
 var import_json_bigint = __toESM(require_json_bigint(), 1);
@@ -3826,7 +3827,8 @@ var checkSignature = async (data, { key, signature }, address) => {
   if (builder.getPayload() === null) {
     return false;
   }
-  if (Buffer.from(data, "hex").compare(builder.getPayload()) !== 0) {
+  const hexData = isHexString(data) ? data : stringToHex(data);
+  if (Buffer.from(hexData, "hex").compare(builder.getPayload()) !== 0) {
     return false;
   }
   return builder.verifySignature({
@@ -3872,7 +3874,7 @@ var customRandom = (alphabet, defaultSize, getRandom) => {
 var customAlphabet = (alphabet, size = 21) => customRandom(alphabet, size, random);
 
 // src/message-signing/generate-nonce.ts
-import { stringToHex } from "@meshsdk/common";
+import { stringToHex as stringToHex2 } from "@meshsdk/common";
 var generateNonce = (label = "", length = 32) => {
   if (length <= 0 || length > 2048) {
     throw new Error("Length must be bewteen 1 and 2048");
@@ -3881,7 +3883,7 @@ var generateNonce = (label = "", length = 32) => {
     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
   );
   const payload = randomString(length);
-  return stringToHex(`${label}${payload}`);
+  return stringToHex2(`${label}${payload}`);
 };
 
 // src/message-signing/sign-data.ts
@@ -3892,8 +3894,10 @@ import {
   CborText as CborText2,
   CborUInt as CborUInt2
 } from "@harmoniclabs/cbor";
+import { stringToHex as stringToHex3, isHexString as isHexString2 } from "@meshsdk/common";
 var signData = (data, signer) => {
-  const payload = Buffer.from(data, "hex");
+  const hexData = isHexString2(data) ? data : stringToHex3(data);
+  const payload = Buffer.from(hexData, "hex");
   const publicKey = Buffer.from(signer.key.toPublic().bytes());
   const protectedMap = [];
   protectedMap.push({ k: new CborUInt2(1), v: new CborNegInt2(-8) });

package/package.json

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