Merge pull request #7494 from ethereum/dev

Deploy v5.1.2

Author: corwintines

.all-contributorsrc

@@ -8442,6 +8442,26 @@
         "doc",
         "translation"
       ]
+    },
+    {
+      "login": "srhinee",
+      "name": "samsara",
+      "avatar_url": "https://avatars.githubusercontent.com/u/29331203?v=4",
+      "profile": "https://github.com/srhinee",
+      "contributions": [
+        "doc",
+        "bug",
+        "translation"
+      ]
+    },
+    {
+      "login": "greefea",
+      "name": "greefea",
+      "avatar_url": "https://avatars.githubusercontent.com/u/106492500?v=4",
+      "profile": "https://github.com/greefea",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -1347,6 +1347,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <tr>
     <td align="center"><a href="https://github.com/lonelyotter"><img src="https://avatars.githubusercontent.com/u/57280827?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Haochen Song</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=lonelyotter" title="Documentation">📖</a> <a href="#translation-lonelyotter" title="Translation">🌍</a></td>
     <td align="center"><a href="https://github.com/opensourcex123"><img src="https://avatars.githubusercontent.com/u/73230562?v=4?s=100" width="100px;" alt=""/><br /><sub><b>N Fx</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=opensourcex123" title="Documentation">📖</a> <a href="#translation-opensourcex123" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/srhinee"><img src="https://avatars.githubusercontent.com/u/29331203?v=4?s=100" width="100px;" alt=""/><br /><sub><b>samsara</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=srhinee" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Asrhinee" title="Bug reports">🐛</a> <a href="#translation-srhinee" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/greefea"><img src="https://avatars.githubusercontent.com/u/106492500?v=4?s=100" width="100px;" alt=""/><br /><sub><b>greefea</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=greefea" title="Documentation">📖</a></td>
   </tr>
 </table>
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "5.1.1",
+  "version": "5.1.2",
   "description": "Website of ethereum.org",
   "main": "index.js",
   "repository": "git@github.com:ethereum/ethereum-org-website.git",

src/components/ShardChainsList.tsx

@@ -15,46 +15,28 @@ const ShardChainsList: React.FC<IProps> = () => {
   const intl = useIntl()
   const reads: Array<CardListItem> = [
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-sharding-is-great",
-        intl
-      ),
-      description: "Vitalik Buterin",
+      title: translateMessageId("page-upgrade-article-title-sharding-is-great", intl),
+      description: translateMessageId("page-upgrade-article-author-vitalik-buterin", intl),
       link: "https://vitalik.ca/general/2021/04/07/sharding.html",
     },
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-rollup-roadmap",
-        intl
-      ),
-      description: "Vitalik Buterin",
+      title: translateMessageId("page-upgrade-article-title-rollup-roadmap", intl),
+      description: translateMessageId("page-upgrade-article-author-vitalik-buterin", intl),
       link: "https://ethereum-magicians.org/t/a-rollup-centric-ethereum-roadmap/4698",
     },
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-two-point-oh",
-        intl
-      ),
-      description: "Ethos.dev",
+      title: translateMessageId("page-upgrade-article-title-two-point-oh", intl),
+      description: translateMessageId("page-upgrade-article-author-ethos-dev", intl),
       link: "https://ethos.dev/beacon-chain/",
     },
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-sharding-consensus",
-        intl
-      ),
-      description: translateMessageId(
-        "page-upgrade-article-author-ethereum-foundation",
-        intl
-      ),
+      title: translateMessageId("page-upgrade-article-title-sharding-consensus", intl),
+      description: translateMessageId("page-upgrade-article-author-ethereum-foundation", intl),
       link: "https://blog.ethereum.org/2020/03/27/sharding-consensus/",
     },
     {
-      title: translateMessageId(
-        "page-upgrade-article-title-hitchhikers-guide-to-ethereum",
-        intl
-      ),
-      description: "Delphi Digital",
+      title: translateMessageId("page-upgrade-article-title-hitchhikers-guide-to-ethereum", intl),
+      description: translateMessageId("page-upgrade-article-author-delphi-digital", intl),
       link: "https://members.delphidigital.io/reports/the-hitchhikers-guide-to-ethereum",
     },
   ]

src/content/developers/docs/data-and-analytics/index.md

@@ -17,20 +17,25 @@ You should understand the basic concept of [Block Explorers](/developers/docs/da
 
 In terms of architectural fundamentals, understanding what an [API](https://www.wikipedia.org/wiki/API) and [REST](https://www.wikipedia.org/wiki/Representational_state_transfer) are, even in theory.
 
+## Block explorers {#block-explorers}
+
+Many [Block Explorers](/developers/docs/data-and-analytics/block-explorers/) offer [RESTful](https://www.wikipedia.org/wiki/Representational_state_transfer) [API](https://www.wikipedia.org/wiki/API) gateways that will provide developers visibility into real-time data on blocks, transactions, miners, accounts, and other on-chain activity.
+
+Developers can then process and transform this data to give their users unique insights and interactions with the [blockchain](/glossary/#blockchain).
+
 ## The Graph {#the-graph}
 
 The [Graph Network](https://thegraph.com/) is a decentralized indexing protocol for organizing blockchain data. Instead of building and managing off-chain and centralized data stores to aggregate on-chain data, with The Graph, developers can build serverless applications that run entirely on public infrastructure.
 
 Using [GraphQL](https://graphql.org/), developers can query any of the curated open APIs, known as sub-graphs, to acquire the necessary information they need to drive their dapp. By querying these indexed sub-graphs, Reports and dapps not only get performance and scalability benefits but also the built in accuracy provided by network consensus. As new improvements and/or sub-graphs are added to the network, your projects can rapidly iterate to take advantage of these enhancements.
 
-## Block explorers {#block-explorers}
+## Dune Analytics {#dune-analytics}
 
-Many [Block Explorers](/developers/docs/data-and-analytics/block-explorers/) offer [RESTful](https://www.wikipedia.org/wiki/Representational_state_transfer) [API](https://www.wikipedia.org/wiki/API) gateways that will provide developers visibility into real-time data on blocks, transactions, miners, accounts, and other on-chain activity.
-
-Developers can then process and transform this data to give their users unique insights and interactions with the [blockchain](/glossary/#blockchain).
+[Dune Analytics](https://dune.com/) pre-processes blockchain data into relational database (PostgreSQL and DatabricksSQL) tables, allows users to query blockchain data using SQL and build dashboards based on query results. On-chain data are organized into 4 raw tables: `blocks`, `transactions`, (event)  `logs` and (call) `traces`. Popular contracts and protocols have been decoded, and each has its own set of event and call tables. Those event and call tables are processed further and organized into abstraction tables by the type of protocols, for example, dex, lending, stablecoins, etc.
 
 ## Further Reading {#further-reading}
 
 - [Graph Network Overview](https://thegraph.com/docs/en/about/network/)
 - [Graph Query Playground](https://thegraph.com/explorer/subgraph/graphprotocol/graph-network-mainnet?version=current)
 - [API code examples on EtherScan](https://etherscan.io/apis#contracts)
+- [Dune Basics](https://docs.dune.com/#dune-basics) 

src/content/developers/docs/nodes-and-clients/index.md

@@ -43,7 +43,7 @@ Both [execution clients](/developers/docs/nodes-and-clients/#execution-clients)
 Multiple client implementations can make the network stronger by reducing its dependency on a single codebase. The ideal goal is to achieve diversity without any client dominating the network, thereby eliminating a potential single point of failure. 
 The variety of languages also invites a broader developer community and allows them to create integrations in their preferred language.
 
-Learn more about [client diversity](/developers/docs/client-diversity).
+Learn more about [client diversity](/developers/docs/nodes-and-clients/client-diversity/).
 
 What these implementations have in common is they all follow a single specification. Specifications dictate how the Ethereum network and blockchain functions. Every technical detail is defined and specifications can be found as:
 

src/content/developers/tutorials/yellow-paper-evm/index.md

@@ -265,4 +265,4 @@ Mathematical notation is precise and has allowed the Yellow Paper to specify eve
 - Programmers understand computer code.
   They may or may not understand mathematical notation.
 
-Maybe for these reasons, the newer [consensus layer specs](https://github.com/ethereum/consensus-specs/blob/dev/tests/core/pyspec/README.md) are written in Python. However, until and unless the Yellow Paper is also translated to Python or a similar language, the Yellow Paper will continue in service, and it is helpful to be able to read it.
+Maybe for these reasons, the newer [consensus layer specs](https://github.com/ethereum/consensus-specs/blob/dev/tests/core/pyspec/README.md) are written in Python. There are [execution layer specs in Python](https://ethereum.github.io/execution-specs), but they are not complete. Until and unless the entire Yellow Paper is also translated to Python or a similar language, the Yellow Paper will continue in service, and it is helpful to be able to read it.

src/content/security/index.md

@@ -287,4 +287,5 @@ Airdrop scams involve a scam project airdropping an asset (NFT, token) into your
 ### Scam education {#reading-scam-education}
 
 - [Staying Safe: Common Scams](https://support.mycrypto.com/staying-safe/common-scams) - _MyCrypto_
-- [Avoiding Scams](https://bitcoin.org/en/scams) _Bitcoin.org_
+- [Avoiding Scams](https://bitcoin.org/en/scams) - _Bitcoin.org_
+- [Twitter thread on common crypto phishing emails and messages](https://twitter.com/tayvano_/status/1516225457640787969) - _Taylor Monahan_

src/content/translations/zh/developers/tutorials/uniswap-v2-annotated-code/index.md

@@ -396,7 +396,7 @@ ERC-20 的转移调用有两种方式可能失败：
     function _mintFee(uint112 _reserve0, uint112 _reserve1) private returns (bool feeOn) {
 ```
 
-在 Uniswap 2.0 的合约中规定交易者为使用兑换市场支付 0.30% 的费用。 这笔费用的大部分（交易的 0.25%）支付给流动资金提供者。 余下的 0.5% 可以支付给流动资金提供者或由工厂合约指定的账户地址作为协议费，可以用于支付 Uniswap 团队的开发费用。
+在 Uniswap 2.0 的合约中规定交易者为使用兑换市场支付 0.30% 的费用。 这笔费用的大部分（交易的 0.25%）支付给流动资金提供者。 余下的 0.05% 可以支付给流动资金提供者或由工厂合约指定的账户地址作为协议费，可以用于支付 Uniswap 团队的开发费用。
 
 为了减少计算次数（因此减少燃料费用），这笔费用只在流动资金被添加或移除时才计算，而不是在每次兑换交易时计算。
 

src/intl/en/page-upgrades-index.json

@@ -16,6 +16,9 @@
   "page-upgrade-article-title-beacon-chain-explainer": "The Beacon Chain Ethereum 2.0 explainer you need to read first",
   "page-upgrade-article-title-sharding-consensus": "Sharding consensus",
   "page-upgrade-article-author-ethereum-foundation": "Ethereum Foundation",
+  "page-upgrade-article-author-vitalik-buterin": "Vitalik Buterin",
+  "page-upgrade-article-author-ethos-dev": "Ethos.dev",
+  "page-upgrade-article-author-delphi-digital": "Delphi Digital",
   "page-upgrade-article-title-sharding-is-great": "Why sharding is great: demystifying the technical properties",
   "page-upgrade-article-title-rollup-roadmap": "A rollup-centric roadmap",
   "page-upgrade-article-title-hitchhikers-guide-to-ethereum": "The Hitchhikers Guide To Ethereum",