Skip to content

Commit

Permalink
Merge branch 'dev' into pr/aguzmant103/13991
Browse files Browse the repository at this point in the history
  • Loading branch information
corwintines committed Oct 4, 2024
2 parents 363a131 + d106746 commit 51ae283
Show file tree
Hide file tree
Showing 68 changed files with 910 additions and 774 deletions.
18 changes: 18 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -12497,6 +12497,24 @@
"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"
]
}
],
"contributorsPerLine": 7,
Expand Down
13 changes: 12 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -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."
}
]
}
]
}
}
1 change: 1 addition & 0 deletions .storybook/i18next.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import i18n, { Resource } from "i18next"
// eslint-disable-next-line no-restricted-imports
import { initReactI18next } from "react-i18next"

export const baseLocales = {
Expand Down
1 change: 1 addition & 0 deletions .storybook/utils.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// eslint-disable-next-line no-restricted-imports
import { getI18n } from "react-i18next"

import { ns as exposedNs } from "./i18next"
Expand Down
71 changes: 71 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1910,6 +1910,8 @@ 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>
</tr>
</tbody>
</table>
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ethereum-org-website",
"version": "9.0.0",
"version": "9.0.1",
"license": "MIT",
"private": true,
"scripts": {
Expand Down Expand Up @@ -39,13 +39,15 @@
"@radix-ui/react-checkbox": "^1.1.1",
"@radix-ui/react-compose-refs": "^1.1.0",
"@radix-ui/react-dialog": "^1.1.1",
"@radix-ui/react-dropdown-menu": "^2.1.1",
"@radix-ui/react-navigation-menu": "^1.2.0",
"@radix-ui/react-popover": "^1.1.1",
"@radix-ui/react-portal": "^1.1.1",
"@radix-ui/react-progress": "^1.1.0",
"@radix-ui/react-radio-group": "^1.2.0",
"@radix-ui/react-slot": "^1.1.0",
"@radix-ui/react-switch": "^1.1.0",
"@radix-ui/react-tabs": "^1.1.0",
"@radix-ui/react-tooltip": "^1.1.2",
"@radix-ui/react-visually-hidden": "^1.1.0",
"@socialgouv/matomo-next": "^1.8.0",
Expand Down
6 changes: 0 additions & 6 deletions public/content/developers/docs/ides/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
4 changes: 2 additions & 2 deletions public/content/developers/docs/nodes-and-clients/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -194,13 +194,13 @@ Learn more about it by reading its [documentation](https://github.com/ethereumjs
There are multiple consensus clients (previously known as 'Eth2' clients) to support the [consensus upgrades](/roadmap/beacon-chain/). They are responsible for all consensus-related logic including the fork-choice algorithm, processing attestations and managing [proof-of-stake](/developers/docs/consensus-mechanisms/pos) rewards and penalties.

| Client | Language | Operating systems | Networks |
| ------------------------------------------------------------- | ---------- | --------------------- | ----------------------------------------------------------------- | |
| ------------------------------------------------------------- | ---------- | --------------------- | ----------------------------------------------------------------- |
| [Lighthouse](https://lighthouse.sigmaprime.io/) | Rust | Linux, Windows, macOS | Beacon Chain, Goerli, Pyrmont, Sepolia, Ropsten, and more |
| [Lodestar](https://lodestar.chainsafe.io/) | TypeScript | Linux, Windows, macOS | Beacon Chain, Goerli, Sepolia, Ropsten, and more |
| [Nimbus](https://nimbus.team/) | Nim | Linux, Windows, macOS | Beacon Chain, Goerli, Sepolia, Ropsten, and more |
| [Prysm](https://docs.prylabs.network/docs/getting-started/) | Go | Linux, Windows, macOS | Beacon Chain, Gnosis, Goerli, Pyrmont, Sepolia, Ropsten, and more |
| [Teku](https://consensys.net/knowledge-base/ethereum-2/teku/) | Java | Linux, Windows, macOS | Beacon Chain, Gnosis, Goerli, Sepolia, Ropsten, and more |
| [Grandine](https://docs.grandine.io/) (beta) | Rust | Linux, Windows, macOS | Beacon Chain, Goerli, Sepolia, and more
| [Grandine](https://docs.grandine.io/) (beta) | Rust | Linux, Windows, macOS | Beacon Chain, Goerli, Sepolia, and more |

### Lighthouse {#lighthouse}

Expand Down
4 changes: 0 additions & 4 deletions public/content/translations/ca/roadmap/beacon-chain/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,3 @@ Les cadenes de fragments només poden entrar de forma segura a l'ecosistema Ethe
</ButtonLink>

<Divider />

## Interactuar amb la cadena de balisa {#interact-with-beacon-chain}

<BeaconChainActions />
4 changes: 0 additions & 4 deletions public/content/translations/nl/roadmap/beacon-chain/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,3 @@ Shardketens kunnen alleen op een veilige manier in het Ethereum-netwerk komen al
</ButtonLink>

<Divider />

## Heb interactie met de Beacon Chain {#interact-with-beacon-chain}

<BeaconChainActions />
4 changes: 0 additions & 4 deletions public/content/translations/sw/roadmap/beacon-chain/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,3 @@ Minyororo ya Vigae itakua salama kuingia katika ikolojia ya Ethereum pale tu uta
</ButtonLink>

<Divider />

## Ingiliana na Mnyororo Kioleza {#interact-with-beacon-chain}

<BeaconChainActions />
Binary file removed public/images/dapps/augur.png
Binary file not shown.
24 changes: 9 additions & 15 deletions src/components/AssetDownload/AssetDownloadArtist.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import { useTranslation } from "next-i18next"
import { Flex } from "@chakra-ui/react"

import Emoji from "@/components/Emoji"
import Link from "@/components/Link"
import Text from "@/components/OldText"

import { cn } from "@/lib/utils/cn"

import { Flex } from "../ui/flex"
import { BaseLink } from "../ui/Link"

type AssetDownloadArtistProps = {
artistName: string
Expand All @@ -16,21 +18,13 @@ const AssetDownloadArtist = ({
}: AssetDownloadArtistProps) => {
const { t } = useTranslation("page-assets")
return (
<Flex
mb="4"
border="1px"
borderTop="none"
borderColor="white700"
py="2"
px="4"
borderRadius="0 0 4px 4px"
>
<Flex me="2" fontSize="md" textColor="text300">
<Flex className={cn("mb-4 border border-t-0", "rounded-b px-4 py-2")}>
<Flex className="me-2">
<Emoji text=":artist_palette:" className="me-2 text-2xl" />
{t("page-assets-download-artist")}
</Flex>
{artistUrl && <Link href={artistUrl}>{artistName}</Link>}
{!artistUrl && <Text m="0">{artistName}</Text>}
{artistUrl && <BaseLink href={artistUrl}>{artistName}</BaseLink>}
{!artistUrl && <p>{artistName}</p>}
</Flex>
)
}
Expand Down
9 changes: 5 additions & 4 deletions src/components/AssetDownload/AssetDownloadImage.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import { Center } from "@chakra-ui/react"
import { ImageProps } from "next/image"

import { Image, type ImageProps } from "@/components/Image"
import { TwImage } from "../Image"
import { Center } from "../ui/flex"

interface AssetDownloadImageProps {
image: ImageProps["src"]
alt: string
}

const AssetDownloadImage = ({ image, alt }: AssetDownloadImageProps) => (
<Center border="1px" borderColor="white700" p="8" w="full">
<Image src={image} alt={alt} w="full" alignSelf="center" />
<Center className="w-full border p-8">
<TwImage src={image} alt={alt} className="w-full self-center" />
</Center>
)

Expand Down
33 changes: 15 additions & 18 deletions src/components/AssetDownload/index.tsx
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
import { extname } from "path"

import type { StaticImageData } from "next/image"
import { BaseHTMLAttributes } from "react"
import type { ImageProps, StaticImageData } from "next/image"
import { useTranslation } from "next-i18next"
import { Box, Flex, type FlexProps } from "@chakra-ui/react"

import AssetDownloadArtist from "@/components/AssetDownload/AssetDownloadArtist"
import AssetDownloadImage from "@/components/AssetDownload/AssetDownloadImage"
import { ButtonLink } from "@/components/Buttons"
import type { ImageProps } from "@/components/Image"
import OldHeading from "@/components/OldHeading"

import { cn } from "@/lib/utils/cn"
import { trackCustomEvent } from "@/lib/utils/matomo"

import { ButtonLink } from "../ui/buttons/Button"
import { Flex, Stack } from "../ui/flex"

type AssetDownloadProps = {
title: string
alt: string
artistName?: string
artistUrl?: string
image: ImageProps["src"]
svgUrl?: string
} & FlexProps
} & BaseHTMLAttributes<HTMLDivElement>

const AssetDownload = ({
alt,
Expand All @@ -28,6 +29,7 @@ const AssetDownload = ({
image,
svgUrl,
title,
className,
...props
}: AssetDownloadProps) => {
const { t } = useTranslation(["page-assets"])
Expand All @@ -41,23 +43,18 @@ const AssetDownload = ({
const imgSrc = (image as StaticImageData).src

return (
<Flex
flexDirection="column"
justifyContent="space-between"
m={4}
p={0}
<Stack
className={cn("m-4 justify-between gap-0 p-0", className)}
{...props}
>
<OldHeading as="h4" fontSize={{ base: "md", md: "xl" }} fontWeight="500">
{title}
</OldHeading>
<Box>
<h4 className="my-8 text-md font-medium md:text-xl">{title}</h4>
<div>
<AssetDownloadImage image={image} alt={alt} />
{artistName && (
<AssetDownloadArtist artistName={artistName} artistUrl={artistUrl} />
)}
</Box>
<Flex gap={5} mt={4}>
</div>
<Flex className="mt-4 gap-5">
<ButtonLink
href={imgSrc}
onClick={matomoHandler}
Expand All @@ -73,7 +70,7 @@ const AssetDownload = ({
</ButtonLink>
)}
</Flex>
</Flex>
</Stack>
)
}

Expand Down
6 changes: 3 additions & 3 deletions src/components/Banners/BugBountyBanner/index.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
// Libraries
import React from "react"
import { Center, Text } from "@chakra-ui/react"

// Components
import BannerNotification from "@/components/Banners/BannerNotification"
import { Center } from "@/components/ui/flex"

const BugBountyBanner = () => (
<BannerNotification shouldShow>
<Center>
<Text m={0} p={0}>
<p>
All Dencun-related bounties currently receive a 2x bonus multiplier (up
to 500,000 USD) up to two weeks before the scheduled mainnet hardfork.
</Text>
</p>
</Center>
</BannerNotification>
)
Expand Down
Loading

0 comments on commit 51ae283

Please sign in to comment.