Merge pull request #575 from NodeFactoryIo/beroburny/prysm-upate

Prysm update

Author: mpetrunic

.env.dist

@@ -5,6 +5,6 @@ SENTRY_PROJECT=chainguardian
 SENTRY_AUTH_TOKEN=xxx
 DOCKER_LIGHTHOUSE_IMAGE=sigp/lighthouse:v1.3.0
 DOCKER_TEKU_IMAGE=consensys/teku:21.5
-DOCKER_PRYSM_IMAGE=gcr.io/prysmaticlabs/prysm/beacon-chain:v1.3.11
-DOCKER_PRYSM_VALIDATOR_IMAGE=gcr.io/prysmaticlabs/prysm/validator:v1.3.11
+DOCKER_PRYSM_IMAGE=gcr.io/prysmaticlabs/prysm/beacon-chain:v1.4.2
+DOCKER_PRYSM_VALIDATOR_IMAGE=gcr.io/prysmaticlabs/prysm/validator:v1.4.2
 DOCKER_NIMBUS_IMAGE=statusim/nimbus-eth2:amd64-v1.4.0

integration/prysm.ts

@@ -7,8 +7,8 @@ import {CgPrysmEth2Api} from "../src/renderer/services/eth2/client/module";
 (async function (): Promise<void> {
     const {proposer, attestation} = await restValidation({
         baseUrl: "http://localhost:5050",
-        getValidatorPrivateKey: async () => getInteropKey(7),
-        limit: 5,
+        getValidatorPrivateKey: async () => getInteropKey(15),
+        limit: 2,
         config,
         ApiClient: CgPrysmEth2Api,
     });

prysm-testnet.yml

@@ -2,12 +2,13 @@ version: '3.6'
 
 services:
   prysm_beacon:
-    image: "${DOCKER_PRYSM_IMAGE:-gcr.io/prysmaticlabs/prysm/beacon-chain:v1.3.11}"
+    image: "${DOCKER_PRYSM_IMAGE:-gcr.io/prysmaticlabs/prysm/beacon-chain:v1.4.2}"
     container_name: "eth2_testnet_prysm_beacon"
     volumes:
       - ./testnet/prysm/data:/data
     ports:
       - '5050:5050'
+      - '5051:5051'
       - '4000:4000'
       - '13000:13000'
       - '12000:12000'
@@ -19,14 +20,15 @@ services:
           --force-clear-db
           --datadir=/data
           --grpc-gateway-port=5050
+          --eth-api-port=5051
           --min-sync-peers=0
           --bootstrap-node=
           --disable-sync
           --interop-genesis-state /data/genesis.ssz
           --interop-eth1data-votes
 
   prysm_validator:
-    image: "${DOCKER_PRYSM_VALIDATOR_IMAGE:-gcr.io/prysmaticlabs/prysm/validator:v1.3.11}"
+    image: "${DOCKER_PRYSM_VALIDATOR_IMAGE:-gcr.io/prysmaticlabs/prysm/validator:v1.4.2}"
     container_name: "eth2_testnet_prysm_validator"
     volumes:
       - ./testnet/prysm/data:/data

src/renderer/containers/BeaconNode/BeaconNodeContainer.tsx

@@ -19,9 +19,12 @@ export const BeaconNodeContainer: React.FC = () => {
 
     const tabs = [{tabId: 0, tabName: "Dashboard", index: 0}];
     if (beacon.docker) {
-        tabs.push({tabId: 1, tabName: "Logs", index: 0}, {tabId: 2, tabName: "Performance", index: 0});
+        tabs.push(
+            {tabId: 1, tabName: "Logs", index: 0},
+            {tabId: 2, tabName: "Performance", index: 0},
+            {tabId: 3, tabName: "Metrics", index: 0},
+        );
     }
-    tabs.push({tabId: 3, tabName: "Metrics", index: 0});
 
     return (
         <Background scrollable={true}>

src/renderer/ducks/beacon/sagas.ts

@@ -241,7 +241,7 @@ export function* watchOnHead(
         typeof CgEth2ApiClient &
         boolean
 > {
-    const config = yield retry(30, 1000, readBeaconChainNetwork, url);
+    const config = yield retry(30, 1000, readBeaconChainNetwork, url, true);
     const ApiClient: typeof CgEth2ApiClient = yield call(getBeaconNodeEth2ApiClient, url);
     const client = new ApiClient(config?.eth2Config || mainnetConfig, url);
     const eventStream = client.events.getEventStream([BeaconEventType.HEAD]);

src/renderer/ducks/validator/sagas.ts

@@ -17,6 +17,7 @@ import {
     CallEffect,
     call,
     takeLatest,
+    retry,
 } from "redux-saga/effects";
 import {CGAccount} from "../../models/account";
 import {deleteKeystore, saveValidatorData} from "../../services/utils/account";
@@ -163,6 +164,7 @@ export function* addNewValidatorSaga(action: ReturnType<typeof addNewValidator>)
     yield put(addValidator(validator));
     yield put(setLoadingValidator(false));
     yield spawn(validatorInfoUpdater, validator.publicKey, validator.network);
+    yield put(startValidatorDutiesWatcher(validator.publicKey));
 }
 
 function* removeValidatorSaga(
@@ -524,9 +526,24 @@ export function* watchValidatorDuties({
 }: ReturnType<typeof startValidatorDutiesWatcher>): Generator<
     SelectEffect | TakeEffect | CallEffect,
     void,
-    IValidatorComplete & typeof CgEth2ApiClient & ICGValidatorResponse & ReturnType<typeof updateEpoch> & Beacon
+    IValidatorComplete &
+        typeof CgEth2ApiClient &
+        ICGValidatorResponse &
+        ReturnType<typeof updateEpoch> &
+        Beacon &
+        ReturnType<typeof setValidatorBeaconNode>
 > {
-    const validator = yield select(getValidator, {publicKey: payload});
+    let validator: IValidatorComplete = yield select(getValidator, {publicKey: payload});
+    if (!validator.beaconNodes.length) {
+        while (true) {
+            const updatedValidator = yield take(setValidatorBeaconNode);
+            if (updatedValidator.payload.length && validator.publicKey === updatedValidator.meta) {
+                validator = {...validator, beaconNodes: updatedValidator.payload};
+                break;
+            }
+        }
+    }
+
     const config = getNetworkConfig(validator.network)?.eth2Config || mainnetConfig;
     const {genesisTime} = getNetworkConfig(validator.network);
 
@@ -539,11 +556,27 @@ export function* watchValidatorDuties({
     function* processDuties(
         epoch: number,
     ): Generator<CallEffect | AllEffect<CallEffect>, void, AttesterDuty[] & ProposerDuty[]> {
-        const attestations = yield call(eth2API.validator.getAttesterDuties, epoch, [validatorState.index]);
-        const attestationsFuture = yield call(eth2API.validator.getAttesterDuties, epoch + 1, [validatorState.index]);
-        const propositions = yield call(eth2API.validator.getProposerDuties, epoch, [validatorId]);
-        const propositionsFuture = yield call(eth2API.validator.getProposerDuties, epoch + 1, [validatorId]);
-        const propositionsSuperFuture = yield call(eth2API.validator.getProposerDuties, epoch + 2, [validatorId]);
+        let attestations: AttesterDuty[], attestationsFuture: AttesterDuty[];
+        try {
+            attestations = yield retry(2, 0, eth2API.validator.getAttesterDuties, epoch, [validatorState.index]);
+            attestationsFuture = yield call(eth2API.validator.getAttesterDuties, epoch + 1, [validatorState.index]);
+        } catch (e) {
+            attestations = attestations || [];
+            attestationsFuture = [];
+            cgLogger.warn("processDuties attestations", e);
+        }
+
+        let propositions: ProposerDuty[], propositionsFuture: ProposerDuty[], propositionsSuperFuture: ProposerDuty[];
+        try {
+            propositions = yield call(eth2API.validator.getProposerDuties, epoch, [validatorId]);
+            propositionsFuture = yield call(eth2API.validator.getProposerDuties, epoch + 1, [validatorId]);
+            propositionsSuperFuture = yield call(eth2API.validator.getProposerDuties, epoch + 2, [validatorId]);
+        } catch (e) {
+            propositions = propositions || [];
+            propositionsFuture = propositionsFuture || [];
+            propositionsSuperFuture = [];
+            cgLogger.warn("processDuties propositions", e);
+        }
 
         // store data to database
         yield all([
@@ -579,6 +612,13 @@ export function* watchValidatorDuties({
         yield take(addBeacons);
         beaconNode = yield select(getBeaconByKey, {key: validator.beaconNodes[0]});
     }
+    if (beaconNode.status !== BeaconStatus.active) {
+        while (true) {
+            const newStatus = yield take(updateStatus);
+            if (newStatus.payload === BeaconStatus.active && newStatus.meta === beaconNode.url) break;
+        }
+    }
+
     yield call(processDuties, computeEpochAtSlot(config, beaconNode.slot));
     while (true) {
         const newEpoch = yield take(updateEpoch);
@@ -592,14 +632,15 @@ function* updateDutiesStatus({
     meta,
 }: ReturnType<typeof updateSlot>): Generator<SelectEffect | AllEffect<AllEffect<CallEffect>>, void, BeaconValidators> {
     const validatorsByBeaconNode = yield select(getValidatorsByBeaconNode);
-    yield all(
-        validatorsByBeaconNode[meta].map(({publicKey}) =>
-            all([
-                call(database.validator.propositionDuties.updateMissed, publicKey, payload),
-                call(database.validator.attestationDuties.updateMissed, publicKey, payload),
-            ]),
-        ),
-    );
+    if (validatorsByBeaconNode[meta])
+        yield all(
+            validatorsByBeaconNode[meta].map(({publicKey}) =>
+                all([
+                    call(database.validator.propositionDuties.updateMissed, publicKey, payload),
+                    call(database.validator.attestationDuties.updateMissed, publicKey, payload),
+                ]),
+            ),
+        );
 }
 
 function* onPublishedBlock({

src/renderer/services/api/http/httpClient.ts

@@ -1,17 +1,19 @@
 import axios, {AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse} from "axios";
 import database from "../../db/api/database";
 
+const axiosConfigDefault: AxiosRequestConfig = {timeout: 3000};
+
 export class HttpClient {
     private client: AxiosInstance;
 
     public constructor(baseURL: string, options: {axios?: AxiosRequestConfig} = {}) {
         if (!options) {
             // eslint-disable-next-line no-param-reassign
-            options = {axios: {}};
+            options = {axios: axiosConfigDefault};
         }
         this.client = axios.create({
             baseURL,
-            ...options.axios,
+            ...{...axiosConfigDefault, ...options.axios},
         });
     }
 

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

@@ -21,6 +21,9 @@ export class CgEth2BeaconPoolApi implements ICGBeaconPoolApi {
     }
 
     public submitAttestation = async (attestation: Attestation): Promise<void> => {
+        await this.httpClient.post("/eth/v1/beacon/pool/attestations", [
+            this.config.types.Attestation.toJson(attestation, {case: "snake"}),
+        ]);
         if (this.publicKey && this.dispatch) {
             const validatorIndexInCommittee = attestation.aggregationBits.findIndex((bit) => bit);
             if (validatorIndexInCommittee !== -1)
@@ -34,9 +37,6 @@ export class CgEth2BeaconPoolApi implements ICGBeaconPoolApi {
                     ),
                 );
         }
-        await this.httpClient.post("/eth/v1/beacon/pool/attestations", [
-            this.config.types.Attestation.toJson(attestation, {case: "snake"}),
-        ]);
     };
 
     public async submitVoluntaryExit(signedVoluntaryExit: SignedVoluntaryExit): Promise<void> {

src/renderer/services/eth2/client/prysm/CgPrysmEth2BeaconApi.ts

@@ -20,16 +20,21 @@ export class CgPrysmEth2BeaconApi extends CgEth2BeaconApi {
 
     public getGenesis = async (): Promise<Genesis | null> => {
         try {
-            const {genesisTime, genesisValidatorsRoot} = await this.httpClient.get<{
-                genesisTime: string;
-                genesisValidatorsRoot: string;
-            }>("/eth/v1alpha1/node/genesis");
+            const genesisResponse = await this.httpClient.get<{
+                data: {
+                    // eslint-disable-next-line camelcase
+                    genesis_time: string;
+                    // eslint-disable-next-line camelcase
+                    genesis_validators_root: string;
+                    // eslint-disable-next-line camelcase
+                    genesis_fork_version: string;
+                };
+            }>("/eth/v1/beacon/genesis");
 
             const result = {
-                genesisTime: Math.round(new Date(genesisTime).getTime() / 1000).toString(),
-                genesisValidatorsRoot: base64ToHex(genesisValidatorsRoot),
-                // TODO: change mocked data with real
-                genesisForkVersion: "0x00000000",
+                genesisTime: Math.round(new Date(genesisResponse.data.genesis_time).getTime() / 1000).toString(),
+                genesisValidatorsRoot: base64ToHex(genesisResponse.data.genesis_validators_root),
+                genesisForkVersion: base64ToHex(genesisResponse.data.genesis_fork_version),
             };
 
             return this.config.types.Genesis.fromJson(result, {case: "camel"});

src/renderer/services/eth2/client/prysm/CgPrysmEth2BeaconPoolApi.ts

@@ -6,7 +6,7 @@ import {Attestation, SignedVoluntaryExit} from "@chainsafe/lodestar-types";
 import {signedNewAttestation} from "../../../../ducks/validator/actions";
 import {toHex} from "@chainsafe/lodestar-utils";
 import {hexToBase64} from "./utils";
-import {Attestation as PrysmAttestation} from "./types";
+import {Attestation as PrysmAttestation} from "./map.types";
 
 type AttestationData = {
     aggregationBits: string;
@@ -32,26 +32,16 @@ export class CgPrysmEth2BeaconPoolApi extends CgEth2BeaconPoolApi {
     }
 
     public submitAttestation = async (attestation: Attestation): Promise<void> => {
-        if (this.publicKey && this.dispatch) {
-            const validatorIndexInCommittee = attestation.aggregationBits.findIndex((bit) => bit);
-            if (validatorIndexInCommittee !== -1)
-                this.dispatch(
-                    signedNewAttestation(
-                        this.publicKey,
-                        toHex(attestation.data.beaconBlockRoot),
-                        attestation.data.index,
-                        attestation.data.slot,
-                        validatorIndexInCommittee,
-                    ),
-                );
-        }
         const data = this.config.types.Attestation.toJson(attestation) as AttestationData;
         const mapped: PrysmAttestation = {
-            aggregationBits: hexToBase64(data.aggregationBits),
+            // eslint-disable-next-line camelcase,@typescript-eslint/camelcase
+            aggregation_bits: hexToBase64(data.aggregationBits),
             data: {
                 slot: data.data.slot,
-                committeeIndex: data.data.index,
-                beaconBlockRoot: hexToBase64(data.data.beaconBlockRoot),
+                // eslint-disable-next-line camelcase,@typescript-eslint/camelcase
+                index: data.data.index,
+                // eslint-disable-next-line camelcase,@typescript-eslint/camelcase
+                beacon_block_root: hexToBase64(data.data.beaconBlockRoot),
                 source: {
                     epoch: data.data.source.epoch,
                     root: hexToBase64(data.data.source.root),
@@ -63,7 +53,20 @@ export class CgPrysmEth2BeaconPoolApi extends CgEth2BeaconPoolApi {
             },
             signature: hexToBase64(data.signature),
         };
-        await this.httpClient.post("/eth/v1alpha1/validator/attestation", mapped);
+        await this.httpClient.post("/eth/v1/beacon/pool/attestations", {data: [mapped]});
+        if (this.publicKey && this.dispatch) {
+            const validatorIndexInCommittee = attestation.aggregationBits.findIndex((bit) => bit);
+            if (validatorIndexInCommittee !== -1)
+                this.dispatch(
+                    signedNewAttestation(
+                        this.publicKey,
+                        toHex(attestation.data.beaconBlockRoot),
+                        attestation.data.index,
+                        attestation.data.slot,
+                        validatorIndexInCommittee,
+                    ),
+                );
+        }
     };
 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars