From 2fcbdc79e72bd4b687778406a2bd81db1e659849 Mon Sep 17 00:00:00 2001 From: "Justin (shocknet)" Date: Sun, 21 Jul 2024 16:50:23 -0400 Subject: [PATCH] values --- env.example | 8 ++++++-- package.json | 6 +++--- src/services/main/liquidityManager.ts | 2 +- src/services/nostr/index.ts | 2 +- src/services/wizard/index.ts | 2 +- src/tests/.env.test | 2 +- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/env.example b/env.example index 19a60331..8a36d59e 100644 --- a/env.example +++ b/env.example @@ -9,7 +9,11 @@ #LND_CERT_PATH=~/.lnd/tls.cert #LND_MACAROON_PATH=~/.lnd/data/chain/bitcoin/mainnet/admin.macaroon -LIQUIDITY_PROVIDER_PUB= +#BOOTSTRAP_PEER +# A trusted peer that will hold a node-level account until channel automation becomes affordable +# The developer is used by default or you may specify your own +# To disable this feature entirely overwrite the env with "null" +#LIQUIDITY_PROVIDER_PUB=null #DB #DATABASE_FILE=db.sqlite @@ -57,7 +61,7 @@ LSP_MAX_FEE_BPS=100 #NOSTR # Default relay may become rate-limited without a paid subscription -#NOSTR_RELAYS=wss://strfry.shock.network +#NOSTR_RELAYS=wss://relay.lightning.pub #LNURL # Optional diff --git a/package.json b/package.json index 9887bf9d..81e52105 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "lightning.pub", + "name": "lnpub", "version": "1.0.0", - "description": "", + "description": "A Nostr based account system and management platform for nodes on Bitcoin's Lightning Network", "main": "index.js", "scripts": { "clean": "rimraf build", @@ -19,7 +19,7 @@ }, "author": "", "type": "module", - "license": "ISC", + "license": "Affero GPLv3", "bugs": { "url": "https://github.com/shocknet/Lightning.Pub/issues" }, diff --git a/src/services/main/liquidityManager.ts b/src/services/main/liquidityManager.ts index 38160e8c..0d7efbda 100644 --- a/src/services/main/liquidityManager.ts +++ b/src/services/main/liquidityManager.ts @@ -13,7 +13,7 @@ export type LiquiditySettings = { } export const LoadLiquiditySettingsFromEnv = (): LiquiditySettings => { const lspSettings = LoadLSPSettingsFromEnv() - const liquidityProviderPub = process.env.LIQUIDITY_PROVIDER_PUB || "" + const liquidityProviderPub = process.env.LIQUIDITY_PROVIDER_PUB === "null" ? "" : (process.env.LIQUIDITY_PROVIDER_PUB || "76ed45f00cea7bac59d8d0b7d204848f5319d7b96c140ffb6fcbaaab0a13d44e") return { lspSettings, liquidityProviderPub, useOnlyLiquidityProvider: false } } export class LiquidityManager { diff --git a/src/services/nostr/index.ts b/src/services/nostr/index.ts index f7cf3a38..845cbbd2 100644 --- a/src/services/nostr/index.ts +++ b/src/services/nostr/index.ts @@ -8,7 +8,7 @@ const getEnvOrDefault = (name: string, defaultValue: string): string => { } export const LoadNosrtSettingsFromEnv = (test = false) => { - const relaysEnv = getEnvOrDefault("NOSTR_RELAYS", "wss://strfry.shock.network"); + const relaysEnv = getEnvOrDefault("NOSTR_RELAYS", "wss://relay.lightning.pub"); return { relays: relaysEnv.split(' ') } diff --git a/src/services/wizard/index.ts b/src/services/wizard/index.ts index debe8cb4..91c2ceea 100644 --- a/src/services/wizard/index.ts +++ b/src/services/wizard/index.ts @@ -156,7 +156,7 @@ export class Wizard { if (automateLiquidityIndex === -1) { toMerge.push(`LIQUIDITY_PROVIDER_PUB=${pendingConfig.automateLiquidity ? defaultProviderPub : ""}`) } else { - envFileContent[automateLiquidityIndex] = `LIQUIDITY_PROVIDER_PUB=` + envFileContent[automateLiquidityIndex] = `LIQUIDITY_PROVIDER_PUB=null` } const pushBackupsToNostrIndex = envFileContent.findIndex(line => line.startsWith('PUSH_BACKUPS_TO_NOSTR')) diff --git a/src/tests/.env.test b/src/tests/.env.test index 1c118bac..ebc37838 100644 --- a/src/tests/.env.test +++ b/src/tests/.env.test @@ -14,7 +14,7 @@ INCOMING_INVOICE_FEE_USER_BPS=0 #defined by app this is just default OUTGOING_INVOICE_FEE_USER_BPS=60 #defined by app this is just default TX_FEE_INTERNAL_ROOT_BPS=60 #this is applied only to withdrawls from application wallets TX_FEE_INTERNAL_USER_BPS=60 #defined by app this is just default -NOSTR_RELAYS=wss://strfry.shock.network +NOSTR_RELAYS=wss://relay.lightning.pub SERVICE_URL=http://localhost:8080 ADMIN_TOKEN=thisisadmin PORT=8080