Merge branch 'dev' into rtl-embla-carousel

Author: wackerow

.all-contributorsrc

@@ -10920,6 +10920,51 @@
       "contributions": [
         "content"
       ]
+    },
+    {
+      "login": "o2Stake",
+      "name": "Tim - o2Stake",
+      "avatar_url": "https://avatars.githubusercontent.com/u/77958700?v=4",
+      "profile": "http://o2stake.com",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "b-wagn",
+      "name": "Benedikt Wagner",
+      "avatar_url": "https://avatars.githubusercontent.com/u/113296072?v=4",
+      "profile": "http://benedikt-wagner.dev",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "tdahar",
+      "name": "Tarun Mohandas Daryanani",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18716811?v=4",
+      "profile": "https://github.com/tdahar",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "Crosstons",
+      "name": "Shubh",
+      "avatar_url": "https://avatars.githubusercontent.com/u/110349596?v=4",
+      "profile": "https://github.com/Crosstons",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "duckdegen",
+      "name": "duckdegen",
+      "avatar_url": "https://avatars.githubusercontent.com/u/98649644?v=4",
+      "profile": "https://github.com/duckdegen",
+      "contributions": [
+        "content"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/ISSUE_TEMPLATE/event_listing.yaml

@@ -0,0 +1,69 @@
+name: Event listing
+description: Request an Ethereum event for listing
+title: Event listing
+labels: ["event :calendar:"]
+body:
+  - type: input
+    id: event_listing_name
+    attributes:
+      label: Event/Meetup Name
+      description: Name for the event to be listed
+    validations:
+      required: true
+  - type: input
+    id: event_listing_website
+    attributes:
+      label: Website
+      description: Publicly available website URL to get more information about the event
+    validations:
+      required: true
+  - type: input
+    id: event_listing_location
+    attributes:
+      label: Location (City/Country, or Remote)
+      description: Geographic location of in-person event, or "Remote" for a virtual event
+    validations:
+      required: true
+  - type: input
+    id: event_listing_description
+    attributes:
+      label: Description
+      description: Brief description of event
+    validations:
+      required: true
+  - type: input
+    id: event_listing_start_date
+    attributes:
+      label: "Start date: (yyyy-mm-dd)"
+      description: Start date of event in yyyy-mm-dd format
+    validations:
+      required: true
+  - type: input
+    id: event_listing_end_date
+    attributes:
+      label: "End date: (yyyy-mm-dd)"
+      description: End date of event in yyyy-mm-dd format
+    validations:
+      required: true
+  - type: textarea
+    id: event_listing_additional_context
+    attributes:
+      label: Additional context
+      description: Add any other context about the event here
+  - type: markdown
+    attributes:
+      value: |
+        **Note:**
+        Events will be only added on the "Upcoming events" table if all fields above are completed, pending approval
+  - type: markdown
+    attributes:
+      value: |
+        **Want to contribute?**
+        We love contributions from the Ethereum community! Please comment on an issue if you're interested in helping out with a PR.
+  - type: checkboxes
+    id: event_listing_work_on
+    attributes:
+      label: Would you like to work on this issue?
+      options:
+        - label: "Yes"
+          required: false

README.md

@@ -1705,6 +1705,13 @@ 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/kamuik16"><img src="https://avatars.githubusercontent.com/u/93703995?v=4?s=100" width="100px;" alt="Krishang Shah"/><br /><sub><b>Krishang Shah</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=kamuik16" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/vuvoth"><img src="https://avatars.githubusercontent.com/u/45826131?v=4?s=100" width="100px;" alt="Vu Vo"/><br /><sub><b>Vu Vo</b></sub></a><br /><a href="#content-vuvoth" title="Content">🖋</a></td>
     </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="http://o2stake.com"><img src="https://avatars.githubusercontent.com/u/77958700?v=4?s=100" width="100px;" alt="Tim - o2Stake"/><br /><sub><b>Tim - o2Stake</b></sub></a><br /><a href="#content-o2Stake" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://benedikt-wagner.dev"><img src="https://avatars.githubusercontent.com/u/113296072?v=4?s=100" width="100px;" alt="Benedikt Wagner"/><br /><sub><b>Benedikt Wagner</b></sub></a><br /><a href="#content-b-wagn" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/tdahar"><img src="https://avatars.githubusercontent.com/u/18716811?v=4?s=100" width="100px;" alt="Tarun Mohandas Daryanani"/><br /><sub><b>Tarun Mohandas Daryanani</b></sub></a><br /><a href="#content-tdahar" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Crosstons"><img src="https://avatars.githubusercontent.com/u/110349596?v=4?s=100" width="100px;" alt="Shubh"/><br /><sub><b>Shubh</b></sub></a><br /><a href="#content-Crosstons" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/duckdegen"><img src="https://avatars.githubusercontent.com/u/98649644?v=4?s=100" width="100px;" alt="duckdegen"/><br /><sub><b>duckdegen</b></sub></a><br /><a href="#content-duckdegen" title="Content">🖋</a></td>
+    </tr>
   </tbody>
 </table>
 

docs/applying-storybook.md

@@ -18,7 +18,7 @@ It's as easy as running `yarn storybook` to boot up a dedicated localhost to see
 
 ## Setting up a component's stories
 
-> 🚨 NOTE: This project has version 7, which is currently still in beta. The following documentation outlines preferences in setup as it relates to this version. You can refer to the [7.0 beta docs](https://storybook.js.org/docs/7.0/react/) if you need any additional details
+> 🚨 NOTE: This project uses Storybook v7. The following documentation outlines preferences in setup as it relates to this version. You can refer to the [main docs](https://storybook.js.org/docs/get-started/install) if you need any additional details
 
 A Storybook "story" is an instance of a component in a certain state or with certain parameters applied to show an alternative version of the component.
 
@@ -42,13 +42,13 @@ import ComponentA from "."
 
 type ComponentAType = typeof ComponentA
 
-const meta: Meta<ComponentAType> {
+const meta {
   title: "ComponentA",
   component: ComponentA
-}
+} satisfies Meta<ComponentAType>
 
 export default meta
-type Story = StoryObj<ComponentAType>;
+type Story = StoryObj<typeof meta>;
 
 export const Basic: Story = {
   render: () => <ComponentA />
@@ -68,13 +68,13 @@ import Button from "."
 
 type ButtonType = typeof Button
 
-const meta: Meta<ButtonType> {
+const meta {
   title: "Button",
   component: Button
-}
+} satisfies Meta<ButtonType>
 
 export default meta
-type Story = StoryObj<ButtonType>;
+type Story = StoryObj<typeof meta>;
 
 export const Solid: Story = {
   render: (args) => <Button {...args}>A Button</Button>,
@@ -116,7 +116,7 @@ The dashboard where you view each story has a number of different addons availab
 
 Outlined below are each area going from left to right in the selections.
 
-| Sidebar above the preview                | Dashboard below the preview                                                                                                                                                                                                                                                |
+| Toolbar above the preview                | Panel below the preview                                                                                                                                                                                                                                                    |
 | ---------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | 1. Rerender preview                      | 1. Controls - allows you to interact with a component’s args (inputs) dynamically. Experiment with alternate configurations of the component to discover edge cases. See [Controls addon docs](https://storybook.js.org/docs/7.0/react/essentials/controls)                |
 | 2. Zoom In                               | 2. Actions (if applicable) - help you verify interactions produce the correct outputs via callbacks. See [Actions addon docs](https://storybook.js.org/docs/7.0/react/essentials/actions)                                                                                  |

package.json

@@ -13,7 +13,10 @@
     "preversion": "bash ./src/scripts/updatePublishDate.sh",
     "crowdin-contributors": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/crowdin/getCrowdinContributors.ts",
     "storybook": "storybook dev -p 6006",
-    "build-storybook": "storybook build"
+    "build-storybook": "storybook build",
+    "crowdin-clean": "rm -rf .crowdin && mkdir .crowdin",
+    "crowdin-import": "ts-node src/scripts/crowdin-import.ts",
+    "markdown-checker": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/markdownChecker.ts"
   },
   "dependencies": {
     "@chakra-ui/next-js": "^2.1.5",

public/.well-known/matrix/server

@@ -0,0 +1,3 @@
+{
+    "m.server": "matrix.ethereum.org:8448"
+}

public/.well-known/security.txt

@@ -0,0 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+Contact: mailto:[email protected]
+Expires: 2023-12-31T23:59:00.000Z
+Encryption: https://ethereum.org/security_at_ethereum.org.asc
+Acknowledgments: https://bounty.ethereum.org
+Preferred-Languages: en
+Canonical: https://ethereum.org/.well-known/security.txt
+Policy: https://bounty.ethereum.org
+Hiring: https://ethereum.org/en/community/get-involved/#ethereum-jobs
+
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCAAdFiEErpbtlp5HmwCE8+F/6I0zNPpfagoFAmMV3bMACgkQ6I0zNPpf
+agrOjhAAgMDS9RJUbJzcAybRfp/STq4Kf50TFd3iqx/t8ECw5UGazefieHesOhZ5
+9B9l6VAIHEGqbm+ukkhT+eBofhkAGEupiH/rUTy3hpFo1Ggp9QGi464Y8RyB0hID
+BwjAsAVEdHyh8T6YrqxKRGvgELuEMZfuPfVhdIGU8CfEQozzuA9q3mChckXdTlSt
+TvOKTMdnNPMlEhp4dT93iQaXDBAncE48TkUi/c8U4qolkskuDhZ4qJkc7xcv5Uk4
+TfF83Xs87AF9ZmABWawlCx7VHhp0HGljtGUpobf2DXV0TG77/dZzMQ4xdyqvDq+v
+tm3djp3UHZVhOkDxMKpBzLnCkCvyvh/tvN4j/trdHHzXx6gEEkuiR5wPPoomCosi
+95AGNFf0vpe2HucL/bOrBySxME+hifAnmkiaXltLbyUUTBQPfkHMHMoq1dmPokm2
+4RZaZ1A/K7rirZLC4w/RmxONVqvxT0baFTcZGyKzYm6gEZ9kCwWw1tyEl472yK0H
+UR2cAhlo+Wa61cOTtwHVw0FMVyG0xZkR04y8WM3T8lE6imGLSmCDgPMZm8XnKdkY
+SMGD3+TzLxe6mymmw+1dGXCPjjkImdrhBGxlwEU74vkFQKiWv/GftiDYYcilcQbS
+OD1N7PTmpef+JEYXOpwxxUTSXu0SfVTSkx0wnHkqbib7Wwv5IwY=
+=g+49
+-----END PGP SIGNATURE-----

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

@@ -19,7 +19,7 @@ Start by reading about the ethereum.org mission and values in our [code of condu
 - Watch or participate in the [Core Dev calls](https://www.youtube.com/playlist?list=PLaM7G4Llrb7zfMXCZVEXEABT8OSnd4-7w)
 - [Ecosystem Support Program's wishlist](https://esp.ethereum.foundation/wishlist/) - tooling, documentation, and infrastructure areas where the Ethereum Ecosystem Support Program is actively seeking grant applications
 - [Web3Bridge](https://www.web3bridge.com/) - join the aspiring web3 community in their initiative to identify, train, and support hundreds of developers and community members throughout Africa
-- Join the [Ethereum Cat Herders Discord](https://discord.io/EthCatHerders)
+- Join the [Ethereum Cat Herders Discord](https://discord.com/invite/Nz6rtfJ8Cu)
 
 ## Researchers & Academics <Emoji text=":mag:" size={1} />‍ {#researchers-and-academics}
 
@@ -33,7 +33,7 @@ Do you have a background in mathematics, cryptography, or economics? You might b
   - 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.
   - Participate in [EIP Governance](https://github.com/ethereum-cat-herders/EIPIP)
-    - Join the [Ethereum Cat Herders Discord](https://discord.io/EthCatHerders)
+    - Join the [Ethereum Cat Herders Discord](https://discord.com/invite/Nz6rtfJ8Cu)
   - [More on EIPs](/eips/)
 - [Challenges.ethereum.org](https://challenges.ethereum.org/) - a series of high-value research bounties, where you can earn >$100,000 USD
 - [Ethresear.ch](https://ethresear.ch) - Ethereum’s primary forum for research, and the world’s most influential forum for cryptoeconomics
@@ -103,6 +103,7 @@ The Ethereum ecosystem is on a mission to fund public goods and impactful projec
 - [ethereum.org jobs](/about/#open-jobs)
 - [Ethereum Foundation job board (Lever)](https://jobs.lever.co/ethereumfoundation)
 - [Ethereum Foundation job board (BambooHR)](https://ethereum.bamboohr.com/jobs/)
+- [JobStash](https://jobstash.xyz)
 - [Cryptocurrency Jobs](https://cryptocurrencyjobs.co/ethereum/)
 - [Crypto.jobs](https://crypto.jobs/)
 - [Careers at ConsenSys](https://consensys.net/careers/)

public/content/developers/docs/consensus-mechanisms/pos/attestations/index.md

@@ -50,9 +50,15 @@ The attestation lifecycle is outlined in the schematic below:
 
 ## Rewards {#rewards}
 
-Validators are rewarded for submitting attestations. The attestation reward is dependent on two variables, the `base reward` and the `inclusion delay`. The best case for the inclusion delay is to be equal to 1.
+Validators are rewarded for submitting attestations. The attestation reward depends on the participation flags (source, target and head), the base reward and the participation rate.
 
-`attestation reward = 7/8 x base reward x (1/inclusion delay)`
+Each of the participation flags can be either true or false, depending on the submitted attestation and its inclusion delay.
+
+The best scenario occurs when all three flags are true, in which case a validator would earn (per correct flag):
+
+`reward += base reward * flag weight * flag attesting rate / 64`
+
+The flag attesting rate is measured using the sum of effective balances of all attesting validators for the given flag compared the total active effective balance.
 
 ### Base reward {#base-reward}
 

public/content/developers/docs/consensus-mechanisms/pos/block-proposal/index.md

@@ -8,7 +8,7 @@ Blocks are the fundamental units of the blockchain. Blocks are discrete units of
 
 ## Prerequisites {#prerequisites}
 
-Block proposal is part of the proof-of-stake protocol. To help understand this page, we recommend you read about [proof-of-stake](public/content/developers/docs/consensus-mechanisms/pos/) and [block architecture](public/content/developers/docs/blocks/).
+Block proposal is part of the proof-of-stake protocol. To help understand this page, we recommend you read about [proof-of-stake](/developers/docs/consensus-mechanisms/pos/) and [block architecture](/developers/docs/blocks/).
 
 ## Who produces blocks? {#who-produces-blocks}