Skip to content

Commit

Permalink
Merge pull request ethereum#11015 from woseK/dev
Browse files Browse the repository at this point in the history
Fixed a few typos
  • Loading branch information
corwintines authored Sep 6, 2023
2 parents 12fd349 + 2f0b75e commit 6b294aa
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions src/content/community/code-of-conduct/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Open participation is core to the ethereum.org ethos. We are a website and commu

### Scope {#scope}

This Code of Conduct applies to all ethereum.org spaces (such as GitHub, Discord, Figma Crowdin, Twitter and other online platforms), and it also applies when the community is represented in real-world public spaces such as at meetups, conferences and events.
This Code of Conduct applies to all ethereum.org spaces (such as GitHub, Discord, Figma, Crowdin, Twitter and other online platforms), and it also applies when the community is represented in real-world public spaces such as at meetups, conferences and events.

### Our standards {#our-standards}

Expand All @@ -52,7 +52,7 @@ Examples of unacceptable behavior by participants include:

- Physical violence, threatening physical violence or encouraging of physical violence of any kind
- Using sexualized language or imagery or imposing unwelcome sexual attention
- Impersonating another individual or otherwise dishonestly claiming affiliation with some individual or organization.
- Impersonating another individual or otherwise dishonestly claiming affiliation with some individual or organization
- Trolling, insulting/derogatory comments, and personal or political attacks
- Harassing other community members in public or private channels
- Publishing others’ private information, such as a physical or electronic address, without explicit permission
Expand Down
2 changes: 1 addition & 1 deletion src/content/developers/docs/bridges/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ For developers, there are many ways to add support for bridges:
- Assessment and maintenance of bridges are hard and time-consuming.
- Selecting one bridge creates a single point of failure and dependency.
- The dapp is limited by the bridge’s capabilities.
- Bridges alone might not be enough. dapps might need DEXs to offer more functionality such as cross-chain swaps.
- Bridges alone might not be enough. Dapps might need DEXs to offer more functionality such as cross-chain swaps.

4. **Integrating multiple bridges –** This solution solves many problems associated with integrating a single bridge. However, it also has limitations, as integrating multiple bridges is resource-consuming and creates technical and communication overheads for developers—the scarcest resource in crypto.

Expand Down
2 changes: 1 addition & 1 deletion src/content/developers/docs/design-and-ux/index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Design and UX in web3
description: Introduction to UX design an research in web3 space and Ethereum
description: Introduction to UX design and research in web3 space and Ethereum
lang: en
---

Expand Down
2 changes: 1 addition & 1 deletion src/content/energy-consumption/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ lang: en

Ethereum is a green blockchain. Ethereum's [proof-of-stake](/developers/docs/consensus-mechanisms/pos) consensus mechanism uses ETH instead of [energy to secure the network](/developers/docs/consensus-mechanisms/pow). Ethereum's energy consumption is approximately [~0.0026 TWh/yr](https://carbon-ratings.com/eth-report-2022) across the entire global network.

The energy consumption estimate for Ethereum comes from a [CCRI (Crypto Carbon Ratings Institute)](https://carbon-ratings.com) study. They generated bottom-up estimates of the electricity consumption and the carbon footprint of the Ethereum network ([see the report](https://carbon-ratings.com/eth-report-2022)). They measured the electricity consumption of different nodes with various hardware and client software configurations. The estimated **2,601 MWh** (0.0026 TWh) for the network’s annual electricity consumption corresponds to yearly carbon emissions of **870 tonnes CO2e** applying regional-specific carbon intensity factors. This value changes as nodes enter and leave the network - you can keep track using a rolling 7-day average estimate by the [Cambridge Blockchain network Sustainability Index](https://ccaf.io/cbnsi/ethereum) (note that they use a slightly different method for their estimates - details available on their site).
The energy consumption estimate for Ethereum comes from a [CCRI (Crypto Carbon Ratings Institute)](https://carbon-ratings.com) study. They generated bottom-up estimates of the electricity consumption and the carbon footprint of the Ethereum network ([see the report](https://carbon-ratings.com/eth-report-2022)). They measured the electricity consumption of different nodes with various hardware and client software configurations. The estimated **2,601 MWh** (0.0026 TWh) for the network’s annual electricity consumption corresponds to yearly carbon emissions of **870 tonnes CO2e** applying regional-specific carbon intensity factors. This value changes as nodes enter and leave the network - you can keep track using a rolling 7-day average estimate by the [Cambridge Blockchain Network Sustainability Index](https://ccaf.io/cbnsi/ethereum) (note that they use a slightly different method for their estimates - details available on their site).

To contextualize Ethereum's energy consumption, we can compare annualized estimates for some other industries. This helps us better understand whether the estimate for Ethereum is high or low.

Expand Down
4 changes: 2 additions & 2 deletions src/content/guides/how-to-use-a-wallet/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ lang: en

# How to use a wallet

Learn how to operate all the basic functions of a wallet. If you don’t have one yet, check out our [How to: create an Ethereum account](/guides/how-to-create-an-ethereum-account/).
Learn how to operate all the basic functions of a wallet. If you don’t have one yet, check out our [How to create an Ethereum account](/guides/how-to-create-an-ethereum-account/).

## Open your wallet

Expand Down Expand Up @@ -51,7 +51,7 @@ Your address will be the same in all Ethereum projects. You do not need to regis

1. Visit any project’s website.
2. If the project's landing page is just a static description of the project, you should be able to click on an "Open the App" button in the menu which will navigate you to the actual web app.
3. Once you are in the app click on “Connect”
3. Once you are in the app click on “Connect”.

![Button allowing user to connect to the website with a wallet](./connect1.png)

Expand Down
4 changes: 2 additions & 2 deletions src/content/roadmap/account-abstraction/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ For example, backup keys can be added to a wallet so that if you lose or acciden
- **Multisig authorization**: You can share authorization credentials across multiple trusted people or devices. Then the contract can be configured so that transactions of more than some preset value require authorization from a certain proportion (e.g. 3/5) of the trusted parties. For example, high value transactions might require approval from both a mobile device and a hardware wallet, or signatures from accounts distributed to trusted family members.
- **Account freezing**: If a device is lost or compromised the account can be locked from another authorized device, protecting the user's assets.
- **Account recovery**: Lost a device or forgotten a password? In the current paradigm this means your assets could be frozen forever. With a smart contract wallet, you can set some pre-approved accounts that can authorize new devices and reset access.
- **Set transaction limits**: specify daily thresholds for how much value can be transferred from the account in a day/week/month. This means if an attacker does gain access to your account they can't drain everything at once and you have opportunities to freeze and reset access.
- **Create whitelists**: only allow transactions to certain addresses that you know to be safe. This means that _even if_ your private key was stolen, the attacker could not send funds to non-whitelisted destination accounts. These whitelists would require multiple signatures to change them so that an attacker couldn't add their own address to the list unless they had access to several of your backup keys.
- **Set transaction limits**: Specify daily thresholds for how much value can be transferred from the account in a day/week/month. This means if an attacker does gain access to your account they can't drain everything at once and you have opportunities to freeze and reset access.
- **Create whitelists**: Only allow transactions to certain addresses that you know to be safe. This means that _even if_ your private key was stolen, the attacker could not send funds to non-whitelisted destination accounts. These whitelists would require multiple signatures to change them so that an attacker couldn't add their own address to the list unless they had access to several of your backup keys.

## Better user experience {#better-user-experience}

Expand Down
2 changes: 1 addition & 1 deletion src/content/roadmap/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,4 @@ Sharding is splitting up the Ethereum blockchain so that subsets of validators a
- [Secret leader election](/roadmap/secret-leader-election) - Clever cryptography can be used to ensure that the identity of the current block proposer is not made public, protecting them from certain types of attack.
- [Account abstraction](/roadmap/account-abstraction) - Account abstraction is a class of upgrades that support smart contract wallets natively on Ethereum, rather than having to use complex middleware.
- [Verkle trees](/roadmap/verkle-trees) - Verkle trees are a data structure that can be used to enable stateless clients on Ethereum. These “stateless” clients will require a tiny amount of storage space but will still be able to verify new blocks.
- [Statelessness](/roadmap/statelessness) - stateless clients will be able to verify new blocks without having to store large amounts of data. This will provide all the benefits of running a node with only a tiny fraction of today’s costs.
- [Statelessness](/roadmap/statelessness) - Stateless clients will be able to verify new blocks without having to store large amounts of data. This will provide all the benefits of running a node with only a tiny fraction of today’s costs.
2 changes: 1 addition & 1 deletion src/intl/en/page-wallets.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"page-wallets-stay-safe-desc": "Financial freedom and the ability to access and use funds anywhere comes with responsibility – there’s no customer support in crypto. You are responsible for keeping your keys safe and secure.",
"page-wallets-subtitle": "Wallets help you access your digital assets and sign in to applications.",
"page-wallets-take-responsibility": "Take responsibility for your own funds",
"page-wallets-take-responsibility-desc": "Centralized exchanges will link your wallet to a username and password that you can recover in a traditional way. Just remember you’re trusting that exchange with custody over your funds. If the exchange has financial trouble, your funds would be risk.",
"page-wallets-take-responsibility-desc": "Centralized exchanges will link your wallet to a username and password that you can recover in a traditional way. Just remember you’re trusting that exchange with custody over your funds. If the exchange has financial trouble, your funds would be at risk.",
"page-wallets-tips": "More tips on staying safe",
"page-wallets-tips-community": "From the community",
"page-wallets-title": "Ethereum wallets",
Expand Down

0 comments on commit 6b294aa

Please sign in to comment.