fixup!

BoltzExchange · Feb 10, 2024 · 276ed97 · 276ed97
1 parent 0658b32
commit 276ed97
Show file tree

Hide file tree

Showing 7 changed files with 403 additions and 573 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,28 +17,28 @@
         "changelog": "git-cliff -o CHANGELOG.md"
     },
     "devDependencies": {
-        "@solidjs/testing-library": "^0.8.5",
+        "@solidjs/testing-library": "^0.8.6",
         "@trivago/prettier-plugin-sort-imports": "^4.3.0",
         "@webbtc/webln-types": "^3.0.0",
         "eventsource": "^2.0.2",
         "git-cliff": "^1.4.0",
-        "jsdom": "^23.0.1",
-        "prettier": "^3.1.1",
-        "sass": "^1.69.7",
+        "jsdom": "^24.0.0",
+        "prettier": "^3.2.5",
+        "sass": "^1.70.0",
         "typescript": "^5.3.3",
-        "vite": "^5.0.10",
-        "vite-plugin-mkcert": "^1.17.1",
-        "vite-plugin-node-polyfills": "^0.17.0",
-        "vite-plugin-solid": "^2.8.0",
-        "vitest": "^1.1.1"
+        "vite": "^5.1.1",
+        "vite-plugin-mkcert": "^1.17.3",
+        "vite-plugin-node-polyfills": "^0.20.0",
+        "vite-plugin-solid": "^2.9.1",
+        "vitest": "^1.2.2"
     },
     "dependencies": {
-        "@bitcoinerlab/secp256k1": "^1.0.5",
+        "@bitcoinerlab/secp256k1": "^1.1.1",
         "@fontsource/noto-sans": "^5.0.18",
         "@scure/base": "^1.1.5",
-        "@solid-primitives/i18n": "^2.0.0",
-        "@solid-primitives/storage": "^2.1.1",
-        "@solidjs/router": "^0.9.1",
+        "@solid-primitives/i18n": "^2.0.1",
+        "@solid-primitives/storage": "^2.1.2",
+        "@solidjs/router": "^0.12.0",
         "@vulpemventures/secp256k1-zkp": "^3.2.1",
         "bignumber.js": "^9.1.2 ",
         "bitcoinjs-lib": "^6.1.5",
@@ -47,12 +47,12 @@
         "buffer": "^6.0.3",
         "create-hmac": "^1.1.7",
         "ecpair": "^2.1.0",
-        "ethers": "^6.9.2",
+        "ethers": "^6.11.0",
         "iframe-resizer": "^4.3.9",
-        "liquidjs-lib": "^6.0.2-liquid.32",
-        "loglevel": "^1.8.1",
+        "liquidjs-lib": "^6.0.2-liquid.34",
+        "loglevel": "^1.9.1",
         "qr-scanner": "^1.4.2",
         "qrcode": "^1.5.3",
-        "solid-js": "^1.8.8"
+        "solid-js": "^1.8.14"
     }
 }
diff --git a/src/index.tsx b/src/index.tsx
@@ -1,7 +1,7 @@
 /* @refresh reload */
 import "@fontsource/noto-sans";
 import "@fontsource/noto-sans/800.css";
-import { Navigate, Route, Router, Routes } from "@solidjs/router";
+import { Navigate, Route, Router } from "@solidjs/router";
 import log from "loglevel";
 import { Show, render } from "solid-js/web";
 
@@ -41,23 +41,28 @@ const isEmbedded = () => {
     return useGlobalContext().embedded();
 };
 
+const App = (props: any) => (
+    <>
+        <SwapChecker />
+        <Show when={!isEmbedded()}>
+            <Nav network={network} />
+        </Show>
+        {props.children}
+        <Notification />
+        <Show when={!isEmbedded()}>
+            <Footer />
+        </Show>
+    </>
+);
+
 const cleanup = render(
     () => (
         <Router>
             <GlobalProvider>
                 <Web3SignerProvider>
                     <CreateProvider>
                         <PayProvider>
-                            <SwapChecker />
-                            <Show when={!isEmbedded()}>
-                                <Nav network={network} />
-                            </Show>
-                            <Routes>
-                                <Route
-                                    path="*"
-                                    element={<Navigate href={"/404"} />}
-                                />
-                                <Route path="/404" component={NotFound} />
+                            <Router root={App}>
                                 <Route path="/" component={Hero} />
                                 <Route path="/swap" component={Create} />
                                 {/* Compatibility with link in Breez:
@@ -71,11 +76,8 @@ const cleanup = render(
                                 <Route path="/error" component={Error} />
                                 <Route path="/refund" component={Refund} />
                                 <Route path="/history" component={History} />
-                            </Routes>
-                            <Notification />
-                            <Show when={!isEmbedded()}>
-                                <Footer />
-                            </Show>
+                                <Route path="*404" component={NotFound} />
+                            </Router>
                         </PayProvider>
                     </CreateProvider>
                 </Web3SignerProvider>

diff --git a/src/utils/boltzClient.ts b/src/utils/boltzClient.ts
@@ -1,6 +1,6 @@
 import { Transaction } from "bitcoinjs-lib";
 import { Musig } from "boltz-core";
-import { Buffer } from "buffer";
+import Buffer from "buffer";
 import { Transaction as LiquidTransaction } from "liquidjs-lib";
 
 import { fetcher } from "./helper";

diff --git a/src/utils/compat.ts b/src/utils/compat.ts
@@ -15,7 +15,7 @@ import {
     constructClaimTransaction as lcCT,
     constructRefundTransaction as lcRT,
 } from "boltz-core/dist/lib/liquid";
-import { Buffer } from "buffer";
+import Buffer from "buffer";
 import {
     address as LiquidAddress,
     networks as LiquidNetworks,

diff --git a/src/utils/refund.ts b/src/utils/refund.ts
@@ -5,7 +5,7 @@ import {
     detectSwap,
 } from "boltz-core";
 import { LiquidRefundDetails } from "boltz-core/dist/lib/liquid";
-import { Buffer } from "buffer";
+import Buffer from "buffer";
 import { ECPairInterface } from "ecpair";
 import { Network as LiquidNetwork } from "liquidjs-lib/src/networks";
 import log from "loglevel";

diff --git a/src/utils/taproot/musig.ts b/src/utils/taproot/musig.ts
@@ -5,7 +5,7 @@ import {
     LiquidRefundDetails,
     TaprootUtils as LiquidTaprootUtils,
 } from "boltz-core/dist/lib/liquid";
-import { Buffer } from "buffer";
+import Buffer from "buffer";
 import { randomBytes } from "crypto";
 import { ECPairInterface } from "ecpair";
 import { Transaction as LiquidTransaction } from "liquidjs-lib";