diff --git a/Cargo.lock b/Cargo.lock index a638dbbd..c96d77d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -256,6 +256,15 @@ dependencies = [ "generic-array 0.12.3", ] +[[package]] +name = "block-buffer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +dependencies = [ + "generic-array 0.14.4", +] + [[package]] name = "block-padding" version = "0.1.5" @@ -280,7 +289,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb" dependencies = [ - "sha2", + "sha2 0.8.2", ] [[package]] @@ -439,6 +448,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +[[package]] +name = "cpuid-bool" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" + [[package]] name = "crc32fast" version = "1.2.0" @@ -538,12 +553,12 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "2.1.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d85653f070353a16313d0046f173f70d1aadd5b42600a14de626f0dfb3473a5" +checksum = "c8492de420e9e60bc9a1d66e2dbb91825390b738a388606600663fc529b4b307" dependencies = [ "byteorder", - "digest 0.8.1", + "digest 0.9.0", "rand_core 0.5.1", "serde", "subtle", @@ -642,29 +657,29 @@ checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b" [[package]] name = "ed25519-zebra" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16644be292b6dbd3d5a4ab1382b22a9f0dc5a2055f9141f3e4bc47ee640e12e" +checksum = "c85a1fff1b329c96789427b09d4d5949b2d2f717851fd1e65a18878bee19d1ff" dependencies = [ "curve25519-dalek", "hex", "rand_core 0.5.1", "serde", - "sha2", + "sha2 0.9.1", "thiserror", ] [[package]] name = "ed25519-zebra" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833d5de20d6c876d03b23d13d9caa75fb682d8939d7d418938699a35ee556491" +checksum = "fc69a9bf9de8ad6cfa9c32db73dbe06ace3eb9a50a2f8c8520d8f453e13ae32a" dependencies = [ "curve25519-dalek", "hex", "rand_core 0.5.1", "serde", - "sha2", + "sha2 0.9.1", "thiserror", ] @@ -1450,9 +1465,9 @@ checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" [[package]] name = "once_cell" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" +checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad" [[package]] name = "opaque-debug" @@ -1460,6 +1475,12 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + [[package]] name = "owning_ref" version = "0.4.1" @@ -1883,9 +1904,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.23" +version = "0.8.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552cbc6167bf0a06c79f8c2a92fdb91cfb5257966c02c2c8f462cb1433e92f15" +checksum = "7466cad0eb3303798229ffab23bb8f598d185c71f3dfa17cd751d440e375782a" dependencies = [ "bytemuck", ] @@ -1896,9 +1917,9 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad5112e0dbbb87577bfbc56c42450235e3012ce336e29c5befd7807bd626da4a" dependencies = [ - "block-buffer", + "block-buffer 0.7.3", "digest 0.8.1", - "opaque-debug", + "opaque-debug 0.2.3", ] [[package]] @@ -2053,10 +2074,23 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" dependencies = [ - "block-buffer", + "block-buffer 0.7.3", "digest 0.8.1", "fake-simd", - "opaque-debug", + "opaque-debug 0.2.3", +] + +[[package]] +name = "sha2" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2933378ddfeda7ea26f48c555bdad8bb446bf8a3d17832dc83e380d444cfb8c1" +dependencies = [ + "block-buffer 0.9.0", + "cfg-if", + "cpuid-bool", + "digest 0.9.0", + "opaque-debug 0.3.0", ] [[package]] @@ -2440,7 +2474,7 @@ name = "tower-batch" version = "0.1.0" dependencies = [ "color-eyre", - "ed25519-zebra 2.1.1", + "ed25519-zebra 2.1.2", "futures", "futures-core", "pin-project", @@ -2841,9 +2875,9 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "0.6.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "637ff90c9540fa3073bb577e65033069e4bae7c79d49d74aa3ffdf5342a53217" +checksum = "00ffb05621d7d051df0f020edf3e5db20797a4e522bf1f9c5dfa20603f1c85f6" dependencies = [ "curve25519-dalek", "rand_core 0.5.1", @@ -2874,7 +2908,7 @@ dependencies = [ "chrono", "color-eyre", "displaydoc", - "ed25519-zebra 1.0.0", + "ed25519-zebra 1.0.1", "equihash", "futures", "hex", @@ -2889,7 +2923,7 @@ dependencies = [ "secp256k1", "serde", "serde-big-array", - "sha2", + "sha2 0.8.2", "spandoc", "thiserror", "tracing", diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml index 1c6221be..b6482007 100644 --- a/zebra-chain/Cargo.toml +++ b/zebra-chain/Cargo.toml @@ -27,11 +27,11 @@ serde = { version = "1", features = ["serde_derive", "rc"] } serde-big-array = "0.3.0" sha2 = { version = "0.8.2", features=["compress"] } thiserror = "1" -x25519-dalek = { version = "0.6", features = ["serde"] } +x25519-dalek = { version = "1", features = ["serde"] } # ZF deps displaydoc = "0.1.7" -ed25519-zebra = "1.0" +ed25519-zebra = "1" equihash = "0.1" redjubjub = "0.2"