diff --git a/Cargo.lock b/Cargo.lock index 8be3027b..8f2f6066 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -968,6 +968,12 @@ dependencies = [ "safemem", ] +[[package]] +name = "base64" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" + [[package]] name = "base64" version = "0.12.3" @@ -2043,6 +2049,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "ct-logs" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d3686f5fa27dbc1d76c751300376e167c5a43387f44bb451fd1c24776e49113" +dependencies = [ + "sct 0.6.1", +] + [[package]] name = "ctr" version = "0.9.2" @@ -3810,14 +3825,14 @@ dependencies = [ "fs-mistrust", "futures 0.3.31", "gif", - "grin_api", - "grin_chain", + "grin_api 5.4.0-alpha.0", + "grin_chain 5.4.0-alpha.0", "grin_config", - "grin_core", - "grin_keychain", - "grin_p2p", + "grin_core 5.4.0-alpha.0", + "grin_keychain 5.4.0-alpha.0", + "grin_p2p 5.4.0-alpha.0", "grin_servers", - "grin_util", + "grin_util 5.4.0-alpha.0", "grin_wallet_api", "grin_wallet_controller", "grin_wallet_impls", @@ -3876,6 +3891,39 @@ dependencies = [ "winit", ] +[[package]] +name = "grin_api" +version = "5.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6443239e75a15c517ce24fe4dd3ef257898ae0224e6b7c993db28794e13ecf3e" +dependencies = [ + "bytes 0.5.6", + "easy-jsonrpc-mw", + "futures 0.3.31", + "grin_chain 5.3.3", + "grin_core 5.3.3", + "grin_p2p 5.3.3", + "grin_pool 5.3.3", + "grin_store 5.3.3", + "grin_util 5.3.3", + "http 0.2.12", + "hyper 0.13.10", + "hyper-rustls 0.20.0", + "hyper-timeout 0.3.1", + "lazy_static", + "log", + "regex", + "ring 0.16.20", + "rustls 0.17.0", + "serde", + "serde_derive", + "serde_json", + "thiserror 1.0.69", + "tokio 0.2.25", + "tokio-rustls 0.13.1", + "url", +] + [[package]] name = "grin_api" version = "5.4.0-alpha.0" @@ -3884,16 +3932,16 @@ dependencies = [ "bytes 1.10.1", "easy-jsonrpc-mw", "futures 0.3.31", - "grin_chain", - "grin_core", - "grin_p2p", - "grin_pool", - "grin_store", - "grin_util", + "grin_chain 5.4.0-alpha.0", + "grin_core 5.4.0-alpha.0", + "grin_p2p 5.4.0-alpha.0", + "grin_pool 5.4.0-alpha.0", + "grin_store 5.4.0-alpha.0", + "grin_util 5.4.0-alpha.0", "http 0.2.12", "hyper 0.14.32", "hyper-rustls 0.23.2", - "hyper-timeout", + "hyper-timeout 0.4.1", "lazy_static", "log", "regex", @@ -3909,6 +3957,30 @@ dependencies = [ "url", ] +[[package]] +name = "grin_chain" +version = "5.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdedcee9e20e0cc8dc1460b37b3951306c774a6aa5788e3f45addc56e60f7fbe" +dependencies = [ + "bit-vec 0.6.3", + "bitflags 1.3.2", + "byteorder", + "chrono", + "croaring", + "enum_primitive", + "grin_core 5.3.3", + "grin_keychain 5.3.3", + "grin_store 5.3.3", + "grin_util 5.3.3", + "lazy_static", + "log", + "lru-cache", + "serde", + "serde_derive", + "thiserror 1.0.69", +] + [[package]] name = "grin_chain" version = "5.4.0-alpha.0" @@ -3919,10 +3991,10 @@ dependencies = [ "chrono", "croaring", "enum_primitive", - "grin_core", - "grin_keychain", - "grin_store", - "grin_util", + "grin_core 5.4.0-alpha.0", + "grin_keychain 5.4.0-alpha.0", + "grin_store 5.4.0-alpha.0", + "grin_util 5.4.0-alpha.0", "lazy_static", "log", "lru-cache", @@ -3936,16 +4008,43 @@ name = "grin_config" version = "5.4.0-alpha.0" dependencies = [ "dirs 2.0.2", - "grin_core", - "grin_p2p", + "grin_core 5.4.0-alpha.0", + "grin_p2p 5.4.0-alpha.0", "grin_servers", - "grin_util", + "grin_util 5.4.0-alpha.0", "rand 0.6.5", "serde", "serde_derive", "toml 0.5.11", ] +[[package]] +name = "grin_core" +version = "5.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4fbf242a2a23a6554dd4c430574d2563993cf5f44921f953635e8a177cf2506" +dependencies = [ + "blake2-rfc", + "byteorder", + "bytes 0.5.6", + "chrono", + "croaring", + "enum_primitive", + "grin_keychain 5.3.3", + "grin_util 5.3.3", + "lazy_static", + "log", + "lru-cache", + "num", + "num-bigint 0.2.6", + "rand 0.6.5", + "serde", + "serde_derive", + "siphasher 0.3.11", + "thiserror 1.0.69", + "zeroize", +] + [[package]] name = "grin_core" version = "5.4.0-alpha.0" @@ -3956,8 +4055,8 @@ dependencies = [ "chrono", "croaring", "enum_primitive", - "grin_keychain", - "grin_util", + "grin_keychain 5.4.0-alpha.0", + "grin_util 5.4.0-alpha.0", "lazy_static", "log", "lru-cache", @@ -3971,6 +4070,29 @@ dependencies = [ "zeroize", ] +[[package]] +name = "grin_keychain" +version = "5.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abeb1c22f48269a0bf463de589f8961d8bbb554def5e5e405710ead9a1b4c71a" +dependencies = [ + "blake2-rfc", + "byteorder", + "digest 0.9.0", + "grin_util 5.3.3", + "hmac 0.11.0", + "lazy_static", + "log", + "pbkdf2 0.8.0", + "rand 0.6.5", + "ripemd160", + "serde", + "serde_derive", + "serde_json", + "sha2 0.9.9", + "zeroize", +] + [[package]] name = "grin_keychain" version = "5.4.0-alpha.0" @@ -3978,7 +4100,7 @@ dependencies = [ "blake2-rfc", "byteorder", "digest 0.9.0", - "grin_util", + "grin_util 5.4.0-alpha.0", "hmac 0.11.0", "lazy_static", "log", @@ -3992,6 +4114,29 @@ dependencies = [ "zeroize", ] +[[package]] +name = "grin_p2p" +version = "5.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6b0ecc5597244d698ec4e1ea2e7d04c3b209f496db16731a04f06af41572c54" +dependencies = [ + "bitflags 1.3.2", + "bytes 0.5.6", + "chrono", + "enum_primitive", + "grin_chain 5.3.3", + "grin_core 5.3.3", + "grin_store 5.3.3", + "grin_util 5.3.3", + "log", + "lru-cache", + "num", + "rand 0.6.5", + "serde", + "serde_derive", + "tempfile", +] + [[package]] name = "grin_p2p" version = "5.4.0-alpha.0" @@ -4000,10 +4145,10 @@ dependencies = [ "bytes 0.5.6", "chrono", "enum_primitive", - "grin_chain", - "grin_core", - "grin_store", - "grin_util", + "grin_chain 5.4.0-alpha.0", + "grin_core 5.4.0-alpha.0", + "grin_store 5.4.0-alpha.0", + "grin_util 5.4.0-alpha.0", "log", "lru-cache", "num", @@ -4013,15 +4158,33 @@ dependencies = [ "tempfile", ] +[[package]] +name = "grin_pool" +version = "5.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14b758b202f034a03b894e732c716ddece8994fae5d8da1e074b1a9e07219f2b" +dependencies = [ + "blake2-rfc", + "chrono", + "grin_core 5.3.3", + "grin_keychain 5.3.3", + "grin_util 5.3.3", + "log", + "rand 0.6.5", + "serde", + "serde_derive", + "thiserror 1.0.69", +] + [[package]] name = "grin_pool" version = "5.4.0-alpha.0" dependencies = [ "blake2-rfc", "chrono", - "grin_core", - "grin_keychain", - "grin_util", + "grin_core 5.4.0-alpha.0", + "grin_keychain 5.4.0-alpha.0", + "grin_util 5.4.0-alpha.0", "log", "rand 0.6.5", "serde", @@ -4052,14 +4215,14 @@ dependencies = [ "chrono", "fs2", "futures 0.3.31", - "grin_api", - "grin_chain", - "grin_core", - "grin_keychain", - "grin_p2p", - "grin_pool", - "grin_store", - "grin_util", + "grin_api 5.4.0-alpha.0", + "grin_chain 5.4.0-alpha.0", + "grin_core 5.4.0-alpha.0", + "grin_keychain 5.4.0-alpha.0", + "grin_p2p 5.4.0-alpha.0", + "grin_pool 5.4.0-alpha.0", + "grin_store 5.4.0-alpha.0", + "grin_util 5.4.0-alpha.0", "http 0.2.12", "hyper 0.14.32", "hyper-rustls 0.23.2", @@ -4077,12 +4240,14 @@ dependencies = [ [[package]] name = "grin_store" -version = "5.4.0-alpha.0" +version = "5.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "708e53758263fa17dfd3fc46419ded59a84d07818e1ee7526b0d47ba268f1362" dependencies = [ "byteorder", "croaring", - "grin_core", - "grin_util", + "grin_core 5.3.3", + "grin_util 5.3.3", "libc", "lmdb-zero", "log", @@ -4093,6 +4258,47 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "grin_store" +version = "5.4.0-alpha.0" +dependencies = [ + "byteorder", + "croaring", + "grin_core 5.4.0-alpha.0", + "grin_util 5.4.0-alpha.0", + "libc", + "lmdb-zero", + "log", + "memmap", + "serde", + "serde_derive", + "tempfile", + "thiserror 1.0.69", +] + +[[package]] +name = "grin_util" +version = "5.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1433d76d0e95c2ed20e1008e9891adfae64812d1bdc5ec71ed5499dcaca2986" +dependencies = [ + "anyhow", + "backtrace", + "base64 0.12.3", + "byteorder", + "grin_secp256k1zkp", + "lazy_static", + "log", + "log4rs", + "parking_lot 0.10.2", + "rand 0.6.5", + "serde", + "serde_derive", + "walkdir", + "zeroize", + "zip", +] + [[package]] name = "grin_util" version = "5.4.0-alpha.0" @@ -4122,9 +4328,9 @@ dependencies = [ "chrono", "easy-jsonrpc-mw", "ed25519-dalek 1.0.1", - "grin_core", - "grin_keychain", - "grin_util", + "grin_core 5.3.3", + "grin_keychain 5.3.3", + "grin_util 5.3.3", "grin_wallet_config", "grin_wallet_impls", "grin_wallet_libwallet", @@ -4143,8 +4349,8 @@ name = "grin_wallet_config" version = "5.4.0-alpha.1" dependencies = [ "dirs 2.0.2", - "grin_core", - "grin_util", + "grin_core 5.3.3", + "grin_util 5.3.3", "grin_wallet_util", "rand 0.6.5", "serde", @@ -4159,16 +4365,16 @@ dependencies = [ "chrono", "easy-jsonrpc-mw", "futures 0.3.31", - "grin_api", - "grin_core", - "grin_keychain", - "grin_util", + "grin_api 5.3.3", + "grin_core 5.3.3", + "grin_keychain 5.3.3", + "grin_util 5.3.3", "grin_wallet_api", "grin_wallet_config", "grin_wallet_impls", "grin_wallet_libwallet", "grin_wallet_util", - "hyper 0.14.32", + "hyper 0.13.10", "lazy_static", "log", "prettytable-rs", @@ -4196,12 +4402,12 @@ dependencies = [ "data-encoding", "ed25519-dalek 1.0.1", "futures 0.3.31", - "grin_api", - "grin_chain", - "grin_core", - "grin_keychain", - "grin_store", - "grin_util", + "grin_api 5.3.3", + "grin_chain 5.3.3", + "grin_core 5.3.3", + "grin_keychain 5.3.3", + "grin_store 5.3.3", + "grin_util 5.3.3", "grin_wallet_config", "grin_wallet_libwallet", "grin_wallet_util", @@ -4237,10 +4443,10 @@ dependencies = [ "chrono", "curve25519-dalek 2.1.3", "ed25519-dalek 1.0.1", - "grin_core", - "grin_keychain", - "grin_store", - "grin_util", + "grin_core 5.3.3", + "grin_keychain 5.3.3", + "grin_store 5.3.3", + "grin_util 5.3.3", "grin_wallet_config", "grin_wallet_util", "hmac 0.12.1", @@ -4267,7 +4473,7 @@ version = "5.4.0-alpha.1" dependencies = [ "data-encoding", "ed25519-dalek 1.0.1", - "grin_util", + "grin_util 5.3.3", "rand 0.6.5", "serde", "serde_derive", @@ -4710,6 +4916,24 @@ dependencies = [ "tower-service", ] +[[package]] +name = "hyper-rustls" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac965ea399ec3a25ac7d13b8affd4b8f39325cca00858ddf5eb29b79e6b14b08" +dependencies = [ + "bytes 0.5.6", + "ct-logs", + "futures-util", + "hyper 0.13.10", + "log", + "rustls 0.17.0", + "rustls-native-certs 0.3.0", + "tokio 0.2.25", + "tokio-rustls 0.13.1", + "webpki 0.21.4", +] + [[package]] name = "hyper-rustls" version = "0.21.0" @@ -4736,7 +4960,7 @@ dependencies = [ "hyper 0.14.32", "log", "rustls 0.20.9", - "rustls-native-certs", + "rustls-native-certs 0.6.3", "tokio 1.48.0", "tokio-rustls 0.23.4", ] @@ -4757,6 +4981,18 @@ dependencies = [ "tower-service", ] +[[package]] +name = "hyper-timeout" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d1f9b0b8258e3ef8f45928021d3ef14096c2b93b99e4b8cfcabf1f58ec84b0a" +dependencies = [ + "bytes 0.5.6", + "hyper 0.13.10", + "tokio 0.2.25", + "tokio-io-timeout 0.4.0", +] + [[package]] name = "hyper-timeout" version = "0.4.1" @@ -4766,7 +5002,7 @@ dependencies = [ "hyper 0.14.32", "pin-project-lite 0.2.16", "tokio 1.48.0", - "tokio-io-timeout", + "tokio-io-timeout 1.2.1", ] [[package]] @@ -6034,8 +6270,8 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "security-framework", - "security-framework-sys", + "security-framework 2.11.1", + "security-framework-sys 2.15.0", "tempfile", ] @@ -6139,7 +6375,7 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" [[package]] name = "nokhwa" version = "0.10.7" -source = "git+https://code.gri.mw/ardocrat/nokhwa?rev=612c861ef153cf0ee575d8dd1413b960e4e19dd6#612c861ef153cf0ee575d8dd1413b960e4e19dd6" +source = "git+https://code.gri.mw/GUI/nokhwa?rev=612c861ef153cf0ee575d8dd1413b960e4e19dd6#612c861ef153cf0ee575d8dd1413b960e4e19dd6" dependencies = [ "flume", "image", @@ -6178,7 +6414,7 @@ dependencies = [ [[package]] name = "nokhwa-bindings-macos" version = "0.2.2" -source = "git+https://code.gri.mw/ardocrat/nokhwa?rev=612c861ef153cf0ee575d8dd1413b960e4e19dd6#612c861ef153cf0ee575d8dd1413b960e4e19dd6" +source = "git+https://code.gri.mw/GUI/nokhwa?rev=612c861ef153cf0ee575d8dd1413b960e4e19dd6#612c861ef153cf0ee575d8dd1413b960e4e19dd6" dependencies = [ "block", "cocoa-foundation", @@ -6205,7 +6441,7 @@ dependencies = [ [[package]] name = "nokhwa-core" version = "0.1.5" -source = "git+https://code.gri.mw/ardocrat/nokhwa?rev=612c861ef153cf0ee575d8dd1413b960e4e19dd6#612c861ef153cf0ee575d8dd1413b960e4e19dd6" +source = "git+https://code.gri.mw/GUI/nokhwa?rev=612c861ef153cf0ee575d8dd1413b960e4e19dd6#612c861ef153cf0ee575d8dd1413b960e4e19dd6" dependencies = [ "bytes 1.10.1", "image", @@ -8473,6 +8709,19 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "rustls" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0d4a31f5d68413404705d6982529b0e11a9aacd4839d1d6222ee3b8cb4015e1" +dependencies = [ + "base64 0.11.0", + "log", + "ring 0.16.20", + "sct 0.6.1", + "webpki 0.21.4", +] + [[package]] name = "rustls" version = "0.18.1" @@ -8498,6 +8747,18 @@ dependencies = [ "webpki 0.22.4", ] +[[package]] +name = "rustls-native-certs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75ffeb84a6bd9d014713119542ce415db3a3e4748f0bfce1e1416cd224a23a5" +dependencies = [ + "openssl-probe", + "rustls 0.17.0", + "schannel", + "security-framework 0.4.4", +] + [[package]] name = "rustls-native-certs" version = "0.6.3" @@ -8507,7 +8768,7 @@ dependencies = [ "openssl-probe", "rustls-pemfile", "schannel", - "security-framework", + "security-framework 2.11.1", ] [[package]] @@ -8717,6 +8978,19 @@ dependencies = [ "zeroize", ] +[[package]] +name = "security-framework" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535" +dependencies = [ + "bitflags 1.3.2", + "core-foundation 0.7.0", + "core-foundation-sys 0.7.0", + "libc", + "security-framework-sys 0.4.3", +] + [[package]] name = "security-framework" version = "2.11.1" @@ -8727,7 +9001,17 @@ dependencies = [ "core-foundation 0.9.4", "core-foundation-sys 0.8.7", "libc", - "security-framework-sys", + "security-framework-sys 2.15.0", +] + +[[package]] +name = "security-framework-sys" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405" +dependencies = [ + "core-foundation-sys 0.7.0", + "libc", ] [[package]] @@ -9782,6 +10066,16 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "tokio-io-timeout" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9390a43272c8a6ac912ed1d1e2b6abeafd5047e05530a2fa304deee041a06215" +dependencies = [ + "bytes 0.5.6", + "tokio 0.2.25", +] + [[package]] name = "tokio-io-timeout" version = "1.2.1" @@ -9824,6 +10118,18 @@ dependencies = [ "tokio 1.48.0", ] +[[package]] +name = "tokio-rustls" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15cb62a0d2770787abc96e99c1cd98fcf17f94959f3af63ca85bdfb203f051b4" +dependencies = [ + "futures-core", + "rustls 0.17.0", + "tokio 0.2.25", + "webpki 0.21.4", +] + [[package]] name = "tokio-rustls" version = "0.14.1" diff --git a/Cargo.toml b/Cargo.toml index ba014051..a49161be 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -149,7 +149,7 @@ nokhwa = { version = "0.10.5", default-features = false, features = ["input-v4l" nokhwa = { version = "0.10.5", default-features = false, features = ["input-msmf"] } [target.'cfg(target_os = "macos")'.dependencies] -nokhwa-mac = { git = "https://code.gri.mw/ardocrat/nokhwa", rev = "612c861ef153cf0ee575d8dd1413b960e4e19dd6", features = ["input-avfoundation", "output-threaded"], package = "nokhwa" } +nokhwa-mac = { git = "https://code.gri.mw/GUI/nokhwa", rev = "612c861ef153cf0ee575d8dd1413b960e4e19dd6", features = ["input-avfoundation", "output-threaded"], package = "nokhwa" } [target.'cfg(not(target_os = "android"))'.dependencies] env_logger = "0.11.3"