From bcd0bcc8caf38c511d0331599b9f0afdf535d278 Mon Sep 17 00:00:00 2001
From: Duddino <duddino@duddino.com>
Date: Tue, 3 Oct 2023 15:27:37 +0200
Subject: [PATCH 1/3] Add duddino testnet explorer (#220)

---
 scripts/chain_params.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/chain_params.js b/scripts/chain_params.js
index 55fc752e6..a4ba68ae3 100644
--- a/scripts/chain_params.js
+++ b/scripts/chain_params.js
@@ -67,6 +67,7 @@ export const cChainParams = {
         Explorers: [
             // Display name      Blockbook-compatible API base
             { name: 'rockdev', url: 'https://testnet.rockdev.org' },
+            { name: 'duddino', url: 'https://testnet.duddino.com' },
         ],
         Nodes: [{ name: 'Duddino', url: 'https://rpc.duddino.com/testnet' }],
         Consensus: {

From 2893160fb28710b0352ee93c894a2bff5437e0ab Mon Sep 17 00:00:00 2001
From: JSKitty <jskitty@protonmail.com>
Date: Tue, 3 Oct 2023 15:30:05 +0100
Subject: [PATCH 2/3] Cold Staking improvements: owner addresses, defaults and
 fixes (#206)

* Add Owner Address setting + misc tweaks

* i18n

* Revert to `master` isOwnAddress()

* Migrate to Account-based CS data + rework logic

* Finalise i18n

* Fix `delegateChange` JSDoc type

Co-authored-by: Duddino <duddino@duddino.com>

---------

Co-authored-by: Duddino <duddino@duddino.com>
---
 index.template.html            | 11 ++++++
 locale/de/translation.js       |  3 +-
 locale/en/translation.js       |  1 +
 locale/es-mx/translation.js    |  1 +
 locale/fr/translation.js       |  1 +
 locale/it/translation.js       |  1 +
 locale/ph/translation.js       |  1 +
 locale/pt-br/translation.js    |  1 +
 locale/pt-pt/translation.js    |  1 +
 locale/template/translation.js |  1 +
 locale/uwu/translation.js      |  1 +
 scripts/accounts.js            |  7 +++-
 scripts/chain_params.js        |  2 +
 scripts/global.js              | 54 ++++++++++++++++----------
 scripts/misc.js                | 12 ++++++
 scripts/network.js             |  8 ++--
 scripts/settings.js            | 43 ++++++++++++--------
 scripts/transactions.js        | 71 +++++++++++++++++++---------------
 scripts/wallet.js              | 18 ++++++++-
 19 files changed, 162 insertions(+), 76 deletions(-)

diff --git a/index.template.html b/index.template.html
index cc85a1dd2..271fcb1d5 100644
--- a/index.template.html
+++ b/index.template.html
@@ -932,6 +932,17 @@ <h3 class="noselect balance-title">
                       </div>
                     </div>
 
+                    <div id="ownerAddressContainer">
+                      <label data-i18n="ownerAddress">(Optional) Owner Address</label><br />
+
+                      <div class="input-group mb-3">
+                        <input class="btn-group-input" data-i18n="ownerAddress" oninput='MPW.guiCheckRecipientInput(event)' style="font-family: monospace;" type="text" id="delegateOwnerAddress" placeholder="(Optional) Owner Address" autocomplete="nope" />
+                        <div class="input-group-append">
+                          <span class="input-group-text ptr" onclick="MPW.guiSelectContact(MPW.doms.domStakeOwnerAddress)"><i class="fa-solid fa-address-book fa-2xl"></i></span>
+                        </div>
+                      </div>
+                    </div>
+
                     <div class="text-right pb-2">
                       <button class="pivx-button-medium w-100" style="margin:0px;" onclick="MPW.delegateGUI()">
                         <span class="buttoni-icon"><i class="fas fa-paper-plane fa-tiny-margin"></i></span>
diff --git a/locale/de/translation.js b/locale/de/translation.js
index ec075d7b5..8eb169108 100644
--- a/locale/de/translation.js
+++ b/locale/de/translation.js
@@ -166,6 +166,7 @@ export default {
     // Stake
     stake: 'Delegieren', //Stake
     stakeUnstake: 'Abberufen', //Unstake
+    ownerAddress: '', //(Optional) Owner Address
     rewardHistory: 'Vergütungshistorie', //Reward History
     loadMore: 'Zeige mehr', //Load more
 
@@ -249,7 +250,7 @@ export default {
     popupSetColdAddr: 'Gib eine kalte Staking Adresse an', //Set your Cold Staking address
     popupCurrentAddress: 'Aktuelle Adresse', //Current address:
     popupColdStakeNote:
-        'Eine kalte Staking Adresse delegiert Münzen für dich. Sie kann nicht für Transaktionen verwendet werden, so kannst du auch fremde kalte Adressen verwenden!', //A Cold Address stakes coins on your behalf, it cannot spend coins, so it's even safe to use a stranger's Cold Address!
+        'Eine kalte Staking Adresse delegiert Münzen für dich. Sie kann nicht für Transaktionen verwendet werden, so kannst du auch fremde kalte Adressen verwenden!', //A Cold Address stakes coins on your behalf, it cannot spend coins, so it's even safe to use a stranger\'s Cold Address!
     popupExample: 'Beispiel', //Example:
     popupWalletLock: 'Möchtest du deine Geldbörse sperren?', //Do you want to lock your wallet?
     popupWalletWipe:
diff --git a/locale/en/translation.js b/locale/en/translation.js
index e8b4a23b3..8433caa9b 100644
--- a/locale/en/translation.js
+++ b/locale/en/translation.js
@@ -157,6 +157,7 @@ export default {
     // Stake
     stake: 'Stake', //
     stakeUnstake: 'Unstake', //
+    ownerAddress: '(Optional) Owner Address',
     rewardHistory: 'Reward History', //
     loadMore: 'Load more', //
 
diff --git a/locale/es-mx/translation.js b/locale/es-mx/translation.js
index d59e50f80..4d8351db4 100644
--- a/locale/es-mx/translation.js
+++ b/locale/es-mx/translation.js
@@ -165,6 +165,7 @@ export default {
     // Stake
     stake: 'Stake', //Stake
     stakeUnstake: 'Unstake', //Unstake
+    ownerAddress: '', //(Optional) Owner Address
     rewardHistory: 'Historial de recompensas', //Reward History
     loadMore: 'Cargar más', //Load more
 
diff --git a/locale/fr/translation.js b/locale/fr/translation.js
index a7d128722..4d2793d9d 100644
--- a/locale/fr/translation.js
+++ b/locale/fr/translation.js
@@ -163,6 +163,7 @@ export default {
     // Stake
     stake: 'Stake', //Stake
     stakeUnstake: 'Unstake', //Unstake
+    ownerAddress: '', //(Optional) Owner Address
     rewardHistory: 'Historique des récompenses', //Reward History
     loadMore: 'Chargez plus', //Load more
 
diff --git a/locale/it/translation.js b/locale/it/translation.js
index fe5aa93cf..6e758871c 100644
--- a/locale/it/translation.js
+++ b/locale/it/translation.js
@@ -150,6 +150,7 @@ export default {
     // Stake
     stake: 'Stake', //Stake
     stakeUnstake: 'Unstake', //Unstake
+    ownerAddress: '', //(Optional) Owner Address
     rewardHistory: 'Cronologia delle ricompense', //Reward History
     loadMore: 'Carica altro', //Load more
 
diff --git a/locale/ph/translation.js b/locale/ph/translation.js
index 1fce7a905..58f3fe837 100644
--- a/locale/ph/translation.js
+++ b/locale/ph/translation.js
@@ -167,6 +167,7 @@ export default {
     // Stake
     stake: 'Stake', //Stake
     stakeUnstake: 'Unstake', //Unstake
+    ownerAddress: '', //(Optional) Owner Address
     rewardHistory: 'History ng iyong Reward', //Reward History
     loadMore: 'Load more', //Load more
 
diff --git a/locale/pt-br/translation.js b/locale/pt-br/translation.js
index b9d5b1b7f..37e9bb94f 100644
--- a/locale/pt-br/translation.js
+++ b/locale/pt-br/translation.js
@@ -164,6 +164,7 @@ export default {
     // Stake
     stake: 'Stake', //Stake
     stakeUnstake: 'Unstake', //Unstake
+    ownerAddress: '', //(Optional) Owner Address
     rewardHistory: 'Histórico de recompensas', //Reward History
     loadMore: 'Carregar mais', //Load more
 
diff --git a/locale/pt-pt/translation.js b/locale/pt-pt/translation.js
index 6c09efe89..5f28ae6c1 100644
--- a/locale/pt-pt/translation.js
+++ b/locale/pt-pt/translation.js
@@ -164,6 +164,7 @@ export default {
     // Stake
     stake: 'Stake', //Stake
     stakeUnstake: 'Unstake', //Unstake
+    ownerAddress: '', //(Optional) Owner Address
     rewardHistory: 'Histórico de recompensas', //Reward History
     loadMore: 'Carregar mais', //Load more
 
diff --git a/locale/template/translation.js b/locale/template/translation.js
index 97d748da6..103c89015 100644
--- a/locale/template/translation.js
+++ b/locale/template/translation.js
@@ -166,6 +166,7 @@ export default {
     // Stake
     stake: '', //Stake
     stakeUnstake: '', //Unstake
+    ownerAddress: '', //(Optional) Owner Address
     rewardHistory: '', //Reward History
     loadMore: '', //Load more
 
diff --git a/locale/uwu/translation.js b/locale/uwu/translation.js
index a4d629c44..6c180d0b2 100644
--- a/locale/uwu/translation.js
+++ b/locale/uwu/translation.js
@@ -160,6 +160,7 @@ export default {
     // Stake
     stake: '', //Stake
     stakeUnstake: '', //Unstake
+    ownerAddress: '(Optional) Owner Addwess', //(Optional) Owner Address
     rewardHistory: 'Rewawrd Histowy', //Reward History
     loadMore: 'Lowoad Mowore', //Load more
 
diff --git a/scripts/accounts.js b/scripts/accounts.js
index 4e0ba0734..aeda262f6 100644
--- a/scripts/accounts.js
+++ b/scripts/accounts.js
@@ -11,7 +11,8 @@ export class Account {
      * @param {String} [accountData.encWif] - The encrypted WIF.
      * @param {Array<Object>} [accountData.localProposals] - The local proposals.
      * @param {Array<Contact>} [accountData.contacts] - The Contacts saved in this account.
-     * @param {String} [account.name] - The Contact Name of the account.
+     * @param {String} [accountData.name] - The Contact Name of the account.
+     * @param {String} [accountData.coldAddress] - The Cold Address that this account delegates to.
      */
     constructor(accountData) {
         // Keys take the Constructor as priority, but if missing, default to their "Type" in empty form for type-safety
@@ -20,6 +21,7 @@ export class Account {
         this.localProposals = accountData?.localProposals || [];
         this.contacts = accountData?.contacts || [];
         this.name = accountData?.name || '';
+        this.coldAddress = accountData?.coldAddress || '';
     }
 
     /** @type {String} The public key. */
@@ -37,6 +39,9 @@ export class Account {
     /** @type {String} The Contact Name of the account. */
     name = '';
 
+    /** @type {String} The Cold Address that this account delegates to. */
+    coldAddress = '';
+
     /**
      * Search for a Contact in this account, by specific properties
      * @param {Object} settings
diff --git a/scripts/chain_params.js b/scripts/chain_params.js
index a4ba68ae3..3185c14d4 100644
--- a/scripts/chain_params.js
+++ b/scripts/chain_params.js
@@ -49,6 +49,7 @@ export const cChainParams = {
         proposalFeeConfirmRequirement: 6,
         maxPaymentCycles: 6,
         maxPayment: 10 * 43200 * COIN, // 43200 blocks of 10 PIV
+        defaultColdStakingAddress: 'SdgQDpS8jDRJDX8yK8m9KnTMarsE84zdsy', // Labs Cold Pool
     },
     testnet: {
         name: 'testnet',
@@ -79,6 +80,7 @@ export const cChainParams = {
         proposalFeeConfirmRequirement: 3,
         maxPaymentCycles: 20,
         maxPayment: 10 * 144 * COIN, // 144 blocks of 10 tPIV
+        defaultColdStakingAddress: 'WmNziUEPyhnUkiVdfsiNX93H6rSJnios44', // Sparrow's Testnet Cold Pool
     },
 };
 // Set default chain
diff --git a/scripts/global.js b/scripts/global.js
index f178ea41a..f92e3fd6b 100644
--- a/scripts/global.js
+++ b/scripts/global.js
@@ -17,8 +17,6 @@ import {
     debug,
     cMarket,
     strCurrency,
-    setColdStakingAddress,
-    strColdStakingAddress,
     nDisplayDecimals,
     fAdvancedMode,
 } from './settings.js';
@@ -34,6 +32,7 @@ import {
     sleep,
     beautifyNumber,
     isStandardAddress,
+    isColdAddress,
 } from './misc.js';
 import { cChainParams, COIN, MIN_PASS_LENGTH } from './chain_params.js';
 import { decrypt } from './aes-gcm.js';
@@ -105,6 +104,10 @@ export async function start() {
             'guiBalanceStakingTicker'
         ),
         domStakeAmount: document.getElementById('delegateAmount'),
+        domStakeOwnerAddressContainer: document.getElementById(
+            'ownerAddressContainer'
+        ),
+        domStakeOwnerAddress: document.getElementById('delegateOwnerAddress'),
         domUnstakeAmount: document.getElementById('undelegateAmount'),
         domStakeTab: document.getElementById('stakeTab'),
         domAddress1s: document.getElementById('address1s'),
@@ -1557,36 +1560,47 @@ export function isMasternodeUTXO(cUTXO, cMasternode) {
  * Creates a GUI popup for the user to check or customise their Cold Address
  */
 export async function guiSetColdStakingAddress() {
+    // Use the Account's cold address, otherwise use the network's default Cold Staking address
+    const strColdAddress = await wallet.getColdStakingAddress();
+
+    // Display the popup and await a response
     if (
         await confirmPopup({
             title: translation.popupSetColdAddr,
-            html: `<p>${
-                translation.popupCurrentAddress
-            }<br><span class="mono">${strColdStakingAddress}</span><br><br><span style="opacity: 0.65; margin: 10px;">${
-                translation.popupColdStakeNote
-            }</span></p><br><input type="text" id="newColdAddress" placeholder="${
+            html: `
+            <p>
+                <span style="opacity: 0.65; margin: 10px; margin-buttom: 0px;">
+                    ${translation.popupColdStakeNote}
+                </span>
+            </p>
+            <input type="text" id="newColdAddress" placeholder="${
                 translation.popupExample
-            } ${strColdStakingAddress.substring(
+            } ${strColdAddress.substring(
                 0,
                 6
-            )}..." style="text-align: center;">`,
+            )}..." value="${strColdAddress}" style="text-align: center;">`,
         })
     ) {
-        // Fetch address from the popup input
-        const strColdAddress = document.getElementById('newColdAddress').value;
-
-        // If it's empty, just return false
-        if (!strColdAddress) return false;
-
-        // Sanity-check, and set!
+        // Check the Cold Address input
+        const strNewColdAddress = document
+            .getElementById('newColdAddress')
+            .value.trim();
+        const fValidCold = isColdAddress(strNewColdAddress);
         if (
-            strColdAddress[0] === cChainParams.current.STAKING_PREFIX &&
-            strColdAddress.length === 34
+            !strNewColdAddress ||
+            (strNewColdAddress !== strColdAddress && fValidCold)
         ) {
-            await setColdStakingAddress(strColdAddress);
+            // If the input is empty: we'll default back to this network's Cold Staking address (effectively a 'reset')
+            const cDB = await Database.getInstance();
+            const cAccount = await cDB.getAccount();
+
+            // Save to DB (allowDeletion enabled to allow for resetting the Cold Address)
+            cAccount.coldAddress = strNewColdAddress;
+            await cDB.updateAccount(cAccount, true);
+
             createAlert('info', ALERTS.STAKE_ADDR_SET, 5000);
             return true;
-        } else {
+        } else if (!fValidCold) {
             createAlert('warning', ALERTS.STAKE_ADDR_BAD, 2500);
             return false;
         }
diff --git a/scripts/misc.js b/scripts/misc.js
index 022110138..6a101ea36 100644
--- a/scripts/misc.js
+++ b/scripts/misc.js
@@ -289,6 +289,18 @@ export function isStandardAddress(strAddress) {
     );
 }
 
+/**
+ * A quick check to see if an address is a Cold (P2CS) address
+ * @param {string} strAddress - The address to check
+ * @returns {boolean} - `true` if a Cold address, `false` if not
+ */
+export function isColdAddress(strAddress) {
+    return (
+        strAddress.length === 34 &&
+        cChainParams.current.STAKING_PREFIX === strAddress[0]
+    );
+}
+
 /**
  * A quick check to see if a string is an XPub key
  * @param {string} strXPub - The XPub to check
diff --git a/scripts/network.js b/scripts/network.js
index 0549efd63..4947b034b 100644
--- a/scripts/network.js
+++ b/scripts/network.js
@@ -1,5 +1,5 @@
 import { cChainParams, COIN } from './chain_params.js';
-import { createAlert } from './misc.js';
+import { createAlert, isColdAddress } from './misc.js';
 import { Mempool, UTXO } from './mempool.js';
 import { getEventEmitter } from './event_bus.js';
 import {
@@ -526,7 +526,7 @@ export class ExplorerNetwork extends Network {
                     // Check vins for undelegations
                     for (const vin of tx.vin) {
                         const fDelegation = vin.addresses?.some((addr) =>
-                            addr.startsWith(cChainParams.current.STAKING_PREFIX)
+                            isColdAddress(addr)
                         );
                         if (fDelegation) {
                             nDelegated -= parseInt(vin.value);
@@ -537,9 +537,7 @@ export class ExplorerNetwork extends Network {
                     for (const out of tx.vout) {
                         strDelegatedAddr =
                             out.addresses?.find((addr) =>
-                                addr.startsWith(
-                                    cChainParams.current.STAKING_PREFIX
-                                )
+                                isColdAddress(addr)
                             ) || strDelegatedAddr;
 
                         const fDelegation = !!strDelegatedAddr;
diff --git a/scripts/settings.js b/scripts/settings.js
index 0f4016280..ac0c1a4e4 100644
--- a/scripts/settings.js
+++ b/scripts/settings.js
@@ -44,8 +44,6 @@ export let cExplorer = cChainParams.current.Explorers[0];
 export let cNode = cChainParams.current.Nodes[0];
 /** A mode which allows MPW to automatically select it's data sources */
 export let fAutoSwitch = true;
-/** The active Cold Staking address: default is the PIVX Labs address */
-export let strColdStakingAddress = 'SdgQDpS8jDRJDX8yK8m9KnTMarsE84zdsy';
 /** The decimals to display for the wallet balance */
 export let nDisplayDecimals = 2;
 /** A mode which configures MPW towards Advanced users, with low-level feature access and less restrictions (Potentially dangerous) */
@@ -95,21 +93,22 @@ export class Settings {
         explorer,
         node,
         autoswitch = true,
-        coldAddress = strColdStakingAddress,
         translation = '',
         displayCurrency = 'usd',
         displayDecimals = nDisplayDecimals,
         advancedMode = false,
+        coldAddress = '',
     } = {}) {
         this.analytics = analytics;
         this.explorer = explorer;
         this.node = node;
         this.autoswitch = autoswitch;
-        this.coldAddress = coldAddress;
         this.translation = translation;
         this.displayCurrency = displayCurrency;
         this.displayDecimals = displayDecimals;
         this.advancedMode = advancedMode;
+        // DEPRECATED: Read-only below here, for migration only
+        this.coldAddress = coldAddress;
     }
 }
 
@@ -197,14 +196,30 @@ export async function start() {
     const {
         analytics: strSettingAnalytics,
         autoswitch,
-        coldAddress,
         displayCurrency,
         displayDecimals,
         advancedMode,
+        // DEPRECATED: Below here are entries that are read-only due to being moved to a different location in the DB
+        coldAddress,
     } = await database.getSettings();
 
-    // Set the Cold Staking address
-    strColdStakingAddress = coldAddress;
+    // Cold Staking: As of v1.2.1 this was moved to the Account class, if any exists here, we'll migrate it then wipe it
+    // Note: We also only migrate Mainnet addresses, to keep the migration logic simple
+    if (
+        coldAddress &&
+        coldAddress.startsWith(cChainParams.main.STAKING_PREFIX)
+    ) {
+        const cAccount = await database.getAccount();
+        // Ensure an account exists (it is possible that a Cold Address was set without a wallet being encrypted)
+        if (cAccount) {
+            // We'll add the Cold Address to the account
+            cAccount.coldAddress = coldAddress;
+            // Save the changes
+            await database.updateAccount(cAccount);
+            // And wipe the old setting
+            await database.setSettings({ coldAddress: '' });
+        }
+    }
 
     // Set any Toggles to their default or DB state
     // Network Auto-Switch
@@ -343,16 +358,6 @@ async function setDecimals(decimals) {
     getStakingBalance(true);
 }
 
-/**
- * Sets and saves the active Cold Staking address
- * @param {string} strColdAddress - The Cold Staking address
- */
-export async function setColdStakingAddress(strColdAddress) {
-    strColdStakingAddress = strColdAddress;
-    const database = await Database.getInstance();
-    database.setSettings({ coldAddress: strColdAddress });
-}
-
 /**
  * Fills the translation dropbox on the settings page
  */
@@ -657,4 +662,8 @@ async function configureAdvancedMode() {
     // Hide or Show the "Mnemonic Passphrase" in the Seed Creation modal, and reset it's input
     doms.domMnemonicModalPassphrase.value = '';
     doms.domMnemonicModalPassphrase.hidden = !fAdvancedMode;
+
+    // Hide or Show the "Owner Address" configuration for Staking, and reset it's input
+    doms.domStakeOwnerAddress.value = '';
+    doms.domStakeOwnerAddressContainer.hidden = !fAdvancedMode;
 }
diff --git a/scripts/transactions.js b/scripts/transactions.js
index bf9bb86f1..24d52d944 100644
--- a/scripts/transactions.js
+++ b/scripts/transactions.js
@@ -1,5 +1,5 @@
 import bitjs from './bitTrx.js';
-import { debug, strColdStakingAddress } from './settings.js';
+import { debug } from './settings.js';
 import { ALERTS, translation, tr } from './i18n.js';
 import {
     doms,
@@ -22,6 +22,7 @@ import {
     confirmPopup,
     isXPub,
     isStandardAddress,
+    isColdAddress,
 } from './misc.js';
 import { bytesToHex, hexToBytes, dSHA256 } from './utils.js';
 import { Database } from './database.js';
@@ -114,10 +115,7 @@ export async function createTxGUI() {
     }
 
     // If Staking address: redirect to staking page
-    if (
-        strReceiverAddress.startsWith(cChainParams.current.STAKING_PREFIX) &&
-        strRawReceiver.length === 34
-    ) {
+    if (isColdAddress(strReceiverAddress)) {
         createAlert('warning', ALERTS.STAKE_NOT_SEND, 7500);
         // Close the current Send Popup
         toggleBottomMenu('transferMenu', 'transferAnimation');
@@ -181,26 +179,23 @@ export async function delegateGUI() {
     const nAmount = Math.round(Number(doms.domStakeAmount.value.trim()) * COIN);
     if (!validateAmount(nAmount, COIN)) return;
 
-    // Ensure the user has an address set - if not, request one!
-    if (
-        (!strColdStakingAddress ||
-            strColdStakingAddress[0] !== cChainParams.current.STAKING_PREFIX) &&
-        (await guiSetColdStakingAddress()) === false
-    )
-        return;
+    // (Advanced Mode) Verify the Owner Address, if any was provided
+    const strOwnerAddress = doms.domStakeOwnerAddress.value.trim();
 
     // Perform the TX
     const cTxRes = await createAndSendTransaction({
         amount: nAmount,
-        address: strColdStakingAddress,
+        address: await wallet.getColdStakingAddress(),
         isDelegation: true,
         useDelegatedInputs: false,
+        delegationOwnerAddress: strOwnerAddress,
     });
 
     // If successful, reset the inputs
     if (cTxRes.ok) {
         doms.domStakeAmount.value = '';
         doms.domStakeAmountValue.value = '';
+        doms.domStakeOwnerAddress.value = '';
 
         // And close the modal
         toggleBottomMenu('stakingDelegate', 'transferAnimation');
@@ -240,7 +235,7 @@ export async function undelegateGUI() {
         isDelegation: false,
         useDelegatedInputs: true,
         delegateChange: true,
-        changeDelegationAddress: strColdStakingAddress,
+        changeDelegationAddress: await wallet.getColdStakingAddress(),
     });
 
     if (!cTxRes.ok && cTxRes.err === 'No change addr') {
@@ -263,8 +258,9 @@ export async function undelegateGUI() {
  * @param {Number} options.amount - Number of satoshi to send
  * @param {boolean} options.isDelegation - Whether to delegate the amount. Address will be the cold staking address
  * @param {boolean} options.useDelegatedInputs - If true, only delegated coins will be used in the transaction
- * @param {delegateChange} options.delegateChange - If there is at least 1.01 PIV of change, the change will be delegated to options.changeDelegationAddress
+ * @param {boolean} options.delegateChange - If there is at least 1.01 PIV of change, the change will be delegated to options.changeDelegationAddress
  * @param {string|null} options.changeDelegationAddress - See options.delegateChange
+ * @param {string|null} options.delegationOwnerAddress - An optional Owner Address to use for the delegation
  * @returns {Promise<{ok: boolean, err: string?}>}
  */
 export async function createAndSendTransaction({
@@ -274,6 +270,7 @@ export async function createAndSendTransaction({
     useDelegatedInputs = false,
     delegateChange = false,
     changeDelegationAddress = null,
+    delegationOwnerAddress = '',
     isProposal = false,
 }) {
     if (!(await wallet.hasWalletUnlocked(true))) return;
@@ -349,22 +346,34 @@ export async function createAndSendTransaction({
 
     // Primary output (receiver)
     if (isDelegation) {
-        const [primaryAddress, primaryAddressPath] =
-            await wallet.getNewAddress();
-        cTx.addcoldstakingoutput(primaryAddress, address, amount / COIN);
-        outputs.push([primaryAddress, address, amount / COIN]);
-
-        knownUTXOs.push(
-            new UTXO({
-                id: null,
-                path: primaryAddressPath,
-                script: cTx.outputs[cTx.outputs.length - 1].script,
-                sats: amount,
-                vout: cTx.outputs.length - 1,
-                status: Mempool.PENDING,
-                isDelegate: true,
-            })
-        );
+        // Check if we're using a custom Cold Stake Owner Address
+        const fCustomColdOwner = !!delegationOwnerAddress;
+
+        // For custom Cold Owner Addresses, it could be an external address, so we need the mempool to class it as an 'external send'
+        const strOwnerAddress = fCustomColdOwner
+            ? delegationOwnerAddress
+            : (await wallet.getNewAddress())[0];
+        const strOwnerPath = await wallet.isOwnAddress(strOwnerAddress);
+
+        // Create the Delegation output
+        cTx.addcoldstakingoutput(strOwnerAddress, address, amount / COIN);
+        outputs.push([strOwnerAddress, address, amount / COIN]);
+
+        // If the owner address is internal, then we add it to our mempool to be instantly re-spendable and show in our balance
+        // ... otherwise, it is considered an outgoing (external) transaction
+        if (strOwnerPath) {
+            knownUTXOs.push(
+                new UTXO({
+                    id: null,
+                    path: strOwnerPath,
+                    script: cTx.outputs[cTx.outputs.length - 1].script,
+                    sats: amount,
+                    vout: cTx.outputs.length - 1,
+                    status: Mempool.PENDING,
+                    isDelegate: true,
+                })
+            );
+        }
     } else if (isProposal) {
         cTx.addproposaloutput(address, amount / COIN);
     } else {
diff --git a/scripts/wallet.js b/scripts/wallet.js
index 3631670fd..72b1d8ad9 100644
--- a/scripts/wallet.js
+++ b/scripts/wallet.js
@@ -2,7 +2,7 @@ import { parseWIF } from './encoding.js';
 import { generateMnemonic, mnemonicToSeed, validateMnemonic } from 'bip39';
 import { doms, beforeUnloadListener } from './global.js';
 import { getNetwork } from './network.js';
-import { MAX_ACCOUNT_GAP } from './chain_params.js';
+import { MAX_ACCOUNT_GAP, cChainParams } from './chain_params.js';
 import {
     LegacyMasterKey,
     HdMasterKey,
@@ -62,6 +62,22 @@ export class Wallet {
         return this.#masterKey;
     }
 
+    /**
+     * Gets the Cold Staking Address for the current wallet, while considering user settings and network automatically.
+     * @return {Promise<String>} Cold Address
+     */
+    async getColdStakingAddress() {
+        // Check if we have an Account with custom Cold Staking settings
+        const cDB = await Database.getInstance();
+        const cAccount = await cDB.getAccount();
+
+        // If there's an account with a Cold Address, return it, otherwise return the default
+        return (
+            cAccount?.coldAddress ||
+            cChainParams.current.defaultColdStakingAddress
+        );
+    }
+
     get nAccount() {
         return this.#nAccount;
     }

From 7182f34cf2167f5e5d23c72059b8d4a6965fd5b1 Mon Sep 17 00:00:00 2001
From: Duddino <duddino@duddino.com>
Date: Tue, 3 Oct 2023 22:30:26 +0200
Subject: [PATCH 3/3] Wallet Balance GUI (#204)

* Move index.html->WalletBalance.vue

* More vueization

* remove unused code

* Remove null references

* Add v-if

* Add reactive

* Fix not updating balance

* Review comments

* Review comments

* Add ref + fix typo

* Balance update

* Forgot to actually commit lol

* Update scripts/global.js

Co-authored-by: JSKitty <jskitty@protonmail.com>

* Fix spaces

* Fix reload animation

---------

Co-authored-by: JSKitty <jskitty@protonmail.com>
---
 index.template.html       |  83 +-----------
 scripts/WalletBalance.vue | 264 ++++++++++++++++++++++++++++++++++++++
 scripts/chain_params.js   |   6 +-
 scripts/global.js         |  41 +-----
 scripts/mempool.js        |   2 +-
 scripts/prices.js         |   4 +-
 scripts/settings.js       |   9 +-
 scripts/wallet.js         |   9 +-
 8 files changed, 292 insertions(+), 126 deletions(-)
 create mode 100644 scripts/WalletBalance.vue

diff --git a/index.template.html b/index.template.html
index 271fcb1d5..8efff0388 100644
--- a/index.template.html
+++ b/index.template.html
@@ -445,83 +445,12 @@ <h3 class="modal-title" id="contactsModalTitle" data-i18n="contacts" style="text
                   <!-- WALLET FEATURES -->
                   <div id="guiWallet" style="display: none;">
                     <div class="row p-0">
-                      <!-- Balance in PIVX & USD-->
-                      <div class="col-12 p-0 mb-5">
-                        <center>
-                          <div class="dcWallet-balances mb-4">
-
-                            <div class="row lessBot p-0">
-                              <div class="col-6 d-flex dcWallet-topLeftMenu" style="justify-content: flex-start;">
-                                <h3 class="noselect balance-title">
-                                  <span class="reload noselect" onclick="MPW.refreshChainData()"><i id="balanceReload" class="fa-solid fa-rotate-right"></i></span>
-                                </h3>
-                              </div>
-
-                              <div class="col-6 d-flex dcWallet-topRightMenu" style="justify-content: flex-end;">
-                                <div class="btn-group dropleft">
-                                  <i class="fa-solid fa-ellipsis-vertical" style="width: 20px;" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></i>
-                                  <div class="dropdown">
-                                    <div class="dropdown-move">
-                                      <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-                                        <a class="dropdown-item ptr" onclick="MPW.renderWalletBreakdown()" data-toggle="modal" data-target="#walletBreakdownModal">
-                                          <i class="fa-solid fa-chart-pie"></i> <span data-i18n="balanceBreakdown">Balance Breakdown</span>
-                                        </a>
-                                        <a class="dropdown-item ptr" onclick="MPW.openExplorer()">
-                                          <i class="fa-solid fa-magnifying-glass"></i> <span data-i18n="viewOnExplorer">View on Explorer</span>
-                                        </a>
-                                        <a class="dropdown-item ptr" onclick="MPW.guiRenderContacts()" data-toggle="modal" data-target="#contactsModal">
-                                          <i class="fa-solid fa-address-book"></i> <span data-i18n="contactsBook">Contacts</span>
-                                        </a>
-                                        <a id="guiExportWalletItem" class="dropdown-item ptr" data-toggle="modal" data-target="#exportPrivateKeysModal" data-backdrop="static" data-keyboard="false" onclick="MPW.toggleExportUI()">
-                                          <i class="fas fa-key"></i> <span data-i18n="export">Export</span>
-                                        </a>
-                                        <a class="dropdown-item ptr" id="guiNewAddress" data-toggle="modal" data-target="#qrModal" onclick="MPW.getNewAddress({updateGUI: true, verify: true});">
-                                          <i class="fas fa-sync-alt"></i> <span data-i18n="refreshAddress">Refresh address</span>
-                                        </a>
-                                        <a class="dropdown-item ptr" data-toggle="modal" data-target="#redeemCodeModal">
-                                          <i class="fa-solid fa-gift"></i> <span data-i18n="redeemOrCreateCode">Redeem or Create Code</span>
-                                        </a>
-                                      </div>
-                                    </div>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-
-                            <canvas id="identicon" class="innerShadow" style="width: 65px; height: 65px;" data-jdenticon-value=""></canvas><br />
-                            <span class="ptr" onclick="MPW.renderWalletBreakdown()" data-toggle="modal" data-target="#walletBreakdownModal">
-                              <span class="dcWallet-pivxBalance" id="guiBalance"></span>
-                              <span id="guiBalanceTicker" class="dcWallet-pivxTicker">PIV</span>
-                              <i class="fa-solid fa-plus" style="opacity: 0.5; position: relative; left: 2px;"></i>
-                            </span>
-                            <br />
-                            <div class="dcWallet-usdBalance">
-                              <span id="guiBalanceValue" class="dcWallet-usdValue">$-</span>
-                              <span id="guiBalanceValueCurrency" class="dcWallet-usdValue">USD</span>
-                            </div>
-
-                            <div class="row lessTop p-0">
-                              <div class="col-6 d-flex" style="justify-content: flex-start;">
-                                <div class="dcWallet-btn-left" data-i18n="send" onclick="MPW.toggleBottomMenu('transferMenu', 'transferAnimation')">
-                                  Send
-                                </div>
-                              </div>
-
-                              <div class="col-6 d-flex" style="justify-content: flex-end;">
-                                <div class="dcWallet-btn-right" data-i18n="receive" onclick="MPW.guiRenderCurrentReceiveModal()" data-toggle="modal" data-target="#qrModal">
-                                  Receive
-                                </div>
-                              </div>
-                            </div>
-
-
-                          </div>
-                        </center>
-                      </div>
-
-                      <div id="activityDashboard" class="col-12 mb-5">
-
-                      </div>
+			<!-- Balance in PIVX & USD-->
+			<div id="walletBalance" class="col-12 p-0 mb-5">
+			</div>
+		        
+			<div id="activityDashboard" class="col-12 mb-5">
+			</div>
                     </div>
 
                     <!-- Export Private Key Modal -->
diff --git a/scripts/WalletBalance.vue b/scripts/WalletBalance.vue
new file mode 100644
index 000000000..27efad00a
--- /dev/null
+++ b/scripts/WalletBalance.vue
@@ -0,0 +1,264 @@
+<script setup>
+import { cChainParams, COIN } from './chain_params.js';
+import { translation } from './i18n';
+import { ref, computed } from 'vue';
+
+import { nDisplayDecimals } from './settings';
+import { beautifyNumber } from './misc';
+import { getEventEmitter } from './event_bus';
+import { cMarket, strCurrency } from './settings.js';
+import {
+    mempool,
+    optimiseCurrencyLocale,
+    refreshChainData,
+    openExplorer,
+    toggleExportUI,
+    toggleBottomMenu,
+} from './global';
+import { renderWalletBreakdown } from './charting';
+import {
+    guiRenderCurrentReceiveModal,
+    guiRenderContacts,
+} from './contacts-book';
+import { wallet, getNewAddress } from './wallet';
+
+const balance = ref(0);
+const price = ref(0.0);
+const displayDecimals = ref(0);
+const updating = ref(false);
+const currency = ref('USD');
+const balanceStr = computed(() => {
+    const nCoins = balance.value / COIN;
+    const strBal = nCoins.toFixed(displayDecimals.value);
+    const nLen = strBal.length;
+    return beautifyNumber(strBal, nLen >= 10 ? '17px' : '25px');
+});
+const balanceValue = computed(() => {
+    const { nValue, cLocale } = optimiseCurrencyLocale(
+        (balance.value / COIN) * price.value
+    );
+
+    return nValue.toLocaleString('en-gb', cLocale);
+});
+
+const ticker = computed(() => cChainParams.current.TICKER);
+
+async function reload() {
+    if (updating.value) return;
+
+    try {
+        updating.value = true;
+        await refreshChainData();
+    } finally {
+        updating.value = false;
+    }
+}
+
+getEventEmitter().on('balance-update', async () => {
+    balance.value = mempool.getBalance();
+    currency.value = strCurrency.toUpperCase();
+    price.value = await cMarket.getPrice(strCurrency);
+    displayDecimals.value = nDisplayDecimals;
+});
+
+getEventEmitter().on('sync-status', (value) => {
+    updating.value = value === 'start';
+});
+
+const isHdWallet = ref(false);
+const isHardwareWallet = ref(false);
+
+getEventEmitter().on('wallet-import', () => {
+    isHdWallet.value = wallet.isHD();
+    isHardwareWallet.value = wallet.isHardwareWallet();
+});
+</script>
+
+<template>
+    <center>
+        <div class="dcWallet-balances mb-4">
+            <div class="row lessBot p-0">
+                <div
+                    class="col-6 d-flex dcWallet-topLeftMenu"
+                    style="justify-content: flex-start"
+                >
+                    <h3 class="noselect balance-title">
+                        <span class="reload noselect" @click="reload()"
+                            ><i
+                                class="fa-solid fa-rotate-right"
+                                :class="{ playAnim: updating }"
+                            ></i
+                        ></span>
+                    </h3>
+                </div>
+
+                <div
+                    class="col-6 d-flex dcWallet-topRightMenu"
+                    style="justify-content: flex-end"
+                >
+                    <div class="btn-group dropleft">
+                        <i
+                            class="fa-solid fa-ellipsis-vertical"
+                            style="width: 20px"
+                            data-toggle="dropdown"
+                            aria-haspopup="true"
+                            aria-expanded="false"
+                        ></i>
+                        <div class="dropdown">
+                            <div class="dropdown-move">
+                                <div
+                                    class="dropdown-menu"
+                                    aria-labelledby="dropdownMenuButton"
+                                >
+                                    <a
+                                        class="dropdown-item ptr"
+                                        @click="renderWalletBreakdown()"
+                                        data-toggle="modal"
+                                        data-target="#walletBreakdownModal"
+                                    >
+                                        <i class="fa-solid fa-chart-pie"></i>
+                                        <span
+                                            >&nbsp;{{
+                                                translation.balanceBreakdown
+                                            }}</span
+                                        >
+                                    </a>
+                                    <a
+                                        class="dropdown-item ptr"
+                                        @click="openExplorer()"
+                                    >
+                                        <i
+                                            class="fa-solid fa-magnifying-glass"
+                                        ></i>
+                                        <span
+                                            >&nbsp;{{
+                                                translation.viewOnExplorer
+                                            }}</span
+                                        >
+                                    </a>
+                                    <a
+                                        class="dropdown-item ptr"
+                                        @click="guiRenderContacts()"
+                                        data-toggle="modal"
+                                        data-target="#contactsModal"
+                                    >
+                                        <i class="fa-solid fa-address-book"></i>
+                                        <span
+                                            >&nbsp;{{
+                                                translation.contacts
+                                            }}</span
+                                        >
+                                    </a>
+                                    <a
+                                        class="dropdown-item ptr"
+                                        data-toggle="modal"
+                                        data-target="#exportPrivateKeysModal"
+                                        data-backdrop="static"
+                                        data-keyboard="false"
+                                        v-if="!isHardwareWallet"
+                                        @click="toggleExportUI()"
+                                    >
+                                        <i class="fas fa-key"></i>
+                                        <span
+                                            >&nbsp;{{
+                                                translation.export
+                                            }}</span
+                                        >
+                                    </a>
+
+                                    <a
+                                        class="dropdown-item ptr"
+                                        v-if="isHdWallet"
+                                        data-toggle="modal"
+                                        data-target="#qrModal"
+                                        @click="
+                                            getNewAddress({
+                                                updateGUI: true,
+                                                verify: true,
+                                            })
+                                        "
+                                    >
+                                        <i class="fas fa-sync-alt"></i>
+                                        <span
+                                            >&nbsp;{{
+                                                translation.refreshAddress
+                                            }}</span
+                                        >
+                                    </a>
+                                    <a
+                                        class="dropdown-item ptr"
+                                        data-toggle="modal"
+                                        data-target="#redeemCodeModal"
+                                    >
+                                        <i class="fa-solid fa-gift"></i>
+                                        <span
+                                            >&nbsp;{{
+                                                translation.redeemOrCreateCode
+                                            }}</span
+                                        >
+                                    </a>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <canvas
+                id="identicon"
+                class="innerShadow"
+                style="width: 65px; height: 65px"
+                data-jdenticon-value=""
+            ></canvas
+            ><br />
+            <span
+                class="ptr"
+                @click="renderWalletBreakdown()"
+                data-toggle="modal"
+                data-target="#walletBreakdownModal"
+            >
+                <span class="dcWallet-pivxBalance" v-html="balanceStr"> </span>
+                <span class="dcWallet-pivxTicker"
+                    >&nbsp;{{ ticker }}&nbsp;</span
+                >
+
+                <i
+                    class="fa-solid fa-plus"
+                    style="opacity: 0.5; position: relative; left: 2px"
+                ></i>
+            </span>
+            <br />
+            <div class="dcWallet-usdBalance">
+                <span class="dcWallet-usdValue">{{ balanceValue }}</span>
+                <span class="dcWallet-usdValue">&nbsp;{{ currency }}</span>
+            </div>
+
+            <div class="row lessTop p-0">
+                <div class="col-6 d-flex" style="justify-content: flex-start">
+                    <div
+                        class="dcWallet-btn-left"
+                        @click="
+                            toggleBottomMenu(
+                                'transferMenu',
+                                'transferAnimation'
+                            )
+                        "
+                    >
+                        {{ translation.send }}
+                    </div>
+                </div>
+
+                <div class="col-6 d-flex" style="justify-content: flex-end">
+                    <div
+                        class="dcWallet-btn-right"
+                        @click="guiRenderCurrentReceiveModal()"
+                        data-toggle="modal"
+                        data-target="#qrModal"
+                    >
+                        {{ translation.receive }}
+                    </div>
+                </div>
+            </div>
+        </div>
+    </center>
+</template>
diff --git a/scripts/chain_params.js b/scripts/chain_params.js
index 3185c14d4..8c7d49a44 100644
--- a/scripts/chain_params.js
+++ b/scripts/chain_params.js
@@ -1,3 +1,5 @@
+import { reactive } from 'vue';
+
 // In most BTC-derived coins, the below parameters can be found in the 'src/chainparams.cpp' Mainnet configuration.
 // These below params share the same names as the CPP params, so finding and editing these is easy-peasy!
 // <[network_byte] [32_byte_payload] [0x01] [4_byte_checksum]>
@@ -17,7 +19,7 @@ export const MIN_PASS_LENGTH = 6;
 export const BIP21_PREFIX = 'pivx';
 
 /* chainparams */
-export const cChainParams = {
+export const cChainParams = reactive({
     current: null,
     main: {
         name: 'mainnet',
@@ -82,6 +84,6 @@ export const cChainParams = {
         maxPayment: 10 * 144 * COIN, // 144 blocks of 10 tPIV
         defaultColdStakingAddress: 'WmNziUEPyhnUkiVdfsiNX93H6rSJnios44', // Sparrow's Testnet Cold Pool
     },
-};
+});
 // Set default chain
 cChainParams.current = cChainParams.main;
diff --git a/scripts/global.js b/scripts/global.js
index f92e3fd6b..8a50d263c 100644
--- a/scripts/global.js
+++ b/scripts/global.js
@@ -48,6 +48,7 @@ import { checkForUpgrades } from './changelog.js';
 import { FlipDown } from './flipdown.js';
 import { createApp } from 'vue';
 import Activity from './Activity.vue';
+import WalletBalance from './WalletBalance.vue';
 import {
     cReceiveType,
     guiAddContactPrompt,
@@ -66,6 +67,7 @@ export function isLoaded() {
 }
 
 export let doms = {};
+export const mempool = new Mempool();
 
 // For now we'll import the component as a vue app by itself. Later, when the
 // dashboard is rewritten in vue, we can simply add <Activity /> to the dashboard component template.
@@ -79,23 +81,18 @@ export const stakingDashboard = createApp(Activity, {
     rewards: true,
 }).mount('#stakeActivity');
 
+export const walletBalance = createApp(WalletBalance).mount('#walletBalance');
+
 export async function start() {
     doms = {
         domNavbarToggler: document.getElementById('navbarToggler'),
         domDashboard: document.getElementById('dashboard'),
         domGuiWallet: document.getElementById('guiWallet'),
         domGettingStartedBtn: document.getElementById('gettingStartedBtn'),
-        domGuiBalance: document.getElementById('guiBalance'),
-        domGuiBalanceTicker: document.getElementById('guiBalanceTicker'),
-        domGuiBalanceValue: document.getElementById('guiBalanceValue'),
-        domGuiBalanceValueCurrency: document.getElementById(
-            'guiBalanceValueCurrency'
-        ),
         domGuiStakingValue: document.getElementById('guiStakingValue'),
         domGuiStakingValueCurrency: document.getElementById(
             'guiStakingValueCurrency'
         ),
-        domBalanceReload: document.getElementById('balanceReload'),
         domBalanceReloadStaking: document.getElementById(
             'balanceReloadStaking'
         ),
@@ -211,7 +208,6 @@ export async function start() {
         domEncryptPasswordCurrent: document.getElementById(
             'changePassword-current'
         ),
-        domEncryptPasswordBox: document.getElementById('encryptPassword'),
         domEncryptPasswordFirst: document.getElementById('newPassword'),
         domEncryptPasswordSecond: document.getElementById('newPasswordRetype'),
         domGenIt: document.getElementById('genIt'),
@@ -233,10 +229,8 @@ export async function start() {
             'ModalMnemonicPassphrase'
         ),
         domExportPrivateKey: document.getElementById('exportPrivateKeyText'),
-        domExportWallet: document.getElementById('guiExportWalletItem'),
         domWipeWallet: document.getElementById('guiWipeWallet'),
         domRestoreWallet: document.getElementById('guiRestoreWallet'),
-        domNewAddress: document.getElementById('guiNewAddress'),
         domRedeemTitle: document.getElementById('redeemCodeModalTitle'),
         domRedeemCodeUse: document.getElementById('redeemCodeUse'),
         domRedeemCodeCreate: document.getElementById('redeemCodeCreate'),
@@ -268,11 +262,6 @@ export async function start() {
         ),
         domPromoTable: document.getElementById('promo-table'),
         domContactsTable: document.getElementById('contactsList'),
-        domActivityList: document.getElementById('activity-list-content'),
-        domActivityLoadMore: document.getElementById('activityLoadMore'),
-        domActivityLoadMoreIcon: document.getElementById(
-            'activityLoadMoreIcon'
-        ),
         domConfirmModalDialog: document.getElementById('confirmModalDialog'),
         domConfirmModalMain: document.getElementById('confirmModalMain'),
         domConfirmModalHeader: document.getElementById('confirmModalHeader'),
@@ -511,12 +500,9 @@ function subscribeToNetworkEvents() {
     getEventEmitter().on('sync-status', (value) => {
         switch (value) {
             case 'start':
-                // Play reload anim
-                doms.domBalanceReload.classList.add('playAnim');
                 doms.domBalanceReloadStaking.classList.add('playAnim');
                 break;
             case 'stop':
-                doms.domBalanceReload.classList.remove('playAnim');
                 doms.domBalanceReloadStaking.classList.remove('playAnim');
                 break;
         }
@@ -532,7 +518,6 @@ function subscribeToNetworkEvents() {
         if (doms.domGovTab.classList.contains('active')) {
             updateGovernanceTab();
         }
-        getBalance(true);
     });
 
     getEventEmitter().on('transaction-sent', (success, result) => {
@@ -555,7 +540,7 @@ function subscribeToNetworkEvents() {
 }
 
 // WALLET STATE DATA
-export const mempool = new Mempool();
+
 let exportHidden = false;
 let isTestnetLastState = cChainParams.current.isTestnet;
 
@@ -610,9 +595,6 @@ export function openTab(evt, tabName) {
  * Updates the GUI ticker among all elements; useful for Network Switching
  */
 export function updateTicker() {
-    // Update the Dashboard currency
-    doms.domGuiBalanceValueCurrency.innerText = strCurrency.toUpperCase();
-
     // Update the Stake Dashboard currency
     doms.domGuiStakingValueCurrency.innerText = strCurrency.toUpperCase();
 
@@ -690,19 +672,11 @@ export function getBalance(updateGUI = false) {
     if (updateGUI) {
         // Set the balance, and adjust font-size for large balance strings
         const strBal = nCoins.toFixed(nDisplayDecimals);
-        const nLen = strBal.length;
-        doms.domGuiBalance.innerHTML = beautifyNumber(
-            strBal,
-            nLen >= 10 ? '17px' : '25px'
-        );
         doms.domAvailToDelegate.innerHTML =
             beautifyNumber(strBal) + ' ' + cChainParams.current.TICKER;
 
         // Update tickers
         updateTicker();
-
-        // Update price displays
-        updatePriceDisplay(doms.domGuiBalanceValue);
     }
 
     return nBalance;
@@ -1480,7 +1454,6 @@ export async function generateVanityWallet() {
                         fRaw: true,
                     });
                     stopSearch();
-                    doms.domGuiBalance.innerHTML = '0';
                     return console.log(
                         'VANITY: Found an address after ' +
                             attempts +
@@ -2585,7 +2558,7 @@ export async function createProposal() {
     }
 }
 
-export function refreshChainData() {
+export async function refreshChainData() {
     const cNet = getNetwork();
     // If in offline mode: don't sync ANY data or connect to the internet
     if (!cNet.enabled)
@@ -2595,7 +2568,7 @@ export function refreshChainData() {
     if (!wallet.isLoaded()) return;
 
     // Fetch block count
-    cNet.getBlockCount().then(() => {});
+    await cNet.getBlockCount();
 }
 
 // A safety mechanism enabled if the user attempts to leave without encrypting/saving their keys
diff --git a/scripts/mempool.js b/scripts/mempool.js
index af1ba0006..da6b73b16 100644
--- a/scripts/mempool.js
+++ b/scripts/mempool.js
@@ -222,7 +222,7 @@ export class Mempool {
         }
 
         // Re-render the Balance UIs
-        getBalance(true);
+        getEventEmitter().emit('balance-update', getBalance(true));
         getStakingBalance(true);
     }
 
diff --git a/scripts/prices.js b/scripts/prices.js
index 194958745..4ada1859a 100644
--- a/scripts/prices.js
+++ b/scripts/prices.js
@@ -1,4 +1,4 @@
-import { getBalance } from './global.js';
+import { getEventEmitter } from './event_bus.js';
 import { isEmpty } from './misc.js';
 import { cMarket, fillCurrencySelect } from './settings.js';
 
@@ -86,6 +86,6 @@ export async function refreshPriceDisplay() {
         await fillCurrencySelect();
 
         // Update price values
-        getBalance(true);
+        getEventEmitter().emit('balance-update');
     }
 }
diff --git a/scripts/settings.js b/scripts/settings.js
index ac0c1a4e4..2ebdd5f46 100644
--- a/scripts/settings.js
+++ b/scripts/settings.js
@@ -24,6 +24,7 @@ import {
 } from './i18n.js';
 import { CoinGecko, refreshPriceDisplay } from './prices.js';
 import { Database } from './database.js';
+import { getEventEmitter } from './event_bus.js';
 
 // --- Default Settings
 /** A mode that emits verbose console info for internal MPW operations */
@@ -341,7 +342,7 @@ async function setCurrency(currency) {
     const database = await Database.getInstance();
     database.setSettings({ displayCurrency: strCurrency });
     // Update the UI to reflect the new currency
-    getBalance(true);
+    getEventEmitter().emit('balance-update');
     getStakingBalance(true);
 }
 
@@ -354,7 +355,7 @@ async function setDecimals(decimals) {
     const database = await Database.getInstance();
     database.setSettings({ displayDecimals: nDisplayDecimals });
     // Update the UI to reflect the new decimals
-    getBalance(true);
+    getEventEmitter().emit('balance-update');
     getStakingBalance(true);
 }
 
@@ -507,7 +508,6 @@ export async function toggleTestnet() {
     doms.domTestnet.style.display = cChainParams.current.isTestnet
         ? ''
         : 'none';
-    doms.domGuiBalanceTicker.innerText = cChainParams.current.TICKER;
     doms.domGuiBalanceStakingTicker.innerText = cChainParams.current.TICKER;
     doms.domPrefixNetwork.innerText =
         cChainParams.current.PUBKEY_PREFIX.join(' or ');
@@ -549,7 +549,8 @@ export async function toggleTestnet() {
     }
 
     mempool.UTXOs = [];
-    getBalance(true);
+
+    getEventEmitter().emit('balance-update');
     getStakingBalance(true);
     await updateEncryptionGUI(wallet.isLoaded());
     await fillExplorerSelect();
diff --git a/scripts/wallet.js b/scripts/wallet.js
index 72b1d8ad9..351cf0d87 100644
--- a/scripts/wallet.js
+++ b/scripts/wallet.js
@@ -29,6 +29,7 @@ import { guiRenderCurrentReceiveModal } from './contacts-book.js';
 import { Account } from './accounts.js';
 import { debug, fAdvancedMode } from './settings.js';
 import { strHardwareName, getHardwareWalletKeys } from './ledger.js';
+import { getEventEmitter } from './event_bus.js';
 export let fWalletLoaded = false;
 
 /**
@@ -316,9 +317,6 @@ export async function importWallet({
                 return;
             }
 
-            // Hide the 'export wallet' button, it's not relevant to hardware wallets
-            doms.domExportWallet.hidden = true;
-
             createAlert(
                 'info',
                 tr(ALERTS.WALLET_HARDWARE_WALLET, [
@@ -420,10 +418,9 @@ export async function importWallet({
         }
 
         // For non-HD wallets: hide the 'new address' button, since these are essentially single-address MPW wallets
-        if (!wallet.isHD()) doms.domNewAddress.style.display = 'none';
 
         // Update the loaded address in the Dashboard
-        wallet.getNewAddress({ updateGUI: true });
+        getNewAddress({ updateGUI: true });
 
         // Display Text
         doms.domGuiWallet.style.display = 'block';
@@ -461,6 +458,7 @@ export async function importWallet({
 
         // Hide all wallet starter options
         setDisplayForAllWalletOptions('none');
+        getEventEmitter().emit('wallet-import');
     }
 }
 
@@ -498,7 +496,6 @@ export async function generateWallet(noUI = false) {
         await getNewAddress({ updateGUI: true });
 
         // Refresh the balance UI (why? because it'll also display any 'get some funds!' alerts)
-        getBalance(true);
         getStakingBalance(true);
     }