@meshsdk/wallet 1.9.0-beta.2 → 1.9.0-beta.21

package/dist/index.cjs

@@ -569,23 +569,23 @@ var bech32 = /* @__PURE__ */ genBech32("bech32");
 var import_common = require("@meshsdk/common");
 var import_core_cst = require("@meshsdk/core-cst");
 var WalletStaticMethods = class {
-  static privateKeyToEntropy(_bech32) {
+  static privateKeyBech32ToPrivateKeyHex(_bech32) {
     const bech32DecodedBytes = bech32.decodeToBytes(_bech32).bytes;
     const bip32PrivateKey = import_core_cst.Bip32PrivateKey.fromBytes(bech32DecodedBytes);
     return (0, import_common.bytesToHex)(bip32PrivateKey.bytes());
   }
-  static mnemonicToEntropy(words) {
+  static mnemonicToPrivateKeyHex(words) {
     const entropy = (0, import_common.mnemonicToEntropy)(words.join(" "));
     const bip32PrivateKey = (0, import_core_cst.buildBip32PrivateKey)(entropy);
     return (0, import_common.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 = import_core_cst.Bip32PrivateKey.fromBytes(bip32Bytes);
     return (0, import_common.bytesToHex)(bip32PrivateKey.bytes());
   }
@@ -593,22 +593,22 @@ var WalletStaticMethods = class {
     const baseAddress = (0, import_core_cst.buildBaseAddress)(
       networkId,
       import_core_cst.Hash28ByteBase16.fromEd25519KeyHashHex(
-        (0, import_core_cst.Ed25519KeyHashHex)(paymentKey.toPublicKey().hash().toString("hex"))
+        paymentKey.toPublic().hash().hex()
       ),
       import_core_cst.Hash28ByteBase16.fromEd25519KeyHashHex(
-        (0, import_core_cst.Ed25519KeyHashHex)(stakingKey.toPublicKey().hash().toString("hex"))
+        stakingKey.toPublic().hash().hex()
       )
     ).toAddress();
     const enterpriseAddress = (0, import_core_cst.buildEnterpriseAddress)(
       networkId,
       import_core_cst.Hash28ByteBase16.fromEd25519KeyHashHex(
-        (0, import_core_cst.Ed25519KeyHashHex)(paymentKey.toPublicKey().hash().toString("hex"))
+        paymentKey.toPublic().hash().hex()
       )
     ).toAddress();
     const rewardAddress = (0, import_core_cst.buildRewardAddress)(
       networkId,
       import_core_cst.Hash28ByteBase16.fromEd25519KeyHashHex(
-        (0, import_core_cst.Ed25519KeyHashHex)(stakingKey.toPublicKey().hash().toString("hex"))
+        stakingKey.toPublic().hash().hex()
       )
     ).toAddress();
     return {
@@ -618,15 +618,12 @@ 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 = (0, import_core_cst.buildDRepID)(
       (0, import_core_cst.Ed25519PublicKeyHex)(pubDRepKey),
       networkId
     );
-    const dRep = import_core_cst.DRep.newKeyHash(
-      (0, import_core_cst.Ed25519KeyHashHex)(dRepKey.toPublicKey().hash().toString("hex"))
-    );
+    const dRep = import_core_cst.DRep.newKeyHash(dRepKey.toPublic().hash().hex());
     const dRepIDHash = dRep.toKeyHash();
     return {
       pubDRepKey,
@@ -653,40 +650,43 @@ var WalletStaticMethods = class {
   }
 };
 var EmbeddedWallet = class extends WalletStaticMethods {
-  _entropy;
+  _walletSecret;
   _networkId;
   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 import_core_cst.Crypto.ready();
+  }
   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 } = (0, import_core_cst.buildKeys)(
-      this._entropy,
+      this._walletSecret,
       accountIndex,
       keyIndex
     );
@@ -700,8 +700,8 @@ 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);
@@ -760,10 +760,8 @@ var EmbeddedWallet = class extends WalletStaticMethods {
       const txHash = (0, import_core_cst.deserializeTxHash)((0, import_core_cst.resolveTxHash)(unsignedTx));
       const { paymentKey } = this.getAccount(accountIndex, keyIndex);
       const vKeyWitness = new import_core_cst.VkeyWitness(
-        (0, import_core_cst.Ed25519PublicKeyHex)(paymentKey.toPublicKey().toBytes().toString("hex")),
-        (0, import_core_cst.Ed25519SignatureHex)(
-          paymentKey.sign(Buffer.from(txHash, "hex")).toString("hex")
-        )
+        paymentKey.toPublic().hex(),
+        paymentKey.sign((0, import_core_cst.HexBlob)(txHash)).hex()
       );
       return vKeyWitness;
     } catch (error) {
@@ -812,6 +810,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.
    *
@@ -1578,6 +1585,7 @@ var import_common4 = require("@meshsdk/common");
 var import_core_cst5 = require("@meshsdk/core-cst");
 var import_transaction = require("@meshsdk/transaction");
 var MeshWallet = class {
+  _keyType;
   _wallet;
   _accountIndex = 0;
   _keyIndex = 0;
@@ -1587,6 +1595,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;
@@ -1600,7 +1609,6 @@ var MeshWallet = class {
             bech32: options.key.bech32
           }
         });
-        this.getAddressesFromWallet(this._wallet);
         break;
       case "cli":
         this._wallet = new EmbeddedWallet({
@@ -1611,7 +1619,6 @@ var MeshWallet = class {
             stake: options.key.stake
           }
         });
-        this.getAddressesFromWallet(this._wallet);
         break;
       case "mnemonic":
         this._wallet = new EmbeddedWallet({
@@ -1621,7 +1628,6 @@ var MeshWallet = class {
             words: options.key.words
           }
         });
-        this.getAddressesFromWallet(this._wallet);
         break;
       case "bip32Bytes":
         this._wallet = new EmbeddedWallet({
@@ -1631,7 +1637,6 @@ var MeshWallet = class {
             bip32Bytes: options.key.bip32Bytes
           }
         });
-        this.getAddressesFromWallet(this._wallet);
         break;
       case "address":
         this._wallet = null;
@@ -1639,6 +1644,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) {
+      await this._wallet.init();
+      this.getAddressesFromWallet(this._wallet);
+    }
+  }
   /**
    * Returns all derived addresses from the wallet.
    * @returns a list of addresses
@@ -1680,8 +1695,11 @@ var MeshWallet = class {
    *
    * @returns an address
    */
-  getChangeAddress() {
-    return this.addresses.baseAddressBech32 ? this.addresses.baseAddressBech32 : this.addresses.enterpriseAddressBech32;
+  async getChangeAddress(addressType = "payment") {
+    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).
@@ -1760,7 +1778,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.
@@ -1768,7 +1786,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.
@@ -1805,7 +1823,7 @@ var MeshWallet = class {
       );
     }
     if (address === void 0) {
-      address = this.getChangeAddress();
+      address = await this.getChangeAddress();
     }
     return this._wallet.signData(
       address,
@@ -1976,7 +1994,7 @@ var MeshWallet = class {
    */
   async createCollateral() {
     const tx = new import_transaction.Transaction({ 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);

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import { DataSignature, IFetcher, ISubmitter, ISigner, IWallet, Wallet, Asset, UTxO, AssetExtended } from '@meshsdk/common';
-import { Ed25519PublicKeyHex, TransactionUnspentOutput, Address, StricaPrivateKey, DRepID, Ed25519KeyHashHex, VkeyWitness } from '@meshsdk/core-cst';
+import { Ed25519PublicKeyHex, TransactionUnspentOutput, Address, Ed25519PrivateKey, DRepID, Ed25519KeyHashHex, VkeyWitness } from '@meshsdk/core-cst';
 import * as _simplewebauthn_browser from '@simplewebauthn/browser';
 
 type Cardano = {
@@ -77,6 +77,11 @@ declare class AppWallet implements ISigner, ISubmitter {
     private readonly _submitter?;
     private readonly _wallet;
     constructor(options: CreateAppWalletOptions);
+    /**
+     * Initializes the wallet. This is a required call as fetching addresses from the wallet is an async operation.
+     * @returns void
+     */
+    init(): Promise<void>;
     /**
      * Get a list of UTXOs to be used as collateral inputs for transactions with plutus script inputs.
      *
@@ -107,7 +112,7 @@ declare global {
 /**
  * Browser Wallet provides a set of APIs to interact with the blockchain. This wallet is compatible with Mesh transaction builders.
  *
- * These wallets APIs are in accordance to CIP-30, which defines the API for dApps to communicate with the user's wallet. Additional utility functions provided for developers that are useful for building dApps.
+ * These wallets APIs are in accordance to CIP-30, which defines the API for dApps to communicate with the user's wallet. Additional utility functions provided for developers that are useful for building applications.
  * ```javascript
  * import { BrowserWallet } from '@meshsdk/core';
  *
@@ -384,8 +389,8 @@ type Account = {
     baseAddressBech32: string;
     enterpriseAddressBech32: string;
     rewardAddressBech32: string;
-    paymentKey: StricaPrivateKey;
-    stakeKey: StricaPrivateKey;
+    paymentKey: Ed25519PrivateKey;
+    stakeKey: Ed25519PrivateKey;
     paymentKeyHex: string;
     stakeKeyHex: string;
     pubDRepKey?: string;
@@ -411,16 +416,16 @@ type CreateEmbeddedWalletOptions = {
     key: EmbeddedWalletKeyType;
 };
 declare class WalletStaticMethods {
-    static privateKeyToEntropy(_bech32: string): string;
-    static mnemonicToEntropy(words: string[]): string;
-    static signingKeyToEntropy(paymentKey: string, stakeKey: string): [string, string];
-    static bip32BytesToEntropy(bip32Bytes: Uint8Array): string;
-    static getAddresses(paymentKey: StricaPrivateKey, stakingKey: StricaPrivateKey, networkId?: number): {
+    static privateKeyBech32ToPrivateKeyHex(_bech32: string): string;
+    static mnemonicToPrivateKeyHex(words: string[]): string;
+    static signingKeyToHexes(paymentKey: string, stakeKey: string): [string, string];
+    static bip32BytesToPrivateKeyHex(bip32Bytes: Uint8Array): string;
+    static getAddresses(paymentKey: Ed25519PrivateKey, stakingKey: Ed25519PrivateKey, networkId?: number): {
         baseAddress: Address;
         enterpriseAddress: Address;
         rewardAddress: Address;
     };
-    static getDRepKey(dRepKey: StricaPrivateKey, networkId?: number): {
+    static getDRepKey(dRepKey: Ed25519PrivateKey, networkId?: number): {
         pubDRepKey: string;
         dRepIDBech32: DRepID;
         dRepIDHash: Ed25519KeyHashHex;
@@ -429,9 +434,10 @@ declare class WalletStaticMethods {
     static addWitnessSets(txHex: string, witnesses: VkeyWitness[]): string;
 }
 declare class EmbeddedWallet extends WalletStaticMethods {
-    private readonly _entropy?;
+    private readonly _walletSecret?;
     private readonly _networkId;
     constructor(options: CreateEmbeddedWalletOptions);
+    init(): Promise<void>;
     getAccount(accountIndex?: number, keyIndex?: number): Account;
     /**
      * Get wallet network ID.
@@ -495,20 +501,23 @@ type CreateMeshWalletOptions = {
  * ```javascript
  * import { MeshWallet, BlockfrostProvider } from '@meshsdk/core';
  *
- * const blockchainProvider = new BlockfrostProvider('<BLOCKFROST_API_KEY>');
+ * const provider = new BlockfrostProvider('<BLOCKFROST_API_KEY>');
  *
  * const wallet = new MeshWallet({
  *   networkId: 0,
- *   fetcher: blockchainProvider,
- *   submitter: blockchainProvider,
+ *   fetcher: provider,
+ *   submitter: provider,
  *   key: {
  *     type: 'mnemonic',
  *     words: ["solution","solution","solution","solution","solution",","solution","solution","solution","solution","solution","solution","solution","solution","solution","solution","solution","solution","solution","solution","solution","solution","solution","solution"],
  *   },
  * });
  * ```
+ *
+ * Please call `await wallet.init()` after creating the wallet to fetch the addresses from the wallet.
  */
 declare class MeshWallet implements IWallet {
+    private readonly _keyType;
     private readonly _wallet;
     private readonly _accountIndex;
     private readonly _keyIndex;
@@ -527,6 +536,11 @@ declare class MeshWallet implements IWallet {
         dRepIDHash?: Ed25519KeyHashHex;
     };
     constructor(options: CreateMeshWalletOptions);
+    /**
+     * Initializes the wallet. This is a required call as fetching addresses from the wallet is an async operation.
+     * @returns void
+     */
+    init(): Promise<void>;
     /**
      * Returns all derived addresses from the wallet.
      * @returns a list of addresses
@@ -555,7 +569,7 @@ declare class MeshWallet implements IWallet {
      *
      * @returns an address
      */
-    getChangeAddress(): string;
+    getChangeAddress(addressType?: GetAddressType): Promise<string>;
     /**
      * 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).
      *

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { DataSignature, IFetcher, ISubmitter, ISigner, IWallet, Wallet, Asset, UTxO, AssetExtended } from '@meshsdk/common';
-import { Ed25519PublicKeyHex, TransactionUnspentOutput, Address, StricaPrivateKey, DRepID, Ed25519KeyHashHex, VkeyWitness } from '@meshsdk/core-cst';
+import { Ed25519PublicKeyHex, TransactionUnspentOutput, Address, Ed25519PrivateKey, DRepID, Ed25519KeyHashHex, VkeyWitness } from '@meshsdk/core-cst';
 import * as _simplewebauthn_browser from '@simplewebauthn/browser';
 
 type Cardano = {
@@ -77,6 +77,11 @@ declare class AppWallet implements ISigner, ISubmitter {
     private readonly _submitter?;
     private readonly _wallet;
     constructor(options: CreateAppWalletOptions);
+    /**
+     * Initializes the wallet. This is a required call as fetching addresses from the wallet is an async operation.
+     * @returns void
+     */
+    init(): Promise<void>;
     /**
      * Get a list of UTXOs to be used as collateral inputs for transactions with plutus script inputs.
      *
@@ -107,7 +112,7 @@ declare global {
 /**
  * Browser Wallet provides a set of APIs to interact with the blockchain. This wallet is compatible with Mesh transaction builders.
  *
- * These wallets APIs are in accordance to CIP-30, which defines the API for dApps to communicate with the user's wallet. Additional utility functions provided for developers that are useful for building dApps.
+ * These wallets APIs are in accordance to CIP-30, which defines the API for dApps to communicate with the user's wallet. Additional utility functions provided for developers that are useful for building applications.
  * ```javascript
  * import { BrowserWallet } from '@meshsdk/core';
  *
@@ -384,8 +389,8 @@ type Account = {
     baseAddressBech32: string;
     enterpriseAddressBech32: string;
     rewardAddressBech32: string;
-    paymentKey: StricaPrivateKey;
-    stakeKey: StricaPrivateKey;
+    paymentKey: Ed25519PrivateKey;
+    stakeKey: Ed25519PrivateKey;
     paymentKeyHex: string;
     stakeKeyHex: string;
     pubDRepKey?: string;
@@ -411,16 +416,16 @@ type CreateEmbeddedWalletOptions = {
     key: EmbeddedWalletKeyType;
 };
 declare class WalletStaticMethods {
-    static privateKeyToEntropy(_bech32: string): string;
-    static mnemonicToEntropy(words: string[]): string;
-    static signingKeyToEntropy(paymentKey: string, stakeKey: string): [string, string];
-    static bip32BytesToEntropy(bip32Bytes: Uint8Array): string;
-    static getAddresses(paymentKey: StricaPrivateKey, stakingKey: StricaPrivateKey, networkId?: number): {
+    static privateKeyBech32ToPrivateKeyHex(_bech32: string): string;
+    static mnemonicToPrivateKeyHex(words: string[]): string;
+    static signingKeyToHexes(paymentKey: string, stakeKey: string): [string, string];
+    static bip32BytesToPrivateKeyHex(bip32Bytes: Uint8Array): string;
+    static getAddresses(paymentKey: Ed25519PrivateKey, stakingKey: Ed25519PrivateKey, networkId?: number): {
         baseAddress: Address;
         enterpriseAddress: Address;
         rewardAddress: Address;
     };
-    static getDRepKey(dRepKey: StricaPrivateKey, networkId?: number): {
+    static getDRepKey(dRepKey: Ed25519PrivateKey, networkId?: number): {
         pubDRepKey: string;
         dRepIDBech32: DRepID;
         dRepIDHash: Ed25519KeyHashHex;
@@ -429,9 +434,10 @@ declare class WalletStaticMethods {
     static addWitnessSets(txHex: string, witnesses: VkeyWitness[]): string;
 }
 declare class EmbeddedWallet extends WalletStaticMethods {
-    private readonly _entropy?;
+    private readonly _walletSecret?;
     private readonly _networkId;
     constructor(options: CreateEmbeddedWalletOptions);
+    init(): Promise<void>;
     getAccount(accountIndex?: number, keyIndex?: number): Account;
     /**
      * Get wallet network ID.
@@ -495,20 +501,23 @@ type CreateMeshWalletOptions = {
  * ```javascript
  * import { MeshWallet, BlockfrostProvider } from '@meshsdk/core';
  *
- * const blockchainProvider = new BlockfrostProvider('<BLOCKFROST_API_KEY>');
+ * const provider = new BlockfrostProvider('<BLOCKFROST_API_KEY>');
  *
  * const wallet = new MeshWallet({
  *   networkId: 0,
- *   fetcher: blockchainProvider,
- *   submitter: blockchainProvider,
+ *   fetcher: provider,
+ *   submitter: provider,
  *   key: {
  *     type: 'mnemonic',
  *     words: ["solution","solution","solution","solution","solution",","solution","solution","solution","solution","solution","solution","solution","solution","solution","solution","solution","solution","solution","solution","solution","solution","solution","solution"],
  *   },
  * });
  * ```
+ *
+ * Please call `await wallet.init()` after creating the wallet to fetch the addresses from the wallet.
  */
 declare class MeshWallet implements IWallet {
+    private readonly _keyType;
     private readonly _wallet;
     private readonly _accountIndex;
     private readonly _keyIndex;
@@ -527,6 +536,11 @@ declare class MeshWallet implements IWallet {
         dRepIDHash?: Ed25519KeyHashHex;
     };
     constructor(options: CreateMeshWalletOptions);
+    /**
+     * Initializes the wallet. This is a required call as fetching addresses from the wallet is an async operation.
+     * @returns void
+     */
+    init(): Promise<void>;
     /**
      * Returns all derived addresses from the wallet.
      * @returns a list of addresses
@@ -555,7 +569,7 @@ declare class MeshWallet implements IWallet {
      *
      * @returns an address
      */
-    getChangeAddress(): string;
+    getChangeAddress(addressType?: GetAddressType): Promise<string>;
     /**
      * 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).
      *

package/dist/index.js

@@ -564,13 +564,13 @@ import {
   buildEnterpriseAddress,
   buildKeys,
   buildRewardAddress,
+  Crypto,
   deserializeTx,
   deserializeTxHash,
   DRep,
-  Ed25519KeyHashHex,
   Ed25519PublicKeyHex,
-  Ed25519SignatureHex,
   Hash28ByteBase16,
+  HexBlob,
   resolveTxHash,
   Serialization,
   signData,
@@ -578,23 +578,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 +602,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,15 +627,12 @@ 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();
     return {
       pubDRepKey,
@@ -662,40 +659,43 @@ var WalletStaticMethods = class {
   }
 };
 var EmbeddedWallet = class extends WalletStaticMethods {
-  _entropy;
+  _walletSecret;
   _networkId;
   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();
+  }
   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,8 +709,8 @@ 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);
@@ -769,10 +769,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 +819,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.
    *
@@ -1447,13 +1454,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 {
@@ -1625,6 +1632,7 @@ import {
 } from "@meshsdk/core-cst";
 import { Transaction as Transaction3 } from "@meshsdk/transaction";
 var MeshWallet = class {
+  _keyType;
   _wallet;
   _accountIndex = 0;
   _keyIndex = 0;
@@ -1634,6 +1642,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;
@@ -1647,7 +1656,6 @@ var MeshWallet = class {
             bech32: options.key.bech32
           }
         });
-        this.getAddressesFromWallet(this._wallet);
         break;
       case "cli":
         this._wallet = new EmbeddedWallet({
@@ -1658,7 +1666,6 @@ var MeshWallet = class {
             stake: options.key.stake
           }
         });
-        this.getAddressesFromWallet(this._wallet);
         break;
       case "mnemonic":
         this._wallet = new EmbeddedWallet({
@@ -1668,7 +1675,6 @@ var MeshWallet = class {
             words: options.key.words
           }
         });
-        this.getAddressesFromWallet(this._wallet);
         break;
       case "bip32Bytes":
         this._wallet = new EmbeddedWallet({
@@ -1678,7 +1684,6 @@ var MeshWallet = class {
             bip32Bytes: options.key.bip32Bytes
           }
         });
-        this.getAddressesFromWallet(this._wallet);
         break;
       case "address":
         this._wallet = null;
@@ -1686,6 +1691,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) {
+      await this._wallet.init();
+      this.getAddressesFromWallet(this._wallet);
+    }
+  }
   /**
    * Returns all derived addresses from the wallet.
    * @returns a list of addresses
@@ -1727,8 +1742,11 @@ var MeshWallet = class {
    *
    * @returns an address
    */
-  getChangeAddress() {
-    return this.addresses.baseAddressBech32 ? this.addresses.baseAddressBech32 : this.addresses.enterpriseAddressBech32;
+  async getChangeAddress(addressType = "payment") {
+    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).
@@ -1807,7 +1825,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.
@@ -1815,7 +1833,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.
@@ -1852,7 +1870,7 @@ var MeshWallet = class {
       );
     }
     if (address === void 0) {
-      address = this.getChangeAddress();
+      address = await this.getChangeAddress();
     }
     return this._wallet.signData(
       address,
@@ -2023,7 +2041,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);

package/package.json

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