From c1924b557376e3decdd3dadc030e6ce196456de3 Mon Sep 17 00:00:00 2001 From: cong-or Date: Tue, 6 Feb 2024 18:19:33 +0000 Subject: [PATCH 1/9] fix(ci): revert spending counter to fix legacy tests --- .../src/accounting/account/spending.rs | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/src/chain-libs/chain-impl-mockchain/src/accounting/account/spending.rs b/src/chain-libs/chain-impl-mockchain/src/accounting/account/spending.rs index b79d5124b4..a5c265c83f 100644 --- a/src/chain-libs/chain-impl-mockchain/src/accounting/account/spending.rs +++ b/src/chain-libs/chain-impl-mockchain/src/accounting/account/spending.rs @@ -59,13 +59,33 @@ impl SpendingCounterIncreasing { /// /// If the counter match succesfully, then the counter at this lane is incremented by one. pub fn next_verify(&mut self, _counter: SpendingCounter) -> Result<(), Error> { - // spending counter has been removed - Ok(()) + let actual_counter = self.nexts[counter.lane()]; + + if actual_counter != counter { + Err(Error::SpendingCredentialInvalid { + expected: actual_counter, + actual: counter, + }) + } else { + self.next_unchecked(counter); + Ok(()) + } } /// Increases the spending counter on the given lane. pub(crate) fn next_unchecked(&mut self, _unchecked_counter: SpendingCounter) { - // spending counter removed + let lane = unchecked_counter.lane(); + let counter_to_update = self.nexts[lane]; + if counter_to_update != unchecked_counter { + tracing::warn!( + "Invalid spending counter, {}", + Error::SpendingCredentialInvalid { + expected: counter_to_update, + actual: unchecked_counter, + } + ); + } + self.nexts[lane] = counter_to_update.increment(); } } From f7a78efb5024dd309a83755b95f49f29211b8260 Mon Sep 17 00:00:00 2001 From: cong-or Date: Tue, 6 Feb 2024 19:45:00 +0000 Subject: [PATCH 2/9] fix(rm spending counter tests): audit tooling f11 --- Cargo.lock | 658 ++++++++++++++++++++++++++++--------------- src/audit/Cargo.toml | 22 +- 2 files changed, 449 insertions(+), 231 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8f1eec6842..5d8b347253 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -499,21 +499,21 @@ version = "0.1.0" dependencies = [ "base64 0.21.5", "bech32 0.8.1", - "chain-addr", - "chain-core", - "chain-crypto", - "chain-impl-mockchain", - "chain-ser", - "chain-storage", - "chain-time", - "chain-vote", + "chain-addr 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-core 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-crypto 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-impl-mockchain 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-ser 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-storage 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-time 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-vote 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", "clap 4.4.8", "clap_complete_command", "color-eyre", "criterion", "csv", "hex", - "jormungandr-lib", + "jormungandr-lib 0.13.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", "rand 0.8.5", "rand_chacha 0.3.1", "rand_core 0.6.4", @@ -524,7 +524,7 @@ dependencies = [ "thiserror", "tracing", "tracing-subscriber", - "wallet", + "wallet 0.8.3 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", ] [[package]] @@ -761,8 +761,8 @@ dependencies = [ name = "blockchain" version = "0.1.0" dependencies = [ - "chain-impl-mockchain", - "chain-time", + "chain-impl-mockchain 0.1.0", + "chain-time 0.1.0", "lru", "thiserror", ] @@ -914,6 +914,16 @@ dependencies = [ "ed25519-bip32 0.4.1", ] +[[package]] +name = "cardano-legacy-address" +version = "0.1.1" +source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" +dependencies = [ + "cbor_event", + "cryptoxide 0.4.4", + "ed25519-bip32 0.4.1", +] + [[package]] name = "cardano-serialization-lib" version = "11.5.0" @@ -978,11 +988,11 @@ name = "cat-data-service" version = "0.1.0" dependencies = [ "axum", - "chain-impl-mockchain", + "chain-impl-mockchain 0.1.0", "chrono", "clap 4.4.8", "event-db", - "jormungandr-lib", + "jormungandr-lib 0.13.0", "metrics", "metrics-exporter-prometheus", "quickcheck", @@ -1006,14 +1016,14 @@ dependencies = [ "assert_cmd", "assert_fs", "bech32 0.8.1", - "chain-addr", - "chain-core", - "chain-crypto", - "chain-impl-mockchain", - "chain-ser", - "chain-storage", - "chain-time", - "chain-vote", + "chain-addr 0.1.0", + "chain-core 0.1.0", + "chain-crypto 0.1.0", + "chain-impl-mockchain 0.1.0", + "chain-ser 0.1.0", + "chain-storage 0.1.0", + "chain-time 0.1.0", + "chain-vote 0.1.0", "clap 4.4.8", "color-eyre", "csv", @@ -1028,7 +1038,7 @@ dependencies = [ "jcli", "jormungandr-automation", "jormungandr-integration-tests", - "jormungandr-lib", + "jormungandr-lib 0.13.0", "jortestkit", "once_cell", "predicates 2.1.5", @@ -1060,7 +1070,7 @@ dependencies = [ "versionisator", "vit-servicing-station-lib", "vit-servicing-station-tests", - "wallet", + "wallet 0.8.3", ] [[package]] @@ -1159,8 +1169,8 @@ name = "chain-addr" version = "0.1.0" dependencies = [ "bech32 0.8.1", - "chain-core", - "chain-crypto", + "chain-core 0.1.0", + "chain-crypto 0.1.0", "cryptoxide 0.4.4", "proptest", "quickcheck", @@ -1168,11 +1178,31 @@ dependencies = [ "test-strategy", ] +[[package]] +name = "chain-addr" +version = "0.1.0" +source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" +dependencies = [ + "bech32 0.8.1", + "chain-core 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-crypto 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "cryptoxide 0.4.4", + "serde", +] + [[package]] name = "chain-core" version = "0.1.0" dependencies = [ - "chain-ser", + "chain-ser 0.1.0", +] + +[[package]] +name = "chain-core" +version = "0.1.0" +source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" +dependencies = [ + "chain-ser 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", ] [[package]] @@ -1196,25 +1226,47 @@ dependencies = [ "sha2 0.10.8", "smoke", "test-strategy", - "typed-bytes", + "typed-bytes 0.1.0", +] + +[[package]] +name = "chain-crypto" +version = "0.1.0" +source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" +dependencies = [ + "bech32 0.8.1", + "cryptoxide 0.4.4", + "curve25519-dalek-ng", + "ed25519-bip32 0.4.1", + "ed25519-dalek", + "generic-array", + "hex", + "proptest", + "quickcheck", + "rand 0.8.5", + "rand_core 0.6.4", + "rayon", + "sha2 0.10.8", + "test-strategy", + "typed-bytes 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", ] [[package]] name = "chain-impl-mockchain" version = "0.1.0" dependencies = [ - "cardano-legacy-address", - "chain-addr", - "chain-core", - "chain-crypto", - "chain-ser", - "chain-time", - "chain-vote", + "cardano-legacy-address 0.1.1", + "chain-addr 0.1.0", + "chain-core 0.1.0", + "chain-crypto 0.1.0", + "chain-ser 0.1.0", + "chain-time 0.1.0", + "chain-vote 0.1.0", "criterion", "cryptoxide 0.4.4", "ed25519-bip32 0.4.1", "hex", - "imhamt", + "imhamt 0.1.0", "lazy_static", "proptest", "quickcheck", @@ -1225,14 +1277,39 @@ dependencies = [ "rayon", "serde", "serde_json", - "sparse-array", + "sparse-array 0.1.0", "strum 0.24.1", "strum_macros 0.24.3", "tempfile", "test-strategy", "thiserror", "tracing", - "typed-bytes", + "typed-bytes 0.1.0", +] + +[[package]] +name = "chain-impl-mockchain" +version = "0.1.0" +source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" +dependencies = [ + "cardano-legacy-address 0.1.1 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-addr 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-core 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-crypto 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-ser 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-time 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-vote 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "cryptoxide 0.4.4", + "hex", + "imhamt 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "rand 0.8.5", + "rand_core 0.6.4", + "sparse-array 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "strum 0.24.1", + "strum_macros 0.24.3", + "thiserror", + "tracing", + "typed-bytes 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", ] [[package]] @@ -1240,7 +1317,7 @@ name = "chain-network" version = "0.1.0" dependencies = [ "async-trait", - "chain-crypto", + "chain-crypto 0.1.0", "futures", "http-body", "pin-project", @@ -1262,9 +1339,25 @@ dependencies = [ "thiserror", ] +[[package]] +name = "chain-path-derivation" +version = "0.8.3" +source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" +dependencies = [ + "thiserror", +] + +[[package]] +name = "chain-ser" +version = "0.1.0" +dependencies = [ + "thiserror", +] + [[package]] name = "chain-ser" version = "0.1.0" +source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" dependencies = [ "thiserror", ] @@ -1281,25 +1374,44 @@ dependencies = [ "thiserror", ] +[[package]] +name = "chain-storage" +version = "0.1.0" +source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" +dependencies = [ + "data-pile", + "sled", + "thiserror", +] + [[package]] name = "chain-time" version = "0.1.0" dependencies = [ - "chain-core", - "chain-ser", + "chain-core 0.1.0", + "chain-ser 0.1.0", "proptest", "quickcheck", "test-strategy", ] +[[package]] +name = "chain-time" +version = "0.1.0" +source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" +dependencies = [ + "chain-core 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-ser 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", +] + [[package]] name = "chain-vote" version = "0.1.0" dependencies = [ "base64 0.21.5", "cfg-if 1.0.0", - "chain-core", - "chain-crypto", + "chain-core 0.1.0", + "chain-crypto 0.1.0", "const_format", "criterion", "cryptoxide 0.4.4", @@ -1311,6 +1423,23 @@ dependencies = [ "thiserror", ] +[[package]] +name = "chain-vote" +version = "0.1.0" +source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" +dependencies = [ + "base64 0.21.5", + "cfg-if 0.1.10", + "chain-core 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-crypto 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "const_format", + "cryptoxide 0.4.4", + "rand 0.8.5", + "rand_core 0.6.4", + "rayon", + "thiserror", +] + [[package]] name = "checked_int_cast" version = "1.0.0" @@ -2381,24 +2510,24 @@ dependencies = [ "async-graphql", "async-graphql-warp", "base64 0.13.1", - "cardano-legacy-address", - "chain-addr", - "chain-core", - "chain-crypto", - "chain-impl-mockchain", + "cardano-legacy-address 0.1.1", + "chain-addr 0.1.0", + "chain-core 0.1.0", + "chain-crypto 0.1.0", + "chain-impl-mockchain 0.1.0", "chain-network", - "chain-ser", - "chain-time", - "chain-vote", + "chain-ser 0.1.0", + "chain-time 0.1.0", + "chain-vote 0.1.0", "clap 4.4.8", "futures", "futures-channel", "futures-util", "http-zipkin", - "imhamt", + "imhamt 0.1.0", "jormungandr-automation", "jormungandr-integration-tests", - "jormungandr-lib", + "jormungandr-lib 0.13.0", "lazy_static", "opentelemetry", "opentelemetry-otlp", @@ -2967,11 +3096,11 @@ dependencies = [ name = "hdkeygen" version = "0.8.3" dependencies = [ - "cardano-legacy-address", + "cardano-legacy-address 0.1.1", "cbor_event", - "chain-addr", - "chain-crypto", - "chain-path-derivation", + "chain-addr 0.1.0", + "chain-crypto 0.1.0", + "chain-path-derivation 0.8.3", "cryptoxide 0.4.4", "ed25519-bip32 0.4.1", "hex", @@ -2981,6 +3110,23 @@ dependencies = [ "zeroize", ] +[[package]] +name = "hdkeygen" +version = "0.8.3" +source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" +dependencies = [ + "cardano-legacy-address 0.1.1 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "cbor_event", + "chain-addr 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-crypto 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-path-derivation 0.8.3 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "cryptoxide 0.4.4", + "ed25519-bip32 0.4.1", + "hex", + "thiserror", + "zeroize", +] + [[package]] name = "headers" version = "0.3.9" @@ -3040,18 +3186,18 @@ name = "hersir" version = "0.1.0" dependencies = [ "assert_fs", - "chain-addr", - "chain-core", - "chain-crypto", - "chain-impl-mockchain", - "chain-vote", + "chain-addr 0.1.0", + "chain-core 0.1.0", + "chain-crypto 0.1.0", + "chain-impl-mockchain 0.1.0", + "chain-vote 0.1.0", "clap 4.4.8", "ctrlc", "custom_debug", "hex", "indicatif", "jormungandr-automation", - "jormungandr-lib", + "jormungandr-lib 0.13.0", "jortestkit", "parity-multiaddr", "rand 0.8.5", @@ -3255,13 +3401,13 @@ dependencies = [ "bech32 0.8.1", "bincode", "catalyst-toolbox", - "chain-addr", - "chain-core", - "chain-crypto", - "chain-impl-mockchain", - "chain-ser", - "chain-time", - "chain-vote", + "chain-addr 0.1.0", + "chain-core 0.1.0", + "chain-crypto 0.1.0", + "chain-impl-mockchain 0.1.0", + "chain-ser 0.1.0", + "chain-time 0.1.0", + "chain-vote 0.1.0", "chrono", "clap 4.4.8", "cocoon", @@ -3272,7 +3418,7 @@ dependencies = [ "dirs", "eccoxide 0.2.0", "ed25519-bip32 0.3.2", - "hdkeygen", + "hdkeygen 0.8.3", "hersir", "hex", "hyper", @@ -3280,7 +3426,7 @@ dependencies = [ "itertools 0.10.5", "jcli", "jormungandr-automation", - "jormungandr-lib", + "jormungandr-lib 0.13.0", "jortestkit", "prettytable-rs", "rand 0.8.5", @@ -3298,7 +3444,7 @@ dependencies = [ "url", "valgrind", "vit-servicing-station-lib", - "wallet", + "wallet 0.8.3", "wallet-core", "warp", "warp-reverse-proxy", @@ -3379,6 +3525,15 @@ dependencies = [ "trybuild", ] +[[package]] +name = "imhamt" +version = "0.1.0" +source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" +dependencies = [ + "rustc_version", + "thiserror", +] + [[package]] name = "indenter" version = "0.3.3" @@ -3479,11 +3634,11 @@ dependencies = [ "base64 0.21.5", "catalyst-toolbox", "cfg-if 1.0.0", - "chain-addr", - "chain-core", - "chain-crypto", - "chain-impl-mockchain", - "chain-ser", + "chain-addr 0.1.0", + "chain-core 0.1.0", + "chain-crypto 0.1.0", + "chain-impl-mockchain 0.1.0", + "chain-ser 0.1.0", "chrono", "csv", "fraction", @@ -3493,7 +3648,7 @@ dependencies = [ "image", "jcli", "jormungandr-automation", - "jormungandr-lib", + "jormungandr-lib 0.13.0", "jortestkit", "lazy_static", "libmath", @@ -3588,18 +3743,18 @@ dependencies = [ "bech32 0.8.1", "bincode", "bytes", - "chain-addr", - "chain-core", - "chain-crypto", - "chain-impl-mockchain", - "chain-time", - "chain-vote", + "chain-addr 0.1.0", + "chain-core 0.1.0", + "chain-crypto 0.1.0", + "chain-impl-mockchain 0.1.0", + "chain-time 0.1.0", + "chain-vote 0.1.0", "clap 4.4.8", "clap_complete", "ed25519-bip32 0.4.1", "gtmpl", "hex", - "jormungandr-lib", + "jormungandr-lib 0.13.0", "predicates 2.1.5", "quickcheck", "rand 0.7.3", @@ -3644,23 +3799,23 @@ dependencies = [ "async-trait", "base64 0.13.1", "bech32 0.8.1", - "cardano-legacy-address", - "chain-addr", - "chain-core", - "chain-crypto", - "chain-impl-mockchain", + "cardano-legacy-address 0.1.1", + "chain-addr 0.1.0", + "chain-core 0.1.0", + "chain-crypto 0.1.0", + "chain-impl-mockchain 0.1.0", "chain-network", - "chain-storage", - "chain-time", - "chain-vote", + "chain-storage 0.1.0", + "chain-time 0.1.0", + "chain-vote 0.1.0", "clap 4.4.8", "criterion", "enum-as-inner", "futures", "hex", "http-zipkin", - "imhamt", - "jormungandr-lib", + "imhamt 0.1.0", + "jormungandr-lib 0.13.0", "jsonrpsee-core", "jsonrpsee-http-server", "keynesis", @@ -3714,14 +3869,14 @@ dependencies = [ "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", + "cardano-legacy-address 0.1.1", + "chain-addr 0.1.0", + "chain-core 0.1.0", + "chain-crypto 0.1.0", + "chain-impl-mockchain 0.1.0", + "chain-storage 0.1.0", + "chain-time 0.1.0", + "chain-vote 0.1.0", "clap 4.4.8", "custom_debug", "flate2", @@ -3731,7 +3886,7 @@ dependencies = [ "hex", "humantime", "jcli", - "jormungandr-lib", + "jormungandr-lib 0.13.0", "jortestkit", "json", "keynesis", @@ -3764,7 +3919,7 @@ dependencies = [ "tonic-build 0.6.2", "tracing", "tracing-subscriber", - "typed-bytes", + "typed-bytes 0.1.0", "url", "versionisator", "warp", @@ -3779,19 +3934,19 @@ dependencies = [ "assert_fs", "base64 0.13.1", "bech32 0.7.3", - "chain-addr", - "chain-core", - "chain-crypto", - "chain-impl-mockchain", - "chain-time", - "chain-vote", + "chain-addr 0.1.0", + "chain-core 0.1.0", + "chain-crypto 0.1.0", + "chain-impl-mockchain 0.1.0", + "chain-time 0.1.0", + "chain-vote 0.1.0", "fs_extra", "futures", "hersir", "hex", "indicatif", "jormungandr-automation", - "jormungandr-lib", + "jormungandr-lib 0.13.0", "jortestkit", "json", "lazy_static", @@ -3828,13 +3983,13 @@ dependencies = [ "base64 0.13.1", "bech32 0.8.1", "bincode", - "cardano-legacy-address", - "chain-addr", - "chain-core", - "chain-crypto", - "chain-impl-mockchain", - "chain-time", - "chain-vote", + "cardano-legacy-address 0.1.1", + "chain-addr 0.1.0", + "chain-core 0.1.0", + "chain-crypto 0.1.0", + "chain-impl-mockchain 0.1.0", + "chain-time 0.1.0", + "chain-vote 0.1.0", "ed25519-bip32 0.4.1", "hex", "http", @@ -3852,17 +4007,45 @@ dependencies = [ "serde_yaml 0.8.26", "thiserror", "time", - "typed-bytes", + "typed-bytes 0.1.0", +] + +[[package]] +name = "jormungandr-lib" +version = "0.13.0" +source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" +dependencies = [ + "base64 0.13.1", + "bech32 0.8.1", + "cardano-legacy-address 0.1.1 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-addr 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-core 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-crypto 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-impl-mockchain 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-time 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-vote 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "hex", + "http", + "humantime", + "parity-multiaddr", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rand_core 0.6.4", + "serde", + "serde_with", + "thiserror", + "time", + "typed-bytes 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", ] [[package]] name = "jormungandrwallet" version = "0.8.1" dependencies = [ - "chain-addr", - "chain-impl-mockchain", - "chain-ser", - "wallet", + "chain-addr 0.1.0", + "chain-impl-mockchain 0.1.0", + "chain-ser 0.1.0", + "wallet 0.8.3", "wallet-core", ] @@ -4187,14 +4370,14 @@ dependencies = [ name = "loki" version = "0.1.0" dependencies = [ - "chain-addr", - "chain-core", - "chain-crypto", - "chain-impl-mockchain", + "chain-addr 0.1.0", + "chain-core 0.1.0", + "chain-crypto 0.1.0", + "chain-impl-mockchain 0.1.0", "clap 4.4.8", "custom_debug", "jormungandr-automation", - "jormungandr-lib", + "jormungandr-lib 0.13.0", "parity-multiaddr", "rand 0.8.5", "rand_core 0.6.4", @@ -4242,13 +4425,13 @@ dependencies = [ "async-trait", "bech32 0.8.1", "cardano-serialization-lib", - "chain-addr", - "chain-crypto", - "chain-impl-mockchain", + "chain-addr 0.1.0", + "chain-crypto 0.1.0", + "chain-impl-mockchain 0.1.0", "futures", "futures-util", "hex", - "jormungandr-lib", + "jormungandr-lib 0.13.0", "jortestkit", "lazy_static", "pharos", @@ -4270,7 +4453,7 @@ dependencies = [ "assert_fs", "bech32 0.8.1", "cardano-serialization-lib", - "chain-impl-mockchain", + "chain-impl-mockchain 0.1.0", "clap 4.4.8", "color-eyre", "futures", @@ -4280,7 +4463,7 @@ dependencies = [ "itertools 0.10.5", "job_scheduler_ng", "jormungandr-automation", - "jormungandr-lib", + "jormungandr-lib 0.13.0", "jortestkit", "mainnet-lib", "num-traits", @@ -4538,17 +4721,17 @@ name = "mjolnir" version = "0.1.0" dependencies = [ "assert_fs", - "chain-addr", - "chain-core", - "chain-crypto", - "chain-impl-mockchain", - "chain-storage", - "chain-time", - "chain-vote", + "chain-addr 0.1.0", + "chain-core 0.1.0", + "chain-crypto 0.1.0", + "chain-impl-mockchain 0.1.0", + "chain-storage 0.1.0", + "chain-time 0.1.0", + "chain-vote 0.1.0", "clap 4.4.8", "indicatif", "jormungandr-automation", - "jormungandr-lib", + "jormungandr-lib 0.13.0", "jortestkit", "loki", "rand 0.8.5", @@ -6794,13 +6977,13 @@ name = "sign" version = "0.1.0" dependencies = [ "bech32 0.8.1", - "chain-addr", - "chain-core", - "chain-crypto", - "chain-impl-mockchain", - "chain-ser", - "chain-storage", - "chain-vote", + "chain-addr 0.1.0", + "chain-core 0.1.0", + "chain-crypto 0.1.0", + "chain-impl-mockchain 0.1.0", + "chain-ser 0.1.0", + "chain-storage 0.1.0", + "chain-vote 0.1.0", "clap 4.4.8", "clap_complete_command", "color-eyre", @@ -6808,7 +6991,7 @@ dependencies = [ "csv", "ed25519-dalek", "hex", - "jormungandr-lib", + "jormungandr-lib 0.13.0", "rand 0.8.5", "rand_chacha 0.3.1", "rand_core 0.5.1", @@ -6966,11 +7149,11 @@ name = "snapshot-lib" version = "0.1.0" dependencies = [ "bech32 0.8.1", - "chain-addr", - "chain-crypto", + "chain-addr 0.1.0", + "chain-crypto 0.1.0", "fraction", "hex", - "jormungandr-lib", + "jormungandr-lib 0.13.0", "proptest", "rand 0.8.5", "rand_chacha 0.3.1", @@ -6992,12 +7175,12 @@ version = "0.1.0" dependencies = [ "assert_fs", "catalyst-toolbox", - "chain-addr", + "chain-addr 0.1.0", "chrono", "clap 4.4.8", "futures", "hex", - "jormungandr-lib", + "jormungandr-lib 0.13.0", "jortestkit", "num-traits", "reqwest", @@ -7044,6 +7227,11 @@ dependencies = [ "test-strategy", ] +[[package]] +name = "sparse-array" +version = "0.1.0" +source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" + [[package]] name = "spin" version = "0.5.2" @@ -7431,11 +7619,11 @@ dependencies = [ "assert_fs", "bech32 0.8.1", "bincode", - "chain-addr", - "chain-core", - "chain-crypto", - "chain-impl-mockchain", - "chain-vote", + "chain-addr 0.1.0", + "chain-core 0.1.0", + "chain-crypto 0.1.0", + "chain-impl-mockchain 0.1.0", + "chain-vote 0.1.0", "clap 4.4.8", "cocoon", "custom_debug", @@ -7443,7 +7631,7 @@ dependencies = [ "hex", "jcli", "jormungandr-automation", - "jormungandr-lib", + "jormungandr-lib 0.13.0", "jortestkit", "rand 0.8.5", "rand_chacha 0.3.1", @@ -8144,6 +8332,11 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" name = "typed-bytes" version = "0.1.0" +[[package]] +name = "typed-bytes" +version = "0.1.0" +source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" + [[package]] name = "typenum" version = "1.17.0" @@ -8427,19 +8620,19 @@ dependencies = [ name = "valgrind" version = "0.1.0" dependencies = [ - "chain-addr", - "chain-core", - "chain-crypto", - "chain-impl-mockchain", - "chain-ser", - "chain-time", - "chain-vote", + "chain-addr 0.1.0", + "chain-core 0.1.0", + "chain-crypto 0.1.0", + "chain-impl-mockchain 0.1.0", + "chain-ser 0.1.0", + "chain-time 0.1.0", + "chain-vote 0.1.0", "clap 4.4.8", "hex", "hyper", "itertools 0.10.5", "jormungandr-automation", - "jormungandr-lib", + "jormungandr-lib 0.13.0", "jortestkit", "regex", "reqwest", @@ -8450,7 +8643,7 @@ dependencies = [ "url", "vit-servicing-station-lib", "vit-servicing-station-tests", - "wallet", + "wallet 0.8.3", "wallet-core", "warp", "warp-reverse-proxy", @@ -8541,7 +8734,7 @@ version = "0.3.4-dev" dependencies = [ "async-trait", "base64 0.13.1", - "chain-ser", + "chain-ser 0.1.0", "clap 4.4.8", "diesel", "diesel_migrations", @@ -8550,7 +8743,7 @@ dependencies = [ "event-db", "http-zipkin", "itertools 0.10.5", - "jormungandr-lib", + "jormungandr-lib 0.13.0", "log", "notify", "pretty_assertions 1.4.0", @@ -8586,7 +8779,7 @@ dependencies = [ "eccoxide 0.2.0", "http-zipkin", "itertools 0.9.0", - "jormungandr-lib", + "jormungandr-lib 0.13.0", "libsqlite3-sys", "log", "notify", @@ -8649,9 +8842,9 @@ dependencies = [ "assert_fs", "base64 0.13.1", "cfg-if 0.1.10", - "chain-addr", - "chain-crypto", - "chain-impl-mockchain", + "chain-addr 0.1.0", + "chain-crypto 0.1.0", + "chain-impl-mockchain 0.1.0", "chrono", "clap 4.4.8", "diesel", @@ -8660,7 +8853,7 @@ dependencies = [ "hex", "hyper", "itertools 0.10.5", - "jormungandr-lib", + "jormungandr-lib 0.13.0", "jortestkit", "lazy_static", "postgres", @@ -8691,9 +8884,9 @@ dependencies = [ "assert_fs", "base64 0.12.3", "cfg-if 0.1.10", - "chain-addr", - "chain-crypto", - "chain-impl-mockchain", + "chain-addr 0.1.0", + "chain-crypto 0.1.0", + "chain-impl-mockchain 0.1.0", "diesel", "diesel_migrations", "dyn-clone", @@ -8729,12 +8922,12 @@ dependencies = [ "assert_fs", "base64 0.13.1", "catalyst-toolbox", - "chain-addr", - "chain-core", - "chain-crypto", - "chain-impl-mockchain", - "chain-time", - "chain-vote", + "chain-addr 0.1.0", + "chain-core 0.1.0", + "chain-crypto 0.1.0", + "chain-impl-mockchain 0.1.0", + "chain-time 0.1.0", + "chain-vote 0.1.0", "clap 4.4.8", "console", "csv", @@ -8752,7 +8945,7 @@ dependencies = [ "indicatif", "itertools 0.10.5", "jormungandr-automation", - "jormungandr-lib", + "jormungandr-lib 0.13.0", "jortestkit", "json", "lazy_static", @@ -8863,22 +9056,22 @@ dependencies = [ name = "wallet" version = "0.8.3" dependencies = [ - "cardano-legacy-address", + "cardano-legacy-address 0.1.1", "cbor_event", - "chain-addr", - "chain-crypto", - "chain-impl-mockchain", - "chain-path-derivation", - "chain-ser", - "chain-time", + "chain-addr 0.1.0", + "chain-crypto 0.1.0", + "chain-impl-mockchain 0.1.0", + "chain-path-derivation 0.8.3", + "chain-ser 0.1.0", + "chain-time 0.1.0", "cryptoxide 0.4.4", "ed25519-bip32 0.4.1", "hashlink", - "hdkeygen", + "hdkeygen 0.8.3", "hex", - "imhamt", + "imhamt 0.1.0", "itertools 0.10.5", - "jormungandr-lib", + "jormungandr-lib 0.13.0", "quickcheck", "quickcheck_macros", "serde", @@ -8888,43 +9081,68 @@ dependencies = [ "zeroize", ] +[[package]] +name = "wallet" +version = "0.8.3" +source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" +dependencies = [ + "cardano-legacy-address 0.1.1 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "cbor_event", + "chain-addr 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-crypto 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-impl-mockchain 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-path-derivation 0.8.3 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-time 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "cryptoxide 0.4.4", + "ed25519-bip32 0.4.1", + "hashlink", + "hdkeygen 0.8.3 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "hex", + "imhamt 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "itertools 0.10.5", + "jormungandr-lib 0.13.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "serde", + "thiserror", + "zeroize", +] + [[package]] name = "wallet-core" version = "0.8.3" dependencies = [ "bech32 0.7.3", - "chain-addr", - "chain-core", - "chain-crypto", - "chain-impl-mockchain", - "chain-path-derivation", - "chain-ser", - "chain-time", - "chain-vote", - "hdkeygen", + "chain-addr 0.1.0", + "chain-core 0.1.0", + "chain-crypto 0.1.0", + "chain-impl-mockchain 0.1.0", + "chain-path-derivation 0.8.3", + "chain-ser 0.1.0", + "chain-time 0.1.0", + "chain-vote 0.1.0", + "hdkeygen 0.8.3", "rand 0.8.5", "rand_chacha 0.3.1", "symmetric-cipher", "thiserror", - "wallet", + "wallet 0.8.3", ] [[package]] name = "wallet-uniffi" version = "0.8.3" dependencies = [ - "chain-addr", - "chain-crypto", - "chain-impl-mockchain", - "chain-ser", - "chain-time", - "chain-vote", + "chain-addr 0.1.0", + "chain-crypto 0.1.0", + "chain-impl-mockchain 0.1.0", + "chain-ser 0.1.0", + "chain-time 0.1.0", + "chain-vote 0.1.0", "symmetric-cipher", "thiserror", "uniffi", "uniffi_build", "uniffi_macros", - "wallet", + "wallet 0.8.3", "wallet-core", ] @@ -8933,10 +9151,10 @@ name = "wallet-wasm-js" version = "0.8.5" dependencies = [ "bech32 0.7.3", - "chain-core", - "chain-crypto", - "chain-impl-mockchain", - "chain-vote", + "chain-core 0.1.0", + "chain-crypto 0.1.0", + "chain-impl-mockchain 0.1.0", + "chain-vote 0.1.0", "clear_on_drop", "console_error_panic_hook", "getrandom 0.2.11", diff --git a/src/audit/Cargo.toml b/src/audit/Cargo.toml index ddf9c97fc7..73d3149607 100644 --- a/src/audit/Cargo.toml +++ b/src/audit/Cargo.toml @@ -6,16 +6,16 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -chain-crypto = { path = "../chain-libs/chain-crypto" } -chain-vote = { path = "../chain-libs/chain-vote" } -jormungandr-lib = { path = "../jormungandr/jormungandr-lib" } -chain-addr = { path = "../chain-libs/chain-addr" } -chain-core = { path = "../chain-libs/chain-core" } -chain-impl-mockchain = { path = "../chain-libs/chain-impl-mockchain" ,features= ["audit"]} -chain-ser = { path = "../chain-libs/chain-ser" } -chain-storage = { path = "../chain-libs/chain-storage" } -chain-time = { path = "../chain-libs/chain-time" } -wallet = { path = "../chain-wallet-libs/wallet" } +chain-addr = { git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling" } +chain-crypto = { git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling" } +chain-vote = {git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling" } +jormungandr-lib = { git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling" } +chain-core = { git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling" } +chain-impl-mockchain = {git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling" } +chain-ser = { git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling" } +chain-storage = { git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling" } +chain-time = { git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling" } +wallet = { git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling" } rand_core = "0.6" @@ -40,7 +40,7 @@ rand = "0.8.3" rand_chacha = "0.3" smoke = "^0.2.1" criterion = "0.3" -chain-crypto = { path = "../chain-libs/chain-crypto", features=["property-test-api"]} +chain-crypto = { git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling", features=["property-test-api"]} [lib] name = "lib" From 15b7764f8fdee83d6e6edc189b1d3325e423a937 Mon Sep 17 00:00:00 2001 From: cong-or Date: Tue, 6 Feb 2024 19:50:41 +0000 Subject: [PATCH 3/9] fix(rm spending counter tests): audit tooling f11 --- .../chain-impl-mockchain/src/accounting/account/spending.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chain-libs/chain-impl-mockchain/src/accounting/account/spending.rs b/src/chain-libs/chain-impl-mockchain/src/accounting/account/spending.rs index a5c265c83f..ba755635f6 100644 --- a/src/chain-libs/chain-impl-mockchain/src/accounting/account/spending.rs +++ b/src/chain-libs/chain-impl-mockchain/src/accounting/account/spending.rs @@ -58,7 +58,7 @@ impl SpendingCounterIncreasing { /// an error reported. /// /// If the counter match succesfully, then the counter at this lane is incremented by one. - pub fn next_verify(&mut self, _counter: SpendingCounter) -> Result<(), Error> { + pub fn next_verify(&mut self, counter: SpendingCounter) -> Result<(), Error> { let actual_counter = self.nexts[counter.lane()]; if actual_counter != counter { @@ -73,7 +73,7 @@ impl SpendingCounterIncreasing { } /// Increases the spending counter on the given lane. - pub(crate) fn next_unchecked(&mut self, _unchecked_counter: SpendingCounter) { + pub(crate) fn next_unchecked(&mut self, unchecked_counter: SpendingCounter) { let lane = unchecked_counter.lane(); let counter_to_update = self.nexts[lane]; if counter_to_update != unchecked_counter { From b52b71eb825fe1ac3f2248cb14b9e9c37c7c7987 Mon Sep 17 00:00:00 2001 From: cong-or Date: Tue, 6 Feb 2024 20:08:04 +0000 Subject: [PATCH 4/9] fix(rm spending counter tests): audit tooling f11 --- src/audit/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/audit/Cargo.toml b/src/audit/Cargo.toml index 73d3149607..ef2e811d13 100644 --- a/src/audit/Cargo.toml +++ b/src/audit/Cargo.toml @@ -11,7 +11,7 @@ chain-crypto = { git = "https://github.com/input-output-hk/catalyst-core.git", b chain-vote = {git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling" } jormungandr-lib = { git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling" } chain-core = { git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling" } -chain-impl-mockchain = {git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling" } +chain-impl-mockchain = {git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling",features= ["audit"] } chain-ser = { git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling" } chain-storage = { git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling" } chain-time = { git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling" } From 2c47b19709eaf8bf83a3aa7ecef32e6636a2104b Mon Sep 17 00:00:00 2001 From: cong-or Date: Tue, 6 Feb 2024 20:23:09 +0000 Subject: [PATCH 5/9] fix(rm spending counter tests): audit tooling f11 --- Cargo.lock | 1064 ++++++++++++++++++++++++++++------------------------ 1 file changed, 575 insertions(+), 489 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5d8b347253..60483e9431 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -126,16 +126,16 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "once_cell", "version_check", ] [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if 1.0.0", "once_cell", @@ -193,9 +193,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" dependencies = [ "anstyle", "anstyle-parse", @@ -207,43 +207,43 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "arc-swap" @@ -328,14 +328,14 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.0.12" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" +checksum = "00ad3f3a942eee60335ab4342358c161ee296829e0d16ff42fc1d6cb07815467" dependencies = [ "anstyle", "bstr", "doc-comment", - "predicates 3.0.4", + "predicates 3.1.0", "predicates-core", "predicates-tree", "wait-timeout", @@ -343,14 +343,14 @@ dependencies = [ [[package]] name = "assert_fs" -version = "1.0.13" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f070617a68e5c2ed5d06ee8dd620ee18fb72b99f6c094bed34cf8ab07c875b48" +checksum = "2cd762e110c8ed629b11b6cde59458cc1c71de78ebbcc30099fc8e0403a2a2ec" dependencies = [ "anstyle", "doc-comment", "globwalk", - "predicates 3.0.4", + "predicates 3.1.0", "predicates-core", "predicates-tree", "tempfile", @@ -372,7 +372,7 @@ dependencies = [ "fast_chemail", "fnv", "futures-util", - "http", + "http 0.2.11", "indexmap 1.9.3", "mime", "multer", @@ -459,18 +459,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -497,7 +497,7 @@ dependencies = [ name = "audit" version = "0.1.0" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bech32 0.8.1", "chain-addr 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", "chain-core 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", @@ -507,7 +507,7 @@ dependencies = [ "chain-storage 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", "chain-time 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", "chain-vote 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "clap 4.4.8", + "clap 4.4.18", "clap_complete_command", "color-eyre", "criterion", @@ -544,7 +544,7 @@ dependencies = [ "bitflags 1.3.2", "bytes", "futures-util", - "http", + "http 0.2.11", "http-body", "hyper", "itoa", @@ -574,7 +574,7 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", + "http 0.2.11", "http-body", "mime", "rustversion", @@ -592,7 +592,7 @@ dependencies = [ "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide 0.7.1", + "miniz_oxide 0.7.2", "object", "rustc-demangle", ] @@ -617,17 +617,17 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64-url" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c5b0a88aa36e9f095ee2e2b13fb8c5e4313e022783aedacc123328c0084916d" +checksum = "fb9fb9fb058cc3063b5fc88d9a21eefa2735871498a04e1650da76ed511c8569" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", ] [[package]] @@ -638,18 +638,18 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "basic-toml" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f2139706359229bfa8f19142ac1155b4b80beafb7a60471ac5dd109d4a19778" +checksum = "2db21524cad41c5591204d22d75e1970a2d1f71060214ca931dc7d5afe2c14e5" dependencies = [ "serde", ] [[package]] name = "bb8" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98b4b0f25f18bcdc3ac72bdb486ed0acf7e185221fd4dc985bc15db5800b0ba2" +checksum = "df7c2093d15d6a1d33b1f972e1c5ea3177748742b97a5f392aa83a65262c6780" dependencies = [ "async-trait", "futures-channel", @@ -723,9 +723,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "bitvec" @@ -769,9 +769,9 @@ dependencies = [ [[package]] name = "borsh" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf617fabf5cdbdc92f774bfe5062d870f228b80056d41180797abf48bed4056e" +checksum = "f58b559fd6448c6e2fd0adb5720cd98a2506594cafa4737ff98c396f3e82f667" dependencies = [ "borsh-derive", "cfg_aliases", @@ -779,15 +779,15 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f404657a7ea7b5249e36808dff544bc88a28f26e0ac40009f674b7a009d14be3" +checksum = "7aadb5b6ccbd078890f6d7003694e33816e6b784358f18e15e7e6d9f065a57cd" dependencies = [ "once_cell", - "proc-macro-crate 2.0.0", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", "syn_derive", ] @@ -799,12 +799,12 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bstr" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" +checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" dependencies = [ "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.5", "serde", ] @@ -816,9 +816,9 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytecheck" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" +checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" dependencies = [ "bytecheck_derive", "ptr_meta", @@ -827,9 +827,9 @@ dependencies = [ [[package]] name = "bytecheck_derive" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" +checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" dependencies = [ "proc-macro2", "quote", @@ -849,9 +849,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "ed2490600f404f2b94c167e31d3ed1d5f3c225a0f3b80230053b3e0b7b962bd9" [[package]] name = "byteorder" @@ -937,7 +937,7 @@ dependencies = [ "cryptoxide 0.4.4", "digest 0.9.0", "ed25519-bip32 0.4.1", - "getrandom 0.2.11", + "getrandom 0.2.12", "hex", "itertools 0.10.5", "js-sys", @@ -957,9 +957,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e34637b3140142bdf929fb439e8aa4ebad7651ebf7b1080b3930aa16ac1459ff" +checksum = "ceed8ef69d8518a5dda55c07425450b58a4e1946f4951eab6d7191ee86c2443d" dependencies = [ "serde", ] @@ -990,7 +990,7 @@ dependencies = [ "axum", "chain-impl-mockchain 0.1.0", "chrono", - "clap 4.4.8", + "clap 4.4.18", "event-db", "jormungandr-lib 0.13.0", "metrics", @@ -1024,7 +1024,7 @@ dependencies = [ "chain-storage 0.1.0", "chain-time 0.1.0", "chain-vote 0.1.0", - "clap 4.4.8", + "clap 4.4.18", "color-eyre", "csv", "fraction", @@ -1055,7 +1055,7 @@ dependencies = [ "serde", "serde_json", "serde_test", - "serde_yaml 0.9.27", + "serde_yaml 0.9.31", "snapshot-lib", "sscanf", "symmetric-cipher", @@ -1091,9 +1091,9 @@ dependencies = [ [[package]] name = "cddl" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436ba47def0bac296c651f18d8b731e1e66b136dcde4016149452535837efdd2" +checksum = "2cc18488a72cef88de14f00d3db73f57a9511d53ae8dd72204a4bf8bc19309d7" dependencies = [ "abnf_to_pest", "base16", @@ -1408,7 +1408,7 @@ dependencies = [ name = "chain-vote" version = "0.1.0" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "cfg-if 1.0.0", "chain-core 0.1.0", "chain-crypto 0.1.0", @@ -1428,8 +1428,8 @@ name = "chain-vote" version = "0.1.0" source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" dependencies = [ - "base64 0.21.5", - "cfg-if 0.1.10", + "base64 0.21.7", + "cfg-if 1.0.0", "chain-core 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", "chain-crypto 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", "const_format", @@ -1448,9 +1448,9 @@ checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" dependencies = [ "android-tzdata", "iana-time-zone", @@ -1458,14 +1458,14 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] name = "ciborium" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" dependencies = [ "ciborium-io", "ciborium-ll", @@ -1474,18 +1474,18 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" [[package]] name = "ciborium-ll" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" dependencies = [ "ciborium-io", - "half", + "half 2.3.1", ] [[package]] @@ -1542,9 +1542,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.8" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" +checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" dependencies = [ "clap_builder", "clap_derive 4.4.7", @@ -1552,9 +1552,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.8" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" +checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" dependencies = [ "anstream", "anstyle", @@ -1564,11 +1564,11 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.4.4" +version = "4.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffe91f06a11b4b9420f62103854e90867812cd5d01557f853c5ee8e791b12ae" +checksum = "abb745187d7f4d76267b37485a65e0149edd0e91a4cfcdd3f27524ad86cee9f3" dependencies = [ - "clap 4.4.8", + "clap 4.4.18", ] [[package]] @@ -1577,7 +1577,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "183495371ea78d4c9ff638bfc6497d46fed2396e4f9c50aebc1278a4a9919a3d" dependencies = [ - "clap 4.4.8", + "clap 4.4.18", "clap_complete", "clap_complete_fig", "clap_complete_nushell", @@ -1589,7 +1589,7 @@ version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87e571d70e22ec91d34e1c5317c8308035a2280d925167646bf094fc5de1737c" dependencies = [ - "clap 4.4.8", + "clap 4.4.18", "clap_complete", ] @@ -1599,7 +1599,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d02bc8b1a18ee47c4d2eec3fb5ac034dc68ebea6125b1509e9ccdffcddce66e" dependencies = [ - "clap 4.4.8", + "clap 4.4.18", "clap_complete", ] @@ -1625,7 +1625,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1739,15 +1739,15 @@ dependencies = [ [[package]] name = "console" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" dependencies = [ "encode_unicode 0.3.6", "lazy_static", "libc", "unicode-width", - "windows-sys 0.45.0", + "windows-sys 0.52.0", ] [[package]] @@ -1788,9 +1788,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -1798,15 +1798,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -1871,46 +1871,37 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" dependencies = [ - "cfg-if 1.0.0", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if 1.0.0", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if 1.0.0", "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if 1.0.0", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crossterm" @@ -1918,7 +1909,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "crossterm_winapi", "libc", "mio", @@ -1937,6 +1928,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + [[package]] name = "crypto-common" version = "0.1.6" @@ -2012,12 +2009,12 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.1" +version = "3.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e95fbd621905b854affdc67943b043a0fbb6ed7385fd5a25650d19a8a6cfdf" +checksum = "b467862cc8610ca6fc9a1532d7777cee0804e678ab45410897b9396495994a0b" dependencies = [ "nix 0.27.1", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2078,12 +2075,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.3" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "fc5d6b04b3fd0ba9926f945895de7d806260a2d7431ba82e7edaecb043c4c6b8" dependencies = [ - "darling_core 0.20.3", - "darling_macro 0.20.3", + "darling_core 0.20.5", + "darling_macro 0.20.5", ] [[package]] @@ -2102,16 +2099,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "04e48a959bcd5c761246f5d090ebc2fbf7b9cd527a492b07a67510c108f1e7e3" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -2127,13 +2124,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "1d1545d67a2149e1d93b7e5c7752dce5a7426eb5d1357ddcfd89336b94444f77" dependencies = [ - "darling_core 0.20.3", + "darling_core 0.20.5", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -2143,7 +2140,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "lock_api", "once_cell", "parking_lot_core 0.9.9", @@ -2151,9 +2148,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "data-pile" @@ -2176,9 +2173,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", "serde", @@ -2186,9 +2183,9 @@ dependencies = [ [[package]] name = "deunicode" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a1abaf4d861455be59f64fd2b55606cb151fce304ede7165f410243ce96bde6" +checksum = "3ae2a35373c5c74340b79ae6780b498b2b183915ec5dacf263aac5a099bf485a" [[package]] name = "dialoguer" @@ -2335,7 +2332,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -2477,12 +2474,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2519,7 +2516,7 @@ dependencies = [ "chain-ser 0.1.0", "chain-time 0.1.0", "chain-vote 0.1.0", - "clap 4.4.8", + "clap 4.4.18", "futures", "futures-channel", "futures-util", @@ -2555,9 +2552,9 @@ dependencies = [ [[package]] name = "eyre" -version = "0.6.9" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80f656be11ddf91bd709454d15d5bd896fbaf4cc3314e69349e4d1569f5b46cd" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" dependencies = [ "indenter", "once_cell", @@ -2565,13 +2562,13 @@ dependencies = [ [[package]] name = "fake" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26221445034074d46b276e13eb97a265ebdb8ed8da705c4dddd3dd20b66b45d2" +checksum = "1c25829bde82205da46e1823b2259db6273379f626fc211f126f65654a2669be" dependencies = [ "chrono", "deunicode", - "http", + "http 1.0.0", "rand 0.8.5", "url-escape", ] @@ -2610,14 +2607,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", ] [[package]] @@ -2639,7 +2636,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", - "miniz_oxide 0.7.1", + "miniz_oxide 0.7.2", ] [[package]] @@ -2659,9 +2656,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -2680,9 +2677,9 @@ dependencies = [ [[package]] name = "fs-err" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5fd9bcbe8b1087cbd395b51498c01bc997cef73e778a80b77a811af5e2d29f" +checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41" dependencies = [ "autocfg", ] @@ -2726,9 +2723,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -2741,9 +2738,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -2751,15 +2748,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -2768,32 +2765,32 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" @@ -2803,9 +2800,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -2861,9 +2858,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -2894,9 +2891,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "glob" @@ -2906,24 +2903,24 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ "aho-corasick", "bstr", - "fnv", "log", - "regex", + "regex-automata 0.4.5", + "regex-syntax 0.8.2", ] [[package]] name = "globwalk" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" +checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", "ignore", "walkdir", ] @@ -3032,17 +3029,17 @@ checksum = "8995bd73dd9ff926fdfe2b146e3e571d4b488488844561c9628cf7a736d973de" [[package]] name = "h2" -version = "0.3.22" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http", - "indexmap 2.1.0", + "http 0.2.11", + "indexmap 2.2.2", "slab", "tokio", "tokio-util 0.7.10", @@ -3055,6 +3052,16 @@ version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +[[package]] +name = "half" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "cfg-if 1.0.0", + "crunchy", +] + [[package]] name = "hashbrown" version = "0.11.2" @@ -3075,11 +3082,11 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.7", "allocator-api2", ] @@ -3089,7 +3096,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] @@ -3133,10 +3140,10 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bytes", "headers-core", - "http", + "http 0.2.11", "httpdate", "mime", "sha1", @@ -3148,7 +3155,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http", + "http 0.2.11", ] [[package]] @@ -3177,9 +3184,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3" [[package]] name = "hersir" @@ -3191,7 +3198,7 @@ dependencies = [ "chain-crypto 0.1.0", "chain-impl-mockchain 0.1.0", "chain-vote 0.1.0", - "clap 4.4.8", + "clap 4.4.18", "ctrlc", "custom_debug", "hex", @@ -3247,11 +3254,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3276,14 +3283,25 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.11", "pin-project-lite", ] @@ -3299,7 +3317,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d10540bb06bfef59fe047376e293e2123e0681e9a57780a0a14776dcac74af0e" dependencies = [ - "http", + "http 0.2.11", "zipkin", ] @@ -3323,22 +3341,22 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", "h2", - "http", + "http 0.2.11", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2", "tokio", "tower-service", "tracing", @@ -3352,9 +3370,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", + "http 0.2.11", "hyper", - "rustls 0.21.9", + "rustls 0.21.10", "tokio", "tokio-rustls 0.24.1", ] @@ -3373,9 +3391,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -3409,7 +3427,7 @@ dependencies = [ "chain-time 0.1.0", "chain-vote 0.1.0", "chrono", - "clap 4.4.8", + "clap 4.4.18", "cocoon", "console", "cryptoxide 0.4.4", @@ -3469,9 +3487,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -3479,17 +3497,16 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" dependencies = [ + "crossbeam-deque", "globset", - "lazy_static", "log", "memchr", - "regex", + "regex-automata 0.4.5", "same-file", - "thread_local", "walkdir", "winapi-util", ] @@ -3553,12 +3570,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] @@ -3631,7 +3648,7 @@ version = "0.1.0" dependencies = [ "assert_cmd", "assert_fs", - "base64 0.21.5", + "base64 0.21.7", "catalyst-toolbox", "cfg-if 1.0.0", "chain-addr 0.1.0", @@ -3678,7 +3695,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.5", + "socket2", "widestring", "windows-sys 0.48.0", "winreg", @@ -3692,13 +3709,13 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi 0.3.5", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3730,9 +3747,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jcli" @@ -3749,7 +3766,7 @@ dependencies = [ "chain-impl-mockchain 0.1.0", "chain-time 0.1.0", "chain-vote 0.1.0", - "clap 4.4.8", + "clap 4.4.18", "clap_complete", "ed25519-bip32 0.4.1", "gtmpl", @@ -3779,7 +3796,7 @@ checksum = "10bbdf445513bbe53f4666218b7057d265c76fa0b30475e121a6bf05dbaacaae" dependencies = [ "chrono", "cron", - "uuid 1.6.0", + "uuid 1.7.0", ] [[package]] @@ -3808,7 +3825,7 @@ dependencies = [ "chain-storage 0.1.0", "chain-time 0.1.0", "chain-vote 0.1.0", - "clap 4.4.8", + "clap 4.4.18", "criterion", "enum-as-inner", "futures", @@ -3877,7 +3894,7 @@ dependencies = [ "chain-storage 0.1.0", "chain-time 0.1.0", "chain-vote 0.1.0", - "clap 4.4.8", + "clap 4.4.18", "custom_debug", "flate2", "fs_extra", @@ -3992,7 +4009,7 @@ dependencies = [ "chain-vote 0.1.0", "ed25519-bip32 0.4.1", "hex", - "http", + "http 0.2.11", "humantime", "parity-multiaddr", "quickcheck", @@ -4025,7 +4042,7 @@ dependencies = [ "chain-time 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", "chain-vote 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", "hex", - "http", + "http 0.2.11", "humantime", "parity-multiaddr", "rand 0.8.5", @@ -4282,9 +4299,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.150" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libm" @@ -4307,7 +4324,7 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "libc", "redox_syscall 0.4.1", ] @@ -4331,9 +4348,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "local-ip-address" @@ -4374,7 +4391,7 @@ dependencies = [ "chain-core 0.1.0", "chain-crypto 0.1.0", "chain-impl-mockchain 0.1.0", - "clap 4.4.8", + "clap 4.4.18", "custom_debug", "jormungandr-automation", "jormungandr-lib 0.13.0", @@ -4454,7 +4471,7 @@ dependencies = [ "bech32 0.8.1", "cardano-serialization-lib", "chain-impl-mockchain 0.1.0", - "clap 4.4.8", + "clap 4.4.18", "color-eyre", "futures", "futures-util", @@ -4479,7 +4496,7 @@ dependencies = [ "tokio", "tracing", "tracing-subscriber", - "uuid 1.6.0", + "uuid 1.7.0", "vit-servicing-station-lib", "vit-servicing-station-tests", "voting_tools_rs", @@ -4525,9 +4542,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memmap2" @@ -4547,15 +4564,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - [[package]] name = "metrics" version = "0.18.1" @@ -4697,18 +4705,18 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "log", @@ -4728,7 +4736,7 @@ dependencies = [ "chain-storage 0.1.0", "chain-time 0.1.0", "chain-vote 0.1.0", - "clap 4.4.8", + "clap 4.4.18", "indicatif", "jormungandr-automation", "jormungandr-lib 0.13.0", @@ -4751,7 +4759,7 @@ dependencies = [ "bytes", "encoding_rs", "futures-util", - "http", + "http 0.2.11", "httparse", "log", "memchr", @@ -4810,7 +4818,7 @@ dependencies = [ "bitflags 1.3.2", "byteorder", "libc", - "num-derive", + "num-derive 0.3.3", "num-traits", "thiserror", ] @@ -4825,7 +4833,7 @@ dependencies = [ "bitflags 1.3.2", "cfg-if 1.0.0", "libc", - "memoffset 0.6.5", + "memoffset", "pin-utils", ] @@ -4835,7 +4843,7 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "cfg-if 1.0.0", "libc", ] @@ -4956,6 +4964,12 @@ dependencies = [ "serde", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" version = "0.3.3" @@ -4967,6 +4981,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "num-derive" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -5028,7 +5053,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi 0.3.5", "libc", ] @@ -5049,18 +5074,18 @@ checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" @@ -5093,7 +5118,7 @@ dependencies = [ "async-trait", "futures", "futures-util", - "http", + "http 0.2.11", "opentelemetry", "opentelemetry-proto", "prost 0.11.9", @@ -5333,15 +5358,15 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.5" +version = "2.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" +checksum = "219c0dcc30b6a27553f9cc242972b67f75b60eb0db71f0b5462f38b058c41546" dependencies = [ "memchr", "thiserror", @@ -5350,9 +5375,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.7.5" +version = "2.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" +checksum = "d0934d6907f148c22a3acbda520c7eed243ad7487a30f51f6ce52b58b7077a8a" dependencies = [ "once_cell", "pest", @@ -5361,9 +5386,9 @@ dependencies = [ [[package]] name = "pest_vm" -version = "2.7.5" +version = "2.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12d2b440b79b697ca2791334f1cae93409e398e04b206c92388b0ceaa0555453" +checksum = "a6479ee195c2adde20c898fd4bd03b0b1b29d9ff04ac313b9f1351ea03fbed54" dependencies = [ "pest", "pest_meta", @@ -5376,7 +5401,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.1.0", + "indexmap 2.2.2", ] [[package]] @@ -5409,22 +5434,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -5441,9 +5466,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" [[package]] name = "plain" @@ -5552,7 +5577,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "byteorder", "bytes", "fallible-iterator", @@ -5615,13 +5640,12 @@ dependencies = [ [[package]] name = "predicates" -version = "3.0.4" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" +checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" dependencies = [ "anstyle", "difflib", - "itertools 0.11.0", "predicates-core", ] @@ -5711,11 +5735,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "2.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "toml_edit 0.20.7", + "toml_edit 0.21.1", ] [[package]] @@ -5750,9 +5774,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -5780,7 +5804,7 @@ checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" dependencies = [ "bit-set", "bit-vec", - "bitflags 2.4.1", + "bitflags 2.4.2", "lazy_static", "num-traits", "rand 0.8.5", @@ -5982,20 +6006,20 @@ dependencies = [ [[package]] name = "quircs" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a4a2aa9fe525f10ce4ee99dbb78dc3faf31bd0667d50729a6c0eb89e17eca5" +checksum = "ec3fec90fc7a119692a6244ed4404d152878a47f0bf3f90f34dc79bb7a339d24" dependencies = [ - "num-derive", + "num-derive 0.4.1", "num-traits", "thiserror", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -6114,7 +6138,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", ] [[package]] @@ -6161,9 +6185,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" dependencies = [ "either", "rayon-core", @@ -6171,9 +6195,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -6197,15 +6221,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -6221,16 +6236,16 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "libredox", "thiserror", ] [[package]] name = "refinery" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "529664dbccc0a296947615c997a857912d72d1c44be1fafb7bae54ecfa7a8c24" +checksum = "a2783724569d96af53464d0711dff635cab7a4934df5e22e9fbc9e181523b83e" dependencies = [ "refinery-core", "refinery-macros", @@ -6238,13 +6253,12 @@ dependencies = [ [[package]] name = "refinery-core" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e895cb870cf06e92318cbbeb701f274d022d5ca87a16fa8244e291cd035ef954" +checksum = "08d6c80329c0455510a8d42fce286ecb4b6bcd8c57e1816d9f2d6bd7379c2cc8" dependencies = [ "async-trait", "cfg-if 1.0.0", - "lazy_static", "log", "postgres", "regex", @@ -6252,33 +6266,33 @@ dependencies = [ "siphasher 1.0.0", "thiserror", "time", - "toml 0.7.8", + "toml 0.8.10", "url", "walkdir", ] [[package]] name = "refinery-macros" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "123e8b80f8010c3ae38330c81e76938fc7adf6cdbfbaad20295bb8c22718b4f1" +checksum = "6ab6e31e166a49d55cb09b62639e5ab9ba2e73f2f124336b06f6c321dc602779" dependencies = [ "proc-macro2", "quote", "refinery-core", "regex", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.5", "regex-syntax 0.8.2", ] @@ -6293,9 +6307,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -6331,26 +6345,26 @@ dependencies = [ [[package]] name = "rend" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" dependencies = [ "bytecheck", ] [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", "futures-util", "h2", - "http", + "http 0.2.11", "http-body", "hyper", "hyper-rustls", @@ -6361,11 +6375,12 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.9", + "rustls 0.21.10", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-rustls 0.24.1", @@ -6405,12 +6420,12 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.5" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", - "getrandom 0.2.11", + "getrandom 0.2.12", "libc", "spin 0.9.8", "untrusted 0.9.0", @@ -6419,26 +6434,27 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.42" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" +checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" dependencies = [ "bitvec", "bytecheck", + "bytes", "hashbrown 0.12.3", "ptr_meta", "rend", "rkyv_derive", "seahash", "tinyvec", - "uuid 1.6.0", + "uuid 1.7.0", ] [[package]] name = "rkyv_derive" -version = "0.7.42" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" +checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" dependencies = [ "proc-macro2", "quote", @@ -6472,9 +6488,9 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.33.1" +version = "1.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06676aec5ccb8fc1da723cc8c0f9a46549f21ebb8753d3915c6c41db1e7f1dc4" +checksum = "755392e1a2f77afd95580d3f0d0e94ac83eeeb7167552c9b5bca549e61a94d83" dependencies = [ "arrayvec 0.7.4", "borsh", @@ -6490,9 +6506,9 @@ dependencies = [ [[package]] name = "rust_decimal_macros" -version = "1.33.1" +version = "1.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e43721f4ef7060ebc2c3ede757733209564ca8207f47674181bcd425dd76945" +checksum = "e418701588729bef95e7a655f2b483ad64bb97c46e8e79fde83efd92aaab6d82" dependencies = [ "quote", "rust_decimal", @@ -6521,15 +6537,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.25" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "errno", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -6546,12 +6562,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.9" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", - "ring 0.17.5", + "ring 0.17.7", "rustls-webpki", "sct", ] @@ -6562,7 +6578,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", ] [[package]] @@ -6571,7 +6587,7 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.5", + "ring 0.17.7", "untrusted 0.9.0", ] @@ -6595,9 +6611,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "same-file" @@ -6622,7 +6638,7 @@ name = "scheduler-service-lib" version = "0.1.0" dependencies = [ "chrono", - "clap 4.4.8", + "clap 4.4.18", "futures", "jortestkit", "reqwest", @@ -6632,7 +6648,7 @@ dependencies = [ "thiserror", "tokio", "tracing", - "uuid 1.6.0", + "uuid 1.7.0", "walkdir", "warp", ] @@ -6696,7 +6712,7 @@ checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -6705,7 +6721,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.5", + "ring 0.17.7", "untrusted 0.9.0", ] @@ -6727,18 +6743,18 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.192" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ "serde_derive", ] @@ -6771,19 +6787,19 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" dependencies = [ - "half", + "half 1.8.2", "serde", ] [[package]] name = "serde_derive" -version = "1.0.192" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -6799,9 +6815,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" dependencies = [ "itoa", "ryu", @@ -6810,9 +6826,9 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" +checksum = "ebd154a240de39fdebcf5775d2675c204d7c13cf39a4c697be6493c8e734337c" dependencies = [ "itoa", "serde", @@ -6820,9 +6836,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -6870,10 +6886,10 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ - "darling 0.20.3", + "darling 0.20.5", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -6890,11 +6906,11 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.27" +version = "0.9.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" +checksum = "adf8a49373e98a4c5f0ceb5d05aa7c648d75f63774981ed95b7c7443bbd50c6e" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.2", "itoa", "ryu", "serde", @@ -6984,7 +7000,7 @@ dependencies = [ "chain-ser 0.1.0", "chain-storage 0.1.0", "chain-vote 0.1.0", - "clap 4.4.8", + "clap 4.4.18", "clap_complete_command", "color-eyre", "cryptoxide 0.4.4", @@ -7054,9 +7070,9 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" [[package]] name = "similar" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" +checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" [[package]] name = "simplelog" @@ -7134,9 +7150,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "smoke" @@ -7164,7 +7180,7 @@ dependencies = [ "serde", "serde_json", "serde_test", - "serde_yaml 0.9.27", + "serde_yaml 0.9.31", "test-strategy", "thiserror", ] @@ -7177,7 +7193,7 @@ dependencies = [ "catalyst-toolbox", "chain-addr 0.1.0", "chrono", - "clap 4.4.8", + "clap 4.4.18", "futures", "hex", "jormungandr-lib 0.13.0", @@ -7193,22 +7209,12 @@ dependencies = [ "thiserror", "tokio", "tracing", - "uuid 1.6.0", + "uuid 1.7.0", "voting_tools_rs", "walkdir", "warp", ] -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "socket2" version = "0.5.5" @@ -7420,9 +7426,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -7438,7 +7444,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -7524,15 +7530,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.1" +version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" dependencies = [ "cfg-if 1.0.0", "fastrand", - "redox_syscall 0.4.1", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -7594,22 +7599,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -7624,7 +7629,7 @@ dependencies = [ "chain-crypto 0.1.0", "chain-impl-mockchain 0.1.0", "chain-vote 0.1.0", - "clap 4.4.8", + "clap 4.4.18", "cocoon", "custom_debug", "dirs", @@ -7665,13 +7670,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", "itoa", "libc", + "num-conv", "num_threads", "powerfmt", "serde", @@ -7687,10 +7693,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] @@ -7721,9 +7728,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.34.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", @@ -7733,7 +7740,7 @@ dependencies = [ "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2", "tokio-macros", "windows-sys 0.48.0", ] @@ -7756,7 +7763,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -7779,7 +7786,7 @@ dependencies = [ "postgres-protocol", "postgres-types", "rand 0.8.5", - "socket2 0.5.5", + "socket2", "tokio", "tokio-util 0.7.10", "whoami", @@ -7802,7 +7809,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.9", + "rustls 0.21.10", "tokio", ] @@ -7870,14 +7877,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.19.15", + "toml_edit 0.22.4", ] [[package]] @@ -7895,20 +7902,31 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.1.0", - "serde", - "serde_spanned", + "indexmap 2.2.2", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.2.2", "toml_datetime", "winnow", ] [[package]] name = "toml_edit" -version = "0.20.7" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +checksum = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.2", + "serde", + "serde_spanned", "toml_datetime", "winnow", ] @@ -7926,7 +7944,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.11", "http-body", "hyper", "hyper-timeout", @@ -7958,7 +7976,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.11", "http-body", "hyper", "hyper-timeout", @@ -8027,11 +8045,11 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "bytes", "futures-core", "futures-util", - "http", + "http 0.2.11", "http-body", "http-range-header", "pin-project-lite", @@ -8083,7 +8101,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -8284,15 +8302,15 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "trybuild" -version = "1.0.85" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196a58260a906cedb9bf6d8034b6379d0c11f552416960452f267402ceeddff1" +checksum = "9a9d3ba662913483d6722303f619e75ea10b7855b0f8e0d72799cf8621bb488f" dependencies = [ "basic-toml", "glob", @@ -8312,7 +8330,7 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 0.2.11", "httparse", "log", "rand 0.8.5", @@ -8366,9 +8384,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -8525,9 +8543,9 @@ dependencies = [ [[package]] name = "unsafe-libyaml" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" +checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" [[package]] name = "unsigned-varint" @@ -8565,12 +8583,12 @@ dependencies = [ [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna 0.4.0", + "idna 0.5.0", "percent-encoding", "serde", ] @@ -8602,17 +8620,17 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "serde", ] [[package]] name = "uuid" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58fe91d841bc04822c9801002db4ea904b9e4b8e6bbad25127b46eff8dc516b" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "serde", ] @@ -8627,7 +8645,7 @@ dependencies = [ "chain-ser 0.1.0", "chain-time 0.1.0", "chain-vote 0.1.0", - "clap 4.4.8", + "clap 4.4.18", "hex", "hyper", "itertools 0.10.5", @@ -8693,7 +8711,7 @@ name = "vit-servicing-station-cli" version = "0.3.4-dev" dependencies = [ "base64 0.13.1", - "clap 4.4.8", + "clap 4.4.18", "csv", "diesel", "diesel_migrations", @@ -8735,7 +8753,7 @@ dependencies = [ "async-trait", "base64 0.13.1", "chain-ser 0.1.0", - "clap 4.4.8", + "clap 4.4.18", "diesel", "diesel_migrations", "dotenv", @@ -8804,7 +8822,7 @@ dependencies = [ name = "vit-servicing-station-server" version = "0.3.4-dev" dependencies = [ - "clap 4.4.8", + "clap 4.4.18", "log", "opentelemetry", "opentelemetry-otlp", @@ -8846,7 +8864,7 @@ dependencies = [ "chain-crypto 0.1.0", "chain-impl-mockchain 0.1.0", "chrono", - "clap 4.4.8", + "clap 4.4.18", "diesel", "dyn-clone", "fake", @@ -8928,7 +8946,7 @@ dependencies = [ "chain-impl-mockchain 0.1.0", "chain-time 0.1.0", "chain-vote 0.1.0", - "clap 4.4.8", + "clap 4.4.18", "console", "csv", "ctrlc", @@ -9009,7 +9027,7 @@ dependencies = [ "cddl", "chrono", "ciborium", - "clap 4.4.8", + "clap 4.4.18", "color-eyre", "cryptoxide 0.4.4", "dashmap", @@ -9157,7 +9175,7 @@ dependencies = [ "chain-vote 0.1.0", "clear_on_drop", "console_error_panic_hook", - "getrandom 0.2.11", + "getrandom 0.2.12", "hex", "js-sys", "rand 0.8.5", @@ -9189,7 +9207,7 @@ dependencies = [ "futures-channel", "futures-util", "headers", - "http", + "http 0.2.11", "hyper", "log", "mime", @@ -9264,7 +9282,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", "wasm-bindgen-shared", ] @@ -9298,7 +9316,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -9349,15 +9367,15 @@ version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring 0.17.5", + "ring 0.17.7", "untrusted 0.9.0", ] [[package]] name = "webpki-roots" -version = "0.25.2" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "weedle2" @@ -9370,9 +9388,9 @@ dependencies = [ [[package]] name = "weezl" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "which" @@ -9435,11 +9453,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] @@ -9475,6 +9493,15 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -9505,6 +9532,21 @@ dependencies = [ "windows_x86_64_msvc 0.48.5", ] +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -9517,6 +9559,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -9529,6 +9577,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -9541,6 +9595,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -9553,6 +9613,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -9565,6 +9631,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -9577,6 +9649,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -9589,11 +9667,17 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + [[package]] name = "winnow" -version = "0.5.19" +version = "0.5.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +checksum = "5389a154b01683d28c77f8f68f49dea75f0a4da32557a58f68ee51ebba472d29" dependencies = [ "memchr", ] @@ -9619,11 +9703,13 @@ dependencies = [ [[package]] name = "xattr" -version = "1.0.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", + "linux-raw-sys", + "rustix", ] [[package]] @@ -9643,22 +9729,22 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zerocopy" -version = "0.7.26" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.26" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -9678,7 +9764,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] From 52bc49e2c1063c2ee432775c733d12f85dd6b987 Mon Sep 17 00:00:00 2001 From: cong-or Date: Tue, 6 Feb 2024 20:50:29 +0000 Subject: [PATCH 6/9] fix(rm spending counter tests): audit tooling f11 --- Cargo.lock | 2 +- Earthfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 60483e9431..134dccfd8b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1429,7 +1429,7 @@ version = "0.1.0" source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" dependencies = [ "base64 0.21.7", - "cfg-if 1.0.0", + "cfg-if 0.1.10", "chain-core 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", "chain-crypto 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", "const_format", diff --git a/Earthfile b/Earthfile index b762609895..5daf804824 100644 --- a/Earthfile +++ b/Earthfile @@ -34,7 +34,7 @@ build-cache: pkg-config - RUN cargo chef cook --release + # RUN cargo chef cook --release SAVE ARTIFACT target SAVE ARTIFACT $CARGO_HOME cargo_home SAVE IMAGE --cache-hint From 8295cc7de70340d3825173d0cf397a9f1c0ff425 Mon Sep 17 00:00:00 2001 From: cong-or Date: Tue, 6 Feb 2024 21:02:48 +0000 Subject: [PATCH 7/9] fix(rm spending counter tests): audit tooling f11 --- Cargo.lock | 658 +++++++++++++++---------------------------- Earthfile | 2 +- src/audit/Cargo.toml | 22 +- src/audit/README.md | 2 + 4 files changed, 234 insertions(+), 450 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 134dccfd8b..8d5237883b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -499,21 +499,21 @@ version = "0.1.0" dependencies = [ "base64 0.21.7", "bech32 0.8.1", - "chain-addr 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-core 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-crypto 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-impl-mockchain 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-ser 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-storage 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-time 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-vote 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-addr", + "chain-core", + "chain-crypto", + "chain-impl-mockchain", + "chain-ser", + "chain-storage", + "chain-time", + "chain-vote", "clap 4.4.18", "clap_complete_command", "color-eyre", "criterion", "csv", "hex", - "jormungandr-lib 0.13.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "jormungandr-lib", "rand 0.8.5", "rand_chacha 0.3.1", "rand_core 0.6.4", @@ -524,7 +524,7 @@ dependencies = [ "thiserror", "tracing", "tracing-subscriber", - "wallet 0.8.3 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "wallet", ] [[package]] @@ -761,8 +761,8 @@ dependencies = [ name = "blockchain" version = "0.1.0" dependencies = [ - "chain-impl-mockchain 0.1.0", - "chain-time 0.1.0", + "chain-impl-mockchain", + "chain-time", "lru", "thiserror", ] @@ -914,16 +914,6 @@ dependencies = [ "ed25519-bip32 0.4.1", ] -[[package]] -name = "cardano-legacy-address" -version = "0.1.1" -source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" -dependencies = [ - "cbor_event", - "cryptoxide 0.4.4", - "ed25519-bip32 0.4.1", -] - [[package]] name = "cardano-serialization-lib" version = "11.5.0" @@ -988,11 +978,11 @@ name = "cat-data-service" version = "0.1.0" dependencies = [ "axum", - "chain-impl-mockchain 0.1.0", + "chain-impl-mockchain", "chrono", "clap 4.4.18", "event-db", - "jormungandr-lib 0.13.0", + "jormungandr-lib", "metrics", "metrics-exporter-prometheus", "quickcheck", @@ -1016,14 +1006,14 @@ dependencies = [ "assert_cmd", "assert_fs", "bech32 0.8.1", - "chain-addr 0.1.0", - "chain-core 0.1.0", - "chain-crypto 0.1.0", - "chain-impl-mockchain 0.1.0", - "chain-ser 0.1.0", - "chain-storage 0.1.0", - "chain-time 0.1.0", - "chain-vote 0.1.0", + "chain-addr", + "chain-core", + "chain-crypto", + "chain-impl-mockchain", + "chain-ser", + "chain-storage", + "chain-time", + "chain-vote", "clap 4.4.18", "color-eyre", "csv", @@ -1038,7 +1028,7 @@ dependencies = [ "jcli", "jormungandr-automation", "jormungandr-integration-tests", - "jormungandr-lib 0.13.0", + "jormungandr-lib", "jortestkit", "once_cell", "predicates 2.1.5", @@ -1070,7 +1060,7 @@ dependencies = [ "versionisator", "vit-servicing-station-lib", "vit-servicing-station-tests", - "wallet 0.8.3", + "wallet", ] [[package]] @@ -1169,8 +1159,8 @@ name = "chain-addr" version = "0.1.0" dependencies = [ "bech32 0.8.1", - "chain-core 0.1.0", - "chain-crypto 0.1.0", + "chain-core", + "chain-crypto", "cryptoxide 0.4.4", "proptest", "quickcheck", @@ -1178,31 +1168,11 @@ dependencies = [ "test-strategy", ] -[[package]] -name = "chain-addr" -version = "0.1.0" -source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" -dependencies = [ - "bech32 0.8.1", - "chain-core 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-crypto 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "cryptoxide 0.4.4", - "serde", -] - [[package]] name = "chain-core" version = "0.1.0" dependencies = [ - "chain-ser 0.1.0", -] - -[[package]] -name = "chain-core" -version = "0.1.0" -source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" -dependencies = [ - "chain-ser 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "chain-ser", ] [[package]] @@ -1226,47 +1196,25 @@ dependencies = [ "sha2 0.10.8", "smoke", "test-strategy", - "typed-bytes 0.1.0", -] - -[[package]] -name = "chain-crypto" -version = "0.1.0" -source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" -dependencies = [ - "bech32 0.8.1", - "cryptoxide 0.4.4", - "curve25519-dalek-ng", - "ed25519-bip32 0.4.1", - "ed25519-dalek", - "generic-array", - "hex", - "proptest", - "quickcheck", - "rand 0.8.5", - "rand_core 0.6.4", - "rayon", - "sha2 0.10.8", - "test-strategy", - "typed-bytes 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "typed-bytes", ] [[package]] name = "chain-impl-mockchain" version = "0.1.0" dependencies = [ - "cardano-legacy-address 0.1.1", - "chain-addr 0.1.0", - "chain-core 0.1.0", - "chain-crypto 0.1.0", - "chain-ser 0.1.0", - "chain-time 0.1.0", - "chain-vote 0.1.0", + "cardano-legacy-address", + "chain-addr", + "chain-core", + "chain-crypto", + "chain-ser", + "chain-time", + "chain-vote", "criterion", "cryptoxide 0.4.4", "ed25519-bip32 0.4.1", "hex", - "imhamt 0.1.0", + "imhamt", "lazy_static", "proptest", "quickcheck", @@ -1277,39 +1225,14 @@ dependencies = [ "rayon", "serde", "serde_json", - "sparse-array 0.1.0", + "sparse-array", "strum 0.24.1", "strum_macros 0.24.3", "tempfile", "test-strategy", "thiserror", "tracing", - "typed-bytes 0.1.0", -] - -[[package]] -name = "chain-impl-mockchain" -version = "0.1.0" -source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" -dependencies = [ - "cardano-legacy-address 0.1.1 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-addr 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-core 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-crypto 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-ser 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-time 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-vote 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "cryptoxide 0.4.4", - "hex", - "imhamt 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "rand 0.8.5", - "rand_core 0.6.4", - "sparse-array 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "strum 0.24.1", - "strum_macros 0.24.3", - "thiserror", - "tracing", - "typed-bytes 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "typed-bytes", ] [[package]] @@ -1317,7 +1240,7 @@ name = "chain-network" version = "0.1.0" dependencies = [ "async-trait", - "chain-crypto 0.1.0", + "chain-crypto", "futures", "http-body", "pin-project", @@ -1339,25 +1262,9 @@ dependencies = [ "thiserror", ] -[[package]] -name = "chain-path-derivation" -version = "0.8.3" -source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" -dependencies = [ - "thiserror", -] - -[[package]] -name = "chain-ser" -version = "0.1.0" -dependencies = [ - "thiserror", -] - [[package]] name = "chain-ser" version = "0.1.0" -source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" dependencies = [ "thiserror", ] @@ -1374,44 +1281,25 @@ dependencies = [ "thiserror", ] -[[package]] -name = "chain-storage" -version = "0.1.0" -source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" -dependencies = [ - "data-pile", - "sled", - "thiserror", -] - [[package]] name = "chain-time" version = "0.1.0" dependencies = [ - "chain-core 0.1.0", - "chain-ser 0.1.0", + "chain-core", + "chain-ser", "proptest", "quickcheck", "test-strategy", ] -[[package]] -name = "chain-time" -version = "0.1.0" -source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" -dependencies = [ - "chain-core 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-ser 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", -] - [[package]] name = "chain-vote" version = "0.1.0" dependencies = [ "base64 0.21.7", "cfg-if 1.0.0", - "chain-core 0.1.0", - "chain-crypto 0.1.0", + "chain-core", + "chain-crypto", "const_format", "criterion", "cryptoxide 0.4.4", @@ -1423,23 +1311,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "chain-vote" -version = "0.1.0" -source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" -dependencies = [ - "base64 0.21.7", - "cfg-if 0.1.10", - "chain-core 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-crypto 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "const_format", - "cryptoxide 0.4.4", - "rand 0.8.5", - "rand_core 0.6.4", - "rayon", - "thiserror", -] - [[package]] name = "checked_int_cast" version = "1.0.0" @@ -2507,24 +2378,24 @@ dependencies = [ "async-graphql", "async-graphql-warp", "base64 0.13.1", - "cardano-legacy-address 0.1.1", - "chain-addr 0.1.0", - "chain-core 0.1.0", - "chain-crypto 0.1.0", - "chain-impl-mockchain 0.1.0", + "cardano-legacy-address", + "chain-addr", + "chain-core", + "chain-crypto", + "chain-impl-mockchain", "chain-network", - "chain-ser 0.1.0", - "chain-time 0.1.0", - "chain-vote 0.1.0", + "chain-ser", + "chain-time", + "chain-vote", "clap 4.4.18", "futures", "futures-channel", "futures-util", "http-zipkin", - "imhamt 0.1.0", + "imhamt", "jormungandr-automation", "jormungandr-integration-tests", - "jormungandr-lib 0.13.0", + "jormungandr-lib", "lazy_static", "opentelemetry", "opentelemetry-otlp", @@ -3103,11 +2974,11 @@ dependencies = [ name = "hdkeygen" version = "0.8.3" dependencies = [ - "cardano-legacy-address 0.1.1", + "cardano-legacy-address", "cbor_event", - "chain-addr 0.1.0", - "chain-crypto 0.1.0", - "chain-path-derivation 0.8.3", + "chain-addr", + "chain-crypto", + "chain-path-derivation", "cryptoxide 0.4.4", "ed25519-bip32 0.4.1", "hex", @@ -3117,23 +2988,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "hdkeygen" -version = "0.8.3" -source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" -dependencies = [ - "cardano-legacy-address 0.1.1 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "cbor_event", - "chain-addr 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-crypto 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-path-derivation 0.8.3 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "cryptoxide 0.4.4", - "ed25519-bip32 0.4.1", - "hex", - "thiserror", - "zeroize", -] - [[package]] name = "headers" version = "0.3.9" @@ -3193,18 +3047,18 @@ name = "hersir" version = "0.1.0" dependencies = [ "assert_fs", - "chain-addr 0.1.0", - "chain-core 0.1.0", - "chain-crypto 0.1.0", - "chain-impl-mockchain 0.1.0", - "chain-vote 0.1.0", + "chain-addr", + "chain-core", + "chain-crypto", + "chain-impl-mockchain", + "chain-vote", "clap 4.4.18", "ctrlc", "custom_debug", "hex", "indicatif", "jormungandr-automation", - "jormungandr-lib 0.13.0", + "jormungandr-lib", "jortestkit", "parity-multiaddr", "rand 0.8.5", @@ -3419,13 +3273,13 @@ dependencies = [ "bech32 0.8.1", "bincode", "catalyst-toolbox", - "chain-addr 0.1.0", - "chain-core 0.1.0", - "chain-crypto 0.1.0", - "chain-impl-mockchain 0.1.0", - "chain-ser 0.1.0", - "chain-time 0.1.0", - "chain-vote 0.1.0", + "chain-addr", + "chain-core", + "chain-crypto", + "chain-impl-mockchain", + "chain-ser", + "chain-time", + "chain-vote", "chrono", "clap 4.4.18", "cocoon", @@ -3436,7 +3290,7 @@ dependencies = [ "dirs", "eccoxide 0.2.0", "ed25519-bip32 0.3.2", - "hdkeygen 0.8.3", + "hdkeygen", "hersir", "hex", "hyper", @@ -3444,7 +3298,7 @@ dependencies = [ "itertools 0.10.5", "jcli", "jormungandr-automation", - "jormungandr-lib 0.13.0", + "jormungandr-lib", "jortestkit", "prettytable-rs", "rand 0.8.5", @@ -3462,7 +3316,7 @@ dependencies = [ "url", "valgrind", "vit-servicing-station-lib", - "wallet 0.8.3", + "wallet", "wallet-core", "warp", "warp-reverse-proxy", @@ -3542,15 +3396,6 @@ dependencies = [ "trybuild", ] -[[package]] -name = "imhamt" -version = "0.1.0" -source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" -dependencies = [ - "rustc_version", - "thiserror", -] - [[package]] name = "indenter" version = "0.3.3" @@ -3651,11 +3496,11 @@ dependencies = [ "base64 0.21.7", "catalyst-toolbox", "cfg-if 1.0.0", - "chain-addr 0.1.0", - "chain-core 0.1.0", - "chain-crypto 0.1.0", - "chain-impl-mockchain 0.1.0", - "chain-ser 0.1.0", + "chain-addr", + "chain-core", + "chain-crypto", + "chain-impl-mockchain", + "chain-ser", "chrono", "csv", "fraction", @@ -3665,7 +3510,7 @@ dependencies = [ "image", "jcli", "jormungandr-automation", - "jormungandr-lib 0.13.0", + "jormungandr-lib", "jortestkit", "lazy_static", "libmath", @@ -3760,18 +3605,18 @@ dependencies = [ "bech32 0.8.1", "bincode", "bytes", - "chain-addr 0.1.0", - "chain-core 0.1.0", - "chain-crypto 0.1.0", - "chain-impl-mockchain 0.1.0", - "chain-time 0.1.0", - "chain-vote 0.1.0", + "chain-addr", + "chain-core", + "chain-crypto", + "chain-impl-mockchain", + "chain-time", + "chain-vote", "clap 4.4.18", "clap_complete", "ed25519-bip32 0.4.1", "gtmpl", "hex", - "jormungandr-lib 0.13.0", + "jormungandr-lib", "predicates 2.1.5", "quickcheck", "rand 0.7.3", @@ -3816,23 +3661,23 @@ dependencies = [ "async-trait", "base64 0.13.1", "bech32 0.8.1", - "cardano-legacy-address 0.1.1", - "chain-addr 0.1.0", - "chain-core 0.1.0", - "chain-crypto 0.1.0", - "chain-impl-mockchain 0.1.0", + "cardano-legacy-address", + "chain-addr", + "chain-core", + "chain-crypto", + "chain-impl-mockchain", "chain-network", - "chain-storage 0.1.0", - "chain-time 0.1.0", - "chain-vote 0.1.0", + "chain-storage", + "chain-time", + "chain-vote", "clap 4.4.18", "criterion", "enum-as-inner", "futures", "hex", "http-zipkin", - "imhamt 0.1.0", - "jormungandr-lib 0.13.0", + "imhamt", + "jormungandr-lib", "jsonrpsee-core", "jsonrpsee-http-server", "keynesis", @@ -3886,14 +3731,14 @@ dependencies = [ "base64 0.13.1", "bech32 0.8.1", "bytesize", - "cardano-legacy-address 0.1.1", - "chain-addr 0.1.0", - "chain-core 0.1.0", - "chain-crypto 0.1.0", - "chain-impl-mockchain 0.1.0", - "chain-storage 0.1.0", - "chain-time 0.1.0", - "chain-vote 0.1.0", + "cardano-legacy-address", + "chain-addr", + "chain-core", + "chain-crypto", + "chain-impl-mockchain", + "chain-storage", + "chain-time", + "chain-vote", "clap 4.4.18", "custom_debug", "flate2", @@ -3903,7 +3748,7 @@ dependencies = [ "hex", "humantime", "jcli", - "jormungandr-lib 0.13.0", + "jormungandr-lib", "jortestkit", "json", "keynesis", @@ -3936,7 +3781,7 @@ dependencies = [ "tonic-build 0.6.2", "tracing", "tracing-subscriber", - "typed-bytes 0.1.0", + "typed-bytes", "url", "versionisator", "warp", @@ -3951,19 +3796,19 @@ dependencies = [ "assert_fs", "base64 0.13.1", "bech32 0.7.3", - "chain-addr 0.1.0", - "chain-core 0.1.0", - "chain-crypto 0.1.0", - "chain-impl-mockchain 0.1.0", - "chain-time 0.1.0", - "chain-vote 0.1.0", + "chain-addr", + "chain-core", + "chain-crypto", + "chain-impl-mockchain", + "chain-time", + "chain-vote", "fs_extra", "futures", "hersir", "hex", "indicatif", "jormungandr-automation", - "jormungandr-lib 0.13.0", + "jormungandr-lib", "jortestkit", "json", "lazy_static", @@ -4000,13 +3845,13 @@ dependencies = [ "base64 0.13.1", "bech32 0.8.1", "bincode", - "cardano-legacy-address 0.1.1", - "chain-addr 0.1.0", - "chain-core 0.1.0", - "chain-crypto 0.1.0", - "chain-impl-mockchain 0.1.0", - "chain-time 0.1.0", - "chain-vote 0.1.0", + "cardano-legacy-address", + "chain-addr", + "chain-core", + "chain-crypto", + "chain-impl-mockchain", + "chain-time", + "chain-vote", "ed25519-bip32 0.4.1", "hex", "http 0.2.11", @@ -4024,45 +3869,17 @@ dependencies = [ "serde_yaml 0.8.26", "thiserror", "time", - "typed-bytes 0.1.0", -] - -[[package]] -name = "jormungandr-lib" -version = "0.13.0" -source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" -dependencies = [ - "base64 0.13.1", - "bech32 0.8.1", - "cardano-legacy-address 0.1.1 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-addr 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-core 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-crypto 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-impl-mockchain 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-time 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-vote 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "hex", - "http 0.2.11", - "humantime", - "parity-multiaddr", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rand_core 0.6.4", - "serde", - "serde_with", - "thiserror", - "time", - "typed-bytes 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", + "typed-bytes", ] [[package]] name = "jormungandrwallet" version = "0.8.1" dependencies = [ - "chain-addr 0.1.0", - "chain-impl-mockchain 0.1.0", - "chain-ser 0.1.0", - "wallet 0.8.3", + "chain-addr", + "chain-impl-mockchain", + "chain-ser", + "wallet", "wallet-core", ] @@ -4387,14 +4204,14 @@ dependencies = [ name = "loki" version = "0.1.0" dependencies = [ - "chain-addr 0.1.0", - "chain-core 0.1.0", - "chain-crypto 0.1.0", - "chain-impl-mockchain 0.1.0", + "chain-addr", + "chain-core", + "chain-crypto", + "chain-impl-mockchain", "clap 4.4.18", "custom_debug", "jormungandr-automation", - "jormungandr-lib 0.13.0", + "jormungandr-lib", "parity-multiaddr", "rand 0.8.5", "rand_core 0.6.4", @@ -4442,13 +4259,13 @@ dependencies = [ "async-trait", "bech32 0.8.1", "cardano-serialization-lib", - "chain-addr 0.1.0", - "chain-crypto 0.1.0", - "chain-impl-mockchain 0.1.0", + "chain-addr", + "chain-crypto", + "chain-impl-mockchain", "futures", "futures-util", "hex", - "jormungandr-lib 0.13.0", + "jormungandr-lib", "jortestkit", "lazy_static", "pharos", @@ -4470,7 +4287,7 @@ dependencies = [ "assert_fs", "bech32 0.8.1", "cardano-serialization-lib", - "chain-impl-mockchain 0.1.0", + "chain-impl-mockchain", "clap 4.4.18", "color-eyre", "futures", @@ -4480,7 +4297,7 @@ dependencies = [ "itertools 0.10.5", "job_scheduler_ng", "jormungandr-automation", - "jormungandr-lib 0.13.0", + "jormungandr-lib", "jortestkit", "mainnet-lib", "num-traits", @@ -4729,17 +4546,17 @@ name = "mjolnir" version = "0.1.0" dependencies = [ "assert_fs", - "chain-addr 0.1.0", - "chain-core 0.1.0", - "chain-crypto 0.1.0", - "chain-impl-mockchain 0.1.0", - "chain-storage 0.1.0", - "chain-time 0.1.0", - "chain-vote 0.1.0", + "chain-addr", + "chain-core", + "chain-crypto", + "chain-impl-mockchain", + "chain-storage", + "chain-time", + "chain-vote", "clap 4.4.18", "indicatif", "jormungandr-automation", - "jormungandr-lib 0.13.0", + "jormungandr-lib", "jortestkit", "loki", "rand 0.8.5", @@ -6993,13 +6810,13 @@ name = "sign" version = "0.1.0" dependencies = [ "bech32 0.8.1", - "chain-addr 0.1.0", - "chain-core 0.1.0", - "chain-crypto 0.1.0", - "chain-impl-mockchain 0.1.0", - "chain-ser 0.1.0", - "chain-storage 0.1.0", - "chain-vote 0.1.0", + "chain-addr", + "chain-core", + "chain-crypto", + "chain-impl-mockchain", + "chain-ser", + "chain-storage", + "chain-vote", "clap 4.4.18", "clap_complete_command", "color-eyre", @@ -7007,7 +6824,7 @@ dependencies = [ "csv", "ed25519-dalek", "hex", - "jormungandr-lib 0.13.0", + "jormungandr-lib", "rand 0.8.5", "rand_chacha 0.3.1", "rand_core 0.5.1", @@ -7165,11 +6982,11 @@ name = "snapshot-lib" version = "0.1.0" dependencies = [ "bech32 0.8.1", - "chain-addr 0.1.0", - "chain-crypto 0.1.0", + "chain-addr", + "chain-crypto", "fraction", "hex", - "jormungandr-lib 0.13.0", + "jormungandr-lib", "proptest", "rand 0.8.5", "rand_chacha 0.3.1", @@ -7191,12 +7008,12 @@ version = "0.1.0" dependencies = [ "assert_fs", "catalyst-toolbox", - "chain-addr 0.1.0", + "chain-addr", "chrono", "clap 4.4.18", "futures", "hex", - "jormungandr-lib 0.13.0", + "jormungandr-lib", "jortestkit", "num-traits", "reqwest", @@ -7233,11 +7050,6 @@ dependencies = [ "test-strategy", ] -[[package]] -name = "sparse-array" -version = "0.1.0" -source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" - [[package]] name = "spin" version = "0.5.2" @@ -7624,11 +7436,11 @@ dependencies = [ "assert_fs", "bech32 0.8.1", "bincode", - "chain-addr 0.1.0", - "chain-core 0.1.0", - "chain-crypto 0.1.0", - "chain-impl-mockchain 0.1.0", - "chain-vote 0.1.0", + "chain-addr", + "chain-core", + "chain-crypto", + "chain-impl-mockchain", + "chain-vote", "clap 4.4.18", "cocoon", "custom_debug", @@ -7636,7 +7448,7 @@ dependencies = [ "hex", "jcli", "jormungandr-automation", - "jormungandr-lib 0.13.0", + "jormungandr-lib", "jortestkit", "rand 0.8.5", "rand_chacha 0.3.1", @@ -8350,11 +8162,6 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" name = "typed-bytes" version = "0.1.0" -[[package]] -name = "typed-bytes" -version = "0.1.0" -source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" - [[package]] name = "typenum" version = "1.17.0" @@ -8638,19 +8445,19 @@ dependencies = [ name = "valgrind" version = "0.1.0" dependencies = [ - "chain-addr 0.1.0", - "chain-core 0.1.0", - "chain-crypto 0.1.0", - "chain-impl-mockchain 0.1.0", - "chain-ser 0.1.0", - "chain-time 0.1.0", - "chain-vote 0.1.0", + "chain-addr", + "chain-core", + "chain-crypto", + "chain-impl-mockchain", + "chain-ser", + "chain-time", + "chain-vote", "clap 4.4.18", "hex", "hyper", "itertools 0.10.5", "jormungandr-automation", - "jormungandr-lib 0.13.0", + "jormungandr-lib", "jortestkit", "regex", "reqwest", @@ -8661,7 +8468,7 @@ dependencies = [ "url", "vit-servicing-station-lib", "vit-servicing-station-tests", - "wallet 0.8.3", + "wallet", "wallet-core", "warp", "warp-reverse-proxy", @@ -8752,7 +8559,7 @@ version = "0.3.4-dev" dependencies = [ "async-trait", "base64 0.13.1", - "chain-ser 0.1.0", + "chain-ser", "clap 4.4.18", "diesel", "diesel_migrations", @@ -8761,7 +8568,7 @@ dependencies = [ "event-db", "http-zipkin", "itertools 0.10.5", - "jormungandr-lib 0.13.0", + "jormungandr-lib", "log", "notify", "pretty_assertions 1.4.0", @@ -8797,7 +8604,7 @@ dependencies = [ "eccoxide 0.2.0", "http-zipkin", "itertools 0.9.0", - "jormungandr-lib 0.13.0", + "jormungandr-lib", "libsqlite3-sys", "log", "notify", @@ -8860,9 +8667,9 @@ dependencies = [ "assert_fs", "base64 0.13.1", "cfg-if 0.1.10", - "chain-addr 0.1.0", - "chain-crypto 0.1.0", - "chain-impl-mockchain 0.1.0", + "chain-addr", + "chain-crypto", + "chain-impl-mockchain", "chrono", "clap 4.4.18", "diesel", @@ -8871,7 +8678,7 @@ dependencies = [ "hex", "hyper", "itertools 0.10.5", - "jormungandr-lib 0.13.0", + "jormungandr-lib", "jortestkit", "lazy_static", "postgres", @@ -8902,9 +8709,9 @@ dependencies = [ "assert_fs", "base64 0.12.3", "cfg-if 0.1.10", - "chain-addr 0.1.0", - "chain-crypto 0.1.0", - "chain-impl-mockchain 0.1.0", + "chain-addr", + "chain-crypto", + "chain-impl-mockchain", "diesel", "diesel_migrations", "dyn-clone", @@ -8940,12 +8747,12 @@ dependencies = [ "assert_fs", "base64 0.13.1", "catalyst-toolbox", - "chain-addr 0.1.0", - "chain-core 0.1.0", - "chain-crypto 0.1.0", - "chain-impl-mockchain 0.1.0", - "chain-time 0.1.0", - "chain-vote 0.1.0", + "chain-addr", + "chain-core", + "chain-crypto", + "chain-impl-mockchain", + "chain-time", + "chain-vote", "clap 4.4.18", "console", "csv", @@ -8963,7 +8770,7 @@ dependencies = [ "indicatif", "itertools 0.10.5", "jormungandr-automation", - "jormungandr-lib 0.13.0", + "jormungandr-lib", "jortestkit", "json", "lazy_static", @@ -9074,22 +8881,22 @@ dependencies = [ name = "wallet" version = "0.8.3" dependencies = [ - "cardano-legacy-address 0.1.1", + "cardano-legacy-address", "cbor_event", - "chain-addr 0.1.0", - "chain-crypto 0.1.0", - "chain-impl-mockchain 0.1.0", - "chain-path-derivation 0.8.3", - "chain-ser 0.1.0", - "chain-time 0.1.0", + "chain-addr", + "chain-crypto", + "chain-impl-mockchain", + "chain-path-derivation", + "chain-ser", + "chain-time", "cryptoxide 0.4.4", "ed25519-bip32 0.4.1", "hashlink", - "hdkeygen 0.8.3", + "hdkeygen", "hex", - "imhamt 0.1.0", + "imhamt", "itertools 0.10.5", - "jormungandr-lib 0.13.0", + "jormungandr-lib", "quickcheck", "quickcheck_macros", "serde", @@ -9099,68 +8906,43 @@ dependencies = [ "zeroize", ] -[[package]] -name = "wallet" -version = "0.8.3" -source = "git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling#59bd518f39c3a0d1c61a363b8940d6327c8bed9d" -dependencies = [ - "cardano-legacy-address 0.1.1 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "cbor_event", - "chain-addr 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-crypto 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-impl-mockchain 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-path-derivation 0.8.3 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "chain-time 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "cryptoxide 0.4.4", - "ed25519-bip32 0.4.1", - "hashlink", - "hdkeygen 0.8.3 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "hex", - "imhamt 0.1.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "itertools 0.10.5", - "jormungandr-lib 0.13.0 (git+https://github.com/input-output-hk/catalyst-core.git?branch=rm-spending-counter-audits-tooling)", - "serde", - "thiserror", - "zeroize", -] - [[package]] name = "wallet-core" version = "0.8.3" dependencies = [ "bech32 0.7.3", - "chain-addr 0.1.0", - "chain-core 0.1.0", - "chain-crypto 0.1.0", - "chain-impl-mockchain 0.1.0", - "chain-path-derivation 0.8.3", - "chain-ser 0.1.0", - "chain-time 0.1.0", - "chain-vote 0.1.0", - "hdkeygen 0.8.3", + "chain-addr", + "chain-core", + "chain-crypto", + "chain-impl-mockchain", + "chain-path-derivation", + "chain-ser", + "chain-time", + "chain-vote", + "hdkeygen", "rand 0.8.5", "rand_chacha 0.3.1", "symmetric-cipher", "thiserror", - "wallet 0.8.3", + "wallet", ] [[package]] name = "wallet-uniffi" version = "0.8.3" dependencies = [ - "chain-addr 0.1.0", - "chain-crypto 0.1.0", - "chain-impl-mockchain 0.1.0", - "chain-ser 0.1.0", - "chain-time 0.1.0", - "chain-vote 0.1.0", + "chain-addr", + "chain-crypto", + "chain-impl-mockchain", + "chain-ser", + "chain-time", + "chain-vote", "symmetric-cipher", "thiserror", "uniffi", "uniffi_build", "uniffi_macros", - "wallet 0.8.3", + "wallet", "wallet-core", ] @@ -9169,10 +8951,10 @@ name = "wallet-wasm-js" version = "0.8.5" dependencies = [ "bech32 0.7.3", - "chain-core 0.1.0", - "chain-crypto 0.1.0", - "chain-impl-mockchain 0.1.0", - "chain-vote 0.1.0", + "chain-core", + "chain-crypto", + "chain-impl-mockchain", + "chain-vote", "clear_on_drop", "console_error_panic_hook", "getrandom 0.2.12", diff --git a/Earthfile b/Earthfile index 5daf804824..b762609895 100644 --- a/Earthfile +++ b/Earthfile @@ -34,7 +34,7 @@ build-cache: pkg-config - # RUN cargo chef cook --release + RUN cargo chef cook --release SAVE ARTIFACT target SAVE ARTIFACT $CARGO_HOME cargo_home SAVE IMAGE --cache-hint diff --git a/src/audit/Cargo.toml b/src/audit/Cargo.toml index ef2e811d13..ddf9c97fc7 100644 --- a/src/audit/Cargo.toml +++ b/src/audit/Cargo.toml @@ -6,16 +6,16 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -chain-addr = { git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling" } -chain-crypto = { git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling" } -chain-vote = {git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling" } -jormungandr-lib = { git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling" } -chain-core = { git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling" } -chain-impl-mockchain = {git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling",features= ["audit"] } -chain-ser = { git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling" } -chain-storage = { git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling" } -chain-time = { git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling" } -wallet = { git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling" } +chain-crypto = { path = "../chain-libs/chain-crypto" } +chain-vote = { path = "../chain-libs/chain-vote" } +jormungandr-lib = { path = "../jormungandr/jormungandr-lib" } +chain-addr = { path = "../chain-libs/chain-addr" } +chain-core = { path = "../chain-libs/chain-core" } +chain-impl-mockchain = { path = "../chain-libs/chain-impl-mockchain" ,features= ["audit"]} +chain-ser = { path = "../chain-libs/chain-ser" } +chain-storage = { path = "../chain-libs/chain-storage" } +chain-time = { path = "../chain-libs/chain-time" } +wallet = { path = "../chain-wallet-libs/wallet" } rand_core = "0.6" @@ -40,7 +40,7 @@ rand = "0.8.3" rand_chacha = "0.3" smoke = "^0.2.1" criterion = "0.3" -chain-crypto = { git = "https://github.com/input-output-hk/catalyst-core.git", branch = "rm-spending-counter-audits-tooling", features=["property-test-api"]} +chain-crypto = { path = "../chain-libs/chain-crypto", features=["property-test-api"]} [lib] name = "lib" diff --git a/src/audit/README.md b/src/audit/README.md index f7f3629579..cf6b2eaab6 100644 --- a/src/audit/README.md +++ b/src/audit/README.md @@ -1,5 +1,7 @@ # Audit Tooling: +Use this branch[*here*](https://github.com/input-output-hk/catalyst-core/tree/rm-spending-counter-audits-tooling) + ## Offline audit ### Download Fund State From 3bbcfe9f3cd308e06abfd92b73dd58bb549bf48d Mon Sep 17 00:00:00 2001 From: cong-or Date: Tue, 6 Feb 2024 21:04:07 +0000 Subject: [PATCH 8/9] fix(rm spending counter tests): audit tooling f11 --- src/audit/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/audit/README.md b/src/audit/README.md index cf6b2eaab6..627cf42ea0 100644 --- a/src/audit/README.md +++ b/src/audit/README.md @@ -1,6 +1,6 @@ # Audit Tooling: -Use this branch[*here*](https://github.com/input-output-hk/catalyst-core/tree/rm-spending-counter-audits-tooling) +[*USE THIS BRANCH*](https://github.com/input-output-hk/catalyst-core/tree/rm-spending-counter-audits-tooling) ## Offline audit From 4bf59feb24f13fab28e0af03504f60f197cd8f21 Mon Sep 17 00:00:00 2001 From: cong-or Date: Tue, 6 Feb 2024 21:10:54 +0000 Subject: [PATCH 9/9] fix(rm spending counter tests): audit tooling f11 --- src/audit/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/audit/README.md b/src/audit/README.md index 627cf42ea0..5baa17fff3 100644 --- a/src/audit/README.md +++ b/src/audit/README.md @@ -1,6 +1,6 @@ # Audit Tooling: -[*USE THIS BRANCH*](https://github.com/input-output-hk/catalyst-core/tree/rm-spending-counter-audits-tooling) +[*USE THIS BRANCH*](https://github.com/input-output-hk/catalyst-core/tree/rm-spending-counter-audits-tooling/src/audit) ## Offline audit