diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml index 5d349586c..6d59dcc27 100644 --- a/.github/workflows/release-cli.yml +++ b/.github/workflows/release-cli.yml @@ -63,7 +63,7 @@ jobs: run: target/${{ matrix.target }}/release/${{ matrix.bin }} --help # Remove once python 3 is the default - - uses: actions/setup-python@v1 + - uses: actions/setup-python@v2.2.1 with: python-version: '3.x' diff --git a/Cargo.lock b/Cargo.lock index 82747301d..a860c014e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -566,7 +566,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "244fbce0d47e97e8ef2f63b81d5e05882cb518c68531eb33194990d7b7e85845" dependencies = [ "stream-cipher", - "zeroize 1.2.0", + "zeroize", ] [[package]] @@ -579,7 +579,7 @@ dependencies = [ "chacha20", "poly1305", "stream-cipher", - "zeroize 1.2.0", + "zeroize", ] [[package]] @@ -656,9 +656,9 @@ checksum = "e763eef8846b13b380f37dfecda401770b0ca4e56e95170237bd7c25c7db3582" [[package]] name = "console" -version = "0.13.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a50aab2529019abfabfa93f1e6c41ef392f91fbf179b347a7e96abb524884a08" +checksum = "3993e6445baa160675931ec041a5e03ca84b9c6e32a056150d3aa2bdda0a1f45" dependencies = [ "encode_unicode", "lazy_static", @@ -667,7 +667,6 @@ dependencies = [ "terminal_size", "unicode-width", "winapi 0.3.9", - "winapi-util", ] [[package]] @@ -803,7 +802,7 @@ dependencies = [ "rand_core 0.5.1", "serde", "subtle 2.4.0", - "zeroize 1.2.0", + "zeroize", ] [[package]] @@ -825,14 +824,14 @@ dependencies = [ [[package]] name = "dialoguer" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f807b2943dc90f9747497d9d65d7e92472149be0b88bf4ce1201b4ac979c26" +checksum = "c9dd058f8b65922819fabb4a41e7d1964e56344042c26efbccd465202c23fa0c" dependencies = [ "console", "lazy_static", "tempfile", - "zeroize 0.9.3", + "zeroize", ] [[package]] @@ -923,7 +922,7 @@ dependencies = [ "rand 0.7.3", "serde", "sha2 0.9.2", - "zeroize 1.2.0", + "zeroize", ] [[package]] @@ -1735,7 +1734,7 @@ dependencies = [ "thiserror", "unsigned-varint 0.6.0", "void", - "zeroize 1.2.0", + "zeroize", ] [[package]] @@ -1796,7 +1795,7 @@ dependencies = [ "snow", "static_assertions 1.1.0", "x25519-dalek", - "zeroize 1.2.0", + "zeroize", ] [[package]] @@ -3084,9 +3083,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.119" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bdd36f49e35b61d49efd8aa7fc068fd295961fd2286d0b2ee9a4c7a14e99cc3" +checksum = "bd761ff957cb2a45fbb9ab3da6512de9de55872866160b23c25f1a841e99d29f" dependencies = [ "serde_derive", ] @@ -3113,9 +3112,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.119" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552954ce79a059ddd5fd68c271592374bd15cab2274970380c000118aeffe1cd" +checksum = "1800f7693e94e186f5e25a28291ae1570da908aff7d97a095dec1e56ff99069b" dependencies = [ "proc-macro2", "quote", @@ -3520,9 +3519,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.58" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc60a3d73ea6594cd712d830cc1f0390fd71542d8c8cd24e70cc54cdfd5e05d5" +checksum = "3fd9d1e9976102a03c542daa2eff1b43f9d72306342f3f8b3ed5fb8908195d6f" dependencies = [ "proc-macro2", "quote", @@ -3719,9 +3718,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.0.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca04cec6ff2474c638057b65798f60ac183e5e79d3448bb7163d36a39cff6ec" +checksum = "8d56477f6ed99e10225f38f9f75f872f29b8b8bd8c0b946f63345bb144e9eeda" dependencies = [ "autocfg 1.0.1", "bytes", @@ -3739,9 +3738,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42517d2975ca3114b22a16192634e8241dc5cc1f130be194645970cc1c371494" +checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57" dependencies = [ "proc-macro2", "quote", @@ -4280,15 +4279,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -4322,7 +4312,7 @@ checksum = "bc614d95359fd7afc321b66d2107ede58b246b844cf5d8a0adcca413e439f088" dependencies = [ "curve25519-dalek", "rand_core 0.5.1", - "zeroize 1.2.0", + "zeroize", ] [[package]] @@ -4348,12 +4338,6 @@ dependencies = [ "static_assertions 1.1.0", ] -[[package]] -name = "zeroize" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45af6a010d13e4cf5b54c94ba5a2b2eba5596b9e46bf5875612d332a1f2b3f86" - [[package]] name = "zeroize" version = "1.2.0" diff --git a/monero-harness/Cargo.toml b/monero-harness/Cargo.toml index f4ff5b12e..fbdaacdc6 100644 --- a/monero-harness/Cargo.toml +++ b/monero-harness/Cargo.toml @@ -12,7 +12,7 @@ port_check = "0.1" rand = "0.7" spectral = "0.6" testcontainers = "0.12" -tokio = { version = "1.0", default-features = false, features = ["rt-multi-thread", "time", "macros"] } +tokio = { version = "1.3", default-features = false, features = ["rt-multi-thread", "time", "macros"] } tracing = "0.1" tracing-log = "0.1" tracing-subscriber = { version = "0.2", default-features = false, features = ["fmt", "ansi", "env-filter"] } diff --git a/swap/Cargo.toml b/swap/Cargo.toml index 6f3b144e7..cc0f5dab9 100644 --- a/swap/Cargo.toml +++ b/swap/Cargo.toml @@ -22,7 +22,7 @@ bitcoin = { version = "0.26", features = ["rand", "use-serde"] } config = { version = "0.10", default-features = false, features = ["toml"] } conquer-once = "0.3" curve25519-dalek = "3" -dialoguer = "0.7" +dialoguer = "0.8" directories-next = "2" ecdsa_fun = { git = "https://github.com/LLFourn/secp256kfun", features = ["libsecp_compat", "serde"] } futures = { version = "0.3", default-features = false } @@ -47,7 +47,7 @@ structopt = "0.3" strum = { version = "0.20", features = ["derive"] } thiserror = "1" time = "0.2" -tokio = { version = "1.0", features = ["rt-multi-thread", "time", "macros", "sync", "process", "fs"] } +tokio = { version = "1.3", features = ["rt-multi-thread", "time", "macros", "sync", "process", "fs"] } tokio-tungstenite = { version = "0.14", features = [ "rustls-tls" ] } tokio-util = { version = "0.6.3", features = ["io"] } toml = "0.5"