Skip to content

Commit dd3d75d

Browse files
committed
Merge branch 'dev' into Accordion
2 parents 377d3eb + 1cfc6c3 commit dd3d75d

File tree

113 files changed

+3599
-2523
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+3599
-2523
lines changed

.all-contributorsrc

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8224,7 +8224,8 @@
82248224
"avatar_url": "https://avatars.githubusercontent.com/u/32320988?v=4",
82258225
"profile": "https://crowdin.com/profile/hiroyukinaito",
82268226
"contributions": [
8227-
"doc"
8227+
"doc",
8228+
"maintenance"
82288229
]
82298230
},
82308231
{
@@ -11774,6 +11775,51 @@
1177411775
"content",
1177511776
"bug"
1177611777
]
11778+
},
11779+
{
11780+
"login": "JeffreyJoel",
11781+
"name": "Jeffrey Owoloko",
11782+
"avatar_url": "https://avatars.githubusercontent.com/u/72028836?v=4",
11783+
"profile": "https://github.com/JeffreyJoel",
11784+
"contributions": [
11785+
"maintenance"
11786+
]
11787+
},
11788+
{
11789+
"login": "colmck",
11790+
"name": "Colin McKerracher",
11791+
"avatar_url": "https://avatars.githubusercontent.com/u/73862596?v=4",
11792+
"profile": "https://github.com/colmck",
11793+
"contributions": [
11794+
"maintenance"
11795+
]
11796+
},
11797+
{
11798+
"login": "writegr",
11799+
"name": "writegr",
11800+
"avatar_url": "https://avatars.githubusercontent.com/u/167099595?v=4",
11801+
"profile": "https://github.com/writegr",
11802+
"contributions": [
11803+
"bug"
11804+
]
11805+
},
11806+
{
11807+
"login": "richardgreg",
11808+
"name": "Cardo",
11809+
"avatar_url": "https://avatars.githubusercontent.com/u/35255909?v=4",
11810+
"profile": "https://github.com/richardgreg",
11811+
"contributions": [
11812+
"maintenance"
11813+
]
11814+
},
11815+
{
11816+
"login": "shravanandoria",
11817+
"name": "shravanandoria",
11818+
"avatar_url": "https://avatars.githubusercontent.com/u/36509067?v=4",
11819+
"profile": "https://www.linkedin.com/in/shravan-andoria/",
11820+
"contributions": [
11821+
"maintenance"
11822+
]
1177711823
}
1177811824
],
1177911825
"contributorsPerLine": 7,

.storybook/preview-head.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<style type="text/css">
2+
3+
:root {
4+
--font-inter: 'Inter', sans-serif;
5+
}
6+
7+
</style>
8+
9+
<link rel="preload" href="/fonts/inter/latin.woff2" as="font" type="font/woff2" crossorigin="anonymous" />

.storybook/preview.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import theme from "../src/@chakra-ui/theme"
55

66
import i18n, { baseLocales } from "./i18next"
77

8+
import "../src/styles/global.css"
9+
810
const extendedTheme = extendBaseTheme(theme)
911

1012
const chakraBreakpointArray = Object.entries(extendedTheme.breakpoints)

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1306,7 +1306,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
13061306
<td align="center" valign="top" width="14.28%"><a href="https://github.com/vorot93"><img src="https://avatars.githubusercontent.com/u/240364?v=4?s=100" width="100px;" alt="Artem Vorotnikov"/><br /><sub><b>Artem Vorotnikov</b></sub></a><br /><a href="#content-vorot93" title="Content">🖋</a> <a href="#projectManagement-vorot93" title="Project Management">📆</a> <a href="#question-vorot93" title="Answering Questions">💬</a></td>
13071307
<td align="center" valign="top" width="14.28%"><a href="https://github.com/liam0215"><img src="https://avatars.githubusercontent.com/u/8989334?v=4?s=100" width="100px;" alt="Liam Arzola"/><br /><sub><b>Liam Arzola</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aliam0215" title="Bug reports">🐛</a></td>
13081308
<td align="center" valign="top" width="14.28%"><a href="https://github.com/srt180"><img src="https://avatars.githubusercontent.com/u/30768686?v=4?s=100" width="100px;" alt="shao"/><br /><sub><b>shao</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=srt180" title="Documentation">📖</a> <a href="#translation-srt180" title="Translation">🌍</a></td>
1309-
<td align="center" valign="top" width="14.28%"><a href="https://crowdin.com/profile/hiroyukinaito"><img src="https://avatars.githubusercontent.com/u/32320988?v=4?s=100" width="100px;" alt="Hiroyuki Naito"/><br /><sub><b>Hiroyuki Naito</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=HiroyukiNaito" title="Documentation">📖</a></td>
1309+
<td align="center" valign="top" width="14.28%"><a href="https://crowdin.com/profile/hiroyukinaito"><img src="https://avatars.githubusercontent.com/u/32320988?v=4?s=100" width="100px;" alt="Hiroyuki Naito"/><br /><sub><b>Hiroyuki Naito</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=HiroyukiNaito" title="Documentation">📖</a> <a href="#maintenance-HiroyukiNaito" title="Maintenance">🚧</a></td>
13101310
<td align="center" valign="top" width="14.28%"><a href="https://github.com/AlehNat"><img src="https://avatars.githubusercontent.com/u/3587775?v=4?s=100" width="100px;" alt="AlehN"/><br /><sub><b>AlehN</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=AlehNat" title="Documentation">📖</a></td>
13111311
</tr>
13121312
<tr>
@@ -1807,6 +1807,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
18071807
<tr>
18081808
<td align="center" valign="top" width="14.28%"><a href="http://croath.com"><img src="https://avatars.githubusercontent.com/u/1398729?v=4?s=100" width="100px;" alt="Croath Liu"/><br /><sub><b>Croath Liu</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=croath" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=croath" title="Code">💻</a></td>
18091809
<td align="center" valign="top" width="14.28%"><a href="https://github.com/HayattiQ"><img src="https://avatars.githubusercontent.com/u/5105841?v=4?s=100" width="100px;" alt="Hayatti"/><br /><sub><b>Hayatti</b></sub></a><br /><a href="#content-HayattiQ" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AHayattiQ" title="Bug reports">🐛</a></td>
1810+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/JeffreyJoel"><img src="https://avatars.githubusercontent.com/u/72028836?v=4?s=100" width="100px;" alt="Jeffrey Owoloko"/><br /><sub><b>Jeffrey Owoloko</b></sub></a><br /><a href="#maintenance-JeffreyJoel" title="Maintenance">🚧</a></td>
1811+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/colmck"><img src="https://avatars.githubusercontent.com/u/73862596?v=4?s=100" width="100px;" alt="Colin McKerracher"/><br /><sub><b>Colin McKerracher</b></sub></a><br /><a href="#maintenance-colmck" title="Maintenance">🚧</a></td>
1812+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/writegr"><img src="https://avatars.githubusercontent.com/u/167099595?v=4?s=100" width="100px;" alt="writegr"/><br /><sub><b>writegr</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Awritegr" title="Bug reports">🐛</a></td>
1813+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/richardgreg"><img src="https://avatars.githubusercontent.com/u/35255909?v=4?s=100" width="100px;" alt="Cardo"/><br /><sub><b>Cardo</b></sub></a><br /><a href="#maintenance-richardgreg" title="Maintenance">🚧</a></td>
1814+
<td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/shravan-andoria/"><img src="https://avatars.githubusercontent.com/u/36509067?v=4?s=100" width="100px;" alt="shravanandoria"/><br /><sub><b>shravanandoria</b></sub></a><br /><a href="#maintenance-shravanandoria" title="Maintenance">🚧</a></td>
18101815
</tr>
18111816
</tbody>
18121817
</table>

SECURITY.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Security Policy
2+
3+
## Supported Versions
4+
5+
Generally only the latest version of this software is in production, and risks are more related to the potential for users to be directed to scams.
6+
7+
## Reporting a Vulnerability
8+
9+
It is recommended that any potential critical vulnerabilities be reported through the [email protected] email address using the PGP outlined in https://ethereum.org/.well-known/security.txt

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ Start by reading about the ethereum.org mission and values in our [code of condu
1313
## Developers <Emoji text=":computer:" size={1} />‍ {#developers}
1414

1515
- Learn about and try Ethereum at [ethereum.org/developers/](/developers/)
16-
- [Find a bounty on Gitcoin](https://gitcoin.co/), work on a small or large technical issue, earn crypto!
1716
- Attend an [ETHGlobal](http://ethglobal.co/) hackathon near you!
1817
- Check out [projects related to your area of expertise or programming language of choice](/developers/docs/programming-languages/)
1918
- Watch or participate in the [Core Dev calls](https://www.youtube.com/@EthereumProtocol)

public/content/contributing/adding-wallets/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ We want to make sure we show a variety of wallets covering the feature-rich land
1010

1111
Anyone is free to suggest adding a wallet on ethereum.org. If there's a wallet that we have missed, please suggest it!
1212

13-
Anyone is free to suggest a new wallet. Wallets are currently listed on:
13+
Wallets are currently listed on:
1414

1515
- [ethereum.org/wallets/find-wallet/](/wallets/find-wallet/)
1616
- [ethereum.org/wallets/](/wallets/)

public/content/contributing/translation-program/translatathon/index.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ We invite you to join us in breaking down language barriers and making ethereum.
1818

1919
### When {#when}
2020

21-
- Application period: August 1st - August 15th
22-
- Translation period: August 16th - August 23rd
23-
- Evaluation & QA period: August 23rd - August 30th
24-
- Results announcement: August 31st
21+
- Application period: August 1st - August 15th, 2023
22+
- Translation period: August 16th - August 23rd, 2023
23+
- Evaluation & QA period: August 23rd - August 30th, 2023
24+
- Results announcement: August 31st, 2023
2525

2626
### Where {#where}
2727

@@ -35,7 +35,7 @@ Office hours, workshops, team formation and FAQ sessions will be hosted on the [
3535

3636
#### Application period {#applications}
3737

38-
The application period will be open from **August 1st** to **August 15th**
38+
The application period will be open from **August 1st** to **August 15th** 2023.
3939

4040
All participants in the Translatathon are required to apply in order to participate and compete for prizes.
4141

public/content/developers/docs/apis/backend/index.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,14 @@ These libraries abstract away much of the complexity of interacting directly wit
175175
- [Documentation](https://docs.watchdata.io/)
176176
- [Discord](https://discord.com/invite/TZRJbZ6bdn)
177177

178+
**Covalent -** **_Enriched blockchain APIs for 200+ Chains._**
179+
180+
- [covalenthq.com](https://www.covalenthq.com/)
181+
- [Documentation](https://www.covalenthq.com/docs/api/)
182+
- [GitHub](https://github.com/covalenthq)
183+
- [Discord](https://www.covalenthq.com/discord/)
184+
185+
178186
## Further reading {#further-reading}
179187

180188
_Know of a community resource that helped you? Edit this page and add it!_

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Validators have to stake ETH so that they have something to lose if they misbeha
7474

7575
## How are validators selected? {#how-are-validators-selected}
7676

77-
A single validator is pseudo-randomly chosen to propose a block in each slot using an algorithm called RANDAO that mixes a hash from the block proposer with a seed that gets updated every block. This value is used to select a specific validator from the total validator set. The validator selection is fixed four epochs in advance.
77+
A single validator is pseudo-randomly chosen to propose a block in each slot using an algorithm called RANDAO that mixes a hash from the block proposer with a seed that gets updated every block. This value is used to select a specific validator from the total validator set. The validator selection is fixed two epochs in advance.
7878

7979
[More on validator selection](/developers/docs/consensus-mechanisms/pos/block-proposal)
8080

0 commit comments

Comments
 (0)