@meshsdk/wallet 1.8.13 → 1.9.0-beta-38

package/dist/index.js

@@ -564,13 +564,14 @@ import {
   buildEnterpriseAddress,
   buildKeys,
   buildRewardAddress,
+  Crypto,
   deserializeTx,
   deserializeTxHash,
   DRep,
-  Ed25519KeyHashHex,
   Ed25519PublicKeyHex,
-  Ed25519SignatureHex,
   Hash28ByteBase16,
+  HexBlob,
+  hexToBech32,
   resolveTxHash,
   Serialization,
   signData,
@@ -578,23 +579,23 @@ import {
   VkeyWitness
 } from "@meshsdk/core-cst";
 var WalletStaticMethods = class {
-  static privateKeyToEntropy(_bech32) {
+  static privateKeyBech32ToPrivateKeyHex(_bech32) {
     const bech32DecodedBytes = bech32.decodeToBytes(_bech32).bytes;
     const bip32PrivateKey = Bip32PrivateKey.fromBytes(bech32DecodedBytes);
     return bytesToHex(bip32PrivateKey.bytes());
   }
-  static mnemonicToEntropy(words) {
+  static mnemonicToPrivateKeyHex(words) {
     const entropy = mnemonicToEntropy(words.join(" "));
     const bip32PrivateKey = buildBip32PrivateKey(entropy);
     return bytesToHex(bip32PrivateKey.bytes());
   }
-  static signingKeyToEntropy(paymentKey, stakeKey) {
+  static signingKeyToHexes(paymentKey, stakeKey) {
     return [
       paymentKey.startsWith("5820") ? paymentKey.slice(4) : paymentKey,
       stakeKey.startsWith("5820") ? stakeKey.slice(4) : stakeKey
     ];
   }
-  static bip32BytesToEntropy(bip32Bytes) {
+  static bip32BytesToPrivateKeyHex(bip32Bytes) {
     const bip32PrivateKey = Bip32PrivateKey.fromBytes(bip32Bytes);
     return bytesToHex(bip32PrivateKey.bytes());
   }
@@ -602,22 +603,22 @@ var WalletStaticMethods = class {
     const baseAddress = buildBaseAddress(
       networkId,
       Hash28ByteBase16.fromEd25519KeyHashHex(
-        Ed25519KeyHashHex(paymentKey.toPublicKey().hash().toString("hex"))
+        paymentKey.toPublic().hash().hex()
       ),
       Hash28ByteBase16.fromEd25519KeyHashHex(
-        Ed25519KeyHashHex(stakingKey.toPublicKey().hash().toString("hex"))
+        stakingKey.toPublic().hash().hex()
       )
     ).toAddress();
     const enterpriseAddress = buildEnterpriseAddress(
       networkId,
       Hash28ByteBase16.fromEd25519KeyHashHex(
-        Ed25519KeyHashHex(paymentKey.toPublicKey().hash().toString("hex"))
+        paymentKey.toPublic().hash().hex()
       )
     ).toAddress();
     const rewardAddress = buildRewardAddress(
       networkId,
       Hash28ByteBase16.fromEd25519KeyHashHex(
-        Ed25519KeyHashHex(stakingKey.toPublicKey().hash().toString("hex"))
+        stakingKey.toPublic().hash().hex()
       )
     ).toAddress();
     return {
@@ -627,20 +628,19 @@ var WalletStaticMethods = class {
     };
   }
   static getDRepKey(dRepKey, networkId = 0) {
-    const pubKey = dRepKey.toPublicKey().pubKey;
-    const pubDRepKey = pubKey.toString("hex");
+    const pubDRepKey = dRepKey.toPublic().hex().toString();
     const dRepIDBech32 = buildDRepID(
       Ed25519PublicKeyHex(pubDRepKey),
       networkId
     );
-    const dRep = DRep.newKeyHash(
-      Ed25519KeyHashHex(dRepKey.toPublicKey().hash().toString("hex"))
-    );
+    const dRep = DRep.newKeyHash(dRepKey.toPublic().hash().hex());
     const dRepIDHash = dRep.toKeyHash();
+    const dRepIDCip105 = hexToBech32("drep", dRepIDHash);
     return {
       pubDRepKey,
       dRepIDBech32,
-      dRepIDHash
+      dRepIDHash,
+      dRepIDCip105
     };
   }
   static generateMnemonic(strength = 256) {
@@ -662,40 +662,45 @@ var WalletStaticMethods = class {
   }
 };
 var EmbeddedWallet = class extends WalletStaticMethods {
-  _entropy;
+  _walletSecret;
   _networkId;
+  cryptoIsReady = false;
   constructor(options) {
     super();
     this._networkId = options.networkId;
     switch (options.key.type) {
       case "mnemonic":
-        this._entropy = WalletStaticMethods.mnemonicToEntropy(
+        this._walletSecret = WalletStaticMethods.mnemonicToPrivateKeyHex(
           options.key.words
         );
         break;
       case "root":
-        this._entropy = WalletStaticMethods.privateKeyToEntropy(
+        this._walletSecret = WalletStaticMethods.privateKeyBech32ToPrivateKeyHex(
           options.key.bech32
         );
         break;
       case "cli":
-        this._entropy = WalletStaticMethods.signingKeyToEntropy(
+        this._walletSecret = WalletStaticMethods.signingKeyToHexes(
           options.key.payment,
           options.key.stake ?? "f0".repeat(32)
         );
         break;
       case "bip32Bytes":
-        this._entropy = WalletStaticMethods.bip32BytesToEntropy(
+        this._walletSecret = WalletStaticMethods.bip32BytesToPrivateKeyHex(
           options.key.bip32Bytes
         );
         break;
     }
   }
+  async init() {
+    await Crypto.ready();
+    this.cryptoIsReady = true;
+  }
   getAccount(accountIndex = 0, keyIndex = 0) {
-    if (this._entropy == void 0)
+    if (this._walletSecret == void 0)
       throw new Error("[EmbeddedWallet] No keys initialized");
     const { paymentKey, stakeKey, dRepKey } = buildKeys(
-      this._entropy,
+      this._walletSecret,
       accountIndex,
       keyIndex
     );
@@ -709,14 +714,15 @@ var EmbeddedWallet = class extends WalletStaticMethods {
       rewardAddressBech32: rewardAddress.toBech32(),
       paymentKey,
       stakeKey,
-      paymentKeyHex: paymentKey.toBytes().toString("hex"),
-      stakeKeyHex: stakeKey.toBytes().toString("hex")
+      paymentKeyHex: paymentKey.hex(),
+      stakeKeyHex: stakeKey.hex()
     };
     if (dRepKey) {
-      const { pubDRepKey, dRepIDBech32, dRepIDHash } = WalletStaticMethods.getDRepKey(dRepKey, this._networkId);
+      const { pubDRepKey, dRepIDBech32, dRepIDHash, dRepIDCip105 } = WalletStaticMethods.getDRepKey(dRepKey, this._networkId);
       _account.pubDRepKey = pubDRepKey;
       _account.dRepIDBech32 = dRepIDBech32;
       _account.dRepIDHash = dRepIDHash;
+      _account.dRepIDCip105 = dRepIDCip105;
     }
     return _account;
   }
@@ -769,10 +775,8 @@ var EmbeddedWallet = class extends WalletStaticMethods {
       const txHash = deserializeTxHash(resolveTxHash(unsignedTx));
       const { paymentKey } = this.getAccount(accountIndex, keyIndex);
       const vKeyWitness = new VkeyWitness(
-        Ed25519PublicKeyHex(paymentKey.toPublicKey().toBytes().toString("hex")),
-        Ed25519SignatureHex(
-          paymentKey.sign(Buffer.from(txHash, "hex")).toString("hex")
-        )
+        paymentKey.toPublic().hex(),
+        paymentKey.sign(HexBlob(txHash)).hex()
       );
       return vKeyWitness;
     } catch (error) {
@@ -821,6 +825,15 @@ var AppWallet = class {
         });
     }
   }
+  /**
+   * Initializes the wallet. This is a required call as fetching addresses from the wallet is an async operation.
+   * @returns void
+   */
+  async init() {
+    if (this._wallet) {
+      await this._wallet.init();
+    }
+  }
   /**
    * Get a list of UTXOs to be used as collateral inputs for transactions with plutus script inputs.
    *
@@ -934,7 +947,6 @@ import {
   POLICY_ID_LENGTH,
   resolveFingerprint
 } from "@meshsdk/common";
-import { csl } from "@meshsdk/core-csl";
 import {
   addressToBech32,
   CardanoSDKUtil,
@@ -946,6 +958,7 @@ import {
   Ed25519PublicKeyHex as Ed25519PublicKeyHex2,
   fromTxUnspentOutput,
   fromValue,
+  hexToBech32 as hexToBech322,
   Serialization as Serialization2,
   toAddress as toAddress2,
   Transaction as Transaction2,
@@ -1004,7 +1017,7 @@ var BrowserWallet = class _BrowserWallet {
     return wallets;
   }
   /**
-   * This is the entrypoint to start communication with the user's wallet. The wallet should request the user's permission to connect the web page to the user's wallet, and if permission has been granted, the wallet will be returned and exposing the full API for the dApp to use.
+   * This is the entrypoint to start communication with the user's wallet. The wallet should request the user's permission to connect the web page to the user's wallet, and if permission has been granted, the wallet will be returned and exposing the full API for the app to use.
    *
    * Query BrowserWallet.getInstalledWallets() to get a list of available wallets, then provide the wallet name for which wallet the user would like to connect with.
    *
@@ -1210,7 +1223,7 @@ var BrowserWallet = class _BrowserWallet {
   /**
    * Submits the signed transaction to the blockchain network.
    *
-   * As wallets should already have this ability to submit transaction, we allow dApps to request that a transaction be sent through it. If the wallet accepts the transaction and tries to send it, it shall return the transaction ID for the dApp to track. The wallet can return error messages or failure if there was an error in sending it.
+   * As wallets should already have this ability to submit transaction, we allow apps to request that a transaction be sent through it. If the wallet accepts the transaction and tries to send it, it shall return the transaction ID for the app to track. The wallet can return error messages or failure if there was an error in sending it.
    *
    * @param tx
    * @returns a transaction hash
@@ -1316,19 +1329,18 @@ var BrowserWallet = class _BrowserWallet {
    * The connected wallet account provides the account's public DRep Key, derivation as described in CIP-0105.
    * These are used by the client to identify the user's on-chain CIP-1694 interactions, i.e. if a user has registered to be a DRep.
    *
-   * @returns wallet account's public DRep Key
+   * @returns DRep object
    */
   async getDRep() {
+    const pubDRepKey = await this.getPubDRepKey();
     try {
-      if (this._walletInstance.cip95 === void 0) return void 0;
-      const dRepKey = await this._walletInstance.cip95.getPubDRepKey();
-      const { dRepIDHash } = await _BrowserWallet.dRepKeyToDRepID(dRepKey);
-      const csldRepIdKeyHash = csl.PublicKey.from_hex(dRepKey).hash();
-      const dRepId = csldRepIdKeyHash.to_bech32("drep");
+      if (pubDRepKey === void 0) return void 0;
+      const { dRepIDHash } = await _BrowserWallet.dRepKeyToDRepID(pubDRepKey);
+      const dRepIDCip105 = hexToBech322("drep", dRepIDHash);
       return {
-        publicKey: dRepKey,
+        publicKey: pubDRepKey,
         publicKeyHash: dRepIDHash,
-        dRepIDCip105: dRepId
+        dRepIDCip105
       };
     } catch (e) {
       console.error(e);
@@ -1344,15 +1356,8 @@ var BrowserWallet = class _BrowserWallet {
   async getPubDRepKey() {
     try {
       if (this._walletInstance.cip95 === void 0) return void 0;
-      const dRepKey = await this._walletInstance.cip95.getPubDRepKey();
-      const { dRepIDHash } = await _BrowserWallet.dRepKeyToDRepID(dRepKey);
-      const csldRepIdKeyHash = csl.PublicKey.from_hex(dRepKey).hash();
-      const dRepId = csldRepIdKeyHash.to_bech32("drep");
-      return {
-        pubDRepKey: dRepKey,
-        dRepIDHash,
-        dRepIDBech32: dRepId
-      };
+      const pubDRepKey = await this._walletInstance.cip95.getPubDRepKey();
+      return pubDRepKey;
     } catch (e) {
       console.error(e);
       return void 0;
@@ -1411,8 +1416,7 @@ var BrowserWallet = class _BrowserWallet {
     if (window.cardano[walletName] === void 0) return void 0;
     const wallet = window.cardano[walletName];
     if (extensions.length > 0) {
-      const _extensions = extensions.map((e) => ({ cip: e }));
-      return wallet.enable({ extensions: _extensions });
+      return wallet.enable({ extensions });
     } else {
       return wallet?.enable();
     }
@@ -1446,13 +1450,13 @@ var BrowserWallet = class _BrowserWallet {
 // src/browser/webauthn/cardano/build-wallet-from-passkey.ts
 var import_base32_encoding = __toESM(require_base32_encoding(), 1);
 var import_bech32 = __toESM(require_dist(), 1);
-import { Crypto } from "@meshsdk/core-cst";
+import { Crypto as Crypto2 } from "@meshsdk/core-cst";
 async function buildWalletFromPasskey(rawId, password, appSalt = "appSalt") {
   const entropy = await createEntropy(rawId, appSalt);
   return buildKey(Buffer.from(entropy), password);
 }
 function buildKey(entropy, password) {
-  const bip32Key = Crypto.Bip32PrivateKey.fromBip39Entropy(entropy, password);
+  const bip32Key = Crypto2.Bip32PrivateKey.fromBip39Entropy(entropy, password);
   const bytes = import_base32_encoding.default.encode(bip32Key.bytes());
   const bech32PrivateKey = import_bech32.bech32.encode("xprv", bytes, 1023);
   return {
@@ -1609,7 +1613,6 @@ import {
   resolveFingerprint as resolveFingerprint2,
   toUTF8
 } from "@meshsdk/common";
-import { resolvePrivateKey } from "@meshsdk/core-csl";
 import {
   Address as Address4,
   buildBaseAddress as buildBaseAddress2,
@@ -1619,11 +1622,13 @@ import {
   Ed25519KeyHashHex as Ed25519KeyHashHex3,
   fromTxUnspentOutput as fromTxUnspentOutput2,
   Hash28ByteBase16 as Hash28ByteBase162,
+  resolvePrivateKey,
   toAddress as toAddress3,
   toTxUnspentOutput as toTxUnspentOutput2
 } from "@meshsdk/core-cst";
 import { Transaction as Transaction3 } from "@meshsdk/transaction";
 var MeshWallet = class {
+  _keyType;
   _wallet;
   _accountIndex = 0;
   _keyIndex = 0;
@@ -1633,6 +1638,7 @@ var MeshWallet = class {
   addresses = {};
   constructor(options) {
     this._networkId = options.networkId;
+    this._keyType = options.key.type;
     if (options.fetcher) this._fetcher = options.fetcher;
     if (options.submitter) this._submitter = options.submitter;
     if (options.accountIndex) this._accountIndex = options.accountIndex;
@@ -1646,7 +1652,6 @@ var MeshWallet = class {
             bech32: options.key.bech32
           }
         });
-        this.getAddressesFromWallet(this._wallet);
         break;
       case "cli":
         this._wallet = new EmbeddedWallet({
@@ -1657,7 +1662,6 @@ var MeshWallet = class {
             stake: options.key.stake
           }
         });
-        this.getAddressesFromWallet(this._wallet);
         break;
       case "mnemonic":
         this._wallet = new EmbeddedWallet({
@@ -1667,7 +1671,6 @@ var MeshWallet = class {
             words: options.key.words
           }
         });
-        this.getAddressesFromWallet(this._wallet);
         break;
       case "bip32Bytes":
         this._wallet = new EmbeddedWallet({
@@ -1677,7 +1680,6 @@ var MeshWallet = class {
             bip32Bytes: options.key.bip32Bytes
           }
         });
-        this.getAddressesFromWallet(this._wallet);
         break;
       case "address":
         this._wallet = null;
@@ -1685,6 +1687,16 @@ var MeshWallet = class {
         break;
     }
   }
+  /**
+   * Initializes the wallet. This is a required call as fetching addresses from the wallet is an async operation.
+   * @returns void
+   */
+  async init() {
+    if (this._wallet && !this._wallet.cryptoIsReady) {
+      await this._wallet.init();
+      this.getAddressesFromWallet(this._wallet);
+    }
+  }
   /**
    * Returns all derived addresses from the wallet.
    * @returns a list of addresses
@@ -1700,6 +1712,7 @@ var MeshWallet = class {
    * @returns a list of assets and their quantities
    */
   async getBalance() {
+    await this.init();
     const utxos = await this.getUnspentOutputs();
     const assets = /* @__PURE__ */ new Map();
     utxos.map((utxo) => {
@@ -1726,8 +1739,12 @@ var MeshWallet = class {
    *
    * @returns an address
    */
-  getChangeAddress() {
-    return this.addresses.baseAddressBech32 ? this.addresses.baseAddressBech32 : this.addresses.enterpriseAddressBech32;
+  async getChangeAddress(addressType = "payment") {
+    await this.init();
+    if (this.addresses.baseAddressBech32 && addressType === "payment") {
+      return this.addresses.baseAddressBech32;
+    }
+    return this.addresses.enterpriseAddressBech32;
   }
   /**
    * This function shall return a list of one or more UTXOs (unspent transaction outputs) controlled by the wallet that are required to reach AT LEAST the combined ADA value target specified in amount AND the best suitable to be used as collateral inputs for transactions with plutus script inputs (pure ADA-only UTXOs).
@@ -1738,6 +1755,7 @@ var MeshWallet = class {
    * @returns a list of UTXOs
    */
   async getCollateral(addressType = "payment") {
+    await this.init();
     const utxos = await this.getCollateralUnspentOutput(addressType);
     return utxos.map((utxo, i) => {
       return fromTxUnspentOutput2(utxo);
@@ -1760,6 +1778,7 @@ var MeshWallet = class {
    * @returns a list of UTXOs
    */
   async getCollateralUnspentOutput(addressType = "payment") {
+    await this.init();
     const utxos = await this.getUnspentOutputs(addressType);
     const pureAdaUtxos = utxos.filter((utxo) => {
       return utxo.output().amount().multiasset() === void 0;
@@ -1778,10 +1797,16 @@ var MeshWallet = class {
    * The connected wallet account provides the account's public DRep Key, derivation as described in CIP-0105.
    * These are used by the client to identify the user's on-chain CIP-1694 interactions, i.e. if a user has registered to be a DRep.
    *
-   * @returns wallet account's public DRep Key
+   * @returns DRep object
    */
   async getDRep() {
-    console.warn("Not implemented yet");
+    await this.init();
+    if (this.addresses.pubDRepKey && this.addresses.dRepIDHash && this.addresses.dRepIDCip105)
+      return {
+        publicKey: this.addresses.pubDRepKey,
+        publicKeyHash: this.addresses.dRepIDHash,
+        dRepIDCip105: this.addresses.dRepIDCip105
+      };
     return void 0;
   }
   /**
@@ -1806,7 +1831,7 @@ var MeshWallet = class {
    * @returns a list of unused addresses
    */
   async getUnusedAddresses() {
-    return [this.getChangeAddress()];
+    return [await this.getChangeAddress()];
   }
   /**
    * Returns a list of used addresses controlled by the wallet.
@@ -1814,7 +1839,7 @@ var MeshWallet = class {
    * @returns a list of used addresses
    */
   async getUsedAddresses() {
-    return [this.getChangeAddress()];
+    return [await this.getChangeAddress()];
   }
   /**
    * Get a list of UTXOs to be used for transaction building.
@@ -1845,13 +1870,14 @@ var MeshWallet = class {
    * @returns a signature
    */
   async signData(payload, address) {
+    await this.init();
     if (!this._wallet) {
       throw new Error(
         "[MeshWallet] Read only wallet does not support signing data."
       );
     }
     if (address === void 0) {
-      address = this.getChangeAddress();
+      address = await this.getChangeAddress();
     }
     return this._wallet.signData(
       address,
@@ -1868,6 +1894,7 @@ var MeshWallet = class {
    * @returns a signed transaction in CBOR
    */
   async signTx(unsignedTx, partialSign = false) {
+    await this.init();
     if (!this._wallet) {
       throw new Error(
         "[MeshWallet] Read only wallet does not support signing data."
@@ -1894,6 +1921,7 @@ var MeshWallet = class {
    * @returns array of signed transactions CborHex string
    */
   async signTxs(unsignedTxs, partialSign = false) {
+    await this.init();
     if (!this._wallet) {
       throw new Error(
         "[MeshWallet] Read only wallet does not support signing data."
@@ -1909,7 +1937,7 @@ var MeshWallet = class {
   /**
    * Submits the signed transaction to the blockchain network.
    *
-   * As wallets should already have this ability to submit transaction, we allow dApps to request that a transaction be sent through it. If the wallet accepts the transaction and tries to send it, it shall return the transaction ID for the dApp to track. The wallet can return error messages or failure if there was an error in sending it.
+   * As wallets should already have this ability to submit transaction, we allow apps to request that a transaction be sent through it. If the wallet accepts the transaction and tries to send it, it shall return the transaction ID for the app to track. The wallet can return error messages or failure if there was an error in sending it.
    *
    * @param tx - a signed transaction in CBOR
    * @returns a transaction hash
@@ -2022,7 +2050,7 @@ var MeshWallet = class {
    */
   async createCollateral() {
     const tx = new Transaction3({ initiator: this });
-    tx.sendLovelace(this.getChangeAddress(), "5000000");
+    tx.sendLovelace(await this.getChangeAddress(), "5000000");
     const unsignedTx = await tx.build();
     const signedTx = await this.signTx(unsignedTx);
     const txHash = await this.submitTx(signedTx);
@@ -2032,7 +2060,8 @@ var MeshWallet = class {
     return {
       pubDRepKey: this.addresses.pubDRepKey,
       dRepIDBech32: this.addresses.dRepIDBech32,
-      dRepIDHash: this.addresses.dRepIDHash
+      dRepIDHash: this.addresses.dRepIDHash,
+      dRepIDCip105: this.addresses.dRepIDCip105
     };
   }
   /**
@@ -2059,7 +2088,8 @@ var MeshWallet = class {
       rewardAddressBech32: account.rewardAddressBech32,
       pubDRepKey: account.pubDRepKey,
       dRepIDBech32: account.dRepIDBech32,
-      dRepIDHash: account.dRepIDHash
+      dRepIDHash: account.dRepIDHash,
+      dRepIDCip105: account.dRepIDCip105
     };
   }
   buildAddressFromBech32Address(address) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshsdk/wallet",
-  "version": "1.8.13",
+  "version": "1.9.0-beta-38",
   "description": "Wallets - https://meshjs.dev/apis/wallets",
   "main": "./dist/index.cjs",
   "browser": "./dist/index.js",
@@ -35,10 +35,9 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@meshsdk/common": "1.8.13",
-    "@meshsdk/core-csl": "1.8.13",
-    "@meshsdk/core-cst": "1.8.13",
-    "@meshsdk/transaction": "1.8.13",
+    "@meshsdk/common": "1.9.0-beta-38",
+    "@meshsdk/core-cst": "1.9.0-beta-38",
+    "@meshsdk/transaction": "1.9.0-beta-38",
     "@simplewebauthn/browser": "^13.0.0"
   },
   "prettier": "@meshsdk/configs/prettier",