From a3e15aa589a33378906dec37da2d29258afe19a2 Mon Sep 17 00:00:00 2001 From: tvanepps Date: Tue, 27 Jun 2023 21:09:55 -0400 Subject: [PATCH 01/24] Update 4-roles-expectations.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Currently includes unspecific references to the “ethos of decentralization,” a list of general characteristics that contributions should have, and descriptions of possible exceptions - Over the course of the Pilot, it became clear that the eligibility and the process for changing it should be better defined - see the DVT discussions - this PR adds explicit projects and research areas which maintain and progress the core protocol --- docs/4-roles-expectations.md | 39 ++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/docs/4-roles-expectations.md b/docs/4-roles-expectations.md index a5a9b8f..7cd4f5a 100644 --- a/docs/4-roles-expectations.md +++ b/docs/4-roles-expectations.md @@ -14,7 +14,7 @@ It should be noted that the Guild as an entity does not directly manage or parti ## 4.2 Members -For the pilot, members of the Protocol Guild will have up to three different functions: [slot holders](https://protocol-guild.readthedocs.io/en/latest/4-roles-expectations.html#slot-holders), [curators](https://protocol-guild.readthedocs.io/en/latest/4-roles-expectations.html#curators) and [signers](https://protocol-guild.readthedocs.io/en/latest/4-roles-expectations.html#signers). +For the Pilot, members of the Protocol Guild will have up to three different functions: [slot holders](https://protocol-guild.readthedocs.io/en/latest/4-roles-expectations.html#slot-holders), [curators](https://protocol-guild.readthedocs.io/en/latest/4-roles-expectations.html#curators) and [signers](https://protocol-guild.readthedocs.io/en/latest/4-roles-expectations.html#signers). ### 4.21 Slot Holders @@ -22,25 +22,34 @@ Slot holders are members of the Guild who have qualified for a placement (slot) #### Qualifications -Members should be committed to Ethereum and its ethos of decentralization. The contributions of qualifying individuals should be: +Note: members should expect these guidelines to change over time, i.e. become more restrictive in some places and more permissive in others. -- Fully open source, ie. available for forking, modification and redistribution -- Continuous for at least 6 months ahead of inclusion -- Released under permissive licenses -- Part of the protocol, not built on top of it, e.g. a specific client implementation vs. an application -- Beneficial to the broader Ethereum community -- Dedicated to a permissionless, open access Ethereum +Qualifying contributions _must_ be: -It is possible for eligible individuals to work on a team which has a token, has VC backing or gives equity. However, members should expect these guidelines to change over time, i.e. become more restrictive in some places and more permissive in others. +- Fully open source, ie. both “source available” and free to fork, modify, redistribute +- The full focus of the individual (anything less receives a partial weighting, see [6.3 weighting](https://protocol-guild.readthedocs.io/en/latest/6-guidelines-for-regular-operation.html#weighting)) +- Continuous for at least 6 months ahead of inclusion, and ongoing -Though Ethereum is a highly technical field, it is clear that the work of non-developers around the core protocol is also crucial and should be eligible. This may include people affiliated with the All Core Devs call, those coordinating ecosystem upgrades, and anyone helping to coevolve the protocol alongside the community. +Qualifying contributions _must_ target at least one of the following projects/areas (note that some areas may not have explicit repos to link to): -There may also be contributors to Protocol Guild itself whose work is significant enough to consider for membership. This work may include: +1. Ethereum L1 core protocol maintenance and development -- general comms/public presentations to improve awareness or explain the mechanism -- fundraising from the broader ecosystem (eg. funding programs, individuals, larger entities who depend on Ethereum) -- research related to the evolution of the Guild itself: smart contract architecture, surveys to members, documentation -- internal maintenance for the Guild membership: helping with curation processes, onboarding/offboarding members +- Client implementations: [Erigon](https://github.com/ledgerwatch/erigon), [Geth](https://github.com/ethereum/go-ethereum), [Hyperledger Besu](https://github.com/hyperledger/besu), [Lighthouse](https://github.com/sigp/lighthouse), [Lodestar](https://github.com/ChainSafe/lodestar), [Nethermind](https://github.com/NethermindEth/nethermind), [Nimbus](https://github.com/status-im/nimbus-eth2), [Prysm](https://github.com/prysmaticlabs/prysm), [Teku](https://github.com/ConsenSys/teku) +- Client Testing/security/infra which supports these implementations +- Protocol maintenance and upgrades, and the related coordination: [EELS](https://github.com/ethereum/execution-specs) + +2. Research and implementation experiments related to potential protocol changes/refinements +- Verkle Tries, Portal Network, EVM + +3. Spec work resulting from the above, where the specs should be implementation agnostic, unopinionated +4. Protocol Guild itself + +- general comms +- fundraising +- research related to the evolution of the Guild itself +- internal maintenance for the Guild membership + +Qualifying contributions _usually_ occur in the collaborative context of a structured collaborative group - however, there have been independent unaffiliated contributors. #### Expectations From ec0dee64f63d1d27bf22cef67d13187b9bf86648 Mon Sep 17 00:00:00 2001 From: tvanepps Date: Tue, 27 Jun 2023 21:44:48 -0400 Subject: [PATCH 02/24] align operation guidelines with new qualifications MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - a rewrite of the Proposing and Discussing New Members section. The rewrite will better align with these more explicit Qualifications - Instead of proposing new members and new projects at the same time, the new process splits them into two distinct proposal types: “Members” and “Projects” --- docs/6-guidelines-for-regular-operation.md | 40 ++++++++++++---------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/docs/6-guidelines-for-regular-operation.md b/docs/6-guidelines-for-regular-operation.md index dd7018f..f15f338 100644 --- a/docs/6-guidelines-for-regular-operation.md +++ b/docs/6-guidelines-for-regular-operation.md @@ -24,39 +24,41 @@ Antifragility and non-gameability emerge from simple frameworks. This limits the - `timeWeighting` can be either 1.0 for full-time or .5 for part-time contributors - Existing contributors get "diluted" as newcomers come in - Continuing contributors get additional weight per month they are active. This means historic contributors don't maintain their split weighting if they leave protocol development - - Anyone who stops contributing is removed from the split via periodic curation reviews + - Anyone who stops contributing should remove themselves is removed from the split via periodic curation reviews -## 6.4 Proposing and Discussing New Members +## 6.4 Modifying Projects and Members -If current members believe that the set should be expanded to include another contributor, they should propose them well enough in advance of a membership update. This would mean at least a week. The process would look something like this: +Modifying eligible projects and active membership should be proposed separately in the case both are being considered. Both should be shared with the membership at least two weeks in advance of any onchain update. -1. An existing member (akin to an EIP champion) should send this info in the `proposed-members` channel. +### Adding/removing Projects + +Changing the list of [eligible projects](link) can be made through a PR to the docs repo. This PR should add the project in the appropriate section, along with the following info: + +- Name of project/research area +- Summary of why this project/research area should be considered eligible + +### Adding Members + +Changing the current membership can be done by an existing member making a PR in the membership repo (currently private to members only). + +When adding a new member, the PR should add the individual to the member list, along with the accompanying info: - Name / Identifier -- Team / Project -- Discord handle +- Project +- Discord handle - Link to relevant work, eg. GitHub, research - Summary of their work and eligibility -2. Discussion should be open for at least a few days to give members time to review and contribute to the discussion. This can be either with reacts on the proposal 👍 / 👎, ideally along with some written thoughts on why you think the proposed member fits the eligibility or not. Deliberations should strive to end in rough consensus, resorting to formal voting procedures only in rare extreme situations. +Discussion should be open for at least one week to give members time to review and discuss. This can be with reacts on the proposal 👍 / 👎 or written thoughts on why the proposed member fits the eligibility or not. -3. Once a positive consensus has been reached, the person can be contacted with the typical onboarding flow. +Once one week has passed, the PR should be merged. -If you are an existing core contributor that is not included, please contact an existing member to have them propose your work for consideration. +### Removing Members/adjusting weights/changing project affiliation -We are exploring tools and methods to make this process more transparent, potentially through a forum for discussion and to maintain a public record of decisions. +ideally this PR should come from the member themselves, in keeping with the spirit and mutual trust of self-curation. Where this isn't possible, the member should be notified or tagged on the PR so they are aware changes. ## 6.5 Onboarding new members Eligible and confirmed members should be given an onboarding form link to be added to the split contract at the next quarterly update. They should also be added to the Protocol Guild's Discord and given the proper `Guild Member` / Team roles. When introducing the concept to potential members or onboarding accepted ones, it should be noted that the submitted address should refer to an individual's personal wallet and *not* their employer's. If teams were the atomic unit, all team members would have to agree on whether to accept or decline membership, likely decreasing the number of participants. - -## 6.6 Guild Contact - -It may be the case that there should be a Guild Contact for each team. The backstop is each team/project, who only need to confirm when a contributor has been added or removed. One member of each team/project (e.g. Lighthouse) should agree to be the point of contact responsible for ensuring other members are aware of any significant developments like: - -- Explaining membership obligations to new team members -- Collecting addresses and signatures for inclusion in the eligible set -- Migration to a new smart contract -- A change to the weighting scheme From 64a1a995f767a390bc09b29d9d603edab1546fad Mon Sep 17 00:00:00 2001 From: tvanepps Date: Tue, 27 Jun 2023 21:49:13 -0400 Subject: [PATCH 03/24] delete old affiliation list delete list of teams to align with new qualifications around projects or research areas --- docs/index.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index 00e82f9..8a1ca74 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -6,8 +6,6 @@ Protocol Guild - by maintaining an onchain registry of its membership - which allows ecosystem sponsors to directly fund the membership, their work, the public good. -Members are from EF DevOps, EF Geth, EF Ipsilon, EF JavaScript, EF Portal, EF Protocol Support, EF Research, EF Robust Incentives Group (RIG), EF Security, EF Testing, Erigon, Ethereum Cat Herders, Hyperledger Besu, Independent, Lighthouse, Lodestar, Nethermind, Prysmatic, Status, Teku, and TXRX. - *"And, Ebling, there's another, greater purpose. Hari Seldon founded two Foundations three centuries ago; one at each end of the Galaxy. You must find that Second Foundation."* Foundation, Isaac Asimov Sponsor the Pilot From 6c49554f0a6d5e5d0e0136674cc54c64afa6cb17 Mon Sep 17 00:00:00 2001 From: tvanepps Date: Thu, 29 Jun 2023 11:06:07 -0400 Subject: [PATCH 04/24] Update 6-guidelines-for-regular-operation.md small typos --- docs/6-guidelines-for-regular-operation.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/6-guidelines-for-regular-operation.md b/docs/6-guidelines-for-regular-operation.md index f15f338..258a3c2 100644 --- a/docs/6-guidelines-for-regular-operation.md +++ b/docs/6-guidelines-for-regular-operation.md @@ -24,7 +24,7 @@ Antifragility and non-gameability emerge from simple frameworks. This limits the - `timeWeighting` can be either 1.0 for full-time or .5 for part-time contributors - Existing contributors get "diluted" as newcomers come in - Continuing contributors get additional weight per month they are active. This means historic contributors don't maintain their split weighting if they leave protocol development - - Anyone who stops contributing should remove themselves is removed from the split via periodic curation reviews + - Anyone who stops contributing should remove themselves from the membership ## 6.4 Modifying Projects and Members @@ -55,7 +55,7 @@ Once one week has passed, the PR should be merged. ### Removing Members/adjusting weights/changing project affiliation -ideally this PR should come from the member themselves, in keeping with the spirit and mutual trust of self-curation. Where this isn't possible, the member should be notified or tagged on the PR so they are aware changes. +Ideally this PR should come from the member themselves, in keeping with the spirit and mutual trust of self-curation. Where this isn't possible, the member should be notified or tagged on the PR so they are aware changes. ## 6.5 Onboarding new members From d0f7f38c4603499d2e08116e6910395a1e3348af Mon Sep 17 00:00:00 2001 From: tvanepps Date: Thu, 29 Jun 2023 15:02:00 -0400 Subject: [PATCH 05/24] typos, phrasing --- docs/6-guidelines-for-regular-operation.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/6-guidelines-for-regular-operation.md b/docs/6-guidelines-for-regular-operation.md index 258a3c2..b4a6aed 100644 --- a/docs/6-guidelines-for-regular-operation.md +++ b/docs/6-guidelines-for-regular-operation.md @@ -28,7 +28,7 @@ Antifragility and non-gameability emerge from simple frameworks. This limits the ## 6.4 Modifying Projects and Members -Modifying eligible projects and active membership should be proposed separately in the case both are being considered. Both should be shared with the membership at least two weeks in advance of any onchain update. +Modifying eligible projects and active membership should be proposed separately in the case both are being considered. Both should be shared with the membership at least two weeks in advance of any onchain update. ### Adding/removing Projects @@ -55,7 +55,7 @@ Once one week has passed, the PR should be merged. ### Removing Members/adjusting weights/changing project affiliation -Ideally this PR should come from the member themselves, in keeping with the spirit and mutual trust of self-curation. Where this isn't possible, the member should be notified or tagged on the PR so they are aware changes. +Ideally this PR should come from the member themselves, in keeping with the spirit and mutual trust of self-curation. Where this isn't possible, the member should be notified or tagged on the PR so they are aware of the changes. ## 6.5 Onboarding new members From 5945fa2d2dfd91361bea913252d075c986969912 Mon Sep 17 00:00:00 2001 From: tvanepps Date: Thu, 29 Jun 2023 15:03:01 -0400 Subject: [PATCH 06/24] change title --- docs/6-guidelines-for-regular-operation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/6-guidelines-for-regular-operation.md b/docs/6-guidelines-for-regular-operation.md index b4a6aed..76183b4 100644 --- a/docs/6-guidelines-for-regular-operation.md +++ b/docs/6-guidelines-for-regular-operation.md @@ -1,4 +1,4 @@ -# 6. Guidelines for Regular Operation +# 6. Operating Guidelines What follows is an outline for how we plan to start, recommendations, and guidelines for regular operation scenarios. From 0fed017f72c52b436477f1a711f9d4fe7a4f99ac Mon Sep 17 00:00:00 2001 From: tvanepps Date: Thu, 29 Jun 2023 15:03:24 -0400 Subject: [PATCH 07/24] Rename 6-guidelines-for-regular-operation.md to 6-operating-guidelines.md --- ...delines-for-regular-operation.md => 6-operating-guidelines.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docs/{6-guidelines-for-regular-operation.md => 6-operating-guidelines.md} (100%) diff --git a/docs/6-guidelines-for-regular-operation.md b/docs/6-operating-guidelines.md similarity index 100% rename from docs/6-guidelines-for-regular-operation.md rename to docs/6-operating-guidelines.md From dc94b162ec14cb578341a678ea6aea81d9f0fa61 Mon Sep 17 00:00:00 2001 From: tvanepps Date: Thu, 29 Jun 2023 15:14:27 -0400 Subject: [PATCH 08/24] update qualifications language tweaks, more example projects --- docs/4-roles-expectations.md | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/docs/4-roles-expectations.md b/docs/4-roles-expectations.md index 7cd4f5a..8bbe679 100644 --- a/docs/4-roles-expectations.md +++ b/docs/4-roles-expectations.md @@ -22,34 +22,41 @@ Slot holders are members of the Guild who have qualified for a placement (slot) #### Qualifications -Note: members should expect these guidelines to change over time, i.e. become more restrictive in some places and more permissive in others. +Note 1: these guidelines will change over time, i.e. become more restrictive in some places and more permissive in others. +Note 2: contributing to the projects/repos referenced below is necessary but does not guarantee Guild eligibility. While this list tries to be explicit by linking to example repos, there are some research areas which can't be linked to a single repo. Qualifying contributions _must_ be: - Fully open source, ie. both “source available” and free to fork, modify, redistribute - The full focus of the individual (anything less receives a partial weighting, see [6.3 weighting](https://protocol-guild.readthedocs.io/en/latest/6-guidelines-for-regular-operation.html#weighting)) -- Continuous for at least 6 months ahead of inclusion, and ongoing +- Continuous for at least 6 months ahead of inclusion and ongoing -Qualifying contributions _must_ target at least one of the following projects/areas (note that some areas may not have explicit repos to link to): +Qualifying contributions _must_ target at least one of the following projects/areas: 1. Ethereum L1 core protocol maintenance and development -- Client implementations: [Erigon](https://github.com/ledgerwatch/erigon), [Geth](https://github.com/ethereum/go-ethereum), [Hyperledger Besu](https://github.com/hyperledger/besu), [Lighthouse](https://github.com/sigp/lighthouse), [Lodestar](https://github.com/ChainSafe/lodestar), [Nethermind](https://github.com/NethermindEth/nethermind), [Nimbus](https://github.com/status-im/nimbus-eth2), [Prysm](https://github.com/prysmaticlabs/prysm), [Teku](https://github.com/ConsenSys/teku) -- Client Testing/security/infra which supports these implementations -- Protocol maintenance and upgrades, and the related coordination: [EELS](https://github.com/ethereum/execution-specs) +- Production client implementations: [Erigon](https://github.com/ledgerwatch/erigon), [Geth](https://github.com/ethereum/go-ethereum), [Hyperledger Besu](https://github.com/hyperledger/besu), [Lighthouse](https://github.com/sigp/lighthouse), [Lodestar](https://github.com/ChainSafe/lodestar), [Nethermind](https://github.com/NethermindEth/nethermind), [Nimbus](https://github.com/status-im/nimbus-eth2), [Prysm](https://github.com/prysmaticlabs/prysm), [Teku](https://github.com/ConsenSys/teku) +- Client Testing/security/infra which supports these implementations: [ethereum/tests](https://github.com/ethereum/tests) [ethereum/execution-spec-tests](https://github.com/ethereum/execution-spec-tests) +- Coordination related to upgrades and maintenance: [ethereum/pm](https://github.com/ethereum/pm) 2. Research and implementation experiments related to potential protocol changes/refinements -- Verkle Tries, Portal Network, EVM +- [Verkle Tries](https://github.com/gballet/go-verkle) (Verge) +- [Portal Network](https://github.com/ethereum/portal-network-specs) (Purge) +- EVM Improvements eg. [Ipsilon](https://github.com/ipsilon) + +3. Spec work resulting from the above (should be implementation agnostic, unopinionated) +- [Execution Specs(EELS)](https://github.com/ethereum/execution-specs) +- [Consensus Specs](https://github.com/ethereum/consensus-specs) -3. Spec work resulting from the above, where the specs should be implementation agnostic, unopinionated 4. Protocol Guild itself +- General comms +- Fundraising +- Research related to the evolution of the Guild itself +- Internal maintenance for the Guild membership -- general comms -- fundraising -- research related to the evolution of the Guild itself -- internal maintenance for the Guild membership +Independent or unaffiliated contributors are considered by the same guidelines as any contributors "officially" part of teams/projects. -Qualifying contributions _usually_ occur in the collaborative context of a structured collaborative group - however, there have been independent unaffiliated contributors. +See [6.4 Modifying Projects and Members](URL) for guidelines on adding/removing eligible projects and members. #### Expectations From e5eba0eb052bebb8ce50b1f06002879db39f21d0 Mon Sep 17 00:00:00 2001 From: tvanepps Date: Tue, 4 Jul 2023 14:49:30 -0400 Subject: [PATCH 09/24] update self-removal language Co-authored-by: Danno Ferrin --- docs/6-operating-guidelines.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/6-operating-guidelines.md b/docs/6-operating-guidelines.md index 76183b4..de17f8b 100644 --- a/docs/6-operating-guidelines.md +++ b/docs/6-operating-guidelines.md @@ -24,7 +24,7 @@ Antifragility and non-gameability emerge from simple frameworks. This limits the - `timeWeighting` can be either 1.0 for full-time or .5 for part-time contributors - Existing contributors get "diluted" as newcomers come in - Continuing contributors get additional weight per month they are active. This means historic contributors don't maintain their split weighting if they leave protocol development - - Anyone who stops contributing should remove themselves from the membership + - Anyone who stops contributing should remove themselves from the membership, and may be removed via periodic curation reviews ## 6.4 Modifying Projects and Members From 890afee80cf5b2cb67335eda383287a08881892d Mon Sep 17 00:00:00 2001 From: tvanepps Date: Tue, 4 Jul 2023 15:27:45 -0400 Subject: [PATCH 10/24] remove "eg" in front of Ipsilon --- docs/4-roles-expectations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/4-roles-expectations.md b/docs/4-roles-expectations.md index 8bbe679..0dbdb0b 100644 --- a/docs/4-roles-expectations.md +++ b/docs/4-roles-expectations.md @@ -42,7 +42,7 @@ Qualifying contributions _must_ target at least one of the following projects/ar 2. Research and implementation experiments related to potential protocol changes/refinements - [Verkle Tries](https://github.com/gballet/go-verkle) (Verge) - [Portal Network](https://github.com/ethereum/portal-network-specs) (Purge) -- EVM Improvements eg. [Ipsilon](https://github.com/ipsilon) +- EVM Improvements [Ipsilon](https://github.com/ipsilon) 3. Spec work resulting from the above (should be implementation agnostic, unopinionated) - [Execution Specs(EELS)](https://github.com/ethereum/execution-specs) From 48252441364cfeea2d1c8c48b6cd0313671de168 Mon Sep 17 00:00:00 2001 From: tvanepps Date: Tue, 4 Jul 2023 15:29:21 -0400 Subject: [PATCH 11/24] edit client teams language Co-authored-by: Danno Ferrin --- docs/4-roles-expectations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/4-roles-expectations.md b/docs/4-roles-expectations.md index 0dbdb0b..14c6a08 100644 --- a/docs/4-roles-expectations.md +++ b/docs/4-roles-expectations.md @@ -35,7 +35,7 @@ Qualifying contributions _must_ target at least one of the following projects/ar 1. Ethereum L1 core protocol maintenance and development -- Production client implementations: [Erigon](https://github.com/ledgerwatch/erigon), [Geth](https://github.com/ethereum/go-ethereum), [Hyperledger Besu](https://github.com/hyperledger/besu), [Lighthouse](https://github.com/sigp/lighthouse), [Lodestar](https://github.com/ChainSafe/lodestar), [Nethermind](https://github.com/NethermindEth/nethermind), [Nimbus](https://github.com/status-im/nimbus-eth2), [Prysm](https://github.com/prysmaticlabs/prysm), [Teku](https://github.com/ConsenSys/teku) +- Production client implementations: Currently this includes [Erigon](https://github.com/ledgerwatch/erigon), [Geth](https://github.com/ethereum/go-ethereum), [Hyperledger Besu](https://github.com/hyperledger/besu), [Lighthouse](https://github.com/sigp/lighthouse), [Lodestar](https://github.com/ChainSafe/lodestar), [Nethermind](https://github.com/NethermindEth/nethermind), [Nimbus](https://github.com/status-im/nimbus-eth2), [Prysm](https://github.com/prysmaticlabs/prysm), [Teku](https://github.com/ConsenSys/teku) - Client Testing/security/infra which supports these implementations: [ethereum/tests](https://github.com/ethereum/tests) [ethereum/execution-spec-tests](https://github.com/ethereum/execution-spec-tests) - Coordination related to upgrades and maintenance: [ethereum/pm](https://github.com/ethereum/pm) From 344b03f6e57831d2f07b8bf43dd0fab5cab3f14b Mon Sep 17 00:00:00 2001 From: tvanepps Date: Wed, 5 Jul 2023 12:37:33 -0400 Subject: [PATCH 12/24] add more examples for research & implementation - Consensus work - Cryptography - Mechanism design - Resource pricing --- docs/4-roles-expectations.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/4-roles-expectations.md b/docs/4-roles-expectations.md index 14c6a08..f0d7e9a 100644 --- a/docs/4-roles-expectations.md +++ b/docs/4-roles-expectations.md @@ -42,7 +42,11 @@ Qualifying contributions _must_ target at least one of the following projects/ar 2. Research and implementation experiments related to potential protocol changes/refinements - [Verkle Tries](https://github.com/gballet/go-verkle) (Verge) - [Portal Network](https://github.com/ethereum/portal-network-specs) (Purge) -- EVM Improvements [Ipsilon](https://github.com/ipsilon) +- EVM Improvements: [Ipsilon](https://github.com/ipsilon) +- Consensus work +- Cryptography +- Mechanism design +- Resource pricing 3. Spec work resulting from the above (should be implementation agnostic, unopinionated) - [Execution Specs(EELS)](https://github.com/ethereum/execution-specs) From 0e529d133d6920db9c68a7923fa68c11869add14 Mon Sep 17 00:00:00 2001 From: tvanepps Date: Wed, 5 Jul 2023 15:31:54 -0400 Subject: [PATCH 13/24] Update docs/4-roles-expectations.md Co-authored-by: cheeky-gorilla <76262359+cheeky-gorilla@users.noreply.github.com> --- docs/4-roles-expectations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/4-roles-expectations.md b/docs/4-roles-expectations.md index f0d7e9a..75ed962 100644 --- a/docs/4-roles-expectations.md +++ b/docs/4-roles-expectations.md @@ -49,7 +49,7 @@ Qualifying contributions _must_ target at least one of the following projects/ar - Resource pricing 3. Spec work resulting from the above (should be implementation agnostic, unopinionated) -- [Execution Specs(EELS)](https://github.com/ethereum/execution-specs) +- [Execution specs (EELS)](https://github.com/ethereum/execution-specs) - [Consensus Specs](https://github.com/ethereum/consensus-specs) 4. Protocol Guild itself From bcc7b9360fea3670b5010df1cc69e3b283f1df6d Mon Sep 17 00:00:00 2001 From: tvanepps Date: Wed, 5 Jul 2023 15:32:01 -0400 Subject: [PATCH 14/24] Update docs/4-roles-expectations.md Co-authored-by: cheeky-gorilla <76262359+cheeky-gorilla@users.noreply.github.com> --- docs/4-roles-expectations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/4-roles-expectations.md b/docs/4-roles-expectations.md index 75ed962..1b048b9 100644 --- a/docs/4-roles-expectations.md +++ b/docs/4-roles-expectations.md @@ -42,7 +42,7 @@ Qualifying contributions _must_ target at least one of the following projects/ar 2. Research and implementation experiments related to potential protocol changes/refinements - [Verkle Tries](https://github.com/gballet/go-verkle) (Verge) - [Portal Network](https://github.com/ethereum/portal-network-specs) (Purge) -- EVM Improvements: [Ipsilon](https://github.com/ipsilon) +- EVM improvements: [Ipsilon](https://github.com/ipsilon) - Consensus work - Cryptography - Mechanism design From 8f34f09f1c109016ab8a28d1becebdf629f0b340 Mon Sep 17 00:00:00 2001 From: tvanepps Date: Wed, 5 Jul 2023 15:32:09 -0400 Subject: [PATCH 15/24] Update docs/4-roles-expectations.md Co-authored-by: cheeky-gorilla <76262359+cheeky-gorilla@users.noreply.github.com> --- docs/4-roles-expectations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/4-roles-expectations.md b/docs/4-roles-expectations.md index 1b048b9..583a8fa 100644 --- a/docs/4-roles-expectations.md +++ b/docs/4-roles-expectations.md @@ -40,7 +40,7 @@ Qualifying contributions _must_ target at least one of the following projects/ar - Coordination related to upgrades and maintenance: [ethereum/pm](https://github.com/ethereum/pm) 2. Research and implementation experiments related to potential protocol changes/refinements -- [Verkle Tries](https://github.com/gballet/go-verkle) (Verge) +- [Verkle tries](https://github.com/gballet/go-verkle) (Verge) - [Portal Network](https://github.com/ethereum/portal-network-specs) (Purge) - EVM improvements: [Ipsilon](https://github.com/ipsilon) - Consensus work From 1b344960c90e2d4092709104bd8f2419b46c96a1 Mon Sep 17 00:00:00 2001 From: tvanepps Date: Wed, 5 Jul 2023 15:32:16 -0400 Subject: [PATCH 16/24] Update docs/4-roles-expectations.md Co-authored-by: cheeky-gorilla <76262359+cheeky-gorilla@users.noreply.github.com> --- docs/4-roles-expectations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/4-roles-expectations.md b/docs/4-roles-expectations.md index 583a8fa..9688fac 100644 --- a/docs/4-roles-expectations.md +++ b/docs/4-roles-expectations.md @@ -36,7 +36,7 @@ Qualifying contributions _must_ target at least one of the following projects/ar 1. Ethereum L1 core protocol maintenance and development - Production client implementations: Currently this includes [Erigon](https://github.com/ledgerwatch/erigon), [Geth](https://github.com/ethereum/go-ethereum), [Hyperledger Besu](https://github.com/hyperledger/besu), [Lighthouse](https://github.com/sigp/lighthouse), [Lodestar](https://github.com/ChainSafe/lodestar), [Nethermind](https://github.com/NethermindEth/nethermind), [Nimbus](https://github.com/status-im/nimbus-eth2), [Prysm](https://github.com/prysmaticlabs/prysm), [Teku](https://github.com/ConsenSys/teku) -- Client Testing/security/infra which supports these implementations: [ethereum/tests](https://github.com/ethereum/tests) [ethereum/execution-spec-tests](https://github.com/ethereum/execution-spec-tests) +- Client testing/security/infra which supports these implementations: [ethereum/tests](https://github.com/ethereum/tests) [ethereum/execution-spec-tests](https://github.com/ethereum/execution-spec-tests) - Coordination related to upgrades and maintenance: [ethereum/pm](https://github.com/ethereum/pm) 2. Research and implementation experiments related to potential protocol changes/refinements From 6c6929fa9c996049b55c1612cff44232134f991d Mon Sep 17 00:00:00 2001 From: tvanepps Date: Wed, 5 Jul 2023 15:32:31 -0400 Subject: [PATCH 17/24] Update docs/4-roles-expectations.md Co-authored-by: cheeky-gorilla <76262359+cheeky-gorilla@users.noreply.github.com> --- docs/4-roles-expectations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/4-roles-expectations.md b/docs/4-roles-expectations.md index 9688fac..32c755d 100644 --- a/docs/4-roles-expectations.md +++ b/docs/4-roles-expectations.md @@ -27,7 +27,7 @@ Note 2: contributing to the projects/repos referenced below is necessary but doe Qualifying contributions _must_ be: -- Fully open source, ie. both “source available” and free to fork, modify, redistribute +- Fully open source, i.e. both “source available” and free to fork, modify, redistribute - The full focus of the individual (anything less receives a partial weighting, see [6.3 weighting](https://protocol-guild.readthedocs.io/en/latest/6-guidelines-for-regular-operation.html#weighting)) - Continuous for at least 6 months ahead of inclusion and ongoing From 1afdd753d9b9ee1ac820c0f34c1016b47d122833 Mon Sep 17 00:00:00 2001 From: tvanepps Date: Wed, 5 Jul 2023 15:33:10 -0400 Subject: [PATCH 18/24] Update docs/4-roles-expectations.md Co-authored-by: cheeky-gorilla <76262359+cheeky-gorilla@users.noreply.github.com> --- docs/4-roles-expectations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/4-roles-expectations.md b/docs/4-roles-expectations.md index 32c755d..e7a1581 100644 --- a/docs/4-roles-expectations.md +++ b/docs/4-roles-expectations.md @@ -50,7 +50,7 @@ Qualifying contributions _must_ target at least one of the following projects/ar 3. Spec work resulting from the above (should be implementation agnostic, unopinionated) - [Execution specs (EELS)](https://github.com/ethereum/execution-specs) -- [Consensus Specs](https://github.com/ethereum/consensus-specs) +- [Consensus specs](https://github.com/ethereum/consensus-specs) 4. Protocol Guild itself - General comms From 5c4b98e2c3aff9c38f4492e7583335e13a95bbf5 Mon Sep 17 00:00:00 2001 From: tvanepps Date: Wed, 5 Jul 2023 15:33:20 -0400 Subject: [PATCH 19/24] Update docs/4-roles-expectations.md Co-authored-by: cheeky-gorilla <76262359+cheeky-gorilla@users.noreply.github.com> --- docs/4-roles-expectations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/4-roles-expectations.md b/docs/4-roles-expectations.md index e7a1581..dc61489 100644 --- a/docs/4-roles-expectations.md +++ b/docs/4-roles-expectations.md @@ -60,7 +60,7 @@ Qualifying contributions _must_ target at least one of the following projects/ar Independent or unaffiliated contributors are considered by the same guidelines as any contributors "officially" part of teams/projects. -See [6.4 Modifying Projects and Members](URL) for guidelines on adding/removing eligible projects and members. +See [6.4 Modifying Projects and Members](https://protocol-guild.readthedocs.io/en/latest/6-guidelines-for-regular-operation.html#proposing-and-discussing-new-members) for guidelines on adding/removing eligible projects and members. #### Expectations From c159091fc3b00425c1c629d184d704013c139eab Mon Sep 17 00:00:00 2001 From: tvanepps Date: Thu, 6 Jul 2023 12:03:36 -0400 Subject: [PATCH 20/24] Update docs/4-roles-expectations.md Co-authored-by: cheeky-gorilla <76262359+cheeky-gorilla@users.noreply.github.com> --- docs/4-roles-expectations.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/4-roles-expectations.md b/docs/4-roles-expectations.md index dc61489..78441b1 100644 --- a/docs/4-roles-expectations.md +++ b/docs/4-roles-expectations.md @@ -23,6 +23,7 @@ Slot holders are members of the Guild who have qualified for a placement (slot) #### Qualifications Note 1: these guidelines will change over time, i.e. become more restrictive in some places and more permissive in others. + Note 2: contributing to the projects/repos referenced below is necessary but does not guarantee Guild eligibility. While this list tries to be explicit by linking to example repos, there are some research areas which can't be linked to a single repo. Qualifying contributions _must_ be: From 7e2107891424cfe033808f600a60024619ea80f5 Mon Sep 17 00:00:00 2001 From: tvanepps Date: Wed, 12 Jul 2023 16:56:02 -0400 Subject: [PATCH 21/24] grammar Co-authored-by: Sally MacFarlane --- docs/4-roles-expectations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/4-roles-expectations.md b/docs/4-roles-expectations.md index 78441b1..3ede5fc 100644 --- a/docs/4-roles-expectations.md +++ b/docs/4-roles-expectations.md @@ -18,7 +18,7 @@ For the Pilot, members of the Protocol Guild will have up to three different fun ### 4.21 Slot Holders -Slot holders are members of the Guild who have qualified for a placement (slot) in the split contract. Estimated to be around 150-200 individuals, however the actual number may be higher or lower. There is no cap or target for number of slots. Slots can be set to any Ethereum address, including the individuals own, a charity, or another split contract. +Slot holders are members of the Guild who have qualified for a placement (slot) in the split contract. Estimated to be around 150-200 individuals, however the actual number may be higher or lower. There is no cap or target for number of slots. Slots can be set to any Ethereum address, including the individual's own, a charity, or another split contract. #### Qualifications From e4c1233c0986e2877c077de21326befda82ddc21 Mon Sep 17 00:00:00 2001 From: tvanepps Date: Wed, 12 Jul 2023 16:56:30 -0400 Subject: [PATCH 22/24] language around merging PR Co-authored-by: Sally MacFarlane --- docs/6-operating-guidelines.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/6-operating-guidelines.md b/docs/6-operating-guidelines.md index de17f8b..63085de 100644 --- a/docs/6-operating-guidelines.md +++ b/docs/6-operating-guidelines.md @@ -51,7 +51,7 @@ When adding a new member, the PR should add the individual to the member list, a Discussion should be open for at least one week to give members time to review and discuss. This can be with reacts on the proposal 👍 / 👎 or written thoughts on why the proposed member fits the eligibility or not. -Once one week has passed, the PR should be merged. +Once one week has passed, if no objections, the PR can be merged. ### Removing Members/adjusting weights/changing project affiliation From 5847f3fcbb029ee60ebb1c16074daae1028f9054 Mon Sep 17 00:00:00 2001 From: tvanepps Date: Thu, 13 Jul 2023 12:06:41 -0400 Subject: [PATCH 23/24] separate out Guild contributions in eligible projects --- docs/4-roles-expectations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/4-roles-expectations.md b/docs/4-roles-expectations.md index 3ede5fc..b6c4069 100644 --- a/docs/4-roles-expectations.md +++ b/docs/4-roles-expectations.md @@ -53,7 +53,7 @@ Qualifying contributions _must_ target at least one of the following projects/ar - [Execution specs (EELS)](https://github.com/ethereum/execution-specs) - [Consensus specs](https://github.com/ethereum/consensus-specs) -4. Protocol Guild itself +There may also be exceptional cases where members are added for contributing to Protocol Guild itself: - General comms - Fundraising - Research related to the evolution of the Guild itself From 64f6bf1bf5c5a2f0c1f5c478f34f017aea441465 Mon Sep 17 00:00:00 2001 From: tvanepps Date: Tue, 18 Jul 2023 16:06:00 -0400 Subject: [PATCH 24/24] link for roles and expectations Co-authored-by: Andrei Maiboroda --- docs/6-operating-guidelines.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/6-operating-guidelines.md b/docs/6-operating-guidelines.md index 63085de..76647b6 100644 --- a/docs/6-operating-guidelines.md +++ b/docs/6-operating-guidelines.md @@ -32,7 +32,7 @@ Modifying eligible projects and active membership should be proposed separately ### Adding/removing Projects -Changing the list of [eligible projects](link) can be made through a PR to the docs repo. This PR should add the project in the appropriate section, along with the following info: +Changing the list of [eligible projects](./4-roles-expectations.md#qualifications) can be made through a PR to the docs repo. This PR should add the project in the appropriate section, along with the following info: - Name of project/research area - Summary of why this project/research area should be considered eligible