Merge branch 'main' into feature/before_merge_testnet

Author: mgarciate

build/Dockerfile

@@ -35,8 +35,10 @@ COPY user-settings_template.yml /app/rocketpool/user-settings_template.yml
 COPY rocketpool-start.sh /usr/local/bin/rocketpool-start.sh
 COPY restart-vc.sh /usr/local/bin/restart-vc.sh
 COPY stop-validator.sh /usr/local/bin/stop-validator.sh
+COPY stop-supervisor.sh /usr/local/bin/stop-supervisor.sh
 RUN chmod +x /usr/local/bin/rocketpool-start.sh
 RUN chmod +x /usr/local/bin/restart-vc.sh
 RUN chmod +x /usr/local/bin/stop-validator.sh
+RUN chmod +x /usr/local/bin/stop-supervisor.sh
 
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

build/api/src/index.ts

@@ -51,6 +51,15 @@ app.get("/api/v1/version", (req: Request, res: Response) => {
   res.send(version);
 });
 
+// POST /api/v1/rocketpool-command-custom
+app.post("/api/v1/rocketpool-command-custom", (req: Request, res: Response) => {
+  console.log(req.body.cmd);
+  var result = shelljs.exec(
+    `/usr/local/bin/rocketpoold --settings /app/rocketpool/user-settings.yml api ${req.body.cmd}`
+  ).stdout;
+  res.send(result);
+});
+
 // POST /api/v1/rocketpool-command
 app.post("/api/v1/rocketpool-command", (req: Request, res: Response) => {
   console.log(req.body.cmd);
@@ -74,16 +83,22 @@ function executeCommand(cmd: string) {
   return result;
 }
 
+// POST /api/v1/minipool/import
+app.post("/api/v1/minipool/import", async (req: Request, res: Response) => {
+  console.log("Try to import key to the brain");
+  res.send(await importKey(req.body.pubkey));
+});
+
 // function that imports the keys from teku to a given url
-function importKey(validatorPubkey: string) {
+async function importKey(validatorPubkey: string): Promise<ImportKeyResponseData> {
   console.log("Import key to the brain");
   var keystoreJson = shelljs.exec(
     `cat /rocketpool/data/validators/teku/keys/${validatorPubkey}.json`
   ).stdout;
   var password = shelljs.exec(
     `cat /rocketpool/data/validators/teku/passwords/${validatorPubkey}.txt`
   ).stdout;
-  postValidatorData({
+  return await postValidatorData({
     keystores: [keystoreJson],
     passwords: [password],
     tags: ["rocketpool"],
@@ -92,7 +107,7 @@ function importKey(validatorPubkey: string) {
 }
 
 // async function to POST fetch
-async function postValidatorData(data = {}) {
+async function postValidatorData(data = {}): Promise<ImportKeyResponseData> {
   const response = await fetch(
     `${appConfig.getConfig().brainAPIUrl}/eth/v1/keystores`,
     {
@@ -103,9 +118,16 @@ async function postValidatorData(data = {}) {
   );
   console.log(response.ok);
   if (response.ok) {
-    const { data }: { data: IImportKeyResponseData } = await response.json();
+    const { data }: { data: ImportKeyResponseData } = await response.json();
     console.log(data);
+    return data;
   }
+  return {
+    data: [{
+      status: "error",
+      message: "Keystore cannot be imported",
+    }]
+  };
 }
 
 app.listen(API_PORT, () => {
@@ -116,10 +138,10 @@ String.prototype.startsWith = function (str) {
   return this.indexOf(str) === 0;
 };
 
-interface IImportKeyResponseData {
-  data: IImportKeyResponse[];
+interface ImportKeyResponseData {
+  data: ImportKeyResponse[];
 }
-interface IImportKeyResponse {
+interface ImportKeyResponse {
   status: string;
   message?: string;
 }

build/stop-supervisor.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+printf "INIT stop-supervisor.sh\n";
+
+while read line; do
+  echo "Processing Event: $line" >&2;
+  kill -3 $(cat "/var/run/supervisord.pid")
+done < /dev/stdin

build/supervisord.conf

@@ -1,5 +1,9 @@
 [supervisord]
 nodaemon=true
+loglevel=info
+logfile=/var/log/supervisor/supervisord.log
+pidfile=/var/run/supervisord.pid
+childlogdir=/var/log/supervisor
 
 [program:rocketpool]
 command=/bin/sh -c "/usr/local/bin/rocketpool-start.sh"
@@ -31,3 +35,7 @@ stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
+
+[eventlistener:processes]
+command=/usr/local/bin/stop-supervisor.sh
+events=PROCESS_STATE_STOPPED, PROCESS_STATE_FATAL

build/ui/package.json

@@ -17,6 +17,7 @@
     "@types/react": "^18.0.28",
     "@types/react-dom": "^18.0.11",
     "axios": "^1.3.4",
+    "bignumber.js": "^9.1.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-scripts": "5.0.1",

build/ui/src/App.tsx

@@ -3,18 +3,19 @@ import "./App.css";
 import TopBar from "./components/TopBar/TopBar";
 import Dashboard from "./Dashboard";
 import { RocketpoolProvider } from "./components/Providers/Context";
+import { Tab } from "./types/Tabs";
 
 function App() {
-  const [activeTab, setActiveTab] = useState<string>("Setup");
+  const [activeTab, setActiveTab] = useState<Tab>("Setup");
 
-  const handleTabClick = (tab: string) => {
+  const handleTabClick = (tab: Tab) => {
     setActiveTab(tab);
   };
   return (
     <RocketpoolProvider>
       <div className="App">
         <header className="App-header">
-          <TopBar onTabClick={(tab: string) => handleTabClick(tab)} />
+          <TopBar onTabClick={(tab: Tab) => handleTabClick(tab)} />
           <Dashboard activeTab={activeTab} />
         </header>
       </div>

build/ui/src/Dashboard.tsx

@@ -11,6 +11,7 @@ import { RocketpoolContext } from "./components/Providers/Context";
 import RewardsTab from "./components/Rewards/RewardsTab";
 import BalanceBox from "./components/BalanceBox/BalanceBox";
 import BalanceButton from "./components/Buttons/BalanceButton";
+import AdvancedTab from "./components/Advanced/AdvancedTab";
 
 function Dashboard({ activeTab }: { activeTab: string }): JSX.Element {
   const { rocketpoolValue, updateRocketpoolValue } =
@@ -42,7 +43,7 @@ function Dashboard({ activeTab }: { activeTab: string }): JSX.Element {
             values[2],
             values[3],
             values[4],
-            values[5],
+            values[5]
           )
         );
         setIsLoading(false);
@@ -137,8 +138,11 @@ function Dashboard({ activeTab }: { activeTab: string }): JSX.Element {
                   {activeTab === "Setup" && (
                     <SetupTab onRefreshRockpoolData={refreshRocketpoolData} />
                   )}
-                  {activeTab === "Rewards" && <RewardsTab config={rocketpoolValue.config} />}
+                  {activeTab === "Rewards" && (
+                    <RewardsTab config={rocketpoolValue.config} />
+                  )}
                   {activeTab === "Info" && <InfoTab />}
+                  {activeTab === "Advanced" && <AdvancedTab />}
                 </div>
               </Card>
             )}

build/ui/src/components/Advanced/AdvancedTab.tsx

@@ -0,0 +1,136 @@
+import React, { useEffect, useRef, useState } from "react";
+import {
+  Alert,
+  AlertTitle,
+  Box,
+  TextField,
+  Button,
+  CircularProgress,
+} from "@mui/material";
+import { AppService } from "../../services/AppService";
+
+interface AdvancedTabProps {}
+
+const AdvancedTab: React.FC<AdvancedTabProps> = (): JSX.Element => {
+  const [command, setCommand] = useState<string>("");
+  const [output, setOutput] = useState<string>("");
+  const [loadingCommand, setLoadingCommand] = useState<boolean>(false);
+  const appService = new AppService();
+
+  const outputRef = useRef<HTMLDivElement | null>(null);
+
+  useEffect(() => {
+    // Scroll to the bottom of the TextField whenever the output is updated
+    if (outputRef.current) {
+      outputRef.current.scrollTop = outputRef.current.scrollHeight;
+    }
+  }, [output]);
+
+  const handleCommandChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    setCommand(event.target.value);
+  };
+
+  const handleSubmit = async (event: React.FormEvent) => {
+    setLoadingCommand(true);
+    event.preventDefault();
+
+    const output = await appService.runCustomCommand(command);
+
+    // Append the command and output to the output box
+    setOutput((prevOutput) => prevOutput + `>> ${command}\n${output}\n\n`);
+
+    // Clear the input field
+    setCommand("");
+    setLoadingCommand(false);
+  };
+
+  return (
+    <div>
+      <div style={{ display: "flex", justifyContent: "center" }}>
+        <Box width={"40rem"} p={2}>
+          <Alert severity="warning" variant="filled">
+            <AlertTitle>Advanced Users Only</AlertTitle>
+            This tab is designed for advanced users. It allows sending commands
+            to the rocketpool binary and displays the output obtained.
+          </Alert>
+        </Box>
+      </div>
+
+      <Box
+        sx={{
+          px: 4,
+        }}
+      >
+        <Box
+          mt={2}
+          p={1}
+          height={300}
+          overflow="auto"
+          borderRadius={1}
+          sx={{ backgroundColor: "grey.200" }}
+          ref={outputRef}
+        >
+          <pre
+            style={{
+              whiteSpace: "pre-wrap",
+              margin: 0,
+              fontFamily: "Ubuntu Mono, monospace",
+              fontSize: "14px",
+              lineHeight: "1.4",
+              color: "#555555",
+              textAlign: "left",
+              overflowWrap: "break-word",
+              wordBreak: "break-all",
+            }}
+          >
+            {output}
+          </pre>
+        </Box>
+        <form
+          onSubmit={handleSubmit}
+          style={{ display: "flex", marginTop: "16px" }}
+        >
+          <TextField
+            label="Enter Command (Example: node status)"
+            value={command}
+            onChange={handleCommandChange}
+            fullWidth
+            InputProps={{
+              disableUnderline: true,
+              style: {
+                fontFamily: "Ubuntu Mono, monospace",
+                fontSize: "14px",
+                lineHeight: "1.4",
+                color: "#555555",
+              },
+            }}
+            InputLabelProps={{
+              style: {
+                fontFamily: "Ubuntu Mono, monospace",
+                fontSize: "14px",
+                lineHeight: "1.4",
+                color: "#555555",
+              },
+            }}
+            sx={{ backgroundColor: "grey.200" }}
+          />
+          {!loadingCommand ? (
+            <Button
+              type="submit"
+              variant="contained"
+              color="primary"
+              style={{ marginLeft: "1rem" }}
+              disabled={command === ""}
+            >
+              Submit
+            </Button>
+          ) : (
+            <CircularProgress style={{ marginLeft: "1rem" }} />
+          )}
+        </form>
+      </Box>
+    </div>
+  );
+};
+
+export default AdvancedTab;

build/ui/src/components/Rewards/RewardsTab.tsx

@@ -15,6 +15,7 @@ import { Config } from "../../types/AppConfig";
 import TxsLinksBox from "../Setup/TxsLinksBox";
 import { CanClaimRewards } from "../../types/CanClaimRewards";
 import { TxResponse } from "../../types/TxResponse";
+import BigNumber from "bignumber.js";
 
 interface RewardsTabProps {
   config?: Config;
@@ -56,13 +57,13 @@ const RewardsTab: React.FC<RewardsTabProps> = ({
         .map((reward) => reward.index)
         .join(",");
       const sumCollateralRplAmount = rewardsInfo.unclaimedIntervals.reduce(
-        (accumulator, currentValue) => accumulator + Number(currentValue.collateralRplAmount),
-        0
+        (accumulator, currentValue) => accumulator.plus(new BigNumber(currentValue.collateralRplAmount)),
+        new BigNumber(0),
       );
       var canClainRewards = restake
         ? await appService.getNodeCanClaimAndRestakeRewards(
             indexes,
-            sumCollateralRplAmount,
+            sumCollateralRplAmount.toString(),
           )
         : await appService.getNodeCanClaimRewards(indexes);
       setNodeCanClaimRewards(canClainRewards);
@@ -72,7 +73,7 @@ const RewardsTab: React.FC<RewardsTabProps> = ({
       var tx = restake
         ? await appService.nodeClaimAndRestakeRewards(
             indexes,
-            sumCollateralRplAmount,
+            sumCollateralRplAmount.toString(),
           )
         : await appService.nodeClaimRewards(indexes);
       setTxResponse(tx);