Skip to content

Commit 601de3b

Browse files
Merge remote-tracking branch 'origin/dev' into refactor/ContentHero-content-adjustments
2 parents c89f702 + aa6fe76 commit 601de3b

File tree

256 files changed

+10238
-2227
lines changed

Some content is hidden

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

256 files changed

+10238
-2227
lines changed

.all-contributorsrc

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11894,6 +11894,60 @@
1189411894
"content",
1189511895
"bug"
1189611896
]
11897+
},
11898+
{
11899+
"login": "rohit-710",
11900+
"name": "Rohit Ramesh",
11901+
"avatar_url": "https://avatars.githubusercontent.com/u/70317502?v=4",
11902+
"profile": "https://bento.me/rohitramesh",
11903+
"contributions": [
11904+
"tool"
11905+
]
11906+
},
11907+
{
11908+
"login": "gsalzer",
11909+
"name": "Gernot Salzer",
11910+
"avatar_url": "https://avatars.githubusercontent.com/u/13353518?v=4",
11911+
"profile": "https://github.com/gsalzer",
11912+
"contributions": [
11913+
"ideas"
11914+
]
11915+
},
11916+
{
11917+
"login": "lightclient",
11918+
"name": "lightclient",
11919+
"avatar_url": "https://avatars.githubusercontent.com/u/14004106?v=4",
11920+
"profile": "https://github.com/lightclient",
11921+
"contributions": [
11922+
"maintenance"
11923+
]
11924+
},
11925+
{
11926+
"login": "GarenWoo",
11927+
"name": "Garen Woo",
11928+
"avatar_url": "https://avatars.githubusercontent.com/u/126687110?v=4",
11929+
"profile": "https://github.com/GarenWoo",
11930+
"contributions": [
11931+
"bug"
11932+
]
11933+
},
11934+
{
11935+
"login": "AbiPrescott",
11936+
"name": "Abi Prescott",
11937+
"avatar_url": "https://avatars.githubusercontent.com/u/140613896?v=4",
11938+
"profile": "https://github.com/AbiPrescott",
11939+
"contributions": [
11940+
"bug"
11941+
]
11942+
},
11943+
{
11944+
"login": "skyminelabs",
11945+
"name": "skyminelabs",
11946+
"avatar_url": "https://avatars.githubusercontent.com/u/57817726?v=4",
11947+
"profile": "https://github.com/skyminelabs",
11948+
"contributions": [
11949+
"maintenance"
11950+
]
1189711951
}
1189811952
],
1189911953
"contributorsPerLine": 7,

.github/ISSUE_TEMPLATE/suggest_wallet.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ body:
66
- type: markdown
77
attributes:
88
value: |
9-
Before suggesting a wallet, make sure you've read [our listing policy](https://www.ethereum.org/en/contributing/adding-wallets/). Only continue with the issue if the wallet meets the criteria listed there. For any required questions, please answer N/A for any questions not applicable to your wallet.
9+
Before suggesting a wallet, make sure you've read [our listing policy](https://www.ethereum.org/en/contributing/adding-wallets/). Only continue with the issue if the wallet meets the criteria listed there. For any required questions, please answer N/A for any questions not applicable to your wallet. This form is very comprehensive, and if you feel like you can't answer all the questions, please reach out to the wallet provider to fill out this template.
1010
- type: markdown
1111
id: project_info
1212
attributes:

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1821,7 +1821,15 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
18211821
<td align="center" valign="top" width="14.28%"><a href="https://github.com/LucasAschenbach"><img src="https://avatars.githubusercontent.com/u/37406743?v=4?s=100" width="100px;" alt="Lucas Aschenbach"/><br /><sub><b>Lucas Aschenbach</b></sub></a><br /><a href="#content-LucasAschenbach" title="Content">🖋</a></td>
18221822
<td align="center" valign="top" width="14.28%"><a href="https://juliet.tech"><img src="https://avatars.githubusercontent.com/u/19226636?v=4?s=100" width="100px;" alt="juliettech"/><br /><sub><b>juliettech</b></sub></a><br /><a href="#tutorial-juliettech13" title="Tutorials">✅</a></td>
18231823
<td align="center" valign="top" width="14.28%"><a href="https://github.com/0xayot"><img src="https://avatars.githubusercontent.com/u/101125111?v=4?s=100" width="100px;" alt="0xayot"/><br /><sub><b>0xayot</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=0xayot" title="Documentation">📖</a></td>
1824+
</tr>
1825+
<tr>
18241826
<td align="center" valign="top" width="14.28%"><a href="https://github.com/lgaroche"><img src="https://avatars.githubusercontent.com/u/13414533?v=4?s=100" width="100px;" alt="Louis"/><br /><sub><b>Louis</b></sub></a><br /><a href="#content-lgaroche" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Algaroche" title="Bug reports">🐛</a></td>
1827+
<td align="center" valign="top" width="14.28%"><a href="https://bento.me/rohitramesh"><img src="https://avatars.githubusercontent.com/u/70317502?v=4?s=100" width="100px;" alt="Rohit Ramesh"/><br /><sub><b>Rohit Ramesh</b></sub></a><br /><a href="#tool-rohit-710" title="Tools">🔧</a></td>
1828+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/gsalzer"><img src="https://avatars.githubusercontent.com/u/13353518?v=4?s=100" width="100px;" alt="Gernot Salzer"/><br /><sub><b>Gernot Salzer</b></sub></a><br /><a href="#ideas-gsalzer" title="Ideas, Planning, & Feedback">🤔</a></td>
1829+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/lightclient"><img src="https://avatars.githubusercontent.com/u/14004106?v=4?s=100" width="100px;" alt="lightclient"/><br /><sub><b>lightclient</b></sub></a><br /><a href="#maintenance-lightclient" title="Maintenance">🚧</a></td>
1830+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/GarenWoo"><img src="https://avatars.githubusercontent.com/u/126687110?v=4?s=100" width="100px;" alt="Garen Woo"/><br /><sub><b>Garen Woo</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AGarenWoo" title="Bug reports">🐛</a></td>
1831+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/AbiPrescott"><img src="https://avatars.githubusercontent.com/u/140613896?v=4?s=100" width="100px;" alt="Abi Prescott"/><br /><sub><b>Abi Prescott</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AAbiPrescott" title="Bug reports">🐛</a></td>
1832+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/skyminelabs"><img src="https://avatars.githubusercontent.com/u/57817726?v=4?s=100" width="100px;" alt="skyminelabs"/><br /><sub><b>skyminelabs</b></sub></a><br /><a href="#maintenance-skyminelabs" title="Maintenance">🚧</a></td>
18251833
</tr>
18261834
</tbody>
18271835
</table>

package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
22
"name": "ethereum-org-website",
3-
"version": "8.5.0",
3+
"version": "8.5.1",
44
"private": true,
55
"scripts": {
66
"dev": "next dev",
7+
"postinstall": "yarn theme",
78
"build": "next build",
89
"postbuild": "next-sitemap",
910
"start": "next start",
@@ -17,8 +18,10 @@
1718
"chromatic": "chromatic --project-token fee8e66c9916",
1819
"crowdin-clean": "rm -rf .crowdin && mkdir .crowdin",
1920
"crowdin-import": "ts-node src/scripts/crowdin-import.ts",
21+
"markdown-checker": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/markdownChecker.ts",
2022
"events-import": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/events-import.ts",
21-
"markdown-checker": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/markdownChecker.ts"
23+
"theme": "chakra-cli tokens ./src/@chakra-ui/theme.ts",
24+
"theme:watch": "chakra-cli tokens ./src/@chakra-ui/theme.ts --watch"
2225
},
2326
"dependencies": {
2427
"@chakra-ui/react": "^2.8.0",
@@ -57,6 +60,7 @@
5760
"yaml-loader": "^0.8.0"
5861
},
5962
"devDependencies": {
63+
"@chakra-ui/cli": "^2.4.1",
6064
"@chakra-ui/storybook-addon": "5.1.0",
6165
"@netlify/plugin-nextjs": "^4.41.3",
6266
"@storybook/addon-essentials": "7.6.6",

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ The Ethereum ecosystem is on a mission to fund public goods and impactful projec
8989

9090
## Product Managers <Emoji text=":fountain_pen:" size={1} />‍ {#product-managers}
9191

92-
- The Ethereum ecosystem needs your talents! Many companies are hiring for product manager roles. If you want to start by contributing to an open source project, get in touch with the [Ethereum Cat Herders](https://discord.com/invite/Nz6rtfJ8Cu) or [MetaCartel](https://www.metacartel.org/)
92+
- The Ethereum ecosystem needs your talents! Many companies are hiring for product manager roles. If you want to start by contributing to an open source project, get in touch with the [Ethereum Cat Herders](https://discord.com/invite/Nz6rtfJ8Cu) or [RaidGuild](https://www.raidguild.org/)
9393

9494
## Marketing <Emoji text=":megaphone:" size={1} />‍ {#marketing}
9595

@@ -117,19 +117,15 @@ The Ethereum ecosystem is on a mission to fund public goods and impactful projec
117117

118118
"DAOs" are decentralized autonomous organizations. These groups leverage Ethereum technology to facilitate organization and collaboration. For instance, for controlling membership, voting on proposals, or managing pooled assets. While DAOs are still experimental, they offer opportunities for you to find groups that you identify with, find collaborators, and grow your impact on the Ethereum community. [More on DAOs](/dao/)
119119

120-
- [DAOSquare](https://www.daosquare.io) [@DAOSquare](https://twitter.com/DAOSquare) - _Promote the DAO concept in non-tech field and help people create value through DAO_
120+
- [DAOSquare](https://daosquare.io/) [@DAOSquare](https://twitter.com/DAOSquare) - _Promote the DAO concept in non-tech field and help people create value through DAO_
121121
- [Developer DAO](https://www.developerdao.com/) [@developer_dao](https://twitter.com/developer_dao) - _Community of builders who believe in collective ownership of the internet_
122122
- [dOrg](https://dOrg.tech) [@dOrg_tech](https://twitter.com/dOrg_tech) - _Freelancer Web3 development collective working as a DAO_
123-
- [DXdao](https://DXdao.eth.link/) [@DXdao](https://twitter.com/DXdao_) - _Decentralized development & governance of dapps & protocols_
124123
- [HausDAO](https://daohaus.club) [@nowdaoit](https://twitter.com/nowdaoit) - _Community governance of DAOhaus_
125-
- [Hero DAO](https://herodao.org/) [@hero_dao](https://twitter.com/hero_dao) - _Community owned superhero franchise_
126-
- [LexDAO](https://lexdao.coop) [@lex_DAO](https://twitter.com/lex_DAO) - _Legal engineering_
124+
- [LexDAO](https://lexdao.org) [@lex_DAO](https://twitter.com/lex_DAO) - _Legal engineering_
127125
- [Machi X](https://machix.com) [@MachiXOfficial](https://twitter.com/MachiXOfficial) - _Art community_
128-
- [MetaCartel](https://metacartel.org) [@Meta_Cartel](https://twitter.com/Meta_Cartel) - _DAO incubator_
129126
- [MetaCartel Ventures](https://metacartel.xyz) [@VENTURE_DAO](https://twitter.com/VENTURE_DAO) - _Venture for pre-seed crypto projects_
130127
- [MetaGame](https://metagame.wtf) [@MetaFam](https://twitter.com/MetaFam) - _MMORPG Game Mechanics for Real Life_
131128
- [MetaFactory](https://metafactory.ai) [@TheMetaFactory](https://twitter.com/TheMetaFactory) - _Digiphysical Apparel Brands_
132-
- [ΜΓΔ](https://metagammadelta.com/) (Meta Gamma Delta) [@metagammadelta](https://twitter.com/metagammadelta) - _Women-led projects_
133129
- [MolochDAO](https://molochdao.com) [@MolochDAO](https://twitter.com/MolochDAO) - _Community focused on funding Ethereum development_
134130
- [Raid Guild](https://raidguild.org) [@RaidGuild](https://twitter.com/RaidGuild) - _Collective of Web3 builders_
135131

public/content/community/grants/index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ This list is curated by our community. If there's something missing or incorrect
1515
These programs support the broad Ethereum ecosystem by offering grants to a wide scope of projects. These include solutions for scalability, community building, security, privacy, and more. These grants are not specific to any one Ethereum platform and are a good place to start if you're unsure.
1616

1717
- [EF Ecosystem Support Program](https://esp.ethereum.foundation) - _Funding open source projects that benefit Ethereum, with a particular focus on universal tools, infrastructure, research and public goods_
18-
- [MetaCartel](https://www.metacartel.org/grants/) - _Dapp development, DAO creation_
1918
- [Moloch DAO](https://www.molochdao.com/) - _Privacy, layer 2 scaling, client security, and more_
2019
- [DAO Grants](https://docs.google.com/spreadsheets/d/1XHc-p_MHNRdjacc8uOEjtPoWL86olP4GyxAJOFO0zxY/edit#gid=0) - _Google spreadsheet of organizations offering grants_
2120
- [Academic Grants](https://esp.ethereum.foundation/academic-grants) - _Grants to support Ethereum-related academic work_

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ We invite you to join us in breaking down language barriers and making ethereum.
1616

1717
## Overview {#overview}
1818

19+
<InfoBanner emoji=":calendar:">
20+
This event has passed. <a href="https://twitter.com/ethdotorg">Stay tuned for the next events</a>.
21+
</InfoBanner>
22+
1923
### When {#when}
2024

2125
- Application period: August 1st - August 15th, 2023
@@ -35,7 +39,7 @@ Office hours, workshops, team formation and FAQ sessions will be hosted on the [
3539

3640
#### Application period {#applications}
3741

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

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

public/content/dao/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ _Typically used for decentralized development and governance of protocols and [d
125125
126126
#### A famous example {#reputation-example}
127127
128-
[DXdao](https://DXdao.eth.link) – DXdao is a global sovereign collective building and governing decentralized protocols and applications since 2019. It leverages reputation-based governance and [holographic consensus](/glossary/#holographic-consensus) to coordinate and manage funds, meaning no one can buy their way into influencing its future.
128+
[DXdao](https://DXdao.eth.limo) – DXdao was a global sovereign collective building and governing decentralized protocols and applications since 2019. It leveraged reputation-based governance and [holographic consensus](/glossary/#holographic-consensus) to coordinate and manage funds, meaning no one could buy their way into influencing its future or governance.
129129
130130
## Join / start a DAO {#join-start-a-dao}
131131

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,12 @@ A smart contract is code that lives on the Ethereum blockchain and runs exactly
7474
- [Documentation](https://portal.thirdweb.com/)
7575
- [GitHub](https://github.com/thirdweb-dev/)
7676

77+
**Crossmint _- Enterprise-grade web3 development platform to deploy smart contracts, enable credit-card and cross chain payments, and use APIs to create, distribute, sell, store, and edit NFTs._**
78+
79+
- [crossmint.com](https://www.crossmint.com)
80+
- [Documentation](https://docs.crossmint.com)
81+
- [Discord](https://discord.com/invite/crossmint)
82+
7783
## Further reading {#further-reading}
7884

7985
- [Explore dapps](/dapps)

public/content/developers/docs/evm/opcodes/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,9 @@ For operations with dynamic gas costs, see [gas.md](https://github.com/wolflo/ev
159159
| 9F | SWAP16 | 3 | `a, ..., b` | `b, ..., a` | |
160160
| A0 | LOG0 | [A8](https://github.com/wolflo/evm-opcodes/blob/main/gas.md#a8-log-operations) | `ost, len` | `.` | | LOG0(memory[ost:ost+len-1]) |
161161
| A1 | LOG1 | [A8](https://github.com/wolflo/evm-opcodes/blob/main/gas.md#a8-log-operations) | `ost, len, topic0` | `.` | | LOG1(memory[ost:ost+len-1], topic0) |
162-
| A2 | LOG2 | [A8](https://github.com/wolflo/evm-opcodes/blob/main/gas.md#a8-log-operations) | `ost, len, topic0, topic1` | `.` | | LOG1(memory[ost:ost+len-1], topic0, topic1) |
163-
| A3 | LOG3 | [A8](https://github.com/wolflo/evm-opcodes/blob/main/gas.md#a8-log-operations) | `ost, len, topic0, topic1, topic2` | `.` | | LOG1(memory[ost:ost+len-1], topic0, topic1, topic2) |
164-
| A4 | LOG4 | [A8](https://github.com/wolflo/evm-opcodes/blob/main/gas.md#a8-log-operations) | `ost, len, topic0, topic1, topic2, topic3` | `.` | | LOG1(memory[ost:ost+len-1],&#160;topic0,&#160;topic1,&#160;topic2,&#160;topic3) |
162+
| A2 | LOG2 | [A8](https://github.com/wolflo/evm-opcodes/blob/main/gas.md#a8-log-operations) | `ost, len, topic0, topic1` | `.` | | LOG2(memory[ost:ost+len-1], topic0, topic1) |
163+
| A3 | LOG3 | [A8](https://github.com/wolflo/evm-opcodes/blob/main/gas.md#a8-log-operations) | `ost, len, topic0, topic1, topic2` | `.` | | LOG3(memory[ost:ost+len-1], topic0, topic1, topic2) |
164+
| A4 | LOG4 | [A8](https://github.com/wolflo/evm-opcodes/blob/main/gas.md#a8-log-operations) | `ost, len, topic0, topic1, topic2, topic3` | `.` | | LOG4(memory[ost:ost+len-1],&#160;topic0,&#160;topic1,&#160;topic2,&#160;topic3) |
165165
| A5-EF | _invalid_ |
166166
| F0 | CREATE | [A9](https://github.com/wolflo/evm-opcodes/blob/main/gas.md#a9-create-operations) | `val, ost, len` | `addr` | | addr = keccak256(rlp([address(this), this.nonce])) |
167167
| F1 | CALL | [AA](https://github.com/wolflo/evm-opcodes/blob/main/gas.md#aa-call-operations) | <code>gas,&#160;addr,&#160;val,&#160;argOst,&#160;argLen,&#160;retOst,&#160;retLen</code> | `success` | mem[retOst:retOst+retLen-1] := returndata |

0 commit comments

Comments
 (0)