Skip to content

Commit

Permalink
refactor: rename Cold Address variable
Browse files Browse the repository at this point in the history
  • Loading branch information
JSKitty committed Jun 14, 2023
1 parent 4941af7 commit 21e6962
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions scripts/global.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
cMarket,
strCurrency,
setColdStakingAddress,
cachedColdStakeAddr,
strColdStakingAddress,
} from './settings.js';
import { createAndSendTransaction, signTransaction } from './transactions.js';
import {
Expand Down Expand Up @@ -1653,7 +1653,7 @@ export async function guiSetColdStakingAddress() {
if (
await confirmPopup({
title: 'Set your Cold Staking address',
html: `<p>Current address:<br><span class="mono">${cachedColdStakeAddr}</span><br><br><span style="opacity: 0.65; margin: 10px;">A Cold Address stakes coins on your behalf, it cannot spend coins, so it's even safe to use a stranger's Cold Address!</span></p><br><input type="text" id="newColdAddress" placeholder="Example: ${cachedColdStakeAddr.substring(
html: `<p>Current address:<br><span class="mono">${strColdStakingAddress}</span><br><br><span style="opacity: 0.65; margin: 10px;">A Cold Address stakes coins on your behalf, it cannot spend coins, so it's even safe to use a stranger's Cold Address!</span></p><br><input type="text" id="newColdAddress" placeholder="Example: ${strColdStakingAddress.substring(
0,
6
)}..." style="text-align: center;">`,
Expand Down
8 changes: 4 additions & 4 deletions scripts/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ 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 cachedColdStakeAddr = 'SdgQDpS8jDRJDX8yK8m9KnTMarsE84zdsy';
export let strColdStakingAddress = 'SdgQDpS8jDRJDX8yK8m9KnTMarsE84zdsy';

let transparencyReport;

Expand Down Expand Up @@ -76,7 +76,7 @@ export class Settings {
explorer,
node,
autoswitch = true,
coldAddress = cachedColdStakeAddr,
coldAddress = strColdStakingAddress,
translation = 'en',
displayCurrency = 'usd',
} = {}) {
Expand Down Expand Up @@ -180,7 +180,7 @@ export async function start() {
} = await database.getSettings();

// Set the Cold Staking address
cachedColdStakeAddr = coldAddress;
strColdStakingAddress = coldAddress;

// Set any Toggles to their default or DB state
fAutoSwitch = autoswitch;
Expand Down Expand Up @@ -296,7 +296,7 @@ async function setCurrency(currency) {
* @param {string} strColdAddress - The Cold Staking address
*/
export async function setColdStakingAddress(strColdAddress) {
cachedColdStakeAddr = strColdAddress;
strColdStakingAddress = strColdAddress;
const database = await Database.getInstance();
database.setSettings({ coldAddress: strColdAddress });
}
Expand Down
10 changes: 5 additions & 5 deletions scripts/transactions.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import bitjs from './bitTrx.js';
import { debug, cachedColdStakeAddr } from './settings.js';
import { debug, strColdStakingAddress } from './settings.js';
import { ALERTS } from './i18n.js';
import {
doms,
Expand Down Expand Up @@ -148,16 +148,16 @@ export async function delegateGUI() {

// Ensure the user has an address set - if not, request one!
if (
(!cachedColdStakeAddr ||
cachedColdStakeAddr[0] !== cChainParams.current.STAKING_PREFIX) &&
(!strColdStakingAddress ||
strColdStakingAddress[0] !== cChainParams.current.STAKING_PREFIX) &&
(await guiSetColdStakingAddress()) === false
)
return;

// Perform the TX
const cTxRes = await createAndSendTransaction({
amount: nAmount,
address: cachedColdStakeAddr,
address: strColdStakingAddress,
isDelegation: true,
useDelegatedInputs: false,
});
Expand Down Expand Up @@ -205,7 +205,7 @@ export async function undelegateGUI() {
isDelegation: false,
useDelegatedInputs: true,
delegateChange: true,
changeDelegationAddress: cachedColdStakeAddr,
changeDelegationAddress: strColdStakingAddress,
});

if (!cTxRes.ok && cTxRes.err === 'No change addr') {
Expand Down

0 comments on commit 21e6962

Please sign in to comment.