mainnet-js 2.7.34 → 3.0.0-next.1

package/dist/module/wallet/Base.js

@@ -1,22 +1,18 @@
-import { binToHex, CashAddressNetworkPrefix, CashAddressType, decodeCashAddress, encodeCashAddress, } from "@bitauth/libauth";
-import { DUST_UTXO_THRESHOLD } from "../constant.js";
-import { networkPrefixMap, NetworkType, prefixFromNetworkMap, UnitEnum, } from "../enum.js";
-import { getAddressHistory } from "../history/electrumTransformer.js";
+import { binToHex } from "@bitauth/libauth";
+import { NetworkType, prefixFromNetworkMap } from "../enum.js";
 import { NFTCapability } from "../interface.js";
-import { SignedMessage } from "../message/signed.js";
 import { getNetworkProvider } from "../network/default.js";
 import { getRelayFeeCache } from "../network/getRelayFeeCache.js";
-import { buildEncodedTransaction, getFeeAmount, getFeeAmountSimple, getSuitableUtxos, } from "../transaction/Wif.js";
-import { balanceFromSatoshi, balanceResponseFromSatoshi, } from "../util/balanceObjectFromSatoshi.js";
+import { buildEncodedTransaction, getFeeAmount, getFeeAmountSimple, getSuitableUtxos, placeholderPrivateKeyBin, } from "../transaction/Wif.js";
 import { checkUtxos } from "../util/checkUtxos.js";
-import { derivePrefix } from "../util/derivePublicKeyHash.js";
-import { amountInSatoshi, asSendRequestObject, deriveTokenaddr, getRuntimePlatform, hexToBin, sumTokenAmounts, sumUtxoValue, toTokenaddr, } from "../util/index.js";
-import { sanitizeUnit } from "../util/sanitizeUnit.js";
+import { asSendRequestObject, getRuntimePlatform, sumTokenAmounts, sumUtxoValue, toTokenaddr, } from "../util/index.js";
 import { sumSendRequestAmounts } from "../util/sumSendRequestAmounts.js";
 import { FeePaidByEnum, WalletTypeEnum } from "./enum.js";
 import { fromUtxoId, OpReturnData, SendRequest, SendResponse, TokenSendRequest, } from "./model.js";
 import { Util } from "./Util.js";
-const placeholderPrivateKey = "0000000000000000000000000000000000000000000000000000000000000001";
+import { SignedMessage } from "../message/signed.js";
+export const placeholderCashAddr = "bitcoincash:qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqfnhks603";
+export const placeholderTokenAddr = "bitcoincash:zqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqweyg7usz";
 /**
  * A class to hold features used by all wallets
  * @class  BaseWallet
@@ -38,16 +34,7 @@ export class BaseWallet {
     }
     // Return wallet info
     getInfo() {
-        return {
-            cashaddr: this.cashaddr,
-            tokenaddr: this.tokenaddr,
-            isTestnet: this.isTestnet,
-            name: this.name,
-            network: this.network,
-            publicKeyHash: binToHex(this.publicKeyHash),
-            walletId: this.toString(),
-            walletDbEntry: this.toDbString(),
-        };
+        throw Error("getInfo not implemented in BaseWallet");
     }
     slpSemiAware(value = true) {
         this._slpSemiAware = value;
@@ -69,7 +56,21 @@ export class BaseWallet {
      * @returns The deposit address as a string
      */
     getDepositAddress() {
-        return this.cashaddr;
+        // return this.cashaddr;
+        throw Error("getDepositAddress not implemented in BaseWallet");
+    }
+    /**
+     * getChangeAddress - get a wallet change address
+     *
+     * a high-level function,
+     *
+     * @see {@link https://rest-unstable.mainnet.cash/api-docs/#/wallet/changeAddress|/wallet/change_address} for REST endpoint
+     *
+     * @returns The change address as a string
+     */
+    getChangeAddress() {
+        // return this.cashaddr;
+        throw Error("getChangeAddress not implemented in BaseWallet");
     }
     /**
      * getTokenDepositAddress - get a cashtoken aware wallet deposit address
@@ -77,7 +78,17 @@ export class BaseWallet {
      * @returns The cashtoken aware deposit address as a string
      */
     getTokenDepositAddress() {
-        return this.tokenaddr;
+        // return this.tokenaddr;
+        throw Error("getTokenDepositAddress not implemented in BaseWallet");
+    }
+    /**
+     * getTokenDepositAddress - get a cashtoken aware wallet deposit address
+     *
+     * @returns The cashtoken aware deposit address as a string
+     */
+    getTokenChangeAddress() {
+        // return this.tokenaddr;
+        throw Error("getTokenDepositAddress not implemented in BaseWallet");
     }
     //#endregion Accessors
     //#region Constructors and Statics
@@ -95,19 +106,6 @@ export class BaseWallet {
         this.provider = this.getNetworkProvider(this.network);
         this.isTestnet = this.network === NetworkType.Mainnet ? false : true;
     }
-    /**
-     * watchOnly - create a watch-only wallet
-     *
-     * such kind of wallet does not have a private key and is unable to spend any funds
-     * however it still allows to use many utility functions such as getting and watching balance, etc.
-     *
-     * @param address   cashaddress, token aware cashaddress of a wallet
-     *
-     * @returns instantiated wallet
-     */
-    static async watchOnly(address) {
-        return new this().watchOnly(address);
-    }
     //#endregion Constructors
     /**
      * named (internal) get a named wallet from the database or create a new one.
@@ -142,7 +140,8 @@ export class BaseWallet {
                 return recoveredWallet;
             }
             else {
-                const wallet = await this.generate();
+                const wallet = await this.initialize();
+                wallet.name = name;
                 await db.addWallet(wallet.name, wallet.toDbString());
                 await db.close();
                 return wallet;
@@ -214,7 +213,7 @@ export class BaseWallet {
             throw Error("No database was available or configured to store the named wallet.");
         }
     }
-    async generate() {
+    async initialize() {
         return this;
     }
     //#region Serialization
@@ -248,45 +247,6 @@ export class BaseWallet {
         };
         return explorerUrlMap[this.network] + txId;
     }
-    // returns the public key hash for an address
-    getPublicKeyHash(hex = false) {
-        if (this.publicKeyHash) {
-            return hex ? binToHex(this.publicKeyHash) : this.publicKeyHash;
-        }
-        else {
-            throw Error("The public key hash for this wallet is not known. If this wallet was created from the constructor directly, calling the deriveInfo() function may help. ");
-        }
-    }
-    /**
-     * fromCashaddr - create a watch-only wallet in the network derived from the address
-     *
-     * such kind of wallet does not have a private key and is unable to spend any funds
-     * however it still allows to use many utility functions such as getting and watching balance, etc.
-     *
-     * @param address   cashaddress of a wallet
-     *
-     * @returns instantiated wallet
-     */
-    static async fromCashaddr(address) {
-        const prefix = derivePrefix(address);
-        const networkType = networkPrefixMap[prefix];
-        return new this(networkType).watchOnly(address);
-    }
-    /**
-     * fromTokenaddr - create a watch-only wallet in the network derived from the address
-     *
-     * such kind of wallet does not have a private key and is unable to spend any funds
-     * however it still allows to use many utility functions such as getting and watching balance, etc.
-     *
-     * @param address   token aware cashaddress of a wallet
-     *
-     * @returns instantiated wallet
-     */
-    static async fromTokenaddr(address) {
-        const prefix = derivePrefix(address);
-        const networkType = networkPrefixMap[prefix];
-        return new this(networkType).watchOnly(address);
-    }
     /**
      * named - create a named wallet
      *
@@ -326,62 +286,7 @@ export class BaseWallet {
         return new this().namedExists(name, dbName);
     }
     fromId(walletId) {
-        const [walletType, networkGiven, arg1, arg2] = walletId.split(":");
-        if (walletType !== WalletTypeEnum.Watch) {
-            throw Error(`fromId called on a ${walletType} wallet, expected a ${WalletTypeEnum.Watch} wallet`);
-        }
-        if (this.network != networkGiven) {
-            throw Error(`Network prefix ${networkGiven} to a ${this.network} wallet`);
-        }
-        if (arg2) {
-            return this.watchOnly(`${arg1}:${arg2}`);
-        }
-        return this.watchOnly(arg1);
-    }
-    // Initialize a watch only wallet from a cash addr
-    async watchOnly(address) {
-        // @ts-ignore
-        this.walletType = WalletTypeEnum.Watch;
-        const addressComponents = address.split(":");
-        let addressPrefix;
-        let addressBase;
-        if (addressComponents.length === 1) {
-            addressBase = addressComponents.shift();
-            addressPrefix = derivePrefix(addressBase);
-        }
-        else {
-            addressPrefix = addressComponents.shift();
-            addressBase = addressComponents.shift();
-            if (addressPrefix in networkPrefixMap) {
-                if (networkPrefixMap[addressPrefix] !== this.network) {
-                    throw Error(`a ${addressPrefix} address cannot be watched from a ${this.network} Wallet`);
-                }
-            }
-        }
-        const prefixedAddress = `${addressPrefix}:${addressBase}`;
-        // check if a token aware address was provided
-        const addressData = decodeCashAddress(prefixedAddress);
-        if (typeof addressData === "string")
-            throw addressData;
-        // @ts-ignore
-        this.publicKeyHash = addressData.payload;
-        let nonTokenAwareType = addressData.type;
-        if (nonTokenAwareType == CashAddressType.p2pkhWithTokens)
-            nonTokenAwareType = CashAddressType.p2pkh;
-        if (nonTokenAwareType == CashAddressType.p2shWithTokens)
-            nonTokenAwareType = CashAddressType.p2sh;
-        if (nonTokenAwareType == CashAddressType.p2pkh)
-            // @ts-ignore
-            this.publicKeyHash = addressData.payload;
-        // @ts-ignore
-        this.cashaddr = encodeCashAddress({
-            prefix: addressData.prefix,
-            type: nonTokenAwareType,
-            payload: addressData.payload,
-        }).address;
-        // @ts-ignore
-        this.tokenaddr = deriveTokenaddr(addressData.payload, this.networkPrefix);
-        return this;
+        throw Error("fromId not implemented in BaseWallet");
     }
     //#region Funds
     /**
@@ -389,24 +294,15 @@ export class BaseWallet {
      *
      */
     async getUtxos() {
-        if (!this.cashaddr) {
-            throw Error("Attempted to get utxos without an address");
-        }
-        return await this.getAddressUtxos(this.cashaddr);
+        throw Error("getUtxos not implemented in BaseWallet");
     }
-    // gets wallet balance in sats, bch and currency
-    async getBalance(rawUnit, priceCache = true) {
-        if (rawUnit) {
-            const unit = sanitizeUnit(rawUnit);
-            return await balanceFromSatoshi(await this.getBalanceFromProvider(), unit, priceCache);
-        }
-        else {
-            return await balanceResponseFromSatoshi(await this.getBalanceFromProvider(), priceCache);
-        }
+    // gets wallet balance in sats
+    async getBalance() {
+        return this.getBalanceFromProvider();
     }
     // Gets balance by summing value in all utxos in stats
     async getBalanceFromUtxos() {
-        const utxos = (await this.getAddressUtxos(this.cashaddr)).filter((val) => val.token === undefined);
+        const utxos = (await this.getUtxos()).filter((val) => val.token === undefined);
         return sumUtxoValue(utxos);
     }
     // Gets balance from fulcrum
@@ -422,16 +318,7 @@ export class BaseWallet {
         return this.getBalanceFromUtxos();
     }
     async getAddressUtxos(address) {
-        if (!address) {
-            address = this.cashaddr;
-        }
-        if (this._slpSemiAware) {
-            const bchUtxos = await this.provider.getUtxos(address);
-            return bchUtxos.filter((bchutxo) => bchutxo.satoshis > DUST_UTXO_THRESHOLD);
-        }
-        else {
-            return await this.provider.getUtxos(address);
-        }
+        throw Error("getAddressUtxos not implemented in BaseWallet");
     }
     // watching for any transaction hash of this wallet
     async watchAddress(callback) {
@@ -449,39 +336,17 @@ export class BaseWallet {
     // can be cancelled by calling the function returned from this one
     async watchBalance(callback) {
         return this.provider.watchAddressStatus(this.getDepositAddress(), async (_status) => {
-            const balance = (await this.getBalance());
+            const balance = await this.getBalanceFromProvider();
             callback(balance);
         });
     }
-    // sets up a callback to be called upon wallet's BCH or USD balance change
-    // if BCH balance does not change, the callback will be triggered every
-    // @param `usdPriceRefreshInterval` milliseconds by polling for new BCH USD price
-    // Since we want to be most sensitive to usd value change, we do not use the cached exchange rates
-    // can be cancelled by calling the function returned from this one
-    async watchBalanceUsd(callback, usdPriceRefreshInterval = 30000) {
-        let usdPrice = -1;
-        const _callback = async () => {
-            const balance = (await this.getBalance(undefined, false));
-            if (usdPrice !== balance.usd) {
-                usdPrice = balance.usd;
-                callback(balance);
-            }
-        };
-        const watchCancel = await this.provider.watchAddressStatus(this.getDepositAddress(), _callback);
-        const interval = setInterval(_callback, usdPriceRefreshInterval);
-        return async () => {
-            await watchCancel?.();
-            clearInterval(interval);
-        };
-    }
     // waits for address balance to be greater than or equal to the target value
     // this call halts the execution
-    async waitForBalance(value, rawUnit = UnitEnum.BCH) {
+    async waitForBalance(value) {
         return new Promise(async (resolve) => {
             let watchCancel;
             watchCancel = await this.watchBalance(async (balance) => {
-                const satoshiBalance = await amountInSatoshi(value, rawUnit);
-                if (balance.sat >= satoshiBalance) {
+                if (balance >= value) {
                     await watchCancel?.();
                     resolve(balance);
                 }
@@ -517,12 +382,6 @@ export class BaseWallet {
         outputCount: 1,
         options: {},
     }) {
-        if (!params.privateKey && params.options?.buildUnsigned !== true) {
-            throw Error("Couldn't get network or private key for wallet.");
-        }
-        if (!this.cashaddr) {
-            throw Error("attempted to send without a cashaddr");
-        }
         if (params.options && params.options.slpSemiAware) {
             this._slpSemiAware = true;
         }
@@ -539,15 +398,14 @@ export class BaseWallet {
             utxos = await checkUtxos(params.options.utxoIds.map((utxoId) => typeof utxoId === "string" ? fromUtxoId(utxoId) : utxoId), this);
         }
         else {
-            utxos = (await this.getAddressUtxos(this.cashaddr)).filter((utxo) => !utxo.token);
+            utxos = (await this.getUtxos()).filter((utxo) => !utxo.token);
         }
         // Get current height to assure recently mined coins are not spent.
         const bestHeight = await this.provider.getBlockHeight();
         // simulate outputs using the sender's address
         const sendRequest = new SendRequest({
-            cashaddr: this.cashaddr,
-            value: 100,
-            unit: "sat",
+            cashaddr: placeholderCashAddr,
+            value: 100n,
         });
         const sendRequests = Array(params.outputCount)
             .fill(0)
@@ -557,15 +415,14 @@ export class BaseWallet {
         const fee = await getFeeAmountSimple({
             utxos: fundingUtxos,
             sendRequests: sendRequests,
-            privateKey: params.privateKey ?? hexToBin(placeholderPrivateKey),
-            sourceAddress: this.cashaddr,
+            sourceAddress: placeholderCashAddr,
             relayFeePerByteInSatoshi: relayFeePerByteInSatoshi,
             feePaidBy: feePaidBy,
         });
         const spendableAmount = sumUtxoValue(fundingUtxos);
         let result = spendableAmount - fee;
-        if (result < 0) {
-            result = 0;
+        if (result < 0n) {
+            result = 0n;
         }
         return { value: result, utxos: fundingUtxos };
     }
@@ -574,7 +431,7 @@ export class BaseWallet {
         options: {},
     }) {
         const { value: result } = await this._getMaxAmountToSend(params);
-        return await balanceResponseFromSatoshi(result);
+        return result;
     }
     /**
      * send Send some amount to an address
@@ -595,7 +452,7 @@ export class BaseWallet {
             resp.explorerUrl = this.explorerUrl(resp.txId);
             if (options?.queryBalance === undefined ||
                 options?.queryBalance === true) {
-                resp.balance = (await this.getBalance());
+                resp.balance = await this.getBalance();
             }
         }
         else {
@@ -636,7 +493,6 @@ export class BaseWallet {
         const sendRequest = new SendRequest({
             cashaddr: cashaddr,
             value: maxSpendableAmount,
-            unit: "sat",
         });
         const { encodedTransaction, tokenIds, sourceOutputs } = await this.encodeTransaction([sendRequest], true, options, privateKey);
         const resp = new SendResponse({});
@@ -648,7 +504,7 @@ export class BaseWallet {
             resp.explorerUrl = this.explorerUrl(resp.txId);
             if (options?.queryBalance === undefined ||
                 options?.queryBalance === true) {
-                resp.balance = (await this.getBalance());
+                resp.balance = await this.getBalance();
             }
         }
         else {
@@ -665,37 +521,31 @@ export class BaseWallet {
      */
     async encodeTransaction(requests, discardChange = false, options, privateKey) {
         let sendRequests = asSendRequestObject(requests);
-        if (!privateKey && options?.buildUnsigned !== true) {
-            throw new Error(`Missing private key`);
-        }
         if (options && options.slpSemiAware) {
             this._slpSemiAware = true;
         }
         let feePaidBy;
-        if (options && options.feePaidBy) {
+        if (options?.feePaidBy) {
             feePaidBy = options.feePaidBy;
         }
         else {
             feePaidBy = FeePaidByEnum.change;
         }
         let changeAddress;
-        if (options && options.changeAddress) {
+        if (options?.changeAddress) {
             changeAddress = options.changeAddress;
         }
         else {
-            changeAddress = this.cashaddr;
+            changeAddress = this.getChangeAddress();
         }
         let checkTokenQuantities = true;
-        if (options && options.checkTokenQuantities === false) {
+        if (options?.checkTokenQuantities === false) {
             checkTokenQuantities = false;
         }
         // get inputs from options or query all inputs
-        let utxos;
+        let utxos = await this.getUtxos();
         if (options && options.utxoIds) {
-            utxos = await checkUtxos(options.utxoIds.map((utxoId) => typeof utxoId === "string" ? fromUtxoId(utxoId) : utxoId), this);
-        }
-        else {
-            utxos = await this.getAddressUtxos(this.cashaddr);
+            utxos = await checkUtxos(options.utxoIds.map((utxoId) => typeof utxoId === "string" ? fromUtxoId(utxoId) : utxoId), utxos);
         }
         // filter out token utxos if there are no token requests
         if (checkTokenQuantities &&
@@ -745,7 +595,7 @@ export class BaseWallet {
                     }
                     if (change > 0) {
                         outputs.push(new TokenSendRequest({
-                            cashaddr: toTokenaddr(changeAddress) || this.tokenaddr,
+                            cashaddr: toTokenaddr(this.getChangeAddress()),
                             amount: change,
                             tokenId: tokenId,
                             commitment: tokenOutputs[0].commitment,
@@ -769,33 +619,32 @@ export class BaseWallet {
         const feeEstimate = await getFeeAmountSimple({
             utxos: utxos,
             sendRequests: sendRequests,
-            privateKey: privateKey ?? hexToBin(placeholderPrivateKey),
-            sourceAddress: this.cashaddr,
+            sourceAddress: this.getDepositAddress(),
             relayFeePerByteInSatoshi: relayFeePerByteInSatoshi,
             feePaidBy: feePaidBy,
         });
-        const fundingUtxos = await getSuitableUtxos(utxos, BigInt(spendAmount) + BigInt(Math.ceil(feeEstimate)), bestHeight, feePaidBy, sendRequests, options?.ensureUtxos || [], options?.tokenOperation);
+        const fundingUtxos = await getSuitableUtxos(utxos, spendAmount + feeEstimate, bestHeight, feePaidBy, sendRequests, options?.ensureUtxos || [], options?.tokenOperation);
         if (fundingUtxos.length === 0) {
             throw Error("The available inputs couldn't satisfy the request with fees");
         }
         const fee = await getFeeAmount({
             utxos: fundingUtxos,
             sendRequests: sendRequests,
-            privateKey: privateKey ?? hexToBin(placeholderPrivateKey),
-            sourceAddress: this.cashaddr,
+            sourceAddress: this.getDepositAddress(),
             relayFeePerByteInSatoshi: relayFeePerByteInSatoshi,
             feePaidBy: feePaidBy,
+            walletCache: this.walletCache,
         });
         const { encodedTransaction, sourceOutputs } = await buildEncodedTransaction({
             inputs: fundingUtxos,
             outputs: sendRequests,
-            signingKey: privateKey ?? hexToBin(placeholderPrivateKey),
-            sourceAddress: this.cashaddr,
+            signingKey: privateKey ?? placeholderPrivateKeyBin,
             fee,
             discardChange,
             feePaidBy,
             changeAddress,
             buildUnsigned: options?.buildUnsigned === true,
+            walletCache: this.walletCache,
         });
         const tokenIds = [
             ...fundingUtxos
@@ -817,32 +666,7 @@ export class BaseWallet {
     }
     // gets transaction history of this wallet
     async getRawHistory(fromHeight = 0, toHeight = -1) {
-        return await this.provider.getHistory(this.cashaddr, fromHeight, toHeight);
-    }
-    /**
-     * getHistory gets transaction history of this wallet with most data decoded and ready to present to user
-     * @note balance calculations are valid only if querying to the blockchain tip (`toHeight` === -1, `count` === -1)
-     * @note this method is heavy on network calls, if invoked in browser use of cache is advised, @see `Config.UseLocalStorageCache`
-     * @note this method tries to recreate the history tab view of Electron Cash wallet, however, it may not be 100% accurate if the tnransaction value changes are the same in the same block (ordering)
-     *
-     * @param unit optional, BCH or currency unit to present balance and balance changes. If unit is currency like USD or EUR, balances will be subject to possible rounding errors. Default 0
-     * @param fromHeight optional, if set, history will be limited. Default 0
-     * @param toHeight optional, if set, history will be limited. Default -1, meaning that all history items will be returned, including mempool
-     * @param start optional, if set, the result set will be paginated with offset `start`
-     * @param count optional, if set, the result set will be paginated with `count`. Default -1, meaning that all history items will be returned
-     *
-     * @returns an array of transaction history items, with input values and addresses encoded in cashaddress format. @see `TransactionHistoryItem` type
-     */
-    async getHistory({ unit = "sat", fromHeight = 0, toHeight = -1, start = 0, count = -1, }) {
-        return getAddressHistory({
-            address: this.cashaddr,
-            provider: this.provider,
-            unit,
-            fromHeight,
-            toHeight,
-            start,
-            count,
-        });
+        throw Error("getRawHistory not implemented in BaseWallet");
     }
     // gets last transaction of this wallet
     async getLastTransaction(confirmedOnly = false) {
@@ -933,10 +757,6 @@ export class BaseWallet {
         return this.provider.waitForBlock(height);
     }
     //#endregion Funds
-    // Convenience wrapper to verify interface
-    async verify(message, sig, publicKey) {
-        return await new SignedMessage().verify(message, sig, this.cashaddr, publicKey);
-    }
     //#region Cashtokens
     /**
      * Create new cashtoken, both funglible and/or non-fungible (NFT)
@@ -953,21 +773,18 @@ export class BaseWallet {
         if (!Array.isArray(sendRequests)) {
             sendRequests = [sendRequests];
         }
-        let utxos;
-        if (options && options.utxoIds) {
-            utxos = await checkUtxos(options.utxoIds.map((utxoId) => typeof utxoId === "string" ? fromUtxoId(utxoId) : utxoId), this);
-        }
-        else {
-            utxos = await this.getAddressUtxos(this.cashaddr);
+        let utxos = await this.getUtxos();
+        if (options?.utxoIds) {
+            utxos = await checkUtxos(options.utxoIds.map((utxoId) => typeof utxoId === "string" ? fromUtxoId(utxoId) : utxoId), utxos);
         }
         const genesisInputs = utxos.filter((val) => val.vout === 0 && !val.token);
         if (genesisInputs.length === 0) {
             throw new Error("No suitable inputs with vout=0 available for new token genesis");
         }
         const genesisSendRequest = new TokenSendRequest({
-            cashaddr: genesisRequest.cashaddr || this.tokenaddr,
+            cashaddr: genesisRequest.cashaddr || this.getTokenDepositAddress(),
             amount: genesisRequest.amount,
-            value: genesisRequest.value || 1000,
+            value: genesisRequest.value || 1000n,
             capability: genesisRequest.capability,
             commitment: genesisRequest.commitment,
             tokenId: genesisInputs[0].txid,
@@ -1000,7 +817,7 @@ export class BaseWallet {
         if (!Array.isArray(mintRequests)) {
             mintRequests = [mintRequests];
         }
-        const utxos = await this.getAddressUtxos(this.cashaddr);
+        const utxos = await this.getUtxos();
         const nftUtxos = utxos.filter((val) => val.token?.tokenId === tokenId &&
             val.token?.capability === NFTCapability.minting);
         if (!nftUtxos.length) {
@@ -1011,7 +828,7 @@ export class BaseWallet {
             : nftUtxos[0].token.amount;
         const safeNewAmount = newAmount < 0n ? 0n : newAmount;
         const mintingInput = new TokenSendRequest({
-            cashaddr: this.tokenaddr,
+            cashaddr: toTokenaddr(nftUtxos[0].address),
             tokenId: tokenId,
             capability: nftUtxos[0].token.capability,
             commitment: nftUtxos[0].token.commitment,
@@ -1021,8 +838,8 @@ export class BaseWallet {
         return this.send([
             mintingInput,
             ...mintRequests.map((val) => new TokenSendRequest({
-                cashaddr: val.cashaddr || this.tokenaddr,
-                amount: 0,
+                cashaddr: val.cashaddr || this.getTokenDepositAddress(),
+                amount: 0n,
                 tokenId: tokenId,
                 value: val.value,
                 capability: val.capability,
@@ -1056,7 +873,7 @@ export class BaseWallet {
         if (burnRequest.tokenId?.length !== 64) {
             throw Error(`Invalid tokenId supplied: ${burnRequest.tokenId}`);
         }
-        const utxos = await this.getAddressUtxos(this.cashaddr);
+        const utxos = await this.getUtxos();
         const tokenUtxos = utxos.filter((val) => val.token?.tokenId === burnRequest.tokenId &&
             val.token?.capability === burnRequest.capability &&
             val.token?.commitment === burnRequest.commitment);
@@ -1090,7 +907,7 @@ export class BaseWallet {
                 const safeNewAmount = newAmount < 0n ? 0n : newAmount;
                 changeSendRequests = [
                     new TokenSendRequest({
-                        cashaddr: burnRequest.cashaddr || this.tokenaddr,
+                        cashaddr: burnRequest.cashaddr || toTokenaddr(this.getChangeAddress()),
                         tokenId: burnRequest.tokenId,
                         capability: burnRequest.capability,
                         commitment: burnRequest.commitment,
@@ -1121,10 +938,10 @@ export class BaseWallet {
                 const safeNewAmount = newAmount < 0n ? 0n : newAmount;
                 changeSendRequests = [
                     new TokenSendRequest({
-                        cashaddr: burnRequest.cashaddr || this.tokenaddr,
+                        cashaddr: burnRequest.cashaddr || toTokenaddr(this.getChangeAddress()),
                         tokenId: burnRequest.tokenId,
                         amount: safeNewAmount,
-                        value: tokenUtxos.reduce((a, c) => a + c.satoshis, 0),
+                        value: tokenUtxos.reduce((a, c) => a + c.satoshis, 0n),
                     }),
                 ];
             }
@@ -1142,10 +959,10 @@ export class BaseWallet {
      * getTokenUtxos Get unspent token outputs for the wallet
      * will return utxos only for the specified token if `tokenId` provided
      * @param  {string?} tokenId tokenId (category) to filter utxos by, if not set will return utxos from all tokens
-     * @returns  {UtxoI[]} token utxos
+     * @returns  {Utxo[]} token utxos
      */
     async getTokenUtxos(tokenId) {
-        const utxos = await this.getAddressUtxos(this.cashaddr);
+        const utxos = await this.getUtxos();
         return utxos.filter((val) => tokenId ? val.token?.tokenId === tokenId : val.token);
     }
     /**
@@ -1199,35 +1016,19 @@ export class BaseWallet {
         }
         return result;
     }
-}
-/**
- * Class to manage a mainnet watch wallet.
- */
-export class WatchWallet extends BaseWallet {
-    static { this.networkPrefix = CashAddressNetworkPrefix.mainnet; }
-    static { this.walletType = WalletTypeEnum.Watch; }
-    constructor() {
-        super(NetworkType.Mainnet);
-    }
-}
-/**
- * Class to manage a testnet watch wallet.
- */
-export class TestNetWatchWallet extends BaseWallet {
-    static { this.networkPrefix = CashAddressNetworkPrefix.testnet; }
-    static { this.walletType = WalletTypeEnum.Watch; }
-    constructor() {
-        super(NetworkType.Testnet);
+    //#endregion Cashtokens
+    sign(message, privateKey = undefined) {
+        if (!privateKey) {
+            throw new Error("Signing private key not provided");
+        }
+        return new SignedMessage().sign(message, privateKey);
     }
-}
-/**
- * Class to manage a regtest watch wallet.
- */
-export class RegTestWatchWallet extends BaseWallet {
-    static { this.networkPrefix = CashAddressNetworkPrefix.regtest; }
-    static { this.walletType = WalletTypeEnum.Watch; }
-    constructor() {
-        super(NetworkType.Regtest);
+    // Convenience wrapper to verify interface
+    verify(message, sig, address, publicKey) {
+        if (!address && !publicKey) {
+            throw new Error("Either address or publicKey must be provided for verification");
+        }
+        return new SignedMessage().verify(message, sig, address, publicKey);
     }
 }
 /**
@@ -1235,7 +1036,7 @@ export class RegTestWatchWallet extends BaseWallet {
  * mainnet wallets on public servers if ALLOW_MAINNET_USER_WALLETS is set to false
  * @param {BaseWallet} wallet        a wallet
  */
-const _checkContextSafety = function (wallet) {
+export const _checkContextSafety = function (wallet) {
     if (getRuntimePlatform() === "node") {
         if (process.env.ALLOW_MAINNET_USER_WALLETS === `false`) {
             if (wallet.network === NetworkType.Mainnet) {
@@ -1273,7 +1074,7 @@ export async function getNamedWalletId(name, dbName) {
         throw Error("No database was available or configured to store the named wallet.");
     }
 }
-function getStorageProvider(dbName) {
+export function getStorageProvider(dbName) {
     if (!BaseWallet.StorageProvider) {
         return undefined;
     }