From 51aaab3f10fc9ba9bfdb678fba9d70063a2e401a Mon Sep 17 00:00:00 2001 From: Paul Wackerow <54227730+wackerow@users.noreply.github.com> Date: Tue, 25 May 2021 23:11:57 -0700 Subject: [PATCH 1/6] removes use of sidechain for rollups small touch ups --- .../developers/docs/scaling/layer-2-rollups/index.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/content/developers/docs/scaling/layer-2-rollups/index.md b/src/content/developers/docs/scaling/layer-2-rollups/index.md index 4f76ccaa54b..f9128f38c44 100644 --- a/src/content/developers/docs/scaling/layer-2-rollups/index.md +++ b/src/content/developers/docs/scaling/layer-2-rollups/index.md @@ -50,7 +50,7 @@ The ZK-rollup smart contract maintains the state of all transfers on layer 2, an With a ZK-rollup, there are no delays when moving funds from layer 2 to layer 1 because a validity proof accepted by the ZK-rollup contract has already verified the funds. -The sidechain where ZK-rollups happen can be optimised to reduce transaction size further. For instance, an account is represented by an index rather than an address, which reduces a transaction from 32 bytes to just 4 bytes. Transactions are also written to Ethereum as calldata, reducing gas. +Being on layer 2, ZK-rollups can be optimised to reduce transaction size further. For instance, an account is represented by an index rather than an address, which reduces a transaction from 32 bytes to just 4 bytes. Transactions are also written to Ethereum as `calldata`, reducing gas. #### Pros and cons {#zk-pros-and-cons} @@ -73,11 +73,11 @@ Multiple implementations of ZK-rollups exist that you can integrate into your da ### Optimistic rollups {#optimistic-rollups} -Optimistic rollups use a sidechain that sits in parallel to the main Ethereum chain. They can offer improvements in scalability because they don't do any computation by default. Instead, after a transaction they propose the new state to mainnet. Or "notarise" the transaction. +Optimistic rollups sit in parallel to the main Ethereum chain on layer 2. They can offer improvements in scalability because they don't do any computation by default. Instead, after a transaction they propose the new state to mainnet, or "notarise" the transaction. -With Optimistic rollups transactions are written to the main Ethereum chain as calldata, optimising them further by reducing the gas cost. +With Optimistic rollups, transactions are written to the main Ethereum chain as `calldata`, optimising them further by reducing the gas cost. -As computation is the slow, expensive part of using Ethereum, Optimistic rollups can offer up to 10-100x improvements in scalability dependent on the transaction. This number will increase even more with the introduction of the Eth2 upgrade: [shard chains](/eth2/shard-chains). This is because there will be more data available in the event that a transaction is disputed. +As computation is the slow, expensive part of using Ethereum, Optimistic rollups can offer up to 10-100x improvements in scalability dependent on the transaction. This number will increase even more with the introduction of [shard chains](/eth2/shard-chains). This is because there will be more data available in the event that a transaction is disputed. #### Disputing transactions {#disputing-transactions} From f3101f2607480accc2967eb329075ba65afaabc8 Mon Sep 17 00:00:00 2001 From: ryancreatescopy <40891631+ryancreatescopy@users.noreply.github.com> Date: Wed, 26 May 2021 15:27:15 +0100 Subject: [PATCH 2/6] fixing 51% attack paragraph --- src/intl/en/page-eth2-staking.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/intl/en/page-eth2-staking.json b/src/intl/en/page-eth2-staking.json index 9995dccd159..4ee5bc0bf76 100644 --- a/src/intl/en/page-eth2-staking.json +++ b/src/intl/en/page-eth2-staking.json @@ -56,7 +56,7 @@ "page-eth2-staking-upgrades-li-5": "A miner upgrade will follow to enable withdraw of staked funds.", "page-eth2-staking-upgrades-title": "Proof-of-stake and Eth2 upgrades", "page-eth2-staking-validators": "More validators, more security", - "page-eth2-staking-validators-desc": "In a blockchain like Ethereum it is possible to corrupt it if you control 51% of the network. For example you could get 51% of validators to state that your balance reads 1,000,000 ETH and not 1 ETH. But, to control 51% of validators, you’d need to own 51% of the ETH in the system – that’s a lot!", + "page-eth2-staking-validators-desc": "In a blockchain like Ethereum it is possible to censor and reorder transactions to suit you if you control a majority of the network. But, to control a majority of validators, you’d need to control a majority of the ETH in the system – that’s a lot! This amount of ETH grows every time a new validator enters the system, bolstering the security of the network. Proof-of-work, the security model proof-of-stake will replace, requires the validators (miners) to have specialist hardware and lots of physical space – entering the system as a miner is difficult so security against majority attacks doesn't increase as much. Proof-of-stake doesn't have these requirements, which should grow the network (and its resistance to majority attacks) to sizes that aren't possible with proof of work.", "page-eth2-staking-withdrawals": "Withdrawals won't be live right away", "page-eth2-staking-withdrawals-desc": "You won't be able to withdraw your stake until future upgrades are deployed. Withdraws will be available in a miner upgrade following the merge of mainnet with the Beacon Chain." } From f7eaba5315c5d2c8925fa06cf7a44f3542419436 Mon Sep 17 00:00:00 2001 From: ryancreatescopy <40891631+ryancreatescopy@users.noreply.github.com> Date: Wed, 26 May 2021 15:28:14 +0100 Subject: [PATCH 3/6] Update page-eth2-staking.json --- src/intl/en/page-eth2-staking.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/intl/en/page-eth2-staking.json b/src/intl/en/page-eth2-staking.json index 4ee5bc0bf76..8e403dc5bc4 100644 --- a/src/intl/en/page-eth2-staking.json +++ b/src/intl/en/page-eth2-staking.json @@ -56,7 +56,7 @@ "page-eth2-staking-upgrades-li-5": "A miner upgrade will follow to enable withdraw of staked funds.", "page-eth2-staking-upgrades-title": "Proof-of-stake and Eth2 upgrades", "page-eth2-staking-validators": "More validators, more security", - "page-eth2-staking-validators-desc": "In a blockchain like Ethereum it is possible to censor and reorder transactions to suit you if you control a majority of the network. But, to control a majority of validators, you’d need to control a majority of the ETH in the system – that’s a lot! This amount of ETH grows every time a new validator enters the system, bolstering the security of the network. Proof-of-work, the security model proof-of-stake will replace, requires the validators (miners) to have specialist hardware and lots of physical space – entering the system as a miner is difficult so security against majority attacks doesn't increase as much. Proof-of-stake doesn't have these requirements, which should grow the network (and its resistance to majority attacks) to sizes that aren't possible with proof of work.", + "page-eth2-staking-validators-desc": "In a blockchain like Ethereum it is possible to censor and reorder transactions to suit you if you control a majority of the network. But, to control a majority of the network, you need a majority of validators, and for this you’d need to control a majority of the ETH in the system – that’s a lot! This amount of ETH grows every time a new validator enters the system, bolstering the security of the network. Proof-of-work, the security model proof-of-stake will replace, requires the validators (miners) to have specialist hardware and lots of physical space – entering the system as a miner is difficult so security against majority attacks doesn't increase as much. Proof-of-stake doesn't have these requirements, which should grow the network (and its resistance to majority attacks) to sizes that aren't possible with proof of work.", "page-eth2-staking-withdrawals": "Withdrawals won't be live right away", "page-eth2-staking-withdrawals-desc": "You won't be able to withdraw your stake until future upgrades are deployed. Withdraws will be available in a miner upgrade following the merge of mainnet with the Beacon Chain." } From 721c3e581dccaac96786de7397bc0ca49e3dff44 Mon Sep 17 00:00:00 2001 From: Sam Richards Date: Wed, 26 May 2021 12:31:04 -0700 Subject: [PATCH 4/6] v2.29.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d454ad76816..5b6f2f8a3ce 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ethereum-org-website", - "version": "2.29.1", + "version": "2.29.2", "description": "Website of ethereum.org", "main": "index.js", "repository": "git@github.com:ethereum/ethereum-org-website.git", From f75e5daafea9f2ed48125efe8477da9e4dc35712 Mon Sep 17 00:00:00 2001 From: GeorgeTrotter <71328004+GeorgeTrotter@users.noreply.github.com> Date: Wed, 26 May 2021 15:42:26 -0400 Subject: [PATCH 5/6] Create index.md --- src/content/about/community-lead/index.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/content/about/community-lead/index.md b/src/content/about/community-lead/index.md index 37e3fc77024..5235a836f23 100644 --- a/src/content/about/community-lead/index.md +++ b/src/content/about/community-lead/index.md @@ -60,4 +60,6 @@ Ethereum.org is led by a team within the Ethereum Foundation. [Learn more about ## Contract details: - This is a full-time, remote position. -- Compensation will ultimately depend on your experience, skillset, location and the contract structure but you can expect $25-$40 USD per hour, or $50,000-$80,000 USD annual salary. +- Compensation will ultimately depend on your experience, skillset, location and the contract structure but you can expect $35-$45 USD per hour, or $70,000-$85,000 USD annual salary. + +To apply to this position, please include a brief (less than one page) cover letter explaining your qualifications and how you would like to improve the Ethereum community, along with a resume or CV. From eda1359aee95a6827e30059be5330793ddaf649a Mon Sep 17 00:00:00 2001 From: Sam Richards Date: Wed, 26 May 2021 12:50:23 -0700 Subject: [PATCH 6/6] Update frontmatter --- src/content/about/community-lead/index.md | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/content/about/community-lead/index.md b/src/content/about/community-lead/index.md index 5235a836f23..82e2ce374dc 100644 --- a/src/content/about/community-lead/index.md +++ b/src/content/about/community-lead/index.md @@ -5,14 +5,13 @@ lang: en sidebar: true template: job position: Community and ecosystem lead -compensation: "$50,000 - $80,000 USD" +compensation: "$70,000 - $85,000 USD" location: Remote type: "Full-time" link: https://ethereum.bamboohr.com/jobs/view.php?id=37 image: ../../../assets/enterprise-eth.png --- - ## Our background: The Ethereum Foundation (EF) is a global non-profit organization dedicated to supporting Ethereum and related technologies. Our mission is to do what is best for Ethereum’s long-term success. Our role is to allocate resources to critical projects, to be a valued voice within the Ethereum ecosystem, and to advocate for Ethereum to the outside world. @@ -26,17 +25,17 @@ Ethereum.org is led by a team within the Ethereum Foundation. [Learn more about ## Core responsibilities: - **Inspire contribution in our open source community across multiple platforms and projects.** - - Whether it's the ethereum.org [Github repo](https://github.com/ethereum/ethereum-org-website), our [Crowdin translation program](https://crowdin.com/project/ethereumfoundation), or just answering common questions for the curious, we rely on our community to drive our success. - - We want you to take our community to new heights; engage with them on Discord channels, respond to Github issues, coordinate contests, events, recognition campaigns; expand participation and impact. + - Whether it's the ethereum.org [Github repo](https://github.com/ethereum/ethereum-org-website), our [Crowdin translation program](https://crowdin.com/project/ethereumfoundation), or just answering common questions for the curious, we rely on our community to drive our success. + - We want you to take our community to new heights; engage with them on Discord channels, respond to Github issues, coordinate contests, events, recognition campaigns; expand participation and impact. - **Work with Ethereum's wider community to facilitate collaboration.** - - Ethereum.org is an important part of the Ethereum ecosystem. You'll work with partners and stakeholders to maximize our impact wherever possible. - - Are there killer explainer videos we could be using on our website? Are there eager open source developers looking for a way to get their hands dirty? We'll look to you to manage these relationships and execute on opportunities to empower others. + - Ethereum.org is an important part of the Ethereum ecosystem. You'll work with partners and stakeholders to maximize our impact wherever possible. + - Are there killer explainer videos we could be using on our website? Are there eager open source developers looking for a way to get their hands dirty? We'll look to you to manage these relationships and execute on opportunities to empower others. - **Set and execute on growth metrics for community engagement.** - - The importance of a community can never be boiled down to just numbers. Nevertheless, an analytic attitude towards our performance will help us understand and improve our results. - - We'll look to you to help establish what milestones we should strive for and to hold yourself accountable to achieving them. + - The importance of a community can never be boiled down to just numbers. Nevertheless, an analytic attitude towards our performance will help us understand and improve our results. + - We'll look to you to help establish what milestones we should strive for and to hold yourself accountable to achieving them. - **Surface insights and distill community feedback to improve our web applications.** - - You should have a product mindset and always be looking for opportunities to improve the content on ethereum.org and the UX in our web applications. You're excited to take an active voice in driving our product roadmap. - - Have you answered the same question ten times this week? Are people reading ethereum.org content but still coming out confused? Are we getting consistent feedback from our community about a feature missing from something we built? What changes should we be making to address these issues? You should derive insights proactively. + - You should have a product mindset and always be looking for opportunities to improve the content on ethereum.org and the UX in our web applications. You're excited to take an active voice in driving our product roadmap. + - Have you answered the same question ten times this week? Are people reading ethereum.org content but still coming out confused? Are we getting consistent feedback from our community about a feature missing from something we built? What changes should we be making to address these issues? You should derive insights proactively. ## About you: