Merge pull request #653 from BoltzExchange/rif

RIF relay for claim transactions

.gitignore

@@ -2,6 +2,7 @@ tags
 .idea/
 .vscode/
 
+.env
 *.log
 dist/
 ts-out/

babel.config.js

@@ -5,6 +5,7 @@ module.exports = {
         "@babel/preset-typescript",
     ],
     plugins: [
+        "babel-plugin-transform-vite-meta-env",
         [
             "@babel/plugin-transform-modules-commonjs",
             { allowTopLevelThis: true },

build.py

@@ -0,0 +1,22 @@
+#! /bin/python3
+
+import sys
+
+with open("./src/config.ts", "r") as f:
+    for line in f:
+        if "cooperativeDisabled" not in line:
+            continue
+
+        if "true" in line:
+            print("Cooperative signatures are disabled in config")
+            sys.exit(1)
+
+        break
+
+with open(".env", "r") as f:
+    data = f.read()
+
+    for var in ["VITE_RSK_LOG_SCAN_ENDPOINT"]:
+        if var not in data:
+            print(f"{var} not in .env file")
+            sys.exit(1)

package.json

@@ -10,7 +10,7 @@
         "dev": "vite",
         "regtest": "cp src/configs/regtest.json public/config.json",
         "preview": "vite preview",
-        "build": "vite-node build.ts && vite build; cp dist/index.html dist/404.html",
+        "build": "./build.py && vite build; cp dist/index.html dist/404.html",
         "mainnet": "cp src/configs/mainnet.json public/config.json",
         "beta": "cp src/configs/beta.json public/config.json",
         "testnet": "cp src/configs/testnet.json public/config.json",
@@ -30,9 +30,9 @@
         "@testing-library/user-event": "^14.5.2",
         "@trivago/prettier-plugin-sort-imports": "^4.3.0",
         "@types/jest": "^29.5.12",
-        "@types/node": "^22.0.2",
         "@webbtc/webln-types": "^3.0.0",
         "babel-jest": "^29.7.0",
+        "babel-plugin-transform-vite-meta-env": "^1.0.3",
         "babel-preset-jest": "^29.6.3",
         "babel-preset-solid": "^1.8.18",
         "eventsource": "^2.0.2",
@@ -45,7 +45,6 @@
         "solid-jest": "^0.2.0",
         "typescript": "^5.5.4",
         "vite": "^5.3.4",
-        "vite-node": "^2.0.4",
         "vite-plugin-mkcert": "^1.17.5",
         "vite-plugin-node-polyfills": "^0.22.0",
         "vite-plugin-solid": "^2.10.2"

playwright.config.ts

@@ -22,8 +22,9 @@ export default defineConfig({
         ignoreHTTPSErrors: true,
 
         /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-        headless: true,
         trace: "on-first-retry",
+
+        headless: true,
     },
 
     /* Configure projects for major browsers */

src/components/BlockExplorer.tsx

@@ -11,7 +11,7 @@ const BlockExplorer = (props: {
 
     txId?: string;
     address?: string;
-    typeLabel?: string;
+    typeLabel?: "lockup_address" | "lockup_tx" | "claim_tx" | "refund_tx";
 }) => {
     const { t } = useGlobalContext();
     const href = () =>

src/components/BlockExplorerLink.tsx

@@ -1,6 +1,8 @@
 import { Accessor, Show, createEffect, createSignal } from "solid-js";
 
+import { RBTC } from "../consts/Assets";
 import { SwapType } from "../consts/Enums";
+import { usePayContext } from "../context/Pay";
 import {
     ChainSwap,
     ReverseSwap,
@@ -10,60 +12,57 @@ import {
 } from "../utils/swapCreator";
 import BlockExplorer from "./BlockExplorer";
 
-enum TransactionType {
-    Lockup = "lockupTx",
-    Claim = "claimTx",
-}
-
 const BlockExplorerLink = ({
     swap,
     swapStatus,
-    contractTransaction,
-    contractTransactionType,
 }: {
     swap: Accessor<SomeSwap>;
     swapStatus: Accessor<string>;
-    contractTransaction: Accessor<string>;
-    contractTransactionType: Accessor<TransactionType>;
 }) => {
-    // Refund transactions are handled in SwapRefunded
+    // Showing addresses makes no sense for EVM based chains
+    if (
+        (swap().type !== SwapType.Chain && getRelevantAssetForSwap(swap())) ===
+        RBTC
+    ) {
+        const { swapStatusTransaction } = usePayContext();
+        const txId = () =>
+            swap().claimTx || swap().lockupTx || swapStatusTransaction()?.id;
 
-    if (swap().type !== SwapType.Chain) {
         return (
-            <>
-                <Show
-                    when={
-                        getRelevantAssetForSwap(swap()) &&
-                        swapStatus() !== null &&
-                        swapStatus() !== "invoice.set" &&
-                        swapStatus() !== "swap.created"
-                    }>
-                    <BlockExplorer
-                        asset={getRelevantAssetForSwap(swap())}
-                        txId={swap().claimTx}
-                        address={
-                            swap().type === SwapType.Submarine
-                                ? (swap() as SubmarineSwap).address
-                                : (swap() as ReverseSwap).lockupAddress
-                        }
-                    />
-                </Show>
-                <Show
-                    when={
-                        getRelevantAssetForSwap(swap()) &&
-                        contractTransaction() !== undefined
-                    }>
-                    <BlockExplorer
-                        asset={getRelevantAssetForSwap(swap())}
-                        txId={contractTransaction()}
-                        typeLabel={contractTransactionType()}
-                    />
-                </Show>
-            </>
+            <Show when={txId() !== undefined}>
+                <BlockExplorer
+                    asset={getRelevantAssetForSwap(swap())}
+                    txId={txId()}
+                    typeLabel={
+                        swap().claimTx !== undefined ? "claim_tx" : "lockup_tx"
+                    }
+                />
+            </Show>
         );
     }
 
-    // TODO: RSK
+    if (swap().type !== SwapType.Chain) {
+        // Refund transactions are handled in SwapRefunded
+        return (
+            <Show
+                when={
+                    getRelevantAssetForSwap(swap()) &&
+                    swapStatus() !== null &&
+                    swapStatus() !== "invoice.set" &&
+                    swapStatus() !== "swap.created"
+                }>
+                <BlockExplorer
+                    asset={getRelevantAssetForSwap(swap())}
+                    txId={swap().claimTx}
+                    address={
+                        swap().type === SwapType.Submarine
+                            ? (swap() as SubmarineSwap).address
+                            : (swap() as ReverseSwap).lockupAddress
+                    }
+                />
+            </Show>
+        );
+    }
 
     const [hasBeenClaimed, setHasBeenClaimed] = createSignal<boolean>(false);
 
@@ -86,4 +85,3 @@ const BlockExplorerLink = ({
 };
 
 export default BlockExplorerLink;
-export { TransactionType };