@@ -99,23 +103,31 @@ function InvoiceItem(props: { item: MutinyInvoice }) {
)
}
-function Utxo(props: { item: Utxo }) {
+function Utxo(props: { item: UtxoItem }) {
const spent = createMemo(() => props.item.is_spent);
const [open, setOpen] = createSignal(false)
+ const redshifted = createMemo(() => getRedshifted(props.item.outpoint));
+
return (
<>
setOpen(!open())}>
-
+
+
+
-
Unknown
+
+ Unknown}>
+ Redshift
+
+
- {spent() ? "SPENT" : "UNSPENT"}
+ {/* {spent() ? "SPENT" : "UNSPENT"} */}
@@ -220,8 +233,8 @@ export function CombinedActivity(props: { limit?: number }) {
const getAllActivity = async () => {
console.log("Getting all activity");
- const txs = await state.node_manager?.list_onchain() as OnChainTx[];
- const invoices = await state.node_manager?.list_invoices() as MutinyInvoice[];
+ const txs = await state.mutiny_wallet?.list_onchain() as OnChainTx[];
+ const invoices = await state.mutiny_wallet?.list_invoices() as MutinyInvoice[];
const activity: ActivityItem[] = [];
diff --git a/src/components/App.tsx b/src/components/App.tsx
index 176b615..927960c 100644
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
@@ -1,5 +1,5 @@
import logo from '~/assets/icons/mutiny-logo.svg';
-import { Card, DefaultMain, NodeManagerGuard, SafeArea, VStack } from "~/components/layout";
+import { DefaultMain, MutinyWalletGuard, SafeArea, VStack, Card } from "~/components/layout";
import BalanceBox from "~/components/BalanceBox";
import NavBar from "~/components/NavBar";
import ReloadPrompt from "~/components/Reload";
@@ -10,7 +10,7 @@ import userClock from '~/assets/icons/user-clock.svg';
export default function App() {
return (
-
+
@@ -30,6 +30,6 @@ export default function App() {
-
+
);
}
diff --git a/src/components/DeleteEverything.tsx b/src/components/DeleteEverything.tsx
index 7262823..71a052d 100644
--- a/src/components/DeleteEverything.tsx
+++ b/src/components/DeleteEverything.tsx
@@ -2,6 +2,8 @@ import { createSignal } from "solid-js";
import { ConfirmDialog } from "~/components/Dialog";
import { Button } from "~/components/layout";
import { showToast } from "~/components/Toaster";
+import { useMegaStore } from "~/state/megaStore";
+import eify from "~/utils/eify";
export function deleteDb(name: string) {
const req = indexedDB.deleteDatabase(name);
@@ -20,18 +22,7 @@ export function deleteDb(name: string) {
}
export function DeleteEverything() {
- async function resetNode() {
- setConfirmLoading(true);
- deleteDb("gossip")
- deleteDb("wallet")
- localStorage.clear();
- showToast({ title: "Deleted", description: `Deleted all data` })
- setConfirmOpen(false);
- setConfirmLoading(false);
- setTimeout(() => {
- window.location.href = "/";
- }, 3000);
- }
+ const [_state, actions] = useMegaStore();
async function confirmReset() {
setConfirmOpen(true);
@@ -40,6 +31,25 @@ export function DeleteEverything() {
const [confirmOpen, setConfirmOpen] = createSignal(false);
const [confirmLoading, setConfirmLoading] = createSignal(false);
+
+ async function resetNode() {
+ try {
+ setConfirmLoading(true);
+ await actions.deleteMutinyWallet();
+ showToast({ title: "Deleted", description: `Deleted all data` })
+
+ setTimeout(() => {
+ window.location.href = "/";
+ }, 1000);
+ } catch (e) {
+ console.error(e)
+ showToast(eify(e))
+ } finally {
+ setConfirmOpen(false);
+ setConfirmLoading(false);
+ }
+ }
+
return (
<>
@@ -48,4 +58,4 @@ export function DeleteEverything() {
)
-}
\ No newline at end of file
+}
diff --git a/src/components/ErrorDisplay.tsx b/src/components/ErrorDisplay.tsx
index bbd7878..8ad130d 100644
--- a/src/components/ErrorDisplay.tsx
+++ b/src/components/ErrorDisplay.tsx
@@ -1,5 +1,5 @@
import { Title } from "solid-start";
-import { ButtonLink, DefaultMain, LargeHeader, SafeArea, SmallHeader } from "~/components/layout";
+import { Button, ButtonLink, DefaultMain, LargeHeader, SafeArea, SmallHeader } from "~/components/layout";
export default function ErrorDisplay(props: { error: Error }) {
return (
@@ -13,7 +13,7 @@ export default function ErrorDisplay(props: { error: Error }) {
{props.error.name}: {props.error.message}
- Dangit
+
);
diff --git a/src/components/ImportExport.tsx b/src/components/ImportExport.tsx
index 5b4d375..e22a48a 100644
--- a/src/components/ImportExport.tsx
+++ b/src/components/ImportExport.tsx
@@ -6,13 +6,13 @@ import { showToast } from "./Toaster";
import { downloadTextFile } from "~/utils/download";
import { createFileUploader } from "@solid-primitives/upload"
import { ConfirmDialog } from "./Dialog";
-import { NodeManager } from "@mutinywallet/mutiny-wasm";
+import { MutinyWallet } from "@mutinywallet/mutiny-wasm";
export function ImportExport() {
const [state, _] = useMegaStore()
async function handleSave() {
- const json = await state.node_manager?.export_json()
+ const json = await state.mutiny_wallet?.export_json()
downloadTextFile(json || "", "mutiny-state.json")
}
@@ -32,7 +32,7 @@ export function ImportExport() {
// This should throw if there's a parse error, so we won't end up clearing
JSON.parse(text);
- NodeManager.import_json(text);
+ MutinyWallet.import_json(text);
window.location.href = "/"
diff --git a/src/components/KitchenSink.tsx b/src/components/KitchenSink.tsx
index 518e05a..a37c0b7 100644
--- a/src/components/KitchenSink.tsx
+++ b/src/components/KitchenSink.tsx
@@ -17,13 +17,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_wallet?.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_wallet?.disconnect_peer(firstNode, props.peer.pubkey);
} else {
- await state.node_manager?.delete_peer(firstNode, props.peer.pubkey);
+ await state.mutiny_wallet?.delete_peer(firstNode, props.peer.pubkey);
}
};
@@ -50,7 +50,7 @@ function PeersList() {
const [state, _] = useMegaStore()
const getPeers = async () => {
- return await state.node_manager?.list_peers() as Promise
+ return await state.mutiny_wallet?.list_peers() as Promise
};
const [peers, { refetch }] = createResource(getPeers);
@@ -95,10 +95,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_wallet?.list_nodes();
const firstNode = nodes[0] as string || ""
- await state.node_manager?.connect_to_peer(firstNode, peerConnectString)
+ await state.mutiny_wallet?.connect_to_peer(firstNode, peerConnectString)
await props.refetchPeers()
@@ -140,7 +140,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_wallet?.close_channel(props.channel.outpoint as string)
} catch (e) {
console.error(e);
showToast(eify(e));
@@ -179,7 +179,7 @@ function ChannelsList() {
const [state, _] = useMegaStore()
const getChannels = async () => {
- return await state.node_manager?.list_channels() as Promise
+ return await state.mutiny_wallet?.list_channels() as Promise
};
const [channels, { refetch }] = createResource(getChannels);
@@ -194,7 +194,7 @@ function ChannelsList() {
});
})
- const network = state.node_manager?.get_network();
+ const network = state.mutiny_wallet?.get_network();
return (
<>
@@ -236,10 +236,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_wallet?.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_wallet?.open_channel(firstNode, pubkey, bigAmount)
setNewChannel(new_channel)
@@ -303,7 +303,7 @@ function LnUrlAuth() {
e.preventDefault();
const lnurl = value().trim();
- await state.node_manager?.lnurl_auth(0, lnurl)
+ await state.mutiny_wallet?.lnurl_auth(0, lnurl)
setValue("");
};
diff --git a/src/components/NavBar.tsx b/src/components/NavBar.tsx
index f70dbb0..e1775d4 100644
--- a/src/components/NavBar.tsx
+++ b/src/components/NavBar.tsx
@@ -2,11 +2,12 @@ import mutiny_m from '~/assets/icons/m.svg';
import airplane from '~/assets/icons/airplane.svg';
import settings from '~/assets/icons/settings.svg';
import receive from '~/assets/icons/big-receive.svg';
+import redshift from '~/assets/icons/rs.svg';
import userClock from '~/assets/icons/user-clock.svg';
import { A } from "solid-start";
-type ActiveTab = 'home' | 'scan' | 'send' | 'receive' | 'settings' | 'activity' | 'none';
+type ActiveTab = 'home' | 'scan' | 'send' | 'receive' | 'settings' | 'redshift' | 'activity' | 'none';
export default function NavBar(props: { activeTab: ActiveTab }) {
const activeStyle = 'border-t-0 border-b-0 p-2 bg-black rounded-lg'
@@ -34,6 +35,11 @@ export default function NavBar(props: { activeTab: ActiveTab }) {
+
+
+ 
+
+
diff --git a/src/components/PeerConnectModal.tsx b/src/components/PeerConnectModal.tsx
index 29b9dbb..05d0472 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/mutinyWalletSetup";
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_wallet) {
const { proxy } = getExistingSettings();
- const nodes = await state.node_manager.list_nodes();
+ const nodes = await state.mutiny_wallet.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..ed31dcb 100644
--- a/src/components/SettingsStringsEditor.tsx
+++ b/src/components/SettingsStringsEditor.tsx
@@ -1,36 +1,22 @@
import { createForm, url } from '@modular-forms/solid';
import { TextField } from '~/components/layout/TextField';
-import { NodeManagerSettingStrings, getExistingSettings } from '~/logic/nodeManagerSetup';
-import { Button } from '~/components/layout';
-import { createSignal } from 'solid-js';
-import { deleteDb } from '~/components/DeleteEverything';
+import { MutinyWalletSettingStrings, getExistingSettings } from '~/logic/mutinyWalletSetup';
+import { Button, SmallHeader } from '~/components/layout';
import { showToast } from './Toaster';
import eify from '~/utils/eify';
-import { ConfirmDialog } from "~/components/Dialog";
import { useMegaStore } from '~/state/megaStore';
export function SettingsStringsEditor() {
const existingSettings = getExistingSettings();
- const [_settingsForm, { Form, Field }] = createForm({ initialValues: existingSettings });
- const [confirmOpen, setConfirmOpen] = createSignal(false);
-
- const [settingsTemp, setSettingsTemp] = createSignal();
-
+ const [_settingsForm, { Form, Field }] = createForm({ initialValues: existingSettings });
const [_store, actions] = useMegaStore();
- async function handleSubmit(values: NodeManagerSettingStrings) {
+ async function handleSubmit(values: MutinyWalletSettingStrings) {
try {
const existing = getExistingSettings();
const newSettings = { ...existing, ...values }
- if (existing.network !== values.network) {
- // If the network changes we need to confirm the wipe
- // Save the settings so we can get them later
- setSettingsTemp(newSettings);
- setConfirmOpen(true);
- } else {
- await actions.setupNodeManager(newSettings);
- window.location.reload();
- }
+ await actions.setupMutinyWallet(newSettings);
+ window.location.reload();
} catch (e) {
console.error(e)
showToast(eify(e))
@@ -38,42 +24,15 @@ export function SettingsStringsEditor() {
console.log(values)
}
- async function confirmStateReset() {
- try {
- deleteDb("gossip")
- localStorage.clear();
- showToast({ title: "Deleted", description: `Deleted all data` })
- const loadedValues = settingsTemp();
-
- await actions.setupNodeManager(loadedValues);
- window.location.reload();
- } catch (e) {
- console.error(e)
- showToast(eify(e))
- }
-
- setConfirmOpen(false);
- }
-
return }>
+
+
+
+
+
+ No utxos (empty state)
+
+ = 0}>
+
+ {(utxo) =>
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Oh dear
+ Here's what happened:
+
+
+
+
+
+
+
+
+ )
+}
\ No newline at end of file
diff --git a/src/routes/Scanner.tsx b/src/routes/Scanner.tsx
index c8efdcd..87f499d 100644
--- a/src/routes/Scanner.tsx
+++ b/src/routes/Scanner.tsx
@@ -83,7 +83,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_wallet?.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 cf161b9..8ef1911 100644
--- a/src/routes/Send.tsx
+++ b/src/routes/Send.tsx
@@ -1,7 +1,7 @@
import { Match, Show, Switch, createEffect, createMemo, createSignal, onMount } from "solid-js";
import { Amount } from "~/components/Amount";
import NavBar from "~/components/NavBar";
-import { Button, ButtonLink, Card, DefaultMain, HStack, LargeHeader, NodeManagerGuard, SafeArea, SmallHeader, VStack } from "~/components/layout";
+import { Button, ButtonLink, Card, DefaultMain, HStack, LargeHeader, MutinyWalletGuard, SafeArea, SmallHeader, VStack } from "~/components/layout";
import { Paste } from "~/assets/svg/Paste";
import { Scan } from "~/assets/svg/Scan";
import { useMegaStore } from "~/state/megaStore";
@@ -14,8 +14,8 @@ import { FullscreenModal } from "~/components/layout/FullscreenModal";
import megacheck from "~/assets/icons/megacheck.png"
import megaex from "~/assets/icons/megaex.png";
import mempoolTxUrl from "~/utils/mempoolTxUrl";
-import { useNavigate } from "solid-start";
import { BackLink } from "~/components/layout/BackLink";
+import { useNavigate } from "solid-start";
import { TagEditor } from "~/components/TagEditor";
import { TagItem, createUniqueId, listTags } from "~/state/contacts";
import { StringShower } from "~/components/ShareCard";
@@ -170,7 +170,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_wallet?.decode_invoice(source.invoice).then(invoice => {
if (invoice?.amount_sats) setAmountSats(invoice.amount_sats);
setInvoice(invoice)
setSource("lightning")
@@ -193,7 +193,7 @@ export default function Send() {
function parsePaste(text: string) {
if (text) {
- const network = state.node_manager?.get_network() || "signet";
+ const network = state.mutiny_wallet?.get_network() || "signet";
const result = toParsedParams(text || "", network);
if (!result.ok) {
showToast(result.error);
@@ -230,21 +230,21 @@ export default function Send() {
const bolt11 = invoice()?.bolt11;
const sentDetails: Partial
= {};
if (source() === "lightning" && invoice() && bolt11) {
- const nodes = await state.node_manager?.list_nodes();
+ const nodes = await state.mutiny_wallet?.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_wallet?.pay_invoice(firstNode, bolt11);
sentDetails.amount = invoice()?.amount_sats;
} else {
- await state.node_manager?.pay_invoice(firstNode, bolt11, amountSats());
+ await state.mutiny_wallet?.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_wallet?.list_nodes();
const firstNode = nodes[0] as string || ""
- const payment = await state.node_manager?.keysend(firstNode, nodePubkey()!, amountSats());
+ const payment = await state.mutiny_wallet?.keysend(firstNode, nodePubkey()!, amountSats());
console.log(payment?.value)
// TODO: handle timeouts
@@ -254,8 +254,9 @@ export default function Send() {
sentDetails.amount = amountSats();
}
} else if (source() === "onchain" && address()) {
+ // FIXME: actual labels
// 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_wallet?.send_to_address(address()!, amountSats(), []);
sentDetails.amount = amountSats();
sentDetails.destination = address();
// TODO: figure out if this is necessary, it takes forever
@@ -280,7 +281,7 @@ export default function Send() {
})
return (
-
+
@@ -302,7 +303,7 @@ export default function Send() {
-
+
Mempool Link
@@ -335,6 +336,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..1ab8639 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, MutinyWalletGuard, 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 7b2c43c..cd3c14f 100644
--- a/src/state/megaStore.tsx
+++ b/src/state/megaStore.tsx
@@ -3,8 +3,8 @@
// Inspired by https://github.com/solidjs/solid-realworld/blob/main/src/store/index.js
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 { MutinyWalletSettingStrings, setupMutinyWallet } from "~/logic/mutinyWalletSetup";
+import { MutinyBalance, MutinyWallet } from "@mutinywallet/mutiny-wasm";
import { ParsedParams } from "~/routes/Scanner";
const MegaStoreContext = createContext();
@@ -13,7 +13,8 @@ type UserStatus = undefined | "new_here" | "waitlisted" | "approved" | "paid"
export type MegaStore = [{
waitlist_id?: string;
- node_manager?: NodeManager;
+ mutiny_wallet?: MutinyWallet;
+ deleting: boolean;
user_status: UserStatus;
scan_result?: ParsedParams;
balance?: MutinyBalance;
@@ -24,7 +25,8 @@ export type MegaStore = [{
dismissed_restore_prompt: boolean
}, {
fetchUserStatus(): Promise;
- setupNodeManager(settings?: NodeManagerSettingStrings): Promise;
+ setupMutinyWallet(settings?: MutinyWalletSettingStrings): Promise;
+ deleteMutinyWallet(): Promise;
setWaitlistId(waitlist_id: string): void;
setScanResult(scan_result: ParsedParams | undefined): void;
sync(): Promise;
@@ -35,7 +37,8 @@ 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_wallet: undefined as MutinyWallet | undefined,
+ deleting: false,
user_status: undefined as UserStatus,
scan_result: undefined as ParsedParams | undefined,
// TODO: wire this up to real price once we have caching
@@ -66,24 +69,34 @@ export const Provider: ParentComponent = (props) => {
return "new_here"
}
},
- async setupNodeManager(settings?: NodeManagerSettingStrings): Promise {
+ async setupMutinyWallet(settings?: MutinyWalletSettingStrings): Promise {
try {
- const nodeManager = await setupNodeManager(settings)
- setState({ node_manager: nodeManager })
+ const mutinyWallet = await setupMutinyWallet(settings)
+ setState({ mutiny_wallet: mutinyWallet })
} catch (e) {
console.error(e)
}
},
+ async deleteMutinyWallet(): Promise {
+ await state.mutiny_wallet?.stop();
+ setState((prevState) => ({
+ ...prevState,
+ mutiny_wallet: undefined,
+ deleting: true,
+ }));
+ MutinyWallet.import_json("{}");
+ localStorage.clear();
+ },
setWaitlistId(waitlist_id: string) {
setState({ waitlist_id })
},
async sync(): Promise {
console.time("BDK Sync Time")
try {
- if (state.node_manager && !state.is_syncing) {
+ if (state.mutiny_wallet && !state.is_syncing) {
setState({ is_syncing: true })
- await state.node_manager?.sync()
- const balance = await state.node_manager?.get_balance();
+ await state.mutiny_wallet?.sync()
+ const balance = await state.mutiny_wallet?.get_balance();
setState({ balance, last_sync: Date.now() })
}
} catch (e) {
@@ -115,9 +128,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_wallet && !state.deleting) {
console.log("running setup node manager...")
- actions.setupNodeManager().then(() => console.log("node manager setup done"))
+ actions.setupMutinyWallet().then(() => console.log("node manager setup done"))
}
})
@@ -152,4 +165,4 @@ export function useMegaStore() {
throw new Error("useMegaStore: cannot find a MegaStoreContext")
}
return context;
-}
\ No newline at end of file
+}
diff --git a/src/utils/conversions.ts b/src/utils/conversions.ts
index 2bab67a..37db8ea 100644
--- a/src/utils/conversions.ts
+++ b/src/utils/conversions.ts
@@ -1,11 +1,11 @@
-import { NodeManager } from "@mutinywallet/mutiny-wasm";
+import { MutinyWallet } 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 = MutinyWallet.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 = MutinyWallet.convert_btc_to_sats(btc);
if (formatted) {
return parseInt(sats.toString()).toLocaleString();
} else {
diff --git a/src/utils/fakeLabels.ts b/src/utils/fakeLabels.ts
new file mode 100644
index 0000000..e528ef2
--- /dev/null
+++ b/src/utils/fakeLabels.ts
@@ -0,0 +1,19 @@
+// Simple storage for fake labels
+// For each outpoint string, we can store a boolean whether it's redshifted or not
+
+function setRedshifted(redshifted: boolean, outpoint?: string,) {
+ if (outpoint === undefined) return;
+ localStorage.setItem(outpoint, redshifted.toString())
+}
+
+function getRedshifted(outpoint: string): boolean {
+ const redshifted = localStorage.getItem(outpoint)
+ if (redshifted === null) {
+ return false
+ }
+ return redshifted === 'true'
+}
+
+const TEST_UTXO = "47651763fbd74488a478aad80e4205c3e34bbadcfc42b5cd9557ef12a15ab00c:1"
+
+export { setRedshifted, getRedshifted, TEST_UTXO }
\ No newline at end of file
diff --git a/vite.config.ts b/vite.config.ts
index ee8d5c2..565d4aa 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -52,7 +52,7 @@ export default defineConfig({
},
optimizeDeps: {
// Don't want vite to bundle these late during dev causing reload
- include: ["qr-scanner", "nostr-tools", "class-variance-authority"],
+ include: ["qr-scanner", "nostr-tools", "class-variance-authority", "@kobalte/core", "@solid-primitives/upload"],
// This is necessary because otherwise `vite dev` can't find the wasm
exclude: ["@mutinywallet/mutiny-wasm", "@mutinywallet/waila-wasm"],
},