Skip to content

Commit 198750f

Browse files
committed
Support stable rust
Updated dependencies such that Rust stable 1.53 is now supported. The optimised avx_2 option will NOT rust on stable because there's still an unstable feature on subtle-ng. BUT this feature is actually for doc generation and has been removed from Rust. As soon as subtle-ng merges dalek-cryptography/subtle#85, avx2 will probably be supported on stable as well. The rand dep update breaks the benchmarks, but these will be fixed in the next commit.
1 parent ecd77ec commit 198750f

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

Cargo.toml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ categories = ["cryptography"]
77
homepage = "https://tari.com"
88
readme = "README.md"
99
license = "BSD-3-Clause"
10-
version = "0.9.1"
10+
version = "0.10.0"
1111
edition = "2018"
1212

1313
[dependencies]
1414
tari_utilities = "^0.3"
1515
base64 = "0.10.1"
1616
digest = "0.8.0"
17-
rand = "0.7.2"
17+
rand = { version = "0.8", default-features = false }
1818
clear_on_drop = "=0.2.4"
19-
curve25519-dalek = { version = "2" }
20-
bulletproofs = {version = "2.1.0" , package="tari_bulletproofs"}
21-
merlin = "2.0.0"
19+
curve25519-dalek = { package = "curve25519-dalek-ng", version = "4", default-features = false, features = ["u64_backend", "serde", "alloc"] }
20+
bulletproofs = {version = "4.0.0", package="tari_bulletproofs"}
21+
merlin = { version = "3", default-features = false }
2222
sha2 = "0.8.0"
2323
sha3 = "0.9"
2424
thiserror = "1.0.20"
@@ -33,16 +33,21 @@ libc = { version = "0.2", optional = true }
3333
wasm-bindgen = { version = "^0.2", features = ["serde-serialize"], optional = true }
3434

3535
[dev-dependencies]
36-
criterion = "0.2"
36+
criterion = "0.3.4"
3737
bincode = "1.1.4"
3838

3939
[build-dependencies]
4040
cbindgen = "0.17.0"
4141

4242
[features]
43-
default = []
43+
default = ["no_cc"]
44+
# Note: avx2 still requires a nightly compiler as of 01/07/2021
45+
# The nightly compiler must be older than 2021-06-03 to avoid the
46+
# #![cfg_attr(feature = "nightly", feature(external_doc))]
47+
# ^^^^^^^^^^^^ feature has been removed
48+
# feature error on subtle-ng
4449
avx2 = ["curve25519-dalek/avx2_backend", "bulletproofs/avx2_backend"]
45-
wasm = ["wasm-bindgen", "rand/wasm-bindgen", "rand/getrandom"]
50+
wasm = ["wasm-bindgen", "rand/getrandom"]
4651
ffi = ["libc"]
4752
no_cc_nightly = ["clear_on_drop/nightly"]
4853
no_cc = ["clear_on_drop/no_cc"]

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2020-09-11
1+
nightly-2021-06-01

src/ristretto/dalek_range_proof.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ use bulletproofs::{
4242
BulletproofGens,
4343
PedersenGens,
4444
RangeProof as DalekProof,
45+
4546
};
4647
use merlin::Transcript;
4748

0 commit comments

Comments
 (0)