Merge branch 'main' into release

sec-bit · Sep 16, 2022 · db87d77 · db87d77
2 parents 5687bea + 6584897
commit db87d77
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 8 deletions.
diff --git a/mfer-node b/mfer-node
diff --git a/mfer-safe-desktop-app/package-lock.json b/mfer-safe-desktop-app/package-lock.json
diff --git a/mfer-safe-desktop-app/package.json b/mfer-safe-desktop-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mfer-safe",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "private": true,
   "dependencies": {
     "@emotion/react": "^11.9.3",

diff --git a/mfer-safe-desktop-app/src-tauri/tauri.conf.json b/mfer-safe-desktop-app/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "MferSafe",
-    "version": "0.1.5"
+    "version": "0.1.6"
   },
   "tauri": {
     "allowlist": {

diff --git a/mfer-safe-desktop-app/src/SettingsView.js b/mfer-safe-desktop-app/src/SettingsView.js
@@ -16,6 +16,7 @@ import LanIcon from "@mui/icons-material/Lan";
 import MapIcon from "@mui/icons-material/Map";
 import ConfirmationNumberIcon from "@mui/icons-material/ConfirmationNumber";
 import MoreTimeIcon from "@mui/icons-material/MoreTime";
+import FingerprintIcon from '@mui/icons-material/Fingerprint';
 import { ethers } from "ethers";
 import { invoke } from "@tauri-apps/api/tauri";
 
@@ -54,6 +55,7 @@ export default function SettingsView() {
   const [batchSize, setBatchSize] = useState(100);
   const [blockNumberDelta, setBlockNumberDelta] = useState(0);
   const [blockTimeDelta, setBlockTimeDelta] = useState(0);
+  const [chainID, setChainID] = useState("0x0");
   const [keyCacheFilePath, setKeyCacheFilePath] = useState("");
   const [addrRandomize, setAddrRandomize] = useState(false);
   const [passthrough, setPassthrough] = useState(true);
@@ -87,6 +89,11 @@ export default function SettingsView() {
       .then((result) => {
         setBlockTimeDelta(result.result);
       });
+    docall("eth_chainId", [])
+      .then((res) => res.json())
+      .then((result) => {
+        setChainID(result.result);
+      });
 
     docall("mfer_randAddrEnabled", [])
       .then((res) => res.json())
@@ -152,6 +159,10 @@ export default function SettingsView() {
     docall("mfer_setTimeDelta", [Number(blockTimeDelta)]);
   }, [blockTimeDelta]);
 
+  const setCID = useCallback(() => {
+    docall("mfer_overrideChainID", [chainID]);
+  }, [chainID]);
+
   const setEnableRandAddr = (e) => {
     docall("mfer_toggleRandAddr", [e.target.checked]);
     setAddrRandomize(e.target.checked);
@@ -216,6 +227,15 @@ export default function SettingsView() {
             icon={ViewModuleIcon}
             onClick={() => setBatch()}
           />
+          <IconButtonTextField
+            state={chainID}
+            setState={setChainID}
+            label="Override ChainID (hex with 0x prefix)"
+            icon={FingerprintIcon}
+            onClick={() => setCID()}
+          />
+        </Stack>
+        <Stack direction="row" width="100%">
           <IconButtonTextField
             state={blockNumberDelta}
             setState={setBlockNumberDelta}

diff --git a/mfer-safe-desktop-app/src/SimulateView.js b/mfer-safe-desktop-app/src/SimulateView.js
@@ -168,7 +168,7 @@ function SimulateView() {
                 simulate(setCallTrace, participants);
               }}
             >
-              🙉Simulate
+              Build and Simulate ⛑️
             </Button>
           </div>
           <TextField
@@ -193,10 +193,10 @@ function SimulateView() {
           {participants.map((participant, idx) => {
             // console.log(participant);
             return <TextField
-              label={participant}
+              label={"Address: " + participant}
               key={idx}
               helperText="Signature override"
-              value={overrideSignature[participant] || ""}
+              value={ overrideSignature[participant] || ""}
               onChange={(e) => {
                 var sig = e.target.value;
                 var newOverridedSig = { ...overrideSignature, [participant]: sig };
+9 −2		cmd/mfer-node/main.go
+3 −0		mferbackend/backend.go
+10 −0		mferbackend/mferactionapi.go
+3 −0		mferbackend/rpcapi.go
+4 −2		mferevm/evm.go
+2 −2		mferevm/evm_test.go
+8 −1		mferstate/overlaystatedb.go
+1 −1		mferstate/overlaystatedb_test.go