diff --git a/.all-contributorsrc b/.all-contributorsrc index 7228368fd66..3538ec41c92 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -9270,6 +9270,70 @@ "contributions": [ "code" ] + }, + { + "login": "hyper0x", + "name": "Renato", + "avatar_url": "https://avatars.githubusercontent.com/u/315569?v=4", + "profile": "https://github.com/hyper0x", + "contributions": [ + "content", + "translation" + ] + }, + { + "login": "frangio", + "name": "Francisco", + "avatar_url": "https://avatars.githubusercontent.com/u/481465?v=4", + "profile": "https://frang.io", + "contributions": [ + "doc" + ] + }, + { + "login": "frankiefab100", + "name": "Franklin Ohaegbulam", + "avatar_url": "https://avatars.githubusercontent.com/u/46662771?v=4", + "profile": "http://frankiefab.com", + "contributions": [ + "code" + ] + }, + { + "login": "soos3d", + "name": "Soos3D", + "avatar_url": "https://avatars.githubusercontent.com/u/99700157?v=4", + "profile": "https://github.com/soos3d", + "contributions": [ + "doc" + ] + }, + { + "login": "minhoryang", + "name": "Minho Ryang", + "avatar_url": "https://avatars.githubusercontent.com/u/1270855?v=4", + "profile": "http://keybase.io/minhoryang", + "contributions": [ + "code" + ] + }, + { + "login": "SebastianSupreme", + "name": "Sebastian Supreme", + "avatar_url": "https://avatars.githubusercontent.com/u/106926150?v=4", + "profile": "https://sebastiansupreme.eth.link", + "contributions": [ + "ideas" + ] + }, + { + "login": "jhhornn", + "name": "Awosise Oluwaseun", + "avatar_url": "https://avatars.githubusercontent.com/u/66667958?v=4", + "profile": "https://github.com/jhhornn", + "contributions": [ + "doc" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index 06bc3bd2322..0a2abde72c6 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ This is the repo for the [ethereum.org](https://ethereum.org) website, a resource for the Ethereum community. The site's purpose is to _“Be the best portal to Ethereum for our growing global community"_ - read more about what this means [here](https://ethereum.org/en/about/). -[ethereum.org](https://ethereum.org) is improved and changed over time through the contributions of community members who submit content, give feedback, or volunteer their time to manage its evolution. If you’re interested in helping to improve [ethereum.org](https://ethereum.org), find out [how to contribute](https://ethereum.org/en/contributing/). +[ethereum.org](https://ethereum.org) is being improved and changed over time through the contributions of community members who submit content, give feedback, or volunteer their time to manage its evolution. If you’re interested in helping to improve [ethereum.org](https://ethereum.org), find out [how to contribute](https://ethereum.org/en/contributing/). ## Looking for the Ethereum blockchain's code? @@ -1464,6 +1464,15 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d Jamie Barrett
Jamie Barrett
💻 + Renato
Renato
🖋 🌍 + Francisco
Francisco
📖 + Franklin Ohaegbulam
Franklin Ohaegbulam
💻 + Soos3D
Soos3D
📖 + Minho Ryang
Minho Ryang
💻 + Sebastian Supreme
Sebastian Supreme
🤔 + + + Awosise Oluwaseun
Awosise Oluwaseun
📖 diff --git a/package.json b/package.json index fe04124c490..c760c8fe2ee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ethereum-org-website", - "version": "6.7.5", + "version": "6.7.6", "description": "Website of ethereum.org", "main": "index.js", "repository": "git@github.com:ethereum/ethereum-org-website.git", diff --git a/src/assets/translation-program/pageviews-dark.png b/src/assets/translation-program/pageviews-dark.png index c947153d855..cf9f8e68850 100644 Binary files a/src/assets/translation-program/pageviews-dark.png and b/src/assets/translation-program/pageviews-dark.png differ diff --git a/src/assets/translation-program/pageviews-light.png b/src/assets/translation-program/pageviews-light.png index 99032d06d22..4d23b5352ef 100644 Binary files a/src/assets/translation-program/pageviews-light.png and b/src/assets/translation-program/pageviews-light.png differ diff --git a/src/components/CopyToClipboard.tsx b/src/components/CopyToClipboard.tsx index c629aef4112..551cd985967 100644 --- a/src/components/CopyToClipboard.tsx +++ b/src/components/CopyToClipboard.tsx @@ -1,5 +1,6 @@ import React, { useState, useEffect, useRef } from "react" import ClipboardJS from "clipboard" +import { Box } from '@chakra-ui/react' export interface IProps { text: string @@ -36,7 +37,7 @@ const CopyToClipboard: React.FC = ({ children, text }) => { } }, [text]) - return
{children(isCopied)}
+ return {children(isCopied)} } export default CopyToClipboard diff --git a/src/components/EthVideo.tsx b/src/components/EthVideo.tsx index d74d9e0c655..e21e68d7856 100644 --- a/src/components/EthVideo.tsx +++ b/src/components/EthVideo.tsx @@ -1,6 +1,5 @@ import React from "react" -import { useTheme } from "@emotion/react" -import { Box } from "@chakra-ui/react" +import { Box, useColorModeValue } from "@chakra-ui/react" import darkVideo from "../assets/ethereum-hero-dark.mp4" import lightVideo from "../assets/ethereum-hero-light.mp4" @@ -11,10 +10,9 @@ export interface IProps { } const EthVideo: React.FC = ({ className, videoSrc }) => { - const theme = useTheme() - const isDarkTheme = theme.isDark + const videoFile = useColorModeValue(lightVideo, darkVideo) - const src = videoSrc ? videoSrc : isDarkTheme ? darkVideo : lightVideo + const src = videoSrc ? videoSrc : videoFile return ( diff --git a/src/components/MarkdownTable.tsx b/src/components/MarkdownTable.tsx index e3a9526a706..504383a500d 100644 --- a/src/components/MarkdownTable.tsx +++ b/src/components/MarkdownTable.tsx @@ -6,7 +6,7 @@ export interface IProps { } const MarkdownTable: React.FC = ({ children }) => ( - + props.theme.breakpoints.l}) { - display: none; - } -` - -const ListItem = styled.li` - margin: 0; -` - -const StyledTableOfContentsLink = styled(Link)` - position: relative; - display: inline-block; - color: ${(props) => props.theme.colors.text300}; - margin-bottom: 0.5rem !important; -` - const slugify = (s: string): string => encodeURIComponent(String(s).trim().toLowerCase().replace(/\s+/g, "-")) @@ -87,9 +51,16 @@ const TableOfContentsLink: React.FC = ({ classes += " nested" } return ( - + {trimmedTitle(item.title)} - + ) } @@ -115,10 +86,8 @@ const ItemsList: React.FC = ({ return ( <> {items.map((item, index) => ( - -
- -
+ + ))} @@ -128,14 +97,9 @@ const ItemsList: React.FC = ({ export interface IProps { items: Array maxDepth?: number - className?: string } -const UpgradeTableOfContents: React.FC = ({ - items, - maxDepth = 1, - className, -}) => { +const UpgradeTableOfContents: React.FC = ({ items, maxDepth = 1 }) => { if (!items) { return null } @@ -145,11 +109,27 @@ const UpgradeTableOfContents: React.FC = ({ } return ( - + + ) } diff --git a/src/content/dao/index.md b/src/content/dao/index.md index 7c501d91f5a..a354ea7fcb9 100644 --- a/src/content/dao/index.md +++ b/src/content/dao/index.md @@ -135,10 +135,12 @@ _Typically used for decentralized development and governance of protocols and da - [Ethereum community DAOs](/community/get-involved/#decentralized-autonomous-organizations-daos) - [DAOHaus's list of DAOs](https://app.daohaus.club/explore) +- [Tally.xyz list of DAOs](https://www.tally.xyz) ### Start a DAO {#start-a-dao} - [Summon a DAO with DAOHaus](https://app.daohaus.club/summon) +- [Start a Governor DAO with Tally](https://www.tally.xyz/add-a-dao) - [Create an Aragon-powered DAO](https://aragon.org/product) - [Start a colony](https://colony.io/) - [Create a DAO with DAOstack's holographic consensus](https://alchemy.daostack.io/daos/create) diff --git a/src/content/desci/index.md b/src/content/desci/index.md index 6509dd349c6..3077e1d793b 100644 --- a/src/content/desci/index.md +++ b/src/content/desci/index.md @@ -90,7 +90,7 @@ Flexible Web3 data solutions support the scenarios above and provide the foundat ## Get involved {#get-involved} Explore projects and join the DeSci community. - +- [Blockchain for Science Telegram](https://t.me/BlockchainForScience) - [Molecule: Fund and get funded for your research projects](https://discover.molecule.to/) - [VitaDAO: receive funding through sponsored research agreements for longevity research](https://www.vitadao.com/) - [ResearchHub: post a scientific result and engage in a conversation with peers](https://www.researchhub.com/) diff --git a/src/content/developers/docs/apis/backend/index.md b/src/content/developers/docs/apis/backend/index.md index 8050c81bb35..542a7907d0c 100644 --- a/src/content/developers/docs/apis/backend/index.md +++ b/src/content/developers/docs/apis/backend/index.md @@ -6,7 +6,7 @@ lang: en In order for a software application to interact with the Ethereum blockchain (i.e. read blockchain data and/or send transactions to the network), it must connect to an Ethereum node. -For this purpose, every Ethereum client implements the [JSON-RPC](/developers/docs/apis/json-rpc/) specification, so there are a uniform set of [endpoints](/developers/docs/apis/json-rpc/#json-rpc-methods) that applications can rely on. +For this purpose, every Ethereum client implements the [JSON-RPC](/developers/docs/apis/json-rpc/) specification, so there are a uniform set of [methods](/developers/docs/apis/json-rpc/#json-rpc-methods) that applications can rely on. If you want to use a specific programming language to connect with an Ethereum node, there are many convenience libraries within the ecosystem that make this much easier. With these libraries, developers can write intuitive, one-line methods to initialize JSON-RPC requests (under the hood) that interact with Ethereum. @@ -56,10 +56,11 @@ These libraries abstract away much of the complexity of interacting directly wit - [ethercluster.com](https://www.ethercluster.com/) -**Chainstack -** **_Shared and dedicated Ethereum nodes as a service._** +**Chainstack -** **_Elastic and dedicated Ethereum nodes as a service._** - [chainstack.com](https://chainstack.com) - [Documentation](https://docs.chainstack.com) +- [Ethereum API reference](https://docs.chainstack.com/api/ethereum/ethereum-api-reference) **QuickNode -** **_Blockchain Infrastructure as a Service._** diff --git a/src/content/developers/docs/apis/javascript/index.md b/src/content/developers/docs/apis/javascript/index.md index 420471a58d7..f0a21f3ae10 100644 --- a/src/content/developers/docs/apis/javascript/index.md +++ b/src/content/developers/docs/apis/javascript/index.md @@ -6,7 +6,7 @@ lang: en In order for a web app to interact with the Ethereum blockchain (i.e. read blockchain data and/or send transactions to the network), it must connect to an Ethereum node. -For this purpose, every Ethereum client implements the [JSON-RPC](/developers/docs/apis/json-rpc/) specification, so there are a uniform set of [endpoints](/developers/docs/apis/json-rpc/endpoints/) that applications can rely on. +For this purpose, every Ethereum client implements the [JSON-RPC](/developers/docs/apis/json-rpc/) specification, so there are a uniform set of [methods](/developers/docs/apis/json-rpc/#json-rpc-methods) that applications can rely on. If you want to use JavaScript to connect with an Ethereum node, it's possible to use vanilla JavaScript but several convenience libraries exist within the ecosystem that make this much easier. With these libraries, developers can write intuitive, one-line methods to initialize JSON RPC requests (under the hood) that interact with Ethereum. diff --git a/src/content/developers/docs/consensus-mechanisms/pos/index.md b/src/content/developers/docs/consensus-mechanisms/pos/index.md index b0f51790268..462ac74d286 100644 --- a/src/content/developers/docs/consensus-mechanisms/pos/index.md +++ b/src/content/developers/docs/consensus-mechanisms/pos/index.md @@ -67,7 +67,7 @@ Overall, proof-of-stake, as it is implemented on Ethereum, has been demonstrated - [Proof of Stake FAQ](https://vitalik.ca/general/2017/12/31/pos_faq.html) _Vitalik Buterin_ - [What is Proof of Stake](https://consensys.net/blog/blockchain-explained/what-is-proof-of-stake/) _ConsenSys_ - [What Proof of Stake Is And Why It Matters](https://bitcoinmagazine.com/culture/what-proof-of-stake-is-and-why-it-matters-1377531463) _Vitalik Buterin_ -- [The Beacon Chain Ethereum 2.0 explainer you need to read first](https://ethos.dev/beacon-chain/) _Ethos.dev_ +- [The Beacon Chain Ethereum 2.0 explainer you need to read first](https://ethos.dev/beacon-chain) _Ethos.dev_ - [Why Proof of Stake (Nov 2020)](https://vitalik.ca/general/2020/11/06/pos2020.html) _Vitalik Buterin_ - [Proof of Stake: How I Learned to Love Weak Subjectivity](https://blog.ethereum.org/2014/11/25/proof-stake-learned-love-weak-subjectivity/) _Vitalik Buterin_ - [Proof-of-stake Ethereum attack and defense](https://mirror.xyz/jmcook.eth/YqHargbVWVNRQqQpVpzrqEQ8IqwNUJDIpwRP7SS5FXs) diff --git a/src/content/developers/docs/networking-layer/index.md b/src/content/developers/docs/networking-layer/index.md index d40a983343c..9f56298ee44 100644 --- a/src/content/developers/docs/networking-layer/index.md +++ b/src/content/developers/docs/networking-layer/index.md @@ -31,7 +31,7 @@ Discovery is the process of finding other nodes in network. This is bootstrapped The protocol used for the node-bootnode interactions is a modified form of [Kademlia](https://medium.com/coinmonks/a-brief-overview-of-kademlia-and-its-use-in-various-decentralized-platforms-da08a7f72b8f) which uses a [distributed hash table](https://en.wikipedia.org/wiki/Distributed_hash_table) to share lists of nodes. Each node has a version of this table containing the information required to connect to its closest peers. This 'closeness' is not geographical - distance is defined by the similarity of the node's ID. Each node's table is regularly refreshed as a security feature. For example, in the [Discv5](https://github.com/ethereum/devp2p/tree/master/discv5), discovery protocol nodes are also able to send 'ads' that display the subprotocols that the client supports, allowing peers to negotiate about the protocols they can both use to communicate over. -Discovery starts wih a game of PING-PONG. A successful PING-PONG "bonds" the new node to a bootnode. The initial message that alerts a bootnode to the existence of a new node entering the network is a `PING`. This `PING` includes hashed information about the new node, the bootnode and an expiry time-stamp. The bootnode receives the PING and returns a `PONG` containing the `PING` hash. If the `PING` and `PONG` hashes match then the connection between the new node and bootnode is verified and they are said to have "bonded". +Discovery starts wih a game of PING-PONG. A successful PING-PONG "bonds" the new node to a bootnode. The initial message that alerts a bootnode to the existence of a new node entering the network is a `PING`. This `PING` includes hashed information about the new node, the bootnode and an expiry time-stamp. The bootnode receives the `PING` and returns a `PONG` containing the `PING` hash. If the `PING` and `PONG` hashes match then the connection between the new node and bootnode is verified and they are said to have "bonded". Once bonded, the new node can send a `FIND-NEIGHBOURS` request to the bootnode. The data returned by the bootnode includes a list of peers that the new node can connect to. If the nodes are not bonded, the `FIND-NEIGHBOURS` request will fail, so the new node will not be able to enter the network. diff --git a/src/content/translations/ru/developers/docs/nodes-and-clients/run-a-node/index.md b/src/content/translations/ru/developers/docs/nodes-and-clients/run-a-node/index.md index 5703e7c4061..8650931b911 100644 --- a/src/content/translations/ru/developers/docs/nodes-and-clients/run-a-node/index.md +++ b/src/content/translations/ru/developers/docs/nodes-and-clients/run-a-node/index.md @@ -102,7 +102,7 @@ sidebarDepth: 2 #### Доступ к RPC {#reaching-rpc} -Порт JSON-RPC по умолчанию — `8545`, но порты локальных конечных точек можно изменять в конфигурационном файле. По умолчанию интерфейс RPC доступен только с локального хоста компьютера. Чтобы сделать его доступным удаленно, можно сделать его открытым, сменив адрес на `0.0.0.0`. Это сделает ваш узел доступным для лкальных и публичных IP-адресов. В большинстве случаев вам также нужно настроить переадресацию портов на маршрутизаторе. +Порт JSON-RPC по умолчанию — `8545`, но порты локальных конечных точек можно изменять в конфигурационном файле. По умолчанию интерфейс RPC доступен только с локального хоста компьютера. Чтобы сделать его доступным удаленно, можно сделать его открытым, сменив адрес на `0.0.0.0`. Это сделает ваш узел доступным для локальных и публичных IP-адресов. В большинстве случаев вам также нужно настроить переадресацию портов на маршрутизаторе. Совершать подобные манипуляции нужно с осторожностью, так как это позволит любому в Интернете управлять вашим узлом. Злонамеренные пользователи, имея доступ к вашему узлу, могут навредить системе или украсть ваши активы, если вы используете свой клиент как кошелек. diff --git a/src/content/translations/zh/developers/docs/scaling/sidechains/index.md b/src/content/translations/zh/developers/docs/scaling/sidechains/index.md index 7f590c179d2..e20da5d2e6d 100644 --- a/src/content/translations/zh/developers/docs/scaling/sidechains/index.md +++ b/src/content/translations/zh/developers/docs/scaling/sidechains/index.md @@ -20,7 +20,7 @@ sidebarDepth: 3 | ------------------------ | ----------------------------------------------------------------------- | | 既有的技术。 | 不够去中心化。 | | 支持通用计算，EVM 兼容。 | 采用单独的共识机制。 未受一层保护（因此，从技术上而言，它不是第二层）。 | -| | 测链验证者达到一定数量可以进行欺诈。 | +| | 侧链验证者达到一定数量可以进行欺诈。 | ### 使用侧链 {#use-sidechains} diff --git a/src/content/translations/zh/developers/docs/transactions/index.md b/src/content/translations/zh/developers/docs/transactions/index.md index dec69eba0ca..53868c4e142 100644 --- a/src/content/translations/zh/developers/docs/transactions/index.md +++ b/src/content/translations/zh/developers/docs/transactions/index.md @@ -12,7 +12,7 @@ lang: zh ## 什么是交易？ {#whats-a-transaction} -以太坊交易是指由外部持有账户发起的行动，换句话说，是指由人管理而不是智能合约管理的账户。 例如，如果 Bob 发送 Alice 1 ETH，则 Bob 的帐户必须减少 1 ETH，而 Alice 的账户必须增加 1 ETH。 此项操作发生在交易中，会变更状态。 +以太坊交易是指由外部持有账户发起的行动，换句话说，是指由人管理而不是智能合约管理的账户。 例如，如果 Bob 向 Alice 发送 1 ETH，则 Bob 的帐户必须减少 1 ETH，而 Alice 的账户必须增加 1 ETH。 交易会造成状态的改变。 ![显示交易导致状态更改的图表](./tx.png) _图表来自 [Ethereum EVM 插图](https://takenobu-hs.github.io/downloads/ethereum_evm_illustrated.pdf)_ diff --git a/src/data/community-events.json b/src/data/community-events.json index ce0b29e648d..e29f74e5182 100644 --- a/src/data/community-events.json +++ b/src/data/community-events.json @@ -14,8 +14,8 @@ "sponsor": null, "location": "Denver, USA", "description": "ETHDenver is a member-owned Community Innovation Festival. With the genesis of SporkDAO in June of 2021, ETHDenver is the first event based DAO in the world.", - "startDate": "2022-02-11", - "endDate": "2022-02-20" + "startDate": "2023-02-24", + "endDate": "2023-03-05" }, { "title": "Schelling Point", diff --git a/src/data/execution-bounty-hunters.csv b/src/data/execution-bounty-hunters.csv index 4217c5ce218..2c4965f634a 100644 --- a/src/data/execution-bounty-hunters.csv +++ b/src/data/execution-bounty-hunters.csv @@ -11,7 +11,7 @@ itsunixiknowthis, "ItsUnixIKnowThis", 15000 catageek, "Bertrand Masius", 15000 tintinweb, "Tin", 12500 , "Ralph Pichler", 12500 -, "Bob Conan", 12000 +, "Bob Conan", 13000 lukaszmatczak, "Łukasz Matczak", 11000 , "Heilman/Marcus/Goldberg", 10000 jonasnick, "Jonas Nick", 10000 diff --git a/src/intl/en/page-upgrades-get-involved-bug-bounty.json b/src/intl/en/page-upgrades-get-involved-bug-bounty.json index 1a009b3c01b..9bec43dd3a0 100644 --- a/src/intl/en/page-upgrades-get-involved-bug-bounty.json +++ b/src/intl/en/page-upgrades-get-involved-bug-bounty.json @@ -97,6 +97,6 @@ "page-upgrades-bug-bounty-card-subheader-2": "Example", "page-upgrades-bug-bounty-card-text": "Attacker can sometimes put a node in a state that causes it to drop one out of every one hundred attestations made by a validator", "page-upgrades-bug-bounty-card-text-1": "Attacker can successfully conduct eclipse attacks on nodes with peer-ids with 4 leading zero bytes", - "page-upgrades-bug-bounty-card-text-2": "There is a consensus bug between two clients, but it is difficult or impractical for the attacker to trigger the event.", - "page-upgrades-bug-bounty-card-text-3": "There is a remote code execution in a majority client, and it is trivial for an attacker to trigger the vulnerability." + "page-upgrades-bug-bounty-card-text-2": "Attacker can successfully partition large parts of the network, and it is trivial for an attacker to trigger the vulnerability", + "page-upgrades-bug-bounty-card-text-3": "Attacker can successfully conduct remote code execution in a majority client, and it is trivial for an attacker to trigger the vulnerability" } diff --git a/src/intl/en/page-upgrades-index.json b/src/intl/en/page-upgrades-index.json index 5823ca40b90..d14a34b0409 100644 --- a/src/intl/en/page-upgrades-index.json +++ b/src/intl/en/page-upgrades-index.json @@ -9,9 +9,9 @@ "consensus-client-prysm-logo-alt": "Prysm logo", "consensus-client-teku-logo-alt": "Teku logo", "consensus-client-under-review": "Review and audit in progress", - "page-upgrades-answer-1": "Think of the changes being rolled out as a set of upgrades being added to improve the Ethereum we use today. These upgrades included the creation of a new chain called the Beacon Chain, which now acts as the consensus engine for the entire network.", - "page-upgrades-answer-2": "Despite the Beacon Chain starting as a separate chain, the existing Mainnet has been 'merged' with this new proof-of-stake consensus layer.", - "page-upgrades-answer-4": "In other words the Ethereum we use today now embodies all the features that we're aiming towards in the Ethereum vision.", + "page-upgrades-answer-1": "The Beacon Chain was used as a tool to upgrade Ethereum Mainnet at The Merge.", + "page-upgrades-answer-2": "With The Merge, Ethereum had its most substantial upgrade ever swapping proof-of-work for a new proof-of-stake based consensus layer.", + "page-upgrades-answer-4": "The Beacon Chain was used to develop the proof-of-stake-based consensus Ethereum uses today. It was run separately to Ethereum Mainnet so developers could observe the consensus mechanism in isolation before using it to coordinate real activity.", "page-upgrade-article-author-ethmerge": "Ethmerge", "page-upgrade-article-author-alchemy": "Alchemy", "page-upgrade-article-author-consensys": "Consensys", @@ -33,19 +33,19 @@ "page-upgrade-article-title-consensus-layer-specs": "Consensus layer specs", "page-upgrade-article-title-engine-api-specs": "Engine API specs", "page-upgrades-beacon-chain-btn": "More on the Beacon Chain", - "page-upgrades-beacon-chain-date": "The Beacon Chain went live on December 1, 2020.", - "page-upgrades-beacon-chain-desc": "The Beacon Chain brought staking to Ethereum, laid the groundwork for future upgrades, and coordinates the network.", + "page-upgrades-beacon-chain-date": "The Beacon Chain went live on December 1, 2020", + "page-upgrades-beacon-chain-desc": "The Beacon Chain brought staking to Ethereum and laid the groundwork for future upgrades. It coordinates the new proof-of-stake Ethereum.", "page-upgrades-beacon-chain-estimate": "The Beacon Chain is live", "page-upgrades-beacon-chain-title": "The Beacon Chain", "page-upgrades-bug-bounty": "View the bug bounty program", "page-upgrades-clients": "Check out the consensus clients (previously known as 'Eth2' clients)", "page-staking-deposit-contract-title": "Check the deposit contract address", "page-upgrades-dive": "Dive into the vision", - "page-upgrades-dive-desc": "How are we going to make Ethereum more scalable, secure, and sustainable? All while keeping Ethereum's core ethos of decentralization.", + "page-upgrades-dive-desc": "How are we making Ethereum more scalable, secure, and sustainable? All while keeping Ethereum's core ethos of decentralization.", "page-upgrades-docking": "The Merge", - "page-upgrades-merge-answer-1": "The Merge occurred via the Paris upgrade on September 15, 2022.", + "page-upgrades-merge-answer-1": "The Merge was when Mainnet switched off proof-of-work and turned on proof-of-stake on 15th September 2022.", "page-upgrades-merge-btn": "More on The Merge", - "page-upgrades-merge-desc": "Mainnet Ethereum merged with the Beacon Chain, marking the end of energy-intensive mining.", + "page-upgrades-merge-desc": "Mainnet Ethereum merged with the proof-of-stake Beacon Chain, marking the end of energy-intensive mining.", "page-upgrades-merge-estimate": "The Merge is live", "page-upgrades-merge-mainnet": "What's Mainnet?", "page-upgrades-merge-mainnet-eth2": "Merging Mainnet and the Beacon Chain", @@ -75,8 +75,8 @@ "page-upgrades-question-1-title": "When will the upgrades ship?", "page-upgrades-question-1-desc": "Ethereum is being upgraded progressively; the upgrades are distinct with different ship dates.", "page-upgrades-question-2-title": "Is the Beacon Chain a separate blockchain?", - "page-upgrades-question-2-desc": "It's not accurate to think of this upgrade as a separate blockchain.", - "page-upgrades-question-3-answer-2a": "The Merge is now finalized, and was designed to have minimal impact on dapp developers.", + "page-upgrades-question-2-desc": "Yes. The Beacon Chain was the name given to a parallel proof-of-stake blockchain used to upgrade Ethereum's Mainnet. There is now only one blockchain, formed by merging the original Ethereum blockchain and the Beacon Chain together.", + "page-upgrades-question-3-answer-2a": "The Merge had minimal impact on dapp developers - they still interact with Etheruem in the same ways.", "page-upgrades-question-3-answer-2a-link": "The Merge and dapp developers", "page-upgrades-question-3-answer-2b": "Sharding plans are still being developed, but will be designed with layer 2 rollups in mind.", "page-upgrades-layer-2-rollups": "More on layer 2 rollups", @@ -88,18 +88,18 @@ "page-upgrades-question-4-answer-6": "Anyone can become a validator by staking their ETH.", "page-upgrades-question-4-answer-7": "More on staking", "page-upgrades-question-4-title": "What is the execution layer?", - "page-upgrades-question-4-desc": "The Ethereum Mainnet you transact on today has previously been referred to as 'Eth1.' This term is being phased out in favor of the 'execution layer'.", - "page-upgrades-question-5-answer-1": "To become a full validator on the network, you'll need to stake 32 ETH. If you don't have that much, or aren't willing to stake that much, you can join staking pools. These pools will let you stake less and earn fractions of the total rewards.", + "page-upgrades-question-4-desc": "Before The Merge, the Ethereum blockchain was sometimes referred to as 'Eth1.' This term was phased out in favor of the 'execution layer'.", + "page-upgrades-question-5-answer-1": "To become a validator on the network, you'll need to stake 32 ETH. If you don't have that much, or aren't willing to stake that much, you can join staking pools. These pools will let you stake less and earn fractions of the total rewards.", "page-upgrades-question-5-desc": "You'll need to use the staking launchpad or join a staking pool.", "page-upgrades-question-5-title": "How do I stake?", "page-upgrades-question-6-answer-3": "Danny Ryan of the Ethereum foundation regularly updates the community:", "page-upgrades-question-6-answer-4": "Ben Edgington of ConsenSys has a weekly newsletter about the Ethereum upgrades:", "page-upgrades-question-6-answer-5": "You can also join the discussion on Ethereum research and development at ethresear.ch.", "page-upgrades-question-6-title": "What do I need to do with my dapp?", - "page-upgrades-question-6-desc": "The Merge has been designed with the goal of minimizing impact on dapp developers, though there are a couple things work noting.", - "page-upgrades-question-6-answer-1": "The Merge has brought a few changes that may have impacted certain types of applications. These changes include block structure and timing, a few opcode changes, sources of on-chain randomness and the concept of epoch finalization.", - "page-upgrades-question-6-answer-1-link": "How The Merge Impacts Ethereum's Application Layer", - "page-upgrades-question-6-answer-2": "Most applications will remain unaffected, but we recommend that developers test their apps in a post-merge environment.", + "page-upgrades-question-6-desc": "The Merge was designed to have minimal impact on dapp developers, though there were a couple of small changes worth noting.", + "page-upgrades-question-6-answer-1": "Dapp developers familiar with pre-merge Ethereum should be aware of some changes. These changes include block structure and timing, a few opcode changes, sources of on-chain randomness and the concept of epoch finalization.", + "page-upgrades-question-6-answer-1-link": "How The Merge Impacted Ethereum's Application Layer", + "page-upgrades-question-6-answer-2": "Applications were almost entirely unaffected.", "page-upgrades-question-7-desc": "Many different teams from all over the community are working on the various Ethereum upgrades.", "page-upgrades-question-7-lighthouse": "Lighthouse", "page-upgrades-question-7-lighthouse-lang": "(Rust implementation)", @@ -136,14 +136,14 @@ "page-upgrades-question-10-answer-1-link": "View the upgrades", "page-upgrades-question-10-answer-2": "But if you've followed the discussions, here's how the upgrades fit into technical roadmaps, and a bit on how they're changing.", "page-upgrades-question-10-answer-3": "Phase 0 described the work to get the Beacon Chain live.", - "page-upgrades-question-10-answer-5": "Phase 1 originally focused on implementing the shard chains, but prioritization shifted to 'The Merge' which has now been completed.", - "page-upgrades-question-10-answer-6": "Phase 1.5 was originally planned to follow shard implementations when Mainnet would be added as the last shard to the Beacon Chain. However, as rollup technology progressed, the Ethereum community expedited the transition away from proof-of-work. Mainnet was instead 'merged' into the Beacon Chain and remains as the execution layer of Ethereum. This was a significant step towards a greener Ethereum.", - "page-upgrades-question-10-answer-7": "The plans around Phase 2 have been a point of intense research and discussion. With The Merge completed before sharding, and the advancements in layer 2 solutions, goals have shifted to provide a more simplified form of data sharding to maximize rollup efficiency. Current layer 2s enable the ability to scale transaction execution, and sharding will allow for storage of proofs for this data on layer 1 in a cheap and scalable manner.", + "page-upgrades-question-10-answer-5": "Phase 1 originally focused on implementing the shard chains, but prioritization shifted to The Merge, which shipped on September 15, 2022.", + "page-upgrades-question-10-answer-6": "Phase 1.5 was originally planned to follow shard implementations when Mainnet would be added as the last shard to the Beacon Chain. However, as rollup technology progressed, the Ethereum community expedited the transition away from proof-of-work instead.", + "page-upgrades-question-10-answer-7": "The plans around Phase 2 have been a point of intense research and discussion. With The Merge behind us, and the advancements in layer 2 solutions, goals have shifted to provide a more simplified form of data sharding to maximize rollup efficiency. Current layer 2s enable the ability to scale transaction execution, and sharding will allow for storage of proofs for this data on layer 1 in a cheap and scalable manner.", "page-upgrades-question-10-answer-8": "More on a rollup-centric roadmap", "page-upgrades-question-11-title": "Can I buy Eth2?", - "page-upgrades-question-11-desc": "No. There is no Eth2 token and your ETH did not change with The Merge.", - "page-upgrades-question-11-answer-1": "One of the driving forces behind the Eth2 rebrand was the common misconception that ETH holders would have to migrate their ETH after 'Ethereum 2.0'. This has never been true. It is ", - "page-upgrades-question-11-answer-2": "a common technique used scammers.", + "page-upgrades-question-11-desc": "No. There is no Eth2 token, and your ETH did not change after The Merge.", + "page-upgrades-question-11-answer-1": "One of the driving forces behind the Eth2 rebrand was the common misconception that ETH holders were required to migrate their ETH to 'ETH 2.0' after The Merge or any other upgrade. This is not true and never has been.", + "page-upgrades-question-11-answer-2": " This confusion is commonly exploited by scammers.", "page-upgrades-question-title": "Frequently asked questions", "page-upgrades-question3-answer-1": "ETH holders don't need to do anything. Your ETH will not need changing or upgrading. There's almost certain to be scams telling you otherwise, so be careful.", "page-upgrades-scalable": "More scalable", @@ -162,7 +162,7 @@ "page-upgrades-take-part": "Take part in the research", "page-upgrades-take-part-desc": "Ethereum researchers and enthusiasts alike meet here to discuss research efforts, including everything related to Ethereum upgrades.", "page-upgrades-the-upgrades": "The Ethereum upgrades", - "page-upgrades-the-upgrades-desc": "Ethereum consists of a set of upgrades that improve the scalability, security, and sustainability of the network. Although each is being worked on in parallel, they have certain dependencies that determine when they will be deployed.", + "page-upgrades-the-upgrades-desc": "Ethereum upgrades aim to improve the network's scalability, security, and sustainability. Ethereum has recently undergone some major upgrades to security and sustainability, and there are more coming in the future, especially relating to scalability.", "page-upgrades-unofficial-roadmap": "This is not the official roadmap. This is how we view what's happening based on the information out there. But this is technology, things can change in an instant. So please don't read this as a commitment.", "page-upgrades-upgrade-desc": "The Ethereum we know and love, just more scalable, more secure, and more sustainable...", "page-upgrades-upgrades": "The Ethereum upgrades", @@ -178,9 +178,9 @@ "page-upgrades-vision-desc": "To bring Ethereum into the mainstream and serve all of humanity, we have to make Ethereum more scalable, secure, and sustainable.", "page-upgrades-vision-upper": "Ethereum vision", "page-upgrades-what-happened-to-eth2-title": "What happened to 'Eth2'?", - "page-upgrades-what-happened-to-eth2-1": "The term 'Eth2' is being phased out in preparation for The Merge.", + "page-upgrades-what-happened-to-eth2-1": "The term 'Eth2' was commonly used before The Merge but is being phased out in favor of more precise terminology.", "page-upgrades-what-happened-to-eth2-1-more": "More on The Merge.", - "page-upgrades-what-happened-to-eth2-2": "After merging 'Eth1' and 'Eth2' into a single chain, there will no longer be two distinct Ethereum networks; there will only be Ethereum.", + "page-upgrades-what-happened-to-eth2-2": "Since merging 'Eth1' and 'Eth2', there are no longer two distinct Ethereum blockchains; there is only Ethereum.", "page-upgrades-what-happened-to-eth2-3": "To limit confusion, the community has updated these terms:", "page-upgrades-what-happened-to-eth2-3-1": "'Eth1' is now the 'execution layer', which handles transactions and execution.", "page-upgrades-what-happened-to-eth2-3-2": "'Eth2' is now the 'consensus layer', which handles proof-of-stake consensus.", diff --git a/src/pages-conditional/what-is-ethereum.tsx b/src/pages-conditional/what-is-ethereum.tsx index e3d088f9db7..199c7125f0e 100644 --- a/src/pages-conditional/what-is-ethereum.tsx +++ b/src/pages-conditional/what-is-ethereum.tsx @@ -244,12 +244,12 @@ const WhatIsEthereumPage = ({ const localeForStatsBoxNumbers = getLocaleForNumberFormat(intl.locale as Lang) - const txCount = useFetchStat<{ - result: Array<{ unixTimeStamp: string; transactionCount: number }> - }>( + const txCount = useFetchStat< + Array<{ unixTimeStamp: string; transactionCount: number }> + >( `${GATSBY_FUNCTIONS_PATH}/txs`, (response) => { - return response.result + return response .map(({ unixTimeStamp, transactionCount }) => ({ timestamp: parseInt(unixTimeStamp) * 1000, // unix milliseconds value: transactionCount,