diff --git a/CHANGELOG.md b/CHANGELOG.md index 5dbc090fd..64ec179f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,10 @@ runtime - Update programs to accept multiple oracle data ([#1153](https://github.com/entropyxyz/entropy-core/pull/1153/)) - Use context, not block number in TDX quote input data ([#1179](https://github.com/entropyxyz/entropy-core/pull/1179)) +### Fixed + +- Reshare in a spawned task and fix propagation pallet rotate keyshares endpoint lookup key ([#1185](https://github.com/entropyxyz/entropy-core/pull/1185)) + ## [0.3.0](https://github.com/entropyxyz/entropy-core/compare/release/v0.2.0...release/v0.3.0) - 2024-10-22 ### Breaking Changes diff --git a/Cargo.lock b/Cargo.lock index 989a41f6a..b26f2af47 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "Inflector" @@ -86,7 +86,7 @@ dependencies = [ "cipher 0.4.4", "ctr", "ghash", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -836,7 +836,7 @@ dependencies = [ "rand_core 0.6.4", "ripemd", "sha2 0.10.8", - "subtle 2.5.0", + "subtle 2.6.1", "zeroize", ] @@ -942,7 +942,7 @@ checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", "arrayvec 0.7.4", - "constant_time_eq 0.3.0", + "constant_time_eq 0.3.1", ] [[package]] @@ -953,20 +953,20 @@ checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae" dependencies = [ "arrayref", "arrayvec 0.7.4", - "constant_time_eq 0.3.0", + "constant_time_eq 0.3.1", ] [[package]] name = "blake3" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" +checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e" dependencies = [ "arrayref", "arrayvec 0.7.4", "cc", "cfg-if", - "constant_time_eq 0.3.0", + "constant_time_eq 0.3.1", ] [[package]] @@ -1072,9 +1072,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" dependencies = [ "serde", ] @@ -1458,9 +1458,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "constcat" @@ -1780,8 +1780,20 @@ checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array 0.14.7", "rand_core 0.6.4", - "serdect", - "subtle 2.5.0", + "subtle 2.6.1", + "zeroize", +] + +[[package]] +name = "crypto-bigint" +version = "0.6.0-rc.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d748d1f5b807ee6d0df5a548d0130417295c3aaed1dcbbb3d6a2e7106e11fcca" +dependencies = [ + "num-traits", + "rand_core 0.6.4", + "serdect 0.3.0-rc.0", + "subtle 2.6.1", "zeroize", ] @@ -1813,7 +1825,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ "generic-array 0.14.7", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -1823,16 +1835,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" dependencies = [ "generic-array 0.14.7", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] name = "crypto-primes" -version = "0.5.0" +version = "0.6.0-pre.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a4eeb0a8686cfc94242c8860628627206a2b24148d6ab8f5d41c708438582f" +checksum = "d9fad3f7645c77d3e0269f3e74a8dd25746de992b16bcecbb316059836e0b366" dependencies = [ - "crypto-bigint", + "crypto-bigint 0.6.0-rc.6", "rand_core 0.6.4", ] @@ -1854,7 +1866,7 @@ dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.5.1", - "subtle 2.5.0", + "subtle 2.6.1", "zeroize", ] @@ -1871,7 +1883,7 @@ dependencies = [ "fiat-crypto", "platforms", "rustc_version", - "subtle 2.5.0", + "subtle 2.6.1", "zeroize", ] @@ -2193,7 +2205,7 @@ dependencies = [ "block-buffer 0.10.4", "const-oid", "crypto-common", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -2331,7 +2343,7 @@ dependencies = [ "digest 0.10.7", "elliptic-curve", "rfc6979", - "serdect", + "serdect 0.2.0", "signature", "spki", ] @@ -2357,7 +2369,7 @@ dependencies = [ "rand_core 0.6.4", "serde", "sha2 0.10.8", - "subtle 2.5.0", + "subtle 2.6.1", "zeroize", ] @@ -2403,7 +2415,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ "base16ct", - "crypto-bigint", + "crypto-bigint 0.5.5", "digest 0.10.7", "ff", "generic-array 0.14.7", @@ -2412,8 +2424,8 @@ dependencies = [ "pkcs8", "rand_core 0.6.4", "sec1", - "serdect", - "subtle 2.5.0", + "serdect 0.2.0", + "subtle 2.6.1", "zeroize", ] @@ -2578,8 +2590,9 @@ dependencies = [ [[package]] name = "entropy-programs-core" -version = "0.10.0" -source = "git+https://github.com/entropyxyz/programs.git?branch=master#b300dab62e0bd77ff9a6341dab4988459dcaed78" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9a92d75d04917995a04398bc9bb57971c1d9ce4fe7b0460fe12fe10213a2c9c" dependencies = [ "getrandom 0.2.15", "serde", @@ -2589,8 +2602,9 @@ dependencies = [ [[package]] name = "entropy-programs-runtime" -version = "0.10.0" -source = "git+https://github.com/entropyxyz/programs.git?branch=master#b300dab62e0bd77ff9a6341dab4988459dcaed78" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d5617ea52abc9c4eed998053a2dcf163f926224a1302fb75d4cc31ae99e700" dependencies = [ "entropy-programs-core", "thiserror 1.0.68", @@ -2787,7 +2801,7 @@ dependencies = [ "tdx-quote", "tokio", "tracing", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", ] [[package]] @@ -2851,7 +2865,7 @@ dependencies = [ "tracing", "tracing-bunyan-formatter", "tracing-loki", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", "uuid", "vergen", "x25519-dalek 2.0.1", @@ -3111,7 +3125,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ "rand_core 0.6.4", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -4052,7 +4066,7 @@ checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", "rand_core 0.6.4", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -4858,10 +4872,11 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.72" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +checksum = "a865e038f7f6ed956f788f0d7d60c541fff74c7bd74272c5d4cf15c63743e705" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -5111,7 +5126,7 @@ dependencies = [ "ecdsa", "elliptic-curve", "once_cell", - "serdect", + "serdect 0.2.0", "sha2 0.10.8", ] @@ -5651,7 +5666,7 @@ checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451" dependencies = [ "crunchy", "digest 0.9.0", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -6047,7 +6062,7 @@ dependencies = [ "rand", "rand_chacha 0.3.1", "rand_distr", - "subtle 2.5.0", + "subtle 2.6.1", "thiserror 1.0.68", "zeroize", ] @@ -7849,7 +7864,7 @@ checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" dependencies = [ "base64ct", "rand_core 0.6.4", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -8937,7 +8952,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ "hmac 0.12.1", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -9044,7 +9059,7 @@ dependencies = [ "rand_core 0.6.4", "signature", "spki", - "subtle 2.5.0", + "subtle 2.6.1", "zeroize", ] @@ -9170,7 +9185,7 @@ dependencies = [ "ring 0.17.8", "rustls-pki-types", "rustls-webpki 0.102.2", - "subtle 2.5.0", + "subtle 2.6.1", "zeroize", ] @@ -9183,7 +9198,7 @@ dependencies = [ "once_cell", "rustls-pki-types", "rustls-webpki 0.102.2", - "subtle 2.5.0", + "subtle 2.6.1", "zeroize", ] @@ -11420,7 +11435,7 @@ dependencies = [ "rand_core 0.6.4", "serde_bytes", "sha2 0.10.8", - "subtle 2.5.0", + "subtle 2.6.1", "zeroize", ] @@ -11474,8 +11489,8 @@ dependencies = [ "der", "generic-array 0.14.7", "pkcs8", - "serdect", - "subtle 2.5.0", + "serdect 0.2.0", + "subtle 2.6.1", "zeroize", ] @@ -11508,9 +11523,9 @@ dependencies = [ [[package]] name = "secrecy" -version = "0.9.0-pre.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e480ff13eb421e9c0201c7d8e17fe61ad336a38701989e91f8d0523001cd2fa" +checksum = "e891af845473308773346dc847b2c23ee78fe442e0472ac50e22a18a93d3ae5a" dependencies = [ "serde", "zeroize", @@ -11584,6 +11599,17 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde-encoded-bytes" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec007ca0e3db940a5409d65780b6bd0202cbea68800861ae876b80655ee8e24b" +dependencies = [ + "base64 0.21.7", + "hex", + "serde", +] + [[package]] name = "serde_bytes" version = "0.11.14" @@ -11668,6 +11694,16 @@ dependencies = [ "serde", ] +[[package]] +name = "serdect" +version = "0.3.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a504c8ee181e3e594d84052f983d60afe023f4d94d050900be18062bbbf7b58" +dependencies = [ + "base16ct", + "serde", +] + [[package]] name = "serial_test" version = "3.2.0" @@ -11991,7 +12027,7 @@ dependencies = [ "ring 0.17.8", "rustc_version", "sha2 0.10.8", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -13770,7 +13806,7 @@ dependencies = [ "bitflags 1.3.2", "byteorder", "keccak", - "subtle 2.5.0", + "subtle 2.6.1", "zeroize", ] @@ -13949,9 +13985,9 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "subxt" @@ -14146,23 +14182,22 @@ dependencies = [ [[package]] name = "synedrion" -version = "0.2.0-beta.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d68ecdc79fc2be671be2abe5391d25b38fca840e18665ef2a177aa925f6740ac" +checksum = "a619936bb0dd5fa8f8e79c703590c6a10be9e2160b61a2e85484f9f053a3c5b0" dependencies = [ - "base64 0.21.7", "bincode 2.0.0-rc.3", "bip32", - "crypto-bigint", + "crypto-bigint 0.6.0-rc.6", "crypto-primes", "digest 0.10.7", "displaydoc", "hashing-serializer", - "hex", "k256", "rand_core 0.6.4", - "secrecy 0.9.0-pre.0", + "secrecy 0.10.3", "serde", + "serde-encoded-bytes", "sha2 0.10.8", "sha3", "signature", @@ -14682,9 +14717,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite 0.2.14", @@ -14694,9 +14729,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", @@ -14705,9 +14740,9 @@ dependencies = [ [[package]] name = "tracing-bunyan-formatter" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5c266b9ac83dedf0e0385ad78514949e6d89491269e7065bee51d2bb8ec7373" +checksum = "2d637245a0d8774bd48df6482e086c59a8b5348a910c3b0579354045a9d82411" dependencies = [ "ahash 0.8.11", "gethostname", @@ -14718,14 +14753,14 @@ dependencies = [ "tracing", "tracing-core", "tracing-log 0.1.4", - "tracing-subscriber 0.3.18", + "tracing-subscriber 0.3.19", ] [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", "valuable", @@ -14779,8 +14814,8 @@ dependencies = [ "tracing", "tracing-core", "tracing-log 0.1.4", - "tracing-serde", - "tracing-subscriber 0.3.18", + "tracing-serde 0.1.3", + "tracing-subscriber 0.3.19", "url", ] @@ -14794,6 +14829,16 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-serde" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1" +dependencies = [ + "serde", + "tracing-core", +] + [[package]] name = "tracing-subscriber" version = "0.2.25" @@ -14814,14 +14859,14 @@ dependencies = [ "tracing", "tracing-core", "tracing-log 0.1.4", - "tracing-serde", + "tracing-serde 0.1.3", ] [[package]] name = "tracing-subscriber" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" dependencies = [ "matchers 0.1.0", "nu-ansi-term", @@ -14835,7 +14880,7 @@ dependencies = [ "tracing", "tracing-core", "tracing-log 0.2.0", - "tracing-serde", + "tracing-serde 0.2.0", ] [[package]] @@ -15070,7 +15115,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402" dependencies = [ "generic-array 0.14.7", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -15080,7 +15125,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ "crypto-common", - "subtle 2.5.0", + "subtle 2.6.1", ] [[package]] @@ -15232,9 +15277,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "d15e63b4482863c109d70a7b8706c1e364eb6ea449b201a76c5b89cedcec2d5c" dependencies = [ "cfg-if", "once_cell", @@ -15243,9 +15288,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "8d36ef12e3aaca16ddd3f67922bc63e48e953f126de60bd33ccc0101ef9998cd" dependencies = [ "bumpalo", "log", @@ -15280,21 +15325,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.45" +version = "0.4.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" +checksum = "9dfaf8f50e5f293737ee323940c7d8b08a66a95a419223d9f41610ca08b0833d" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "705440e08b42d3e4b36de7d66c944be628d579796b8090bfa3471478a2260051" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -15302,9 +15348,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "98c9ae5a76e46f4deecd0f0255cc223cfa18dc9b261213b8aa0c7b36f61b3f1d" dependencies = [ "proc-macro2", "quote", @@ -15315,9 +15361,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "6ee99da9c5ba11bd675621338ef6fa52296b76b83305e9b6e5c77d4c286d6d49" [[package]] name = "wasm-encoder" @@ -16041,9 +16087,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "a98bc3c33f0fe7e59ad7cd041b89034fa82a7c2d4365ca538dda6cdaf513863c" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml index 869bc5dd1..720b42d4e 100644 --- a/crates/client/Cargo.toml +++ b/crates/client/Cargo.toml @@ -17,7 +17,7 @@ num ="0.4.3" thiserror ="2.0.3" futures ="0.3" sp-core ={ version="31.0.0", default-features=false, features=["full_crypto", "serde"] } -tracing ="0.1.37" +tracing ="0.1.41" rand ={ version="0.8", default-features=false } anyhow ="1.0.93" @@ -29,12 +29,12 @@ x25519-dalek ={ version="2.0.1", features=["static_secrets"], optional=true entropy-protocol ={ version="0.3.0", path="../protocol", optional=true, default-features=false } reqwest ={ version="0.12.9", features=["json", "stream"], optional=true } base64 ={ version="0.22.0", optional=true } -synedrion ={ version="0.2.0-beta.0", optional=true } +synedrion ={ version="0.2.0", optional=true } hex ={ version="0.4.3", optional=true } parity-scale-codec={ version="3.6.3", default-features=false, optional=true } # Only for the browser -js-sys={ version="0.3.72", optional=true } +js-sys={ version="0.3.74", optional=true } tokio ={ version="1.41", features=["time"] } [dev-dependencies] diff --git a/crates/client/src/user.rs b/crates/client/src/user.rs index 154924c42..268274fae 100644 --- a/crates/client/src/user.rs +++ b/crates/client/src/user.rs @@ -160,7 +160,7 @@ pub async fn request_attestation( rpc: &LegacyRpcMethods, attestee: &sr25519::Pair, ) -> Result<[u8; 32], AttestationRequestError> { - tracing::debug!("{} is requesting an attestation.", attestee.public()); + tracing::debug!("{:?} is requesting an attestation.", attestee.public()); let request_attestation = entropy::tx().attestation().request_attestation(); diff --git a/crates/kvdb/Cargo.toml b/crates/kvdb/Cargo.toml index a379eec23..d49ad9bc7 100644 --- a/crates/kvdb/Cargo.toml +++ b/crates/kvdb/Cargo.toml @@ -23,7 +23,7 @@ zeroize ={ version="1.8", features=["zeroize_derive"], default-features= rpassword ={ version="7.3.1", default-features=false } scrypt ={ version="0.11.0", default-features=false, features=["std"] } chacha20poly1305={ version="0.9", features=["alloc"], default-features=false } -synedrion ={ version="0.2.0-beta.0" } +synedrion ="0.2.0" # Async tokio ={ version="1.41", features=["macros", "sync", "fs", "rt-multi-thread", "io-util"] } diff --git a/crates/protocol/Cargo.toml b/crates/protocol/Cargo.toml index 572a14119..3f252f927 100644 --- a/crates/protocol/Cargo.toml +++ b/crates/protocol/Cargo.toml @@ -11,7 +11,7 @@ edition ='2021' [dependencies] async-trait ="0.1.83" entropy-shared ={ version="0.3.0", path="../shared", default-features=false } -synedrion ={ version="0.2.0-beta.0" } +synedrion ="0.2.0" serde ={ version="1.0", features=["derive"], default-features=false } subxt ={ version="0.35.3", default-features=false } sp-core ={ version="31.0.0", default-features=false, features=["full_crypto", "serde"] } @@ -24,7 +24,7 @@ thiserror ="2.0.3" snow ="0.9.6" getrandom ={ version="0.2", features=["js"] } rand_core ={ version="0.6.4", features=["getrandom"] } -tracing ="0.1.37" +tracing ="0.1.41" bincode ="1.3.3" serde_json ="1.0" zeroize ="1.8.1" @@ -39,10 +39,10 @@ tokio-tungstenite={ version="0.24.0", optional=true } # Used only with the `wasm` feature gloo-net ={ version="0.6.0", default-features=false, features=["websocket"], optional=true } -wasm-bindgen-futures={ version="0.4.45", optional=true } +wasm-bindgen-futures={ version="0.4.47", optional=true } wasm-bindgen ={ version="0.2.92", optional=true } wasm-bindgen-derive ={ version="0.3", optional=true } -js-sys ={ version="0.3.72", optional=true } +js-sys ={ version="0.3.74", optional=true } base64 ={ version="0.22.1", optional=true } schnorrkel ={ version="0.11.4", default-features=false, features=["std"], optional=true } diff --git a/crates/protocol/src/errors.rs b/crates/protocol/src/errors.rs index 6555a05e4..e9cc618b7 100644 --- a/crates/protocol/src/errors.rs +++ b/crates/protocol/src/errors.rs @@ -152,6 +152,8 @@ pub enum ProtocolExecutionErr { ArcUnwrapError, #[error("Message processing task panic or cancellation: {0}")] JoinHandle(#[from] tokio::task::JoinError), + #[error("Could not get validating key from keyshare")] + NoValidatingKey, } #[derive(Debug, Error)] diff --git a/crates/protocol/src/execute_protocol.rs b/crates/protocol/src/execute_protocol.rs index 89999a267..d2112e883 100644 --- a/crates/protocol/src/execute_protocol.rs +++ b/crates/protocol/src/execute_protocol.rs @@ -278,7 +278,8 @@ pub async fn execute_dkg( tracing::info!("Finished key init protocol"); // Send verifying key - let verifying_key = init_keyshare.verifying_key(); + let verifying_key = + init_keyshare.verifying_key().ok_or(ProtocolExecutionErr::NoValidatingKey)?; for party_id in party_ids.iter() { if !key_init_parties.contains(party_id) { let message = ProtocolMessage { diff --git a/crates/protocol/tests/protocol.rs b/crates/protocol/tests/protocol.rs index 19e04adaa..afbf04056 100644 --- a/crates/protocol/tests/protocol.rs +++ b/crates/protocol/tests/protocol.rs @@ -78,7 +78,7 @@ async fn test_sign_with_parties(num_parties: usize) { let (pairs, ids) = get_keypairs_and_ids(num_parties); let keyshares = KeyShare::::new_centralized(&mut OsRng, &ids, None); let aux_infos = AuxInfo::::new_centralized(&mut OsRng, &ids); - let verifying_key = keyshares[&PartyId::from(pairs[0].public())].verifying_key(); + let verifying_key = keyshares[&PartyId::from(pairs[0].public())].verifying_key().unwrap(); let parties: Vec<_> = pairs .iter() @@ -114,7 +114,7 @@ async fn test_sign_with_parties(num_parties: usize) { async fn test_refresh_with_parties(num_parties: usize) { let (pairs, ids) = get_keypairs_and_ids(num_parties); let keyshares = KeyShare::::new_centralized(&mut OsRng, &ids, None); - let verifying_key = keyshares[&PartyId::from(pairs[0].public())].verifying_key(); + let verifying_key = keyshares[&PartyId::from(pairs[0].public())].verifying_key().unwrap(); let session_id = SessionId::Reshare { verifying_key: verifying_key.to_encoded_point(true).as_bytes().to_vec(), @@ -198,7 +198,7 @@ async fn test_dkg_and_sign_with_parties(num_parties: usize) { }) .collect(); - let verifying_key = parties[0].keyshare.clone().unwrap().verifying_key(); + let verifying_key = parties[0].keyshare.clone().unwrap().verifying_key().unwrap(); let message_hash = [0u8; 32]; let session_id = SessionId::Sign(SigningSessionInfo { diff --git a/crates/testing-utils/Cargo.toml b/crates/testing-utils/Cargo.toml index 2aea25152..7f4b8a6c1 100644 --- a/crates/testing-utils/Cargo.toml +++ b/crates/testing-utils/Cargo.toml @@ -22,12 +22,12 @@ entropy-shared ={ version="0.3.0", path="../shared" } entropy-kvdb ={ version="0.3.0", path="../kvdb", default-features=false } entropy-tss ={ version="0.3.0", path="../threshold-signature-server", features=["test_helpers"] } entropy-protocol ={ version="0.3.0", path="../protocol" } -synedrion ={ version="0.2.0-beta.0" } +synedrion ="0.2.0" hex ="0.4.3" rand_core ="0.6.4" rand ="0.8.5" tdx-quote ={ version="0.0.1", features=["mock"] } # Logging -tracing ="0.1.37" -tracing-subscriber={ version="0.3.18", features=["env-filter"] } +tracing ="0.1.41" +tracing-subscriber={ version="0.3.19", features=["env-filter"] } diff --git a/crates/testing-utils/keyshares/production/keyshare-held-by-alice.keyshare b/crates/testing-utils/keyshares/production/keyshare-held-by-alice.keyshare index bf4eddd15..5bfdf562c 100644 Binary files a/crates/testing-utils/keyshares/production/keyshare-held-by-alice.keyshare and b/crates/testing-utils/keyshares/production/keyshare-held-by-alice.keyshare differ diff --git a/crates/testing-utils/keyshares/production/keyshare-held-by-bob.keyshare b/crates/testing-utils/keyshares/production/keyshare-held-by-bob.keyshare index 32a400848..3b99543ae 100644 Binary files a/crates/testing-utils/keyshares/production/keyshare-held-by-bob.keyshare and b/crates/testing-utils/keyshares/production/keyshare-held-by-bob.keyshare differ diff --git a/crates/testing-utils/keyshares/production/keyshare-held-by-charlie.keyshare b/crates/testing-utils/keyshares/production/keyshare-held-by-charlie.keyshare index dbcf40f53..1af50b17d 100644 Binary files a/crates/testing-utils/keyshares/production/keyshare-held-by-charlie.keyshare and b/crates/testing-utils/keyshares/production/keyshare-held-by-charlie.keyshare differ diff --git a/crates/testing-utils/keyshares/test/keyshare-held-by-alice.keyshare b/crates/testing-utils/keyshares/test/keyshare-held-by-alice.keyshare index c2a187223..65e89b906 100644 Binary files a/crates/testing-utils/keyshares/test/keyshare-held-by-alice.keyshare and b/crates/testing-utils/keyshares/test/keyshare-held-by-alice.keyshare differ diff --git a/crates/testing-utils/keyshares/test/keyshare-held-by-bob.keyshare b/crates/testing-utils/keyshares/test/keyshare-held-by-bob.keyshare index 69fc750de..2877283cc 100644 Binary files a/crates/testing-utils/keyshares/test/keyshare-held-by-bob.keyshare and b/crates/testing-utils/keyshares/test/keyshare-held-by-bob.keyshare differ diff --git a/crates/testing-utils/keyshares/test/keyshare-held-by-charlie.keyshare b/crates/testing-utils/keyshares/test/keyshare-held-by-charlie.keyshare index d4a1ea866..d2559b0c5 100644 Binary files a/crates/testing-utils/keyshares/test/keyshare-held-by-charlie.keyshare and b/crates/testing-utils/keyshares/test/keyshare-held-by-charlie.keyshare differ diff --git a/crates/testing-utils/src/create_test_keyshares.rs b/crates/testing-utils/src/create_test_keyshares.rs index 0d95a5c84..ecd89853a 100644 --- a/crates/testing-utils/src/create_test_keyshares.rs +++ b/crates/testing-utils/src/create_test_keyshares.rs @@ -49,7 +49,7 @@ where let aux_infos = AuxInfo::::new_centralized(&mut OsRng, &all_parties); let new_holder = NewHolder { - verifying_key: keyshares.values().next().unwrap().verifying_key(), + verifying_key: keyshares.values().next().unwrap().verifying_key().unwrap(), old_threshold: 2, old_holders, }; diff --git a/crates/threshold-signature-server/Cargo.toml b/crates/threshold-signature-server/Cargo.toml index ac390f102..251dcba05 100644 --- a/crates/threshold-signature-server/Cargo.toml +++ b/crates/threshold-signature-server/Cargo.toml @@ -22,7 +22,7 @@ zeroize ="1.8.1" hex ="0.4.3" reqwest-eventsource="0.6" serde_derive ="1.0.147" -synedrion ={ version="0.2.0-beta.0" } +synedrion ="0.2.0" strum ="0.26.2" backoff ={ version="0.4.0", features=["tokio"] } @@ -46,14 +46,14 @@ entropy-protocol={ version="0.3.0", path="../protocol", features=["server"] } entropy-client ={ version="0.3.0", path="../client", default-features=false, features=["native"] } # Programs -entropy-programs-runtime={ git="https://github.com/entropyxyz/programs.git", branch="master" } +entropy-programs-runtime="0.11.0" # Logging -tracing ="0.1.37" -tracing-subscriber ={ version="0.3.18", features=["env-filter", "json"] } +tracing ="0.1.41" +tracing-subscriber ={ version="0.3.19", features=["env-filter", "json"] } tracing-loki ="0.2" tower-http ={ version="0.6.2", features=["trace", "cors"] } -tracing-bunyan-formatter="0.3.9" +tracing-bunyan-formatter="0.3.10" uuid ={ version="1.11.0", features=["v4"] } # Misc @@ -61,7 +61,7 @@ tokio-tungstenite="0.24.0" bincode ="1.3.3" bip32 ={ version="0.5.2" } bip39 ={ version="2.1.0", features=["zeroize"] } -bytes ={ version="1.8", default-features=false, features=["serde"] } +bytes ={ version="1.9", default-features=false, features=["serde"] } base64 ="0.22.1" clap ={ version="4.5.21", features=["derive"] } num ="0.4.3" @@ -82,7 +82,7 @@ project-root="0.2.2" sp-keyring ="34.0.0" more-asserts="0.3.1" lazy_static ="1.5.0" -blake3 ="1.5.4" +blake3 ="1.5.5" ethers-core ="2.0.14" schnorrkel ={ version="0.11.4", default-features=false, features=["std"] } schemars ={ version="0.8.21" } diff --git a/crates/threshold-signature-server/src/attestation/api.rs b/crates/threshold-signature-server/src/attestation/api.rs index 8ab443ab5..d043e149a 100644 --- a/crates/threshold-signature-server/src/attestation/api.rs +++ b/crates/threshold-signature-server/src/attestation/api.rs @@ -186,7 +186,8 @@ pub async fn create_quote( context, ); - Ok(configfs_tsm::create_quote(input_data.0)?) + Ok(configfs_tsm::create_quote(input_data.0) + .map_err(|e| AttestationErr::QuoteGeneration(format!("{:?}", e)))?) } /// Querystring for the GET `/attest` endpoint diff --git a/crates/threshold-signature-server/src/attestation/errors.rs b/crates/threshold-signature-server/src/attestation/errors.rs index 14ace080b..7daad52fb 100644 --- a/crates/threshold-signature-server/src/attestation/errors.rs +++ b/crates/threshold-signature-server/src/attestation/errors.rs @@ -39,7 +39,7 @@ pub enum AttestationErr { Codec(#[from] parity_scale_codec::Error), #[cfg(feature = "production")] #[error("Quote generation: {0}")] - QuoteGeneration(#[from] std::io::Error), + QuoteGeneration(String), #[error("Vec Conversion Error: {0}")] Conversion(&'static str), #[error("Data is repeated")] diff --git a/pallets/registry/Cargo.toml b/pallets/registry/Cargo.toml index e172ac17d..af7046fd2 100644 --- a/pallets/registry/Cargo.toml +++ b/pallets/registry/Cargo.toml @@ -16,7 +16,7 @@ bip32 ={ version="0.5.2", default-features=false, features=["alloc"] } codec ={ package="parity-scale-codec", version="3.6.3", default-features=false, features=["derive"] } log ={ version="0.4.22", default-features=false } scale-info={ version="2.11", default-features=false, features=["derive"] } -synedrion ={ version="0.2.0-beta.0", default-features=false } +synedrion ={ version="0.2.0", default-features=false } rand ={ version="0.8.5", default-features=false, features=["alloc"] } frame-benchmarking={ version="29.0.0", default-features=false, optional=true } diff --git a/scripts/create-test-keyshares/Cargo.toml b/scripts/create-test-keyshares/Cargo.toml index 4cfbdb541..1cc26bccd 100644 --- a/scripts/create-test-keyshares/Cargo.toml +++ b/scripts/create-test-keyshares/Cargo.toml @@ -11,13 +11,11 @@ publish =false [dependencies] entropy-testing-utils={ version="0.3.0", path="../../crates/testing-utils" } -tokio ={ version="1.41", features=["macros", "fs", "rt-multi-thread", "io-util", "process"] } -entropy-shared ={ version="0.3.0", path="../../crates/shared" } -entropy-kvdb ={ version="0.3.0", path="../../crates/kvdb", default-features=false } -sp-core ="31.0.0" - -# Unreleased version of Synedrion with support for child key derivations. -synedrion={ version="0.2.0-beta.0" } +tokio={ version="1.41", features=["macros", "fs", "rt-multi-thread", "io-util", "process"] } +entropy-shared={ version="0.3.0", path="../../crates/shared" } +entropy-kvdb={ version="0.3.0", path="../../crates/kvdb", default-features=false } +sp-core="31.0.0" +synedrion="0.2.0" entropy-tss={ version="0.3.0", path="../../crates/threshold-signature-server", features=[ "test_helpers", ] }