@lucid-evolution/wallet 0.1.6 → 0.1.8

package/dist/index.cjs

@@ -41,7 +41,11 @@ module.exports = __toCommonJS(src_exports);
 // src/wallet.ts
 var import_utils = require("@lucid-evolution/utils");
 var import_core_utils = require("@lucid-evolution/core-utils");
+
+// src/core.ts
 var CML = __toESM(require("@dcspark/cardano-multiplatform-lib-nodejs"), 1);
+
+// src/wallet.ts
 var import_bip39 = require("@lucid-evolution/bip39");
 function walletFromSeed(seed, options = { addressType: "Base", accountIndex: 0, network: "Mainnet" }) {
   function harden(num) {
@@ -55,6 +59,7 @@ function walletFromSeed(seed, options = { addressType: "Base", accountIndex: 0,
     options.password ? new TextEncoder().encode(options.password) : new Uint8Array()
   );
   const accountKey = rootKey.derive(harden(1852)).derive(harden(1815)).derive(harden(options.accountIndex));
+  rootKey.free();
   const paymentKey = accountKey.derive(0).derive(0).to_raw_key();
   const stakeKey = accountKey.derive(2).derive(0).to_raw_key();
   const paymentKeyHash = paymentKey.to_public().hash();
@@ -224,7 +229,6 @@ function discoverOwnUsedTxKeyHashes(tx, ownKeyHashes, ownUtxos) {
 // src/wallet_selection.ts
 var import_core_utils2 = require("@lucid-evolution/core-utils");
 var import_utils2 = require("@lucid-evolution/utils");
-var CML2 = __toESM(require("@dcspark/cardano-multiplatform-lib-nodejs"), 1);
 var import_sign_data = require("@lucid-evolution/sign_data");
 var makeWalletFromSeed = (provider, network, seed, options) => {
   const { address, rewardAddress, paymentKey, stakeKey } = walletFromSeed(
@@ -236,8 +240,8 @@ var makeWalletFromSeed = (provider, network, seed, options) => {
       network
     }
   );
-  const paymentKeyHash = CML2.PrivateKey.from_bech32(paymentKey).to_public().hash().to_hex();
-  const stakeKeyHash = stakeKey ? CML2.PrivateKey.from_bech32(stakeKey).to_public().hash().to_hex() : "";
+  const paymentKeyHash = CML.PrivateKey.from_bech32(paymentKey).to_public().hash().to_hex();
+  const stakeKeyHash = stakeKey ? CML.PrivateKey.from_bech32(stakeKey).to_public().hash().to_hex() : "";
   const privKeyHashMap = {
     [paymentKeyHash]: paymentKey,
     [stakeKeyHash]: stakeKey
@@ -249,7 +253,9 @@ var makeWalletFromSeed = (provider, network, seed, options) => {
     getUtxosCore: async () => {
       const utxos = await provider.getUtxos((0, import_utils2.paymentCredentialOf)(address));
       const coreUtxos = [];
-      utxos.forEach((utxo) => coreUtxos.push((0, import_utils2.utxoToCore)(utxo)));
+      for (const utxo of utxos) {
+        coreUtxos.push((0, import_utils2.utxoToCore)(utxo));
+      }
       return coreUtxos;
     },
     getDelegation: async () => {
@@ -259,16 +265,15 @@ var makeWalletFromSeed = (provider, network, seed, options) => {
       const utxos = await provider.getUtxos(address);
       const ownKeyHashes = [paymentKeyHash, stakeKeyHash];
       const usedKeyHashes = discoverOwnUsedTxKeyHashes(tx, ownKeyHashes, utxos);
-      const txWitnessSetBuilder = CML2.TransactionWitnessSetBuilder.new();
-      usedKeyHashes.forEach((keyHash) => {
-        const priv = CML2.PrivateKey.from_bech32(privKeyHashMap[keyHash]);
-        const witness = CML2.make_vkey_witness(
-          CML2.hash_transaction(tx.body()),
-          // toCMLTransactionHash(tx.body()),
+      const txWitnessSetBuilder = CML.TransactionWitnessSetBuilder.new();
+      for (const keyHash of usedKeyHashes) {
+        const priv = CML.PrivateKey.from_bech32(privKeyHashMap[keyHash]);
+        const witness = CML.make_vkey_witness(
+          CML.hash_transaction(tx.body()),
           priv
         );
         txWitnessSetBuilder.add_vkey(witness);
-      });
+      }
       return txWitnessSetBuilder.build();
     },
     signMessage: async (address2, payload) => {
@@ -290,11 +295,11 @@ var makeWalletFromSeed = (provider, network, seed, options) => {
   };
 };
 var makeWalletFromPrivateKey = (provider, network, privateKey) => {
-  const priv = CML2.PrivateKey.from_bech32(privateKey);
+  const priv = CML.PrivateKey.from_bech32(privateKey);
   const pubKeyHash = priv.to_public().hash();
-  const address = CML2.EnterpriseAddress.new(
+  const address = CML.EnterpriseAddress.new(
     network === "Mainnet" ? 1 : 0,
-    CML2.Credential.new_pub_key(pubKeyHash)
+    CML.Credential.new_pub_key(pubKeyHash)
   ).to_address().to_bech32(void 0);
   return {
     address: async () => address,
@@ -315,8 +320,8 @@ var makeWalletFromPrivateKey = (provider, network, privateKey) => {
     },
     signTx: async (tx) => {
       const signed = priv.sign(tx.to_cbor_bytes());
-      const witness = CML2.Vkeywitness.new(priv.to_public(), signed);
-      const txWitnessSetBuilder = CML2.TransactionWitnessSetBuilder.new();
+      const witness = CML.Vkeywitness.new(priv.to_public(), signed);
+      const txWitnessSetBuilder = CML.TransactionWitnessSetBuilder.new();
       txWitnessSetBuilder.add_vkey(witness);
       return txWitnessSetBuilder.build();
     },
@@ -347,15 +352,15 @@ var makeWalletFromAPI = (provider, api) => {
   };
   const getRewardAddress = async () => {
     const [rewardAddressHex] = await api.getRewardAddresses();
-    const rewardAddress = rewardAddressHex ? CML2.RewardAddress.from_address(CML2.Address.from_hex(rewardAddressHex)).to_address().to_bech32(void 0) : null;
+    const rewardAddress = rewardAddressHex ? CML.RewardAddress.from_address(CML.Address.from_hex(rewardAddressHex)).to_address().to_bech32(void 0) : null;
     return rewardAddress;
   };
   return {
-    address: async () => CML2.Address.from_hex(await getAddressHex()).to_bech32(void 0),
+    address: async () => CML.Address.from_hex(await getAddressHex()).to_bech32(void 0),
     rewardAddress: async () => getRewardAddress(),
     getUtxos: async () => {
       const utxos = (await api.getUtxos() || []).map((utxo) => {
-        const parsedUtxo = CML2.TransactionUnspentOutput.from_cbor_bytes(
+        const parsedUtxo = CML.TransactionUnspentOutput.from_cbor_bytes(
           (0, import_core_utils2.fromHex)(utxo)
         );
         return (0, import_utils2.coreToUtxo)(parsedUtxo);
@@ -365,7 +370,7 @@ var makeWalletFromAPI = (provider, api) => {
     getUtxosCore: async () => {
       const utxos = [];
       (await api.getUtxos() || []).forEach((utxo) => {
-        utxos.push(CML2.TransactionUnspentOutput.from_cbor_hex(utxo));
+        utxos.push(CML.TransactionUnspentOutput.from_cbor_hex(utxo));
       });
       return utxos;
     },
@@ -375,10 +380,10 @@ var makeWalletFromAPI = (provider, api) => {
     },
     signTx: async (tx) => {
       const witnessSet = await api.signTx((0, import_core_utils2.toHex)(tx.to_cbor_bytes()), true);
-      return CML2.TransactionWitnessSet.from_cbor_hex(witnessSet);
+      return CML.TransactionWitnessSet.from_cbor_hex(witnessSet);
     },
     signMessage: async (address, payload) => {
-      const hexAddress = (0, import_core_utils2.toHex)(CML2.Address.from_bech32(address).to_raw_bytes());
+      const hexAddress = (0, import_core_utils2.toHex)(CML.Address.from_bech32(address).to_raw_bytes());
       return await api.signData(hexAddress, payload);
     },
     submitTx: async (tx) => {

package/dist/index.js

@@ -1,7 +1,11 @@
 // src/wallet.ts
 import { getAddressDetails } from "@lucid-evolution/utils";
 import { fromHex } from "@lucid-evolution/core-utils";
+
+// src/core.ts
 import * as CML from "@dcspark/cardano-multiplatform-lib-nodejs";
+
+// src/wallet.ts
 import { mnemonicToEntropy } from "@lucid-evolution/bip39";
 function walletFromSeed(seed, options = { addressType: "Base", accountIndex: 0, network: "Mainnet" }) {
   function harden(num) {
@@ -15,6 +19,7 @@ function walletFromSeed(seed, options = { addressType: "Base", accountIndex: 0,
     options.password ? new TextEncoder().encode(options.password) : new Uint8Array()
   );
   const accountKey = rootKey.derive(harden(1852)).derive(harden(1815)).derive(harden(options.accountIndex));
+  rootKey.free();
   const paymentKey = accountKey.derive(0).derive(0).to_raw_key();
   const stakeKey = accountKey.derive(2).derive(0).to_raw_key();
   const paymentKeyHash = paymentKey.to_public().hash();
@@ -189,7 +194,6 @@ import {
   paymentCredentialOf,
   utxoToCore
 } from "@lucid-evolution/utils";
-import * as CML2 from "@dcspark/cardano-multiplatform-lib-nodejs";
 import { signData } from "@lucid-evolution/sign_data";
 var makeWalletFromSeed = (provider, network, seed, options) => {
   const { address, rewardAddress, paymentKey, stakeKey } = walletFromSeed(
@@ -201,8 +205,8 @@ var makeWalletFromSeed = (provider, network, seed, options) => {
       network
     }
   );
-  const paymentKeyHash = CML2.PrivateKey.from_bech32(paymentKey).to_public().hash().to_hex();
-  const stakeKeyHash = stakeKey ? CML2.PrivateKey.from_bech32(stakeKey).to_public().hash().to_hex() : "";
+  const paymentKeyHash = CML.PrivateKey.from_bech32(paymentKey).to_public().hash().to_hex();
+  const stakeKeyHash = stakeKey ? CML.PrivateKey.from_bech32(stakeKey).to_public().hash().to_hex() : "";
   const privKeyHashMap = {
     [paymentKeyHash]: paymentKey,
     [stakeKeyHash]: stakeKey
@@ -214,7 +218,9 @@ var makeWalletFromSeed = (provider, network, seed, options) => {
     getUtxosCore: async () => {
       const utxos = await provider.getUtxos(paymentCredentialOf(address));
       const coreUtxos = [];
-      utxos.forEach((utxo) => coreUtxos.push(utxoToCore(utxo)));
+      for (const utxo of utxos) {
+        coreUtxos.push(utxoToCore(utxo));
+      }
       return coreUtxos;
     },
     getDelegation: async () => {
@@ -224,16 +230,15 @@ var makeWalletFromSeed = (provider, network, seed, options) => {
       const utxos = await provider.getUtxos(address);
       const ownKeyHashes = [paymentKeyHash, stakeKeyHash];
       const usedKeyHashes = discoverOwnUsedTxKeyHashes(tx, ownKeyHashes, utxos);
-      const txWitnessSetBuilder = CML2.TransactionWitnessSetBuilder.new();
-      usedKeyHashes.forEach((keyHash) => {
-        const priv = CML2.PrivateKey.from_bech32(privKeyHashMap[keyHash]);
-        const witness = CML2.make_vkey_witness(
-          CML2.hash_transaction(tx.body()),
-          // toCMLTransactionHash(tx.body()),
+      const txWitnessSetBuilder = CML.TransactionWitnessSetBuilder.new();
+      for (const keyHash of usedKeyHashes) {
+        const priv = CML.PrivateKey.from_bech32(privKeyHashMap[keyHash]);
+        const witness = CML.make_vkey_witness(
+          CML.hash_transaction(tx.body()),
           priv
         );
         txWitnessSetBuilder.add_vkey(witness);
-      });
+      }
       return txWitnessSetBuilder.build();
     },
     signMessage: async (address2, payload) => {
@@ -255,11 +260,11 @@ var makeWalletFromSeed = (provider, network, seed, options) => {
   };
 };
 var makeWalletFromPrivateKey = (provider, network, privateKey) => {
-  const priv = CML2.PrivateKey.from_bech32(privateKey);
+  const priv = CML.PrivateKey.from_bech32(privateKey);
   const pubKeyHash = priv.to_public().hash();
-  const address = CML2.EnterpriseAddress.new(
+  const address = CML.EnterpriseAddress.new(
     network === "Mainnet" ? 1 : 0,
-    CML2.Credential.new_pub_key(pubKeyHash)
+    CML.Credential.new_pub_key(pubKeyHash)
   ).to_address().to_bech32(void 0);
   return {
     address: async () => address,
@@ -280,8 +285,8 @@ var makeWalletFromPrivateKey = (provider, network, privateKey) => {
     },
     signTx: async (tx) => {
       const signed = priv.sign(tx.to_cbor_bytes());
-      const witness = CML2.Vkeywitness.new(priv.to_public(), signed);
-      const txWitnessSetBuilder = CML2.TransactionWitnessSetBuilder.new();
+      const witness = CML.Vkeywitness.new(priv.to_public(), signed);
+      const txWitnessSetBuilder = CML.TransactionWitnessSetBuilder.new();
       txWitnessSetBuilder.add_vkey(witness);
       return txWitnessSetBuilder.build();
     },
@@ -312,15 +317,15 @@ var makeWalletFromAPI = (provider, api) => {
   };
   const getRewardAddress = async () => {
     const [rewardAddressHex] = await api.getRewardAddresses();
-    const rewardAddress = rewardAddressHex ? CML2.RewardAddress.from_address(CML2.Address.from_hex(rewardAddressHex)).to_address().to_bech32(void 0) : null;
+    const rewardAddress = rewardAddressHex ? CML.RewardAddress.from_address(CML.Address.from_hex(rewardAddressHex)).to_address().to_bech32(void 0) : null;
     return rewardAddress;
   };
   return {
-    address: async () => CML2.Address.from_hex(await getAddressHex()).to_bech32(void 0),
+    address: async () => CML.Address.from_hex(await getAddressHex()).to_bech32(void 0),
     rewardAddress: async () => getRewardAddress(),
     getUtxos: async () => {
       const utxos = (await api.getUtxos() || []).map((utxo) => {
-        const parsedUtxo = CML2.TransactionUnspentOutput.from_cbor_bytes(
+        const parsedUtxo = CML.TransactionUnspentOutput.from_cbor_bytes(
           fromHex2(utxo)
         );
         return coreToUtxo(parsedUtxo);
@@ -330,7 +335,7 @@ var makeWalletFromAPI = (provider, api) => {
     getUtxosCore: async () => {
       const utxos = [];
       (await api.getUtxos() || []).forEach((utxo) => {
-        utxos.push(CML2.TransactionUnspentOutput.from_cbor_hex(utxo));
+        utxos.push(CML.TransactionUnspentOutput.from_cbor_hex(utxo));
       });
       return utxos;
     },
@@ -340,10 +345,10 @@ var makeWalletFromAPI = (provider, api) => {
     },
     signTx: async (tx) => {
       const witnessSet = await api.signTx(toHex(tx.to_cbor_bytes()), true);
-      return CML2.TransactionWitnessSet.from_cbor_hex(witnessSet);
+      return CML.TransactionWitnessSet.from_cbor_hex(witnessSet);
     },
     signMessage: async (address, payload) => {
-      const hexAddress = toHex(CML2.Address.from_bech32(address).to_raw_bytes());
+      const hexAddress = toHex(CML.Address.from_bech32(address).to_raw_bytes());
       return await api.signData(hexAddress, payload);
     },
     submitTx: async (tx) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lucid-evolution/wallet",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -22,17 +22,17 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@dcspark/cardano-multiplatform-lib-nodejs": "^5.2.0",
-    "@lucid-evolution/bip39": "0.2.5",
-    "@lucid-evolution/core-types": "0.1.4",
-    "@lucid-evolution/core-utils": "0.1.4",
-    "@lucid-evolution/utils": "0.1.6",
-    "@lucid-evolution/sign_data": "0.1.4"
+    "@dcspark/cardano-multiplatform-lib-nodejs": "^5.3.0",
+    "@lucid-evolution/bip39": "0.2.6",
+    "@lucid-evolution/core-types": "0.1.5",
+    "@lucid-evolution/core-utils": "0.1.5",
+    "@lucid-evolution/sign_data": "0.1.5",
+    "@lucid-evolution/utils": "0.1.8"
   },
   "devDependencies": {
-    "@types/node": "^20.11.24",
+    "@types/node": "^20.12.8",
     "tsup": "^8.0.2",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.5"
   },
   "scripts": {
     "build": "tsup-node src/index.ts --format esm,cjs --dts --clean",