Merge branch 'ethereum:dev' into gabe-dev

Author: gabrieltemtsen

.all-contributorsrc

@@ -11056,6 +11056,15 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "jimgreen2013",
+      "name": "jimgreen2013",
+      "avatar_url": "https://avatars.githubusercontent.com/u/15890793?v=4",
+      "profile": "https://github.com/jimgreen2013",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -1725,6 +1725,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://t.me/nebolax"><img src="https://avatars.githubusercontent.com/u/63492346?v=4?s=100" width="100px;" alt="Alexey Nebolsin"/><br /><sub><b>Alexey Nebolsin</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=nebolax" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jimgreen2013"><img src="https://avatars.githubusercontent.com/u/15890793?v=4?s=100" width="100px;" alt="jimgreen2013"/><br /><sub><b>jimgreen2013</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=jimgreen2013" title="Documentation">📖</a></td>
     </tr>
   </tbody>
 </table>

public/content/developers/docs/scaling/sidechains/index.md

@@ -51,7 +51,7 @@ While bridges help users move funds between Ethereum and the sidechain, the asse
 
 | Pros                                                                                                                        | Cons                                                                                                             |
 | --------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------- |
-| The technology underpinning sidechains is well-established and benefits from extensive research and improvements in design. | Sidechains trade off some measure of decentralization and trustlesness for scalability.                          |
+| The technology underpinning sidechains is well-established and benefits from extensive research and improvements in design. | Sidechains trade off some measure of decentralization and trustlessness for scalability.                          |
 | Sidechains support general computation and offer EVM compatibility (they can run Ethereum-native dapps).                    | A sidechain uses a separate consensus mechanism and doesn't benefit from Ethereum's security guarantees.         |
 | Sidechains use different consensus models to efficiently process transactions and lower transaction fees for users.         | Sidechains require higher trust assumptions (e.g., a quorum of malicious sidechain validators can commit fraud). |
 | EVM-compatible sidechains allow dapps to expand their ecosystem.                                                            |                                                                                                                  |

public/content/governance/index.md

@@ -121,7 +121,7 @@ Forks are when major technical upgrades or changes need to be made to the networ
 
 The DAO fork was in response to the [2016 DAO attack](https://www.coindesk.com/understanding-dao-hack-journalists) where an insecure [DAO](/glossary/#dao) contract was drained of over 3.6 million ETH in a hack. The fork moved the funds from the faulty contract to a new contract allowing anyone who lost funds in the hack to recover them.
 
-This course of action was voted on by the Ethereum community. Any ETH holder was able to vote via a transaction on [a voting platform](http://v1.carbonvote.com/). The decision to fork reached over 85% of the votes.
+This course of action was voted on by the Ethereum community. Any ETH holder was able to vote via a transaction on [a voting platform](https://web.archive.org/web/20170620030820/http://v1.carbonvote.com/). The decision to fork reached over 85% of the votes.
 
 It's important to note that whilst the protocol did fork to revert the hack, the weight the vote carried in deciding to fork is debatable for a few reasons:
 

public/content/roadmap/pbs/index.md

@@ -20,7 +20,7 @@ For example, inclusion lists can be introduced so that when validators know abou
 
 <ExpandableCard title="What kinds of censorship does PBS solve?" eventCategory="/roadmap/pbs" eventName="clicked what kinds of censorship does PBS solve?">
 
-Powerful organizations can pressure validators to censor transactions to or from certain addresses. Validators comply with this pressure by detecting blacklisted addresses in their transaction pool and omitting them from the blocks the propose. After PBS this will no longer be possible because block proposers will not know which transactions they are broadcasting in their blocks. It might be important for certain individuals or apps to comply with censorship rules, for example when it is made law in their region. In these cases, compliance happens at the application level, while the protocol remains permissionless and censorship free.
+Powerful organizations can pressure validators to censor transactions to or from certain addresses. Validators comply with this pressure by detecting blacklisted addresses in their transaction pool and omitting them from the blocks they propose. After PBS this will no longer be possible because block proposers will not know which transactions they are broadcasting in their blocks. It might be important for certain individuals or apps to comply with censorship rules, for example when it is made law in their region. In these cases, compliance happens at the application level, while the protocol remains permissionless and censorship free.
 
 </ExpandableCard>
 

public/wallets/aurox.png

@@ -349,6 +349,15 @@ const communityConferences: CommunityConference[] = [
     location: "Lagos, NGA",
     description: "This conference will bring together Web3 enthusiasts from all over Nigeria and beyond. Here, community meets technology for three days of intensive Networking and Learning experiences.",
   },
+  {
+    title: "ETHSafari",
+    startDate: "2024-09-09",
+    endDate: "2024-09-15",
+    to: "https://ethsafari.xyz/",
+    location: "Nairobi & Kilifi, Kenya",
+    description:
+      "Welcome to the largest Ethereum event happening in Africa! Join the BlockTrain from Nairobi to celebrate an ETH-festival held underneath ancient Boabab trees in Kilifi.",
+  },
   {
     title: "TOKEN2049",
     startDate: "2024-09-18",

src/data/community-events.ts

@@ -7,6 +7,7 @@ import AlphaWalletImage from "@/public/wallets/alpha.png"
 import AmbireImage from "@/public/wallets/ambire.png"
 import ApexImage from "@/public/wallets/apex.png"
 import ArgentImage from "@/public/wallets/argent.png"
+import AuroxImage from "@/public/wallets/aurox.png"
 import BitcoindotcomImage from "@/public/wallets/bitcoindotcom.png"
 import BitkeepImage from "@/public/wallets/bitkeep.png"
 import BlockWalletImage from "@/public/wallets/blockwallet.png"
@@ -2712,6 +2713,54 @@ const walletData: WalletData[] = [
     documentation:
       "https://docs.xdefi.io/xdefi-wallet-v2-draft/technical-docs/extension-integration",
   },
+  {
+    last_updated: "2023-10-30",
+    name: "Aurox Wallet",
+    image: AuroxImage,
+    brand_color: "#1F47FF",
+    url: "https://getaurox.com/wallet",
+    wallet_live_date: "2022-12-06",
+    active_development_team: true,
+    languages_supported: ["en"],
+    twitter: "https://twitter.com/getaurox",
+    discord: "https://aurox.app/discord",
+    reddit: "",
+    telegram: "",
+    ios: false,
+    android: false,
+    linux: false,
+    windows: false,
+    macOS: false,
+    firefox: false,
+    chromium: true,
+    hardware: false,
+    open_source: true,
+    repo_url: "https://github.com/GetAurox/Aurox-Wallet",
+    non_custodial: true,
+    security_audit: ["https://skynet.certik.com/projects/aurox"],
+    scam_protection: true,
+    hardware_support: true,
+    walletconnect: false,
+    rpc_importing: true,
+    nft_support: true,
+    connect_to_dapps: true,
+    staking: false,
+    swaps: true,
+    multichain: true,
+    layer_2: true,
+    gas_fee_customization: true,
+    ens_support: true,
+    erc_20_support: true,
+    eip_1559_support: true,
+    buy_crypto: false,
+    withdraw_crypto: false,
+    multisig: false,
+    social_recovery: false,
+    onboard_documentation:
+      "https://docs.getaurox.com/product-docs/aurox-ecosystem/what-is-the-aurox-ecosystem",
+    documentation:
+      "https://docs.getaurox.com/product-docs/aurox-ecosystem/what-is-the-aurox-ecosystem",
+  },
 ]
 
 export default walletData

src/data/wallets/wallet-data.ts

@@ -59,10 +59,13 @@ export type Layout = keyof LayoutMappingType
 
 export type Lang =
   | "en"
+  | "am"
   | "ar"
   | "az"
+  | "be"
   | "bg"
   | "bn"
+  | "bs"
   | "ca"
   | "cs"
   | "da"
@@ -71,27 +74,31 @@ export type Lang =
   | "es"
   | "fa"
   | "fi"
+  | "fil"
   | "fr"
   | "gl"
   | "gu"
   | "he"
   | "hi"
   | "hr"
   | "hu"
+  | "hy-am"
   | "id"
   | "ig"
   | "it"
   | "ja"
   | "ka"
   | "kk"
   | "km"
+  | "kn"
   | "ko"
   | "lt"
   | "ml"
   | "mr"
   | "ms"
-  | "nl"
   | "nb"
+  | "ne-np"
+  | "nl"
   | "pcm"
   | "ph"
   | "pl"
@@ -106,6 +113,7 @@ export type Lang =
   | "sw"
   | "ta"
   | "th"
+  | "tk"
   | "tr"
   | "uk"
   | "ur"