Merge branch 'main' into release

Author: dynm

.gitmodules

@@ -3,4 +3,4 @@
 	url = https://github.com/wmitsuda/topic0
 [submodule "mfer-node"]
 	path = mfer-node
-	url = git@github.com:sec-bit/mfer-node.git
+	url = https://github.com/sec-bit/mfer-node

mfer-node

@@ -1,6 +1,6 @@
 {
   "name": "mfer-safe",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "private": true,
   "dependencies": {
     "@emotion/react": "^11.9.3",

mfer-safe-desktop-app/package-lock.json

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "MferSafe",
-    "version": "0.1.3"
+    "version": "0.1.4"
   },
   "tauri": {
     "allowlist": {

mfer-safe-desktop-app/package.json

@@ -1,5 +1,6 @@
 import "./App.css";
 import * as React from "react";
+import {useState, useEffect} from "react"
 
 import NavTabs from "./NavTabs";
 import SimulateView from "./SimulateView";
@@ -8,8 +9,22 @@ import SettingsView from "./SettingsView";
 import TxDataOverview from "./TxDataOverview";
 import TraceView from "./TraceView";
 import { BrowserRouter as Router, Routes, Route } from "react-router-dom";
+import { listen } from "@tauri-apps/api/event";
 
 function App() {
+  const [log, setLog] = useState("")
+  useEffect(() => {
+    console.log("init tauri event listener")
+    listen("mfernode-event", (event) => {
+      if (event.payload !== undefined) {
+        setLog((log) => {
+          var logLines = log.split("\n").slice(0, 500);
+          log = logLines.join("\n");
+          return event.payload + "\n" + log
+        });
+      }
+    });
+  }, []);
   return (
     <Router>
       <div>
@@ -19,7 +34,7 @@ function App() {
           <Route path="/txs" element={<TxDataOverview />} />
           <Route path="/trace/:txHash" element={<TraceView />} />
           <Route path="/safemultisend" element={<SimulateView />} />
-          <Route path="/logs" element={<LogsView/>} />
+          <Route path="/logs" element={<LogsView log={log} />} />
         </Routes>
       </div>
     </Router>

mfer-safe-desktop-app/src-tauri/tauri.conf.json

@@ -1,17 +1,8 @@
 import * as React from "react";
-import { useState, useEffect } from "react";
 import TextareaAutosize from "@mui/material/TextareaAutosize";
-import { listen } from "@tauri-apps/api/event";
 
-export default function LogView() {
-  const [log, setLog] = useState("");
-  useEffect(() => {
-    listen("mfernode-event", (event) => {
-      if (event.payload !== undefined) {
-        setLog((log) => event.payload + "\n" + log);
-      }
-    });
-  }, []);
+export default function LogView(props) {
+  const { log } = props;
   return (
     <TextareaAutosize
       aria-label="empty textarea"

mfer-safe-desktop-app/src/App.js

@@ -13,6 +13,7 @@ import SpeedDialIcon from "@mui/material/SpeedDialIcon";
 import SpeedDialAction from "@mui/material/SpeedDialAction";
 import ReplayIcon from "@mui/icons-material/Replay";
 import DeleteForeverIcon from "@mui/icons-material/DeleteForever";
+import ClearIcon from '@mui/icons-material/Clear';
 import TerminalIcon from "@mui/icons-material/Terminal";
 
 const actions = [
@@ -30,6 +31,13 @@ const actions = [
       docall("mfer_clearTxPool", []);
     },
   },
+  {
+    icon: <ClearIcon />,
+    name: "Clear Key Cache",
+    onClick: () => {
+      docall("mfer_clearKeyCache", []);
+    },
+  },
 ];
 export default function NavTabs() {
   const [value, setValue] = React.useState(0);

mfer-safe-desktop-app/src/LogsView.js

@@ -56,6 +56,7 @@ export default function SettingsView() {
   const [blockTimeDelta, setBlockTimeDelta] = useState(0);
   const [keyCacheFilePath, setKeyCacheFilePath] = useState("");
   const [addrRandomize, setAddrRandomize] = useState(false);
+  const [passthrough, setPassthrough] = useState(true);
 
   useEffect(() => {
     getMferNodeArgs().then((args) => {
@@ -93,6 +94,11 @@ export default function SettingsView() {
         setAddrRandomize(result.result);
       });
 
+    docall("mfer_passthroughEnabled", [])
+      .then((res) => res.json())
+      .then((result) => {
+        setPassthrough(result.result);
+      });
   }, []);
 
   const saveRPCSettings = useCallback(() => {
@@ -151,6 +157,11 @@ export default function SettingsView() {
     setAddrRandomize(e.target.checked);
   };
 
+  const setPassthroughFunc = (e) => {
+    docall("mfer_togglePassthrough", [e.target.checked]);
+    setPassthrough(e.target.checked);
+  };
+
   return (
     <Box
       component="div"
@@ -171,7 +182,12 @@ export default function SettingsView() {
         padding={2}
         width="520px"
       >
-        <FormGroup>
+        <FormGroup row>
+          <FormControlLabel control={
+            <Checkbox
+              checked={passthrough}
+              onChange={setPassthroughFunc}
+            />} label="Passthrough" />
           <FormControlLabel control={
             <Checkbox
               checked={addrRandomize}