@meshsdk/wallet 2.0.0-beta.7 → 2.0.0-beta.8

package/dist/index.cjs

@@ -24748,26 +24748,8 @@ var MeshCardanoBrowserWallet = class _MeshCardanoBrowserWallet extends CardanoBr
 // src/cardano/wallet/mesh/cardano-headless-wallet.ts
 var import_core9 = require("@cardano-sdk/core");
 
-// src/cardano/utils/value.ts
-var import_core5 = require("@cardano-sdk/core");
-function mergeValue(a, b) {
-  const ma = a.multiasset() ?? /* @__PURE__ */ new Map();
-  b.multiasset()?.forEach((v, k) => {
-    const newVal = (ma.get(k) ?? 0n) + v;
-    if (newVal == 0n) {
-      ma.delete(k);
-    } else {
-      ma.set(k, newVal);
-    }
-  });
-  return new import_core5.Serialization.Value(
-    BigInt(a.coin()) + BigInt(b.coin()),
-    ma.size > 0 ? ma : void 0
-  );
-}
-
 // src/cardano/address/single-address-manager.ts
-var import_core6 = require("@cardano-sdk/core");
+var import_core5 = require("@cardano-sdk/core");
 var AddressManager = class _AddressManager {
   static async create(config) {
     let paymentSigner;
@@ -24856,7 +24838,7 @@ var AddressManager = class _AddressManager {
     );
   }
   constructor(paymentCredential, stakeCredential, drepCredential, paymentSigner, networkId, stakeSigner, drepSigner) {
-    (0, import_core6.setInConwayEra)(true);
+    (0, import_core5.setInConwayEra)(true);
     this.paymentCredential = paymentCredential;
     this.stakeCredential = stakeCredential;
     this.drepCredential = drepCredential;
@@ -24914,7 +24896,7 @@ var AddressManager = class _AddressManager {
 };
 
 // src/cardano/signer/cardano-signer.ts
-var import_core7 = require("@cardano-sdk/core");
+var import_core6 = require("@cardano-sdk/core");
 var import_crypto5 = require("@cardano-sdk/crypto");
 var import_util5 = require("@cardano-sdk/util");
 var import_cbor2 = require("@harmoniclabs/cbor");
@@ -25108,11 +25090,11 @@ var getCoseKeyFromPublicKey = (cbor) => {
 // src/cardano/signer/cardano-signer.ts
 var CardanoSigner = class {
   constructor() {
-    (0, import_core7.setInConwayEra)(true);
+    (0, import_core6.setInConwayEra)(true);
   }
   static async signTx(tx, signers, returnFullTx = false) {
-    const cardanoTx = import_core7.Serialization.Transaction.fromCbor(
-      import_core7.Serialization.TxCBOR(tx)
+    const cardanoTx = import_core6.Serialization.Transaction.fromCbor(
+      import_core6.Serialization.TxCBOR(tx)
     );
     const txHash = cardanoTx.body().hash();
     const vkeyWitnesses = [];
@@ -25130,22 +25112,22 @@ var CardanoSigner = class {
         ...vkeyWitnesses
       ] : vkeyWitnesses;
       txWitnessSet2.setVkeys(
-        import_core7.Serialization.CborSet.fromCore(
+        import_core6.Serialization.CborSet.fromCore(
           witnessSetVkeysValues,
-          import_core7.Serialization.VkeyWitness.fromCore
+          import_core6.Serialization.VkeyWitness.fromCore
         )
       );
-      return new import_core7.Serialization.Transaction(
+      return new import_core6.Serialization.Transaction(
         cardanoTx.body(),
         txWitnessSet2,
         cardanoTx.auxiliaryData()
       ).toCbor();
     }
-    const txWitnessSet = new import_core7.Serialization.TransactionWitnessSet();
+    const txWitnessSet = new import_core6.Serialization.TransactionWitnessSet();
     txWitnessSet.setVkeys(
-      import_core7.Serialization.CborSet.fromCore(
+      import_core6.Serialization.CborSet.fromCore(
         vkeyWitnesses,
-        import_core7.Serialization.VkeyWitness.fromCore
+        import_core6.Serialization.VkeyWitness.fromCore
       )
     );
     return txWitnessSet.toCbor();
@@ -25179,7 +25161,7 @@ var CardanoSigner = class {
 };
 
 // src/cardano/utils/transaction-signers.ts
-var import_core8 = require("@cardano-sdk/core");
+var import_core7 = require("@cardano-sdk/core");
 async function getRequiredSignersFromInputs(txBody, fetcher) {
   const requiredSigners = /* @__PURE__ */ new Set();
   let inputs = txBody.inputs().values();
@@ -25207,7 +25189,7 @@ async function getRequiredSignersFromInputs(txBody, fetcher) {
     });
   });
   for (const utxo of utxos) {
-    const address = import_core8.Cardano.Address.fromBech32(utxo.output.address);
+    const address = import_core7.Cardano.Address.fromBech32(utxo.output.address);
     const addressProps = address.getProps();
     if (addressProps.paymentPart) {
       if (addressProps.paymentPart.type === 0 /* KeyHash */) {
@@ -25329,10 +25311,10 @@ function getRequiredSignersFromWithdrawals(txBody) {
   const withdrawals = txBody.withdrawals();
   if (withdrawals) {
     for (const rewardAccount of withdrawals.keys()) {
-      const address = import_core8.Cardano.Address.fromBech32(rewardAccount);
+      const address = import_core7.Cardano.Address.fromBech32(rewardAccount);
       const addressType = address.getType();
-      if (addressType === import_core8.Cardano.AddressType.RewardKey) {
-        requiredSigners.add(import_core8.Cardano.RewardAccount.toHash(rewardAccount));
+      if (addressType === import_core7.Cardano.AddressType.RewardKey) {
+        requiredSigners.add(import_core7.Cardano.RewardAccount.toHash(rewardAccount));
       }
     }
   }
@@ -25389,6 +25371,24 @@ async function getTransactionRequiredSigners(transaction, fetcher) {
   return allRequiredSigners;
 }
 
+// src/cardano/utils/value.ts
+var import_core8 = require("@cardano-sdk/core");
+function mergeValue(a, b) {
+  const ma = a.multiasset() ?? /* @__PURE__ */ new Map();
+  b.multiasset()?.forEach((v, k) => {
+    const newVal = (ma.get(k) ?? 0n) + v;
+    if (newVal == 0n) {
+      ma.delete(k);
+    } else {
+      ma.set(k, newVal);
+    }
+  });
+  return new import_core8.Serialization.Value(
+    BigInt(a.coin()) + BigInt(b.coin()),
+    ma.size > 0 ? ma : void 0
+  );
+}
+
 // src/cardano/wallet/mesh/cardano-headless-wallet.ts
 var CardanoHeadlessWallet = class _CardanoHeadlessWallet {
   constructor(networkId, addressManager, walletAddressType, fetcher, submitter) {
@@ -25649,9 +25649,7 @@ var CardanoHeadlessWallet = class _CardanoHeadlessWallet {
       transaction,
       this.fetcher
     );
-    const signersMap = await this.addressManager.getCredentialsSigners(
-      requiredSigners
-    );
+    const signersMap = await this.addressManager.getCredentialsSigners(requiredSigners);
     if (!partialSign) {
       if (requiredSigners.size !== signersMap.size) {
         throw new Error("[CardanoWallet] Not all required signers found");
@@ -25801,26 +25799,12 @@ var MeshCardanoHeadlessWallet = class _MeshCardanoHeadlessWallet extends Cardano
     if (!this.fetcher) {
       throw new Error("[CardanoWallet] No fetcher provided");
     }
-    const utxos = await this.fetchAccountUtxos();
-    const getUtxoLovelaceValue = (utxo) => {
-      const value = utxo.output.amount;
-      let lovelace = 0;
-      for (const asset of value) {
-        if (asset.unit === "lovelace" || asset.unit === "") {
-          lovelace = parseInt(asset.quantity);
-        }
-      }
-      return lovelace;
-    };
-    const sortedUtxos = utxos.sort(
-      (a, b) => getUtxoLovelaceValue(a) - getUtxoLovelaceValue(b)
+    const collaterals = await this.getCollateral();
+    return collaterals.map(
+      (coll) => fromTxUnspentOutput(
+        import_core10.Serialization.TransactionUnspentOutput.fromCbor((0, import_util6.HexBlob)(coll))
+      )
     );
-    for (const utxo of sortedUtxos) {
-      if (getUtxoLovelaceValue(utxo) >= 5e6) {
-        return [utxo];
-      }
-    }
-    return [];
   }
   /**
    * Get the balance of the wallet.

package/dist/index.js

@@ -25328,24 +25328,6 @@ var MeshCardanoBrowserWallet = class _MeshCardanoBrowserWallet extends CardanoBr
 // src/cardano/wallet/mesh/cardano-headless-wallet.ts
 import { Cardano as Cardano6, Serialization as Serialization6, setInConwayEra as setInConwayEra5 } from "@cardano-sdk/core";
 
-// src/cardano/utils/value.ts
-import { Serialization as Serialization3 } from "@cardano-sdk/core";
-function mergeValue(a, b) {
-  const ma = a.multiasset() ?? /* @__PURE__ */ new Map();
-  b.multiasset()?.forEach((v, k) => {
-    const newVal = (ma.get(k) ?? 0n) + v;
-    if (newVal == 0n) {
-      ma.delete(k);
-    } else {
-      ma.set(k, newVal);
-    }
-  });
-  return new Serialization3.Value(
-    BigInt(a.coin()) + BigInt(b.coin()),
-    ma.size > 0 ? ma : void 0
-  );
-}
-
 // src/cardano/address/single-address-manager.ts
 import { setInConwayEra as setInConwayEra3 } from "@cardano-sdk/core";
 var AddressManager = class _AddressManager {
@@ -25494,7 +25476,7 @@ var AddressManager = class _AddressManager {
 };
 
 // src/cardano/signer/cardano-signer.ts
-import { Serialization as Serialization4, setInConwayEra as setInConwayEra4 } from "@cardano-sdk/core";
+import { Serialization as Serialization3, setInConwayEra as setInConwayEra4 } from "@cardano-sdk/core";
 import { Ed25519PublicKeyHex, Ed25519SignatureHex as Ed25519SignatureHex2 } from "@cardano-sdk/crypto";
 import { HexBlob as HexBlob5 } from "@cardano-sdk/util";
 import {
@@ -25708,8 +25690,8 @@ var CardanoSigner = class {
     setInConwayEra4(true);
   }
   static async signTx(tx, signers, returnFullTx = false) {
-    const cardanoTx = Serialization4.Transaction.fromCbor(
-      Serialization4.TxCBOR(tx)
+    const cardanoTx = Serialization3.Transaction.fromCbor(
+      Serialization3.TxCBOR(tx)
     );
     const txHash = cardanoTx.body().hash();
     const vkeyWitnesses = [];
@@ -25727,22 +25709,22 @@ var CardanoSigner = class {
         ...vkeyWitnesses
       ] : vkeyWitnesses;
       txWitnessSet2.setVkeys(
-        Serialization4.CborSet.fromCore(
+        Serialization3.CborSet.fromCore(
           witnessSetVkeysValues,
-          Serialization4.VkeyWitness.fromCore
+          Serialization3.VkeyWitness.fromCore
         )
       );
-      return new Serialization4.Transaction(
+      return new Serialization3.Transaction(
         cardanoTx.body(),
         txWitnessSet2,
         cardanoTx.auxiliaryData()
       ).toCbor();
     }
-    const txWitnessSet = new Serialization4.TransactionWitnessSet();
+    const txWitnessSet = new Serialization3.TransactionWitnessSet();
     txWitnessSet.setVkeys(
-      Serialization4.CborSet.fromCore(
+      Serialization3.CborSet.fromCore(
         vkeyWitnesses,
-        Serialization4.VkeyWitness.fromCore
+        Serialization3.VkeyWitness.fromCore
       )
     );
     return txWitnessSet.toCbor();
@@ -25776,7 +25758,7 @@ var CardanoSigner = class {
 };
 
 // src/cardano/utils/transaction-signers.ts
-import { Cardano as Cardano5 } from "@cardano-sdk/core";
+import { Cardano as Cardano4 } from "@cardano-sdk/core";
 async function getRequiredSignersFromInputs(txBody, fetcher) {
   const requiredSigners = /* @__PURE__ */ new Set();
   let inputs = txBody.inputs().values();
@@ -25804,7 +25786,7 @@ async function getRequiredSignersFromInputs(txBody, fetcher) {
     });
   });
   for (const utxo of utxos) {
-    const address = Cardano5.Address.fromBech32(utxo.output.address);
+    const address = Cardano4.Address.fromBech32(utxo.output.address);
     const addressProps = address.getProps();
     if (addressProps.paymentPart) {
       if (addressProps.paymentPart.type === 0 /* KeyHash */) {
@@ -25926,10 +25908,10 @@ function getRequiredSignersFromWithdrawals(txBody) {
   const withdrawals = txBody.withdrawals();
   if (withdrawals) {
     for (const rewardAccount of withdrawals.keys()) {
-      const address = Cardano5.Address.fromBech32(rewardAccount);
+      const address = Cardano4.Address.fromBech32(rewardAccount);
       const addressType = address.getType();
-      if (addressType === Cardano5.AddressType.RewardKey) {
-        requiredSigners.add(Cardano5.RewardAccount.toHash(rewardAccount));
+      if (addressType === Cardano4.AddressType.RewardKey) {
+        requiredSigners.add(Cardano4.RewardAccount.toHash(rewardAccount));
       }
     }
   }
@@ -25986,6 +25968,24 @@ async function getTransactionRequiredSigners(transaction, fetcher) {
   return allRequiredSigners;
 }
 
+// src/cardano/utils/value.ts
+import { Serialization as Serialization5 } from "@cardano-sdk/core";
+function mergeValue(a, b) {
+  const ma = a.multiasset() ?? /* @__PURE__ */ new Map();
+  b.multiasset()?.forEach((v, k) => {
+    const newVal = (ma.get(k) ?? 0n) + v;
+    if (newVal == 0n) {
+      ma.delete(k);
+    } else {
+      ma.set(k, newVal);
+    }
+  });
+  return new Serialization5.Value(
+    BigInt(a.coin()) + BigInt(b.coin()),
+    ma.size > 0 ? ma : void 0
+  );
+}
+
 // src/cardano/wallet/mesh/cardano-headless-wallet.ts
 var CardanoHeadlessWallet = class _CardanoHeadlessWallet {
   constructor(networkId, addressManager, walletAddressType, fetcher, submitter) {
@@ -26246,9 +26246,7 @@ var CardanoHeadlessWallet = class _CardanoHeadlessWallet {
       transaction,
       this.fetcher
     );
-    const signersMap = await this.addressManager.getCredentialsSigners(
-      requiredSigners
-    );
+    const signersMap = await this.addressManager.getCredentialsSigners(requiredSigners);
     if (!partialSign) {
       if (requiredSigners.size !== signersMap.size) {
         throw new Error("[CardanoWallet] Not all required signers found");
@@ -26398,26 +26396,12 @@ var MeshCardanoHeadlessWallet = class _MeshCardanoHeadlessWallet extends Cardano
     if (!this.fetcher) {
       throw new Error("[CardanoWallet] No fetcher provided");
     }
-    const utxos = await this.fetchAccountUtxos();
-    const getUtxoLovelaceValue = (utxo) => {
-      const value = utxo.output.amount;
-      let lovelace = 0;
-      for (const asset of value) {
-        if (asset.unit === "lovelace" || asset.unit === "") {
-          lovelace = parseInt(asset.quantity);
-        }
-      }
-      return lovelace;
-    };
-    const sortedUtxos = utxos.sort(
-      (a, b) => getUtxoLovelaceValue(a) - getUtxoLovelaceValue(b)
+    const collaterals = await this.getCollateral();
+    return collaterals.map(
+      (coll) => fromTxUnspentOutput(
+        Serialization7.TransactionUnspentOutput.fromCbor(HexBlob6(coll))
+      )
     );
-    for (const utxo of sortedUtxos) {
-      if (getUtxoLovelaceValue(utxo) >= 5e6) {
-        return [utxo];
-      }
-    }
-    return [];
   }
   /**
    * Get the balance of the wallet.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshsdk/wallet",
-  "version": "2.0.0-beta.7",
+  "version": "2.0.0-beta.8",
   "description": "Wallets - https://meshjs.dev/apis/wallets",
   "main": "./dist/index.cjs",
   "browser": "./dist/index.js",
@@ -19,9 +19,9 @@
   ],
   "scripts": {
     "build": "tsup",
-    "build:demo": "tsup demo/src/main.ts --format esm --outDir demo/dist --clean",
-    "dev:demo": "tsup demo/src/main.ts --format esm --outDir demo/dist --watch",
-    "preview:demo": "npx serve demo -p 5173",
+    "build:demo": "npm --prefix demo run build",
+    "dev:demo": "npm --prefix demo run dev",
+    "preview:demo": "npm --prefix demo run start",
     "build:docs": "typedoc src/index.ts --json ../../apps/docs/src/data/mesh-wallets.json",
     "clean": "rm -rf .turbo && rm -rf dist && rm -rf node_modules",
     "dev": "tsup src/index.ts --format esm,cjs --watch --dts",
@@ -31,6 +31,7 @@
     "test": "jest"
   },
   "devDependencies": {
+    "@ianvs/prettier-plugin-sort-imports": "^4.4.1",
     "@meshsdk/common": "1.9.0-beta.100",
     "@meshsdk/provider": "1.9.0-beta.99",
     "@types/jest": "^29.5.12",
@@ -38,18 +39,12 @@
     "eslint": "^8.57.0",
     "jest": "^29.7.0",
     "patch-package": "^8.0.1",
+    "prettier": "^3.5.3",
     "ts-jest": "^29.1.4",
     "ts-node": "^10.9.2",
     "tsup": "^8.0.2",
     "typedoc": "^0.26.3",
-    "typescript": "^5.3.3",
-    "jest": "^29.7.0",
-    "@types/jest": "^29.5.12",
-    "ts-node": "^10.9.2",
-    "ts-jest": "^29.1.4",
-    "dotenv": "^16.4.5",
-    "@meshsdk/provider": "1.9.0-beta.99",
-    "@meshsdk/common": "1.9.0-beta.100"
+    "typescript": "^5.3.3"
   },
   "dependencies": {
     "@cardano-sdk/core": "0.46.11",