Merge pull request #11085 from ethereum/dev

Release candidate: v7.20.1

Author: pettinarip

.all-contributorsrc

@@ -10432,6 +10432,70 @@
         "doc",
         "bug"
       ]
+    },
+    {
+      "login": "mteam88",
+      "name": "Matthew",
+      "avatar_url": "https://avatars.githubusercontent.com/u/84196639?v=4",
+      "profile": "https://mteam88.github.io",
+      "contributions": [
+        "bug",
+        "doc"
+      ]
+    },
+    {
+      "login": "avalidurl",
+      "name": "gokhan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/11991363?v=4",
+      "profile": "https://github.com/avalidurl",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "0xadri",
+      "name": "Adri",
+      "avatar_url": "https://avatars.githubusercontent.com/u/738533?v=4",
+      "profile": "https://github.com/0xadri",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "DSherryD",
+      "name": "Sherry.Du",
+      "avatar_url": "https://avatars.githubusercontent.com/u/130898085?v=4",
+      "profile": "https://github.com/DSherryD",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "FrancescoXX",
+      "name": "Francesco Ciulla",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18360871?v=4",
+      "profile": "http://francescociulla.com",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "blazingrome",
+      "name": "blazingrome",
+      "avatar_url": "https://avatars.githubusercontent.com/u/136898739?v=4",
+      "profile": "https://github.com/blazingrome",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "etan-status",
+      "name": "Etan Kissling",
+      "avatar_url": "https://avatars.githubusercontent.com/u/89844309?v=4",
+      "profile": "https://github.com/etan-status",
+      "contributions": [
+        "content"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -121,7 +121,7 @@ To use an existing function locally you don't need to do anything. Just check th
 
 To create a new function, you will need to create two files:
 
-- One in `src/lambdas` where the logic will live. These are the ones that will be deployed to Netlify. These functions follow [this format](https://docs.netlify.com/functions/build-with-javascript/#synchronous-function-format).
+- One in `src/lambda` where the logic will live. These are the ones that will be deployed to Netlify. These functions follow [this format](https://docs.netlify.com/functions/build-with-javascript/#synchronous-function-format).
 - One in `src/api` that will be just a wrapper around the previous one in order to be compatible with Gatsby functions. More on the [Gatbsy docs](https://www.gatsbyjs.com/docs/reference/functions/getting-started/) for the format they follow.
 
 Typically, you will develop and test functions in the Gatsby context, by running `yarn start`.
@@ -1631,6 +1631,15 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/LadyDhaga"><img src="https://avatars.githubusercontent.com/u/106376368?v=4?s=100" width="100px;" alt="chinaman123"/><br /><sub><b>chinaman123</b></sub></a><br /><a href="#ideas-LadyDhaga" title="Ideas, Planning, & Feedback">🤔</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://t.me/mevsinternet"><img src="https://avatars.githubusercontent.com/u/32142853?v=4?s=100" width="100px;" alt="Alex"/><br /><sub><b>Alex</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=z0rats" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Az0rats" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://mteam88.github.io"><img src="https://avatars.githubusercontent.com/u/84196639?v=4?s=100" width="100px;" alt="Matthew"/><br /><sub><b>Matthew</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Amteam88" title="Bug reports">🐛</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=mteam88" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/avalidurl"><img src="https://avatars.githubusercontent.com/u/11991363?v=4?s=100" width="100px;" alt="gokhan"/><br /><sub><b>gokhan</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aavalidurl" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/0xadri"><img src="https://avatars.githubusercontent.com/u/738533?v=4?s=100" width="100px;" alt="Adri"/><br /><sub><b>Adri</b></sub></a><br /><a href="#content-0xadri" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/DSherryD"><img src="https://avatars.githubusercontent.com/u/130898085?v=4?s=100" width="100px;" alt="Sherry.Du"/><br /><sub><b>Sherry.Du</b></sub></a><br /><a href="#content-DSherryD" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://francescociulla.com"><img src="https://avatars.githubusercontent.com/u/18360871?v=4?s=100" width="100px;" alt="Francesco Ciulla"/><br /><sub><b>Francesco Ciulla</b></sub></a><br /><a href="#content-FrancescoXX" title="Content">🖋</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/blazingrome"><img src="https://avatars.githubusercontent.com/u/136898739?v=4?s=100" width="100px;" alt="blazingrome"/><br /><sub><b>blazingrome</b></sub></a><br /><a href="#content-blazingrome" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/etan-status"><img src="https://avatars.githubusercontent.com/u/89844309?v=4?s=100" width="100px;" alt="Etan Kissling"/><br /><sub><b>Etan Kissling</b></sub></a><br /><a href="#content-etan-status" title="Content">🖋</a></td>
     </tr>
   </tbody>
 </table>

docs/ds-implementation.md

@@ -0,0 +1,43 @@
+# DS implementation guide
+
+This is a reference for implementing the new Design System components and styles defined in a public [Figma file](https://www.figma.com/file/NrNxGjBL0Yl1PrNrOT8G2B/ethereum.org-Design-System).
+
+This is part of our [Design System implementation epic](https://github.com/ethereum/ethereum-org-website/issues/9546). Currently we are implementing the v1, check the remaining tasks [here](https://github.com/ethereum/ethereum-org-website/issues/9548).
+
+## Basics
+
+- Use Chakra tokens for spacing, sizes, and breakpoints. [Chakra theme docs](https://chakra-ui.com/docs/styled-system/theme)
+- For colors use the semantic tokens defined in [this file](https://github.com/ethereum/ethereum-org-website/blob/dev/src/@chakra-ui/gatsby-plugin/semanticTokens.ts). These tokens will match the color variables used in the DS Figma file
+- Use as many Chakra components and utils as possible
+- Read the [Best Practices doc](https://github.com/ethereum/ethereum-org-website/blob/dev/docs/best-practices.md) for more examples and info
+
+**IMPORTANT**
+Follow the new component directory structure:
+
+```markdown
+src/
+└── components/
+    └── ComponentA/
+        ├── index.tsx
+        ├── ComponentA.stories.tsx
+        └── // Any other files as applicable (utils, child components, useHook, etc.)
+```
+
+## Components creation/modification from the DS
+
+If you are implementing:
+
+- A base component (a component that already exists in the [Chakra components list](https://chakra-ui.com/docs/components/), for example, the button or inputs)
+  - Try to avoid creating a new component file `/ComponentA/index.tsx` if there is no additional or custom logic we need to add to them
+  - Create a theme file to override the default Chakra styles with the DS specs. See examples under the [Chakra theme folder](https://github.com/ethereum/ethereum-org-website/blob/dev/src/@chakra-ui/gatsby-plugin/components/)
+  - Create a `.stories.tsx` file under `src/components/BaseStories`
+- A new custom component (e.g. the PageHero)
+  - Use as many Chakra components as possible
+  - Avoid implementing previous implementation details or styles if Chakra offers a solution for that
+
+## Stories
+
+As defined in the new directory structure, each created or adapted component must have a story attached to it.
+
+- Follow the [Applying Storybook documentation](https://github.com/ethereum/ethereum-org-website/blob/dev/docs/applying-storybook.md)
+- Follow the [proposed Storybook structure](https://www.figma.com/file/Ne3iAassyfAcJ0AlgqioAP/DS-to-storybook-structure)

package.json

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

src/content/community/code-of-conduct/index.md

@@ -35,7 +35,7 @@ Open participation is core to the ethereum.org ethos. We are a website and commu
 
 ### Scope {#scope}
 
-This Code of Conduct applies to all ethereum.org spaces (such as GitHub, Discord, Figma Crowdin, Twitter and other online platforms), and it also applies when the community is represented in real-world public spaces such as at meetups, conferences and events.
+This Code of Conduct applies to all ethereum.org spaces (such as GitHub, Discord, Figma, Crowdin, Twitter and other online platforms), and it also applies when the community is represented in real-world public spaces such as at meetups, conferences and events.
 
 ### Our standards {#our-standards}
 
@@ -52,7 +52,7 @@ Examples of unacceptable behavior by participants include:
 
 - Physical violence, threatening physical violence or encouraging of physical violence of any kind
 - Using sexualized language or imagery or imposing unwelcome sexual attention
-- Impersonating another individual or otherwise dishonestly claiming affiliation with some individual or organization.
+- Impersonating another individual or otherwise dishonestly claiming affiliation with some individual or organization
 - Trolling, insulting/derogatory comments, and personal or political attacks
 - Harassing other community members in public or private channels
 - Publishing others’ private information, such as a physical or electronic address, without explicit permission

src/content/community/get-involved/index.md

@@ -28,7 +28,7 @@ Do you have a background in mathematics, cryptography, or economics? You might b
 - Write or review an Ethereum Improvement Proposal
   - Write an EIP
     1. Submit your idea on [Ethereum Magicians](https://ethereum-magicians.org)
-    2. Read [EIP-1](https://eip.ethereum.org/EIPS/eip-1) - **Yes, that's the _entire_ document.**
+    2. Read [EIP-1](https://eips.ethereum.org/EIPS/eip-1) - **Yes, that's the _entire_ document.**
     3. Follow the directons in EIP-1. Reference it as you write your draft.
   - Learn how to become an [EIP Editor](https://eips.ethereum.org/EIPS/eip-5069)
     - You can peer-review EIPs right now! See [open PRs with the `e-review` tag](https://github.com/ethereum/EIPs/pulls?q=is%3Apr+is%3Aopen+label%3Ae-review). Provide technical feedback on the `discussion-to` link.

src/content/developers/docs/apis/json-rpc/index.md

@@ -1552,7 +1552,7 @@ params: [
   - `blockHash`: `DATA`, 32 Bytes - hash of the block where this log was in. `null` when its pending. `null` when its pending log.
   - `blockNumber`: `QUANTITY` - the block number where this log was in. `null` when its pending. `null` when its pending log.
   - `address`: `DATA`, 20 Bytes - address from which this log originated.
-  - `data`: `DATA` - contains one or more 32 Bytes non-indexed arguments of the log.
+  - `data`: `DATA` - contains zero or more 32 Bytes non-indexed arguments of the log.
   - `topics`: `Array of DATA` - Array of 0 to 4 32 Bytes `DATA` of indexed log arguments. (In _solidity_: The first topic is the _hash_ of the signature of the event (e.g. `Deposit(address,bytes32,uint256)`), except you declared the event with the `anonymous` specifier.)
 - **Example**
 

src/content/developers/docs/bridges/index.md

@@ -91,7 +91,7 @@ For developers, there are many ways to add support for bridges:
    - Assessment and maintenance of bridges are hard and time-consuming.
    - Selecting one bridge creates a single point of failure and dependency.
    - The dapp is limited by the bridge’s capabilities.
-   - Bridges alone might not be enough. dapps might need DEXs to offer more functionality such as cross-chain swaps.
+   - Bridges alone might not be enough. Dapps might need DEXs to offer more functionality such as cross-chain swaps.
 
 4. **Integrating multiple bridges –** This solution solves many problems associated with integrating a single bridge. However, it also has limitations, as integrating multiple bridges is resource-consuming and creates technical and communication overheads for developers—the scarcest resource in crypto.
 

src/content/developers/docs/design-and-ux/index.md

@@ -1,6 +1,6 @@
 ---
 title: Design and UX in web3
-description: Introduction to UX design an research in web3 space and Ethereum
+description: Introduction to UX design and research in web3 space and Ethereum
 lang: en
 ---
 

src/content/developers/docs/ides/index.md

@@ -66,6 +66,6 @@ Most established IDEs have built plugins to enhance the Ethereum development exp
 
 ## Further reading {#further-reading}
 
-- [Ethereum IDEs](https://www.alchemy.com/list-of/web3-ides-on-ethereum) _- Alchemy's list of Ethereunm IDEs_
+- [Ethereum IDEs](https://www.alchemy.com/list-of/web3-ides-on-ethereum) _- Alchemy's list of Ethereum IDEs_
 
 _Know of a community resource that helped you? Edit this page and add it!_