diff --git a/Cargo.lock b/Cargo.lock index c8c00f60..d0ae981c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -514,8 +514,8 @@ dependencies = [ "hex", "image", "itertools 0.10.5", - "jcli 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", - "jormungandr-automation 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?branch=catalyst-fund9)", + "jcli", + "jormungandr-automation", "jormungandr-integration-tests", "jormungandr-lib 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", "jortestkit", @@ -540,7 +540,7 @@ dependencies = [ "symmetric-cipher", "test-strategy 0.2.1", "thiserror", - "thor 0.1.0 (git+https://github.com/input-output-hk/jormungandr.git?branch=catalyst-fund9)", + "thor", "time 0.3.17", "tokio", "url", @@ -2295,7 +2295,7 @@ dependencies = [ "custom_debug", "hex", "indicatif", - "jormungandr-automation 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", + "jormungandr-automation", "jormungandr-lib 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", "jortestkit", "parity-multiaddr", @@ -2309,7 +2309,7 @@ dependencies = [ "serde_yaml", "structopt", "thiserror", - "thor 0.1.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", + "thor", "yaml-rust", ] @@ -2718,40 +2718,6 @@ dependencies = [ "versionisator", ] -[[package]] -name = "jcli" -version = "0.15.0" -source = "git+https://github.com/input-output-hk/jormungandr.git?branch=catalyst-fund9#47e874c5792bccd2eb073ef65ea89ac5d0525c04" -dependencies = [ - "base64 0.13.1", - "bech32 0.8.1", - "bincode", - "bytes", - "chain-addr", - "chain-core", - "chain-crypto", - "chain-impl-mockchain", - "chain-time", - "chain-vote", - "clap 3.2.23", - "ed25519-bip32", - "gtmpl", - "hex", - "jormungandr-lib 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?branch=catalyst-fund9)", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rayon", - "reqwest", - "rpassword", - "serde", - "serde_derive", - "serde_json", - "serde_yaml", - "structopt", - "thiserror", - "versionisator", -] - [[package]] name = "jobserver" version = "0.1.25" @@ -2825,70 +2791,6 @@ dependencies = [ "zip", ] -[[package]] -name = "jormungandr-automation" -version = "0.15.0" -source = "git+https://github.com/input-output-hk/jormungandr.git?branch=catalyst-fund9#47e874c5792bccd2eb073ef65ea89ac5d0525c04" -dependencies = [ - "assert_cmd 2.0.6", - "assert_fs", - "base64 0.13.1", - "bech32 0.8.1", - "bytesize", - "cardano-legacy-address", - "chain-addr", - "chain-core", - "chain-crypto", - "chain-impl-mockchain", - "chain-storage", - "chain-time", - "chain-vote", - "custom_debug", - "flate2", - "fs_extra", - "futures", - "graphql_client", - "hex", - "humantime", - "jormungandr-lib 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?branch=catalyst-fund9)", - "jortestkit", - "json", - "keynesis", - "lazy_static", - "log", - "netstat2", - "os_info", - "parity-multiaddr", - "poldercast", - "predicates 2.1.2", - "prost", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rand_core 0.6.4", - "regex", - "reqwest", - "semver", - "serde", - "serde_derive", - "serde_json", - "serde_yaml", - "strum 0.23.0", - "sysinfo 0.23.13", - "tar", - "tempfile", - "thiserror", - "tokio", - "tokio-stream", - "tonic", - "tonic-build", - "tracing", - "tracing-subscriber", - "typed-bytes", - "url", - "warp", - "zip", -] - [[package]] name = "jormungandr-integration-tests" version = "0.15.0" @@ -2910,7 +2812,7 @@ dependencies = [ "hersir", "hex", "indicatif", - "jormungandr-automation 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", + "jormungandr-automation", "jormungandr-lib 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", "jortestkit", "json", @@ -2933,7 +2835,7 @@ dependencies = [ "serde_yaml", "tempfile", "thiserror", - "thor 0.1.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", + "thor", "tokio", "tonic", "tracing", @@ -3227,7 +3129,7 @@ dependencies = [ "chain-crypto", "chain-impl-mockchain", "custom_debug", - "jormungandr-automation 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", + "jormungandr-automation", "jormungandr-lib 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", "parity-multiaddr", "rand 0.8.5", @@ -3237,7 +3139,7 @@ dependencies = [ "serde_yaml", "structopt", "thiserror", - "thor 0.1.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", + "thor", "tokio", "warp", ] @@ -3388,7 +3290,7 @@ dependencies = [ "chain-time", "chain-vote", "indicatif", - "jormungandr-automation 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", + "jormungandr-automation", "jormungandr-lib 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", "jortestkit", "loki", @@ -3396,7 +3298,7 @@ dependencies = [ "rand_core 0.6.4", "structopt", "thiserror", - "thor 0.1.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", + "thor", "tokio", "versionisator", ] @@ -5578,8 +5480,8 @@ dependencies = [ "custom_debug", "dirs", "hex", - "jcli 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", - "jormungandr-automation 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", + "jcli", + "jormungandr-automation", "jormungandr-lib 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", "jortestkit", "rand 0.8.5", @@ -5592,37 +5494,6 @@ dependencies = [ "time 0.3.17", ] -[[package]] -name = "thor" -version = "0.1.0" -source = "git+https://github.com/input-output-hk/jormungandr.git?branch=catalyst-fund9#47e874c5792bccd2eb073ef65ea89ac5d0525c04" -dependencies = [ - "assert_fs", - "bech32 0.8.1", - "bincode", - "chain-addr", - "chain-core", - "chain-crypto", - "chain-impl-mockchain", - "chain-vote", - "cocoon", - "custom_debug", - "dirs", - "hex", - "jcli 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?branch=catalyst-fund9)", - "jormungandr-automation 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?branch=catalyst-fund9)", - "jormungandr-lib 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?branch=catalyst-fund9)", - "jortestkit", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rand_core 0.6.4", - "serde", - "serde_yaml", - "structopt", - "thiserror", - "time 0.3.17", -] - [[package]] name = "thread_local" version = "1.1.4" diff --git a/catalyst-toolbox/Cargo.toml b/catalyst-toolbox/Cargo.toml index 0bf3a97e..ea1d6c19 100644 --- a/catalyst-toolbox/Cargo.toml +++ b/catalyst-toolbox/Cargo.toml @@ -30,8 +30,8 @@ itertools = "0.10" jcli = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" } jormungandr-lib = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" } jormungandr-integration-tests = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" } -jormungandr-automation = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "catalyst-fund9" } -thor = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "catalyst-fund9" } +jormungandr-automation = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" } +thor = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" } jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch = "master" } rayon = "1.5" rust_decimal = "1.16"