Merge remote-tracking branch 'upstream/dev' into migrate/contributors

Author: Baystef

.all-contributorsrc

@@ -12497,6 +12497,33 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "r4f4ss",
+      "name": "rafaelss",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5679073?v=4",
+      "profile": "https://github.com/r4f4ss",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "preetjdp",
+      "name": "Preet Parekh",
+      "avatar_url": "https://avatars.githubusercontent.com/u/27439197?v=4",
+      "profile": "https://preetjdp.dev/",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "ludamad",
+      "name": "ludamad",
+      "avatar_url": "https://avatars.githubusercontent.com/u/163993?v=4",
+      "profile": "https://www.linkedin.com/in/adamdomurad/",
+      "contributions": [
+        "content"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.eslintrc.json

@@ -65,6 +65,17 @@
         "varsIgnorePattern": "^_$"
       }
     ],
-    "unused-imports/no-unused-imports-ts": "warn"
+    "unused-imports/no-unused-imports-ts": "warn",
+    "no-restricted-imports": [
+      "warn",
+      {
+        "paths": [
+          {
+            "name": "react-i18next",
+            "message": "Please use next-i18next instead of react-i18next."
+          }
+        ]
+      }
+    ]
   }
 }

.storybook/i18next.ts

@@ -1,4 +1,5 @@
 import i18n, { Resource } from "i18next"
+// eslint-disable-next-line no-restricted-imports
 import { initReactI18next } from "react-i18next"
 
 export const baseLocales = {

.storybook/utils.ts

@@ -1,3 +1,4 @@
+// eslint-disable-next-line no-restricted-imports
 import { getI18n } from "react-i18next"
 
 import { ns as exposedNs } from "./i18next"

CODE_OF_CONDUCT.md

@@ -0,0 +1,71 @@
+# Code of conduct
+
+## Mission
+
+To develop and maintain the most comprehensive and accessible knowledge hub for Ethereum.
+
+## Values
+
+The ethereum.org community strives to be:
+
+- educational, intended to help everyone to understand Ethereum
+- inclusive
+- accessible
+- community-driven
+- focused on Ethereum’s underlying technology and use-cases
+- focused on Ethereum concepts and design principles
+
+## What we are not
+
+- The Ethereum Foundation website
+- A platform for promoting investments or profiteering of any kind
+- A platform for elevating or endorsing individual projects or organizations
+- A DEX, CEX or any other form of financial platform
+- A platform that gives financial or legal advice of any kind
+
+## Code of conduct
+
+### Pledge
+
+Open participation is core to the ethereum.org ethos. We are a website and community maintained by thousands of contributors, and this is only possible if we maintain a welcoming, participatory environment. To this end, contributors to this site pledge to maintain a harassment-free environment for all participants across all ethereum.org platforms and community spaces. The ethereum.org community welcomes and values anyone who wants to participate in a constructive and friendly way, regardless of age, disability, ethnicity, sex characteristics, gender identity, level of experience, area of expertise, education, socio-economic status, nationality, personal appearance, race, religion or any other dimension of diversity.
+
+### 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.
+
+### Our standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting and/or empathetically providing constructive criticism
+- Acting calmly and professionally when resolving conflicts or disagreements
+- Showing empathy and tolerance towards other community members
+- Encouraging and amplifying new voices in the community
+
+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
+- 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
+- Social engineering, scamming or otherwise manipulating other community members
+- Promoting investments, tokens, projects or anything else for personal monetary or non-monetary gain
+- Spamming servers with off-topic content
+- Disregarding requests or warnings from community moderators
+- Engaging in other conduct which could reasonably be considered inappropriate in a professional setting
+
+### Reporting
+
+Violations of the code of conduct will normally be visible to the community as we try to do everything in open, public channels, allowing community members to self-police.
+
+However, if something happens that you feel needs attention, you can raise it with someone who has a moderation role (e.g. discord guide) so that they can help investigate and execute the appropriate response.
+
+When reporting, please include as much detail as possible, including specific examples and timestamps. This will help to ensure a fair outcome.
+
+### Enforcement
+
+Depending on the severity, people who violate the code of conduct can receive warnings, temporary bans or permanent bans from ethereum.org communities.

README.md

@@ -1910,6 +1910,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/cratiu222"><img src="https://avatars.githubusercontent.com/u/156356273?v=4?s=100" width="100px;" alt="Christina"/><br /><sub><b>Christina</b></sub></a><br /><a href="#content-cratiu222" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/nipunh"><img src="https://avatars.githubusercontent.com/u/26524611?v=4?s=100" width="100px;" alt="Nipun Hedaoo"/><br /><sub><b>Nipun Hedaoo</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=nipunh" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/chenjiali-april"><img src="https://avatars.githubusercontent.com/u/132745538?v=4?s=100" width="100px;" alt="april"/><br /><sub><b>april</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=chenjiali-april" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/r4f4ss"><img src="https://avatars.githubusercontent.com/u/5679073?v=4?s=100" width="100px;" alt="rafaelss"/><br /><sub><b>rafaelss</b></sub></a><br /><a href="#content-r4f4ss" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://preetjdp.dev/"><img src="https://avatars.githubusercontent.com/u/27439197?v=4?s=100" width="100px;" alt="Preet Parekh"/><br /><sub><b>Preet Parekh</b></sub></a><br /><a href="#content-preetjdp" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/adamdomurad/"><img src="https://avatars.githubusercontent.com/u/163993?v=4?s=100" width="100px;" alt="ludamad"/><br /><sub><b>ludamad</b></sub></a><br /><a href="#content-ludamad" title="Content">🖋</a></td>
     </tr>
   </tbody>
 </table>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "9.0.0",
+  "version": "9.0.1",
   "license": "MIT",
   "private": true,
   "scripts": {

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

@@ -41,12 +41,6 @@ Most established IDEs have built plugins to enhance the Ethereum development exp
 - [Code samples](https://github.com/Azure-Samples/blockchain/blob/master/blockchain-workbench/application-and-smart-contract-samples/readme.md)
 - [GitHub](https://github.com/microsoft/vscode)
 
-**Atom -** **_A hackable text editor for the 21st Century_**
-
-- [Atom](https://atom.io/)
-- [GitHub](https://github.com/atom)
-- [Ethereum packages](https://atom.io/packages/search?utf8=%E2%9C%93&q=keyword%3Aethereum&commit=Search)
-
 **JetBrains IDEs (IntelliJ IDEA, etc.) -** **_Essential tools for software developers and teams_**
 
 - [JetBrains](https://www.jetbrains.com/)

public/content/developers/docs/networking-layer/portal-network/index.md

@@ -76,7 +76,7 @@ The Portal Network clients are:
 - [Trin](https://github.com/ethereum/trin): written in Rust
 - [Fluffy](https://nimbus.team/docs/fluffy.html): written in Nim
 - [Ultralight](https://github.com/ethereumjs/ultralight): written in Typescript
-- [Shisui](https://github.com/GrapeBaBa/shisui): written in Go
+- [Shisui](https://github.com/optimism-java/shisui): written in Go
 
 Having multiple independent client implementations enhances the resilience and decentralization of the Ethereum network.
 

public/content/developers/docs/nodes-and-clients/bootnodes/index.md

@@ -8,7 +8,7 @@ When a new node joins the Ethereum network it needs to connect to nodes that are
 
 ## Connect to a bootnode {#connect-to-a-bootnode}
 
-Most clients have a list of bootnodes build in, but you might also want to run your own bootnode, or use one that is not part of the client's hardcoded list. In this case, you can specify them when starting your client, as follows (example is for Geth, please check your client's documentation):
+Most clients have a list of bootnodes builtin, but you might also want to run your own bootnode, or use one that is not part of the client's hardcoded list. In this case, you can specify them when starting your client, as follows (example is for Geth, please check your client's documentation):
 
 ```
 geth --bootnodes "enode://<node ID>@<IP address>:<port>"