Merge branch 'ethereum:dev' into improve_btn_position

Author: dhirajgagrai

.all-contributorsrc

@@ -9072,6 +9072,42 @@
       "contributions": [
         "ideas"
       ]
+    },
+    {
+      "login": "codespirit7",
+      "name": "Ritesh Singh",
+      "avatar_url": "https://avatars.githubusercontent.com/u/88592710?v=4",
+      "profile": "https://www.linkedin.com/in/ritesh-in/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "simonletort",
+      "name": "Simon Letort",
+      "avatar_url": "https://avatars.githubusercontent.com/u/367992?v=4",
+      "profile": "https://www.linkedin.com/in/simonletort",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "AidanPine",
+      "name": "AidanPine",
+      "avatar_url": "https://avatars.githubusercontent.com/u/92037147?v=4",
+      "profile": "https://github.com/AidanPine",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "christy-pdx",
+      "name": "christy-pdx",
+      "avatar_url": "https://avatars.githubusercontent.com/u/107286087?v=4",
+      "profile": "https://github.com/christy-pdx",
+      "contributions": [
+        "content"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -1435,6 +1435,12 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center"><a href="https://github.com/Abyscuit"><img src="https://avatars.githubusercontent.com/u/36307949?v=4?s=100" width="100px;" alt="Marcus Escobedo"/><br /><sub><b>Marcus Escobedo</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Abyscuit" title="Documentation">📖</a></td>
       <td align="center"><a href="https://workfromhomejobs.me/remote-developer-jobs/"><img src="https://avatars.githubusercontent.com/u/4492996?v=4?s=100" width="100px;" alt="fr33dr4g0n"/><br /><sub><b>fr33dr4g0n</b></sub></a><br /><a href="#ideas-fr33dr4g0n" title="Ideas, Planning, & Feedback">🤔</a></td>
     </tr>
+    <tr>
+      <td align="center"><a href="https://www.linkedin.com/in/ritesh-in/"><img src="https://avatars.githubusercontent.com/u/88592710?v=4?s=100" width="100px;" alt="Ritesh Singh"/><br /><sub><b>Ritesh Singh</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=codespirit7" title="Documentation">📖</a></td>
+      <td align="center"><a href="https://www.linkedin.com/in/simonletort"><img src="https://avatars.githubusercontent.com/u/367992?v=4?s=100" width="100px;" alt="Simon Letort"/><br /><sub><b>Simon Letort</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=simonletort" title="Documentation">📖</a></td>
+      <td align="center"><a href="https://github.com/AidanPine"><img src="https://avatars.githubusercontent.com/u/92037147?v=4?s=100" width="100px;" alt="AidanPine"/><br /><sub><b>AidanPine</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=AidanPine" title="Code">💻</a></td>
+      <td align="center"><a href="https://github.com/christy-pdx"><img src="https://avatars.githubusercontent.com/u/107286087?v=4?s=100" width="100px;" alt="christy-pdx"/><br /><sub><b>christy-pdx</b></sub></a><br /><a href="#content-christy-pdx" title="Content">🖋</a></td>
+    </tr>
   </tbody>
   <tfoot>
 

i18n/config.json

@@ -191,6 +191,14 @@
     "langDir": "ltr",
     "dateFormat": "MM/DD/YYYY"
   },
+  {
+    "code": "km",
+    "hrefLang": "km",
+    "name": "Khmer",
+    "localName": "ចក្រភពខ្មែរ",
+    "langDir": "ltr",
+    "dateFormat": "MM/DD/YYYY"
+  },
   {
     "code": "ko",
     "hrefLang": "ko",

package.json

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

src/@chakra-ui/gatsby-plugin/styles.ts

@@ -3,109 +3,140 @@ import { mode } from "@chakra-ui/theme-tools"
 import { lightTheme as oldTheme } from "../../theme"
 
 const styles = {
-  global: (props) => ({
-    /**
-     * THESE ARE OLD GLOBAL STYLES - carried over from old css files
-     *
-     * They are needed just to keep style consistency as we transition out of
-     * the old styled components to Chakra.
-     *
-     * TODO: remove these overrides as we adopt the new Design System and we
-     * don't need the global styles anymore
-     */
-    body: {
-      // TODO: when we have Chakra v2, this should be done by overriding the
-      // native Chakra semantic tokens
-      bg: mode("white", "gray.700")(props),
-      lineHeight: "1.6rem",
-    },
-    // should be replace with https://chakra-ui.com/docs/components/text
-    p: {
-      margin: "0px 0px 1.45rem",
-    },
-    // should be replace with https://chakra-ui.com/docs/components/list
-    "ul, ol": {
-      margin: "0px 0px 1.45rem 1.45rem",
-      padding: 0,
-    },
-    // YouTube embeds
-    iframe: {
-      display: "block",
-      maxWidth: "560px",
-      margin: "32px 0",
-    },
-    // should be replace by the usage of https://chakra-ui.com/docs/components/heading
-    // also, the media queries defined on each of these heading tags are bearly used
-    "h1,h2,h3,h4,h5,h6": {
-      margin: "2rem 0",
-      lineHeight: 1.4,
-      scrollMarginTop: "navHeight",
-      scrollSnapMargin: "navHeight",
-    },
-    h1: {
-      fontSize: "3rem",
-      fontWeight: 700,
-      [`@media (max-width: ${oldTheme.breakpoints.m})`]: {
-        fontSize: "2.5rem",
-      },
-    },
-    h2: {
-      fontSize: "2rem",
-      marginTop: "3rem",
-      fontWeight: 600,
-      [`@media (max-width: ${oldTheme.breakpoints.m})`]: {
-        fontSize: "1.5rem",
-      },
-    },
-    h3: {
-      fontSize: "1.5rem",
-      marginTop: "2.5rem",
-      fontWeight: 600,
-      [`@media (max-width: ${oldTheme.breakpoints.m})`]: {
-        fontSize: "1.25rem",
-      },
-    },
-    h4: {
-      fontSize: "1.25rem",
-      fontWeight: 500,
-      [`@media (max-width: ${oldTheme.breakpoints.m})`]: {
-        fontSize: "1rem",
-      },
-    },
-    h5: {
-      fontSize: "1rem",
-      fontWeight: 450,
-    },
-    h6: {
-      fontSize: "0.9rem",
-      fontWeight: 400,
-      textTransform: "uppercase",
-    },
-    // Anchor tag styles
-    // Selected specifically for mdx rendered side icon link
-    ".header-anchor": {
-      position: "relative !important",
-      display: "initial",
-      marginLeft: "-1.5em",
-      paddingRight: "0.5rem !important",
-      fontSize: "1rem",
-      verticalAlign: "middle",
+    global: (props) => ({
+        /**
+         * THESE ARE OLD GLOBAL STYLES - carried over from old css files
+         *
+         * They are needed just to keep style consistency as we transition out of
+         * the old styled components to Chakra.
+         *
+         * TODO: remove these overrides as we adopt the new Design System and we
+         * don't need the global styles anymore
+         */
+        body: {
+            // TODO: when we have Chakra v2, this should be done by overriding the
+            // native Chakra semantic tokens
+            bg: mode("white", "gray.700")(props),
+            lineHeight: "1.6rem",
+        },
+        // should be replace with https://chakra-ui.com/docs/components/text
+        p: {
+            margin: "0px 0px 1.45rem",
+        },
+        // should be replace with https://chakra-ui.com/docs/components/list
+        "ul, ol": {
+            margin: "0px 0px 1.45rem 1.45rem",
+            padding: 0,
+        },
 
-      svg: {
-        display: "inline",
-        fill: "primary",
-        visibility: "hidden",
-      },
-    },
-    "h1:hover,h2:hover,h3:hover,h4:hover,h5:hover,h6:hover": {
-      ".header-anchor svg": {
-        visibility: "visible",
-      },
-    },
-    ".header-anchor:focus svg": {
-      visibility: "visible",
-    },
-  }),
+        // imported global CSS styles for list items
+        li: {
+            "margin-bottom": "calc(1.45rem / 2)",
+        },
+        "ol li": {
+            "padding-left": "0",
+        },
+        "ul li": {
+            "padding-left": "0",
+        },
+        "li > ol": {
+            "margin-left": "1.45rem",
+            "margin-bottom": "calc(1.45rem / 2)",
+            "margin-top": "calc(1.45rem / 2)",
+        },
+        "li > ul": {
+            "margin-left": "1.45rem",
+            "margin-bottom": "calc(1.45rem / 2)",
+            "margin-top": "calc(1.45rem / 2)",
+        },
+
+        "li *:last-child": {
+            "margin-bottom": "0",
+        },
+        "p *:last-child": {
+            "margin-bottom": "0",
+        },
+        "li > p": {
+            "margin-bottom": "calc(1.45rem / 2)",
+        },
+        // YouTube embeds
+        iframe: {
+            display: "block",
+            maxWidth: "560px",
+            margin: "32px 0",
+        },
+        // should be replace by the usage of https://chakra-ui.com/docs/components/heading
+        // also, the media queries defined on each of these heading tags are bearly used
+        "h1,h2,h3,h4,h5,h6": {
+            margin: "2rem 0",
+            lineHeight: 1.4,
+            scrollMarginTop: "navHeight",
+            scrollSnapMargin: "navHeight",
+        },
+        h1: {
+            fontSize: "3rem",
+            fontWeight: 700,
+            [`@media (max-width: ${oldTheme.breakpoints.m})`]: {
+                fontSize: "2.5rem",
+            },
+        },
+        h2: {
+            fontSize: "2rem",
+            marginTop: "3rem",
+            fontWeight: 600,
+            [`@media (max-width: ${oldTheme.breakpoints.m})`]: {
+                fontSize: "1.5rem",
+            },
+        },
+        h3: {
+            fontSize: "1.5rem",
+            marginTop: "2.5rem",
+            fontWeight: 600,
+            [`@media (max-width: ${oldTheme.breakpoints.m})`]: {
+                fontSize: "1.25rem",
+            },
+        },
+        h4: {
+            fontSize: "1.25rem",
+            fontWeight: 500,
+            [`@media (max-width: ${oldTheme.breakpoints.m})`]: {
+                fontSize: "1rem",
+            },
+        },
+        h5: {
+            fontSize: "1rem",
+            fontWeight: 450,
+        },
+        h6: {
+            fontSize: "0.9rem",
+            fontWeight: 400,
+            textTransform: "uppercase",
+        },
+        // Anchor tag styles
+        // Selected specifically for mdx rendered side icon link
+        ".header-anchor": {
+            position: "relative !important",
+            display: "initial",
+            marginLeft: "-1.5em",
+            paddingRight: "0.5rem !important",
+            fontSize: "1rem",
+            verticalAlign: "middle",
+
+            svg: {
+                display: "inline",
+                fill: "primary",
+                visibility: "hidden",
+            },
+        },
+        "h1:hover,h2:hover,h3:hover,h4:hover,h5:hover,h6:hover": {
+            ".header-anchor svg": {
+                visibility: "visible",
+            },
+        },
+        ".header-anchor:focus svg": {
+            visibility: "visible",
+        },
+    }),
 }
 
 export default styles

src/assets/feedback-thumbs-up.svg

@@ -1,5 +1,6 @@
 // Library imports
 import React, { ReactNode, useState } from "react"
+import { Icon } from "@chakra-ui/react"
 import styled from "@emotion/styled"
 // Component imports
 import Translation from "./Translation"
@@ -100,14 +101,16 @@ const FeedbackCard: React.FC<IProps> = ({
             <>
               <Button
                 variant="outline-color"
-                leftIcon={<ThumbsUp />}
+                leftIcon={<Icon as={ThumbsUp} w={6} h={6} />}
                 onClick={() => handleSubmit(true)}
               >
                 <Translation id="yes" />
               </Button>
               <Button
                 variant="outline-color"
-                leftIcon={<ThumbsUp className="flip" />}
+                leftIcon={
+                  <Icon as={ThumbsUp} w={6} h={6} transform="scaleY(-1)" />
+                }
                 onClick={() => handleSubmit(false)}
               >
                 <Translation id="no" />

src/components/FeedbackCard.tsx

@@ -113,14 +113,16 @@ User's funds are at risk if:
 - the bridge operators have malicious intent in a trusted bridge
 - the bridge gets hacked
 
-One recent hack was Solana’s Wormhole bridge, [where 120k wETH ($325 million USD) was stolen during the hack](https://rekt.news/wormhole-rekt/).
+One recent hack was Solana’s Wormhole bridge, [where 120k wETH ($325 million USD) was stolen during the hack](https://rekt.news/wormhole-rekt/). Many of the [top hacks in blockchains involved bridges](https://rekt.news/leaderboard/).
 
-Bridges are crucial to onboarding users onto Ethereum L2s, and even for users who want to explore different ecosystems. However, given the risks involved in interacting with bridges, users must understand the trade-offs the bridges are making.
+Bridges are crucial to onboarding users onto Ethereum L2s, and even for users who want to explore different ecosystems. However, given the risks involved in interacting with bridges, users must understand the trade-offs the bridges are making. These are some [strategies for cross-chain security](https://blog.debridge.finance/10-strategies-for-cross-chain-security-8ed5f5879946).
 
 <Divider />
 
 ## Further reading {#further-reading}
-
+- [EIP-5164: Cross-Chain Execution](https://ethereum-magicians.org/t/eip-5164-cross-chain-execution/9658) _June 18, 2022 - Brendan Asselstine_  
+- [L2Bridge Risk Framework](https://gov.l2beat.com/t/l2bridge-risk-framework/31) _July 5, 2022 - Bartek Kiepuszewski_  
+- ["Why the future will be multi-chain, but it will not be cross-chain."](https://old.reddit.com/r/ethereum/comments/rwojtk/ama_we_are_the_efs_research_team_pt_7_07_january/hrngyk8/) _January 8, 2022 - Vitalik Buterin_ 
 - [What Are Blockchain Bridges And How Can We Classify Them?](https://blog.li.finance/what-are-blockchain-bridges-and-how-can-we-classify-them-560dc6ec05fa) _Feb 18, 2021 - Arjun Chand_
 - [What Are Cross-Chain Bridges?](https://www.alchemy.com/overviews/cross-chain-bridges) _May 10, 2022 - Alchemy_
 - [Blockchain Bridges: Building Networks of Cryptonetworks](https://medium.com/1kxnetwork/blockchain-bridges-5db6afac44f8) _Sep 8, 2021 - Dmitriy Berenzon_

src/content/bridges/index.md

@@ -14,7 +14,7 @@ Ethereum research is open and transparent, embodying principles of [Decentralize
 
 ## General research resources {#general-research-resources}
 
-Regardless of the specific topic, there is a wealth of information on Ethereum research to be found at [ethresear.ch](https://ethresear.ch) and the [Eth R&D Discord channel](https://discord.gg/n7JxAeRu). These are the primary places where Ethereum researchers discuss the latest ideas and development opportunities.
+Regardless of the specific topic, there is a wealth of information on Ethereum research to be found at [ethresear.ch](https://ethresear.ch) and the [Eth R&D Discord channel](https://discord.gg/qGpsxSA). These are the primary places where Ethereum researchers discuss the latest ideas and development opportunities.
 
 This report published in May 2022 by [DelphiDigital](https://members.delphidigital.io/reports/the-hitchhikers-guide-to-ethereum) provides a good overview of the Ethereum roadmap.