Merge pull request #721 from ethereum/pectra

Pectra

Author: wackerow

.env.holesky

@@ -9,3 +9,4 @@ export REACT_APP_BEACONCHAIN_URL=https://holesky.beaconcha.in
 export REACT_APP_EL_EXPLORER_URL=https://holesky.beaconcha.in
 export REACT_APP_TUTORIAL_URL=https://notes.ethereum.org/@launchpad/holesky
 export REACT_APP_FAUCET_URL=https://www.holeskyfaucet.io/
+export REACT_APP_MIN_GENESIS_TIME=1695902400000

.env.template

@@ -12,10 +12,16 @@ REACT_APP_IS_MAINNET=true
 REACT_APP_FORTMATIC_KEY=pk_test_D113D979E0D3508F
 # string
 REACT_APP_CONTRACT_ADDRESS=0x00000000219ab540356cBB839Cbe05303d7705Fa
+# string
+REACT_APP_COMPOUNDING_CONTRACT_ADDRESS=0x0000BBdDc7CE488642fb579F8B00f3a590007251
+# string
+REACT_APP_WITHDRAWAL_CONTRACT_ADDRESS=0x00000961Ef480Eb55e80D19ad83579A64c007002
 # number
 REACT_APP_ETH_REQUIREMENT=524288
 # number
-REACT_APP_PRICE_PER_VALIDATOR=32
+REACT_APP_MIN_ACTIVATION_BALANCE=32
+# number
+REACT_APP_MAX_EFFECTIVE_BALANCE=2048
 # Uint8Array such as "0x00000000"
 REACT_APP_GENESIS_FORK_VERSION=0x00000000
 # string
@@ -32,6 +38,8 @@ REACT_APP_TEKU_INSTALLATION_URL=https://docs.teku.consensys.io/get-started/insta
 #
 # true, false
 REACT_APP_IS_MAINNET=false
+# string (if `REACT_APP_IS_MAINNET=true`, it's the active public testnet name; otherwise, it's the testnet name of this website)
+REACT_APP_TESTNET_LAUNCHPAD_NAME=Holesky
 # string
 REACT_APP_CONTRACT_ADDRESS=0x4242424242424242424242424242424242424242
 # string
@@ -42,9 +50,17 @@ REACT_APP_BEACONCHAIN_URL=https://holesky.beaconcha.in
 REACT_APP_EL_EXPLORER_URL=https://holesky.beaconcha.in
 # string
 REACT_APP_TUTORIAL_URL=https://notes.ethereum.org/@launchpad/holesky
-# string (if `REACT_APP_IS_MAINNET=true`, it's the active public testnet name; otherwise, it's the testnet name of this website)
-REACT_APP_TESTNET_LAUNCHPAD_NAME=Holesky
 # number
 REACT_APP_ETH_DEPOSIT_OFFSET=0
 # string
 REACT_APP_FAUCET_URL=https://www.holeskyfaucet.io/
+# string
+REACT_APP_RPC_URL=https://rpc.holesky.ethpandaops.io
+# string
+REACT_APP_BEACONCHAIN_URL=https://holesky.beaconcha.in
+# string
+REACT_APP_TUTORIAL_URL=https://notes.ethereum.org/@launchpad/holesky
+# number
+REACT_APP_ETH_DEPOSIT_OFFSET=0
+# number
+REACT_APP_MIN_GENESIS_TIME=1695902400000

.nvmrc

@@ -0,0 +1 @@
+14.19.2

.prettierrc

@@ -1,4 +1,6 @@
 {
   "singleQuote": true,
-  "trailingComma": "es5"
+  "trailingComma": "es5",
+  "tabWidth": 2,
+  "semi": true
 }

netlify.toml

@@ -4,6 +4,9 @@
   NODE_VERSION = "14.19.2"
 [context.deploy-preview.environment]
   NODE_VERSION = "14.19.2"
+  REACT_APP_IS_MERGE = "true"
+  REACT_APP_COMPOUNDING_CONTRACT_ADDRESS = "0x0000BBdDc7CE488642fb579F8B00f3a590007251"
+  REACT_APP_WITHDRAWAL_CONTRACT_ADDRESS = "0x00000961Ef480Eb55e80D19ad83579A64c007002"
 [context.branch-deploy.environment]
   NODE_VERSION = "14.19.2"
 [context.dev.environment]

package.json

@@ -15,10 +15,10 @@
     "@types/react-helmet": "^6.1.0",
     "@types/react-scroll": "^1.5.4",
     "@types/react-tooltip": "^3.11.0",
-    "@web3-react/abstract-connector": "latest",
+    "@web3-react/abstract-connector": "6.0.7",
     "@web3-react/core": "^6.0.7",
     "@web3-react/fortmatic-connector": "^6.0.7",
-    "@web3-react/injected-connector": "latest",
+    "@web3-react/injected-connector": "6.0.7",
     "@web3-react/types": "^6.0.7",
     "animate.css": "^3.7.2",
     "animate.css-react": "^1.0.0",
@@ -111,7 +111,15 @@
     "compile": "formatjs compile src/intl/en.json --format crowdin --out-file src/intl/compiled/en.json --ast"
   },
   "eslintConfig": {
-    "extends": "react-app"
+    "extends": [
+      "react-app",
+      "plugin:@typescript-eslint/recommended",
+      "plugin:prettier/recommended"
+    ],
+    "plugins": [
+      "@typescript-eslint",
+      "prettier"
+    ]
   },
   "browserslist": {
     "production": [

src/Routes.tsx

@@ -5,6 +5,7 @@ import { useIntl } from 'react-intl';
 import { supportedLanguages } from './intl';
 import {
   AcknowledgementPage,
+  ActionsPage,
   CongratulationsPage,
   ConnectWalletPage,
   SelectClientPage,
@@ -70,6 +71,7 @@ export enum routesEnum {
   languagesPage = '/languages',
   withdrawals = '/withdrawals',
   btecGuide = '/btec',
+  actionsPage = '/validator-actions',
 }
 const routes: RouteType[] = [
   {
@@ -126,6 +128,7 @@ const routes: RouteType[] = [
   { path: routesEnum.topUpPage, exact: true, component: TopUpPage },
   { path: routesEnum.withdrawals, exact: true, component: Withdrawals },
   { path: routesEnum.btecGuide, exact: true, component: BtecGuide },
+  { path: routesEnum.actionsPage, exact: true, component: ActionsPage },
   { path: routesEnum.landingPage, exact: true, component: LandingPage },
   // NOTE: this wildcard route must be the last index of the routes array
   { path: routesEnum.notFoundPage, component: NotFoundPage },

src/components/Alert.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import styled from 'styled-components';
 import { Box, BoxProps } from 'grommet';
 
-const variantStyles = {
+const variantStyles: Record<string, React.CSSProperties> = {
   primary: {
     backgroundColor: '#cce5ff',
     borderColor: '#b8daff',
@@ -39,28 +39,33 @@ const HighlightStyles = styled.div`
   }
 `;
 
-export const Alert = (
-  props: {
-    children: React.ReactNode;
-    className?: string;
-    error?: boolean;
-    style?: any;
-    variant?: string;
-  } & BoxProps
-): JSX.Element => {
-  const { variant = 'primary', className, children, pad } = props;
-  return (
-    <Box
-      border
-      className={className}
-      pad={pad || 'medium'}
-      round="xsmall"
-      variant={variant}
-      {...props}
-      // @ts-ignore
-      style={variantStyles[variant]}
-    >
-      <HighlightStyles>{children}</HighlightStyles>
-    </Box>
-  );
-};
+type AlertProps = {
+  children: React.ReactNode;
+  className?: string;
+  error?: boolean;
+  style?: any;
+  variant?: string;
+} & BoxProps;
+
+export const Alert = ({
+  variant = 'primary',
+  className,
+  children,
+  style,
+  pad,
+  ...props
+}: AlertProps) => (
+  <Box
+    border
+    className={className}
+    pad={pad || 'medium'}
+    round="xsmall"
+    style={{
+      ...variantStyles[variant],
+      ...style,
+    }}
+    {...props}
+  >
+    <HighlightStyles>{children}</HighlightStyles>
+  </Box>
+);