diff --git a/Cargo.lock b/Cargo.lock index b5e25353e..014ce438f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -54,17 +54,6 @@ dependencies = [ "cpufeatures", ] -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom 0.2.15", - "once_cell", - "version_check", -] - [[package]] name = "ahash" version = "0.8.11" @@ -101,7 +90,7 @@ dependencies = [ "bytes", "cfg-if", "const-hex", - "derive_more 0.99.18", + "derive_more", "hex-literal", "itoa", "k256", @@ -948,7 +937,7 @@ version = "1.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4abf69a87be33b6f125a93d5046b5f7395c26d1f449bf8d3927f5577463b6de0" dependencies = [ - "ahash 0.8.11", + "ahash", "aws-credential-types", "aws-runtime", "aws-sigv4", @@ -1572,30 +1561,6 @@ dependencies = [ "util 0.1.0", ] -[[package]] -name = "borsh" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" -dependencies = [ - "borsh-derive", - "cfg_aliases", -] - -[[package]] -name = "borsh-derive" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" -dependencies = [ - "once_cell", - "proc-macro-crate 3.2.0", - "proc-macro2", - "quote", - "syn 2.0.76", - "syn_derive", -] - [[package]] name = "bs58" version = "0.4.0" @@ -1643,37 +1608,14 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "byte-unit" -version = "5.1.4" +version = "4.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ac19bdf0b2665407c39d82dbc937e951e7e2001609f0fb32edd0af45a2d63e" +checksum = "da78b32057b8fdfc352504708feeba7216dcd65a2c9ab02978cbd288d1279b6c" dependencies = [ - "rust_decimal", "serde", "utf8-width", ] -[[package]] -name = "bytecheck" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" -dependencies = [ - "bytecheck_derive", - "ptr_meta", - "simdutf8", -] - -[[package]] -name = "bytecheck_derive" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "bytemuck" version = "1.17.1" @@ -1805,12 +1747,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "cfg_aliases" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - [[package]] name = "chacha20" version = "0.9.1" @@ -1920,7 +1856,7 @@ dependencies = [ [[package]] name = "circuit-macros" version = "0.1.0" -source = "git+https://github.com/renegade-fi/renegade.git#254260624e742cb5faf973a213b9dc0686536f8e" +source = "git+https://github.com/renegade-fi/renegade.git#bd66fac3b85e533047b58b984572b2bee57a1eec" dependencies = [ "itertools 0.10.5", "proc-macro2", @@ -1963,7 +1899,7 @@ dependencies = [ [[package]] name = "circuit-types" version = "0.1.0" -source = "git+https://github.com/renegade-fi/renegade.git#254260624e742cb5faf973a213b9dc0686536f8e" +source = "git+https://github.com/renegade-fi/renegade.git#bd66fac3b85e533047b58b984572b2bee57a1eec" dependencies = [ "ark-bn254", "ark-ec", @@ -2034,7 +1970,7 @@ dependencies = [ [[package]] name = "circuits" version = "0.1.0" -source = "git+https://github.com/renegade-fi/renegade.git#254260624e742cb5faf973a213b9dc0686536f8e" +source = "git+https://github.com/renegade-fi/renegade.git#bd66fac3b85e533047b58b984572b2bee57a1eec" dependencies = [ "ark-crypto-primitives", "ark-ec", @@ -2274,7 +2210,7 @@ dependencies = [ [[package]] name = "common" version = "0.1.0" -source = "git+https://github.com/renegade-fi/renegade.git#254260624e742cb5faf973a213b9dc0686536f8e" +source = "git+https://github.com/renegade-fi/renegade.git#bd66fac3b85e533047b58b984572b2bee57a1eec" dependencies = [ "ark-mpc", "async-trait", @@ -2399,7 +2335,7 @@ dependencies = [ [[package]] name = "constants" version = "0.1.0" -source = "git+https://github.com/renegade-fi/renegade.git#254260624e742cb5faf973a213b9dc0686536f8e" +source = "git+https://github.com/renegade-fi/renegade.git#bd66fac3b85e533047b58b984572b2bee57a1eec" dependencies = [ "ark-bn254", "ark-ec", @@ -2889,27 +2825,6 @@ dependencies = [ "syn 2.0.76", ] -[[package]] -name = "derive_more" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" -dependencies = [ - "derive_more-impl", -] - -[[package]] -name = "derive_more-impl" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.76", - "unicode-xid", -] - [[package]] name = "digest" version = "0.8.1" @@ -3644,7 +3559,7 @@ dependencies = [ [[package]] name = "external-api" version = "0.1.0" -source = "git+https://github.com/renegade-fi/renegade.git#254260624e742cb5faf973a213b9dc0686536f8e" +source = "git+https://github.com/renegade-fi/renegade.git#bd66fac3b85e533047b58b984572b2bee57a1eec" dependencies = [ "circuit-types 0.1.0 (git+https://github.com/renegade-fi/renegade.git)", "common 0.1.0 (git+https://github.com/renegade-fi/renegade.git)", @@ -4270,9 +4185,6 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.8", -] [[package]] name = "hashbrown" @@ -4280,7 +4192,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.11", + "ahash", ] [[package]] @@ -4289,7 +4201,7 @@ version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ - "ahash 0.8.11", + "ahash", "allocator-api2", ] @@ -5206,7 +5118,7 @@ checksum = "3f0bee397dc9a7003e7bd34fffc1dc2d4c4fdc96530a0c439a5f98c9402bc7bf" dependencies = [ "bitflags 2.6.0", "byteorder", - "derive_more 0.99.18", + "derive_more", "indexmap 1.9.3", "libc", "mdbx-sys", @@ -5723,7 +5635,7 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2be3cbd384d4e955b231c895ce10685e3d8260c5ccffae898c96c723b0772835" dependencies = [ - "ahash 0.8.11", + "ahash", "portable-atomic", ] @@ -6362,15 +6274,14 @@ dependencies = [ [[package]] name = "openraft" -version = "0.9.14" +version = "0.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c3d679c9cd2dfdfea765c6922d4173cf89ca06bdc568928d86ea65c32ca524f" +checksum = "425a5a830e64ef5223ff95d49d538004925ec3f7f1f68548a4f5cc90e75afdcf" dependencies = [ "anyerror", "byte-unit", - "chrono", "clap 4.5.16", - "derive_more 1.0.0", + "derive_more", "futures", "maplit", "openraft-macros", @@ -7256,26 +7167,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "quanta" version = "0.12.3" @@ -7628,15 +7519,6 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" -[[package]] -name = "rend" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" -dependencies = [ - "bytecheck", -] - [[package]] name = "renegade-crypto" version = "0.1.0" @@ -7660,7 +7542,7 @@ dependencies = [ [[package]] name = "renegade-crypto" version = "0.1.0" -source = "git+https://github.com/renegade-fi/renegade.git#254260624e742cb5faf973a213b9dc0686536f8e" +source = "git+https://github.com/renegade-fi/renegade.git#bd66fac3b85e533047b58b984572b2bee57a1eec" dependencies = [ "ark-ec", "ark-ff 0.4.2", @@ -7893,35 +7775,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "rkyv" -version = "0.7.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" -dependencies = [ - "bitvec 1.0.1", - "bytecheck", - "bytes", - "hashbrown 0.12.3", - "ptr_meta", - "rend", - "rkyv_derive", - "seahash", - "tinyvec", - "uuid 1.10.0", -] - -[[package]] -name = "rkyv_derive" -version = "0.7.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "rlp" version = "0.5.2" @@ -8000,22 +7853,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18" -[[package]] -name = "rust_decimal" -version = "1.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" -dependencies = [ - "arrayvec", - "borsh", - "bytes", - "num-traits", - "rand 0.8.5", - "rkyv", - "serde", - "serde_json", -] - [[package]] name = "rustc-demangle" version = "0.1.24" @@ -8238,7 +8075,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024" dependencies = [ "cfg-if", - "derive_more 0.99.18", + "derive_more", "parity-scale-codec 3.6.12", "scale-info-derive", ] @@ -8292,12 +8129,6 @@ dependencies = [ "untrusted 0.9.0", ] -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - [[package]] name = "sec1" version = "0.3.0" @@ -8689,12 +8520,6 @@ dependencies = [ "wide", ] -[[package]] -name = "simdutf8" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" - [[package]] name = "simple_asn1" version = "0.6.2" @@ -9041,18 +8866,6 @@ dependencies = [ "syn 2.0.76", ] -[[package]] -name = "syn_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.76", -] - [[package]] name = "sync_wrapper" version = "0.1.2" @@ -10058,7 +9871,7 @@ dependencies = [ [[package]] name = "util" version = "0.1.0" -source = "git+https://github.com/renegade-fi/renegade.git#254260624e742cb5faf973a213b9dc0686536f8e" +source = "git+https://github.com/renegade-fi/renegade.git#bd66fac3b85e533047b58b984572b2bee57a1eec" dependencies = [ "ark-ec", "ark-serialize 0.4.2", @@ -10305,7 +10118,7 @@ dependencies = [ "arrayvec", "base64 0.13.1", "bytes", - "derive_more 0.99.18", + "derive_more", "ethabi 16.0.0", "ethereum-types 0.12.1", "futures", diff --git a/state/Cargo.toml b/state/Cargo.toml index 2821a7439..4a93ce4c9 100644 --- a/state/Cargo.toml +++ b/state/Cargo.toml @@ -27,7 +27,7 @@ required-features = ["mocks"] [dependencies] # === Replication === # -openraft = { version = "0.9", features = ["serde", "storage-v2"] } +openraft = { version = "=0.9.13", features = ["serde", "storage-v2"] } # === Storage === # bincode = "1.3"