Skip to content

Commit 412ae7c

Browse files
committed
Merge branch 'dev' into performance/lazy-mobile-menu
2 parents 38fdecd + 6ed50f8 commit 412ae7c

File tree

19 files changed

+320
-71
lines changed

19 files changed

+320
-71
lines changed

.all-contributorsrc

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12132,6 +12132,33 @@
1213212132
"contributions": [
1213312133
"content"
1213412134
]
12135+
},
12136+
{
12137+
"login": "jacobjelen",
12138+
"name": "jacobjelen",
12139+
"avatar_url": "https://avatars.githubusercontent.com/u/6750124?v=4",
12140+
"profile": "http://www.jacobjelen.com",
12141+
"contributions": [
12142+
"bug"
12143+
]
12144+
},
12145+
{
12146+
"login": "Dennayz",
12147+
"name": "Dennis Zhang",
12148+
"avatar_url": "https://avatars.githubusercontent.com/u/58843979?v=4",
12149+
"profile": "https://github.com/Dennayz",
12150+
"contributions": [
12151+
"tool"
12152+
]
12153+
},
12154+
{
12155+
"login": "JanetMo",
12156+
"name": "Marlene Marz",
12157+
"avatar_url": "https://avatars.githubusercontent.com/u/42071757?v=4",
12158+
"profile": "https://github.com/JanetMo",
12159+
"contributions": [
12160+
"content"
12161+
]
1213512162
}
1213612163
],
1213712164
"contributorsPerLine": 7,

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1856,6 +1856,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
18561856
<td align="center" valign="top" width="14.28%"><a href="https://github.com/alex1092"><img src="https://avatars.githubusercontent.com/u/59183749?v=4?s=100" width="100px;" alt="Alex"/><br /><sub><b>Alex</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=alex1092" title="Code">💻</a></td>
18571857
<td align="center" valign="top" width="14.28%"><a href="https://github.com/kyndrawynne"><img src="https://avatars.githubusercontent.com/u/108100622?v=4?s=100" width="100px;" alt="kyndrawynne"/><br /><sub><b>kyndrawynne</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Akyndrawynne" title="Bug reports">🐛</a></td>
18581858
<td align="center" valign="top" width="14.28%"><a href="https://github.com/stolab"><img src="https://avatars.githubusercontent.com/u/144235139?v=4?s=100" width="100px;" alt="stolab"/><br /><sub><b>stolab</b></sub></a><br /><a href="#content-stolab" title="Content">🖋</a></td>
1859+
<td align="center" valign="top" width="14.28%"><a href="http://www.jacobjelen.com"><img src="https://avatars.githubusercontent.com/u/6750124?v=4?s=100" width="100px;" alt="jacobjelen"/><br /><sub><b>jacobjelen</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Ajacobjelen" title="Bug reports">🐛</a></td>
1860+
</tr>
1861+
<tr>
1862+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Dennayz"><img src="https://avatars.githubusercontent.com/u/58843979?v=4?s=100" width="100px;" alt="Dennis Zhang"/><br /><sub><b>Dennis Zhang</b></sub></a><br /><a href="#tool-Dennayz" title="Tools">🔧</a></td>
1863+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/JanetMo"><img src="https://avatars.githubusercontent.com/u/42071757?v=4?s=100" width="100px;" alt="Marlene Marz"/><br /><sub><b>Marlene Marz</b></sub></a><br /><a href="#content-JanetMo" title="Content">🖋</a></td>
18591864
</tr>
18601865
</tbody>
18611866
</table>

public/content/community/language-resources/index.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,14 @@ If you are bilingual and want to help us reach more people, you can also get inv
9999
- [Microsoft Learn (Smart contracts)](https://docs.microsoft.com/it-it/learn/modules/blockchain-solidity-ethereum-smart-contracts/) - learn about writing smart contracts using Solidity
100100
- [Microsoft Learn (dapps)](https://docs.microsoft.com/it-it/learn/modules/blockchain-create-ui-decentralized-apps/) - create a user interface with decentralized applications
101101

102+
### Japanese {#ja}
103+
104+
- [Japan Virtual and Crypto assets Exchange Association](https://jvcea.or.jp/)
105+
- [Japan Cryptoasset Business Association](https://cryptocurrency-association.org/)
106+
- [Get started with blockchain development - Learn | Microsoft Docs](https://docs.microsoft.com/ja-jp/learn/paths/ethereum-blockchain-development/) - This learning path introduces you to blockchain and development on the Ethereum platform
107+
- [Mastering Ethereum](https://www.oreilly.co.jp/books/9784873118963/) - Mastering Ethereum in Japanese
108+
- [Hands-On Smart Contract Development with Solidity and Ethereum](https://www.oreilly.co.jp/books/9784873119342/) - Hands-On Smart Contract Development with Solidity and Ethereum in Japanese
109+
102110
### Russian {#ru}
103111

104112
- [Cyber Academy](https://cyberacademy.dev) - educational space for web3 builders
@@ -123,11 +131,3 @@ If you are bilingual and want to help us reach more people, you can also get inv
123131
- [Tino Group](https://wiki.tino.org/ethereum-la-gi/) - overview of Ethereum, dapps, wallets and FAQs
124132
- [Tap Chi Bitcoin](https://tapchibitcoin.io/tap-chi/tin-tuc-ethereum-eth) - web platform with subpages for Ethereum news and education
125133
- [Coin68](https://coin68.com/ethereum-tieu-diem/) - cryptocurrency portal with Ethereum news and educational content
126-
127-
### Japanese {#ja}
128-
129-
- [Japan Virtual and Crypto assets Exchange Association](https://jvcea.or.jp/)
130-
- [Japan Cryptoasset Business Association](https://cryptocurrency-association.org/)
131-
- [Get started with blockchain development - Learn | Microsoft Docs](https://docs.microsoft.com/ja-jp/learn/paths/ethereum-blockchain-development/) - This learning path introduces you to blockchain and development on the Ethereum platform
132-
- [Mastering Ethereum](https://www.oreilly.co.jp/books/9784873118963/) - Mastering Ethereum in Japanese
133-
- [Hands-On Smart Contract Development with Solidity and Ethereum](https://www.oreilly.co.jp/books/9784873119342/) - Hands-On Smart Contract Development with Solidity and Ethereum in Japanese

public/content/contributing/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ We have low barrier to entry issues on our GitHub repository specifically design
8888

8989
## Claim your Onchain Achievement Token (OAT) {#oat}
9090

91-
If your contribution gets merged into ethereum.org, you will have a change to claim a special badge on [Galxe](https://galxe.com/ethereumorg/). An Onchain Achievement Token (OAT) is a proof that you helped make the ecosystem a little more awesome.
91+
If your contribution gets merged into ethereum.org, you will have a chance to claim a special badge on [Galxe](https://app.galxe.com/quest/ethereumorg). An Onchain Achievement Token (OAT) is a proof that you helped make the ecosystem a little more awesome.
9292

9393
[More on OATs](https://help.galxe.com/en/articles/7067290-galxe-oats-reward-and-celebrate-achievements)
9494

public/content/dao/index.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,3 +160,7 @@ _Typically used for decentralized development and governance of protocols and [d
160160

161161
- [What is a DAO in crypto?](https://youtu.be/KHm0uUPqmVE)
162162
- [Can a DAO Build a City?](https://www.ted.com/talks/scott_fitsimones_could_a_dao_build_the_next_great_city)[TED](https://www.ted.com/)
163+
164+
<Divider />
165+
166+
<QuizWidget quizKey="daos" />

public/content/decentralized-identity/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ There are many ambitious projects using Ethereum as a foundation for decentraliz
163163
- **[Proof of Humanity](https://www.proofofhumanity.id)** - _Proof of Humanity (or PoH) is a social identity verification system built on Ethereum._
164164
- **[BrightID](https://www.brightid.org/)** - _A decentralized, open-source social identity network seeking to reform identity verification through the creation and analysis of a social graph._
165165
- **[walt.id](https://walt.id)**_Open source decentralized identity and wallet infrastructure that enables developers and organizations to leverage self-sovereign identity and NFTs/SBTs._
166-
- **[Masca](https://masca.io/)** _Open source decentralized identity wallet implemented as MetaMask Snap that enables users and developers to leverage DIDs and VCs._
166+
- **[Veramo](https://veramo.io/)** - _A JavaScript framework that makes it easy for anyone to use cryptographically verifiable data in their applications._
167167

168168
## Further reading {#further-reading}
169169

public/content/developers/docs/frameworks/index.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,13 @@ Before diving into frameworks, we recommend you first read through our introduct
132132
- [Documentation](https://catapulta.sh/docs)
133133
- [Github](https://github.com/catapulta-sh)
134134

135+
**Covalent -** **_Enriched blockchain APIs for 200+ Chains._**
136+
137+
- [covalenthq.com](https://www.covalenthq.com/)
138+
- [Documentation](https://www.covalenthq.com/docs/api/)
139+
- [GitHub](https://github.com/covalenthq)
140+
- [Discord](https://www.covalenthq.com/discord/)
141+
135142
**Wake -** **_All-in-one Python framework for contracts testing, fuzzing, deployment, vulnerability scanning and code navigation._**
136143

137144
- [Homepage](https://getwake.io/)

public/content/developers/docs/networks/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ The Sepolia network uses a permissioned validator set. It's fairly new, meaning
6262
- [Alchemy Sepolia faucet](https://sepoliafaucet.com/)
6363
- [Infura Sepolia faucet](https://www.infura.io/faucet)
6464
- [Chainstack Sepolia faucet](https://faucet.chainstack.com/sepolia-faucet)
65+
- [Ethereum Ecosystem faucet](https://www.ethereum-ecosystem.com/faucets/ethereum-sepolia)
6566

6667
#### Goerli _(long-term support)_ {#goerli}
6768

public/content/developers/docs/smart-contracts/languages/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ The two most active and maintained languages are:
1111
- Solidity
1212
- Vyper
1313

14+
Remix IDE provides a comprehensive development environment for creating and testing contracts in both Solidity and Vyper. [Try the in-browser Remix IDE](https://remix.ethereum.org) to start coding.
15+
1416
More experienced developers also might want to use Yul, an intermediate language for the [Ethereum Virtual Machine](/developers/docs/evm/), or Yul+, an extension to Yul.
1517

1618
If you're curious and like to help test new languages that are still under heavy development you can experiment with Fe, an emerging smart contract language which is currently still in its infancy.

public/images/upgrades/reth.png

21.7 KB
Loading

0 commit comments

Comments
 (0)