Skip to content

Commit 8c6a8ee

Browse files
committed
Merge branch 'main' into develop
2 parents d7f5c7a + 1a10ce1 commit 8c6a8ee

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ cache: cargo
33

44
env:
55
- TEST_COMMAND=test EXTRA_FLAGS='' FEATURES=''
6-
- TEST_COMMAND=test EXTRA_FLAGS='' FEATURES='yoloproofs'
6+
# The yoloproofs feature is disabled on the main branch.
7+
#- TEST_COMMAND=test EXTRA_FLAGS='' FEATURES='yoloproofs'
78
# run cargo bench with a filter that matches no benchmarks.
89
# this ensures the benchmarks build but doesn't run them on the CI server.
910
- TEST_COMMAND=bench EXTRA_FLAGS='"DONTRUNBENCHMARKS"' FEATURES=''

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
Entries are listed in reverse chronological order.
44

5+
## 2.0.0
6+
7+
* Switch from `failure` to `std`-compatible errors via `thiserror`.
8+
* Update `rand`, `curve25519-dalek`, `merlin` versions.
9+
* Adds `no_std` support by @xoloki.
10+
511
## 1.0.4
612

713
* Change doc-include paths to allow compilation on the latest Rust nightly

Cargo.toml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
[package]
22
name = "bulletproofs"
3-
version = "1.0.4"
3+
# Before doing a release:
4+
# - update version field
5+
# - update html_root_url
6+
# - ensure yoloproofs was disabled in an atomic (revertable) commit
7+
# - update CHANGELOG
8+
version = "2.0.0"
49
authors = ["Cathie Yun <[email protected]>",
510
"Henry de Valence <[email protected]>",
611
"Oleg Andreev <[email protected]>"]
@@ -35,7 +40,7 @@ rand_chacha = "0.2"
3540
[features]
3641
default = ["std", "avx2_backend"]
3742
avx2_backend = ["curve25519-dalek/avx2_backend"]
38-
yoloproofs = []
43+
# yoloproofs = []
3944
std = ["rand", "rand/std", "thiserror"]
4045

4146
[[test]]

src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#![deny(missing_docs)]
66
#![doc(include = "../README.md")]
77
#![doc(html_logo_url = "https://doc.dalek.rs/assets/dalek-logo-clear.png")]
8+
#![doc(html_root_url = "https://docs.rs/bulletproofs/2.0.0")]
89

910
extern crate alloc;
1011

0 commit comments

Comments
 (0)