Skip to content

Commit fa1fa6a

Browse files
wackerowwackerow
authored
Merge pull request #721 from ethereum/pectra
Pectra
2 parents ded8412 + 5d89d38 commit fa1fa6a

File tree

92 files changed

+8972
-2022
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+8972
-2022
lines changed

Diff for: ‎.env.holesky

+1
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ export REACT_APP_BEACONCHAIN_URL=https://holesky.beaconcha.in
99
export REACT_APP_EL_EXPLORER_URL=https://holesky.beaconcha.in
1010
export REACT_APP_TUTORIAL_URL=https://notes.ethereum.org/@launchpad/holesky
1111
export REACT_APP_FAUCET_URL=https://www.holeskyfaucet.io/
12+
export REACT_APP_MIN_GENESIS_TIME=1695902400000

Diff for: ‎.env.template

+19-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,16 @@ REACT_APP_IS_MAINNET=true
1212
REACT_APP_FORTMATIC_KEY=pk_test_D113D979E0D3508F
1313
# string
1414
REACT_APP_CONTRACT_ADDRESS=0x00000000219ab540356cBB839Cbe05303d7705Fa
15+
# string
16+
REACT_APP_COMPOUNDING_CONTRACT_ADDRESS=0x0000BBdDc7CE488642fb579F8B00f3a590007251
17+
# string
18+
REACT_APP_WITHDRAWAL_CONTRACT_ADDRESS=0x00000961Ef480Eb55e80D19ad83579A64c007002
1519
# number
1620
REACT_APP_ETH_REQUIREMENT=524288
1721
# number
18-
REACT_APP_PRICE_PER_VALIDATOR=32
22+
REACT_APP_MIN_ACTIVATION_BALANCE=32
23+
# number
24+
REACT_APP_MAX_EFFECTIVE_BALANCE=2048
1925
# Uint8Array such as "0x00000000"
2026
REACT_APP_GENESIS_FORK_VERSION=0x00000000
2127
# string
@@ -32,6 +38,8 @@ REACT_APP_TEKU_INSTALLATION_URL=https://docs.teku.consensys.io/get-started/insta
3238
#
3339
# true, false
3440
REACT_APP_IS_MAINNET=false
41+
# string (if `REACT_APP_IS_MAINNET=true`, it's the active public testnet name; otherwise, it's the testnet name of this website)
42+
REACT_APP_TESTNET_LAUNCHPAD_NAME=Holesky
3543
# string
3644
REACT_APP_CONTRACT_ADDRESS=0x4242424242424242424242424242424242424242
3745
# string
@@ -42,9 +50,17 @@ REACT_APP_BEACONCHAIN_URL=https://holesky.beaconcha.in
4250
REACT_APP_EL_EXPLORER_URL=https://holesky.beaconcha.in
4351
# string
4452
REACT_APP_TUTORIAL_URL=https://notes.ethereum.org/@launchpad/holesky
45-
# string (if `REACT_APP_IS_MAINNET=true`, it's the active public testnet name; otherwise, it's the testnet name of this website)
46-
REACT_APP_TESTNET_LAUNCHPAD_NAME=Holesky
4753
# number
4854
REACT_APP_ETH_DEPOSIT_OFFSET=0
4955
# string
5056
REACT_APP_FAUCET_URL=https://www.holeskyfaucet.io/
57+
# string
58+
REACT_APP_RPC_URL=https://rpc.holesky.ethpandaops.io
59+
# string
60+
REACT_APP_BEACONCHAIN_URL=https://holesky.beaconcha.in
61+
# string
62+
REACT_APP_TUTORIAL_URL=https://notes.ethereum.org/@launchpad/holesky
63+
# number
64+
REACT_APP_ETH_DEPOSIT_OFFSET=0
65+
# number
66+
REACT_APP_MIN_GENESIS_TIME=1695902400000

Diff for: ‎.nvmrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
14.19.2

Diff for: ‎.prettierrc

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
22
"singleQuote": true,
3-
"trailingComma": "es5"
3+
"trailingComma": "es5",
4+
"tabWidth": 2,
5+
"semi": true
46
}

Diff for: ‎netlify.toml

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
NODE_VERSION = "14.19.2"
55
[context.deploy-preview.environment]
66
NODE_VERSION = "14.19.2"
7+
REACT_APP_IS_MERGE = "true"
8+
REACT_APP_COMPOUNDING_CONTRACT_ADDRESS = "0x0000BBdDc7CE488642fb579F8B00f3a590007251"
9+
REACT_APP_WITHDRAWAL_CONTRACT_ADDRESS = "0x00000961Ef480Eb55e80D19ad83579A64c007002"
710
[context.branch-deploy.environment]
811
NODE_VERSION = "14.19.2"
912
[context.dev.environment]

Diff for: ‎package.json

+11-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
"@types/react-helmet": "^6.1.0",
1616
"@types/react-scroll": "^1.5.4",
1717
"@types/react-tooltip": "^3.11.0",
18-
"@web3-react/abstract-connector": "latest",
18+
"@web3-react/abstract-connector": "6.0.7",
1919
"@web3-react/core": "^6.0.7",
2020
"@web3-react/fortmatic-connector": "^6.0.7",
21-
"@web3-react/injected-connector": "latest",
21+
"@web3-react/injected-connector": "6.0.7",
2222
"@web3-react/types": "^6.0.7",
2323
"animate.css": "^3.7.2",
2424
"animate.css-react": "^1.0.0",
@@ -111,7 +111,15 @@
111111
"compile": "formatjs compile src/intl/en.json --format crowdin --out-file src/intl/compiled/en.json --ast"
112112
},
113113
"eslintConfig": {
114-
"extends": "react-app"
114+
"extends": [
115+
"react-app",
116+
"plugin:@typescript-eslint/recommended",
117+
"plugin:prettier/recommended"
118+
],
119+
"plugins": [
120+
"@typescript-eslint",
121+
"prettier"
122+
]
115123
},
116124
"browserslist": {
117125
"production": [

Diff for: ‎src/Routes.tsx

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { useIntl } from 'react-intl';
55
import { supportedLanguages } from './intl';
66
import {
77
AcknowledgementPage,
8+
ActionsPage,
89
CongratulationsPage,
910
ConnectWalletPage,
1011
SelectClientPage,
@@ -70,6 +71,7 @@ export enum routesEnum {
7071
languagesPage = '/languages',
7172
withdrawals = '/withdrawals',
7273
btecGuide = '/btec',
74+
actionsPage = '/validator-actions',
7375
}
7476
const routes: RouteType[] = [
7577
{
@@ -126,6 +128,7 @@ const routes: RouteType[] = [
126128
{ path: routesEnum.topUpPage, exact: true, component: TopUpPage },
127129
{ path: routesEnum.withdrawals, exact: true, component: Withdrawals },
128130
{ path: routesEnum.btecGuide, exact: true, component: BtecGuide },
131+
{ path: routesEnum.actionsPage, exact: true, component: ActionsPage },
129132
{ path: routesEnum.landingPage, exact: true, component: LandingPage },
130133
// NOTE: this wildcard route must be the last index of the routes array
131134
{ path: routesEnum.notFoundPage, component: NotFoundPage },

Diff for: ‎src/components/Alert.tsx

+31-26
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22
import styled from 'styled-components';
33
import { Box, BoxProps } from 'grommet';
44

5-
const variantStyles = {
5+
const variantStyles: Record<string, React.CSSProperties> = {
66
primary: {
77
backgroundColor: '#cce5ff',
88
borderColor: '#b8daff',
@@ -39,28 +39,33 @@ const HighlightStyles = styled.div`
3939
}
4040
`;
4141

42-
export const Alert = (
43-
props: {
44-
children: React.ReactNode;
45-
className?: string;
46-
error?: boolean;
47-
style?: any;
48-
variant?: string;
49-
} & BoxProps
50-
): JSX.Element => {
51-
const { variant = 'primary', className, children, pad } = props;
52-
return (
53-
<Box
54-
border
55-
className={className}
56-
pad={pad || 'medium'}
57-
round="xsmall"
58-
variant={variant}
59-
{...props}
60-
// @ts-ignore
61-
style={variantStyles[variant]}
62-
>
63-
<HighlightStyles>{children}</HighlightStyles>
64-
</Box>
65-
);
66-
};
42+
type AlertProps = {
43+
children: React.ReactNode;
44+
className?: string;
45+
error?: boolean;
46+
style?: any;
47+
variant?: string;
48+
} & BoxProps;
49+
50+
export const Alert = ({
51+
variant = 'primary',
52+
className,
53+
children,
54+
style,
55+
pad,
56+
...props
57+
}: AlertProps) => (
58+
<Box
59+
border
60+
className={className}
61+
pad={pad || 'medium'}
62+
round="xsmall"
63+
style={{
64+
...variantStyles[variant],
65+
...style,
66+
}}
67+
{...props}
68+
>
69+
<HighlightStyles>{children}</HighlightStyles>
70+
</Box>
71+
);

0 commit comments

Comments
 (0)