Merge branch 'develop'

Author: Marketen

Dockerfile.dev

@@ -29,8 +29,6 @@ COPY --from=git-data /usr/src/app/.git-data.json $GIT_DATA_PATH
 COPY package.json yarn.lock .yarnrc.yml tsconfig.json ./
 COPY packages packages
 
-# link instructions must be executed in runtime due to the way the volumes are mounted
-ENTRYPOINT ["/bin/sh", "-c", "ln -sf /app/packages/admin-ui/build/ /app/packages/dappmanager/dist && \
-  ln -sf /usr/src/app/dnp_repo/ /app/packages/dappmanager && \
-  ln -sf /usr/src/app/DNCORE/ /app/packages/dappmanager && \
+ENTRYPOINT ["/bin/sh", "-c", "mkdir -p /app/packages/dappmanager/dnp_repo /app/packages/dappmanager/DNCORE && \
+  ln -sf /app/packages/admin-ui/build/ /app/packages/dappmanager/dist && \
   yarn && yarn build && yarn run dev"]

docker-compose-dev.yml

@@ -19,8 +19,8 @@ services:
     restart: always
     volumes:
       - "/run/dbus/system_bus_socket:/run/dbus/system_bus_socket"
-      - "/var/lib/docker/volumes/dncore_dappmanagerdnpdappnodeeth_data/_data:/usr/src/app/dnp_repo/"
-      - "/usr/src/dappnode/DNCORE/:/usr/src/app/DNCORE/"
+      - "/var/lib/docker/volumes/dncore_dappmanagerdnpdappnodeeth_data/_data:/app/packages/dappmanager/dnp_repo/"
+      - "/usr/src/dappnode/DNCORE/:/app/packages/dappmanager/DNCORE/" # left side must be absolute path where DNCORE is located in the host. i.e on macos /Users/<user>/dappnode/DNCORE/
       - "/var/run/docker.sock:/var/run/docker.sock"
       - "/etc/hostname:/etc/dappnodename:ro"
       - "./:/app"
@@ -29,6 +29,7 @@ services:
       - ETH_MAINNET_RPC_URL_REMOTE=
       - IPFS_HOST=
       - DISABLE_UPNP=
+
     networks:
       dncore_network:
         aliases:

docker-compose.yml

@@ -24,6 +24,8 @@ services:
       - DISABLE_UPNP=
       - ALWAYS_DAPPGETBASIC=
       - SKIP_COMPOSE_VALIDATION=
+      - TEST=
+
     networks:
       dncore_network:
         aliases:

packages/admin-ui/package.json

@@ -64,7 +64,8 @@
     "@types/react-dom": "^18.3.0",
     "nodemon": "^3.1.4",
     "prettier": "^1.16.4",
-    "ts-node": "^10.9.2"
+    "ts-node": "^10.9.2",
+    "vite-plugin-svgr": "^4.5.0"
   },
   "optionalDependencies": {
     "@rollup/rollup-linux-x64-gnu": "4.18.0"

packages/admin-ui/src/__mock-backend__/index.ts

@@ -56,6 +56,44 @@ export const otherCalls: Omit<Routes, keyof typeof namedSpacedCalls> = {
       progress: 0.83027522935
     }
   ],
+  nodeStatusGetByNetwork: async () => ({
+    mainnet: {
+      ec: {
+        name: "Nethermind",
+        dnp: "nethermind.dnp.dappnode.eth",
+        isSynced: true,
+        currentBlock: 23648945,
+        progress: 100,
+        peers: 50
+      },
+      cc: {
+        name: "Nimbus",
+        dnp: "nimbus.dnp.dappnode.eth",
+        isSynced: true,
+        currentBlock: 12875373,
+        progress: 100,
+        peers: 40
+      }
+    },
+    hoodi: {
+      ec: {
+        name: "besu",
+        dnp: "besu-hoodi.dnp.dappnode.eth",
+        isSynced: true,
+        currentBlock: 1480848,
+        progress: 100,
+        peers: 30
+      },
+      cc: {
+        name: "Prysm",
+        dnp: "prysm-hoodi.dnp.dappnode.eth",
+        isSynced: false,
+        currentBlock: 1592925,
+        progress: 100,
+        peers: 20
+      }
+    }
+  }),
   changeIpfsTimeout: async () => {},
   cleanCache: async () => {},
   cleanDb: async () => {},
@@ -226,6 +264,8 @@ export const otherCalls: Omit<Routes, keyof typeof namedSpacedCalls> = {
     ipfsClientTarget: IpfsClientTarget.remote,
     ipfsGateway: "https://ipfs-gateway.dappnode.net"
   }),
+  mirrorProviderGet: async () => ({ enabled: false }),
+  mirrorProviderSet: async () => {},
   enableEthicalMetrics: async () => {},
   getEthicalMetricsConfig: async () => ({
     mail: "@example.com",
@@ -411,6 +451,12 @@ export const otherCalls: Omit<Routes, keyof typeof namedSpacedCalls> = {
       gnosis: "prysm-gnosis.dnp.dappnode.eth"
     };
   },
+  executionClientsGetByNetworks: async () => {
+    return {
+      mainnet: "geth.dnp.dappnode.eth",
+      gnosis: "nethermind-xdai.dnp.dappnode.eth"
+    };
+  },
   premiumBeaconBackupActivate: async () => {},
   premiumBeaconBackupDeactivate: async () => {},
   premiumBeaconBackupStatus: async (): Promise<Record<string, BeaconBackupNetworkStatus>> => {
@@ -433,6 +479,43 @@ export const otherCalls: Omit<Routes, keyof typeof namedSpacedCalls> = {
     mainnet: { validators: ["0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef"] },
     hoodi: { validators: [] },
     gnosis: null
+  }),
+
+  validatorsDataByNetwork: async () => ({
+    mainnet: {
+      active: { validators: ["0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef"] },
+      attesting: { validators: ["0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef"] },
+      balances: {
+        balances: {
+          "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef": "32000000000"
+        }
+      }
+    },
+    hoodi: {
+      active: { validators: [] },
+      attesting: { validators: [] },
+      balances: { balances: {} }
+    },
+    gnosis: {
+      active: null,
+      attesting: null,
+      balances: null
+    }
+  }),
+
+  signerByNetworkGet: async () => ({
+    mainnet: {
+      isInstalled: true,
+      brainRunning: true
+    },
+    hoodi: {
+      isInstalled: true,
+      brainRunning: false
+    },
+    gnosis: {
+      isInstalled: false,
+      brainRunning: false
+    }
   })
 };
 

packages/admin-ui/src/components/Loading.tsx

@@ -2,17 +2,17 @@ import React, { useState, useEffect } from "react";
 import logoAnimated from "img/dappNodeAnimation.gif";
 import "./loading.scss";
 
-export default function Loading({ steps }: { steps: string[] }) {
+export default function Loading({ steps, small }: { steps?: string[]; small?: boolean }) {
   const [index, setIndex] = useState(0);
   useEffect(() => {
     const interval = setInterval(() => setIndex((i) => i + 1), 3000);
     return () => clearInterval(interval);
   }, []);
 
   return (
-    <div className="loading-view">
+    <div className={`loading-view ${small && "small"}`}>
       <img src={logoAnimated} alt="Loading icon" />
-      <p className="steps">{steps[index] || steps[steps.length - 1]}...</p>
+      {steps && <p className="steps">{steps[index] || steps[steps.length - 1]}...</p>}
     </div>
   );
 }

packages/admin-ui/src/components/loading.scss

@@ -12,4 +12,13 @@
   p {
     opacity: 0.6;
   }
+
+  &.small {
+    margin: 1rem 0px;
+    img {
+      width: 50px;
+      height: 50px;
+      margin: 0px;
+    }
+  }
 }