Merge branch 'develop' into beroburny/fix-validator-details

Author: BeroBurny

.env.dist

@@ -3,8 +3,8 @@ SENTRY_DSN=https://[email protected]/yyyyyyy
 SENTRY_ORG=nodefactory
 SENTRY_PROJECT=chainguardian
 SENTRY_AUTH_TOKEN=xxx
-DOCKER_LIGHTHOUSE_IMAGE=sigp/lighthouse:v1.5.2
+DOCKER_LIGHTHOUSE_IMAGE=sigp/lighthouse:v2.0.0
 DOCKER_TEKU_IMAGE=consensys/teku:21.9.2
-DOCKER_PRYSM_IMAGE=gcr.io/prysmaticlabs/prysm/beacon-chain:v2.0.0-rc.2
-DOCKER_PRYSM_VALIDATOR_IMAGE=gcr.io/prysmaticlabs/prysm/validator:v2.0.0-rc.2
-DOCKER_NIMBUS_IMAGE=statusim/nimbus-eth2:amd64-v1.4.2
+DOCKER_PRYSM_IMAGE=gcr.io/prysmaticlabs/prysm/beacon-chain:v2.0.1
+DOCKER_PRYSM_VALIDATOR_IMAGE=gcr.io/prysmaticlabs/prysm/validator:v2.0.1
+DOCKER_NIMBUS_IMAGE=statusim/nimbus-eth2:amd64-v1.5.0

.github/workflows/ci.yaml

@@ -30,9 +30,7 @@ jobs:
         run: yarn run test:unit && yarn run test:components
 
       - name: Run e2e tests
-        run: |
-          yarn add cheerio-select
-          yarn run test:e2e
+        run: yarn run test:e2e
 
       - name: Publish code coverage
         uses: codecov/codecov-action@v1

lighthouse-testnet.yml

@@ -5,7 +5,7 @@ version: "3.0"
 
 services:
   beacon_node:
-    image: "${DOCKER_LIGHTHOUSE_IMAGE:-sigp/lighthouse:v1.5.2}"
+    image: "${DOCKER_LIGHTHOUSE_IMAGE:-sigp/lighthouse:v2.0.0}"
     container_name: "eth2_testnet_beacon_lighthouse"
     volumes:
       - ./testnet/lighthouse/data:/root/testnet
@@ -16,7 +16,7 @@ services:
     command: sh /root/scripts/start-beacon-node.sh
 
   second_beacon_node:
-    image: "${DOCKER_LIGHTHOUSE_IMAGE:-sigp/lighthouse:v1.5.2}"
+    image: "${DOCKER_LIGHTHOUSE_IMAGE:-sigp/lighthouse:v2.0.0}"
     container_name: "eth2_testnet_second_beacon_lighthouse"
     volumes:
       - ./testnet/lighthouse/data:/root/testnet
@@ -30,7 +30,7 @@ services:
     command: sh /root/scripts/start-second-beacon-node.sh
 
   validator_client:
-    image: "${DOCKER_LIGHTHOUSE_IMAGE:-sigp/lighthouse:v1.5.2}"
+    image: "${DOCKER_LIGHTHOUSE_IMAGE:-sigp/lighthouse:v2.0.0}"
     container_name: "eth2_testnet_validator_lighthouse"
     network_mode: "host"
     volumes:

nimbus-testnet.yml

@@ -2,7 +2,7 @@ version: "3.4"
 
 services:
   beacon_node:
-    image: "${DOCKER_NIMBUS_IMAGE:-statusim/nimbus-eth2:amd64-v1.4.2}"
+    image: "${DOCKER_NIMBUS_IMAGE:-statusim/nimbus-eth2:amd64-v1.5.0}"
     container_name: "eth2_testnet_beacon_nimbus"
     entrypoint: "/bin/bash"
     ports:

package.json

@@ -1,7 +1,7 @@
 {
   "name": "chainguardian",
   "productName": "ChainGuardian",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Eth2.0 desktop validator client",
   "keywords": [
     "eth2",
@@ -208,7 +208,6 @@
     "bigint-buffer": "1.1.5",
     "bip39": "3.0.2",
     "cheerio": "1.0.0-rc.4",
-    "cheerio-select": "^1.5.0",
     "date-fns": "^2.16.1",
     "electron-log": "^4.3.1",
     "electron-mock-ipc": "^0.3.9",
@@ -237,6 +236,7 @@
   },
   "resolutions": {
     "terser": "4.6.3",
-    "serialize-javascript": "4.0.0"
+    "serialize-javascript": "4.0.0",
+    "cheerio-select": "1.5.0"
   }
 }

prysm-testnet.yml

@@ -2,7 +2,7 @@ version: '3.6'
 
 services:
   prysm_beacon:
-    image: "${DOCKER_PRYSM_IMAGE:-gcr.io/prysmaticlabs/prysm/beacon-chain:v2.0.0-rc.2}"
+    image: "${DOCKER_PRYSM_IMAGE:-gcr.io/prysmaticlabs/prysm/beacon-chain:v2.0.1}"
     container_name: "eth2_testnet_prysm_beacon"
     volumes:
       - ./testnet/prysm/data:/data
@@ -28,7 +28,7 @@ services:
           --interop-eth1data-votes
 
   prysm_validator:
-    image: "${DOCKER_PRYSM_VALIDATOR_IMAGE:-gcr.io/prysmaticlabs/prysm/validator:v2.0.0-rc.2}"
+    image: "${DOCKER_PRYSM_VALIDATOR_IMAGE:-gcr.io/prysmaticlabs/prysm/validator:v2.0.1}"
     container_name: "eth2_testnet_prysm_validator"
     volumes:
       - ./testnet/prysm/data:/data

src/renderer/components/ConfigureBeaconNode/ConfigureBeaconNode.tsx

@@ -52,12 +52,10 @@ export const ConfigureBeaconNode: React.FunctionComponent<IConfigureBNProps> = (
 
     const [images, setImages] = useState([]);
     useEffect(() => {
-        getAvailableClientReleases(props.clientName, defaults.beacon.versionPrefix, props.clientName === "prysm").then(
-            (imageList) => {
-                setImages(imageList);
-                setImageIndex(imageList.length - 1);
-            },
-        );
+        getAvailableClientReleases(props.clientName, defaults.beacon.versionPrefix).then((imageList) => {
+            setImages(imageList);
+            setImageIndex(imageList.length - 1);
+        });
     }, [props.clientName]);
     const [imageIndex, setImageIndex] = useState(0);
 

src/renderer/services/docker/getClientParams.ts

@@ -41,7 +41,7 @@ export const getClientParams = ({
                 `--p2p-tcp-port=${libp2pPort}`,
                 `--p2p-udp-port=${discoveryPort}`,
                 `--grpc-gateway-host=0.0.0.0`,
-                `--eth-api-port=${rpcPort}`,
+                `--grpc-gateway-port=${rpcPort}`,
                 `--http-web3provider=${eth1Url}`,
             ];
             // --fallback-web3provider=<PROVIDER 1> --fallback-web3provider=<PROVIDER 2>

src/renderer/services/eth2/client/eth2ApiClient/CgEth2EventsApi.ts

@@ -5,7 +5,7 @@ import {CgEventsApi, BeaconEvent, Topics} from "../interface";
 import {EventType} from "../enums";
 import {stringifyQuery} from "@chainsafe/lodestar-api/lib/client/utils/format";
 
-type EventSourceError = {status: number; message: string};
+export type EventSourceError = {status: number; message: string};
 
 export class CgEth2EventsApi implements CgEventsApi {
     protected readonly url: string;