Merge branch 'main' into develop

Author: hdevalence

.travis.yml

@@ -6,7 +6,8 @@ rust:
 
 env:
   - TEST_COMMAND=test EXTRA_FLAGS='' FEATURES=''
-  - TEST_COMMAND=test EXTRA_FLAGS='' FEATURES='yoloproofs'
+  # Disabled for now along with the yoloproofs feature.
+  #- TEST_COMMAND=test EXTRA_FLAGS='' FEATURES='yoloproofs'
   # run cargo bench with a filter that matches no benchmarks.
   # this ensures the benchmarks build but doesn't run them on the CI server.
   - TEST_COMMAND=bench EXTRA_FLAGS='"DONTRUNBENCHMARKS"' FEATURES=''

CONTRIBUTING.md

@@ -10,22 +10,25 @@ of flux.
 
 Currently, the work on the `bulletproofs` crate is in two branches:
 
-* `main`, currently focused on having a production-ready implementation
-  of the rangeproof protocol;
+* `main` holds the latest released version;
 
-* `circuit`, currently focused on exploratory work around circuit
-  proofs.
+* `develop` holds ongoing development work.
 
-Changes affecting the rangeproof parts of the code should be made
-against the `main` branch.
+Pull requests should be made against `develop`, **not** `main`.
 
-Changes affecting the circuit parts of the code should be made as PRs
-against the `circuit` branch.  This allows piecewise review of the
-circuit code while it's in development, as well as allowing a complete
-review when we eventually merge it into the `main` branch.
+It's best to start a PR for every in-progress branch so that it's possible
+to track all ongoing development work.  Adding the `PTAL` (please take a 
+look) label indicates that the branch is ready for code review.
 
-The `main` branch is regularly merged into the `circuit` branch, so that
-the circuit work stays in sync.
+## Labels
+
+Labels starting with `T-` are for labeling topics (`T-api`, `T-r1cs`, etc).
+
+The `T-research` label indicates unsolved open problems.
+
+Labels starting with `P-` are for priority levels.
+
+Labels starting with `E-` are for effort estimates.
 
 ## CI
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bulletproofs"
-version = "1.0.0-pre.0"
+version = "1.0.0"
 authors = ["Cathie Yun <[email protected]>", 
            "Henry de Valence <[email protected]>",
            "Oleg Andreev <[email protected]>"]
@@ -31,7 +31,8 @@ bincode = "1"
 
 [features]
 avx2_backend = ["curve25519-dalek/avx2_backend"]
-yoloproofs = []
+# Disable the yoloproofs feature for the released crate, so that it's not possible for someone to publish a crate using R1CS proofs yet.
+# yoloproofs = []
 
 [[bench]]
 name = "range_proof"

Makefile

@@ -1,4 +1,4 @@
-FEATURES := yoloproofs
+FEATURES := 
 
 doc:
 	cargo rustdoc --features "$(FEATURES)" -- --html-in-header docs/assets/rustdoc-include-katex-header.html