docs: update CONTRIBUTING.md with dev workflow info & commit message …

…info; reordered sections

CONTRIBUTORS.md

@@ -3,14 +3,55 @@
 Blockstack Core is open-source software written in Rust.  Contributions
 should adhere to the following best practices.
 
-## Simplicity of implementation
+You can find information on joining online community forums (Discord, mailing list etc.) in the [README](README.md).
+
+#### Table Of Contents
+
+[Code of Conduct](#code-of-conduct)
+
+[How Can I Contribute?](#how-can-i-contribute)
+* [Development Workflow](#development-workflow)
+* [Contributing Conventions](#contributing-conventions)
+
+[Style](#style)
+* [Git Commit Messages](#git-commit-messages)
+* [Rust Styleguide](#rust-styleguide)
+
+[License Agreement](#licensing-and-contributor-license-agreement)
+
+# Code of Conduct
+
+This project and everyone participating in it is governed by this [Code of Conduct](CODE_OF_CONDUCT.md).
+
+# How Can I Contribute?
+## Development Workflow
+
+- For typical development, branch off of the `develop` branch.
+- For consensus breaking changes, branch off of the `next` branch.
+- For hotfixes, branch off of `master`.
+
+### Documentation Updates
+
+- Any major changes should be added to the [CHANGELOG](CHANGELOG.md).
+- Mention any required documentation changes in the description of your pull request.
+- If adding an RPC endpoint, add an entry for the new endpoint to the OpenAPI spec `./docs/rpc/openapi.yaml`.
+
+### Each file should include relevant unit tests
+
+Each Rust file should contain a `mod test {}` definition, in which unit tests
+should be supplied for the file's methods.  Unit tests should cover a maximal
+amount of code paths.
+
+## Contributing Conventions
+
+### Simplicity of implementation
 
 The most important consideration when accepting or rejecting a contribution is
 the simplicity (i.e. ease of understanding) of its implementation.
 Contributions that are "clever" or introduce functionality beyond the scope of
 the immediate problem they are meant to solve will be rejected.
 
-### Type simplicity
+#### Type simplicity
 
 Simplicity of implementation includes simplicity of types.  Type parameters
 and associated types should only be used if there are at
@@ -19,34 +60,27 @@ least two possible implementations of those types.
 Lifetime parameters should only be introduced if the compiler cannot deduce them
 on its own.
 
-## Builds with a stable Rust compiler
-
+### Builds with a stable Rust compiler
 We use a recent, stable Rust compiler.  Contributions should _not_
 require nightly Rust features to build and run.
 
-## Each file should include relevant unit tests
-
-Each Rust file should contain a `mod test {}` definition, in which unit tests
-should be supplied for the file's methods.  Unit tests should cover a maximal
-amount of code paths.
-
-## Use built-in logging facilities
+### Use built-in logging facilities
 
 Blockstack Core implements logging macros in `util::log`.  If your code needs to
 output data, it should use these macros _exclusively_ for doing so.  The only
 exception is code that is explicitly user-facing, such as help documentation.
 
-## Minimal dependencies
+### Minimal dependencies
 
 Adding new package dependencies is very much discouraged.  Exceptions will be
 granted on a case-by-case basis, and only if deemed absolutely necessary.
 
-## Minimal global macros
+### Minimal global macros
 
 Adding new global macros is discouraged.  Exceptions will only be given if
 absolutely necessary.
 
-## Minimal compiler warnings
+### Minimal compiler warnings
 
 Contributions should not trigger compiler warnings if possible, and should not
 mask compiler warnings with macros.  Common sources of compiler warnings that
@@ -57,11 +91,31 @@ will not be accepted include, but are not limited to:
 * variable naming conventions
 * unhandled return types
 
-## Minimal `unsafe` code
+### Minimal `unsafe` code
 
 Contributions should not contain `unsafe` blocks if at all possible.
 
-## Code block consistency
+### Error definitions
+
+Each module should include an `Error` enumeration in its `mod.rs` that encodes
+errors specific to the module.  All error code paths in the module should return
+an `Err` type with one of the module's errors.
+
+# Style
+## Git Commit Messages
+Aim to use descriptive git commit messages. We try to follow [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/).
+The general format is as follows:
+```
+<type>[optional scope]: <one-line description>
+
+[optional body]
+[optional footer(s)]
+```
+Common types include build, ci, docs, fix, feat, test, refactor, etc.
+
+## Rust styleguide
+
+### Code block consistency
 
 Surrounding code blocks with `{` and `}` is encouraged, even when the enclosed
 block is a single statement.  Blocks in the same lexical scope must use
@@ -91,26 +145,18 @@ match bar {
    1..2 => Some("abc"),
    3..4 => Some("def"),
    _ => None
-}  
+}
 ```
 
-## Error definitions
-
-Each module should include an `Error` enumeration in its `mod.rs` that encodes
-errors specific to the module.  All error code paths in the module should return
-an `Err` type with one of the module's errors.
-
-## Whitespace
+### Whitespace
 
 All contributions should use the same whitespacing as the rest of the project.
 Moreover, Pull requests where a large number of changes only deal with whitespace will be
 rejected.
 
-## Licensing and contributor license agreement.
+# Licensing and contributor license agreement
 
 Blockstack Core is released under the terms of the GPL version 3.  Contributions
 that are not licensed under compatible terms will be rejected.  Moreover,
 contributions will not be accepted unless _all_ authors accept the project's
 contributor license agreement.
-
-