diff --git a/Cargo.lock b/Cargo.lock index 65c45046..fafe07c1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1945,6 +1945,24 @@ dependencies = [ "slab", ] +[[package]] +name = "fuzzy-matcher" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" +dependencies = [ + "thread_local", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -2332,16 +2350,17 @@ dependencies = [ [[package]] name = "inquire" -version = "0.6.2" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c33e7c1ddeb15c9abcbfef6029d8e29f69b52b6d6c891031b88ed91b5065803b" +checksum = "0fddf93031af70e75410a2511ec04d49e758ed2f26dad3404a934e0fb45cc12a" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "crossterm", "dyn-clone", - "lazy_static", + "fuzzy-matcher", + "fxhash", "newline-converter", - "thiserror", + "once_cell", "unicode-segmentation", "unicode-width", ] @@ -2357,9 +2376,9 @@ dependencies = [ [[package]] name = "interactive-clap" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69f547ee8ecc587e3b832ca0c6a343225ff96ff7ca51dc14c34a321fbeb6c6c" +checksum = "7295a8d03a71e15612a524a8e1dec1a913459e0000e530405f20d09fb0f014f7" dependencies = [ "interactive-clap-derive", "strum", @@ -2368,9 +2387,9 @@ dependencies = [ [[package]] name = "interactive-clap-derive" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d19b60b6a42c672d30bbc6816f7ed89aee477d8229666e3e39fb9319e8b179" +checksum = "9a0c8d4a6b99054853778e3e9ffb0b74bcb5e8f43d99d97e5c0252c57ce67bf6" dependencies = [ "proc-macro-error", "proc-macro2", @@ -2870,9 +2889,9 @@ dependencies = [ [[package]] name = "near-cli-rs" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f139fe7225bcd0e5065d9d636196ab24e774f31625ede7c079f29845db0d8ec4" +checksum = "62769a8dc261da03e21e4f7de51fe917ce824376d11027ca951620b3b5d5e071" dependencies = [ "bip39", "bs58 0.5.1", @@ -3018,9 +3037,9 @@ dependencies = [ [[package]] name = "near-ledger" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7706ef5fdfc979957a58c240f7bd6e7d969550310888a3d5b18267b73d50a51" +checksum = "a8849fda5ad5da9774d313f5d28247260ff48ae89a57f281c8e65c32b64d6c99" dependencies = [ "ed25519-dalek 1.0.1", "hex 0.4.3", @@ -3028,6 +3047,7 @@ dependencies = [ "ledger-transport", "ledger-transport-hid", "log", + "near-primitives", "near-primitives-core", "slip10", ] @@ -3287,9 +3307,9 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "newline-converter" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f71d09d5c87634207f894c6b31b6a2b2c64ea3bdcf71bd5599fdbbe1600c00f" +checksum = "47b6b097ecb1cbfed438542d16e84fd7ad9b0c76c8a65b7f9039212a3d14dc7f" dependencies = [ "unicode-segmentation", ] diff --git a/cargo-near/Cargo.toml b/cargo-near/Cargo.toml index ade6ce1a..27b362dc 100644 --- a/cargo-near/Cargo.toml +++ b/cargo-near/Cargo.toml @@ -36,16 +36,16 @@ zstd = "0.11" atty = "0.2.14" color-eyre = "0.6" -inquire = "0.6" +inquire = "0.7" strum = { version = "0.24", features = ["derive"] } strum_macros = "0.24" linked-hash-map = { version = "0.5", features = ["serde_impl"] } names = { version = "0.14.0", default-features = false } derive_more = "0.99.9" shell-words = "1.0.0" -interactive-clap = "0.2.8" -interactive-clap-derive = "0.2.8" -near-cli-rs = { version = "0.8.1", default-features = false } +interactive-clap = "0.2.10" +interactive-clap-derive = "0.2.10" +near-cli-rs = { version = "0.9.0", default-features = false } dunce = "1" [features] diff --git a/cargo-near/src/commands/deploy/mod.rs b/cargo-near/src/commands/deploy/mod.rs index 038da490..6fcec916 100644 --- a/cargo-near/src/commands/deploy/mod.rs +++ b/cargo-near/src/commands/deploy/mod.rs @@ -7,7 +7,6 @@ use crate::commands::build_command; #[interactive_clap(output_context = ContractContext)] #[interactive_clap(skip_default_from_cli)] pub struct Contract { - #[interactive_clap(skip_default_input_arg)] #[interactive_clap(flatten)] /// Specify a build command args: build_command_args: build_command::BuildCommand,