You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

CONTRIBUTING.md 14KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283
  1. Contributing to Bitcoin Core
  2. ============================
  3. The Bitcoin Core project operates an open contributor model where anyone is
  4. welcome to contribute towards development in the form of peer review, testing
  5. and patches. This document explains the practical process and guidelines for
  6. contributing.
  7. Firstly in terms of structure, there is no particular concept of "Core
  8. developers" in the sense of privileged people. Open source often naturally
  9. revolves around meritocracy where longer term contributors gain more trust from
  10. the developer community. However, some hierarchy is necessary for practical
  11. purposes. As such there are repository "maintainers" who are responsible for
  12. merging pull requests as well as a "lead maintainer" who is responsible for the
  13. release cycle, overall merging, moderation and appointment of maintainers.
  14. Contributor Workflow
  15. --------------------
  16. The codebase is maintained using the "contributor workflow" where everyone
  17. without exception contributes patch proposals using "pull requests". This
  18. facilitates social contribution, easy testing and peer review.
  19. To contribute a patch, the workflow is as follows:
  20. 1. Fork repository
  21. 1. Create topic branch
  22. 1. Commit patches
  23. The project coding conventions in the [developer notes](doc/developer-notes.md)
  24. must be adhered to.
  25. In general [commits should be atomic](https://en.wikipedia.org/wiki/Atomic_commit#Atomic_commit_convention)
  26. and diffs should be easy to read. For this reason do not mix any formatting
  27. fixes or code moves with actual code changes.
  28. Commit messages should be verbose by default consisting of a short subject line
  29. (50 chars max), a blank line and detailed explanatory text as separate
  30. paragraph(s), unless the title alone is self-explanatory (like "Corrected typo
  31. in init.cpp") in which case a single title line is sufficient. Commit messages should be
  32. helpful to people reading your code in the future, so explain the reasoning for
  33. your decisions. Further explanation [here](http://chris.beams.io/posts/git-commit/).
  34. If a particular commit references another issue, please add the reference. For
  35. example: `refs #1234` or `fixes #4321`. Using the `fixes` or `closes` keywords
  36. will cause the corresponding issue to be closed when the pull request is merged.
  37. Please refer to the [Git manual](https://git-scm.com/doc) for more information
  38. about Git.
  39. - Push changes to your fork
  40. - Create pull request
  41. The title of the pull request should be prefixed by the component or area that
  42. the pull request affects. Valid areas as:
  43. - *Consensus* for changes to consensus critical code
  44. - *Docs* for changes to the documentation
  45. - *Qt* for changes to bitcoin-qt
  46. - *Mining* for changes to the mining code
  47. - *Net* or *P2P* for changes to the peer-to-peer network code
  48. - *RPC/REST/ZMQ* for changes to the RPC, REST or ZMQ APIs
  49. - *Scripts and tools* for changes to the scripts and tools
  50. - *Tests* for changes to the bitcoin unit tests or QA tests
  51. - *Trivial* should **only** be used for PRs that do not change generated
  52. executable code. Notably, refactors (change of function arguments and code
  53. reorganization) and changes in behavior should **not** be marked as trivial.
  54. Examples of trivial PRs are changes to:
  55. - comments
  56. - whitespace
  57. - variable names
  58. - logging and messages
  59. - *Utils and libraries* for changes to the utils and libraries
  60. - *Wallet* for changes to the wallet code
  61. Examples:
  62. Consensus: Add new opcode for BIP-XXXX OP_CHECKAWESOMESIG
  63. Net: Automatically create hidden service, listen on Tor
  64. Qt: Add feed bump button
  65. Trivial: Fix typo in init.cpp
  66. Note that translations should not be submitted as pull requests, please see
  67. [Translation Process](https://github.com/bitcoin/bitcoin/blob/master/doc/translation_process.md)
  68. for more information on helping with translations.
  69. If a pull request is not to be considered for merging (yet), please
  70. prefix the title with [WIP] or use [Tasks Lists](https://help.github.com/articles/basic-writing-and-formatting-syntax/#task-lists)
  71. in the body of the pull request to indicate tasks are pending.
  72. The body of the pull request should contain enough description about what the
  73. patch does together with any justification/reasoning. You should include
  74. references to any discussions (for example other tickets or mailing list
  75. discussions).
  76. At this stage one should expect comments and review from other contributors. You
  77. can add more commits to your pull request by committing them locally and pushing
  78. to your fork until you have satisfied all feedback.
  79. Squashing Commits
  80. ---------------------------
  81. If your pull request is accepted for merging, you may be asked by a maintainer
  82. to squash and or [rebase](https://git-scm.com/docs/git-rebase) your commits
  83. before it will be merged. The basic squashing workflow is shown below.
  84. git checkout your_branch_name
  85. git rebase -i HEAD~n
  86. # n is normally the number of commits in the pull
  87. # set commits from 'pick' to 'squash', save and quit
  88. # on the next screen, edit/refine commit messages
  89. # save and quit
  90. git push -f # (force push to GitHub)
  91. If you have problems with squashing (or other workflows with `git`), you can
  92. alternatively enable "Allow edits from maintainers" in the right GitHub
  93. sidebar and ask for help in the pull request.
  94. Please refrain from creating several pull requests for the same change.
  95. Use the pull request that is already open (or was created earlier) to amend
  96. changes. This preserves the discussion and review that happened earlier for
  97. the respective change set.
  98. The length of time required for peer review is unpredictable and will vary from
  99. pull request to pull request.
  100. Pull Request Philosophy
  101. -----------------------
  102. Patchsets should always be focused. For example, a pull request could add a
  103. feature, fix a bug, or refactor code; but not a mixture. Please also avoid super
  104. pull requests which attempt to do too much, are overly large, or overly complex
  105. as this makes review difficult.
  106. ### Features
  107. When adding a new feature, thought must be given to the long term technical debt
  108. and maintenance that feature may require after inclusion. Before proposing a new
  109. feature that will require maintenance, please consider if you are willing to
  110. maintain it (including bug fixing). If features get orphaned with no maintainer
  111. in the future, they may be removed by the Repository Maintainer.
  112. ### Refactoring
  113. Refactoring is a necessary part of any software project's evolution. The
  114. following guidelines cover refactoring pull requests for the project.
  115. There are three categories of refactoring, code only moves, code style fixes,
  116. code refactoring. In general refactoring pull requests should not mix these
  117. three kinds of activity in order to make refactoring pull requests easy to
  118. review and uncontroversial. In all cases, refactoring PRs must not change the
  119. behaviour of code within the pull request (bugs must be preserved as is).
  120. Project maintainers aim for a quick turnaround on refactoring pull requests, so
  121. where possible keep them short, uncomplex and easy to verify.
  122. Pull requests that refactor the code should not be made by new contributors. It
  123. requires a certain level of experience to know where the code belongs to and to
  124. understand the full ramification (including rebase effort of open pull requests).
  125. Trivial pull requests or pull requests that refactor the code with no clear
  126. benefits may be immediately closed by the maintainers to reduce unnecessary
  127. workload on reviewing.
  128. "Decision Making" Process
  129. -------------------------
  130. The following applies to code changes to the Bitcoin Core project (and related
  131. projects such as libsecp256k1), and is not to be confused with overall Bitcoin
  132. Network Protocol consensus changes.
  133. Whether a pull request is merged into Bitcoin Core rests with the project merge
  134. maintainers and ultimately the project lead.
  135. Maintainers will take into consideration if a patch is in line with the general
  136. principles of the project; meets the minimum standards for inclusion; and will
  137. judge the general consensus of contributors.
  138. In general, all pull requests must:
  139. - Have a clear use case, fix a demonstrable bug or serve the greater good of
  140. the project (for example refactoring for modularisation);
  141. - Be well peer reviewed;
  142. - Have unit tests and functional tests where appropriate;
  143. - Follow code style guidelines ([C++](doc/developer-notes.md), [functional tests](test/functional/README.md));
  144. - Not break the existing test suite;
  145. - Where bugs are fixed, where possible, there should be unit tests
  146. demonstrating the bug and also proving the fix. This helps prevent regression.
  147. Patches that change Bitcoin consensus rules are considerably more involved than
  148. normal because they affect the entire ecosystem and so must be preceded by
  149. extensive mailing list discussions and have a numbered BIP. While each case will
  150. be different, one should be prepared to expend more time and effort than for
  151. other kinds of patches because of increased peer review and consensus building
  152. requirements.
  153. ### Peer Review
  154. Anyone may participate in peer review which is expressed by comments in the pull
  155. request. Typically reviewers will review the code for obvious errors, as well as
  156. test out the patch set and opine on the technical merits of the patch. Project
  157. maintainers take into account the peer review when determining if there is
  158. consensus to merge a pull request (remember that discussions may have been
  159. spread out over GitHub, mailing list and IRC discussions). The following
  160. language is used within pull-request comments:
  161. - ACK means "I have tested the code and I agree it should be merged";
  162. - NACK means "I disagree this should be merged", and must be accompanied by
  163. sound technical justification (or in certain cases of copyright/patent/licensing
  164. issues, legal justification). NACKs without accompanying reasoning may be
  165. disregarded;
  166. - utACK means "I have not tested the code, but I have reviewed it and it looks
  167. OK, I agree it can be merged";
  168. - Concept ACK means "I agree in the general principle of this pull request";
  169. - Nit refers to trivial, often non-blocking issues.
  170. Reviewers should include the commit hash which they reviewed in their comments.
  171. Project maintainers reserve the right to weigh the opinions of peer reviewers
  172. using common sense judgement and also may weight based on meritocracy: Those
  173. that have demonstrated a deeper commitment and understanding towards the project
  174. (over time) or have clear domain expertise may naturally have more weight, as
  175. one would expect in all walks of life.
  176. Where a patch set affects consensus critical code, the bar will be set much
  177. higher in terms of discussion and peer review requirements, keeping in mind that
  178. mistakes could be very costly to the wider community. This includes refactoring
  179. of consensus critical code.
  180. Where a patch set proposes to change the Bitcoin consensus, it must have been
  181. discussed extensively on the mailing list and IRC, be accompanied by a widely
  182. discussed BIP and have a generally widely perceived technical consensus of being
  183. a worthwhile change based on the judgement of the maintainers.
  184. ### Finding Reviewers
  185. As most reviewers are themselves developers with their own projects, the review
  186. process can be quite lengthy, and some amount of patience is required. If you find
  187. that you've been waiting for a pull request to be given attention for several
  188. months, there may be a number of reasons for this, some of which you can do something
  189. about:
  190. - It may be because of a feature freeze due to an upcoming release. During this time,
  191. only bug fixes are taken into consideration. If your pull request is a new feature,
  192. it will not be prioritized until the release is over. Wait for release.
  193. - It may be because the changes you are suggesting do not appeal to people. Rather than
  194. nits and critique, which require effort and means they care enough to spend time on your
  195. contribution, thundering silence is a good sign of widespread (mild) dislike of a given change
  196. (because people don't assume *others* won't actually like the proposal). Don't take
  197. that personally, though! Instead, take another critical look at what you are suggesting
  198. and see if it: changes too much, is too broad, doesn't adhere to the
  199. [developer notes](doc/developer-notes.md), is dangerous or insecure, is messily written, etc.
  200. Identify and address any of the issues you find. Then ask e.g. on IRC if someone could give
  201. their opinion on the concept itself.
  202. - It may be because your code is too complex for all but a few people. And those people
  203. may not have realized your pull request even exists. A great way to find people who
  204. are qualified and care about the code you are touching is the
  205. [Git Blame feature](https://help.github.com/articles/tracing-changes-in-a-file/). Simply
  206. find the person touching the code you are touching before you and see if you can find
  207. them and give them a nudge. Don't be incessant about the nudging though.
  208. - Finally, if all else fails, ask on IRC or elsewhere for someone to give your pull request
  209. a look. If you think you've been waiting an unreasonably long amount of time (month+) for
  210. no particular reason (few lines changed, etc), this is totally fine. Try to return the favor
  211. when someone else is asking for feedback on their code, and universe balances out.
  212. Release Policy
  213. --------------
  214. The project leader is the release manager for each Bitcoin Core release.
  215. Copyright
  216. ---------
  217. By contributing to this repository, you agree to license your work under the
  218. MIT license unless specified otherwise in `contrib/debian/copyright` or at
  219. the top of the file itself. Any work contributed where you are not the original
  220. author must contain its license header with the original author(s) and source.