From d36adad34c3616f2f2f99e86699488bef144b6df Mon Sep 17 00:00:00 2001 From: Paul Miller Date: Sat, 15 Apr 2023 11:01:22 -0500 Subject: [PATCH] add lsp and rgs config --- .env | 4 +++- src/logic/nodeManagerSetup.ts | 26 ++++++++++++++++++++------ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/.env b/.env index 7bd9785..407132f 100644 --- a/.env +++ b/.env @@ -8,4 +8,6 @@ VITE_NETWORK="signet" VITE_PROXY="wss://p.mutinywallet.com" -VITE_ESPLORA="https://mutinynet.com/api" \ No newline at end of file +VITE_ESPLORA="https://mutinynet.com/api" +VITE_LSP="https://signet-lsp.mutinywallet.com" +VITE_RGS="https://rgs.mutinynet.com" diff --git a/src/logic/nodeManagerSetup.ts b/src/logic/nodeManagerSetup.ts index bd740df..add1783 100644 --- a/src/logic/nodeManagerSetup.ts +++ b/src/logic/nodeManagerSetup.ts @@ -2,34 +2,46 @@ import init, { NodeManager } from '@mutinywallet/node-manager'; export type NodeManagerSettingStrings = { - network?: string, proxy?: string, esplora?: string + network?: string, proxy?: string, esplora?: string, rgs?: string, lsp?: string, } export function getExistingSettings(): NodeManagerSettingStrings { const network = localStorage.getItem('MUTINY_SETTINGS_network') || import.meta.env.VITE_NETWORK; const proxy = localStorage.getItem('MUTINY_SETTINGS_proxy') || import.meta.env.VITE_PROXY; const esplora = localStorage.getItem('MUTINY_SETTINGS_esplora') || import.meta.env.VITE_ESPLORA; + const rgs = localStorage.getItem('MUTINY_SETTINGS_rgs') || import.meta.env.VITE_RGS; + const lsp = localStorage.getItem('MUTINY_SETTINGS_lsp') || import.meta.env.VITE_LSP; - return { network, proxy, esplora } + return { network, proxy, esplora, rgs, lsp } } export async function setAndGetMutinySettings(settings?: NodeManagerSettingStrings): Promise { - let { network, proxy, esplora } = settings || {}; + let { network, proxy, esplora, rgs, lsp } = settings || {}; const existingSettings = getExistingSettings(); try { network = network || existingSettings.network; proxy = proxy || existingSettings.proxy; esplora = esplora || existingSettings.esplora; + rgs = rgs || existingSettings.rgs; + lsp = lsp || existingSettings.lsp; if (!network || !proxy || !esplora) { throw new Error("Missing a default setting for network, proxy, or esplora. Check your .env file to make sure it looks like .env.sample") } + localStorage.setItem('MUTINY_SETTINGS_network', network); localStorage.setItem('MUTINY_SETTINGS_proxy', proxy); localStorage.setItem('MUTINY_SETTINGS_esplora', esplora); - return { network, proxy, esplora } + if (!rgs || !lsp) { + console.warn("RGS or LSP not set") + } + + rgs && localStorage.setItem('MUTINY_SETTINGS_rgs', rgs); + lsp && localStorage.setItem('MUTINY_SETTINGS_lsp', lsp); + + return { network, proxy, esplora, rgs, lsp } } catch (error) { console.error(error) throw error @@ -57,13 +69,15 @@ export async function setupNodeManager(): Promise { console.time("Setup"); console.log("Starting setup...") - const { network, proxy, esplora } = await setAndGetMutinySettings() + const { network, proxy, esplora, rgs, lsp } = await setAndGetMutinySettings() console.log("Initializing Node Manager") console.log("Using network", network); console.log("Using proxy", proxy); console.log("Using esplora address", esplora); + console.log("Using rgs address", rgs); + console.log("Using lsp address", lsp); - const nodeManager = await new NodeManager("", undefined, proxy, network, esplora) + const nodeManager = await new NodeManager("", undefined, proxy, network, esplora, rgs, lsp) const nodes = await nodeManager.list_nodes();