@lucid-evolution/wallet 0.2.3 → 0.4.0

package/dist/index.cjs

@@ -44,7 +44,7 @@ var import_utils = require("@lucid-evolution/utils");
 var import_core_utils = require("@lucid-evolution/core-utils");
 
 // src/core.ts
-var CML = __toESM(require("@anastasia-labs/cardano-multiplatform-lib-nodejs"), 1);
+var CML = __toESM(require("@lucid-evolution/cml"), 1);
 
 // src/wallet.ts
 var import_bip39 = require("bip39");
@@ -112,15 +112,18 @@ function walletFromSeed(seed, options = {}) {
 function discoverOwnUsedTxKeyHashes(tx, ownKeyHashes, ownUtxos) {
   return (0, import_core_utils.withCMLScope)((own) => {
     const usedKeyHashes = [];
+    const ownUtxoByOutRef = /* @__PURE__ */ new Map();
+    for (const utxo of ownUtxos) {
+      const key = `${utxo.txHash}#${utxo.outputIndex}`;
+      if (!ownUtxoByOutRef.has(key)) ownUtxoByOutRef.set(key, utxo);
+    }
     const txBody = own(tx.body());
     const inputs = own(txBody.inputs());
     for (let i = 0; i < inputs.len(); i++) {
       const input = own(inputs.get(i));
       const txHash = own(input.transaction_id()).to_hex();
       const outputIndex = Number(input.index());
-      const utxo = ownUtxos.find(
-        (utxo2) => utxo2.txHash === txHash && utxo2.outputIndex === outputIndex
-      );
+      const utxo = ownUtxoByOutRef.get(`${txHash}#${outputIndex}`);
       if (utxo) {
         const { paymentCredential } = (0, import_utils.getAddressDetails)(utxo.address);
         usedKeyHashes.push(paymentCredential?.hash);
@@ -343,16 +346,15 @@ function discoverOwnUsedTxKeyHashes(tx, ownKeyHashes, ownUtxos) {
         const input = own(collateral.get(i));
         const txHash = own(input.transaction_id()).to_hex();
         const outputIndex = Number(input.index());
-        const utxo = ownUtxos.find(
-          (utxo2) => utxo2.txHash === txHash && utxo2.outputIndex === outputIndex
-        );
+        const utxo = ownUtxoByOutRef.get(`${txHash}#${outputIndex}`);
         if (utxo) {
           const { paymentCredential } = (0, import_utils.getAddressDetails)(utxo.address);
           usedKeyHashes.push(paymentCredential?.hash);
         }
       }
     }
-    return usedKeyHashes.filter((k) => ownKeyHashes.includes(k));
+    const ownKeyHashSet = new Set(ownKeyHashes);
+    return usedKeyHashes.filter((k) => ownKeyHashSet.has(k));
   });
 }
 
@@ -553,6 +555,32 @@ var makeWalletFromAPI = (provider, api) => {
       );
       return utxos;
     },
+    // Exposed only when the CIP-30 wallet implements getCollateral. With a
+    // UTxO override, only candidates in the override are returned, so a
+    // collateral UTxO spent by a pending chained transaction is not reused.
+    ...typeof api.getCollateral !== "function" ? {} : {
+      getCollateral: async (amount) => {
+        const params = amount === void 0 ? void 0 : {
+          amount: (0, import_core_utils2.withCMLScope)(
+            (own) => (0, import_core_utils2.toHex)(own(CML.Value.from_coin(amount)).to_cbor_bytes())
+          )
+        };
+        const hexes = await api.getCollateral(params) || [];
+        const candidates = (0, import_core_utils2.withCMLScope)(
+          (own) => hexes.map(
+            (utxo) => (0, import_utils2.coreToUtxo)(
+              own(
+                CML.TransactionUnspentOutput.from_cbor_bytes((0, import_core_utils2.fromHex)(utxo))
+              )
+            )
+          )
+        );
+        const override = config.overriddenUTxOs;
+        return override === void 0 ? candidates : candidates.filter(
+          (candidate) => override.some((utxo) => (0, import_utils2.isEqualUTxO)(utxo, candidate))
+        );
+      }
+    },
     getUtxosCore: async () => {
       const utxos = config.overriddenUTxOs !== void 0 ? config.overriddenUTxOs.map(import_utils2.utxoToCore) : (await api.getUtxos() || []).map(
         (utxo) => CML.TransactionUnspentOutput.from_cbor_hex(utxo)

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import { Address, RewardAddress, PrivateKey, KeyHash, UTxO, Network, Provider, WalletApi, Wallet } from '@lucid-evolution/core-types';
-import * as CML from '@anastasia-labs/cardano-multiplatform-lib-nodejs';
+import * as CML from '@lucid-evolution/cml';
 
 type FromSeed = {
     address: Address;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { Address, RewardAddress, PrivateKey, KeyHash, UTxO, Network, Provider, WalletApi, Wallet } from '@lucid-evolution/core-types';
-import * as CML from '@anastasia-labs/cardano-multiplatform-lib-nodejs';
+import * as CML from '@lucid-evolution/cml';
 
 type FromSeed = {
     address: Address;

package/dist/index.js

@@ -3,7 +3,7 @@ import { getAddressDetails } from "@lucid-evolution/utils";
 import { fromHex, withCMLScope } from "@lucid-evolution/core-utils";
 
 // src/core.ts
-import * as CML from "@anastasia-labs/cardano-multiplatform-lib-nodejs";
+import * as CML from "@lucid-evolution/cml";
 
 // src/wallet.ts
 import { mnemonicToEntropy } from "bip39";
@@ -71,15 +71,18 @@ function walletFromSeed(seed, options = {}) {
 function discoverOwnUsedTxKeyHashes(tx, ownKeyHashes, ownUtxos) {
   return withCMLScope((own) => {
     const usedKeyHashes = [];
+    const ownUtxoByOutRef = /* @__PURE__ */ new Map();
+    for (const utxo of ownUtxos) {
+      const key = `${utxo.txHash}#${utxo.outputIndex}`;
+      if (!ownUtxoByOutRef.has(key)) ownUtxoByOutRef.set(key, utxo);
+    }
     const txBody = own(tx.body());
     const inputs = own(txBody.inputs());
     for (let i = 0; i < inputs.len(); i++) {
       const input = own(inputs.get(i));
       const txHash = own(input.transaction_id()).to_hex();
       const outputIndex = Number(input.index());
-      const utxo = ownUtxos.find(
-        (utxo2) => utxo2.txHash === txHash && utxo2.outputIndex === outputIndex
-      );
+      const utxo = ownUtxoByOutRef.get(`${txHash}#${outputIndex}`);
       if (utxo) {
         const { paymentCredential } = getAddressDetails(utxo.address);
         usedKeyHashes.push(paymentCredential?.hash);
@@ -302,16 +305,15 @@ function discoverOwnUsedTxKeyHashes(tx, ownKeyHashes, ownUtxos) {
         const input = own(collateral.get(i));
         const txHash = own(input.transaction_id()).to_hex();
         const outputIndex = Number(input.index());
-        const utxo = ownUtxos.find(
-          (utxo2) => utxo2.txHash === txHash && utxo2.outputIndex === outputIndex
-        );
+        const utxo = ownUtxoByOutRef.get(`${txHash}#${outputIndex}`);
         if (utxo) {
           const { paymentCredential } = getAddressDetails(utxo.address);
           usedKeyHashes.push(paymentCredential?.hash);
         }
       }
     }
-    return usedKeyHashes.filter((k) => ownKeyHashes.includes(k));
+    const ownKeyHashSet = new Set(ownKeyHashes);
+    return usedKeyHashes.filter((k) => ownKeyHashSet.has(k));
   });
 }
 
@@ -321,6 +323,7 @@ import {
   coreToUtxo,
   credentialToRewardAddress,
   getAddressDetails as getAddressDetails2,
+  isEqualUTxO,
   utxoToCore
 } from "@lucid-evolution/utils";
 import { signData } from "@lucid-evolution/sign_data";
@@ -517,6 +520,32 @@ var makeWalletFromAPI = (provider, api) => {
       );
       return utxos;
     },
+    // Exposed only when the CIP-30 wallet implements getCollateral. With a
+    // UTxO override, only candidates in the override are returned, so a
+    // collateral UTxO spent by a pending chained transaction is not reused.
+    ...typeof api.getCollateral !== "function" ? {} : {
+      getCollateral: async (amount) => {
+        const params = amount === void 0 ? void 0 : {
+          amount: withCMLScope2(
+            (own) => toHex(own(CML.Value.from_coin(amount)).to_cbor_bytes())
+          )
+        };
+        const hexes = await api.getCollateral(params) || [];
+        const candidates = withCMLScope2(
+          (own) => hexes.map(
+            (utxo) => coreToUtxo(
+              own(
+                CML.TransactionUnspentOutput.from_cbor_bytes(fromHex2(utxo))
+              )
+            )
+          )
+        );
+        const override = config.overriddenUTxOs;
+        return override === void 0 ? candidates : candidates.filter(
+          (candidate) => override.some((utxo) => isEqualUTxO(utxo, candidate))
+        );
+      }
+    },
     getUtxosCore: async () => {
       const utxos = config.overriddenUTxOs !== void 0 ? config.overriddenUTxOs.map(utxoToCore) : (await api.getUtxos() || []).map(
         (utxo) => CML.TransactionUnspentOutput.from_cbor_hex(utxo)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lucid-evolution/wallet",
-  "version": "0.2.3",
+  "version": "0.4.0",
   "description": "",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -21,17 +21,13 @@
   "keywords": [],
   "author": "",
   "license": "MIT",
-  "browser": {
-    "@anastasia-labs/cardano-multiplatform-lib-nodejs": "@anastasia-labs/cardano-multiplatform-lib-browser"
-  },
   "dependencies": {
-    "@anastasia-labs/cardano-multiplatform-lib-browser": "6.2.0-1",
-    "@anastasia-labs/cardano-multiplatform-lib-nodejs": "6.2.0-1",
     "bip39": "^3.1.0",
-    "@lucid-evolution/core-types": "0.3.0",
-    "@lucid-evolution/sign_data": "0.1.32",
-    "@lucid-evolution/core-utils": "0.1.17",
-    "@lucid-evolution/utils": "0.1.75"
+    "@lucid-evolution/cml": "0.1.0",
+    "@lucid-evolution/core-types": "0.5.0",
+    "@lucid-evolution/core-utils": "0.2.0",
+    "@lucid-evolution/sign_data": "0.2.0",
+    "@lucid-evolution/utils": "0.2.0"
   },
   "devDependencies": {
     "@types/node": "^20.12.8",