diff --git a/Cargo.lock b/Cargo.lock index 6d9830e..a89e737 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -54,7 +54,7 @@ dependencies = [ "i18n-embed", "i18n-embed-fl", "lazy_static", - "nom 7.1.3", + "nom", "pin-project", "rand 0.7.3", "rand 0.8.5", @@ -76,7 +76,7 @@ dependencies = [ "chacha20poly1305", "cookie-factory", "hkdf 0.11.0", - "nom 7.1.3", + "nom", "rand 0.8.5", "secrecy 0.8.0", "sha2 0.9.9", @@ -669,29 +669,6 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf9ff0bbfd639f15c74af777d81383cf53efb7c93613f6cab67c6c11e05bbf8b" -[[package]] -name = "bindgen" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239" -dependencies = [ - "bitflags 1.3.2", - "cexpr", - "clang-sys", - "clap", - "env_logger 0.8.4", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "proc-macro2 1.0.70", - "quote 1.0.33", - "regex", - "rustc-hash", - "shlex", - "which", -] - [[package]] name = "bit-vec" version = "0.6.3" @@ -888,15 +865,6 @@ dependencies = [ "libc", ] -[[package]] -name = "cexpr" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" -dependencies = [ - "nom 5.1.3", -] - [[package]] name = "cfg-if" version = "0.1.10" @@ -980,17 +948,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "clang-sys" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" -dependencies = [ - "glob", - "libc", - "libloading", -] - [[package]] name = "clap" version = "2.34.0" @@ -1043,7 +1000,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7328b20597b53c2454f0b1919720c25c7339051c02b72b7e05409e00b14132be" dependencies = [ "lazy_static", - "nom 7.1.3", + "nom", "pathdiff", "serde", "toml 0.8.8", @@ -1125,24 +1082,21 @@ dependencies = [ [[package]] name = "croaring" -version = "0.4.6" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00d14ad7d8cc067d7a5c93e8563791bfec3f7182361db955530db11d94ed63c" +checksum = "7266f0a7275b00ce4c4f4753e8c31afdefe93828101ece83a06e2ddab1dd1010" dependencies = [ "byteorder", "croaring-sys", - "libc", ] [[package]] name = "croaring-sys" -version = "0.4.6" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5d6a46501bb403a61e43bc7cd19977b4f9c54efd703949b00259cc61afb5a86" +checksum = "e47112498c394a7067949ebc07ef429b7384a413cf0efcf675846a47bcd307fb" dependencies = [ - "bindgen", "cc", - "libc", ] [[package]] @@ -1840,19 +1794,6 @@ dependencies = [ "termcolor", ] -[[package]] -name = "env_logger" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" -dependencies = [ - "atty", - "humantime 2.1.0", - "log", - "regex", - "termcolor", -] - [[package]] name = "equivalent" version = "1.0.1" @@ -2383,12 +2324,6 @@ version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - [[package]] name = "glob-match" version = "0.2.1" @@ -2422,8 +2357,9 @@ dependencies = [ [[package]] name = "grin_api" -version = "5.2.0-beta.3" -source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe9105a4b1db20827977575e56c8f6ea9f8f6bab2ac7f6abf95afbd29dafcd39" dependencies = [ "bytes 0.5.6", "easy-jsonrpc-mw", @@ -2454,8 +2390,9 @@ dependencies = [ [[package]] name = "grin_chain" -version = "5.2.0-beta.3" -source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2926f3e9444ec13781ddd6eeb4e4b2f8da68986c633b6d00b7c7cc4c2e87689" dependencies = [ "bit-vec", "bitflags 1.3.2", @@ -2477,8 +2414,9 @@ dependencies = [ [[package]] name = "grin_core" -version = "5.2.0-beta.3" -source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "426d0e2f2fa27c26f931d4a21a236ff8ae16594151fdd0f8ce52fece85d94d89" dependencies = [ "blake2-rfc", "byteorder", @@ -2503,8 +2441,9 @@ dependencies = [ [[package]] name = "grin_keychain" -version = "5.2.0-beta.3" -source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f93a5e9c18f2b443387051512e162fb130d4597e039a51fdc00a249578de9b5" dependencies = [ "blake2-rfc", "byteorder", @@ -2561,8 +2500,9 @@ dependencies = [ [[package]] name = "grin_p2p" -version = "5.2.0-beta.3" -source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "415b7a30b128f127cd173572a9cf08c8bc072ef000ac778264b345f69e521fd8" dependencies = [ "bitflags 1.3.2", "bytes 0.5.6", @@ -2583,8 +2523,9 @@ dependencies = [ [[package]] name = "grin_pool" -version = "5.2.0-beta.3" -source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faa348a96f1e8721cd9109689ab2f54e8d278e32900da3d45faacee083237308" dependencies = [ "blake2-rfc", "chrono", @@ -2601,6 +2542,8 @@ dependencies = [ [[package]] name = "grin_secp256k1zkp" version = "0.7.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447e2e66d2f6cc14d49afdad59a5b26f47654c845483dbb3f3403ace0dbb94b4" dependencies = [ "arrayvec 0.3.25", "cc", @@ -2613,8 +2556,9 @@ dependencies = [ [[package]] name = "grin_servers" -version = "5.2.0-beta.3" -source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e360615506e0ba18dfb5ceee673106a24b878e138346db7488c1134cfd043bf5" dependencies = [ "chrono", "fs2", @@ -2643,8 +2587,9 @@ dependencies = [ [[package]] name = "grin_store" -version = "5.2.0-beta.3" -source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e32cd44bbbeaf7629f3fdaf166c6d3ef7d9198f9d3bbb06a3162cd5f3a8b407" dependencies = [ "byteorder", "croaring", @@ -2662,8 +2607,9 @@ dependencies = [ [[package]] name = "grin_util" -version = "5.2.0-beta.3" -source = "git+https://github.com/mimblewimble/grin?tag=v5.2.0-beta.3#94277bba9db2e31e713f2a4cfdc37b11e46a1630" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68e2e83d3ca5946b958e98ed4df1f1a7cf808ea74c0e4b4026e42e4a04d9ef92" dependencies = [ "backtrace", "base64 0.12.3", @@ -2683,8 +2629,9 @@ dependencies = [ [[package]] name = "grin_wallet_api" -version = "5.2.0-beta.1" -source = "git+https://github.com/mimblewimble/grin-wallet#12a25f82f1a799caa738f3d7cf42e8ee2b13f005" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc6efe4a404c3b67cba4c75c3a8af4c009bbdcad2fe013ec6a81f59ecf79970a" dependencies = [ "base64 0.12.3", "chrono", @@ -2708,8 +2655,9 @@ dependencies = [ [[package]] name = "grin_wallet_config" -version = "5.2.0-beta.1" -source = "git+https://github.com/mimblewimble/grin-wallet#12a25f82f1a799caa738f3d7cf42e8ee2b13f005" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcfbdf53cb183082d67b1fba346ee0490cb988d012647a853b7bba44e59fba95" dependencies = [ "dirs 2.0.2", "grin_core", @@ -2723,8 +2671,9 @@ dependencies = [ [[package]] name = "grin_wallet_controller" -version = "5.2.0-beta.1" -source = "git+https://github.com/mimblewimble/grin-wallet#12a25f82f1a799caa738f3d7cf42e8ee2b13f005" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d716c6cf456dcb6ba5b091fe611d4f53dcd7559d0dc2805cc9d65650ff00cac1" dependencies = [ "chrono", "easy-jsonrpc-mw", @@ -2757,8 +2706,9 @@ dependencies = [ [[package]] name = "grin_wallet_impls" -version = "5.2.0-beta.1" -source = "git+https://github.com/mimblewimble/grin-wallet#12a25f82f1a799caa738f3d7cf42e8ee2b13f005" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ddb40b2bc1263be4de92384868c97dd5bd670ba3209119912c143abda73547" dependencies = [ "base64 0.12.3", "blake2-rfc", @@ -2796,8 +2746,9 @@ dependencies = [ [[package]] name = "grin_wallet_libwallet" -version = "5.2.0-beta.1" -source = "git+https://github.com/mimblewimble/grin-wallet#12a25f82f1a799caa738f3d7cf42e8ee2b13f005" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e3356a69caa77e9797714c2757a6a90995b996fde744da0b8e292fda8f5331f" dependencies = [ "age", "base64 0.9.3", @@ -2833,8 +2784,9 @@ dependencies = [ [[package]] name = "grin_wallet_util" -version = "5.2.0-beta.1" -source = "git+https://github.com/mimblewimble/grin-wallet#12a25f82f1a799caa738f3d7cf42e8ee2b13f005" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af2dcb47e9ddbf8cad4f8a14fbf9514085e603007f52d26e4f2ad59671b2b609" dependencies = [ "data-encoding", "ed25519-dalek 1.0.1", @@ -3639,12 +3591,6 @@ dependencies = [ "spin 0.5.2", ] -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "libc" version = "0.2.153" @@ -3661,16 +3607,6 @@ dependencies = [ "libc", ] -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if 1.0.0", - "winapi 0.3.9", -] - [[package]] name = "libm" version = "0.2.8" @@ -4094,16 +4030,6 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" -[[package]] -name = "nom" -version = "5.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08959a387a676302eebf4ddbcbc611da04285579f76f88ee0506c63b1a61dd4b" -dependencies = [ - "memchr", - "version_check", -] - [[package]] name = "nom" version = "7.1.3" @@ -4562,12 +4488,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "pem" version = "0.8.3" @@ -5974,12 +5894,6 @@ dependencies = [ "dirs 5.0.1", ] -[[package]] -name = "shlex" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" - [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -6498,7 +6412,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9df107843d725428d76bb159040fbae6d1524dcf25d5b24c56daa6b37ce9dbb5" dependencies = [ "anyhow", - "env_logger 0.5.13", + "env_logger", "log", "pem", "test-cert-gen", @@ -8135,15 +8049,6 @@ dependencies = [ "webpki 0.21.4", ] -[[package]] -name = "which" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724" -dependencies = [ - "libc", -] - [[package]] name = "winapi" version = "0.2.8" diff --git a/Cargo.toml b/Cargo.toml index f27a5c3..a052038 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -56,19 +56,19 @@ tor-keymgr = "0.17.0" tor-rtcompat = "0.17.0" x25519-dalek = "0.6.0" grin_onion = { path = "./onion" } -grin_secp256k1zkp = { version = "0.7.12", features = ["bullet-proof-sizing"] } -grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } -grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } -grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } -grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } -grin_p2p = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } -grin_servers = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } -grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } -grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } -grin_wallet_api = { git = "https://github.com/mimblewimble/grin-wallet", version = "5.2.0-beta.1" } -grin_wallet_config = { git = "https://github.com/mimblewimble/grin-wallet", version = "5.2.0-beta.1" } -grin_wallet_controller = { git = "https://github.com/mimblewimble/grin-wallet", version = "5.2.0-beta.1" } -grin_wallet_impls = { git = "https://github.com/mimblewimble/grin-wallet", version = "5.2.0-beta.1" } -grin_wallet_libwallet = { git = "https://github.com/mimblewimble/grin-wallet", version = "5.2.0-beta.1" } -grin_wallet_util = { git = "https://github.com/mimblewimble/grin-wallet", version = "5.2.0-beta.1" } -log = "0.4.20" +grin_secp256k1zkp = { version = "0.7.13", features = ["bullet-proof-sizing"] } +grin_api = "5.3.0" +grin_core = "5.3.0" +grin_chain = "5.3.0" +grin_keychain = "5.3.0" +grin_p2p = "5.3.0" +grin_servers = "5.3.0" +grin_store = "5.3.0" +grin_util = "5.3.0" +grin_wallet_api = "5.3.0" +grin_wallet_config = "5.3.0" +grin_wallet_controller = "5.3.0" +grin_wallet_impls = "5.3.0" +grin_wallet_libwallet = "5.3.0" +grin_wallet_util = "5.3.0" +log = "0.4.20" \ No newline at end of file diff --git a/onion/Cargo.toml b/onion/Cargo.toml index 1c5a143..dc2bce3 100644 --- a/onion/Cargo.toml +++ b/onion/Cargo.toml @@ -6,33 +6,33 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -blake2 = { package = "blake2-rfc", version = "0.2"} +blake2 = { package = "blake2-rfc", version = "0.2" } byteorder = "1" bytes = "0.5.6" chacha20 = "0.8.1" curve25519-dalek = "2.1" ed25519-dalek = "1.0.1" -hmac = { version = "0.12.0", features = ["std"]} -itertools = { version = "0.10.3"} +hmac = { version = "0.12.0", features = ["std"] } +itertools = { version = "0.10.3" } lazy_static = "1" rand = "0.7.3" rpassword = "4.0" -serde = { version = "1", features= ["derive"]} +serde = { version = "1", features = ["derive"] } serde_derive = "1" serde_json = "1" sha2 = "0.10.0" thiserror = "1" toml = "0.5" x25519-dalek = "0.6.0" -grin_secp256k1zkp = { version = "0.7.12", features = ["bullet-proof-sizing"]} -grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } -grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } -grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } -grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } -grin_servers = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } -grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } -grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } -grin_wallet_api = { git = "https://github.com/mimblewimble/grin-wallet", version = "5.2.0-beta.1" } -grin_wallet_impls = { git = "https://github.com/mimblewimble/grin-wallet", version = "5.2.0-beta.1" } -grin_wallet_libwallet = { git = "https://github.com/mimblewimble/grin-wallet", version = "5.2.0-beta.1" } -grin_wallet_util = { git = "https://github.com/mimblewimble/grin-wallet", version = "5.2.0-beta.1" } \ No newline at end of file +grin_secp256k1zkp = { version = "0.7.13", features = ["bullet-proof-sizing"] } +grin_api = "5.3.0" +grin_core = "5.3.0" +grin_chain = "5.3.0" +grin_keychain = "5.3.0" +grin_servers = "5.3.0" +grin_store = "5.3.0" +grin_util = "5.3.0" +grin_wallet_api = "5.3.0" +grin_wallet_impls = "5.3.0" +grin_wallet_libwallet = "5.3.0" +grin_wallet_util = "5.3.0" \ No newline at end of file