Skip to content

Commit 6c74456

Browse files
authored
Merge pull request #608 from ChainSafe/beroburnt/v-7-1
Release 0.7.1
2 parents 9020022 + 4ee2087 commit 6c74456

20 files changed

+80
-381
lines changed

.env.dist

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

lighthouse-testnet.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version: "3.0"
55

66
services:
77
beacon_node:
8-
image: "${DOCKER_LIGHTHOUSE_IMAGE:-sigp/lighthouse:v1.5.2}"
8+
image: "${DOCKER_LIGHTHOUSE_IMAGE:-sigp/lighthouse:v2.0.0}"
99
container_name: "eth2_testnet_beacon_lighthouse"
1010
volumes:
1111
- ./testnet/lighthouse/data:/root/testnet
@@ -16,7 +16,7 @@ services:
1616
command: sh /root/scripts/start-beacon-node.sh
1717

1818
second_beacon_node:
19-
image: "${DOCKER_LIGHTHOUSE_IMAGE:-sigp/lighthouse:v1.5.2}"
19+
image: "${DOCKER_LIGHTHOUSE_IMAGE:-sigp/lighthouse:v2.0.0}"
2020
container_name: "eth2_testnet_second_beacon_lighthouse"
2121
volumes:
2222
- ./testnet/lighthouse/data:/root/testnet
@@ -30,7 +30,7 @@ services:
3030
command: sh /root/scripts/start-second-beacon-node.sh
3131

3232
validator_client:
33-
image: "${DOCKER_LIGHTHOUSE_IMAGE:-sigp/lighthouse:v1.5.2}"
33+
image: "${DOCKER_LIGHTHOUSE_IMAGE:-sigp/lighthouse:v2.0.0}"
3434
container_name: "eth2_testnet_validator_lighthouse"
3535
network_mode: "host"
3636
volumes:

nimbus-testnet.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "3.4"
22

33
services:
44
beacon_node:
5-
image: "${DOCKER_NIMBUS_IMAGE:-statusim/nimbus-eth2:amd64-v1.4.2}"
5+
image: "${DOCKER_NIMBUS_IMAGE:-statusim/nimbus-eth2:amd64-v1.5.0}"
66
container_name: "eth2_testnet_beacon_nimbus"
77
entrypoint: "/bin/bash"
88
ports:

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "chainguardian",
33
"productName": "ChainGuardian",
4-
"version": "0.7.0",
4+
"version": "0.7.1",
55
"description": "Eth2.0 desktop validator client",
66
"keywords": [
77
"eth2",
@@ -204,7 +204,7 @@
204204
"@reduxjs/toolkit": "^1.4.0",
205205
"@sentry/electron": "2.0.3",
206206
"archiver": "^5.2.0",
207-
"axios": "0.21.1",
207+
"axios": "0.21.2",
208208
"bigint-buffer": "1.1.5",
209209
"bip39": "3.0.2",
210210
"cheerio": "1.0.0-rc.4",

prysm-testnet.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '3.6'
22

33
services:
44
prysm_beacon:
5-
image: "${DOCKER_PRYSM_IMAGE:-gcr.io/prysmaticlabs/prysm/beacon-chain:v2.0.0-rc.2}"
5+
image: "${DOCKER_PRYSM_IMAGE:-gcr.io/prysmaticlabs/prysm/beacon-chain:v2.0.1}"
66
container_name: "eth2_testnet_prysm_beacon"
77
volumes:
88
- ./testnet/prysm/data:/data
@@ -28,7 +28,7 @@ services:
2828
--interop-eth1data-votes
2929
3030
prysm_validator:
31-
image: "${DOCKER_PRYSM_VALIDATOR_IMAGE:-gcr.io/prysmaticlabs/prysm/validator:v2.0.0-rc.2}"
31+
image: "${DOCKER_PRYSM_VALIDATOR_IMAGE:-gcr.io/prysmaticlabs/prysm/validator:v2.0.1}"
3232
container_name: "eth2_testnet_prysm_validator"
3333
volumes:
3434
- ./testnet/prysm/data:/data

src/main/menu/menu.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const template = [
2828
{
2929
label: "Discord",
3030
click: async (): Promise<void> => {
31-
await shell.openExternal("https://discord.gg/4GBwH52cFb");
31+
await shell.openExternal("https://discord.gg/ATcsRSN24v");
3232
},
3333
},
3434
...(isMac
@@ -90,7 +90,7 @@ const template = [
9090
{
9191
label: "Discord Support",
9292
click: async (): Promise<void> => {
93-
await shell.openExternal("https://discord.gg/uM9rZFDefm");
93+
await shell.openExternal("https://discord.gg/ATcsRSN24v");
9494
},
9595
},
9696
{

src/renderer/components/ConfigureBeaconNode/ConfigureBeaconNode.tsx

+4-6
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,10 @@ export const ConfigureBeaconNode: React.FunctionComponent<IConfigureBNProps> = (
5252

5353
const [images, setImages] = useState([]);
5454
useEffect(() => {
55-
getAvailableClientReleases(props.clientName, defaults.beacon.versionPrefix, props.clientName === "prysm").then(
56-
(imageList) => {
57-
setImages(imageList);
58-
setImageIndex(imageList.length - 1);
59-
},
60-
);
55+
getAvailableClientReleases(props.clientName, defaults.beacon.versionPrefix).then((imageList) => {
56+
setImages(imageList);
57+
setImageIndex(imageList.length - 1);
58+
});
6159
}, [props.clientName]);
6260
const [imageIndex, setImageIndex] = useState(0);
6361

src/renderer/containers/ValidatorDetails/ValidatorStats/ValidatorStats.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ export const ValidatorStats = ({validator}: IValidatorStatsProps): ReactElement
104104
<ValidatorAttestationEfficiencyChart data={attestationData} />
105105
</div>
106106
<div className='beacon-node-charts-container'>
107-
<ValidatorAttestationsTable publicKey={validator.publicKey} slot={beaconNode.slot} />
108-
<ValidatorPropositionsTable publicKey={validator.publicKey} slot={beaconNode.slot} />
107+
<ValidatorAttestationsTable publicKey={validator.publicKey} slot={beaconNode?.slot} />
108+
<ValidatorPropositionsTable publicKey={validator.publicKey} slot={beaconNode?.slot} />
109109
</div>
110110
<PrivateKeyPromp keystore={validator.keystore} display={showPK} onClose={onPrimaryKeyClose} />
111111
</div>

src/renderer/overlays/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {ipcRenderer} from "electron";
1212

1313
export const Overlays: React.FC = () => {
1414
const onDiscordClick = (): void => {
15-
shell.openExternal("https://discord.gg/uM9rZFDefm");
15+
shell.openExternal("https://discord.gg/ATcsRSN24v");
1616
};
1717

1818
const history = useHistory();

src/renderer/services/docker/getClientParams.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export const getClientParams = ({
4141
`--p2p-tcp-port=${libp2pPort}`,
4242
`--p2p-udp-port=${discoveryPort}`,
4343
`--grpc-gateway-host=0.0.0.0`,
44-
`--eth-api-port=${rpcPort}`,
44+
`--grpc-gateway-port=${rpcPort}`,
4545
`--http-web3provider=${eth1Url}`,
4646
];
4747
// --fallback-web3provider=<PROVIDER 1> --fallback-web3provider=<PROVIDER 2>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {CgEventsApi, BeaconEvent, Topics} from "../interface";
55
import {EventType} from "../enums";
66
import {stringifyQuery} from "@chainsafe/lodestar-api/lib/client/utils/format";
77

8-
type EventSourceError = {status: number; message: string};
8+
export type EventSourceError = {status: number; message: string};
99

1010
export class CgEth2EventsApi implements CgEventsApi {
1111
protected readonly url: string;

0 commit comments

Comments
 (0)