Update secp256kfun and rand to latest version

This will allow us to compile on stable Rust.
The latest version of `secp256kfun` uses `curve25519-dalek-ng` instead
of the original curve25519-dalek crate. Instead of converting back and
forth, we simply switch to this crate as well. Judging from the README
it is just a fork because there was trouble between the maintainers of
the original crate.
pull/536/head
Thomas Eizinger 2 years ago
parent e79ac4563b
commit b8cb9e1b8b
No known key found for this signature in database
GPG Key ID: 651AC83A6C6C8B96

60
Cargo.lock generated

@ -826,11 +826,24 @@ dependencies = [
"byteorder",
"digest 0.9.0",
"rand_core 0.5.1",
"serde",
"subtle 2.4.0",
"zeroize",
]
[[package]]
name = "curve25519-dalek-ng"
version = "4.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "574d8b2cd0bae5434fd50d53280f8299d95557a978686555880aaf5b8f4f81e9"
dependencies = [
"byteorder",
"digest 0.9.0",
"rand_core 0.6.2",
"serde",
"subtle-ng",
"zeroize",
]
[[package]]
name = "data-encoding"
version = "2.3.2"
@ -932,11 +945,11 @@ checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
[[package]]
name = "ecdsa_fun"
version = "0.4.2-alpha.0"
source = "git+https://github.com/LLFourn/secp256kfun#8538ef22498170960a9769df2700c1986cc540fd"
version = "0.6.2-alpha.0"
source = "git+https://github.com/LLFourn/secp256kfun#84134daf34845434d7f38cdae7ffc31730a3b1e9"
dependencies = [
"bincode",
"rand_chacha 0.2.2",
"rand_chacha 0.3.0",
"secp256kfun",
"serde",
"sigma_fun",
@ -2182,11 +2195,10 @@ dependencies = [
[[package]]
name = "monero"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c73108ba5cf025e437600990935234241f95ada3c4621960d50912cde739af6"
source = "git+https://github.com/comit-network/monero-rs?rev=818f38b#818f38b043e2a9fa38d74fec5310a270f510844e"
dependencies = [
"base58-monero",
"curve25519-dalek",
"curve25519-dalek-ng",
"fixed-hash",
"hex 0.4.3",
"hex-literal",
@ -3347,24 +3359,24 @@ dependencies = [
[[package]]
name = "secp256kfun"
version = "0.4.2-alpha.0"
source = "git+https://github.com/LLFourn/secp256kfun#8538ef22498170960a9769df2700c1986cc540fd"
version = "0.6.2-alpha.0"
source = "git+https://github.com/LLFourn/secp256kfun#84134daf34845434d7f38cdae7ffc31730a3b1e9"
dependencies = [
"digest 0.9.0",
"rand_core 0.5.1",
"rand_core 0.6.2",
"secp256k1",
"secp256kfun_parity_backend",
"serde",
"subtle 2.4.0",
"subtle-ng",
]
[[package]]
name = "secp256kfun_parity_backend"
version = "0.1.4-alpha.0"
source = "git+https://github.com/LLFourn/secp256kfun#8538ef22498170960a9769df2700c1986cc540fd"
version = "0.1.6-alpha.0"
source = "git+https://github.com/LLFourn/secp256kfun#84134daf34845434d7f38cdae7ffc31730a3b1e9"
dependencies = [
"crunchy",
"subtle 2.4.0",
"subtle-ng",
]
[[package]]
@ -3535,13 +3547,13 @@ dependencies = [
[[package]]
name = "sigma_fun"
version = "0.1.3-alpha.0"
source = "git+https://github.com/LLFourn/secp256kfun#8538ef22498170960a9769df2700c1986cc540fd"
version = "0.3.2-alpha.0"
source = "git+https://github.com/LLFourn/secp256kfun#84134daf34845434d7f38cdae7ffc31730a3b1e9"
dependencies = [
"curve25519-dalek",
"curve25519-dalek-ng",
"digest 0.9.0",
"generic-array 0.14.4",
"rand_core 0.5.1",
"rand_core 0.6.2",
"secp256kfun",
"serde",
]
@ -3808,6 +3820,12 @@ version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2"
[[package]]
name = "subtle-ng"
version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8049cf85f0e715d6af38dde439cb0ccb91f67fb9f5f63c80f8b43e48356e1a3f"
[[package]]
name = "swap"
version = "0.5.0"
@ -3826,7 +3844,7 @@ dependencies = [
"bmrng",
"config",
"conquer-once",
"curve25519-dalek",
"curve25519-dalek-ng",
"data-encoding",
"dialoguer",
"directories-next",
@ -3846,8 +3864,8 @@ dependencies = [
"port_check",
"prettytable-rs",
"proptest",
"rand 0.7.3",
"rand_chacha 0.2.2",
"rand 0.8.3",
"rand_chacha 0.3.0",
"reqwest",
"rust_decimal",
"rust_decimal_macros",

@ -1,2 +1,5 @@
[workspace]
members = [ "monero-harness", "monero-rpc", "swap", "monero-wallet" ]
[patch.crates-io]
monero = { git = "https://github.com/comit-network/monero-rs", rev = "818f38b" }

@ -21,11 +21,11 @@ bitcoin = { version = "0.26", features = [ "rand", "use-serde" ] }
bmrng = "0.5"
config = { version = "0.11", default-features = false, features = [ "toml" ] }
conquer-once = "0.3"
curve25519-dalek = "3"
curve25519-dalek = { package = "curve25519-dalek-ng", version = "4" }
data-encoding = "2.3"
dialoguer = "0.8"
directories-next = "2"
ecdsa_fun = { git = "https://github.com/LLFourn/secp256kfun", features = [ "libsecp_compat", "serde" ] }
ecdsa_fun = { git = "https://github.com/LLFourn/secp256kfun", default-features = false, features = [ "libsecp_compat", "serde" ] }
ed25519-dalek = "1"
futures = { version = "0.3", default-features = false }
itertools = "0.10"
@ -37,8 +37,8 @@ monero-rpc = { path = "../monero-rpc" }
pem = "0.8"
prettytable-rs = "0.8"
proptest = "1"
rand = "0.7"
rand_chacha = "0.2"
rand = "0.8"
rand_chacha = "0.3"
reqwest = { version = "0.11", features = [ "rustls-tls", "stream", "socks" ], default-features = false }
rust_decimal = { version = "1", features = [ "serde-float" ] }
rust_decimal_macros = "1"
@ -46,7 +46,7 @@ serde = { version = "1", features = [ "derive" ] }
serde_cbor = "0.11"
serde_json = "1"
sha2 = "0.9"
sigma_fun = { git = "https://github.com/LLFourn/secp256kfun", features = [ "ed25519", "serde" ] }
sigma_fun = { git = "https://github.com/LLFourn/secp256kfun", default-features = false, features = [ "ed25519", "serde" ] }
sled = "0.34"
structopt = "0.3"
strum = { version = "0.20", features = [ "derive" ] }

Loading…
Cancel
Save