Skip to content

Commit 1de33f1

Browse files
authored
Merge branch 'dev' into ethbratislava
2 parents 2dd6723 + 4bf0144 commit 1de33f1

File tree

182 files changed

+1198
-1405
lines changed

Some content is hidden

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

182 files changed

+1198
-1405
lines changed

.all-contributorsrc

Lines changed: 123 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11325,14 +11325,130 @@
1132511325
]
1132611326
},
1132711327
{
11328-
"login": "repo",
11329-
"name": "repo",
11330-
"avatar_url": "https://avatars.githubusercontent.com/u/45478?v=4",
11331-
"profile": "https://github.com/repo",
11328+
"login": "doutv",
11329+
"name": "Jason Huang",
11330+
"avatar_url": "https://avatars.githubusercontent.com/u/20609724?v=4",
11331+
"profile": "http://huangyongjin.com",
1133211332
"contributions": [
11333-
"doc",
11334-
"blog",
11335-
"translation"
11333+
"bug"
11334+
]
11335+
},
11336+
{
11337+
"login": "adeolu98",
11338+
"name": "dCRYPT",
11339+
"avatar_url": "https://avatars.githubusercontent.com/u/39372980?v=4",
11340+
"profile": "https://github.com/adeolu98",
11341+
"contributions": [
11342+
"bug"
11343+
]
11344+
},
11345+
{
11346+
"login": "sourabupadhya123",
11347+
"name": "Sourab",
11348+
"avatar_url": "https://avatars.githubusercontent.com/u/64914231?v=4",
11349+
"profile": "https://github.com/sourabupadhya123",
11350+
"contributions": [
11351+
"security"
11352+
]
11353+
},
11354+
{
11355+
"login": "ykaravas",
11356+
"name": "ykaravas",
11357+
"avatar_url": "https://avatars.githubusercontent.com/u/6537956?v=4",
11358+
"profile": "https://github.com/ykaravas",
11359+
"contributions": [
11360+
"bug"
11361+
]
11362+
},
11363+
{
11364+
"login": "allwin199",
11365+
"name": "Prince Allwin",
11366+
"avatar_url": "https://avatars.githubusercontent.com/u/127643894?v=4",
11367+
"profile": "https://allwin-portfolio.vercel.app/",
11368+
"contributions": [
11369+
"content"
11370+
]
11371+
},
11372+
{
11373+
"login": "ryanpwaldon",
11374+
"name": "Ryan Waldon",
11375+
"avatar_url": "https://avatars.githubusercontent.com/u/12480362?v=4",
11376+
"profile": "https://github.com/ryanpwaldon",
11377+
"contributions": [
11378+
"content",
11379+
"code"
11380+
]
11381+
},
11382+
{
11383+
"login": "4everlandorg",
11384+
"name": "4EVERLAND",
11385+
"avatar_url": "https://avatars.githubusercontent.com/u/89854839?v=4",
11386+
"profile": "https://www.4everland.org",
11387+
"contributions": [
11388+
"tool"
11389+
]
11390+
},
11391+
{
11392+
"login": "iepn",
11393+
"name": "iepn",
11394+
"avatar_url": "https://avatars.githubusercontent.com/u/57232813?v=4",
11395+
"profile": "https://member.acm.org/~rhymeq",
11396+
"contributions": [
11397+
"code"
11398+
]
11399+
},
11400+
{
11401+
"login": "veridelisi",
11402+
"name": "veridelisi",
11403+
"avatar_url": "https://avatars.githubusercontent.com/u/72710290?v=4",
11404+
"profile": "https://www.ispanyol.com",
11405+
"contributions": [
11406+
"tutorial"
11407+
]
11408+
},
11409+
{
11410+
"login": "reetbatra",
11411+
"name": "Reet Batra",
11412+
"avatar_url": "https://avatars.githubusercontent.com/u/51335174?v=4",
11413+
"profile": "https://github.com/reetbatra",
11414+
"contributions": [
11415+
"bug"
11416+
]
11417+
},
11418+
{
11419+
"login": "gndelia",
11420+
"name": "Gonzalo D'Elia",
11421+
"avatar_url": "https://avatars.githubusercontent.com/u/352474?v=4",
11422+
"profile": "https://github.com/gndelia",
11423+
"contributions": [
11424+
"bug"
11425+
]
11426+
},
11427+
{
11428+
"login": "rileyannon",
11429+
"name": "Riley Annon",
11430+
"avatar_url": "https://avatars.githubusercontent.com/u/31807653?v=4",
11431+
"profile": "http://www.rileyannon.com",
11432+
"contributions": [
11433+
"bug"
11434+
]
11435+
},
11436+
{
11437+
"login": "ayofimihan",
11438+
"name": "Ogunsina Champion",
11439+
"avatar_url": "https://avatars.githubusercontent.com/u/31336254?v=4",
11440+
"profile": "http://0x13.dev",
11441+
"contributions": [
11442+
"bug"
11443+
]
11444+
},
11445+
{
11446+
"login": "ardislu",
11447+
"name": "Ardis Lu",
11448+
"avatar_url": "https://avatars.githubusercontent.com/u/29699850?v=4",
11449+
"profile": "http://ardislu.dev",
11450+
"contributions": [
11451+
"doc"
1133611452
]
1133711453
}
1133811454
],

.github/workflows/get-crowdin-contributors.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,5 @@ jobs:
5959
6060
- name: Create Pull Request
6161
run: |
62-
gh auth login --with-token <<< ${{ secrets.GITHUB_TOKEN }}
62+
gh auth login --with-token ${{ secrets.GITHUB_TOKEN }}
6363
gh pr create --base dev --head "automated-update-${{ env.TIMESTAMP }}" --title "Update translation contributors from Crowdin - ${{ env.READABLE_DATE }}" --body-file pr_body.txt

.github/workflows/get-translation-progress.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,5 @@ jobs:
6060
6161
- name: Create Pull Request
6262
run: |
63-
gh auth login --with-token <<< ${{ secrets.GITHUB_TOKEN }}
63+
gh auth login --with-token ${{ secrets.GITHUB_TOKEN }}
6464
gh pr create --base dev --head "automated-update-${{ env.TIMESTAMP }}" --title "Update translation progress from Crowdin - ${{ env.READABLE_DATE }}" --body-file pr_body.txt

README.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1762,7 +1762,24 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
17621762
<tr>
17631763
<td align="center" valign="top" width="14.28%"><a href="https://github.com/UNOFFICIALbgd"><img src="https://avatars.githubusercontent.com/u/71248977?v=4?s=100" width="100px;" alt="UNOFFICIALbgd"/><br /><sub><b>UNOFFICIALbgd</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AUNOFFICIALbgd" title="Bug reports">🐛</a></td>
17641764
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Codex-Bugmenot"><img src="https://avatars.githubusercontent.com/u/59927099?v=4?s=100" width="100px;" alt="Codex-Bugmenot"/><br /><sub><b>Codex-Bugmenot</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3ACodex-Bugmenot" title="Bug reports">🐛</a></td>
1765-
<td align="center" valign="top" width="14.28%"><a href="https://github.com/repo"><img src="https://avatars.githubusercontent.com/u/45478?v=4?s=100" width="100px;" alt="repo"/><br /><sub><b>repo</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=repo" title="Documentation">📖</a> <a href="#blog-repo" title="Blogposts">📝</a> <a href="#translation-repo" title="Translation">🌍</a></td>
1765+
<td align="center" valign="top" width="14.28%"><a href="http://huangyongjin.com"><img src="https://avatars.githubusercontent.com/u/20609724?v=4?s=100" width="100px;" alt="Jason Huang"/><br /><sub><b>Jason Huang</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Adoutv" title="Bug reports">🐛</a></td>
1766+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/adeolu98"><img src="https://avatars.githubusercontent.com/u/39372980?v=4?s=100" width="100px;" alt="dCRYPT"/><br /><sub><b>dCRYPT</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aadeolu98" title="Bug reports">🐛</a></td>
1767+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/sourabupadhya123"><img src="https://avatars.githubusercontent.com/u/64914231?v=4?s=100" width="100px;" alt="Sourab"/><br /><sub><b>Sourab</b></sub></a><br /><a href="#security-sourabupadhya123" title="Security">🛡️</a></td>
1768+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ykaravas"><img src="https://avatars.githubusercontent.com/u/6537956?v=4?s=100" width="100px;" alt="ykaravas"/><br /><sub><b>ykaravas</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aykaravas" title="Bug reports">🐛</a></td>
1769+
<td align="center" valign="top" width="14.28%"><a href="https://allwin-portfolio.vercel.app/"><img src="https://avatars.githubusercontent.com/u/127643894?v=4?s=100" width="100px;" alt="Prince Allwin"/><br /><sub><b>Prince Allwin</b></sub></a><br /><a href="#content-allwin199" title="Content">🖋</a></td>
1770+
</tr>
1771+
<tr>
1772+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ryanpwaldon"><img src="https://avatars.githubusercontent.com/u/12480362?v=4?s=100" width="100px;" alt="Ryan Waldon"/><br /><sub><b>Ryan Waldon</b></sub></a><br /><a href="#content-ryanpwaldon" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=ryanpwaldon" title="Code">💻</a></td>
1773+
<td align="center" valign="top" width="14.28%"><a href="https://www.4everland.org"><img src="https://avatars.githubusercontent.com/u/89854839?v=4?s=100" width="100px;" alt="4EVERLAND"/><br /><sub><b>4EVERLAND</b></sub></a><br /><a href="#tool-4everlandorg" title="Tools">🔧</a></td>
1774+
<td align="center" valign="top" width="14.28%"><a href="https://member.acm.org/~rhymeq"><img src="https://avatars.githubusercontent.com/u/57232813?v=4?s=100" width="100px;" alt="iepn"/><br /><sub><b>iepn</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=iepn" title="Code">💻</a></td>
1775+
<td align="center" valign="top" width="14.28%"><a href="https://www.ispanyol.com"><img src="https://avatars.githubusercontent.com/u/72710290?v=4?s=100" width="100px;" alt="veridelisi"/><br /><sub><b>veridelisi</b></sub></a><br /><a href="#tutorial-veridelisi" title="Tutorials">✅</a></td>
1776+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/reetbatra"><img src="https://avatars.githubusercontent.com/u/51335174?v=4?s=100" width="100px;" alt="Reet Batra"/><br /><sub><b>Reet Batra</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Areetbatra" title="Bug reports">🐛</a></td>
1777+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/gndelia"><img src="https://avatars.githubusercontent.com/u/352474?v=4?s=100" width="100px;" alt="Gonzalo D'Elia"/><br /><sub><b>Gonzalo D'Elia</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Agndelia" title="Bug reports">🐛</a></td>
1778+
<td align="center" valign="top" width="14.28%"><a href="http://www.rileyannon.com"><img src="https://avatars.githubusercontent.com/u/31807653?v=4?s=100" width="100px;" alt="Riley Annon"/><br /><sub><b>Riley Annon</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Arileyannon" title="Bug reports">🐛</a></td>
1779+
</tr>
1780+
<tr>
1781+
<td align="center" valign="top" width="14.28%"><a href="http://0x13.dev"><img src="https://avatars.githubusercontent.com/u/31336254?v=4?s=100" width="100px;" alt="Ogunsina Champion"/><br /><sub><b>Ogunsina Champion</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aayofimihan" title="Bug reports">🐛</a></td>
1782+
<td align="center" valign="top" width="14.28%"><a href="http://ardislu.dev"><img src="https://avatars.githubusercontent.com/u/29699850?v=4?s=100" width="100px;" alt="Ardis Lu"/><br /><sub><b>Ardis Lu</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=ardislu" title="Documentation">📖</a></td>
17661783
</tr>
17671784
</tbody>
17681785
</table>

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
"@emotion/styled": "^11.11.0",
2828
"@radix-ui/react-navigation-menu": "^1.1.4",
2929
"@socialgouv/matomo-next": "^1.8.0",
30-
"clipboard": "^2.0.11",
3130
"embla-carousel-react": "^7.0.0",
3231
"ethereum-blockies-base64": "^1.0.2",
3332
"focus-trap-react": "^10.2.3",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Start by reading about the ethereum.org mission and values in our [code of condu
1616
- [Find a bounty on Gitcoin](https://gitcoin.co/), work on a small or large technical issue, earn crypto!
1717
- Attend an [ETHGlobal](http://ethglobal.co/) hackathon near you!
1818
- Check out [projects related to your area of expertise or programming language of choice](/developers/docs/programming-languages/)
19-
- Watch or participate in the [Core Dev calls](https://www.youtube.com/playlist?list=PLaM7G4Llrb7zfMXCZVEXEABT8OSnd4-7w)
19+
- Watch or participate in the [Core Dev calls](https://www.youtube.com/@EthereumProtocol)
2020
- [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
2121
- [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
2222
- Join the [Ethereum Cat Herders Discord](https://discord.com/invite/Nz6rtfJ8Cu)

public/content/community/grants/index.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ These programs support the broad Ethereum ecosystem by offering grants to a wide
1818
- [MetaCartel](https://www.metacartel.org/grants/) - _Dapp development, DAO creation_
1919
- [Moloch DAO](https://www.molochdao.com/) - _Privacy, layer 2 scaling, client security, and more_
2020
- [DAO Grants](https://docs.google.com/spreadsheets/d/1XHc-p_MHNRdjacc8uOEjtPoWL86olP4GyxAJOFO0zxY/edit#gid=0) - _Google spreadsheet of organizations offering grants_
21-
- [Crunchbase for Web3 Grants](https://www.cryptoneur.xyz/web3-grants) - _Filter and search for grants by category, use case, amount, and more. Contribute to help others find the right grant._
2221
- [Academic Grants](https://esp.ethereum.foundation/academic-grants) - _Grants to support Ethereum-related academic work_
2322
- [Blockworks Grantfarm](https://blockworks.co/grants/programs) - _Blockworks has compiled a comprehensive directory of all grants, RFPs, and bug bounties._
2423

@@ -36,7 +35,6 @@ These projects have created their own grants for projects aimed at developing an
3635
- [Swarm Foundation Grants Program](https://my.ethswarm.org/grants) - _[Swarm Foundation](https://www.ethswarm.org/) ecosystem_
3736
- [The Graph](https://thegraph.com/ecosystem/grants/)_[The Graph](https://thegraph.com/) ecosystem_
3837
- [Uniswap Grants Program](https://www.uniswapfoundation.org/grants)_[Uniswap](https://uniswap.org/) community_
39-
- [Web3 Grants](https://web3grants.net) - _An extensive list of web3/crypto related grant programs_
4038

4139
## Quadratic funding {#quadratic-funding}
4240

public/content/community/research/index.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ One particular area of layer 2 that requires more research and development is sa
134134

135135
Sharding Ethereum's blockchain has long been part of the development roadmap. However, new scaling solutions such as "Danksharding" are currently taking center stage.
136136

137+
The precursor to full Danksharding known as Proto-Danksharding went live with the Cancun-Deneb ("Dencun") network upgrade.
138+
139+
[More about the Dencun upgrade](/roadmap/dencun/)
140+
137141
#### Background reading {#background-reading-4}
138142

139143
- [Proto-Danksharding notes](https://notes.ethereum.org/@vbuterin/proto_danksharding_faq)

0 commit comments

Comments
 (0)