From a31a96fdef87ac1c1a2020b11821626deab7f994 Mon Sep 17 00:00:00 2001 From: Cody Burns Date: Sun, 9 Dec 2018 11:13:08 -0600 Subject: [PATCH 1/7] Update README.md updating --- README.md | 153 +++++++++++++++++++++++++----------------------------- 1 file changed, 72 insertions(+), 81 deletions(-) diff --git a/README.md b/README.md index 6d56839..b9c4b7c 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,56 @@ -# Volunteering +#Code Of Conduct +## Volunteering Ethereum Classic development is actively underway by a decentralized community development initiative run by volunteers. It is an open organization where people are judged solely on the quality of their contributions. - Are you interested in volunteering your time to help the development of Ethereum Classic? Post in the issues section, tell us about yourself and we will try to help you find a place you can contribute to Ethereum Classic development. +If you are interested in our community organization, you can find more information about volunteering with other community organizers here: https://github.com/ethereumclassic + +## Volunteers' GPG Keys +Anyone is free to submit pull requests, issues, and general code reviews as an outside contributor. +For membership into the organization allows contributors a higher level of access to the code contained in this repository and, as such, requires additional security considerations. +For membership: +- Be an active contributor to a repository at least once every 3 months, or have a substantial body of work invested within the project +- Have 2fa enabled +- Submit a PR with a valid GPG key to the volunteer list +https://github.com/ethereumclassic/volunteer/tree/master/Volunteer-Public-Keys - GPG keys of volunteers on the Ethereum Classic project +### Administrator / owner access +Owner access allows users the highest level of access to the repository and should only be granted under overwhelmingly obvious need. +NO OWNER SHALL ADD OR REMOVE ANY OWNER WITHOUT EXPRESS WRITTEN CONSENT OF ALL OTHER OWNERS. +### Current Owners +- Cody Burns +- Elaine Ou +- WhatisGravity -If you are interested in community organization, you can find more information about volunteering with other community organizers here: https://github.com/ethereumclassic +## Structure + +This “organization” is designed to operate development in a similar fashion to the Angel +volunteer system found at CCC events. Existing volunteers will do their best to +help new volunteers, but there is no strict leadership hierarchy. +Instead of a chain of command, we operate on a merit system where you are judged only on your code & discussion contributions, not your age, race, gender, sex, nationality or anything else, just on what you contribute. You do not even need to own any Ethereum classic, if you have a good idea or a well reasoned contribution, that is all that matters. +If you see anything that needs to be fixed and you are capable, please feel free to fix it, create a local fork, make the change and submit a pull request. +Everyone is currently working in a volunteer capacity, the fastest way to enact changes is to create pull requests. +If you would like to make fundamental changes to the system, please consult with your peers, have them review your code, and make sure we have consensus. If the issue is contentious we should work to include the input of the wider community. + +## Coding conventions + * We indent using two spaces (soft tabs) + * We avoid logic in views, putting HTML generators into helpers + * We ALWAYS put spaces after list items and method parameters (`[1, 2, 3]`, not `[1,2,3]`), around operators (`x += 1`, not `x+=1`), and around hash arrows. + * This is open source software. Consider the people who will read your code, and make it look nice for them. It's sort of like driving a car: Perhaps you love doing donuts when you're alone, but with passengers the goal is to make the ride as smooth as possible. + * So that we can consistently serve images from the CDN, always use image_path or image_tag when referring to images. Never prepend "/images/" when using image_path or image_tag. + * Also for the CDN, always use cwd-relative paths rather than root-relative paths in image URLs in any CSS. So instead of url('/images/blah.gif'), use url('../images/blah.gif'). +For pull requests into any repo; + +- Make sure all of your commits are atomic (one feature per commit). +- Code contributions must be well commented +- one-line messages are fine for small changes, but bigger changes should look like this: +``` +$ git commit -m "A brief summary of the commit +> +> A paragraph describing what changed and its impact." +``` +- Please write tests and ensure they are passing +- 2 community reviewers are required to merge ## Community @@ -19,39 +64,13 @@ Server oftc.net, channel #etc-dev ### Telegram -https://telegram.me/etcdev +https://telegram.me/ethclassic -## Structure +### Reddit +http://reddit.com/r/ethereumclassic -I propose that we operate our development in a similar fashion to the Angel -volunteer system found at CCC events. Existing volunteers will do their best to -help new volunteers, but there is no strict leadership hierarchy. -Instead of a chain of command, I propose that we operate on a merit system where you are judged only on your code & discussion -contributions, not your age, race, gender, sex, nationality or anything else, just on -what you contribute. You do not even need to own any Ethereum classic, if you have a good idea or a well reasoned contribution, that is all that matters. -If you see anything that needs to be fixed and you are capable, please -feel free to fix it, create a local fork, make the change and submit a pull request. -Everyone is currently working in a volunteer capacity, the fastest way to enact changes is to create pull requests. - - -If you would like to make fundamental changes to the system, please consult -with your peers, have them review your code, and make sure we have -consensus. If the issue is contentious we should work to include the input of the wider community. - -Any donations received will be fairly distributed among active volunteers. - -## Objective -Our primary priority is maintaining existing clients currently maintained by the ICO backed Ethereum Foundation with -the DAO hard fork code removed to ensure easy access to the original/classic Ethereum network. We do this by keeping -up with upstream patches for every major client and provide an alternative which does not require the user to use -a special flag to run a node on the original/classic Ethereum network. - -As more people volunteer, we can shift our focus, begin to close issues shared by both ourselves and the upstream developers. -In my opinion, we should first start with restoration and access to the original/classic Ethereum network and then focus on -security oriented updates while the growing developer community discusses and builds a roadmap for future updates to the system -and which clients and projects we should support with community development. ## Projects @@ -60,15 +79,9 @@ A diversity of perspectives is important and anything you don't yet know, you ca ### Ethereum Classic Core Projects -Ethereum Classic Clients public board https://trello.com/b/aiSzWBm7/core-etc-development - -Build Server (TeamCity) http://build.ethereumclassic.org/login.html - -Process of client restoration https://github.com/ethereumproject/volunteer/tree/master/Client%20Collaboration - **Go-ethereum** -https://github.com/ethereumproject/go-ethereum +https://github.com/ethereumclassic/go-ethereum Go language implementation of the original/classic design of the Ethereum protocol. Go-ethereum is currently restored and under active development, other clients are in the restoration process or require volunteers to contribute to their restoration. @@ -76,23 +89,6 @@ Development builds https://bintray.com/ethereumproject/GoEthereumClassic/go-ethe Contacts: IRC Server oftc.net, channel #etc-dev, contact @whatisgravity, Slack @splix, @elaine -**Bomb Defusal** - -ECIP-1010 Delay Difficulty Bomb Explosion - https://github.com/ethereumproject/ECIPs/blob/master/ECIPs/ECIP-1010.md - -Related issues: - -https://github.com/ethereumproject/ECIPs/issues/4 - -https://github.com/ethereumproject/volunteer/issues/28 - -https://github.com/ethereumproject/go-ethereum/issues/11 - -Public board https://trello.com/b/ZuTNRTsW/etc-bomb-disposal - -Contacts: IRC Server oftc.net, channel #etc-dev @whatisgravity, Slack @dontpanicburns, @splix, @elaine - - **Mist browser & wallet** https://github.com/ethereumproject/mist @@ -118,44 +114,22 @@ Looking for developers, testers, designers and doc writers. Contacts: Slack - @sianyu, @splix - -### Associated Projects - -Working on a project using ETC and looking for collaborators? Feel free to add it to this list. - **Blockchain Explorer** http://explorer.etherhub.io ETC Block Explorer public board https://trello.com/b/W3ftl57z/etc-block-explorer-development -https://github.com/ethereumproject/explorer - In response to none of the existing major Ethereum blockchain explorers being open source, as a community we have decided to develop a quality open source block chain explorer. Providing an open source solution which allows for easy verification of contracts supports increased contract complexity within the ecosystem. +https://github.com/ethereumclassic/explorer - In response to none of the existing major Ethereum blockchain explorers being open source, as a community we have decided to develop a quality open source block chain explorer. Providing an open source solution which allows for easy verification of contracts supports increased contract complexity within the ecosystem. Contacts: Slack @elaine, @sianyu, @dontpanicburns **Social Fork Analysis** -https://github.com/ethereumproject/social-fork-analysis - A citizen journalism project doing social network analysis with the goal of creating an easy to use data set for journalists and researchers. +https://github.com/ethereumclassic/social-fork-analysis - A citizen journalism project doing social network analysis with the goal of creating an easy to use data set for journalists and researchers. Contacts: IRC Server oftc.net, channel #etc-dev, @whatisgravity -**ETC-CX-Wallet** -https://github.com/realcodywburns/ETC-CX-Wallet - Ethereum classic chrome extension wallet. This project is a sub-project of https://github.com/ethereumproject/etherwallet - -Contacts: Slack @dontpanicburns - -**Tortuga** - -https://github.com/realcodywburns/tortuga - Localbitcoins for ETC traded on chain - -Contacts: Slack @dontpanicburns - -... more to come ... - -## Volunteers' GPG Keys - -https://github.com/ethereumproject/volunteer/tree/master/Volunteer-Public-Keys - GPG keys of volunteers on the Ethereum Classic project - -## Public Trello Boards +## Public Trello Boards (outdated) We need a simple, visual way to coordinate plans and assignments. To make the processes in the organization transparent, we use public Trello boards. @@ -168,3 +142,20 @@ These boards are public and everyone can see the progress. Write access can be g * Ethereum Classic Clients public board https://trello.com/b/aiSzWBm7/core-etc-development * ETC Block Explorer public board https://trello.com/b/W3ftl57z/etc-block-explorer-development * Ethereum Classic Marketing & Research Team https://trello.com/ethereumclassicmr + +## Banned Users +Bad things happen. Blocking users is sometime the only option to protect the code base. It should only be used in extreme circumstances and should be documented here. +Blocking a user prevents the following on all repositories: +• opening or commenting on issues or pull requests +• starring, forking, or watching +• adding or editing wiki pages + +### Blocked +#### EOSclassic-EOSC +https://github.com/EOSclassic-EOSC +Excessive troll like activity + +### Lifetime ban +#### Krykoder +https://github.com/krykoder +Hijacking Ethereum classic’s repository, removing all admins, and possible malicious activity. From a1c80a36d8e02193562e516d034f9a52cc8ed1bd Mon Sep 17 00:00:00 2001 From: "Burns, Cody" Date: Sun, 9 Dec 2018 13:15:30 -0600 Subject: [PATCH 2/7] add index that pulls a list of contributers for the cla bot --- index.html | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 index.html diff --git a/index.html b/index.html new file mode 100644 index 0000000..7a87a64 --- /dev/null +++ b/index.html @@ -0,0 +1,32 @@ + + + + + + +

0

+ + From 641c5c96b22f2a12831b4591cbe01e48359ae523 Mon Sep 17 00:00:00 2001 From: "Burns, Cody" Date: Sun, 9 Dec 2018 13:18:54 -0600 Subject: [PATCH 3/7] added .clabot file --- .clabot | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .clabot diff --git a/.clabot b/.clabot new file mode 100644 index 0000000..2117181 --- /dev/null +++ b/.clabot @@ -0,0 +1,6 @@ +{ + "contributors": "https://ethereumclassic.github.io/volunteer/index.html", + "message": "We require contributors to sign our Contributor License Agreement, and we don\"t have on file. In order for us to review and merge your code, please read the volunteer repo to get yourself added.", + "label": "CLA Found", + "recheckComment": "Rechecking now" +} From 8ae02b8f334272b9a0be3914e3d6b8ac8caac23c Mon Sep 17 00:00:00 2001 From: "Burns, Cody" Date: Sun, 9 Dec 2018 13:22:05 -0600 Subject: [PATCH 4/7] rm slack references added 'or self-documented' --- README.md | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index b9c4b7c..8b6fa45 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -#Code Of Conduct +# Code Of Conduct ## Volunteering Ethereum Classic development is actively underway by a decentralized community development initiative run by volunteers. @@ -15,8 +15,8 @@ For membership: - Submit a PR with a valid GPG key to the volunteer list https://github.com/ethereumclassic/volunteer/tree/master/Volunteer-Public-Keys - GPG keys of volunteers on the Ethereum Classic project ### Administrator / owner access -Owner access allows users the highest level of access to the repository and should only be granted under overwhelmingly obvious need. -NO OWNER SHALL ADD OR REMOVE ANY OWNER WITHOUT EXPRESS WRITTEN CONSENT OF ALL OTHER OWNERS. +Owner access allows users the highest level of access to the repository and should only be granted under overwhelmingly obvious need. +NO OWNER SHALL ADD OR REMOVE ANY OWNER WITHOUT EXPRESS WRITTEN CONSENT OF ALL OTHER OWNERS. ### Current Owners - Cody Burns - Elaine Ou @@ -42,11 +42,11 @@ If you would like to make fundamental changes to the system, please consult with For pull requests into any repo; - Make sure all of your commits are atomic (one feature per commit). -- Code contributions must be well commented +- Code contributions must be well commented or self-documented - one-line messages are fine for small changes, but bigger changes should look like this: ``` $ git commit -m "A brief summary of the commit -> +> > A paragraph describing what changed and its impact." ``` - Please write tests and ensure they are passing @@ -58,7 +58,7 @@ $ git commit -m "A brief summary of the commit Invitation link https://discord.gg/G7GpJPX -### IRC +### IRC Server oftc.net, channel #etc-dev @@ -66,7 +66,7 @@ Server oftc.net, channel #etc-dev https://telegram.me/ethclassic -### Reddit +### Reddit http://reddit.com/r/ethereumclassic @@ -79,17 +79,17 @@ A diversity of perspectives is important and anything you don't yet know, you ca ### Ethereum Classic Core Projects -**Go-ethereum** +**Go-ethereum** https://github.com/ethereumclassic/go-ethereum -Go language implementation of the original/classic design of the Ethereum protocol. Go-ethereum is currently restored and under active development, other clients are in the restoration process or require volunteers to contribute to their restoration. +Go language implementation of the original/classic design of the Ethereum protocol. Go-ethereum is currently restored and under active development, other clients are in the restoration process or require volunteers to contribute to their restoration. Development builds https://bintray.com/ethereumproject/GoEthereumClassic/go-ethereum/develop#files/ -Contacts: IRC Server oftc.net, channel #etc-dev, contact @whatisgravity, Slack @splix, @elaine +Contacts: IRC Server oftc.net, channel #etc-dev, contact @whatisgravity, @splix, @elaine -**Mist browser & wallet** +**Mist browser & wallet** https://github.com/ethereumproject/mist @@ -102,25 +102,25 @@ Mist wallet associated projects: * Meteor-package-elements - https://github.com/ethereumproject/meteor-package-elements * Ether wallet - https://github.com/ethereumproject/etherwallet -Contacts: - * Mist - IRC Server oftc.net, channel #etc-dev, contact @whatisgravity, Slack @splix - * Ether Wallet - Slack @elaine, @dontpanicburns +Contacts: + * Mist - IRC Server oftc.net, channel #etc-dev, contact @whatisgravity, @splix + * Ether Wallet - @elaine, @dontpanicburns **Classic Ethereum Dapp UI Components** -https://github.com/ethereumproject/classic-dapp-ui - Javascript and CSS UI components to build Dapps for Ethereum Classic. +https://github.com/ethereumproject/classic-dapp-ui - Javascript and CSS UI components to build Dapps for Ethereum Classic. Looking for developers, testers, designers and doc writers. -Contacts: Slack - @sianyu, @splix +Contacts: @sianyu, @splix **Blockchain Explorer** http://explorer.etherhub.io -ETC Block Explorer public board https://trello.com/b/W3ftl57z/etc-block-explorer-development +ETC Block Explorer public board https://trello.com/b/W3ftl57z/etc-block-explorer-development https://github.com/ethereumclassic/explorer - In response to none of the existing major Ethereum blockchain explorers being open source, as a community we have decided to develop a quality open source block chain explorer. Providing an open source solution which allows for easy verification of contracts supports increased contract complexity within the ecosystem. -Contacts: Slack @elaine, @sianyu, @dontpanicburns +Contacts: @elaine, @sianyu, @dontpanicburns **Social Fork Analysis** @@ -131,7 +131,7 @@ Contacts: IRC Server oftc.net, channel #etc-dev, @whatisgravity ## Public Trello Boards (outdated) -We need a simple, visual way to coordinate plans and assignments. To make the processes in the organization transparent, we use public Trello boards. +We need a simple, visual way to coordinate plans and assignments. To make the processes in the organization transparent, we use public Trello boards. For those of you not familiar with Trello, Trello is a collaboration tool that organizes projects into boards. In one glance, Trello shows you what's being worked on, who's working on what, and where something is in a process. It is an easy way for volunteers to quickly find tasks that they can immediately work on. @@ -140,7 +140,7 @@ These boards are public and everyone can see the progress. Write access can be g **Links** * Ethereum Classic Clients public board https://trello.com/b/aiSzWBm7/core-etc-development -* ETC Block Explorer public board https://trello.com/b/W3ftl57z/etc-block-explorer-development +* ETC Block Explorer public board https://trello.com/b/W3ftl57z/etc-block-explorer-development * Ethereum Classic Marketing & Research Team https://trello.com/ethereumclassicmr ## Banned Users @@ -156,6 +156,6 @@ https://github.com/EOSclassic-EOSC Excessive troll like activity ### Lifetime ban -#### Krykoder +#### Krykoder https://github.com/krykoder Hijacking Ethereum classic’s repository, removing all admins, and possible malicious activity. From fc5841063eb606c7dc8fb9bd601a3d1a3a4fd9bd Mon Sep 17 00:00:00 2001 From: "Burns, Cody" Date: Sun, 9 Dec 2018 13:28:29 -0600 Subject: [PATCH 5/7] readme- add CLA info cla folder .sol - current contract .abi - the abi file --- CLA/cla.abi | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ CLA/cla.sol | 11 +++++++++++ README.md | 8 ++++++++ 3 files changed, 73 insertions(+) create mode 100644 CLA/cla.abi create mode 100644 CLA/cla.sol diff --git a/CLA/cla.abi b/CLA/cla.abi new file mode 100644 index 0000000..6b30360 --- /dev/null +++ b/CLA/cla.abi @@ -0,0 +1,54 @@ +[ + { + "constant": true, + "inputs": [], + "name": "count", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "name": "", + "type": "uint256" + } + ], + "name": "contributors", + "outputs": [ + { + "name": "", + "type": "string" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "name": "_username", + "type": "string" + } + ], + "name": "addMe", + "outputs": [ + { + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + } +] diff --git a/CLA/cla.sol b/CLA/cla.sol new file mode 100644 index 0000000..ccbc527 --- /dev/null +++ b/CLA/cla.sol @@ -0,0 +1,11 @@ +pragma solidity ^0.4.20; + +contract CLA { + string[] public contributors; + uint public count; + + function addMe(string _username) public returns(bool){ + contributors.push(_username); + count = contributors.length; + } +} diff --git a/README.md b/README.md index 8b6fa45..e6407a8 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,14 @@ NO OWNER SHALL ADD OR REMOVE ANY OWNER WITHOUT EXPRESS WRITTEN CONSENT OF ALL OT - Elaine Ou - WhatisGravity +## Contributor Licence Agreements (CLAs) + +Current contract: 0xA034F311C86eD32AB79fd86bEDb60F0fACD90231 + +The purpose of a CLA is to ensure that the guardian of a project’s outputs has the necessary ownership or grants of rights over all contributions to allow them to distribute under the chosen license. + +If you agree to everything in this document, 'sign' our CLA use the abi in the CLA folder and send your github username to the `addMe()` function on the contract above. This contract is stored on our blockchain and serves as a permanent record of your consent. + ## Structure This “organization” is designed to operate development in a similar fashion to the Angel From 8466e4ef9255b8e91113de602ac1d400b89b5b27 Mon Sep 17 00:00:00 2001 From: "Burns, Cody" Date: Sun, 9 Dec 2018 13:50:28 -0600 Subject: [PATCH 6/7] remove lifetime ban for now --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index e6407a8..7063b50 100644 --- a/README.md +++ b/README.md @@ -162,8 +162,3 @@ Blocking a user prevents the following on all repositories: #### EOSclassic-EOSC https://github.com/EOSclassic-EOSC Excessive troll like activity - -### Lifetime ban -#### Krykoder -https://github.com/krykoder -Hijacking Ethereum classic’s repository, removing all admins, and possible malicious activity. From f05935a71438378bc333d7681c72ed2a82bc709d Mon Sep 17 00:00:00 2001 From: Cody Burns Date: Mon, 28 Jan 2019 20:50:59 -0600 Subject: [PATCH 7/7] add blue and gravity --- README.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7063b50..60ec0e3 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ NO OWNER SHALL ADD OR REMOVE ANY OWNER WITHOUT EXPRESS WRITTEN CONSENT OF ALL OT ### Current Owners - Cody Burns - Elaine Ou -- WhatisGravity +- ## Contributor Licence Agreements (CLAs) @@ -162,3 +162,16 @@ Blocking a user prevents the following on all repositories: #### EOSclassic-EOSC https://github.com/EOSclassic-EOSC Excessive troll like activity + +#### Krykoder + +grand theft repo + +#### whatisgravity + +stolen account + +##### somethingblue + +spamming +