many small patches in a trenchcoat

.env-sample

@@ -7,7 +7,10 @@
 # The password used to encrypt cookies
 #LNDASH_COOKIE_SECRET=cookie_encrypting_password
 
-
+# Privacy mode disables:
+# Exchange-rate queries
+# Default: false
+#LNDASH_PRIVACY_MODE=true
 
 
 # The environment variables below can be used to pre-configure

.prettierrc.yaml

@@ -0,0 +1,7 @@
+plugins:
+  - "@prettier/plugin-pug"
+printWidth: 120
+semi: true
+tabWidth: 4
+trailingComma: "none"
+useTabs: true

app.js

@@ -179,8 +179,10 @@ app.runOnStartup = async () => {
 
 
 	// exchange rates
-	utils.refreshExchangeRates();
-	setInterval(utils.refreshExchangeRates, 30 * 60000);
+	if (!process.env.LNDASH_PRIVACY_MODE) {
+		utils.refreshExchangeRates();
+		setInterval(utils.refreshExchangeRates, 30 * 60000);
+	}
 
 
 	// refresh periodically

app/btcCoinConfig.js

@@ -33,7 +33,7 @@ const currencyUnits = [
 		active:true,
 		multiplier:100000000,
 		values:["sat", "satoshi"],
-		decimalPlaces:0
+		decimalPlaces:3
 	},
 	{
 		type:"native",
@@ -52,15 +52,15 @@ const currencyUnits = [
 		decimalPlaces:0
 	},
 	{
-		type:"exchanged",
+		type:"fiat",
 		name:"USD",
 		multiplier:"usd",
 		values:["usd"],
 		decimalPlaces:2,
 		symbol:"$"
 	},
 	{
-		type:"exchanged",
+		type:"fiat",
 		name:"EUR",
 		multiplier:"eur",
 		values:["eur"],

app/currencies.js

@@ -1,50 +1,70 @@
 global.currencyTypes = {
 	"btc": {
 		id: "btc",
-		type:"native",
-		name:"BTC",
-		multiplier:1,
-		default:true,
-		decimalPlaces:8
+		type: "native",
+		name: "BTC",
+		multiplier: 1,
+		default: true,
+		decimalPlaces: 8
+	},
+	"mbtc": {
+		id: "mbtc",
+		type: "native",
+		name: "mBTC",
+		multiplier: 1000,
+		decimalPlaces: 5
+	},
+	"bits": {
+		id: "bits",
+		type: "native",
+		name: "bits",
+		active: false,
+		multiplier: 1000000,
+		decimalPlaces: 2
 	},
 	"sat": {
 		id: "sat",
-		type:"native",
-		name:"sat",
-		multiplier:100000000,
-		decimalPlaces:0
+		type: "native",
+		name: "sat",
+		multiplier: 100000000,
+		decimalPlaces: 3
 	},
 	"msat": {
 		id: "msat",
-		type:"native",
-		name:"msat",
-		multiplier:100000000000,
-		decimalPlaces:0
+		type: "native",
+		name: "msat",
+		multiplier: 100000000000,
+		decimalPlaces: 0
+	},
+	"local": {
+		id: "local",
+		type: "native",
+		name: "Local"
 	},
 	"usd": {
 		id: "usd",
-		type:"exchanged",
-		name:"USD",
-		multiplier:"usd",
-		decimalPlaces:2,
-		symbol:"$"
+		type: "fiat",
+		name: "USD",
+		multiplier: "usd",
+		decimalPlaces: 2,
+		symbol: "$"
 	},
 	"eur": {
 		id: "eur",
-		type:"exchanged",
-		name:"EUR",
-		multiplier:"eur",
-		decimalPlaces:2,
-		symbol:"€"
+		type: "fiat",
+		name: "EUR",
+		multiplier: "eur",
+		decimalPlaces: 2,
+		symbol: "€"
 	},
 	"gbp": {
 		id: "gbp",
-		type:"exchanged",
-		name:"GBP",
-		multiplier:"gbp",
-		decimalPlaces:2,
-		symbol:"£"
-	},
+		type: "fiat",
+		name: "GBP",
+		multiplier: "gbp",
+		decimalPlaces: 2,
+		symbol: "£"
+	}
 };
 
 global.currencySymbols = {

app/passwordUtils.js

@@ -1,36 +1,27 @@
 const crypto = require("crypto");
 
-async function hash(password) {
-	return new Promise((resolve, reject) => {
-		const salt = crypto.randomBytes(8).toString("hex");
-
-		crypto.scrypt(password, salt, 64, (err, derivedKey) => {
-			if (err) {
-				reject(err);
-
-			} else {
-				resolve(salt + ":" + derivedKey.toString('hex'));
-			}
-		});
-	})
+function hash(password) {
+	try {
+		const salt = crypto.randomBytes(8).toString('hex');
+		const derivedKey = (crypto.scryptSync(password, salt, 64)).toString('hex');
+		return salt + ":" + derivedKey;
+	} catch (e) {
+		throw e;
+	}
 }
 
-async function verify(password, hash) {
-	return new Promise((resolve, reject) => {
+function verify(password, hash) {
+	try {
 		const [salt, key] = hash.split(":");
-		crypto.scrypt(password, salt, 64, (err, derivedKey) => {
-			if (err) {
-				reject(err);
-
-			} else {
-				resolve(key == derivedKey.toString('hex'));
-			}
-		});
-	})
+		const derivedKey = (crypto.scryptSync(password, salt, 64)).toString('hex');
+		return key === derivedKey;
+	} catch (e) {
+		throw e;
+	}
 }
 
 
 module.exports = {
 	hash: hash,
 	verify: verify
-}
+};

app/rpcApi.js

@@ -660,9 +660,9 @@ async function getWalletUtxos(minConfirmations=1, maxConfirmations=100000000) {
 }
 
 async function getNewDepositAddress(addressType) {
-	let valuesByTypeString = {"p2wkh":0, "np2wkh":1};
+	const valuesByTypeString = {"p2wkh":0, "np2wkh":1, "p2tr": 4};
 
-	let NewAddress = util.promisify(lndRpc.NewAddress.bind(lndRpc));
+	const NewAddress = util.promisify(lndRpc.NewAddress.bind(lndRpc));
 	return await NewAddress({type:valuesByTypeString[addressType]});
 }
 

app/utils.js

@@ -7,7 +7,6 @@ const qrcode = require("qrcode");
 const CryptoJS = require("crypto-js");
 const fs = require("fs");
 const url = require("url");
-const base64url = require('base64url');
 const path = require('path');
 const axios = require("axios");
 
@@ -112,7 +111,10 @@ function formatCurrencyAmountWithForcedDecimalPlaces(amount, formatType, forcedD
 
 	var dec = new Decimal(amount);
 
-	var decimalPlaces = currencyType.decimalPlaces;
+	// the regex used to strip trailing zeros only works
+	// if theres a non-zero in the string
+	// force currencies with no decimals to have one so 0 values dont get deleted
+	var decimalPlaces = currencyType.decimalPlaces || 1;
 	//if (decimalPlaces == 0 && dec < 1) {
 	//	decimalPlaces = 5;
 	//}
@@ -159,7 +161,7 @@ function formatCurrencyAmountWithForcedDecimalPlaces(amount, formatType, forcedD
 
 			return returnVal;
 		}
-	} else if (currencyType.type == "exchanged") {
+	} else if (currencyType.type == "fiat") {
 		//console.log(JSON.stringify(global.exchangeRates) + " - " + currencyType.name);
 		if (global.exchangeRates != null && global.exchangeRates[currencyType.id] != null) {
 			dec = dec.times(global.exchangeRates[currencyType.id]);
@@ -626,11 +628,10 @@ function parseLndconnectString(lndconnectString) {
 	let parsedUrl = url.parse(lndconnectString, true);
 
 	let tlsCertAscii = "-----BEGIN CERTIFICATE-----\r\n";
-	tlsCertAscii += chunkString(base64url.toBase64(parsedUrl.query.cert), 64).join("\r\n");
+	tlsCertAscii += chunkString(Buffer.from(parsedUrl.query.cert, 'base64url').toString('base64'), 64).join("\r\n");
 	tlsCertAscii += "\r\n-----END CERTIFICATE-----";
 
-	let adminMacaroonHex = base64url.toBase64(parsedUrl.query.macaroon);
-	adminMacaroonHex = Buffer.from(adminMacaroonHex, 'base64').toString('hex');
+	let adminMacaroonHex = Buffer.from(parsedUrl.query.macaroon, 'base64url').toString('hex');
 
 	let parsedData = {
 		host:parsedUrl.hostname,
@@ -654,8 +655,8 @@ function formatLndconnectString(lndconnectData) {
 	// remove ---END--- line
 	certLines.shift();
 
-	let cert = base64url.fromBase64(certLines.join(''));
-	let macaroon = base64url(Buffer.from(lndconnectData.adminMacaroonHex, 'hex'));
+	let cert = Buffer.from(certLines.join(''), 'base64').toString('base64url');
+	let macaroon = Buffer.from(lndconnectData.adminMacaroonHex, 'hex').toString('base64url');
 
 	return `lndconnect://${lndconnectData.host}:${lndconnectData.port}?cert=${cert}&macaroon=${macaroon}`;
 }
@@ -767,9 +768,10 @@ const formatBuffer = (buffer, format="base64", fullDetail=false) => {
 };
 
 function getExchangedCurrencyFormatData(amount, exchangeType, includeUnit=true) {
-	if (global.exchangeRates != null && global.exchangeRates[exchangeType.toLowerCase()] != null) {
+	exchangeType = exchangeType.toLowerCase()
+	if (global.exchangeRates != null && global.exchangeRates[exchangeType] != null) {
 		var dec = new Decimal(amount);
-		dec = dec.times(global.exchangeRates[exchangeType.toLowerCase()]);
+		dec = dec.times(global.exchangeRates[exchangeType]);
 		var exchangedAmt = parseFloat(Math.round(dec * 100) / 100).toFixed(2);
 
 		return {