Skip to content

Commit

Permalink
Merge branch 'dev' into emotion
Browse files Browse the repository at this point in the history
  • Loading branch information
wackerow committed Aug 8, 2022
2 parents 0c2dec7 + 50cd939 commit 2a57448
Show file tree
Hide file tree
Showing 31 changed files with 198 additions and 61 deletions.
27 changes: 27 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -8347,6 +8347,33 @@
"doc",
"bug"
]
},
{
"login": "vrinek",
"name": "Kostas",
"avatar_url": "https://avatars.githubusercontent.com/u/81346?v=4",
"profile": "https://github.com/vrinek",
"contributions": [
"doc"
]
},
{
"login": "rogueassasin1729",
"name": "rogueassasin1729",
"avatar_url": "https://avatars.githubusercontent.com/u/92800000?v=4",
"profile": "https://github.com/rogueassasin1729",
"contributions": [
"doc"
]
},
{
"login": "Pandapip1",
"name": "Pandapip1",
"avatar_url": "https://avatars.githubusercontent.com/u/45835846?v=4",
"profile": "https://pandapip1.com/",
"contributions": [
"doc"
]
}
],
"contributorsPerLine": 7,
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1333,6 +1333,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center"><a href="https://github.com/michaelmccallam"><img src="https://avatars.githubusercontent.com/u/3510607?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael McCallam</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=michaelmccallam" title="Documentation">📖</a></td>
<td align="center"><a href="https://nownodes.io/"><img src="https://avatars.githubusercontent.com/u/110098268?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Polina G.</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=PolinaShanti" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/Cerebro92"><img src="https://avatars.githubusercontent.com/u/13215478?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Neeraj Gahlot</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Cerebro92" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3ACerebro92" title="Bug reports">🐛</a></td>
<td align="center"><a href="https://github.com/vrinek"><img src="https://avatars.githubusercontent.com/u/81346?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kostas</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=vrinek" title="Documentation">📖</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/rogueassasin1729"><img src="https://avatars.githubusercontent.com/u/92800000?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rogueassasin1729</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=rogueassasin1729" title="Documentation">📖</a></td>
<td align="center"><a href="https://pandapip1.com/"><img src="https://avatars.githubusercontent.com/u/45835846?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pandapip1</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Pandapip1" title="Documentation">📖</a></td>
</tr>
</table>

Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
"devDependencies": {
"@netlify/functions": "^1.0.0",
"@types/browser-lang": "^0.1.0",
"@types/github-slugger": "^1.3.0",
"@types/luxon": "^2.3.2",
"@types/mdx-js__react": "^1.5.5",
"@types/node": "^17.0.23",
Expand All @@ -91,6 +92,7 @@
"prettier": "^2.2.1",
"pretty-quick": "^3.1.0",
"react-test-renderer": "^17.0.1",
"ts-node": "^10.9.1",
"typescript": "^4.6.3"
},
"scripts": {
Expand All @@ -101,7 +103,7 @@
"crowdin-clean": "rm -rf .crowdin && mkdir .crowdin",
"crowdin-import": "ts-node src/scripts/crowdin-import.ts",
"format": "prettier --write \"**/*.{js,jsx,json,md}\"",
"generate-heading-ids": "node src/scripts/generate-heading-ids.js",
"generate-heading-ids": "ts-node --esm src/scripts/generateHeadingIds.mts",
"start": "gatsby develop",
"start:lambda": "netlify-lambda serve src/lambda",
"start:static": "gatsby build && gatsby serve",
Expand Down
1 change: 0 additions & 1 deletion src/content/community/online/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ Hundreds of thousands of Ethereum enthusiasts gather in these online forums to s
<SocialListItem socialIcon="reddit"><Link to="https://www.reddit.com/r/ethfinance/">r/ethfinance</Link> - the financial side of Ethereum, including DeFi</SocialListItem>
<SocialListItem socialIcon="reddit"><Link to="https://www.reddit.com/r/ethdev/">r/ethdev</Link> - focused on Ethereum development</SocialListItem>
<SocialListItem socialIcon="reddit"><Link to="https://www.reddit.com/r/ethtrader/">r/ethtrader</Link> - trends & market analysis</SocialListItem>
<SocialListItem socialIcon="reddit"><Link to="https://www.reddit.com/r/EtherMining/">r/EtherMining</Link> - focused on securing the Ethereum Network (mining)</SocialListItem>
<SocialListItem socialIcon="reddit"><Link to="https://www.reddit.com/r/ethstaker/">r/ethstaker</Link> - welcome to all interested in staking on Ethereum</SocialListItem>
<SocialListItem socialIcon="webpage"><Link to="https://ethereum-magicians.org">Fellowship of Ethereum Magicians</Link> - community oriented around technical standards in Ethereum</SocialListItem>
<SocialListItem socialIcon="stackExchange"><Link to="https://ethereum.stackexchange.com">Ethereum Stackexchange</Link> - discussion and help for Ethereum developers</SocialListItem>
Expand Down
2 changes: 1 addition & 1 deletion src/content/community/support/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,4 @@ Transactions on Ethereum can sometimes get stuck if you have submitted a lower t

#### How do I mine Ethereum? {#mining-ethereum}

We do not recommend buying mining equipment if you are not already mining Ethereum. In ~Q3/Q4 2022, [The Merge](/upgrades/merge/) will happen, switching Ethereum from proof-of-work to proof-of-stake. This change means mining Ethereum will no longer be possible. If you are still interested in mining Ethereum, you can seek help from mining communities, such as [/r/EtherMining](https://www.reddit.com/r/EtherMining/).
We do not recommend buying mining equipment if you are not already mining Ethereum. In ~Q3/Q4 2022, [The Merge](/upgrades/merge/) will happen, switching Ethereum from proof-of-work to proof-of-stake. This change means mining Ethereum will no longer be possible.
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,11 @@ Here is a list of some of the most popular Ethereum node providers, feel free to
- [Docs](https://documenter.getpostman.com/view/13630829/TVmFkLwy)
- Features
- Access to 50+ blockchain nodes
- Free API Key
- Free API Key
- Block Explorers
- API Response Time ⩽ 1 sec
- 24/7 Support Team
- Personal Account Manager
- Personal Account Manager
- Shared, archive, backup and dedicated nodes
- [**Pocket Network**](https://www.pokt.network/)
- [Docs](https://docs.pokt.network/home/)
Expand Down Expand Up @@ -209,13 +209,16 @@ Here is a list of some of the most popular Ethereum node providers, feel free to
- Suitable for Developers to Enterprises
- [**Rivet**](https://rivet.cloud/)
- [Docs](https://rivet.readthedocs.io/en/latest/)
- Features - Free tier option - Scale as you go -[**SenseiNode**](https://senseinode.com)
- Features
- Free tier option
- Scale as you go
- [**SenseiNode**](https://senseinode.com)
- [Docs](https://docs.senseinode.com/)
- Features
- Dedicated and Share nodes
- Dashboard
- Hosting off AWS on multiple hosting providers accross different locations in Latin America
- Prysm and Lighthouse clients
- Dedicated and Share nodes
- Dashboard
- Hosting off AWS on multiple hosting providers accross different locations in Latin America
- Prysm and Lighthouse clients
- [**SettleMint**](https://console.settlemint.com/)
- [Docs](https://docs.settlemint.com/)
- Features
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,9 @@ For more information, [read the Vyper rationale](https://vyper.readthedocs.io/en
- [Smart contract development frameworks and tools for Vyper](/developers/docs/programming-languages/python/)
- [VyperPunk - learn to secure and hack Vyper smart contracts](https://github.com/SupremacyTeam/VyperPunk)
- [VyperExamples - Vyper vulnerability examples](https://www.vyperexamples.com/reentrancy)
- [Update Jan 8, 2020](https://blog.ethereum.org/2020/01/08/update-on-the-vyper-compiler)

- [Vyper Hub for development](https://github.com/zcor/vyper-dev)
- [Vyper greatest hits smart contract examples](https://github.com/pynchmeister/vyper-greatest-hits/tree/main/contracts)
- [Awesome Vyper curated resources](https://github.com/spadebuilders/awesome-vyper)

### Example {#example}

Expand Down
15 changes: 13 additions & 2 deletions src/content/developers/docs/standards/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,20 @@ Typically standards are introduced as [Ethereum Improvement Proposals](/eips/) (

## Types of standards {#types-of-standards}

Certain EIPs relate to application-level standards (e.g. a standard smart-contract format), which are introduced as [Ethereum Requests for Comment (ERC)](https://eips.ethereum.org/erc). Many ERCs are critical standards used widely across the Ethereum ecosystem.
There are 3 types of EIPs:

- [List of ERCs](https://eips.ethereum.org/erc)
- [Standards Track](https://eips.ethereum.org/): describes any change that affects most or all Ethereum implementations
- [Meta Track](https://eips.ethereum.org/meta): describes a process surrounding Ethereum or proposes a change to a process
- [Informational Track](https://eips.ethereum.org/informational): describes an Ethereum design issue or provides general guidelines or information to the Ethereum community

Furthermore, the Standard Track is subdivided into 4 categories:

- [Core](https://eips.ethereum.org/core): improvements requiring a consensus fork
- [Networking](https://eips.ethereum.org/networking): improvements around devp2p and Light Ethereum Subprotocol, as well as proposed improvements to network protocol specifications of whisper and swarm.
- [Interface](https://eips.ethereum.org/interface): improvements around client API/RPC specifications and standards, and certain language-level standards like method names and contract ABIs.
- [ERC](https://eips.ethereum.org/erc): application-level standards and conventions

More detailed information on these different types and categories can be found in [EIP-1](https://eips.ethereum.org/EIPS/eip-1#eip-types)

### Token standards {#token-standards}

Expand Down
2 changes: 1 addition & 1 deletion src/content/translations/ca/community/support/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,4 @@ Les transaccions en Ethereum, de vegades, poden restar bloquejades si heu enviat

#### Com puc minar Ethereum? {#mining-ethereum}

No recomanem comprar equipament per a la mineria si no esteu minant Ethereum actualment. Durant el segon trimestre de 2022 tindrà lloc [la fusió](/upgrades/merge/): canviarem Ethereum de la prova de treball a la prova de participació. Aquest canvi significa que minar Ethereum ja no serà possible. Si encara us interessa minar Ethereum, podeu buscar ajuda en les comunitats mineres, com ara [/r/EtherMining](https://www.reddit.com/r/EtherMining/).
No recomanem comprar equipament per a la mineria si no esteu minant Ethereum actualment. Durant el segon trimestre de 2022 tindrà lloc [la fusió](/upgrades/merge/): canviarem Ethereum de la prova de treball a la prova de participació. Aquest canvi significa que minar Ethereum ja no serà possible.
2 changes: 1 addition & 1 deletion src/content/translations/de/community/support/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,4 @@ Transaktionen auf Ethereum können manchmal stecken bleiben, wenn Sie eine niedr

#### Wie kann ich Ethereum minen? {#mining-ethereum}

Wir raten davon ab, Mining-Ausrüstung zu kaufen, wenn Sie nicht bereits schon Ethereum minen. Vorraussichtlich im 3./4. Quartal 2022 wird [Die Zusammenführung](/upgrades/merge/) vonstattengehen, wodurch Ethereum von Proof-of-Work zu Proof-of-Stake wechselt. Diese Änderung bedeutet, dass das Mining von Ethereum nicht mehr möglich sein wird. Wenn Sie weiterhin daran interessiert sind, Ethereum zu schürfen, können Sie in Mining-Communitys wie [/r/EtherMining](https://www.reddit.com/r/EtherMining/) Hilfe suchen.
Wir raten davon ab, Mining-Ausrüstung zu kaufen, wenn Sie nicht bereits schon Ethereum minen. Vorraussichtlich im 3./4. Quartal 2022 wird [Die Zusammenführung](/upgrades/merge/) vonstattengehen, wodurch Ethereum von Proof-of-Work zu Proof-of-Stake wechselt. Diese Änderung bedeutet, dass das Mining von Ethereum nicht mehr möglich sein wird.
1 change: 0 additions & 1 deletion src/content/translations/es/community/online/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ Cientos de miles de entusiastas de Ethereum se reúnen en estos foros en línea
<SocialListItem socialIcon="reddit"><Link to="https://www.reddit.com/r/ethfinance/">r/ethfinance</Link> : el lado financiero de Ethereum, incluidas las DeFi</SocialListItem>
<SocialListItem socialIcon="reddit"><Link to="https://www.reddit.com/r/ethdev/">r/ethdev</Link> : foco puesto en el desarollo de Ethereum</SocialListItem>
<SocialListItem socialIcon="reddit"><Link to="https://www.reddit.com/r/ethtrader/">r/ethtrader</Link> : tendencias y análisis de mercado</SocialListItem>
<SocialListItem socialIcon="reddit"><Link to="https://www.reddit.com/r/EtherMining/">r/EtherMining</Link> : foco puesto en la protección de la red Ethereum (minería)</SocialListItem>
<SocialListItem socialIcon="reddit"><Link to="https://www.reddit.com/r/ethstaker/">r/ethstaker</Link> : bienvenidos a todos los interesados en las apuestas en Ethereum</SocialListItem>
<SocialListItem socialIcon="webpage"><Link to="https://ethereum-magicians.org">Programa de becas de Ethereum Magicians</Link> : un foro orientado a la comunidad en el que se debaten los estándares técnicos en Ethereum</SocialListItem>
<SocialListItem socialIcon="stackExchange"><Link to="https://ethereum.stackexchange.com">Ethereum Stackexchange</Link> : foro de debate y ayuda para desarrolladores de Ethereum</SocialListItem>
Expand Down
2 changes: 1 addition & 1 deletion src/content/translations/es/community/support/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,4 @@ Debido a la demanda de la red, las transacciones en Ethereum pueden a veces esta

#### ¿Cómo puedo minar Ethereum? {#mining-ethereum}

No recomendamos comprar equipo destinado a minar si aún no ha minado en Ethereum. En el tercer/cuarto trimestre de 2022, se producirá [la fusión](/upgrades/merge/), cambiando Ethereum de prueba de trabajo a prueba de participación. Este cambio significa que ya no se podrá minar Ethereum. Si todavía le interesa minar Ethereum, puede pedir ayuda a comunidades mineras, como [/r/EtherMining](https://www.reddit.com/r/EtherMining/).
No recomendamos comprar equipo destinado a minar si aún no ha minado en Ethereum. En el tercer/cuarto trimestre de 2022, se producirá [la fusión](/upgrades/merge/), cambiando Ethereum de prueba de trabajo a prueba de participación. Este cambio significa que ya no se podrá minar Ethereum.
1 change: 0 additions & 1 deletion src/content/translations/fa/community/online/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ lang: fa
<SocialListItem socialIcon="reddit"><Link to="https://www.reddit.com/r/ethfinance/">r/ethfinance</Link> _- جنبه مالی اتریوم، از جمله DeFi_</SocialListItem>
<SocialListItem socialIcon="reddit"><Link to="https://www.reddit.com/r/ethdev/">r/ethdev</Link> _- متمرکز بر توسعه اتریوم_</SocialListItem>
<SocialListItem socialIcon="reddit"><Link to="https://www.reddit.com/r/ethtrader/">r/ethtrader</Link> _- روندها و تحلیل بازار_</SocialListItem>
<SocialListItem socialIcon="reddit"><Link to="https://www.reddit.com/r/EtherMining/">r/EtherMining</Link> _- متمرکز بر ایمن‌سازی شبکه اتریوم (استخراج)_</SocialListItem>
<SocialListItem socialIcon="reddit"><Link to="https://www.reddit.com/r/ethstaker/">r/ethstaker</Link> _- به همه علاقمندان به سهام‌گذاری در اتریوم خوش آمدید_</SocialListItem>
<SocialListItem socialIcon="webpage"><Link to="https://ethereum-magicians.org">انجمن شعبده بازان اتریوم</Link> _- جامعه گرا حول استانداردهای فنی در اتریوم_</SocialListItem>
<SocialListItem socialIcon="stackExchange"><Link to="https://ethereum.stackexchange.com">Ethereum Stackexchange</Link> _- بحث و کمک برای توسعه دهندگان اتریوم_</SocialListItem>
Expand Down
2 changes: 1 addition & 1 deletion src/content/translations/fa/community/support/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,4 @@ _این یک فهرست جامع نیست. برای پیدا کردن پشتیب

#### چگونه می‌توانم اتریوم را استخراج کنم؟ {#mining-ethereum}

اگر در تاکنون اتریوم را استخراج نکرده‌اید، خرید تجهیزات استخراج را توصیه نمی‌کنیم. [ادغام](/upgrades/merge/) حوالی سه‌ماهه‌ی سوم/چهارم سال 2022 اتفاق خواهد افتاد و سازوکار اتریوم را از اثبات کار به اثبات سهام تغییر خواهد داد. این تغییر به این معنی است که استخراج اتریوم دیگر امکان‌پذیر نخواهد بود. اگر همچنان به استخراج اتریوم علاقه دارید، می‌توانید از انجمن‌های استخراج مانند [/r/EtherMining](https://www.reddit.com/r/EtherMining/) کمک بگیرید.
اگر در تاکنون اتریوم را استخراج نکرده‌اید، خرید تجهیزات استخراج را توصیه نمی‌کنیم. [ادغام](/upgrades/merge/) حوالی سه‌ماهه‌ی سوم/چهارم سال 2022 اتفاق خواهد افتاد و سازوکار اتریوم را از اثبات کار به اثبات سهام تغییر خواهد داد.
2 changes: 1 addition & 1 deletion src/content/translations/fr/community/support/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,4 @@ Les transactions sur Ethereum peuvent parfois se bloquer si vous avez soumis des

#### Comment miner de l'Ethereum ? {#mining-ethereum}

Nous ne vous recommandons pas d'investir dans de l'équipement de minage si vous n'êtes pas déjà en train de miner de l'Ethereum. Pendant le deuxième trimestre de 2022, [la fusion](/upgrades/merge/) aura lieu, ce qui aura pour conséquence de faire passer Ethereum de la preuve de travail à la preuve d'enjeu. Ce changement signifie que miner de l'Ethereum ne sera plus possible. Si le minage d'Ethereum vous intéresse quand-même, vous pouvez demander de l'aide auprès de communautés spécialisées, telles que [/r/EtherMining](https://www.reddit.com/r/EtherMining/).
Nous ne vous recommandons pas d'investir dans de l'équipement de minage si vous n'êtes pas déjà en train de miner de l'Ethereum. Pendant le deuxième trimestre de 2022, [la fusion](/upgrades/merge/) aura lieu, ce qui aura pour conséquence de faire passer Ethereum de la preuve de travail à la preuve d'enjeu. Ce changement signifie que miner de l'Ethereum ne sera plus possible.
2 changes: 1 addition & 1 deletion src/content/translations/id/community/support/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,4 @@ Transaksi di Ethereum dapat terkadang mengalami kemacetan jika Anda telah mengir

#### Bagaimana cara menambang Ethereum? {#mining-ethereum}

Kami tidak menyarankan membeli peralatan menambang jika Anda belum menambang Ethereum. Di ~Q3/Q4 2022, [penggabungan](/upgrades/merge/) akan terjadi, yang mengalihkan Ethereum dari bukti kerja ke bukti taruhan. Perubahan ini berarti menambang Ethereum tidak akan mungkin lagi. Jika Anda masih tertarik dengan menambang Ethereum, Anda dapat mencari bantuan dari komunitas menambang, seperti [/r/EtherMining](https://www.reddit.com/r/EtherMining/).
Kami tidak menyarankan membeli peralatan menambang jika Anda belum menambang Ethereum. Di ~Q3/Q4 2022, [penggabungan](/upgrades/merge/) akan terjadi, yang mengalihkan Ethereum dari bukti kerja ke bukti taruhan. Perubahan ini berarti menambang Ethereum tidak akan mungkin lagi.
Loading

0 comments on commit 2a57448

Please sign in to comment.