Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Merged by Bors] - Rename Eth1/Eth2 in documents #3021

Closed
wants to merge 18 commits into from
Closed

[Merged by Bors] - Rename Eth1/Eth2 in documents #3021

wants to merge 18 commits into from

Conversation

ackintosh
Copy link
Member

@ackintosh ackintosh commented Feb 14, 2022 •
edited
Loading

Issue Addressed

Resolves #3019

Proposed Changes

  • Eth2 Eth2.0 Ethereum 2.0 -> Ethereum consensus
  • Eth2 network -> consensus layer
  • Ethereum 2.0 specification -> Ethereum proof-of-stake consensus specification
  • Eth2 deposit contract -> Staking deposit contract
  • Eth1 -> execution client

Additional Info

The description needs to be updated by someone who has permission to do. 馃摑

image

ackintosh
ackintosh commented Feb 14, 2022
View reviewed changes
book/src/key-management.md
@@ -3,7 +3,7 @@
[launchpad]: https://launchpad.ethereum.org/

>
> **Note: we recommend using the [Eth2 launchpad][launchpad] to create validators.**
> **Note: we recommend using the [Staking launchpad][launchpad] to create validators.**
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ref: https://launchpad.ethereum.org/

Staking Launchpad

@ackintosh ackintosh marked this pull request as ready for review February 14, 2022 15:13
realbigsean
realbigsean reviewed Feb 22, 2022
View reviewed changes
book/src/api-bn.md Outdated Show resolved Hide resolved
realbigsean
realbigsean reviewed Feb 22, 2022
View reviewed changes
book/src/api-bn.md Outdated Show resolved Hide resolved
realbigsean
realbigsean reviewed Feb 22, 2022
View reviewed changes
book/src/faq.md Outdated Show resolved Hide resolved
realbigsean
realbigsean reviewed Feb 22, 2022
View reviewed changes
book/src/faq.md Outdated Show resolved Hide resolved
realbigsean
realbigsean requested changes Feb 22, 2022
View reviewed changes
Copy link
Member

@realbigsean realbigsean left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot for this @ackintosh !

@realbigsean realbigsean added the waiting-on-author The reviewer has suggested changes and awaits thier implementation. label Feb 22, 2022
ackintosh and others added 10 commits February 23, 2022 12:53
@ackintosh @realbigsean
Update book/src/api-bn.md
50a5a58 
Co-authored-by: realbigsean <seananderson33@GMAIL.com>
@ackintosh @realbigsean
Update book/src/api-bn.md
8fa2395 
Co-authored-by: realbigsean <seananderson33@GMAIL.com>
@ackintosh @realbigsean
Update book/src/api-lighthouse.md
f87b454 
Co-authored-by: realbigsean <seananderson33@GMAIL.com>
@ackintosh @realbigsean
Update book/src/faq.md
a15aae7 
Co-authored-by: realbigsean <seananderson33@GMAIL.com>
@ackintosh @realbigsean
Update book/src/faq.md
f8a649e 
Co-authored-by: realbigsean <seananderson33@GMAIL.com>
@ackintosh @realbigsean
Update book/src/key-recovery.md
08b44ce 
Co-authored-by: realbigsean <seananderson33@GMAIL.com>
@ackintosh @realbigsean
Update book/src/mainnet-validator.md
6ba1b9f 
Co-authored-by: realbigsean <seananderson33@GMAIL.com>
@ackintosh @realbigsean
Update book/src/mainnet-validator.md
a6431b0 
Co-authored-by: realbigsean <seananderson33@GMAIL.com>
@ackintosh @realbigsean
Update book/src/mainnet-validator.md
42601ba 
Co-authored-by: realbigsean <seananderson33@GMAIL.com>
@ackintosh @realbigsean
Update book/src/slashing-protection.md
2a3cafe 
Co-authored-by: realbigsean <seananderson33@GMAIL.com>
ackintosh and others added 4 commits February 23, 2022 12:56
@ackintosh @realbigsean
Update book/src/validator-doppelganger.md
45581d8 
Co-authored-by: realbigsean <seananderson33@GMAIL.com>
@ackintosh @realbigsean
Update book/src/validator-import-launchpad.md
387fe93 
Co-authored-by: realbigsean <seananderson33@GMAIL.com>
@ackintosh @realbigsean
Update book/src/voluntary-exit.md
7748641 
Co-authored-by: realbigsean <seananderson33@GMAIL.com>
@ackintosh @realbigsean
Update book/src/voluntary-exit.md
4e91129 
Co-authored-by: realbigsean <seananderson33@GMAIL.com>
@ackintosh
Copy link
Member Author

@realbigsean Thank you for your review!

realbigsean
realbigsean requested changes Feb 28, 2022
View reviewed changes
Copy link
Member

@realbigsean realbigsean left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry I had a couple more tiny ones I think I missed before!

book/src/api-bn.md Outdated Show resolved Hide resolved
book/src/redundancy.md Outdated Show resolved Hide resolved
ackintosh and others added 2 commits March 1, 2022 08:24
@ackintosh @realbigsean
Update book/src/api-bn.md
476b0cc 
Co-authored-by: realbigsean <seananderson33@GMAIL.com>
@ackintosh @realbigsean
Update book/src/redundancy.md
69dd523 
Co-authored-by: realbigsean <seananderson33@GMAIL.com>
realbigsean
realbigsean approved these changes Mar 1, 2022
View reviewed changes
Copy link
Member

@realbigsean realbigsean left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a ton @ackintosh !

@realbigsean realbigsean added ready-for-merge This PR is ready to merge. and removed waiting-on-author The reviewer has suggested changes and awaits thier implementation. labels Mar 1, 2022
@AgeManning
Copy link
Member

bors r+

bors bot pushed a commit that referenced this pull request Mar 2, 2022
@ackintosh
Rename Eth1/Eth2 in documents (#3021)
668115a 
## Issue Addressed

Resolves #3019

## Proposed Changes

- Eth2 Eth2.0 Ethereum 2.0 -> Ethereum consensus
- Eth2 network -> consensus layer
- Ethereum 2.0 specification -> Ethereum proof-of-stake consensus specification
- Eth2 deposit contract -> Staking deposit contract
- Eth1 -> execution client

## Additional Info

The description needs to be updated by someone who has permission to do. 馃摑 

<img width="487" alt="image" src="https://user-images.githubusercontent.com/1885716/153995211-816d9561-751e-4810-abb9-83d979379783.png">
@bors
Copy link

bors bot commented Mar 2, 2022

Pull request successfully merged into unstable.

Build succeeded:

@bors bors bot changed the title Rename Eth1/Eth2 in documents [Merged by Bors] - Rename Eth1/Eth2 in documents Mar 2, 2022
@bors bors bot closed this Mar 2, 2022
@ackintosh ackintosh deleted the renaming branch March 2, 2022 05:53
@ackintosh ackintosh mentioned this pull request Mar 2, 2022
Closed
pawanjay176 added a commit to pawanjay176/lighthouse that referenced this pull request Mar 2, 2022
@pawanjay176
Squashed commit of Rename random to prev_randao sigp#3040:
1630817 
commit 6370edd
Author: Paul Hauner <paul@paulhauner.com>
Date:   Wed Mar 2 16:31:18 2022 +1100

    Update testing/execution_engine_integration/src/build_geth.rs

    Co-authored-by: Michael Sproul <micsproul@gmail.com>

commit f5a1dee
Author: Paul Hauner <paul@paulhauner.com>
Date:   Wed Mar 2 16:24:03 2022 +1100

    Fix proto-array bug

commit 4f7610f
Author: Paul Hauner <paul@paulhauner.com>
Date:   Wed Mar 2 16:23:52 2022 +1100

    Fix payload tests

commit cd7a0f5
Author: Paul Hauner <paul@paulhauner.com>
Date:   Wed Mar 2 15:22:54 2022 +1100

    Implement consensus-specs/2844

commit 5313364
Merge: d5e84a5 668115a
Author: Paul Hauner <paul@paulhauner.com>
Date:   Wed Mar 2 14:23:19 2022 +1100

    Merge branch 'unstable' into prev-randao-rename

commit d5e84a5
Author: Paul Hauner <paul@paulhauner.com>
Date:   Wed Mar 2 13:31:45 2022 +1100

    Fix windows test errors

commit 668115a
Author: Akihito Nakano <sora.akatsuki@gmail.com>
Date:   Wed Mar 2 01:05:08 2022 +0000

    Rename Eth1/Eth2 in documents (sigp#3021)

    ## Issue Addressed

    Resolves sigp#3019

    ## Proposed Changes

    - Eth2 Eth2.0 Ethereum 2.0 -> Ethereum consensus
    - Eth2 network -> consensus layer
    - Ethereum 2.0 specification -> Ethereum proof-of-stake consensus specification
    - Eth2 deposit contract -> Staking deposit contract
    - Eth1 -> execution client

    ## Additional Info

    The description needs to be updated by someone who has permission to do. 馃摑

    <img width="487" alt="image" src="https://user-images.githubusercontent.com/1885716/153995211-816d9561-751e-4810-abb9-83d979379783.png">

commit e34524b
Author: Age Manning <Age@AgeManning.com>
Date:   Wed Mar 2 01:05:07 2022 +0000

    Increase default target-peer count to 80 (sigp#3005)

    Increase the default peer count from 50 to 80

commit db2e3ae
Author: Paul Hauner <paul@paulhauner.com>
Date:   Wed Mar 2 11:08:40 2022 +1100

    Fix yaml indenting

commit a2f99e5
Author: Paul Hauner <paul@paulhauner.com>
Date:   Wed Mar 2 11:05:57 2022 +1100

    Specify go version in github actions

commit 0c5e9c6
Author: Paul Hauner <paul@paulhauner.com>
Date:   Wed Mar 2 11:04:15 2022 +1100

    Switch EE tests to be a binary

commit 7f07fa5
Author: Paul Hauner <paul@paulhauner.com>
Date:   Wed Mar 2 10:22:32 2022 +1100

    Print output of failed make command

commit fa20696
Author: Paul Hauner <paul@paulhauner.com>
Date:   Wed Mar 2 10:01:00 2022 +1100

    Bump spec tests version

commit c2d7677
Author: Paul Hauner <paul@paulhauner.com>
Date:   Sat Feb 26 10:17:14 2022 +1100

    Add auth port

commit 540337a
Author: Paul Hauner <paul@paulhauner.com>
Date:   Sat Feb 26 10:10:06 2022 +1100

    Use `merge-kiln-v2` branch for geth

commit 1a3d32e
Author: Paul Hauner <paul@paulhauner.com>
Date:   Fri Feb 25 15:08:38 2022 +1100

    Revert "Add serde "random" alias"

    This reverts commit bb02c2f.

commit 63376bd
Author: Paul Hauner <paul@paulhauner.com>
Date:   Fri Feb 25 14:59:26 2022 +1100

    Add serde "random" alias

commit 375aa32
Author: Paul Hauner <paul@paulhauner.com>
Date:   Fri Feb 25 10:09:38 2022 +1100

    Rename random to prev_randao

commit b6493d5
Author: Paul Hauner <paul@paulhauner.com>
Date:   Tue Mar 1 22:56:47 2022 +0000

    Enforce Optimistic Sync Conditions & CLI Tests (v2) (sigp#3050)

    ## Description

    This PR adds a single, trivial commit (f5d2b27) atop sigp#2986 to resolve a tests compile error. The original author (@ethDreamer) is AFK so I'm getting this one merged 鈽猴笍

    Please see sigp#2986 for more information about the other, significant changes in this PR.

    Co-authored-by: Mark Mackey <mark@sigmaprime.io>
    Co-authored-by: ethDreamer <37123614+ethDreamer@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@realbigsean realbigsean realbigsean approved these changes

Assignees
No one assigned
Labels
ready-for-merge This PR is ready to merge.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@ackintosh @AgeManning @realbigsean