@meshsdk/wallet 1.6.4 → 1.6.6

package/dist/index.cjs

@@ -286,23 +286,40 @@ var WalletStaticMethods = class {
       import_core_cst.Hash28ByteBase16.fromEd25519KeyHashHex(
         (0, import_core_cst.Ed25519KeyHashHex)(stakingKey.toPublicKey().hash().toString("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"))
       )
-    );
+    ).toAddress();
     const rewardAddress = (0, import_core_cst.buildRewardAddress)(
       networkId,
       import_core_cst.Hash28ByteBase16.fromEd25519KeyHashHex(
         (0, import_core_cst.Ed25519KeyHashHex)(stakingKey.toPublicKey().hash().toString("hex"))
       )
+    ).toAddress();
+    return {
+      baseAddress,
+      enterpriseAddress,
+      rewardAddress
+    };
+  }
+  static getDRepKey(dRepKey, networkId = 0) {
+    const pubKey = dRepKey.toPublicKey().pubKey;
+    const pubDRepKey = pubKey.toString("hex");
+    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 dRepIDHash = dRep.toKeyHash();
     return {
-      baseAddress: baseAddress.toAddress(),
-      enterpriseAddress: enterpriseAddress.toAddress(),
-      rewardAddress: rewardAddress.toAddress()
+      pubDRepKey,
+      dRepIDBech32,
+      dRepIDHash
     };
   }
   static generateMnemonic(strength = 256) {
@@ -351,13 +368,13 @@ var EmbeddedWallet = class extends WalletStaticMethods {
   getAccount(accountIndex = 0, keyIndex = 0) {
     if (this._entropy == void 0)
       throw new Error("[EmbeddedWallet] No keys initialized");
-    const { paymentKey, stakeKey } = (0, import_core_cst.buildKeys)(
+    const { paymentKey, stakeKey, dRepKey } = (0, import_core_cst.buildKeys)(
       this._entropy,
       accountIndex,
       keyIndex
     );
     const { baseAddress, enterpriseAddress, rewardAddress } = WalletStaticMethods.getAddresses(paymentKey, stakeKey, this._networkId);
-    return {
+    let _account = {
       baseAddress,
       enterpriseAddress,
       rewardAddress,
@@ -369,25 +386,30 @@ var EmbeddedWallet = class extends WalletStaticMethods {
       paymentKeyHex: paymentKey.toBytes().toString("hex"),
       stakeKeyHex: stakeKey.toBytes().toString("hex")
     };
+    if (dRepKey) {
+      const { pubDRepKey, dRepIDBech32, dRepIDHash } = WalletStaticMethods.getDRepKey(dRepKey, this._networkId);
+      _account.pubDRepKey = pubDRepKey;
+      _account.dRepIDBech32 = dRepIDBech32;
+      _account.dRepIDHash = dRepIDHash;
+    }
+    return _account;
   }
   getNetworkId() {
     return this._networkId;
   }
   signData(address, payload, accountIndex = 0, keyIndex = 0) {
     try {
-      const account = this.getAccount(accountIndex, keyIndex);
-      const foundAddress = [
-        account.baseAddress,
-        account.enterpriseAddress,
-        account.rewardAddress
-      ].find((a) => a.toBech32() === address);
+      const { baseAddress, enterpriseAddress, rewardAddress, paymentKey } = this.getAccount(accountIndex, keyIndex);
+      const foundAddress = [baseAddress, enterpriseAddress, rewardAddress].find(
+        (a) => a.toBech32() === address
+      );
       if (foundAddress === void 0)
         throw new Error(
           `[EmbeddedWallet] Address: ${address} doesn't belong to this account.`
         );
       return (0, import_core_cst.signData)(payload, {
         address: import_core_cst.Address.fromBech32(address),
-        key: account.paymentKey
+        key: paymentKey
       });
     } catch (error) {
       throw new Error(
@@ -398,13 +420,11 @@ var EmbeddedWallet = class extends WalletStaticMethods {
   signTx(unsignedTx, accountIndex = 0, keyIndex = 0) {
     try {
       const txHash = (0, import_core_cst.deserializeTxHash)((0, import_core_cst.resolveTxHash)(unsignedTx));
-      const account = this.getAccount(accountIndex, keyIndex);
+      const { paymentKey } = this.getAccount(accountIndex, keyIndex);
       const vKeyWitness = new import_core_cst.VkeyWitness(
-        (0, import_core_cst.Ed25519PublicKeyHex)(
-          account.paymentKey.toPublicKey().toBytes().toString("hex")
-        ),
+        (0, import_core_cst.Ed25519PublicKeyHex)(paymentKey.toPublicKey().toBytes().toString("hex")),
         (0, import_core_cst.Ed25519SignatureHex)(
-          account.paymentKey.sign(Buffer.from(txHash, "hex")).toString("hex")
+          paymentKey.sign(Buffer.from(txHash, "hex")).toString("hex")
         )
       );
       return vKeyWitness;
@@ -809,6 +829,9 @@ var BrowserWallet = class _BrowserWallet {
    */
   async signTx(unsignedTx, partialSign = false) {
     const witness = await this._walletInstance.signTx(unsignedTx, partialSign);
+    if (witness === "") {
+      return unsignedTx;
+    }
     return _BrowserWallet.addBrowserWitnesses(unsignedTx, witness);
   }
   /**
@@ -852,8 +875,15 @@ var BrowserWallet = class _BrowserWallet {
     for (let i = 0; i < witnessSets.length; i++) {
       const unsignedTx = unsignedTxs[i];
       const cWitness = witnessSets[i];
-      const signedTx = _BrowserWallet.addBrowserWitnesses(unsignedTx, cWitness);
-      signedTxs.push(signedTx);
+      if (cWitness === "") {
+        signedTxs.push(unsignedTx);
+      } else {
+        const signedTx = _BrowserWallet.addBrowserWitnesses(
+          unsignedTx,
+          cWitness
+        );
+        signedTxs.push(signedTx);
+      }
     }
     return signedTxs;
   }
@@ -953,23 +983,27 @@ var BrowserWallet = class _BrowserWallet {
       new Set(balance.map((v) => v.unit.slice(0, import_common2.POLICY_ID_LENGTH)))
     ).filter((p) => p !== "lovelace");
   }
+  /**
+   * 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
+   */
   async getPubDRepKey() {
     try {
       if (this._walletInstance.cip95 === void 0) return void 0;
       const dRepKey = await this._walletInstance.cip95.getPubDRepKey();
-      const dRepKeyHex = (0, import_core_cst3.Ed25519PublicKeyHex)(dRepKey);
-      const dRepID = import_core_cst3.Ed25519PublicKey.fromHex(dRepKeyHex);
-      const dRepIDHex = (await dRepID.hash()).hex();
+      const { dRepKeyHex, dRepIDHash } = await _BrowserWallet.dRepKeyToDRepID(dRepKey);
       const networkId = await this.getNetworkId();
       const dRepId = (0, import_core_cst3.buildDRepID)(dRepKeyHex, networkId);
       return {
         pubDRepKey: dRepKey,
-        dRepIDHash: dRepIDHex,
+        dRepIDHash,
         dRepIDBech32: dRepId
         // todo to check
       };
     } catch (e) {
-      console.log(e);
+      console.error(e);
       return void 0;
     }
   }
@@ -979,10 +1013,27 @@ var BrowserWallet = class _BrowserWallet {
       const pubStakeKeys = await this._walletInstance.cip95.getRegisteredPubStakeKeys();
       const pubStakeKeyHashes = await Promise.all(
         pubStakeKeys.map(async (pubStakeKey) => {
-          const pubStakeKeyHex = (0, import_core_cst3.Ed25519PublicKeyHex)(pubStakeKey);
-          const pubStakeKeyPubKey = import_core_cst3.Ed25519PublicKey.fromHex(pubStakeKeyHex);
-          const pubStakeKeyHash = (await pubStakeKeyPubKey.hash()).hex();
-          return pubStakeKeyHash.toString();
+          const { dRepIDHash } = await _BrowserWallet.dRepKeyToDRepID(pubStakeKey);
+          return dRepIDHash;
+        })
+      );
+      return {
+        pubStakeKeys,
+        pubStakeKeyHashes
+      };
+    } catch (e) {
+      console.error(e);
+      return void 0;
+    }
+  }
+  async getUnregisteredPubStakeKeys() {
+    try {
+      if (this._walletInstance.cip95 === void 0) return void 0;
+      const pubStakeKeys = await this._walletInstance.cip95.getUnregisteredPubStakeKeys();
+      const pubStakeKeyHashes = await Promise.all(
+        pubStakeKeys.map(async (pubStakeKey) => {
+          const { dRepIDHash } = await _BrowserWallet.dRepKeyToDRepID(pubStakeKey);
+          return dRepIDHash;
         })
       );
       return {
@@ -990,10 +1041,20 @@ var BrowserWallet = class _BrowserWallet {
         pubStakeKeyHashes
       };
     } catch (e) {
-      console.log(e);
+      console.error(e);
       return void 0;
     }
   }
+  static async dRepKeyToDRepID(dRepKey) {
+    const dRepKeyHex = (0, import_core_cst3.Ed25519PublicKeyHex)(dRepKey);
+    const dRepID = import_core_cst3.Ed25519PublicKey.fromHex(dRepKeyHex);
+    const dRepIDHash = (await dRepID.hash()).hex();
+    return {
+      dRepKeyHex,
+      dRepID,
+      dRepIDHash
+    };
+  }
   static resolveInstance(walletName, extensions = []) {
     if (window.cardano === void 0) return void 0;
     if (window.cardano[walletName] === void 0) return void 0;
@@ -1038,14 +1099,14 @@ var import_core_cst4 = require("@meshsdk/core-cst");
 var import_transaction = require("@meshsdk/transaction");
 var MeshWallet = class {
   _wallet;
-  // private readonly _account: Account;
   _accountIndex = 0;
   _keyIndex = 0;
   _fetcher;
   _submitter;
   _networkId;
-  _addresses = {};
+  addresses = {};
   constructor(options) {
+    this._networkId = options.networkId;
     switch (options.key.type) {
       case "root":
         this._wallet = new EmbeddedWallet({
@@ -1078,8 +1139,11 @@ var MeshWallet = class {
         });
         this.getAddressesFromWallet(this._wallet);
         break;
+      case "address":
+        this._wallet = null;
+        this.buildAddressFromBech32Address(options.key.address);
+        break;
     }
-    this._networkId = options.networkId;
     if (options.fetcher) this._fetcher = options.fetcher;
     if (options.submitter) this._submitter = options.submitter;
     if (options.accountIndex) this._accountIndex = options.accountIndex;
@@ -1120,7 +1184,7 @@ var MeshWallet = class {
    * @returns an address
    */
   getChangeAddress() {
-    return this._addresses.baseAddressBech32;
+    return this.addresses.baseAddressBech32 ? this.addresses.baseAddressBech32 : 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).
@@ -1173,7 +1237,7 @@ var MeshWallet = class {
    * @returns a list of reward addresses
    */
   getRewardAddresses() {
-    return [this._addresses.rewardAddressBech32];
+    return [this.addresses.rewardAddressBech32];
   }
   /**
    * Returns a list of unused addresses controlled by the wallet.
@@ -1213,7 +1277,7 @@ var MeshWallet = class {
    * @param addressType - the type of address to fetch UTXOs from (default: payment)
    * @returns a list of UTXOs
    */
-  async getUsedUTxOs(addressType) {
+  async getUsedUTxOs(addressType = "payment") {
     return await this.getUnspentOutputs(addressType);
   }
   /**
@@ -1222,7 +1286,7 @@ var MeshWallet = class {
    * @param addressType - the type of address to fetch UTXOs from (default: payment)
    * @returns a list of UTXOs
    */
-  async getUtxos(addressType) {
+  async getUtxos(addressType = "payment") {
     const utxos = await this.getUsedUTxOs(addressType);
     return utxos.map((c) => (0, import_core_cst4.fromTxUnspentOutput)(c));
   }
@@ -1278,6 +1342,11 @@ var MeshWallet = class {
    * @returns array of signed transactions CborHex string
    */
   signTxs(unsignedTxs, partialSign = false) {
+    if (!this._wallet) {
+      throw new Error(
+        "[MeshWallet] Read only wallet does not support signing data."
+      );
+    }
     const signedTxs = [];
     for (const unsignedTx of unsignedTxs) {
       const signedTx = this.signTx(unsignedTx, partialSign);
@@ -1296,7 +1365,7 @@ var MeshWallet = class {
   async submitTx(tx) {
     if (!this._submitter) {
       throw new Error(
-        "[AppWallet] Submitter is required to submit transactions. Please provide a submitter."
+        "[MeshWallet] Submitter is required to submit transactions. Please provide a submitter."
       );
     }
     return this._submitter.submitTx(tx);
@@ -1309,11 +1378,11 @@ var MeshWallet = class {
    * @param addressType - the type of address to fetch UTXOs from (default: payment)
    * @returns an Address object
    */
-  getUsedAddress(addressType) {
-    if (addressType === "enterprise") {
-      return (0, import_core_cst4.toAddress)(this._addresses.enterpriseAddressBech32);
+  getUsedAddress(addressType = "payment") {
+    if (this.addresses.baseAddressBech32 && addressType === "payment") {
+      return (0, import_core_cst4.toAddress)(this.addresses.baseAddressBech32);
     } else {
-      return (0, import_core_cst4.toAddress)(this._addresses.baseAddressBech32);
+      return (0, import_core_cst4.toAddress)(this.addresses.enterpriseAddressBech32);
     }
   }
   /**
@@ -1324,14 +1393,14 @@ var MeshWallet = class {
    * @param addressType - the type of address to fetch UTXOs from (default: payment)
    * @returns a list of UTXOs
    */
-  async getUnspentOutputs(addressType) {
+  async getUnspentOutputs(addressType = "payment") {
     if (!this._fetcher) {
       throw new Error(
-        "[AppWallet] Fetcher is required to fetch UTxOs. Please provide a fetcher."
+        "[MeshWallet] Fetcher is required to fetch UTxOs. Please provide a fetcher."
       );
     }
     const utxos = await this._fetcher.fetchAddressUTxOs(
-      addressType == "enterprise" ? this._addresses.enterpriseAddressBech32 : this._addresses.baseAddressBech32
+      this.addresses.baseAddressBech32 && addressType == "payment" ? this.addresses.baseAddressBech32 : this.addresses.enterpriseAddressBech32
     );
     return utxos.map((utxo) => (0, import_core_cst4.toTxUnspentOutput)(utxo));
   }
@@ -1399,6 +1468,13 @@ var MeshWallet = class {
     const txHash = await this.submitTx(signedTx);
     return txHash;
   }
+  getPubDRepKey() {
+    return {
+      pubDRepKey: this.addresses.pubDRepKey,
+      dRepIDBech32: this.addresses.dRepIDBech32,
+      dRepIDHash: this.addresses.dRepIDHash
+    };
+  }
   /**
    * Generate mnemonic or private key
    *
@@ -1414,49 +1490,57 @@ var MeshWallet = class {
   }
   getAddressesFromWallet(wallet) {
     const account = wallet.getAccount(this._accountIndex, this._keyIndex);
-    this._addresses = {
+    this.addresses = {
       baseAddress: account.baseAddress,
       enterpriseAddress: account.enterpriseAddress,
       rewardAddress: account.rewardAddress,
       baseAddressBech32: account.baseAddressBech32,
       enterpriseAddressBech32: account.enterpriseAddressBech32,
-      rewardAddressBech32: account.rewardAddressBech32
+      rewardAddressBech32: account.rewardAddressBech32,
+      pubDRepKey: account.pubDRepKey,
+      dRepIDBech32: account.dRepIDBech32,
+      dRepIDHash: account.dRepIDHash
     };
   }
   buildAddressFromBech32Address(address) {
-    const serializer = new import_core_cst4.CardanoSDKSerializer();
-    const deserializedAddress = serializer.deserializer.key.deserializeAddress(address);
-    if (deserializedAddress.pubKeyHash && deserializedAddress.stakeCredentialHash) {
-      this._addresses.baseAddress = (0, import_core_cst4.buildBaseAddress)(
+    let pubKeyHash = void 0;
+    let stakeKeyHash = void 0;
+    const baseAddress = import_core_cst4.Address.fromBech32(address).asBase();
+    if (baseAddress) {
+      pubKeyHash = baseAddress.getPaymentCredential().hash;
+      stakeKeyHash = baseAddress.getStakeCredential().hash;
+    }
+    const enterpriseAddress = import_core_cst4.Address.fromBech32(address).asEnterprise();
+    if (enterpriseAddress) {
+      pubKeyHash = enterpriseAddress.getPaymentCredential().hash;
+    }
+    const rewardAddress = import_core_cst4.Address.fromBech32(address).asReward();
+    if (rewardAddress) {
+      stakeKeyHash = rewardAddress.getPaymentCredential().hash;
+    }
+    if (pubKeyHash && stakeKeyHash) {
+      this.addresses.baseAddress = (0, import_core_cst4.buildBaseAddress)(
         this._networkId,
+        import_core_cst4.Hash28ByteBase16.fromEd25519KeyHashHex((0, import_core_cst4.Ed25519KeyHashHex)(pubKeyHash)),
         import_core_cst4.Hash28ByteBase16.fromEd25519KeyHashHex(
-          (0, import_core_cst4.Ed25519KeyHashHex)(deserializedAddress.pubKeyHash)
-        ),
-        import_core_cst4.Hash28ByteBase16.fromEd25519KeyHashHex(
-          (0, import_core_cst4.Ed25519KeyHashHex)(
-            (0, import_core_cst4.Ed25519KeyHashHex)(deserializedAddress.stakeCredentialHash)
-          )
+          (0, import_core_cst4.Ed25519KeyHashHex)((0, import_core_cst4.Ed25519KeyHashHex)(stakeKeyHash))
         )
       ).toAddress();
-      this._addresses.baseAddressBech32 = this._addresses.baseAddress.toBech32();
+      this.addresses.baseAddressBech32 = this.addresses.baseAddress.toBech32();
     }
-    if (deserializedAddress.pubKeyHash) {
-      this._addresses.enterpriseAddress = (0, import_core_cst4.buildEnterpriseAddress)(
+    if (pubKeyHash) {
+      this.addresses.enterpriseAddress = (0, import_core_cst4.buildEnterpriseAddress)(
         this._networkId,
-        import_core_cst4.Hash28ByteBase16.fromEd25519KeyHashHex(
-          (0, import_core_cst4.Ed25519KeyHashHex)(deserializedAddress.pubKeyHash)
-        )
+        import_core_cst4.Hash28ByteBase16.fromEd25519KeyHashHex((0, import_core_cst4.Ed25519KeyHashHex)(pubKeyHash))
       ).toAddress();
-      this._addresses.enterpriseAddressBech32 = this._addresses.enterpriseAddress.toBech32();
+      this.addresses.enterpriseAddressBech32 = this.addresses.enterpriseAddress.toBech32();
     }
-    if (deserializedAddress.stakeCredentialHash) {
-      this._addresses.rewardAddress = (0, import_core_cst4.buildRewardAddress)(
+    if (stakeKeyHash) {
+      this.addresses.rewardAddress = (0, import_core_cst4.buildRewardAddress)(
         this._networkId,
-        import_core_cst4.Hash28ByteBase16.fromEd25519KeyHashHex(
-          (0, import_core_cst4.Ed25519KeyHashHex)(deserializedAddress.stakeCredentialHash)
-        )
+        import_core_cst4.Hash28ByteBase16.fromEd25519KeyHashHex((0, import_core_cst4.Ed25519KeyHashHex)(stakeKeyHash))
       ).toAddress();
-      this._addresses.rewardAddressBech32 = this._addresses.rewardAddress.toBech32();
+      this.addresses.rewardAddressBech32 = this.addresses.rewardAddress.toBech32();
     }
   }
 };

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import { DataSignature, IFetcher, ISubmitter, ISigner, IInitiator, Wallet, Asset, UTxO, AssetExtended } from '@meshsdk/common';
-import { TransactionUnspentOutput, Address, StricaPrivateKey, VkeyWitness } from '@meshsdk/core-cst';
+import { Ed25519PublicKeyHex, TransactionUnspentOutput, Address, StricaPrivateKey, DRepID, Ed25519KeyHashHex, VkeyWitness } from '@meshsdk/core-cst';
 
 type Cardano = {
     [key: string]: {
@@ -20,7 +20,7 @@ type TransactionSignatureRequest = {
     cbor: string;
     partialSign: boolean;
 };
-type WalletInstance = {
+interface Cip30WalletApi {
     experimental: ExperimentalFeatures;
     getBalance(): Promise<string>;
     getChangeAddress(): Promise<string>;
@@ -37,12 +37,14 @@ type WalletInstance = {
     signTxs?(txs: TransactionSignatureRequest[]): Promise<string[]>;
     signTxs?(txs: string[], partialSign: boolean): Promise<string[]>;
     submitTx(tx: string): Promise<string>;
-    cip95?: WalletInstanceCip95;
-};
-type WalletInstanceCip95 = {
-    getPubDRepKey(): Promise<string>;
-    getRegisteredPubStakeKeys(): Promise<string[]>;
-};
+    cip95?: Cip95WalletApi;
+}
+interface Cip95WalletApi {
+    getRegisteredPubStakeKeys: () => Promise<Ed25519PublicKeyHex[]>;
+    getUnregisteredPubStakeKeys: () => Promise<Ed25519PublicKeyHex[]>;
+    getPubDRepKey: () => Promise<Ed25519PublicKeyHex>;
+}
+type WalletInstance = Cip30WalletApi & Cip95WalletApi;
 type ExperimentalFeatures = {
     getCollateral(): Promise<string[] | undefined>;
     signTxs?(txs: TransactionSignatureRequest[]): Promise<string[]>;
@@ -285,6 +287,12 @@ declare class BrowserWallet implements IInitiator, ISigner, ISubmitter {
      * @returns a list of policy IDs
      */
     getPolicyIds(): Promise<string[]>;
+    /**
+     * 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
+     */
     getPubDRepKey(): Promise<{
         pubDRepKey: string;
         dRepIDHash: string;
@@ -294,6 +302,11 @@ declare class BrowserWallet implements IInitiator, ISigner, ISubmitter {
         pubStakeKeys: string[];
         pubStakeKeyHashes: string[];
     } | undefined>;
+    getUnregisteredPubStakeKeys(): Promise<{
+        pubStakeKeys: string[];
+        pubStakeKeyHashes: string[];
+    } | undefined>;
+    private static dRepKeyToDRepID;
     private static resolveInstance;
     static addBrowserWitnesses(unsignedTx: string, witnesses: string): string;
     static getSupportedExtensions(wallet: string): {
@@ -312,6 +325,9 @@ type Account = {
     stakeKey: StricaPrivateKey;
     paymentKeyHex: string;
     stakeKeyHex: string;
+    pubDRepKey?: string;
+    dRepIDBech32?: DRepID;
+    dRepIDHash?: Ed25519KeyHashHex;
 };
 type EmbeddedWalletKeyType = {
     type: "root";
@@ -337,6 +353,11 @@ declare class WalletStaticMethods {
         enterpriseAddress: Address;
         rewardAddress: Address;
     };
+    static getDRepKey(dRepKey: StricaPrivateKey, networkId?: number): {
+        pubDRepKey: string;
+        dRepIDBech32: DRepID;
+        dRepIDHash: Ed25519KeyHashHex;
+    };
     static generateMnemonic(strength?: number): string[];
     static addWitnessSets(txHex: string, witnesses: VkeyWitness[]): string;
 }
@@ -364,6 +385,9 @@ type CreateMeshWalletOptions = {
     } | {
         type: "mnemonic";
         words: string[];
+    } | {
+        type: "address";
+        address: string;
     };
     accountIndex?: number;
     keyIndex?: number;
@@ -371,10 +395,14 @@ type CreateMeshWalletOptions = {
 /**
  * Mesh Wallet provides a set of APIs to interact with the blockchain. This wallet is compatible with Mesh transaction builders.
  *
- * It is a single address wallet, a wrapper around the AppWallet class.
+ * There are 4 types of keys that can be used to create a wallet:
+ * - root: A private key in bech32 format, generally starts with `xprv1`
+ * - cli: CLI generated keys starts with `5820`. Payment key is required, and the stake key is optional.
+ * - mnemonic: A list of 24 words
+ * - address: A bech32 address that can be used to create a read-only wallet, generally starts with `addr` or `addr_test1`
  *
  * ```javascript
- * import { MeshWallet, BlockfrostProvider } from '@meshsdksdk/core';
+ * import { MeshWallet, BlockfrostProvider } from '@meshsdk/core';
  *
  * const blockchainProvider = new BlockfrostProvider('<BLOCKFROST_API_KEY>');
  *
@@ -396,7 +424,17 @@ declare class MeshWallet implements IInitiator, ISigner, ISubmitter {
     private readonly _fetcher?;
     private readonly _submitter?;
     private readonly _networkId;
-    private _addresses;
+    addresses: {
+        baseAddress?: Address;
+        enterpriseAddress?: Address;
+        rewardAddress?: Address;
+        baseAddressBech32?: string;
+        enterpriseAddressBech32?: string;
+        rewardAddressBech32?: string;
+        pubDRepKey?: string;
+        dRepIDBech32?: DRepID;
+        dRepIDHash?: Ed25519KeyHashHex;
+    };
     constructor(options: CreateMeshWalletOptions);
     /**
      * Returns a list of assets in the wallet. This API will return every assets in the wallet. Each asset is an object with the following properties:
@@ -560,6 +598,11 @@ declare class MeshWallet implements IInitiator, ISigner, ISubmitter {
      * @returns a transaction hash
      */
     createCollateral(): Promise<string>;
+    getPubDRepKey(): {
+        pubDRepKey: string | undefined;
+        dRepIDBech32: string | undefined;
+        dRepIDHash: string | undefined;
+    };
     /**
      * Generate mnemonic or private key
      *
@@ -567,8 +610,8 @@ declare class MeshWallet implements IInitiator, ISigner, ISubmitter {
      * @returns a transaction hash
      */
     static brew(privateKey?: boolean, strength?: number): string[] | string;
-    getAddressesFromWallet(wallet: EmbeddedWallet): void;
-    buildAddressFromBech32Address(address: string): void;
+    private getAddressesFromWallet;
+    private buildAddressFromBech32Address;
 }
 
 export { type Account, AppWallet, type AppWalletKeyType, BrowserWallet, type CreateAppWalletOptions, type CreateEmbeddedWalletOptions, type CreateMeshWalletOptions, EmbeddedWallet, type EmbeddedWalletKeyType, MeshWallet, WalletStaticMethods };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { DataSignature, IFetcher, ISubmitter, ISigner, IInitiator, Wallet, Asset, UTxO, AssetExtended } from '@meshsdk/common';
-import { TransactionUnspentOutput, Address, StricaPrivateKey, VkeyWitness } from '@meshsdk/core-cst';
+import { Ed25519PublicKeyHex, TransactionUnspentOutput, Address, StricaPrivateKey, DRepID, Ed25519KeyHashHex, VkeyWitness } from '@meshsdk/core-cst';
 
 type Cardano = {
     [key: string]: {
@@ -20,7 +20,7 @@ type TransactionSignatureRequest = {
     cbor: string;
     partialSign: boolean;
 };
-type WalletInstance = {
+interface Cip30WalletApi {
     experimental: ExperimentalFeatures;
     getBalance(): Promise<string>;
     getChangeAddress(): Promise<string>;
@@ -37,12 +37,14 @@ type WalletInstance = {
     signTxs?(txs: TransactionSignatureRequest[]): Promise<string[]>;
     signTxs?(txs: string[], partialSign: boolean): Promise<string[]>;
     submitTx(tx: string): Promise<string>;
-    cip95?: WalletInstanceCip95;
-};
-type WalletInstanceCip95 = {
-    getPubDRepKey(): Promise<string>;
-    getRegisteredPubStakeKeys(): Promise<string[]>;
-};
+    cip95?: Cip95WalletApi;
+}
+interface Cip95WalletApi {
+    getRegisteredPubStakeKeys: () => Promise<Ed25519PublicKeyHex[]>;
+    getUnregisteredPubStakeKeys: () => Promise<Ed25519PublicKeyHex[]>;
+    getPubDRepKey: () => Promise<Ed25519PublicKeyHex>;
+}
+type WalletInstance = Cip30WalletApi & Cip95WalletApi;
 type ExperimentalFeatures = {
     getCollateral(): Promise<string[] | undefined>;
     signTxs?(txs: TransactionSignatureRequest[]): Promise<string[]>;
@@ -285,6 +287,12 @@ declare class BrowserWallet implements IInitiator, ISigner, ISubmitter {
      * @returns a list of policy IDs
      */
     getPolicyIds(): Promise<string[]>;
+    /**
+     * 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
+     */
     getPubDRepKey(): Promise<{
         pubDRepKey: string;
         dRepIDHash: string;
@@ -294,6 +302,11 @@ declare class BrowserWallet implements IInitiator, ISigner, ISubmitter {
         pubStakeKeys: string[];
         pubStakeKeyHashes: string[];
     } | undefined>;
+    getUnregisteredPubStakeKeys(): Promise<{
+        pubStakeKeys: string[];
+        pubStakeKeyHashes: string[];
+    } | undefined>;
+    private static dRepKeyToDRepID;
     private static resolveInstance;
     static addBrowserWitnesses(unsignedTx: string, witnesses: string): string;
     static getSupportedExtensions(wallet: string): {
@@ -312,6 +325,9 @@ type Account = {
     stakeKey: StricaPrivateKey;
     paymentKeyHex: string;
     stakeKeyHex: string;
+    pubDRepKey?: string;
+    dRepIDBech32?: DRepID;
+    dRepIDHash?: Ed25519KeyHashHex;
 };
 type EmbeddedWalletKeyType = {
     type: "root";
@@ -337,6 +353,11 @@ declare class WalletStaticMethods {
         enterpriseAddress: Address;
         rewardAddress: Address;
     };
+    static getDRepKey(dRepKey: StricaPrivateKey, networkId?: number): {
+        pubDRepKey: string;
+        dRepIDBech32: DRepID;
+        dRepIDHash: Ed25519KeyHashHex;
+    };
     static generateMnemonic(strength?: number): string[];
     static addWitnessSets(txHex: string, witnesses: VkeyWitness[]): string;
 }
@@ -364,6 +385,9 @@ type CreateMeshWalletOptions = {
     } | {
         type: "mnemonic";
         words: string[];
+    } | {
+        type: "address";
+        address: string;
     };
     accountIndex?: number;
     keyIndex?: number;
@@ -371,10 +395,14 @@ type CreateMeshWalletOptions = {
 /**
  * Mesh Wallet provides a set of APIs to interact with the blockchain. This wallet is compatible with Mesh transaction builders.
  *
- * It is a single address wallet, a wrapper around the AppWallet class.
+ * There are 4 types of keys that can be used to create a wallet:
+ * - root: A private key in bech32 format, generally starts with `xprv1`
+ * - cli: CLI generated keys starts with `5820`. Payment key is required, and the stake key is optional.
+ * - mnemonic: A list of 24 words
+ * - address: A bech32 address that can be used to create a read-only wallet, generally starts with `addr` or `addr_test1`
  *
  * ```javascript
- * import { MeshWallet, BlockfrostProvider } from '@meshsdksdk/core';
+ * import { MeshWallet, BlockfrostProvider } from '@meshsdk/core';
  *
  * const blockchainProvider = new BlockfrostProvider('<BLOCKFROST_API_KEY>');
  *
@@ -396,7 +424,17 @@ declare class MeshWallet implements IInitiator, ISigner, ISubmitter {
     private readonly _fetcher?;
     private readonly _submitter?;
     private readonly _networkId;
-    private _addresses;
+    addresses: {
+        baseAddress?: Address;
+        enterpriseAddress?: Address;
+        rewardAddress?: Address;
+        baseAddressBech32?: string;
+        enterpriseAddressBech32?: string;
+        rewardAddressBech32?: string;
+        pubDRepKey?: string;
+        dRepIDBech32?: DRepID;
+        dRepIDHash?: Ed25519KeyHashHex;
+    };
     constructor(options: CreateMeshWalletOptions);
     /**
      * Returns a list of assets in the wallet. This API will return every assets in the wallet. Each asset is an object with the following properties:
@@ -560,6 +598,11 @@ declare class MeshWallet implements IInitiator, ISigner, ISubmitter {
      * @returns a transaction hash
      */
     createCollateral(): Promise<string>;
+    getPubDRepKey(): {
+        pubDRepKey: string | undefined;
+        dRepIDBech32: string | undefined;
+        dRepIDHash: string | undefined;
+    };
     /**
      * Generate mnemonic or private key
      *
@@ -567,8 +610,8 @@ declare class MeshWallet implements IInitiator, ISigner, ISubmitter {
      * @returns a transaction hash
      */
     static brew(privateKey?: boolean, strength?: number): string[] | string;
-    getAddressesFromWallet(wallet: EmbeddedWallet): void;
-    buildAddressFromBech32Address(address: string): void;
+    private getAddressesFromWallet;
+    private buildAddressFromBech32Address;
 }
 
 export { type Account, AppWallet, type AppWalletKeyType, BrowserWallet, type CreateAppWalletOptions, type CreateEmbeddedWalletOptions, type CreateMeshWalletOptions, EmbeddedWallet, type EmbeddedWalletKeyType, MeshWallet, WalletStaticMethods };

package/dist/index.js

@@ -232,11 +232,13 @@ import {
   Bip32PrivateKey,
   buildBaseAddress,
   buildBip32PrivateKey,
+  buildDRepID,
   buildEnterpriseAddress,
   buildKeys,
   buildRewardAddress,
   deserializeTx,
   deserializeTxHash,
+  DRep,
   Ed25519KeyHashHex,
   Ed25519PublicKeyHex,
   Ed25519SignatureHex,
@@ -273,23 +275,40 @@ var WalletStaticMethods = class {
       Hash28ByteBase16.fromEd25519KeyHashHex(
         Ed25519KeyHashHex(stakingKey.toPublicKey().hash().toString("hex"))
       )
-    );
+    ).toAddress();
     const enterpriseAddress = buildEnterpriseAddress(
       networkId,
       Hash28ByteBase16.fromEd25519KeyHashHex(
         Ed25519KeyHashHex(paymentKey.toPublicKey().hash().toString("hex"))
       )
-    );
+    ).toAddress();
     const rewardAddress = buildRewardAddress(
       networkId,
       Hash28ByteBase16.fromEd25519KeyHashHex(
         Ed25519KeyHashHex(stakingKey.toPublicKey().hash().toString("hex"))
       )
+    ).toAddress();
+    return {
+      baseAddress,
+      enterpriseAddress,
+      rewardAddress
+    };
+  }
+  static getDRepKey(dRepKey, networkId = 0) {
+    const pubKey = dRepKey.toPublicKey().pubKey;
+    const pubDRepKey = pubKey.toString("hex");
+    const dRepIDBech32 = buildDRepID(
+      Ed25519PublicKeyHex(pubDRepKey),
+      networkId
     );
+    const dRep = DRep.newKeyHash(
+      Ed25519KeyHashHex(dRepKey.toPublicKey().hash().toString("hex"))
+    );
+    const dRepIDHash = dRep.toKeyHash();
     return {
-      baseAddress: baseAddress.toAddress(),
-      enterpriseAddress: enterpriseAddress.toAddress(),
-      rewardAddress: rewardAddress.toAddress()
+      pubDRepKey,
+      dRepIDBech32,
+      dRepIDHash
     };
   }
   static generateMnemonic(strength = 256) {
@@ -338,13 +357,13 @@ var EmbeddedWallet = class extends WalletStaticMethods {
   getAccount(accountIndex = 0, keyIndex = 0) {
     if (this._entropy == void 0)
       throw new Error("[EmbeddedWallet] No keys initialized");
-    const { paymentKey, stakeKey } = buildKeys(
+    const { paymentKey, stakeKey, dRepKey } = buildKeys(
       this._entropy,
       accountIndex,
       keyIndex
     );
     const { baseAddress, enterpriseAddress, rewardAddress } = WalletStaticMethods.getAddresses(paymentKey, stakeKey, this._networkId);
-    return {
+    let _account = {
       baseAddress,
       enterpriseAddress,
       rewardAddress,
@@ -356,25 +375,30 @@ var EmbeddedWallet = class extends WalletStaticMethods {
       paymentKeyHex: paymentKey.toBytes().toString("hex"),
       stakeKeyHex: stakeKey.toBytes().toString("hex")
     };
+    if (dRepKey) {
+      const { pubDRepKey, dRepIDBech32, dRepIDHash } = WalletStaticMethods.getDRepKey(dRepKey, this._networkId);
+      _account.pubDRepKey = pubDRepKey;
+      _account.dRepIDBech32 = dRepIDBech32;
+      _account.dRepIDHash = dRepIDHash;
+    }
+    return _account;
   }
   getNetworkId() {
     return this._networkId;
   }
   signData(address, payload, accountIndex = 0, keyIndex = 0) {
     try {
-      const account = this.getAccount(accountIndex, keyIndex);
-      const foundAddress = [
-        account.baseAddress,
-        account.enterpriseAddress,
-        account.rewardAddress
-      ].find((a) => a.toBech32() === address);
+      const { baseAddress, enterpriseAddress, rewardAddress, paymentKey } = this.getAccount(accountIndex, keyIndex);
+      const foundAddress = [baseAddress, enterpriseAddress, rewardAddress].find(
+        (a) => a.toBech32() === address
+      );
       if (foundAddress === void 0)
         throw new Error(
           `[EmbeddedWallet] Address: ${address} doesn't belong to this account.`
         );
       return signData(payload, {
         address: Address.fromBech32(address),
-        key: account.paymentKey
+        key: paymentKey
       });
     } catch (error) {
       throw new Error(
@@ -385,13 +409,11 @@ var EmbeddedWallet = class extends WalletStaticMethods {
   signTx(unsignedTx, accountIndex = 0, keyIndex = 0) {
     try {
       const txHash = deserializeTxHash(resolveTxHash(unsignedTx));
-      const account = this.getAccount(accountIndex, keyIndex);
+      const { paymentKey } = this.getAccount(accountIndex, keyIndex);
       const vKeyWitness = new VkeyWitness(
-        Ed25519PublicKeyHex(
-          account.paymentKey.toPublicKey().toBytes().toString("hex")
-        ),
+        Ed25519PublicKeyHex(paymentKey.toPublicKey().toBytes().toString("hex")),
         Ed25519SignatureHex(
-          account.paymentKey.sign(Buffer.from(txHash, "hex")).toString("hex")
+          paymentKey.sign(Buffer.from(txHash, "hex")).toString("hex")
         )
       );
       return vKeyWitness;
@@ -556,7 +578,7 @@ import {
 } from "@meshsdk/common";
 import {
   addressToBech32,
-  buildDRepID,
+  buildDRepID as buildDRepID2,
   CardanoSDKUtil,
   deserializeAddress,
   deserializeTx as deserializeTx3,
@@ -817,6 +839,9 @@ var BrowserWallet = class _BrowserWallet {
    */
   async signTx(unsignedTx, partialSign = false) {
     const witness = await this._walletInstance.signTx(unsignedTx, partialSign);
+    if (witness === "") {
+      return unsignedTx;
+    }
     return _BrowserWallet.addBrowserWitnesses(unsignedTx, witness);
   }
   /**
@@ -860,8 +885,15 @@ var BrowserWallet = class _BrowserWallet {
     for (let i = 0; i < witnessSets.length; i++) {
       const unsignedTx = unsignedTxs[i];
       const cWitness = witnessSets[i];
-      const signedTx = _BrowserWallet.addBrowserWitnesses(unsignedTx, cWitness);
-      signedTxs.push(signedTx);
+      if (cWitness === "") {
+        signedTxs.push(unsignedTx);
+      } else {
+        const signedTx = _BrowserWallet.addBrowserWitnesses(
+          unsignedTx,
+          cWitness
+        );
+        signedTxs.push(signedTx);
+      }
     }
     return signedTxs;
   }
@@ -961,23 +993,27 @@ var BrowserWallet = class _BrowserWallet {
       new Set(balance.map((v) => v.unit.slice(0, POLICY_ID_LENGTH)))
     ).filter((p) => p !== "lovelace");
   }
+  /**
+   * 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
+   */
   async getPubDRepKey() {
     try {
       if (this._walletInstance.cip95 === void 0) return void 0;
       const dRepKey = await this._walletInstance.cip95.getPubDRepKey();
-      const dRepKeyHex = Ed25519PublicKeyHex2(dRepKey);
-      const dRepID = Ed25519PublicKey.fromHex(dRepKeyHex);
-      const dRepIDHex = (await dRepID.hash()).hex();
+      const { dRepKeyHex, dRepIDHash } = await _BrowserWallet.dRepKeyToDRepID(dRepKey);
       const networkId = await this.getNetworkId();
-      const dRepId = buildDRepID(dRepKeyHex, networkId);
+      const dRepId = buildDRepID2(dRepKeyHex, networkId);
       return {
         pubDRepKey: dRepKey,
-        dRepIDHash: dRepIDHex,
+        dRepIDHash,
         dRepIDBech32: dRepId
         // todo to check
       };
     } catch (e) {
-      console.log(e);
+      console.error(e);
       return void 0;
     }
   }
@@ -987,10 +1023,27 @@ var BrowserWallet = class _BrowserWallet {
       const pubStakeKeys = await this._walletInstance.cip95.getRegisteredPubStakeKeys();
       const pubStakeKeyHashes = await Promise.all(
         pubStakeKeys.map(async (pubStakeKey) => {
-          const pubStakeKeyHex = Ed25519PublicKeyHex2(pubStakeKey);
-          const pubStakeKeyPubKey = Ed25519PublicKey.fromHex(pubStakeKeyHex);
-          const pubStakeKeyHash = (await pubStakeKeyPubKey.hash()).hex();
-          return pubStakeKeyHash.toString();
+          const { dRepIDHash } = await _BrowserWallet.dRepKeyToDRepID(pubStakeKey);
+          return dRepIDHash;
+        })
+      );
+      return {
+        pubStakeKeys,
+        pubStakeKeyHashes
+      };
+    } catch (e) {
+      console.error(e);
+      return void 0;
+    }
+  }
+  async getUnregisteredPubStakeKeys() {
+    try {
+      if (this._walletInstance.cip95 === void 0) return void 0;
+      const pubStakeKeys = await this._walletInstance.cip95.getUnregisteredPubStakeKeys();
+      const pubStakeKeyHashes = await Promise.all(
+        pubStakeKeys.map(async (pubStakeKey) => {
+          const { dRepIDHash } = await _BrowserWallet.dRepKeyToDRepID(pubStakeKey);
+          return dRepIDHash;
         })
       );
       return {
@@ -998,10 +1051,20 @@ var BrowserWallet = class _BrowserWallet {
         pubStakeKeyHashes
       };
     } catch (e) {
-      console.log(e);
+      console.error(e);
       return void 0;
     }
   }
+  static async dRepKeyToDRepID(dRepKey) {
+    const dRepKeyHex = Ed25519PublicKeyHex2(dRepKey);
+    const dRepID = Ed25519PublicKey.fromHex(dRepKeyHex);
+    const dRepIDHash = (await dRepID.hash()).hex();
+    return {
+      dRepKeyHex,
+      dRepID,
+      dRepIDHash
+    };
+  }
   static resolveInstance(walletName, extensions = []) {
     if (window.cardano === void 0) return void 0;
     if (window.cardano[walletName] === void 0) return void 0;
@@ -1047,12 +1110,12 @@ import {
 } from "@meshsdk/common";
 import { resolvePrivateKey } from "@meshsdk/core-csl";
 import {
+  Address as Address4,
   buildBaseAddress as buildBaseAddress2,
   buildEnterpriseAddress as buildEnterpriseAddress2,
   buildRewardAddress as buildRewardAddress2,
-  CardanoSDKSerializer,
   deserializeTx as deserializeTx4,
-  Ed25519KeyHashHex as Ed25519KeyHashHex2,
+  Ed25519KeyHashHex as Ed25519KeyHashHex3,
   fromTxUnspentOutput as fromTxUnspentOutput2,
   Hash28ByteBase16 as Hash28ByteBase162,
   toAddress as toAddress3,
@@ -1061,14 +1124,14 @@ import {
 import { Transaction as Transaction3 } from "@meshsdk/transaction";
 var MeshWallet = class {
   _wallet;
-  // private readonly _account: Account;
   _accountIndex = 0;
   _keyIndex = 0;
   _fetcher;
   _submitter;
   _networkId;
-  _addresses = {};
+  addresses = {};
   constructor(options) {
+    this._networkId = options.networkId;
     switch (options.key.type) {
       case "root":
         this._wallet = new EmbeddedWallet({
@@ -1101,8 +1164,11 @@ var MeshWallet = class {
         });
         this.getAddressesFromWallet(this._wallet);
         break;
+      case "address":
+        this._wallet = null;
+        this.buildAddressFromBech32Address(options.key.address);
+        break;
     }
-    this._networkId = options.networkId;
     if (options.fetcher) this._fetcher = options.fetcher;
     if (options.submitter) this._submitter = options.submitter;
     if (options.accountIndex) this._accountIndex = options.accountIndex;
@@ -1143,7 +1209,7 @@ var MeshWallet = class {
    * @returns an address
    */
   getChangeAddress() {
-    return this._addresses.baseAddressBech32;
+    return this.addresses.baseAddressBech32 ? this.addresses.baseAddressBech32 : 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).
@@ -1196,7 +1262,7 @@ var MeshWallet = class {
    * @returns a list of reward addresses
    */
   getRewardAddresses() {
-    return [this._addresses.rewardAddressBech32];
+    return [this.addresses.rewardAddressBech32];
   }
   /**
    * Returns a list of unused addresses controlled by the wallet.
@@ -1236,7 +1302,7 @@ var MeshWallet = class {
    * @param addressType - the type of address to fetch UTXOs from (default: payment)
    * @returns a list of UTXOs
    */
-  async getUsedUTxOs(addressType) {
+  async getUsedUTxOs(addressType = "payment") {
     return await this.getUnspentOutputs(addressType);
   }
   /**
@@ -1245,7 +1311,7 @@ var MeshWallet = class {
    * @param addressType - the type of address to fetch UTXOs from (default: payment)
    * @returns a list of UTXOs
    */
-  async getUtxos(addressType) {
+  async getUtxos(addressType = "payment") {
     const utxos = await this.getUsedUTxOs(addressType);
     return utxos.map((c) => fromTxUnspentOutput2(c));
   }
@@ -1301,6 +1367,11 @@ var MeshWallet = class {
    * @returns array of signed transactions CborHex string
    */
   signTxs(unsignedTxs, partialSign = false) {
+    if (!this._wallet) {
+      throw new Error(
+        "[MeshWallet] Read only wallet does not support signing data."
+      );
+    }
     const signedTxs = [];
     for (const unsignedTx of unsignedTxs) {
       const signedTx = this.signTx(unsignedTx, partialSign);
@@ -1319,7 +1390,7 @@ var MeshWallet = class {
   async submitTx(tx) {
     if (!this._submitter) {
       throw new Error(
-        "[AppWallet] Submitter is required to submit transactions. Please provide a submitter."
+        "[MeshWallet] Submitter is required to submit transactions. Please provide a submitter."
       );
     }
     return this._submitter.submitTx(tx);
@@ -1332,11 +1403,11 @@ var MeshWallet = class {
    * @param addressType - the type of address to fetch UTXOs from (default: payment)
    * @returns an Address object
    */
-  getUsedAddress(addressType) {
-    if (addressType === "enterprise") {
-      return toAddress3(this._addresses.enterpriseAddressBech32);
+  getUsedAddress(addressType = "payment") {
+    if (this.addresses.baseAddressBech32 && addressType === "payment") {
+      return toAddress3(this.addresses.baseAddressBech32);
     } else {
-      return toAddress3(this._addresses.baseAddressBech32);
+      return toAddress3(this.addresses.enterpriseAddressBech32);
     }
   }
   /**
@@ -1347,14 +1418,14 @@ var MeshWallet = class {
    * @param addressType - the type of address to fetch UTXOs from (default: payment)
    * @returns a list of UTXOs
    */
-  async getUnspentOutputs(addressType) {
+  async getUnspentOutputs(addressType = "payment") {
     if (!this._fetcher) {
       throw new Error(
-        "[AppWallet] Fetcher is required to fetch UTxOs. Please provide a fetcher."
+        "[MeshWallet] Fetcher is required to fetch UTxOs. Please provide a fetcher."
       );
     }
     const utxos = await this._fetcher.fetchAddressUTxOs(
-      addressType == "enterprise" ? this._addresses.enterpriseAddressBech32 : this._addresses.baseAddressBech32
+      this.addresses.baseAddressBech32 && addressType == "payment" ? this.addresses.baseAddressBech32 : this.addresses.enterpriseAddressBech32
     );
     return utxos.map((utxo) => toTxUnspentOutput2(utxo));
   }
@@ -1422,6 +1493,13 @@ var MeshWallet = class {
     const txHash = await this.submitTx(signedTx);
     return txHash;
   }
+  getPubDRepKey() {
+    return {
+      pubDRepKey: this.addresses.pubDRepKey,
+      dRepIDBech32: this.addresses.dRepIDBech32,
+      dRepIDHash: this.addresses.dRepIDHash
+    };
+  }
   /**
    * Generate mnemonic or private key
    *
@@ -1437,49 +1515,57 @@ var MeshWallet = class {
   }
   getAddressesFromWallet(wallet) {
     const account = wallet.getAccount(this._accountIndex, this._keyIndex);
-    this._addresses = {
+    this.addresses = {
       baseAddress: account.baseAddress,
       enterpriseAddress: account.enterpriseAddress,
       rewardAddress: account.rewardAddress,
       baseAddressBech32: account.baseAddressBech32,
       enterpriseAddressBech32: account.enterpriseAddressBech32,
-      rewardAddressBech32: account.rewardAddressBech32
+      rewardAddressBech32: account.rewardAddressBech32,
+      pubDRepKey: account.pubDRepKey,
+      dRepIDBech32: account.dRepIDBech32,
+      dRepIDHash: account.dRepIDHash
     };
   }
   buildAddressFromBech32Address(address) {
-    const serializer = new CardanoSDKSerializer();
-    const deserializedAddress = serializer.deserializer.key.deserializeAddress(address);
-    if (deserializedAddress.pubKeyHash && deserializedAddress.stakeCredentialHash) {
-      this._addresses.baseAddress = buildBaseAddress2(
+    let pubKeyHash = void 0;
+    let stakeKeyHash = void 0;
+    const baseAddress = Address4.fromBech32(address).asBase();
+    if (baseAddress) {
+      pubKeyHash = baseAddress.getPaymentCredential().hash;
+      stakeKeyHash = baseAddress.getStakeCredential().hash;
+    }
+    const enterpriseAddress = Address4.fromBech32(address).asEnterprise();
+    if (enterpriseAddress) {
+      pubKeyHash = enterpriseAddress.getPaymentCredential().hash;
+    }
+    const rewardAddress = Address4.fromBech32(address).asReward();
+    if (rewardAddress) {
+      stakeKeyHash = rewardAddress.getPaymentCredential().hash;
+    }
+    if (pubKeyHash && stakeKeyHash) {
+      this.addresses.baseAddress = buildBaseAddress2(
         this._networkId,
+        Hash28ByteBase162.fromEd25519KeyHashHex(Ed25519KeyHashHex3(pubKeyHash)),
         Hash28ByteBase162.fromEd25519KeyHashHex(
-          Ed25519KeyHashHex2(deserializedAddress.pubKeyHash)
-        ),
-        Hash28ByteBase162.fromEd25519KeyHashHex(
-          Ed25519KeyHashHex2(
-            Ed25519KeyHashHex2(deserializedAddress.stakeCredentialHash)
-          )
+          Ed25519KeyHashHex3(Ed25519KeyHashHex3(stakeKeyHash))
         )
       ).toAddress();
-      this._addresses.baseAddressBech32 = this._addresses.baseAddress.toBech32();
+      this.addresses.baseAddressBech32 = this.addresses.baseAddress.toBech32();
     }
-    if (deserializedAddress.pubKeyHash) {
-      this._addresses.enterpriseAddress = buildEnterpriseAddress2(
+    if (pubKeyHash) {
+      this.addresses.enterpriseAddress = buildEnterpriseAddress2(
         this._networkId,
-        Hash28ByteBase162.fromEd25519KeyHashHex(
-          Ed25519KeyHashHex2(deserializedAddress.pubKeyHash)
-        )
+        Hash28ByteBase162.fromEd25519KeyHashHex(Ed25519KeyHashHex3(pubKeyHash))
       ).toAddress();
-      this._addresses.enterpriseAddressBech32 = this._addresses.enterpriseAddress.toBech32();
+      this.addresses.enterpriseAddressBech32 = this.addresses.enterpriseAddress.toBech32();
     }
-    if (deserializedAddress.stakeCredentialHash) {
-      this._addresses.rewardAddress = buildRewardAddress2(
+    if (stakeKeyHash) {
+      this.addresses.rewardAddress = buildRewardAddress2(
         this._networkId,
-        Hash28ByteBase162.fromEd25519KeyHashHex(
-          Ed25519KeyHashHex2(deserializedAddress.stakeCredentialHash)
-        )
+        Hash28ByteBase162.fromEd25519KeyHashHex(Ed25519KeyHashHex3(stakeKeyHash))
       ).toAddress();
-      this._addresses.rewardAddressBech32 = this._addresses.rewardAddress.toBech32();
+      this.addresses.rewardAddressBech32 = this.addresses.rewardAddress.toBech32();
     }
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshsdk/wallet",
-  "version": "1.6.4",
+  "version": "1.6.6",
   "description": "",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",