Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies and clean up the code #86

Merged
merged 14 commits into from
Apr 13, 2023
38 changes: 38 additions & 0 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Rust

on:
push:
branches: [ '**' ]
pull_request:
branches: [ '**' ]

env:
CARGO_TERM_COLOR: always
RUSTFLAGS: '-D warnings'

jobs:
test:
name: Run tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
- run: cargo test

clippy:
name: Check that clippy is happy
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
with:
components: clippy
- run: cargo clippy --target x86_64-unknown-linux-gnu

bench:
name: Check that benchmarks compile
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
- run: cargo build --benches
117 changes: 24 additions & 93 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "schnorrkel"
version = "0.10.2"
version = "0.11.0"
authors = ["Jeff Burdges <[email protected]>"]
readme = "README.md"
license = "BSD-3-Clause"
Expand All @@ -10,114 +10,45 @@ keywords = ["cryptography", "ed25519", "curve25519", "signature", "ECC"]
categories = ["cryptography", "no-std"]
description = "Schnorr VRF, signatures, etc. using the Ristretto group"
exclude = [ ".gitignore", "res/*" ]
edition = "2018"
edition = "2021"

# [badges]
# travis-ci = { repository = "dalek-cryptography/ed25519-dalek", branch = "master"}

[dependencies.aead]
version = "0.4.3"
default-features = false
optional = true

[dependencies.arrayref]
version = "0.3.6"
default-features = false

[dependencies.arrayvec]
[dependencies]
aead = { version = "0.5.2", default-features = false, optional = true }
arrayref = { version = "0.3.6", default-features = false }
# needs to match parity-scale-code which is "=0.7.0"
version = "0.7.0"
default-features = false

[dependencies.curve25519-dalek]
package = "curve25519-dalek-ng"
# git = "https://github.com/dalek-cryptography/curve25519-dalek"
version = "4.1.1"
default-features = false

# [dependencies.ed25519-dalek]
# version = "1.0.0"
# default-features = false
# optional = true

[dependencies.subtle]
package = "subtle-ng"
version = "2.5.0"
default-features = false

[dependencies.merlin]
version = "3.0.0"
# features = ["debug-transcript"]
default-features = false

# [dependencies.rand]
# version = "0.8.3"
# default-features = false
# optional = true

[dependencies.rand_core]
version = "0.6.2"
default-features = false

[dependencies.rand_chacha]
version = "0.3.1"
default-features = false
optional = true

[dependencies.serde_crate]
version = "1.0.130"
package = "serde"
default-features = false
optional = true

[dependencies.serde_bytes]
version = "0.11.5"
default-features = false
optional = true

[dependencies.cfg-if]
version = "1.0.0"
optional = true

[dependencies.sha2]
version = "0.9.8"
default-features = false

[dependencies.failure]
version = "0.1.8"
default-features = false
optional = true

[dependencies.zeroize]
version = "1.4.2"
default-features = false
features = ["zeroize_derive"]
arrayvec = { version = "0.7.0", default-features = false }
curve25519-dalek = { version = "4.0.0-rc.2", default-features = false, features = ["digest", "zeroize"] }
subtle = { version = "2.5.0", default-features = false }
merlin = { version = "3.0.0", default-features = false }
rand_core = { version = "0.6.2", default-features = false }
serde_crate = { version = "1.0.130", package = "serde", default-features = false, optional = true }
serde_bytes = { version = "0.11.5", default-features = false, optional = true }
cfg-if = { version = "1.0.0", optional = true }
sha2 = { version = "0.10.6", default-features = false }
failure = { version = "0.1.8", default-features = false, optional = true }
zeroize = { version = "1.4.2", default-features = false, features = ["zeroize_derive"] }

[dev-dependencies]
rand = "0.8.4"
rand_chacha = "0.3.1"
# hex = "0.3.2"
hex-literal = "0.3.3"
sha2 = "0.9.8"
sha3 = "0.9.1"
rand_chacha = { version = "0.3.1", default-features = false }
hex-literal = "0.4.1"
sha3 = "0.10.7"
bincode = "1.3.3"
criterion = "0.3.5"
criterion = "0.4.0"
serde_json = "1.0.68"

[[bench]]
name = "schnorr_benchmarks"
harness = false

[features]
default = ["std", "u64_backend", "getrandom"] # "rand"
default = ["std", "getrandom", "precomputed-tables"]
preaudit_deprecated = []
nightly = ["curve25519-dalek/nightly"] # "zeroize/nightly"
nightly = []
alloc = ["curve25519-dalek/alloc", "rand_core/alloc", "serde_bytes/alloc"]
std = ["getrandom", "curve25519-dalek/std", "serde_bytes/std"] # "failure/std"
std = ["alloc", "getrandom", "serde_bytes/std"]
asm = ["sha2/asm"]
u64_backend = ["curve25519-dalek/u64_backend"]
u32_backend = ["curve25519-dalek/u32_backend"]
avx2_backend = ["curve25519-dalek/avx2_backend"]
precomputed-tables = ["curve25519-dalek/precomputed-tables"]
serde = ["serde_crate", "serde_bytes", "cfg-if"]
# We cannot make getrandom a direct dependency because rand_core makes
# getrandom a feature name, which requires forwarding.
Expand Down
60 changes: 0 additions & 60 deletions iffy/migration_from_ed25519/src/derive.rs.diff

This file was deleted.

Loading