From 1b3c73a40c418e08669ceb7d863ede234e811402 Mon Sep 17 00:00:00 2001 From: benthecarman Date: Tue, 2 May 2023 21:42:39 -0500 Subject: [PATCH] Change to MutinyManager --- src/components/Activity.tsx | 6 ++--- src/components/App.tsx | 6 ++--- src/components/BalanceBox.tsx | 6 ++--- src/components/KitchenSink.tsx | 22 ++++++++--------- src/components/PeerConnectModal.tsx | 6 ++--- src/components/SettingsStringsEditor.tsx | 12 +++++----- src/components/layout/index.tsx | 4 ++-- ...eManagerSetup.ts => mutinyManagerSetup.ts} | 24 +++++++++---------- src/routes/Admin.tsx | 6 ++--- src/routes/Receive.tsx | 12 +++++----- src/routes/Redshift.tsx | 20 ++++++++-------- src/routes/Scanner.tsx | 2 +- src/routes/Send.tsx | 24 +++++++++---------- src/routes/Settings.tsx | 8 +++---- src/state/megaStore.tsx | 24 +++++++++---------- src/utils/conversions.ts | 6 ++--- 16 files changed, 94 insertions(+), 94 deletions(-) rename src/logic/{nodeManagerSetup.ts => mutinyManagerSetup.ts} (79%) diff --git a/src/components/Activity.tsx b/src/components/Activity.tsx index 9c2dbbf..fda4ffd 100644 --- a/src/components/Activity.tsx +++ b/src/components/Activity.tsx @@ -141,19 +141,19 @@ export function Activity() { const getTransactions = async () => { console.log("Getting onchain txs"); - const txs = await state.node_manager?.list_onchain() as OnChainTx[]; + const txs = await state.mutiny_manager?.list_onchain() as OnChainTx[]; return txs.reverse(); } const getInvoices = async () => { console.log("Getting invoices"); - const invoices = await state.node_manager?.list_invoices() as MutinyInvoice[]; + const invoices = await state.mutiny_manager?.list_invoices() as MutinyInvoice[]; return invoices.filter((inv) => inv.paid).reverse(); } const getUtXos = async () => { console.log("Getting utxos"); - const utxos = await state.node_manager?.list_utxos() as UtxoItem[]; + const utxos = await state.mutiny_manager?.list_utxos() as UtxoItem[]; return utxos; } diff --git a/src/components/App.tsx b/src/components/App.tsx index 26e6105..cbcf78f 100644 --- a/src/components/App.tsx +++ b/src/components/App.tsx @@ -1,5 +1,5 @@ import logo from '~/assets/icons/mutiny-logo.svg'; -import { DefaultMain, NodeManagerGuard, SafeArea } from "~/components/layout"; +import { DefaultMain, MutinyManagerGuard, SafeArea } from "~/components/layout"; import BalanceBox from "~/components/BalanceBox"; import NavBar from "~/components/NavBar"; import ReloadPrompt from "~/components/Reload"; @@ -9,7 +9,7 @@ import settings from '~/assets/icons/settings.svg'; export default function App() { return ( - +
@@ -22,6 +22,6 @@ export default function App() { - + ); } diff --git a/src/components/BalanceBox.tsx b/src/components/BalanceBox.tsx index d0856c8..e3e542d 100644 --- a/src/components/BalanceBox.tsx +++ b/src/components/BalanceBox.tsx @@ -21,15 +21,15 @@ export default function BalanceBox() { const fetchOnchainBalance = async () => { console.log("Refetching onchain balance"); - await state.node_manager?.sync(); - const balance = await state.node_manager?.get_balance(); + await state.mutiny_manager?.sync(); + const balance = await state.mutiny_manager?.get_balance(); return balance }; // TODO: it's hacky to do these separately, but ln doesn't need the sync so I don't want to wait const fetchLnBalance = async () => { console.log("Refetching ln balance"); - const balance = await state.node_manager?.get_balance(); + const balance = await state.mutiny_manager?.get_balance(); return balance }; diff --git a/src/components/KitchenSink.tsx b/src/components/KitchenSink.tsx index 1fe29ac..ca5305c 100644 --- a/src/components/KitchenSink.tsx +++ b/src/components/KitchenSink.tsx @@ -16,13 +16,13 @@ function PeerItem(props: { peer: MutinyPeer }) { const [state, _] = useMegaStore() const handleDisconnectPeer = async () => { - const nodes = await state.node_manager?.list_nodes(); + const nodes = await state.mutiny_manager?.list_nodes(); const firstNode = nodes[0] as string || "" if (props.peer.is_connected) { - await state.node_manager?.disconnect_peer(firstNode, props.peer.pubkey); + await state.mutiny_manager?.disconnect_peer(firstNode, props.peer.pubkey); } else { - await state.node_manager?.delete_peer(firstNode, props.peer.pubkey); + await state.mutiny_manager?.delete_peer(firstNode, props.peer.pubkey); } }; @@ -49,7 +49,7 @@ function PeersList() { const [state, _] = useMegaStore() const getPeers = async () => { - return await state.node_manager?.list_peers() as Promise + return await state.mutiny_manager?.list_peers() as Promise }; const [peers, { refetch }] = createResource(getPeers); @@ -94,10 +94,10 @@ function ConnectPeer(props: { refetchPeers: RefetchPeersType }) { e.preventDefault(); const peerConnectString = value().trim(); - const nodes = await state.node_manager?.list_nodes(); + const nodes = await state.mutiny_manager?.list_nodes(); const firstNode = nodes[0] as string || "" - await state.node_manager?.connect_to_peer(firstNode, peerConnectString) + await state.mutiny_manager?.connect_to_peer(firstNode, peerConnectString) await props.refetchPeers() @@ -139,7 +139,7 @@ function ChannelItem(props: { channel: MutinyChannel, network?: string }) { async function confirmCloseChannel() { setConfirmLoading(true); try { - await state.node_manager?.close_channel(props.channel.outpoint as string) + await state.mutiny_manager?.close_channel(props.channel.outpoint as string) } catch (e) { console.error(e); showToast(eify(e)); @@ -178,7 +178,7 @@ function ChannelsList() { const [state, _] = useMegaStore() const getChannels = async () => { - return await state.node_manager?.list_channels() as Promise + return await state.mutiny_manager?.list_channels() as Promise }; const [channels, { refetch }] = createResource(getChannels); @@ -193,7 +193,7 @@ function ChannelsList() { }); }) - const network = state.node_manager?.get_network(); + const network = state.mutiny_manager?.get_network(); return ( <> @@ -235,10 +235,10 @@ function OpenChannel(props: { refetchChannels: RefetchChannelsListType }) { const pubkey = peerPubkey().trim(); const bigAmount = BigInt(amount()); - const nodes = await state.node_manager?.list_nodes(); + const nodes = await state.mutiny_manager?.list_nodes(); const firstNode = nodes[0] as string || "" - const new_channel = await state.node_manager?.open_channel(firstNode, pubkey, bigAmount) + const new_channel = await state.mutiny_manager?.open_channel(firstNode, pubkey, bigAmount) setNewChannel(new_channel) diff --git a/src/components/PeerConnectModal.tsx b/src/components/PeerConnectModal.tsx index 29b9dbb..433a38d 100644 --- a/src/components/PeerConnectModal.tsx +++ b/src/components/PeerConnectModal.tsx @@ -3,7 +3,7 @@ import { As, Dialog } from "@kobalte/core"; import { Button, Card } from "~/components/layout"; import { useMegaStore } from "~/state/megaStore"; import { Show, createResource } from "solid-js"; -import { getExistingSettings } from "~/logic/nodeManagerSetup"; +import { getExistingSettings } from "~/logic/mutinyManagerSetup"; import getHostname from "~/utils/getHostname"; const OVERLAY = "fixed inset-0 z-50 bg-black/50 backdrop-blur-sm" @@ -15,9 +15,9 @@ export default function PeerConnectModal() { const [state, _] = useMegaStore() const getPeerConnectString = async () => { - if (state.node_manager) { + if (state.mutiny_manager) { const { proxy } = getExistingSettings(); - const nodes = await state.node_manager.list_nodes(); + const nodes = await state.mutiny_manager.list_nodes(); const firstNode = nodes[0] as string || "" const hostName = getHostname(proxy || "") const connectString = `mutiny:${firstNode}@${hostName}` diff --git a/src/components/SettingsStringsEditor.tsx b/src/components/SettingsStringsEditor.tsx index 63b1622..8782d17 100644 --- a/src/components/SettingsStringsEditor.tsx +++ b/src/components/SettingsStringsEditor.tsx @@ -1,6 +1,6 @@ import { createForm, url } from '@modular-forms/solid'; import { TextField } from '~/components/layout/TextField'; -import { NodeManagerSettingStrings, getExistingSettings } from '~/logic/nodeManagerSetup'; +import { MutinyManagerSettingStrings, getExistingSettings } from '~/logic/mutinyManagerSetup'; import { Button } from '~/components/layout'; import { createSignal } from 'solid-js'; import { deleteDb } from '~/components/DeleteEverything'; @@ -11,14 +11,14 @@ import { useMegaStore } from '~/state/megaStore'; export function SettingsStringsEditor() { const existingSettings = getExistingSettings(); - const [_settingsForm, { Form, Field }] = createForm({ initialValues: existingSettings }); + const [_settingsForm, { Form, Field }] = createForm({ initialValues: existingSettings }); const [confirmOpen, setConfirmOpen] = createSignal(false); - const [settingsTemp, setSettingsTemp] = createSignal(); + const [settingsTemp, setSettingsTemp] = createSignal(); const [_store, actions] = useMegaStore(); - async function handleSubmit(values: NodeManagerSettingStrings) { + async function handleSubmit(values: MutinyManagerSettingStrings) { try { const existing = getExistingSettings(); const newSettings = { ...existing, ...values } @@ -28,7 +28,7 @@ export function SettingsStringsEditor() { setSettingsTemp(newSettings); setConfirmOpen(true); } else { - await actions.setupNodeManager(newSettings); + await actions.setupMutinyManager(newSettings); window.location.reload(); } } catch (e) { @@ -45,7 +45,7 @@ export function SettingsStringsEditor() { showToast({ title: "Deleted", description: `Deleted all data` }) const loadedValues = settingsTemp(); - await actions.setupNodeManager(loadedValues); + await actions.setupMutinyManager(loadedValues); window.location.reload(); } catch (e) { console.error(e) diff --git a/src/components/layout/index.tsx b/src/components/layout/index.tsx index ad648b8..e35f828 100644 --- a/src/components/layout/index.tsx +++ b/src/components/layout/index.tsx @@ -71,11 +71,11 @@ export const FullscreenLoader = () => { ); } -export const NodeManagerGuard: ParentComponent = (props) => { +export const MutinyManagerGuard: ParentComponent = (props) => { const [state, _] = useMegaStore(); return ( }> - + {props.children} diff --git a/src/logic/nodeManagerSetup.ts b/src/logic/mutinyManagerSetup.ts similarity index 79% rename from src/logic/nodeManagerSetup.ts rename to src/logic/mutinyManagerSetup.ts index 68a0abb..63d3fcf 100644 --- a/src/logic/nodeManagerSetup.ts +++ b/src/logic/mutinyManagerSetup.ts @@ -1,17 +1,17 @@ -import initNodeManager, { NodeManager } from '@mutinywallet/mutiny-wasm'; +import initMutinyManager, { MutinyManager } from '@mutinywallet/mutiny-wasm'; import initWaila from '@mutinywallet/waila-wasm' -// export type NodeManagerSettingStrings = { +// export type MutinyManagerSettingStrings = { // network?: string, proxy?: string, esplora?: string, rgs?: string, lsp?: string, // } type Network = "bitcoin" | "testnet" | "regtest" | "signet"; -export type NodeManagerSettingStrings = { +export type MutinyManagerSettingStrings = { network?: Network, proxy?: string, esplora?: string, rgs?: string, lsp?: string, } -export function getExistingSettings(): NodeManagerSettingStrings { +export function getExistingSettings(): MutinyManagerSettingStrings { 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; @@ -21,7 +21,7 @@ export function getExistingSettings(): NodeManagerSettingStrings { return { network, proxy, esplora, rgs, lsp } } -export async function setAndGetMutinySettings(settings?: NodeManagerSettingStrings): Promise { +export async function setAndGetMutinySettings(settings?: MutinyManagerSettingStrings): Promise { let { network, proxy, esplora, rgs, lsp } = settings || {}; const existingSettings = getExistingSettings(); @@ -70,29 +70,29 @@ export async function checkForWasm() { } } -export async function setupNodeManager(settings?: NodeManagerSettingStrings): Promise { - await initNodeManager(); +export async function setupMutinyManager(settings?: MutinyManagerSettingStrings): Promise { + await initMutinyManager(); // Might as well init waila while we're at it await initWaila(); console.time("Setup"); console.log("Starting setup...") const { network, proxy, esplora, rgs, lsp } = await setAndGetMutinySettings(settings) - console.log("Initializing Node Manager") + console.log("Initializing Mutiny 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, rgs, lsp) + const mutinyManager = await new MutinyManager("", undefined, proxy, network, esplora, rgs, lsp) - const nodes = await nodeManager.list_nodes(); + const nodes = await mutinyManager.list_nodes(); // If we don't have any nodes yet, create one if (!nodes.length) { - await nodeManager?.new_node() + await mutinyManager?.new_node() } - return nodeManager + return mutinyManager } \ No newline at end of file diff --git a/src/routes/Admin.tsx b/src/routes/Admin.tsx index 19d32a2..7534db3 100644 --- a/src/routes/Admin.tsx +++ b/src/routes/Admin.tsx @@ -1,12 +1,12 @@ import { DeleteEverything } from "~/components/DeleteEverything"; import KitchenSink from "~/components/KitchenSink"; import NavBar from "~/components/NavBar"; -import { Card, DefaultMain, LargeHeader, NodeManagerGuard, SafeArea, SmallHeader, VStack } from "~/components/layout"; +import { Card, DefaultMain, LargeHeader, MutinyManagerGuard, SafeArea, SmallHeader, VStack } from "~/components/layout"; import { BackLink } from "~/components/layout/BackLink"; export default function Admin() { return ( - + @@ -22,6 +22,6 @@ export default function Admin() { - + ) } \ No newline at end of file diff --git a/src/routes/Receive.tsx b/src/routes/Receive.tsx index 772c8e3..c11f54d 100644 --- a/src/routes/Receive.tsx +++ b/src/routes/Receive.tsx @@ -2,7 +2,7 @@ import { MutinyBip21RawMaterials, MutinyInvoice } from "@mutinywallet/mutiny-was import { createEffect, createResource, createSignal, For, Match, onCleanup, Switch } from "solid-js"; import { QRCodeSVG } from "solid-qr-code"; import { AmountEditable } from "~/components/AmountEditable"; -import { Button, Card, LargeHeader, NodeManagerGuard, SafeArea, SmallHeader } from "~/components/layout"; +import { Button, Card, LargeHeader, MutinyManagerGuard, SafeArea, SmallHeader } from "~/components/layout"; import NavBar from "~/components/NavBar"; import { useMegaStore } from "~/state/megaStore"; import { objectToSearchParams } from "~/utils/objectToSearchParams"; @@ -138,7 +138,7 @@ export default function Receive() { async function getUnifiedQr(amount: string) { const bigAmount = BigInt(amount); try { - const raw = await state.node_manager?.create_bip21(bigAmount); + const raw = await state.mutiny_manager?.create_bip21(bigAmount); // Save the raw info so we can watch the address and invoice setBip21Raw(raw); @@ -171,7 +171,7 @@ export default function Receive() { const lightning = bip21.invoice const address = bip21.address - const invoice = await state.node_manager?.get_invoice(lightning) + const invoice = await state.mutiny_manager?.get_invoice(lightning) if (invoice && invoice.paid) { setReceiveState("paid") @@ -179,7 +179,7 @@ export default function Receive() { return "lightning_paid" } - const tx = await state.node_manager?.check_address(address) as OnChainTx | undefined; + const tx = await state.mutiny_manager?.check_address(address) as OnChainTx | undefined; if (tx) { setReceiveState("paid") @@ -201,7 +201,7 @@ export default function Receive() { }); return ( - +
@@ -285,6 +285,6 @@ export default function Receive() {
- + ) } \ No newline at end of file diff --git a/src/routes/Redshift.tsx b/src/routes/Redshift.tsx index 7f5c00d..a5ad188 100644 --- a/src/routes/Redshift.tsx +++ b/src/routes/Redshift.tsx @@ -1,6 +1,6 @@ import { Component, createEffect, createMemo, createResource, createSignal, For, Match, onCleanup, onMount, ParentComponent, Show, Suspense, Switch } from "solid-js"; import { CENTER_COLUMN, MISSING_LABEL, REDSHIFT_LABEL, RIGHT_COLUMN, THREE_COLUMNS, UtxoItem } from "~/components/Activity"; -import { Card, DefaultMain, LargeHeader, LoadingSpinner, NiceP, NodeManagerGuard, SafeArea, SmallAmount, SmallHeader, VStack } from "~/components/layout"; +import { Card, DefaultMain, LargeHeader, LoadingSpinner, NiceP, MutinyManagerGuard, SafeArea, SmallAmount, SmallHeader, VStack } from "~/components/layout"; import { BackLink } from "~/components/layout/BackLink"; import { StyledRadioGroup } from "~/components/layout/Radio"; import NavBar from "~/components/NavBar"; @@ -56,7 +56,7 @@ function RedshiftReport(props: { redshift: RedshiftResult, utxo: UtxoItem }) { const getUtXos = async () => { console.log("Getting utxos"); - return await state.node_manager?.list_utxos() as UtxoItem[]; + return await state.mutiny_manager?.list_utxos() as UtxoItem[]; } function findUtxoByOutpoint(outpoint?: string, utxos: UtxoItem[] = []): UtxoItem | undefined { @@ -78,7 +78,7 @@ function RedshiftReport(props: { redshift: RedshiftResult, utxo: UtxoItem }) { async function checkRedshift(outpoint: string) { // const rs = redshiftItems[0] as RedshiftResult; console.log("Checking redshift", outpoint) - const redshift = await state.node_manager?.get_redshift(outpoint); + const redshift = await state.mutiny_manager?.get_redshift(outpoint); console.log(redshift) return redshift[0] } @@ -219,7 +219,7 @@ function ShiftObserver(props: { setShiftStage: (stage: ShiftStage) => void, utxo async function checkRedshift(outpoint: string) { // const rs = redshiftItems[0] as RedshiftResult; console.log("Checking redshift", outpoint) - const redshift = await state.node_manager?.get_redshift(outpoint); + const redshift = await state.mutiny_manager?.get_redshift(outpoint); console.log(redshift) return redshift } @@ -282,13 +282,13 @@ export default function Redshift() { const getUtXos = async () => { console.log("Getting utxos"); - return await state.node_manager?.list_utxos() as UtxoItem[]; + return await state.mutiny_manager?.list_utxos() as UtxoItem[]; } const getChannels = async () => { console.log("Getting channels"); - await state.node_manager?.sync() - const channels = await state.node_manager?.list_channels() as Promise; + await state.mutiny_manager?.sync() + const channels = await state.mutiny_manager?.list_channels() as Promise; console.log(channels) return channels @@ -315,7 +315,7 @@ export default function Redshift() { async function redshiftUtxo(utxo: UtxoItem) { console.log("Redshifting utxo", utxo.outpoint) - const redshift = await state.node_manager?.init_redshift(utxo.outpoint); + const redshift = await state.mutiny_manager?.init_redshift(utxo.outpoint); console.log("Redshift initialized:") console.log(redshift) return redshift @@ -331,7 +331,7 @@ export default function Redshift() { }) return ( - + @@ -405,6 +405,6 @@ export default function Redshift() { - + ) } \ No newline at end of file diff --git a/src/routes/Scanner.tsx b/src/routes/Scanner.tsx index dc6f730..65ea79c 100644 --- a/src/routes/Scanner.tsx +++ b/src/routes/Scanner.tsx @@ -87,7 +87,7 @@ export default function Scanner() { // When we have a nice result we can head over to the send screen createEffect(() => { if (scanResult()) { - const network = state.node_manager?.get_network() || "signet"; + const network = state.mutiny_manager?.get_network() || "signet"; const result = toParsedParams(scanResult() || "", network); if (!result.ok) { showToast(result.error); diff --git a/src/routes/Send.tsx b/src/routes/Send.tsx index 0b260a2..2e3da85 100644 --- a/src/routes/Send.tsx +++ b/src/routes/Send.tsx @@ -1,7 +1,7 @@ import { Match, Show, Switch, createEffect, createMemo, createResource, createSignal, onCleanup, onMount } from "solid-js"; import { Amount } from "~/components/Amount"; import NavBar from "~/components/NavBar"; -import { Button, ButtonLink, DefaultMain, HStack, LargeHeader, NodeManagerGuard, SafeArea, SmallHeader, VStack } from "~/components/layout"; +import { Button, ButtonLink, DefaultMain, HStack, LargeHeader, MutinyManagerGuard, SafeArea, SmallHeader, VStack } from "~/components/layout"; import { Paste } from "~/assets/svg/Paste"; import { Scan } from "~/assets/svg/Scan"; import { useMegaStore } from "~/state/megaStore"; @@ -84,7 +84,7 @@ export default function Send() { if (source.memo) setDescription(source.memo); if (source.invoice) { - state.node_manager?.decode_invoice(source.invoice).then(invoice => { + state.mutiny_manager?.decode_invoice(source.invoice).then(invoice => { if (invoice?.amount_sats) setAmountSats(invoice.amount_sats); setInvoice(invoice) setSource("lightning") @@ -107,7 +107,7 @@ export default function Send() { function parsePaste(text: string) { if (text) { - const network = state.node_manager?.get_network() || "signet"; + const network = state.mutiny_manager?.get_network() || "signet"; const result = toParsedParams(text || "", network); if (!result.ok) { showToast(result.error); @@ -144,21 +144,21 @@ export default function Send() { const bolt11 = invoice()?.bolt11; let sentDetails: Partial = {}; if (source() === "lightning" && invoice() && bolt11) { - const nodes = await state.node_manager?.list_nodes(); + const nodes = await state.mutiny_manager?.list_nodes(); const firstNode = nodes[0] as string || "" sentDetails.destination = bolt11; // If the invoice has sats use that, otherwise we pass the user-defined amount if (invoice()?.amount_sats) { - await state.node_manager?.pay_invoice(firstNode, bolt11); + await state.mutiny_manager?.pay_invoice(firstNode, bolt11); sentDetails.amount = invoice()?.amount_sats; } else { - await state.node_manager?.pay_invoice(firstNode, bolt11, amountSats()); + await state.mutiny_manager?.pay_invoice(firstNode, bolt11, amountSats()); sentDetails.amount = amountSats(); } } else if (source() === "lightning" && nodePubkey()) { - const nodes = await state.node_manager?.list_nodes(); + const nodes = await state.mutiny_manager?.list_nodes(); const firstNode = nodes[0] as string || "" - const payment = await state.node_manager?.keysend(firstNode, nodePubkey()!, amountSats()); + const payment = await state.mutiny_manager?.keysend(firstNode, nodePubkey()!, amountSats()); console.log(payment?.value) // TODO: handle timeouts @@ -169,7 +169,7 @@ export default function Send() { } } else if (source() === "onchain" && address()) { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - const txid = await state.node_manager?.send_to_address(address()!, amountSats()); + const txid = await state.mutiny_manager?.send_to_address(address()!, amountSats()); sentDetails.amount = amountSats(); sentDetails.destination = address(); // TODO: figure out if this is necessary, it takes forever @@ -194,7 +194,7 @@ export default function Send() { }) return ( - + @@ -216,7 +216,7 @@ export default function Send() { handshake - + Mempool Link @@ -315,6 +315,6 @@ export default function Send() { - + ) } \ No newline at end of file diff --git a/src/routes/Settings.tsx b/src/routes/Settings.tsx index ca73c00..922869f 100644 --- a/src/routes/Settings.tsx +++ b/src/routes/Settings.tsx @@ -1,4 +1,4 @@ -import { ButtonLink, DefaultMain, LargeHeader, NodeManagerGuard, SafeArea, VStack } from "~/components/layout"; +import { ButtonLink, DefaultMain, LargeHeader, MutinyManagerGuard, SafeArea, VStack } from "~/components/layout"; import { BackLink } from "~/components/layout/BackLink"; import NavBar from "~/components/NavBar"; import { SeedWords } from "~/components/SeedWords"; @@ -9,7 +9,7 @@ export default function Settings() { const [store, _actions] = useMegaStore(); return ( - + @@ -17,7 +17,7 @@ export default function Settings() {

Write down these words or you'll die!

- + "I know what I'm doing" @@ -25,6 +25,6 @@ export default function Settings() { - + ) } \ No newline at end of file diff --git a/src/state/megaStore.tsx b/src/state/megaStore.tsx index 8530c07..3a366b2 100644 --- a/src/state/megaStore.tsx +++ b/src/state/megaStore.tsx @@ -2,8 +2,8 @@ import { ParentComponent, createContext, createEffect, onCleanup, onMount, useContext } from "solid-js"; import { createStore } from "solid-js/store"; -import { NodeManagerSettingStrings, setupNodeManager } from "~/logic/nodeManagerSetup"; -import { MutinyBalance, NodeManager } from "@mutinywallet/mutiny-wasm"; +import { MutinyManagerSettingStrings, setupMutinyManager } from "~/logic/mutinyManagerSetup"; +import { MutinyBalance, MutinyManager } from "@mutinywallet/mutiny-wasm"; import { ParsedParams } from "~/routes/Scanner"; const MegaStoreContext = createContext(); @@ -12,7 +12,7 @@ type UserStatus = undefined | "new_here" | "waitlisted" | "approved" | "paid" export type MegaStore = [{ waitlist_id?: string; - node_manager?: NodeManager; + mutiny_manager?: MutinyManager; user_status: UserStatus; scan_result?: ParsedParams; balance?: MutinyBalance; @@ -20,7 +20,7 @@ export type MegaStore = [{ price: number }, { fetchUserStatus(): Promise; - setupNodeManager(settings?: NodeManagerSettingStrings): Promise; + setupMutinyManager(settings?: MutinyManagerSettingStrings): Promise; setWaitlistId(waitlist_id: string): void; setScanResult(scan_result: ParsedParams | undefined): void; sync(): Promise; @@ -29,7 +29,7 @@ export type MegaStore = [{ export const Provider: ParentComponent = (props) => { const [state, setState] = createStore({ waitlist_id: localStorage.getItem("waitlist_id"), - node_manager: undefined as NodeManager | undefined, + mutiny_manager: undefined as MutinyManager | undefined, user_status: undefined as UserStatus, scan_result: undefined as ParsedParams | undefined, // TODO: wire this up to real price once we have caching @@ -55,10 +55,10 @@ export const Provider: ParentComponent = (props) => { return "new_here" } }, - async setupNodeManager(settings?: NodeManagerSettingStrings): Promise { + async setupMutinyManager(settings?: MutinyManagerSettingStrings): Promise { try { - const nodeManager = await setupNodeManager(settings) - setState({ node_manager: nodeManager }) + const mutinyManager = await setupMutinyManager(settings) + setState({ mutiny_manager: mutinyManager }) } catch (e) { console.error(e) } @@ -69,7 +69,7 @@ export const Provider: ParentComponent = (props) => { async sync(): Promise { console.time("BDK Sync Time") try { - await state.node_manager?.sync() + await state.mutiny_manager?.sync() } catch (e) { console.error(e); } @@ -89,9 +89,9 @@ export const Provider: ParentComponent = (props) => { // Only load node manager when status is approved createEffect(() => { - if (state.user_status === "approved" && !state.node_manager) { + if (state.user_status === "approved" && !state.mutiny_manager) { console.log("running setup node manager...") - actions.setupNodeManager().then(() => console.log("node manager setup done")) + actions.setupMutinyManager().then(() => console.log("node manager setup done")) } }) @@ -102,7 +102,7 @@ export const Provider: ParentComponent = (props) => { createEffect(() => { const interval = setInterval(() => { - if (state.node_manager) actions.sync(); + if (state.mutiny_manager) actions.sync(); }, 60 * 1000); // Poll every minute onCleanup(() => { diff --git a/src/utils/conversions.ts b/src/utils/conversions.ts index 2bab67a..17e50de 100644 --- a/src/utils/conversions.ts +++ b/src/utils/conversions.ts @@ -1,11 +1,11 @@ -import { NodeManager } from "@mutinywallet/mutiny-wasm"; +import { MutinyManager } from "@mutinywallet/mutiny-wasm"; export function satsToUsd(amount: number | undefined, price: number, formatted: boolean): string { if (typeof amount !== "number" || isNaN(amount)) { return "" } try { - const btc = NodeManager.convert_sats_to_btc(BigInt(Math.floor(amount))); + const btc = MutinyManager.convert_sats_to_btc(BigInt(Math.floor(amount))); const usd = btc * price; if (formatted) { @@ -26,7 +26,7 @@ export function usdToSats(amount: number | undefined, price: number, formatted: } try { const btc = price / amount; - const sats = NodeManager.convert_btc_to_sats(btc); + const sats = MutinyManager.convert_btc_to_sats(btc); if (formatted) { return parseInt(sats.toString()).toLocaleString(); } else {