diff --git a/.circleci/config.yml b/.circleci/config.yml index 2551527f..5ec06215 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -63,7 +63,7 @@ jobs: command: | git clone https://github.com/input-output-hk/jormungandr.git cd jormungandr - git checkout master + git checkout catalyst-fund9 - run: name: install jormungandr command: | @@ -75,7 +75,7 @@ jobs: command: | git clone https://github.com/input-output-hk/vit-servicing-station.git cd vit-servicing-station - git checkout master + git checkout catalyst-fund9 - run: name: install vit-station-service command: | @@ -154,7 +154,7 @@ commands: command: | git clone https://github.com/input-output-hk/jormungandr.git cd jormungandr - git checkout master + git checkout catalyst-fund9 - run: name: install jormungandr command: | @@ -166,7 +166,7 @@ commands: command: | git clone https://github.com/input-output-hk/vit-servicing-station.git cd vit-servicing-station - git checkout master + git checkout catalyst-fund9 - run: name: install vit-station-service command: | diff --git a/Cargo.lock b/Cargo.lock index fa8d5385..8caee0ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.17.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -32,6 +32,16 @@ dependencies = [ "generic-array", ] +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + [[package]] name = "aes" version = "0.7.5" @@ -44,14 +54,25 @@ dependencies = [ "opaque-debug", ] +[[package]] +name = "aes" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +dependencies = [ + "cfg-if 1.0.0", + "cipher 0.4.4", + "cpufeatures", +] + [[package]] name = "aes-gcm" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" dependencies = [ - "aead", - "aes", + "aead 0.4.3", + "aes 0.7.5", "cipher 0.3.0", "ctr", "ghash", @@ -60,24 +81,39 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ - "getrandom 0.2.6", + "getrandom 0.2.11", "once_cell", "version_check", ] [[package]] name = "aho-corasick" -version = "0.7.18" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + [[package]] name = "ansi_term" version = "0.11.0" @@ -96,17 +132,23 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + [[package]] name = "anyhow" -version = "1.0.57" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arrayref" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" @@ -116,9 +158,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "ascii" @@ -132,9 +174,9 @@ version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c98233c6673d8601ab23e77eb38f999c51100d46c5703b17288c57fddf3a1ffe" dependencies = [ - "bstr", + "bstr 0.2.17", "doc-comment", - "predicates", + "predicates 2.1.5", "predicates-core", "predicates-tree", "wait-timeout", @@ -142,13 +184,14 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.0.4" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ae1ddd39efd67689deb1979d80bad3bf7f2b09c6e6117c8d1f2443b5e2f83e" +checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" dependencies = [ - "bstr", + "anstyle", + "bstr 1.8.0", "doc-comment", - "predicates", + "predicates 3.0.4", "predicates-core", "predicates-tree", "wait-timeout", @@ -156,13 +199,14 @@ dependencies = [ [[package]] name = "assert_fs" -version = "1.0.7" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf09bb72e00da477c2596865e8873227e2196d263cca35414048875dbbeea1be" +checksum = "f070617a68e5c2ed5d06ee8dd620ee18fb72b99f6c094bed34cf8ab07c875b48" dependencies = [ + "anstyle", "doc-comment", "globwalk", - "predicates", + "predicates 3.0.4", "predicates-core", "predicates-tree", "tempfile", @@ -170,34 +214,35 @@ dependencies = [ [[package]] name = "async-stream" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" dependencies = [ "async-stream-impl", "futures-core", + "pin-project-lite 0.2.13", ] [[package]] name = "async-stream-impl" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] name = "async-trait" -version = "0.1.53" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] @@ -206,7 +251,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi 0.3.9", ] @@ -217,7 +262,7 @@ version = "0.1.0" source = "git+https://github.com/aurora-is-near/aurora-bn.git#8f1743884061981cac84388862e2763b2aa09307" dependencies = [ "byteorder", - "getrandom 0.2.6", + "getrandom 0.2.11", "rand 0.8.5", "serde", ] @@ -231,7 +276,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -251,15 +296,15 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.65" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide 0.5.1", + "miniz_oxide 0.7.1", "object", "rustc-demangle", ] @@ -272,15 +317,21 @@ checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" [[package]] name = "base64" -version = "0.13.0" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "base64ct" -version = "1.0.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a32fd6af2b5827bce66c29053ba0e7c42b9dcab01835835058558c10851a46b" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bech32" @@ -306,18 +357,18 @@ dependencies = [ [[package]] name = "bip39" version = "0.1.0" -source = "git+https://github.com/input-output-hk/chain-wallet-libs.git?branch=master#cd1d4e0a61836c50e193ee140ec74579115de056" +source = "git+https://github.com/input-output-hk/chain-wallet-libs.git?branch=catalyst-fund9#cc383a409996cb470f94c3b7e4a587474c953c5f" dependencies = [ - "cryptoxide 0.4.2", + "cryptoxide 0.4.4", "thiserror", "zeroize", ] [[package]] name = "bit-set" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" dependencies = [ "bit-vec", ] @@ -334,11 +385,17 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + [[package]] name = "bitvec" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ "funty", "radium", @@ -390,9 +447,9 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.10.2" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] @@ -403,6 +460,30 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" +[[package]] +name = "borsh" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf617fabf5cdbdc92f774bfe5062d870f228b80056d41180797abf48bed4056e" +dependencies = [ + "borsh-derive", + "cfg_aliases", +] + +[[package]] +name = "borsh-derive" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f404657a7ea7b5249e36808dff544bc88a28f26e0ac40009f674b7a009d14be3" +dependencies = [ + "once_cell", + "proc-macro-crate 2.0.0", + "proc-macro2", + "quote", + "syn 2.0.39", + "syn_derive", +] + [[package]] name = "bs58" version = "0.4.0" @@ -417,43 +498,65 @@ checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" dependencies = [ "lazy_static", "memchr", - "regex-automata", - "serde", + "regex-automata 0.1.10", ] [[package]] -name = "buf_redux" -version = "0.8.4" +name = "bstr" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f" +checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" dependencies = [ "memchr", - "safemem", + "regex-automata 0.4.3", + "serde", ] [[package]] name = "bumpalo" -version = "3.9.1" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "byte-slice-cast" -version = "1.2.1" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" + +[[package]] +name = "bytecheck" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" +dependencies = [ + "bytecheck_derive", + "ptr_meta", + "simdutf8", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c5fdd0166095e1d463fc6cc01aa8ce547ad77a4e84d42eb6762b084e28067e" +checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] name = "bytemuck" -version = "1.9.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdead85bdec19c194affaeeb670c0e41fe23de31459efd1c174d049269cf02cc" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" @@ -463,21 +566,21 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" [[package]] name = "bytes" -version = "1.1.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "bytesize" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c58ec36aac5066d5ca17df51b3e70279f5670a72102f5752cb7e7c856adfc70" +checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "bzip2" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" dependencies = [ "bzip2-sys", "libc", @@ -497,26 +600,23 @@ dependencies = [ [[package]] name = "cardano-legacy-address" version = "0.1.1" -source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#6e033ed9cce4857a94817c25e99a4b67a601fef1" +source = "git+https://github.com/input-output-hk/chain-libs.git?branch=catalyst-fund9#1b01f0dbf9282102f394727b4f8637fe4ce1728e" dependencies = [ "cbor_event", - "cryptoxide 0.4.2", + "cryptoxide 0.4.4", "ed25519-bip32 0.4.1", ] [[package]] name = "cast" -version = "0.2.7" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a" -dependencies = [ - "rustc_version", -] +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "catalyst-toolbox" -version = "0.3.0" -source = "git+https://github.com/input-output-hk/catalyst-toolbox.git?branch=main#f540007b055ca5aea84837f6219b5079118fff27" +version = "0.5.0" +source = "git+https://github.com/input-output-hk/catalyst-toolbox.git?branch=catalyst-fund9#386a0936a0328e3f84b515030d881d06250ff446" dependencies = [ "assert_fs", "bech32 0.8.1", @@ -527,17 +627,20 @@ dependencies = [ "chain-ser", "chain-storage", "chain-time", + "color-eyre", "csv", + "env_logger 0.9.3", "futures", "gag", + "governor", "graphql_client", "hex", "image", - "itertools 0.10.3", + "itertools 0.10.5", "jcli", "jormungandr-automation", "jormungandr-integration-tests", - "jormungandr-lib", + "jormungandr-lib 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", "jortestkit", "log", "once_cell", @@ -545,22 +648,21 @@ dependencies = [ "quircs", "rand 0.8.5", "rand_chacha 0.3.1", + "rayon", "regex", - "reqwest 0.11.10", + "reqwest 0.11.22", "rust_decimal", "rust_decimal_macros", "serde", "serde_json", "serde_yaml", "sscanf", - "stderrlog", - "stopwatch", "structopt", "symmetric-cipher", "thiserror", "thor", - "time 0.3.9", - "tokio 1.18.2", + "time", + "tokio 1.34.0", "url", "versionisator", "vit-servicing-station-lib", @@ -569,17 +671,18 @@ dependencies = [ [[package]] name = "cbor_event" -version = "2.1.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b6cda8a789815488ee290d106bc97dba47785dae73d63576fc42c126912a451" +checksum = "089a0261d1bc59e54e8e11860031efd88593f0e61b921172c474f1f38c2f2d3c" [[package]] name = "cc" -version = "1.0.73" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -594,26 +697,32 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "chacha20" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fc89c7c5b9e7a02dfe45cd2367bae382f9ed31c61ca8debe5f827c420a2f08" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ "cfg-if 1.0.0", - "cipher 0.4.3", + "cipher 0.4.4", "cpufeatures", ] [[package]] name = "chacha20poly1305" -version = "0.10.0-pre" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "746c430f71e66469abcf493c11484b1a86b957c84fc2d0ba664cd12ac23679ea" +checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ - "aead", + "aead 0.5.2", "chacha20", - "cipher 0.4.3", + "cipher 0.4.4", "poly1305", "zeroize", ] @@ -621,12 +730,12 @@ dependencies = [ [[package]] name = "chain-addr" version = "0.1.0" -source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#6e033ed9cce4857a94817c25e99a4b67a601fef1" +source = "git+https://github.com/input-output-hk/chain-libs.git?branch=catalyst-fund9#1b01f0dbf9282102f394727b4f8637fe4ce1728e" dependencies = [ "bech32 0.8.1", "chain-core", "chain-crypto", - "cryptoxide 0.4.2", + "cryptoxide 0.4.4", "proptest", "quickcheck", "test-strategy", @@ -635,7 +744,7 @@ dependencies = [ [[package]] name = "chain-core" version = "0.1.0" -source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#6e033ed9cce4857a94817c25e99a4b67a601fef1" +source = "git+https://github.com/input-output-hk/chain-libs.git?branch=catalyst-fund9#1b01f0dbf9282102f394727b4f8637fe4ce1728e" dependencies = [ "chain-ser", ] @@ -643,10 +752,10 @@ dependencies = [ [[package]] name = "chain-crypto" version = "0.1.0" -source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#6e033ed9cce4857a94817c25e99a4b67a601fef1" +source = "git+https://github.com/input-output-hk/chain-libs.git?branch=catalyst-fund9#1b01f0dbf9282102f394727b4f8637fe4ce1728e" dependencies = [ "bech32 0.8.1", - "cryptoxide 0.4.2", + "cryptoxide 0.4.4", "curve25519-dalek-ng", "ed25519-bip32 0.4.1", "ed25519-dalek", @@ -655,9 +764,9 @@ dependencies = [ "proptest", "quickcheck", "rand 0.8.5", - "rand_core 0.6.3", + "rand_core 0.6.4", "rayon", - "sha2 0.10.2", + "sha2 0.10.8", "test-strategy", "typed-bytes", ] @@ -665,10 +774,10 @@ dependencies = [ [[package]] name = "chain-evm" version = "0.1.0" -source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#6e033ed9cce4857a94817c25e99a4b67a601fef1" +source = "git+https://github.com/input-output-hk/chain-libs.git?branch=catalyst-fund9#1b01f0dbf9282102f394727b4f8637fe4ce1728e" dependencies = [ "aurora-bn", - "base64 0.13.0", + "base64 0.13.1", "blake2", "byte-slice-cast", "chain-core", @@ -680,13 +789,13 @@ dependencies = [ "hex", "imhamt", "libsecp256k1", - "num 0.4.0", + "num", "quickcheck", "ripemd", "rlp", "secp256k1", - "sha2 0.10.2", - "sha3 0.10.1", + "sha2 0.10.8", + "sha3 0.10.8", "thiserror", "typed-bytes", ] @@ -694,7 +803,7 @@ dependencies = [ [[package]] name = "chain-impl-mockchain" version = "0.1.0" -source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#6e033ed9cce4857a94817c25e99a4b67a601fef1" +source = "git+https://github.com/input-output-hk/chain-libs.git?branch=catalyst-fund9#1b01f0dbf9282102f394727b4f8637fe4ce1728e" dependencies = [ "cardano-legacy-address", "chain-addr", @@ -704,7 +813,7 @@ dependencies = [ "chain-ser", "chain-time", "chain-vote", - "cryptoxide 0.4.2", + "cryptoxide 0.4.4", "ed25519-bip32 0.4.1", "hex", "imhamt", @@ -714,7 +823,7 @@ dependencies = [ "quickcheck_macros", "rand 0.8.5", "rand_chacha 0.3.1", - "rand_core 0.6.3", + "rand_core 0.6.4", "sparse-array", "strum 0.23.0", "strum_macros 0.23.1", @@ -726,7 +835,7 @@ dependencies = [ [[package]] name = "chain-path-derivation" version = "0.1.0" -source = "git+https://github.com/input-output-hk/chain-wallet-libs.git?branch=master#cd1d4e0a61836c50e193ee140ec74579115de056" +source = "git+https://github.com/input-output-hk/chain-wallet-libs.git?branch=catalyst-fund9#cc383a409996cb470f94c3b7e4a587474c953c5f" dependencies = [ "thiserror", ] @@ -734,7 +843,7 @@ dependencies = [ [[package]] name = "chain-ser" version = "0.1.0" -source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#6e033ed9cce4857a94817c25e99a4b67a601fef1" +source = "git+https://github.com/input-output-hk/chain-libs.git?branch=catalyst-fund9#1b01f0dbf9282102f394727b4f8637fe4ce1728e" dependencies = [ "thiserror", ] @@ -742,11 +851,11 @@ dependencies = [ [[package]] name = "chain-storage" version = "0.1.0" -source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#b6590318da760d223022bf4e3b1c42e1ee697242" +source = "git+https://github.com/input-output-hk/chain-libs.git?branch=catalyst-fund9#1b01f0dbf9282102f394727b4f8637fe4ce1728e" dependencies = [ "criterion", "data-pile", - "rand_core 0.6.3", + "rand_core 0.6.4", "sled", "tempfile", "thiserror", @@ -755,7 +864,7 @@ dependencies = [ [[package]] name = "chain-time" version = "0.1.0" -source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#6e033ed9cce4857a94817c25e99a4b67a601fef1" +source = "git+https://github.com/input-output-hk/chain-libs.git?branch=catalyst-fund9#1b01f0dbf9282102f394727b4f8637fe4ce1728e" dependencies = [ "chain-core", "chain-ser", @@ -767,15 +876,15 @@ dependencies = [ [[package]] name = "chain-vote" version = "0.1.0" -source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#6e033ed9cce4857a94817c25e99a4b67a601fef1" +source = "git+https://github.com/input-output-hk/chain-libs.git?branch=catalyst-fund9#1b01f0dbf9282102f394727b4f8637fe4ce1728e" dependencies = [ "cfg-if 1.0.0", "chain-core", "chain-crypto", "const_format", - "cryptoxide 0.4.2", + "cryptoxide 0.4.4", "rand 0.8.5", - "rand_core 0.6.3", + "rand_core 0.6.4", "rayon", "thiserror", ] @@ -788,16 +897,17 @@ checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919" [[package]] name = "chrono" -version = "0.4.19" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ - "libc", - "num-integer", + "android-tzdata", + "iana-time-zone", + "js-sys", "num-traits", "serde", - "time 0.1.44", - "winapi 0.3.9", + "wasm-bindgen", + "windows-targets 0.48.5", ] [[package]] @@ -811,9 +921,9 @@ dependencies = [ [[package]] name = "cipher" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ "crypto-common", "inout", @@ -828,7 +938,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term 0.12.1", "atty", - "bitflags", + "bitflags 1.3.2", "strsim 0.8.0", "textwrap 0.11.0", "unicode-width", @@ -837,25 +947,25 @@ dependencies = [ [[package]] name = "clap" -version = "3.1.18" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", - "bitflags", + "bitflags 1.3.2", "clap_lex", - "indexmap", + "indexmap 1.9.3", "strsim 0.10.0", "termcolor", "terminal_size", - "textwrap 0.15.0", + "textwrap 0.16.0", ] [[package]] name = "clap_lex" -version = "0.2.0" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" dependencies = [ "os_str_bytes", ] @@ -866,13 +976,13 @@ version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "cocoon" version = "0.3.0" -source = "git+https://github.com/dkijania/cocoon.git#1dfd975c3f0720d51c56fb297e7c92467bc3448a" +source = "git+https://github.com/dkijania/cocoon.git#85a61e33191ddb209f5d5a3382280419bc55c0fb" dependencies = [ "aes-gcm", "chacha20poly1305", @@ -883,6 +993,33 @@ dependencies = [ "zeroize", ] +[[package]] +name = "color-eyre" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204" +dependencies = [ + "backtrace", + "color-spantrace", + "eyre", + "indenter", + "once_cell", + "owo-colors", + "tracing-error", +] + +[[package]] +name = "color-spantrace" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" +dependencies = [ + "once_cell", + "owo-colors", + "tracing-core", + "tracing-error", +] + [[package]] name = "color_quant" version = "1.1.0" @@ -904,33 +1041,31 @@ dependencies = [ [[package]] name = "console" -version = "0.15.0" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" dependencies = [ "encode_unicode", + "lazy_static", "libc", - "once_cell", - "regex", - "terminal_size", "unicode-width", - "winapi 0.3.9", + "windows-sys 0.45.0", ] [[package]] name = "const_format" -version = "0.2.23" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0936ffe6d0c8d6a51b3b0a73b2acbe925d786f346cf45bfddc8341d79fb7dc8a" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.22" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef196d5d972878a48da7decb7686eded338b4858fbabeed513d63a7c98b2b82d" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" dependencies = [ "proc-macro2", "quote", @@ -955,15 +1090,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.2" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -979,16 +1114,16 @@ dependencies = [ [[package]] name = "criterion" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1604dafd25fba2fe2d5895a9da139f8dc9b319a5fe5354ca137cbbce4e178d10" +checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" dependencies = [ "atty", "cast", "clap 2.34.0", "criterion-plot", "csv", - "itertools 0.10.3", + "itertools 0.10.5", "lazy_static", "num-traits", "oorandom", @@ -1005,19 +1140,19 @@ dependencies = [ [[package]] name = "criterion-plot" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00996de9f2f7559f7f4dc286073197f83e92256a59ed395f9aac01fe717da57" +checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" dependencies = [ "cast", - "itertools 0.10.3", + "itertools 0.10.5", ] [[package]] name = "crossbeam-channel" -version = "0.5.4" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -1025,9 +1160,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", @@ -1036,26 +1171,24 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.8" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg 1.1.0", "cfg-if 1.0.0", "crossbeam-utils", - "lazy_static", "memoffset", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.8" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if 1.0.0", - "lazy_static", ] [[package]] @@ -1066,11 +1199,12 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-common" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", + "rand_core 0.6.4", "typenum", ] @@ -1102,40 +1236,39 @@ checksum = "42014d4c82e74bc17aaccc4bd75d3615d2b8236198de81c51bed5ddefaae6435" [[package]] name = "cryptoxide" -version = "0.4.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "129eabb7b0b78644a3a7e7cf220714aba47463bb281f69fa7a71ca5d12564cca" +checksum = "382ce8820a5bb815055d3553a610e8cb542b2d767bbacea99038afda96cd760d" [[package]] name = "csv" -version = "1.1.6" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ - "bstr", "csv-core", - "itoa 0.4.8", + "itoa 1.0.9", "ryu", "serde", ] [[package]] name = "csv-core" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ "memchr", ] [[package]] name = "ctor" -version = "0.1.22" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1149,12 +1282,12 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.2.2" +version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b37feaa84e6861e00a1f5e5aa8da3ee56d605c9992d33e082786754828e20865" +checksum = "82e95fbd621905b854affdc67943b043a0fbb6ed7385fd5a25650d19a8a6cfdf" dependencies = [ "nix", - "winapi 0.3.9", + "windows-sys 0.48.0", ] [[package]] @@ -1178,28 +1311,28 @@ checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8" dependencies = [ "byteorder", "digest 0.9.0", - "rand_core 0.6.3", + "rand_core 0.6.4", "subtle-ng", "zeroize", ] [[package]] name = "custom_debug" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8225047674d65dcf4321e6bd3e060bdbbe940604a99b1559827f3e61c498d1e" +checksum = "e89e0ae2c2a42be29595d05c50e3ce6096c0698a97e021c3289790f0750cc8e2" dependencies = [ "custom_debug_derive", ] [[package]] name = "custom_debug_derive" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b35d34eb004bf2d33c093f1c55ee77829e8654644288d3b6afd8c2d99d23729" +checksum = "08a9f3941234c9f62ceaa2782974827749de9b0a8a6487275a278da068e1baf7" dependencies = [ "proc-macro2", - "syn", + "syn 1.0.109", "synstructure", ] @@ -1224,7 +1357,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn", + "syn 1.0.109", ] [[package]] @@ -1235,14 +1368,14 @@ checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "data-encoding" -version = "2.3.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "data-pile" @@ -1263,6 +1396,16 @@ dependencies = [ "byteorder", ] +[[package]] +name = "deranged" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", + "serde", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -1271,9 +1414,15 @@ checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] +[[package]] +name = "deunicode" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a1abaf4d861455be59f64fd2b55606cb151fce304ede7165f410243ce96bde6" + [[package]] name = "dialoguer" version = "0.9.0" @@ -1288,11 +1437,12 @@ dependencies = [ [[package]] name = "dialoguer" -version = "0.10.1" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8c8ae48e400addc32a8710c8d62d55cb84249a7d58ac4cd959daecfbaddc545" +checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" dependencies = [ "console", + "shell-words", "tempfile", "zeroize", ] @@ -1317,7 +1467,7 @@ checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1362,11 +1512,11 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.3" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.2", + "block-buffer 0.10.4", "crypto-common", "subtle", ] @@ -1405,9 +1555,9 @@ checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" [[package]] name = "dyn-clone" -version = "1.0.5" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e50f3adc76d6a43f5ed73b698a87d0760ca74617f60f7c3b879003536fdd28" +checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" [[package]] name = "eccoxide" @@ -1419,9 +1569,9 @@ dependencies = [ [[package]] name = "ed25519" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cb2103c580a9f8732121f755eccb51312f7db26314664314c119298107064b" +checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ "signature", ] @@ -1441,7 +1591,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb588f93c0d91b2f668849fd6d030cddb0b2e31f105963be189da5acdf492a21" dependencies = [ - "cryptoxide 0.4.2", + "cryptoxide 0.4.4", ] [[package]] @@ -1460,9 +1610,9 @@ dependencies = [ [[package]] name = "either" -version = "1.6.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encode_unicode" @@ -1472,9 +1622,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if 1.0.0", ] @@ -1489,21 +1639,50 @@ dependencies = [ "regex", ] +[[package]] +name = "env_logger" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +dependencies = [ + "atty", + "humantime", + "log", + "regex", + "termcolor", +] + [[package]] name = "environmental" -version = "1.1.3" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b" + +[[package]] +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b91989ae21441195d7d9b9993a2f9295c7e1a8c96255d8b729accddc124797" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] [[package]] name = "ethabi" -version = "17.0.0" +version = "17.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69517146dfab88e9238c00c724fd8e277951c3cc6f22b016d72f422a832213e" +checksum = "e4966fba78396ff92db3b817ee71143eccd98acf0f876b8d600e585a670c5d1b" dependencies = [ "ethereum-types", "hex", - "sha3 0.10.1", + "sha3 0.10.8", ] [[package]] @@ -1527,7 +1706,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23750149fe8834c0e24bb9adcbacbe06c45b9861f15df53e09f26cb7c4ab91ef" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "ethereum-types", "hash-db", "hash256-std-hasher", @@ -1536,7 +1715,7 @@ dependencies = [ "rlp-derive", "scale-info", "serde", - "sha3 0.10.1", + "sha3 0.10.8", "triehash", ] @@ -1574,7 +1753,7 @@ dependencies = [ "rlp", "scale-info", "serde", - "sha3 0.10.1", + "sha3 0.10.8", ] [[package]] @@ -1611,7 +1790,17 @@ dependencies = [ "environmental", "evm-core", "primitive-types", - "sha3 0.10.1", + "sha3 0.10.8", +] + +[[package]] +name = "eyre" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80f656be11ddf91bd709454d15d5bd896fbaf4cc3314e69349e4d1569f5b46cd" +dependencies = [ + "indenter", + "once_cell", ] [[package]] @@ -1632,29 +1821,28 @@ checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "synstructure", ] [[package]] name = "fake" -version = "2.4.3" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a8531dd3a64fd1cfbe92fad4160bc2060489c6195fe847e045e5788f710bae" +checksum = "26221445034074d46b276e13eb97a265ebdb8ed8da705c4dddd3dd20b66b45d2" dependencies = [ "chrono", + "deunicode", "http", "rand 0.8.5", + "url-escape", ] [[package]] name = "fastrand" -version = "1.7.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" -dependencies = [ - "instant", -] +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "filedescriptor" @@ -1669,14 +1857,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.16" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0408e2626025178a6a7f7ffc05a25bc47103229f19c113755de7bf63816290c" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall", - "winapi 0.3.9", + "redox_syscall 0.3.5", + "windows-sys 0.48.0", ] [[package]] @@ -1693,20 +1881,18 @@ dependencies = [ [[package]] name = "fixedbitset" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.23" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ - "cfg-if 1.0.0", "crc32fast", - "libc", - "miniz_oxide 0.5.1", + "miniz_oxide 0.7.1", ] [[package]] @@ -1741,11 +1927,10 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ - "matches", "percent-encoding", ] @@ -1761,9 +1946,9 @@ dependencies = [ [[package]] name = "fs_extra" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] name = "fsevent-sys" @@ -1786,7 +1971,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" dependencies = [ - "bitflags", + "bitflags 1.3.2", "fuchsia-zircon-sys", ] @@ -1813,7 +1998,7 @@ checksum = "569d2238870f92cff64fc810013b61edaf446ebcfba36b649b96bc5b4078328a" dependencies = [ "proc-macro-crate 0.1.5", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1824,9 +2009,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.21" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -1839,9 +2024,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.21" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -1849,15 +2034,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.21" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.21" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -1866,38 +2051,44 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.21" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-macro" -version = "0.3.21" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] name = "futures-sink" -version = "0.3.21" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.21" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" + +[[package]] +name = "futures-timer" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" +checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.21" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -1906,7 +2097,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.13", "pin-utils", "slab", ] @@ -1932,9 +2123,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.5" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -1953,14 +2144,14 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.6" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if 1.0.0", "js-sys", "libc", - "wasi 0.10.0+wasi-snapshot-preview1", + "wasi 0.11.0+wasi-snapshot-preview1", "wasm-bindgen", ] @@ -1976,9 +2167,9 @@ dependencies = [ [[package]] name = "gif" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a7187e78088aead22ceedeee99779455b23fc231fe13ec443f99bb71694e5b" +checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" dependencies = [ "color_quant", "weezl", @@ -1986,27 +2177,27 @@ dependencies = [ [[package]] name = "gimli" -version = "0.26.1" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.8" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ "aho-corasick", - "bstr", - "fnv", + "bstr 1.8.0", "log", - "regex", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -2015,18 +2206,33 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "ignore", "walkdir", ] [[package]] -name = "graphql-introspection-query" -version = "0.2.0" +name = "governor" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2a4732cf5140bd6c082434494f785a19cfb566ab07d1382c3671f5812fed6d" +checksum = "19775995ee20209163239355bc3ad2f33f83da35d9ef72dea26e5af753552c87" dependencies = [ - "serde", + "futures", + "futures-timer", + "no-std-compat", + "nonzero_ext", + "parking_lot 0.12.1", + "rand 0.8.5", + "smallvec", +] + +[[package]] +name = "graphql-introspection-query" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f2a4732cf5140bd6c082434494f785a19cfb566ab07d1382c3671f5812fed6d" +dependencies = [ + "serde", ] [[package]] @@ -2064,7 +2270,7 @@ dependencies = [ "quote", "serde", "serde_json", - "syn", + "syn 1.0.109", ] [[package]] @@ -2075,7 +2281,7 @@ checksum = "e56b093bfda71de1da99758b036f4cc811fd2511c8a76f75680e9ffbd2bb4251" dependencies = [ "graphql_client_codegen", "proc-macro2", - "syn", + "syn 1.0.109", ] [[package]] @@ -2085,7 +2291,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8bc64bdceb2909623131a62d470e809c32f86b8329d82f8d31d9971349cb00a" dependencies = [ "gtmpl_value", - "itertools 0.10.3", + "itertools 0.10.5", "lazy_static", "percent-encoding", ] @@ -2108,7 +2314,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio 0.2.25", "tokio-util 0.3.1", @@ -2118,20 +2324,20 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.13" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "fnv", "futures-core", "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 2.1.0", "slab", - "tokio 1.18.2", - "tokio-util 0.7.2", + "tokio 1.34.0", + "tokio-util 0.7.10", "tracing", ] @@ -2165,19 +2371,34 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + [[package]] name = "hashlink" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf" dependencies = [ - "hashbrown", + "hashbrown 0.11.2", ] [[package]] name = "hdkeygen" version = "0.2.0" -source = "git+https://github.com/input-output-hk/chain-wallet-libs.git?branch=master#cd1d4e0a61836c50e193ee140ec74579115de056" +source = "git+https://github.com/input-output-hk/chain-wallet-libs.git?branch=catalyst-fund9#cc383a409996cb470f94c3b7e4a587474c953c5f" dependencies = [ "bip39", "cardano-legacy-address", @@ -2185,7 +2406,7 @@ dependencies = [ "chain-addr", "chain-crypto", "chain-path-derivation", - "cryptoxide 0.4.2", + "cryptoxide 0.4.4", "ed25519-bip32 0.4.1", "hex", "thiserror", @@ -2194,18 +2415,17 @@ dependencies = [ [[package]] name = "headers" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cff78e5788be1e0ab65b04d306b2ed5092c815ec97ec70f4ebd5aee158aa55d" +checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.13.0", - "bitflags", - "bytes 1.1.0", + "base64 0.21.5", + "bytes 1.5.0", "headers-core", "http", - "httpdate 1.0.2", + "httpdate 1.0.3", "mime", - "sha-1 0.10.0", + "sha1", ] [[package]] @@ -2235,10 +2455,16 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + [[package]] name = "hersir" version = "0.1.0" -source = "git+https://github.com/input-output-hk/jormungandr.git?branch=master#26000281078521c7a40985f331040a628393fcc4" +source = "git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0#47e874c5792bccd2eb073ef65ea89ac5d0525c04" dependencies = [ "assert_fs", "chain-addr", @@ -2250,13 +2476,13 @@ dependencies = [ "hex", "indicatif", "jormungandr-automation", - "jormungandr-lib", + "jormungandr-lib 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", "jortestkit", "parity-multiaddr 0.11.2", "rand 0.8.5", "rand_chacha 0.3.1", - "rand_core 0.6.3", - "reqwest 0.11.10", + "rand_core 0.6.4", + "reqwest 0.11.22", "serde", "serde_derive", "serde_json", @@ -2289,18 +2515,27 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.3", + "digest 0.10.7", +] + +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", ] [[package]] name = "http" -version = "0.2.7" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "fnv", - "itoa 1.0.2", + "itoa 1.0.9", ] [[package]] @@ -2315,13 +2550,13 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "http", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.13", ] [[package]] @@ -2336,9 +2571,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" @@ -2348,9 +2583,9 @@ checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -2384,23 +2619,23 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.18" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "futures-channel", "futures-core", "futures-util", - "h2 0.3.13", + "h2 0.3.22", "http", - "http-body 0.4.4", + "http-body 0.4.5", "httparse", - "httpdate 1.0.2", - "itoa 1.0.2", - "pin-project-lite 0.2.9", - "socket2 0.4.4", - "tokio 1.18.2", + "httpdate 1.0.3", + "itoa 1.0.9", + "pin-project-lite 0.2.13", + "socket2 0.4.10", + "tokio 1.34.0", "tower-service", "tracing", "want", @@ -2424,15 +2659,16 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ + "futures-util", "http", - "hyper 0.14.18", - "rustls 0.20.5", - "tokio 1.18.2", - "tokio-rustls 0.23.4", + "hyper 0.14.27", + "rustls 0.21.9", + "tokio 1.34.0", + "tokio-rustls 0.24.1", ] [[package]] @@ -2441,9 +2677,9 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper 0.14.18", - "pin-project-lite 0.2.9", - "tokio 1.18.2", + "hyper 0.14.27", + "pin-project-lite 0.2.13", + "tokio 1.34.0", "tokio-io-timeout", ] @@ -2466,13 +2702,36 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.1.0", - "hyper 0.14.18", + "bytes 1.5.0", + "hyper 0.14.27", "native-tls", - "tokio 1.18.2", + "tokio 1.34.0", "tokio-native-tls", ] +[[package]] +name = "iana-time-zone" +version = "0.1.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + [[package]] name = "iapyx" version = "0.0.1" @@ -2490,9 +2749,9 @@ dependencies = [ "chrono", "cocoon", "console", - "cryptoxide 0.4.2", + "cryptoxide 0.4.4", "csv", - "dialoguer 0.10.1", + "dialoguer 0.10.4", "dirs", "eccoxide", "ed25519-bip32 0.3.2", @@ -2501,13 +2760,13 @@ dependencies = [ "hex", "hyper 0.13.10", "image", - "itertools 0.10.3", + "itertools 0.10.5", "jcli", "jormungandr-automation", - "jormungandr-lib", + "jormungandr-lib 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", "jortestkit", "rand 0.8.5", - "rand_core 0.6.3", + "rand_core 0.6.4", "rayon", "regex", "reqwest 0.10.10", @@ -2517,7 +2776,7 @@ dependencies = [ "structopt", "thiserror", "thor", - "tokio 1.18.2", + "tokio 1.34.0", "url", "valgrind", "wallet", @@ -2534,29 +2793,26 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.2.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] [[package]] name = "ignore" -version = "0.4.18" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" +checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060" dependencies = [ - "crossbeam-utils", + "crossbeam-deque", "globset", - "lazy_static", "log", "memchr", - "regex", + "regex-automata 0.4.3", "same-file", - "thread_local", "walkdir", "winapi-util", ] @@ -2583,7 +2839,7 @@ dependencies = [ [[package]] name = "imhamt" version = "0.1.0" -source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#6e033ed9cce4857a94817c25e99a4b67a601fef1" +source = "git+https://github.com/input-output-hk/chain-libs.git?branch=catalyst-fund9#1b01f0dbf9282102f394727b4f8637fe4ce1728e" dependencies = [ "proptest", "rustc_version", @@ -2626,17 +2882,33 @@ checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + [[package]] name = "indexmap" -version = "1.8.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg 1.1.0", - "hashbrown", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown 0.14.3", ] [[package]] @@ -2657,7 +2929,7 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" dependencies = [ - "bitflags", + "bitflags 1.3.2", "inotify-sys", "libc", ] @@ -2708,7 +2980,7 @@ dependencies = [ "iapyx", "jcli", "jormungandr-automation", - "jormungandr-lib", + "jormungandr-lib 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", "jortestkit", "libmath", "rand 0.8.5", @@ -2719,13 +2991,24 @@ dependencies = [ "snapshot-trigger-service", "thiserror", "thor", - "tokio 1.18.2", + "tokio 1.34.0", "valgrind", "vit-servicing-station-lib", "vit-servicing-station-tests", "vitup", ] +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.3", + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "iovec" version = "0.1.4" @@ -2737,9 +3020,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.5.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "itertools" @@ -2752,9 +3035,18 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.3" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" dependencies = [ "either", ] @@ -2767,34 +3059,34 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.2" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jcli" -version = "0.13.0" -source = "git+https://github.com/input-output-hk/jormungandr.git?branch=master#26000281078521c7a40985f331040a628393fcc4" +version = "0.15.0" +source = "git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0#47e874c5792bccd2eb073ef65ea89ac5d0525c04" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "bech32 0.8.1", "bincode", - "bytes 1.1.0", + "bytes 1.5.0", "chain-addr", "chain-core", "chain-crypto", "chain-impl-mockchain", "chain-time", "chain-vote", - "clap 3.1.18", + "clap 3.2.25", "ed25519-bip32 0.4.1", "gtmpl", "hex", - "jormungandr-lib", + "jormungandr-lib 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", "rand 0.8.5", "rand_chacha 0.3.1", "rayon", - "reqwest 0.11.10", + "reqwest 0.11.22", "rpassword", "serde", "serde_derive", @@ -2807,21 +3099,21 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.24" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] [[package]] name = "jormungandr-automation" -version = "0.13.0" -source = "git+https://github.com/input-output-hk/jormungandr.git?branch=master#26000281078521c7a40985f331040a628393fcc4" +version = "0.15.0" +source = "git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0#47e874c5792bccd2eb073ef65ea89ac5d0525c04" dependencies = [ - "assert_cmd 2.0.4", + "assert_cmd 2.0.12", "assert_fs", - "base64 0.13.0", + "base64 0.13.1", "bech32 0.8.1", "bytesize", "cardano-legacy-address", @@ -2839,7 +3131,7 @@ dependencies = [ "graphql_client", "hex", "humantime", - "jormungandr-lib", + "jormungandr-lib 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", "jortestkit", "json", "keynesis", @@ -2849,29 +3141,29 @@ dependencies = [ "os_info", "parity-multiaddr 0.11.2", "poldercast 1.2.1", - "predicates", + "predicates 2.1.5", "prost", "rand 0.8.5", "rand_chacha 0.3.1", - "rand_core 0.6.3", + "rand_core 0.6.4", "regex", - "reqwest 0.11.10", + "reqwest 0.11.22", "semver", "serde", "serde_derive", "serde_json", "serde_yaml", "strum 0.23.0", - "sysinfo 0.23.12", + "sysinfo 0.23.13", "tar", "tempfile", "thiserror", - "tokio 1.18.2", + "tokio 1.34.0", "tokio-stream", "tonic", "tonic-build", "tracing", - "tracing-subscriber 0.3.6", + "tracing-subscriber 0.3.18", "typed-bytes", "url", "warp", @@ -2880,12 +3172,12 @@ dependencies = [ [[package]] name = "jormungandr-integration-tests" -version = "0.13.0" -source = "git+https://github.com/input-output-hk/jormungandr.git?branch=master#26000281078521c7a40985f331040a628393fcc4" +version = "0.15.0" +source = "git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0#47e874c5792bccd2eb073ef65ea89ac5d0525c04" dependencies = [ - "assert_cmd 2.0.4", + "assert_cmd 2.0.12", "assert_fs", - "base64 0.13.0", + "base64 0.13.1", "bech32 0.7.3", "chain-addr", "chain-core", @@ -2900,7 +3192,7 @@ dependencies = [ "hex", "indicatif", "jormungandr-automation", - "jormungandr-lib", + "jormungandr-lib 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", "jortestkit", "json", "lazy_static", @@ -2908,13 +3200,13 @@ dependencies = [ "mjolnir", "parity-multiaddr 0.11.2", "poldercast 1.2.1", - "predicates", + "predicates 2.1.5", "prost", "rand 0.8.5", "rand_chacha 0.3.1", - "rand_core 0.6.3", + "rand_core 0.6.4", "regex", - "reqwest 0.11.10", + "reqwest 0.11.22", "rstest", "serde", "serde_derive", @@ -2923,7 +3215,7 @@ dependencies = [ "tempfile", "thiserror", "thor", - "tokio 1.18.2", + "tokio 1.34.0", "tonic", "tracing", "url", @@ -2932,10 +3224,38 @@ dependencies = [ [[package]] name = "jormungandr-lib" -version = "0.13.0" -source = "git+https://github.com/input-output-hk/jormungandr.git?branch=master#69132bda6b489e395f53954e148b915fc5977e34" +version = "0.15.0" +source = "git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0#47e874c5792bccd2eb073ef65ea89ac5d0525c04" +dependencies = [ + "base64 0.13.1", + "bech32 0.8.1", + "cardano-legacy-address", + "chain-addr", + "chain-core", + "chain-crypto", + "chain-impl-mockchain", + "chain-time", + "chain-vote", + "hex", + "http", + "humantime", + "parity-multiaddr 0.11.2", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rand_core 0.6.4", + "serde", + "serde_with", + "thiserror", + "time", + "typed-bytes", +] + +[[package]] +name = "jormungandr-lib" +version = "0.15.0" +source = "git+https://github.com/input-output-hk/jormungandr.git?branch=catalyst-fund9#5784b68249050879f7bbc80159a1cc1bd5348be1" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "bech32 0.8.1", "cardano-legacy-address", "chain-addr", @@ -2950,11 +3270,11 @@ dependencies = [ "parity-multiaddr 0.11.2", "rand 0.8.5", "rand_chacha 0.3.1", - "rand_core 0.6.3", + "rand_core 0.6.4", "serde", "serde_with", "thiserror", - "time 0.3.9", + "time", "typed-bytes", ] @@ -2964,7 +3284,7 @@ version = "0.1.0" source = "git+https://github.com/input-output-hk/jortestkit.git?branch=master#4907ed1f3f0a341158ca4e53d967c78b86cd00fa" dependencies = [ "assert_fs", - "base64 0.13.0", + "base64 0.13.1", "bech32 0.8.1", "bytesize", "console", @@ -2978,24 +3298,24 @@ dependencies = [ "indicatif", "lazy_static", "os_info", - "predicates", + "predicates 2.1.5", "rand 0.8.5", "rand_chacha 0.3.1", - "rand_core 0.6.3", + "rand_core 0.6.4", "rayon", - "reqwest 0.11.10", + "reqwest 0.11.22", "semver", "serde", "serde_derive", "serde_json", "serde_yaml", - "sha-1 0.9.8", + "sha-1", "sha2 0.9.9", "sysinfo 0.14.15", "tar", "thiserror", - "time 0.3.9", - "tokio 1.18.2", + "time", + "tokio 1.34.0", "warp", "zip", ] @@ -3011,9 +3331,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.57" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" dependencies = [ "wasm-bindgen", ] @@ -3026,9 +3346,12 @@ checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" [[package]] name = "keccak" -version = "0.1.0" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" +checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +dependencies = [ + "cpufeatures", +] [[package]] name = "kernel32-sys" @@ -3049,15 +3372,15 @@ dependencies = [ "cryptoxide 0.3.6", "hex", "rand_chacha 0.3.1", - "rand_core 0.6.3", + "rand_core 0.6.4", "thiserror", ] [[package]] name = "kqueue" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6112e8f37b59803ac47a42d14f1f3a59bbf72fc6857ffc5be455e28a691f8e" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" dependencies = [ "kqueue-sys", "libc", @@ -3065,11 +3388,11 @@ dependencies = [ [[package]] name = "kqueue-sys" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", ] @@ -3087,9 +3410,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.125" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libmath" @@ -3100,14 +3423,25 @@ dependencies = [ "rand 0.3.23", ] +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", +] + [[package]] name = "libsecp256k1" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0452aac8bab02242429380e9b2f94ea20cea2b37e2c1777a1358799bbe97f37" +checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1" dependencies = [ "arrayref", - "base64 0.13.0", + "base64 0.13.1", "digest 0.9.0", "libsecp256k1-core", "libsecp256k1-gen-ecmult", @@ -3158,15 +3492,27 @@ dependencies = [ [[package]] name = "linked-hash-map" -version = "0.5.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] name = "lock_api" -version = "0.4.7" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg 1.1.0", "scopeguard", @@ -3174,18 +3520,17 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" dependencies = [ - "cfg-if 1.0.0", "serde", ] [[package]] name = "loki" version = "0.1.0" -source = "git+https://github.com/input-output-hk/jormungandr.git?branch=master#26000281078521c7a40985f331040a628393fcc4" +source = "git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0#47e874c5792bccd2eb073ef65ea89ac5d0525c04" dependencies = [ "chain-addr", "chain-core", @@ -3193,17 +3538,17 @@ dependencies = [ "chain-impl-mockchain", "custom_debug", "jormungandr-automation", - "jormungandr-lib", + "jormungandr-lib 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", "parity-multiaddr 0.11.2", "rand 0.8.5", - "rand_core 0.6.3", - "reqwest 0.11.10", + "rand_core 0.6.4", + "reqwest 0.11.22", "serde", "serde_yaml", "structopt", "thiserror", "thor", - "tokio 1.18.2", + "tokio 1.34.0", "warp", ] @@ -3213,16 +3558,16 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ea2d928b485416e8908cff2d97d621db22b27f7b3b6729e438bcf42c671ba91" dependencies = [ - "hashbrown", + "hashbrown 0.11.2", ] [[package]] name = "lru" -version = "0.7.5" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32613e41de4c47ab04970c348ca7ae7382cf116625755af070b008a15516a889" +checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" dependencies = [ - "hashbrown", + "hashbrown 0.12.3", ] [[package]] @@ -3231,20 +3576,14 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" dependencies = [ - "regex-automata", + "regex-automata 0.1.10", ] -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memmap2" @@ -3257,9 +3596,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.6.5" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg 1.1.0", ] @@ -3282,14 +3621,14 @@ dependencies = [ "migrations_internals", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" @@ -3322,9 +3661,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.5.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] @@ -3363,14 +3702,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.3" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", - "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -3397,7 +3735,7 @@ dependencies = [ [[package]] name = "mjolnir" version = "0.1.0" -source = "git+https://github.com/input-output-hk/jormungandr.git?branch=master#26000281078521c7a40985f331040a628393fcc4" +source = "git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0#47e874c5792bccd2eb073ef65ea89ac5d0525c04" dependencies = [ "assert_fs", "chain-addr", @@ -3409,18 +3747,36 @@ dependencies = [ "chain-vote", "indicatif", "jormungandr-automation", - "jormungandr-lib", + "jormungandr-lib 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", "jortestkit", "loki", "rand 0.8.5", - "rand_core 0.6.3", + "rand_core 0.6.4", "structopt", "thiserror", "thor", - "tokio 1.18.2", + "tokio 1.34.0", "versionisator", ] +[[package]] +name = "multer" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2" +dependencies = [ + "bytes 1.5.0", + "encoding_rs", + "futures-util", + "http", + "httparse", + "log", + "memchr", + "mime", + "spin 0.9.8", + "version_check", +] + [[package]] name = "multihash" version = "0.11.4" @@ -3430,7 +3786,7 @@ dependencies = [ "blake2b_simd", "blake2s_simd", "digest 0.9.0", - "sha-1 0.9.8", + "sha-1", "sha2 0.9.9", "sha3 0.9.1", "unsigned-varint 0.5.1", @@ -3453,11 +3809,11 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "424f6e86263cd5294cbd7f1e95746b95aca0e0d66bff31e5a40d6baa87b4aa99" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "synstructure", ] @@ -3467,29 +3823,11 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" -[[package]] -name = "multipart" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00dec633863867f29cb39df64a397cdf4a6354708ddd7759f70c7fb51c5f9182" -dependencies = [ - "buf_redux", - "httparse", - "log", - "mime", - "mime_guess", - "quick-error 1.2.3", - "rand 0.8.5", - "safemem", - "tempfile", - "twoway", -] - [[package]] name = "native-tls" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ "lazy_static", "libc", @@ -3505,9 +3843,9 @@ dependencies = [ [[package]] name = "net2" -version = "0.2.37" +version = "0.2.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac" dependencies = [ "cfg-if 0.1.10", "libc", @@ -3520,7 +3858,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0faa3f4ad230fd2bf2a5dad71476ecbaeaed904b3c7e7e5b1f266c415c03761f" dependencies = [ - "bitflags", + "bitflags 1.3.2", "byteorder", "libc", "num-derive", @@ -3530,15 +3868,27 @@ dependencies = [ [[package]] name = "nix" -version = "0.24.1" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags", + "bitflags 2.4.1", "cfg-if 1.0.0", "libc", ] +[[package]] +name = "no-std-compat" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" + +[[package]] +name = "nonzero_ext" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" + [[package]] name = "normalize-line-endings" version = "0.3.0" @@ -3551,7 +3901,7 @@ version = "5.0.0-pre.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c614e7ed2b1cf82ec99aeffd8cf6225ef5021b9951148eb161393c394855032c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crossbeam-channel", "filetime", "fsevent-sys", @@ -3573,50 +3923,34 @@ dependencies = [ ] [[package]] -name = "num" -version = "0.1.42" +name = "nu-ansi-term" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" dependencies = [ - "num-bigint 0.1.44", - "num-complex 0.1.43", - "num-integer", - "num-iter", - "num-rational 0.1.42", - "num-traits", + "overload", + "winapi 0.3.9", ] [[package]] name = "num" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" dependencies = [ - "num-bigint 0.4.3", - "num-complex 0.4.1", + "num-bigint", + "num-complex", "num-integer", "num-iter", - "num-rational 0.4.0", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63899ad0da84ce718c14936262a41cee2c79c981fc0a0e7c7beb47d5a07e8c1" -dependencies = [ - "num-integer", + "num-rational 0.4.1", "num-traits", - "rand 0.4.6", - "rustc-serialize", ] [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg 1.1.0", "num-integer", @@ -3625,19 +3959,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b288631d7878aaf59442cffd36910ea604ecd7745c36054328595114001c9656" -dependencies = [ - "num-traits", - "rustc-serialize", -] - -[[package]] -name = "num-complex" -version = "0.4.1" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fbc387afefefd5e9e39493299f3069e14a140dd34dc19b4c1c1a8fddb6a790" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ "num-traits", ] @@ -3650,7 +3974,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -3674,18 +3998,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-rational" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" -dependencies = [ - "num-bigint 0.1.44", - "num-integer", - "num-traits", - "rustc-serialize", -] - [[package]] name = "num-rational" version = "0.3.2" @@ -3699,32 +4011,32 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg 1.1.0", - "num-bigint 0.4.3", + "num-bigint", "num-integer", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg 1.1.0", ] [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.3", "libc", ] @@ -3745,18 +4057,18 @@ checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" [[package]] name = "object" -version = "0.28.4" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.10.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "oorandom" @@ -3772,11 +4084,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.40" +version = "0.10.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb81a6430ac911acb25fe5ac8f1d2af1b4ea8a4fdfda0f1ee4292af2e2d8eb0e" +checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" dependencies = [ - "bitflags", + "bitflags 2.4.1", "cfg-if 1.0.0", "foreign-types", "libc", @@ -3787,13 +4099,13 @@ dependencies = [ [[package]] name = "openssl-macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] @@ -3804,11 +4116,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.73" +version = "0.9.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5fd19fb3e0a8191c1e34935718976a3e70c112ab9a24af6d7cadccd9d90bc0" +checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" dependencies = [ - "autocfg 1.1.0", "cc", "libc", "pkg-config", @@ -3817,9 +4128,9 @@ dependencies = [ [[package]] name = "os_info" -version = "3.3.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04304d855bb5385d4b595edf0147b8e281871766b75dd4c87b2bdf3c9e5c2d19" +checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" dependencies = [ "log", "winapi 0.3.9", @@ -3827,9 +4138,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.0.1" +version = "6.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d8d0b2f198229de29dca79676f2738ff952edf3fde542eb8bf94d8c21b435" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" [[package]] name = "output_vt100" @@ -3840,6 +4151,18 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + [[package]] name = "parity-multiaddr" version = "0.9.7" @@ -3871,17 +4194,17 @@ dependencies = [ "percent-encoding", "serde", "static_assertions", - "unsigned-varint 0.7.1", + "unsigned-varint 0.7.2", "url", ] [[package]] name = "parity-scale-codec" -version = "3.1.2" +version = "3.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b44461635bbb1a0300f100a841e571e7d919c81c73075ef5d152ffdb521066" +checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb" dependencies = [ - "arrayvec 0.7.2", + "arrayvec 0.7.4", "bitvec", "byte-slice-cast", "impl-trait-for-tuples", @@ -3891,14 +4214,14 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.1.2" +version = "3.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c45ed1f39709f5a89338fab50e59816b2e8815f5bb58276e7ddf9afd495f73f8" +checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -3909,34 +4232,63 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core", + "parking_lot_core 0.8.6", ] [[package]] -name = "parking_lot_core" -version = "0.8.5" +name = "parking_lot" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ - "cfg-if 1.0.0", - "instant", + "lock_api", + "parking_lot_core 0.9.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if 1.0.0", + "instant", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", "winapi 0.3.9", ] +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.4.1", + "smallvec", + "windows-targets 0.48.5", +] + [[package]] name = "password-hash" -version = "0.3.2" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d791538a6dcc1e7cb7fe6f6b58aca40e7f79403c45b2bc274008b5e647af1d8" +checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" dependencies = [ "base64ct", - "rand_core 0.6.3", + "rand_core 0.6.4", "subtle", ] +[[package]] +name = "path-slash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" + [[package]] name = "pbkdf2" version = "0.9.0" @@ -3950,50 +4302,50 @@ dependencies = [ [[package]] name = "pbkdf2" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.3", + "digest 0.10.7", "hmac 0.12.1", "password-hash", - "sha2 0.10.2", + "sha2 0.10.8", ] [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" -version = "0.6.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap", + "indexmap 2.1.0", ] [[package]] name = "pin-project" -version = "1.0.10" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.10" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] @@ -4004,9 +4356,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -4016,9 +4368,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "platforms" @@ -4028,9 +4380,9 @@ checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325" [[package]] name = "plotters" -version = "0.3.1" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" dependencies = [ "num-traits", "plotters-backend", @@ -4041,15 +4393,15 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.2" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" [[package]] name = "plotters-svg" -version = "0.3.1" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" dependencies = [ "plotters-backend", ] @@ -4060,7 +4412,7 @@ version = "0.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", "deflate", "miniz_oxide 0.3.7", @@ -4088,19 +4440,19 @@ checksum = "2326808f3c476da7495ff611ad36b6a2e4e9d1f20a5b5eb4bbd8fb5e47f899be" dependencies = [ "hex", "keynesis", - "lru 0.7.5", + "lru 0.7.8", "thiserror", ] [[package]] name = "poly1305" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ "cpufeatures", "opaque-debug", - "universal-hash", + "universal-hash 0.5.1", ] [[package]] @@ -4112,40 +4464,58 @@ dependencies = [ "cfg-if 1.0.0", "cpufeatures", "opaque-debug", - "universal-hash", + "universal-hash 0.4.1", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "predicates" -version = "2.1.1" +version = "2.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5aab5be6e4732b473071984b3164dbbfb7a3674d30ea5ff44410b6bcd960c3c" +checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ "difflib", "float-cmp", - "itertools 0.10.3", + "itertools 0.10.5", "normalize-line-endings", "predicates-core", "regex", ] +[[package]] +name = "predicates" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" +dependencies = [ + "anstyle", + "difflib", + "itertools 0.11.0", + "predicates-core", +] + [[package]] name = "predicates-core" -version = "1.0.3" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da1c2388b1513e1b605fcec39a95e0a9e8ef088f71443ef37099fa9ae6673fcb" +checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" [[package]] name = "predicates-tree" -version = "1.0.5" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d86de6de25020a36c6d3643a86d9a6a9f552107c0559c60ea03551b5e16c032" +checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" dependencies = [ "predicates-core", "termtree", @@ -4188,12 +4558,21 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.1.3" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ - "thiserror", - "toml", + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit 0.20.7", ] [[package]] @@ -4205,7 +4584,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -4222,20 +4601,20 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.38" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9027b48e9d4c9175fa2218adf3557f91c1137021739951d4932f5f8268ac48aa" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] name = "proptest" version = "1.0.0" -source = "git+https://github.com/input-output-hk/proptest.git#38044d47b2e8eeab62408294aa9e78e393f13d6b" +source = "git+https://github.com/input-output-hk/proptest.git#270ea99959dc4c4e5076047d79a9654f5f0ac74a" dependencies = [ "bit-set", - "bitflags", + "bitflags 1.3.2", "byteorder", "lazy_static", "num-traits", @@ -4244,7 +4623,7 @@ dependencies = [ "rand_chacha 0.3.1", "rand_xorshift 0.3.0", "rand_xoshiro", - "regex-syntax", + "regex-syntax 0.6.29", "rusty-fork", "tempfile", ] @@ -4255,7 +4634,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "prost-derive", ] @@ -4265,9 +4644,9 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "heck", - "itertools 0.10.3", + "itertools 0.10.5", "lazy_static", "log", "multimap", @@ -4286,10 +4665,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" dependencies = [ "anyhow", - "itertools 0.10.3", + "itertools 0.10.5", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4298,10 +4677,30 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "prost", ] +[[package]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "qrcode" version = "0.12.0" @@ -4330,7 +4729,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f" dependencies = [ - "env_logger", + "env_logger 0.7.1", "log", "rand 0.7.3", "rand_core 0.5.1", @@ -4344,14 +4743,14 @@ checksum = "608c156fd8e97febc07dc9c2e2c80bf74cfc6ef26893eae3daf8bc2bc94a4b7f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "quircs" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "088cd18eb88277186050867dbfc7079eba83a753e4bc2b51c0feef6908679f4a" +checksum = "66a4a2aa9fe525f10ce4ee99dbb78dc3faf31bd0667d50729a6c0eb89e17eca5" dependencies = [ "num-derive", "num-traits", @@ -4360,21 +4759,21 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.18" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] [[package]] name = "r2d2" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545c5bc2b880973c9c10e4067418407a0ccaa3091781d1671d46eb35107cb26f" +checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" dependencies = [ "log", - "parking_lot", + "parking_lot 0.12.1", "scheduled-thread-pool", ] @@ -4447,7 +4846,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha 0.3.1", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -4477,7 +4876,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -4506,11 +4905,11 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.6", + "getrandom 0.2.11", ] [[package]] @@ -4590,7 +4989,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" dependencies = [ - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -4599,31 +4998,27 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" dependencies = [ - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] name = "rayon" -version = "1.5.3" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ - "autocfg 1.1.0", - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.3" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -4637,33 +5032,52 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.13" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.6", - "redox_syscall", + "getrandom 0.2.11", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.5.5" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -4672,14 +5086,31 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax", + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", ] [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "registration-service" @@ -4698,8 +5129,8 @@ dependencies = [ "signals-handler", "structopt", "thiserror", - "tokio 1.18.2", - "uuid", + "tokio 1.34.0", + "uuid 0.8.2", "walkdir", "warp", ] @@ -4708,7 +5139,7 @@ dependencies = [ name = "registration-verify-service" version = "0.1.0" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "catalyst-toolbox", "chain-addr", "chain-crypto", @@ -4717,7 +5148,7 @@ dependencies = [ "hex", "iapyx", "jormungandr-integration-tests", - "jormungandr-lib", + "jormungandr-lib 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", "jortestkit", "reqwest 0.10.10", "serde", @@ -4727,8 +5158,8 @@ dependencies = [ "snapshot-trigger-service", "structopt", "thiserror", - "tokio 1.18.2", - "uuid", + "tokio 1.34.0", + "uuid 0.8.2", "walkdir", "warp", ] @@ -4742,13 +5173,22 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "rend" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" +dependencies = [ + "bytecheck", +] + [[package]] name = "reqwest" version = "0.10.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "bytes 0.5.6", "encoding_rs", "futures-core", @@ -4766,7 +5206,7 @@ dependencies = [ "mime_guess", "native-tls", "percent-encoding", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.13", "rustls 0.18.1", "serde", "serde_json", @@ -4784,43 +5224,45 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.10" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a1f7aa4f35e5e8b4160449f51afc758f0ce6454315a9fa7d0d113e958c41eb" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "base64 0.13.0", - "bytes 1.1.0", + "base64 0.21.5", + "bytes 1.5.0", "encoding_rs", "futures-core", "futures-util", - "h2 0.3.13", + "h2 0.3.22", "http", - "http-body 0.4.4", - "hyper 0.14.18", - "hyper-rustls 0.23.0", + "http-body 0.4.5", + "hyper 0.14.27", + "hyper-rustls 0.24.2", "hyper-tls 0.5.0", "ipnet", "js-sys", - "lazy_static", "log", "mime", "native-tls", + "once_cell", "percent-encoding", - "pin-project-lite 0.2.9", - "rustls 0.20.5", - "rustls-pemfile 0.3.0", + "pin-project-lite 0.2.13", + "rustls 0.21.9", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", - "tokio 1.18.2", + "system-configuration", + "tokio 1.34.0", "tokio-native-tls", - "tokio-rustls 0.23.4", + "tokio-rustls 0.24.1", + "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.22.3", - "winreg 0.10.1", + "webpki-roots 0.25.3", + "winreg 0.50.0", ] [[package]] @@ -4832,28 +5274,70 @@ dependencies = [ "cc", "libc", "once_cell", - "spin", - "untrusted", + "spin 0.5.2", + "untrusted 0.7.1", "web-sys", "winapi 0.3.9", ] +[[package]] +name = "ring" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +dependencies = [ + "cc", + "getrandom 0.2.11", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + [[package]] name = "ripemd" -version = "0.1.1" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" +dependencies = [ + "digest 0.10.7", +] + +[[package]] +name = "rkyv" +version = "0.7.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1facec54cb5e0dc08553501fa740091086d0259ad0067e0d4103448e4cb22ed3" +checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" dependencies = [ - "digest 0.10.3", + "bitvec", + "bytecheck", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid 1.6.1", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] name = "rlp" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "999508abb0ae792aabed2460c45b89106d97fe4adac593bdaef433c2605847b5" +checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "rustc-hex", ] @@ -4865,7 +5349,7 @@ checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4888,25 +5372,30 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn", + "syn 1.0.109", ] [[package]] name = "rust_decimal" -version = "1.23.1" +version = "1.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22dc69eadbf0ee2110b8d20418c0c6edbaefec2811c4963dc17b6344e11fe0f8" +checksum = "06676aec5ccb8fc1da723cc8c0f9a46549f21ebb8753d3915c6c41db1e7f1dc4" dependencies = [ - "arrayvec 0.7.2", + "arrayvec 0.7.4", + "borsh", + "bytes 1.5.0", "num-traits", + "rand 0.8.5", + "rkyv", "serde", + "serde_json", ] [[package]] name = "rust_decimal_macros" -version = "1.23.1" +version = "1.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c70be9367d4bc095d10b48d41b819d09ed4dafc528765a144d32ed1d530654" +checksum = "2e43721f4ef7060ebc2c3ede757733209564ca8207f47674181bcd425dd76945" dependencies = [ "quote", "rust_decimal", @@ -4914,9 +5403,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hex" @@ -4924,12 +5413,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" -[[package]] -name = "rustc-serialize" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" - [[package]] name = "rustc_version" version = "0.4.0" @@ -4939,6 +5422,33 @@ dependencies = [ "semver", ] +[[package]] +name = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys 0.4.11", + "windows-sys 0.48.0", +] + [[package]] name = "rustls" version = "0.18.1" @@ -4947,34 +5457,33 @@ checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81" dependencies = [ "base64 0.12.3", "log", - "ring", + "ring 0.16.20", "sct 0.6.1", "webpki 0.21.4", ] [[package]] name = "rustls" -version = "0.19.1" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ - "base64 0.13.0", "log", - "ring", - "sct 0.6.1", - "webpki 0.21.4", + "ring 0.16.20", + "sct 0.7.1", + "webpki 0.22.4", ] [[package]] name = "rustls" -version = "0.20.5" +version = "0.21.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a024a432ae760ab3bff924ad91ce1cfa52cb57ed16e1ef32d0d249cfee1a6c13" +checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" dependencies = [ "log", - "ring", - "sct 0.7.0", - "webpki 0.22.0", + "ring 0.17.5", + "rustls-webpki", + "sct 0.7.1", ] [[package]] @@ -4983,23 +5492,33 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", ] [[package]] name = "rustls-pemfile" -version = "0.3.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.13.0", + "base64 0.21.5", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] name = "rustversion" -version = "1.0.6" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rusty-fork" @@ -5015,15 +5534,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" - -[[package]] -name = "safemem" -version = "0.3.3" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "same-file" @@ -5036,9 +5549,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.1.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8980cafbe98a7ee7a9cc16b32ebce542c77883f512d83fbf2ddc8f6a85ea74c9" +checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60" dependencies = [ "bitvec", "cfg-if 1.0.0", @@ -5049,40 +5562,39 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.1.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4260c630e8a8a33429d1688eff2f163f24c65a4e1b1578ef6b565061336e4b6f" +checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "schannel" -version = "0.1.19" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "lazy_static", - "winapi 0.3.9", + "windows-sys 0.48.0", ] [[package]] name = "scheduled-thread-pool" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6f74fd1204073fa02d5d5d68bec8021be4c38690b61264b2fdb48083d0e7d7" +checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" dependencies = [ - "parking_lot", + "parking_lot 0.12.1", ] [[package]] name = "scoped-tls" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "scoped_threadpool" @@ -5092,9 +5604,9 @@ checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" @@ -5102,25 +5614,31 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring", - "untrusted", + "ring 0.17.5", + "untrusted 0.9.0", ] +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + [[package]] name = "secp256k1" -version = "0.22.1" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26947345339603ae8395f68e2f3d85a6b0a8ddfe6315818e80b8504415099db0" +checksum = "295642060261c80709ac034f52fca8e5a9fa2c7d341ded5cdb164b7c33768b2a" dependencies = [ "rand 0.6.5", "secp256k1-sys", @@ -5137,11 +5655,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.6.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -5150,9 +5668,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.6.1" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -5160,18 +5678,18 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.9" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.137" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] @@ -5188,22 +5706,22 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.137" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] name = "serde_json" -version = "1.0.81" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ - "itoa 1.0.2", + "itoa 1.0.9", "ryu", "serde", ] @@ -5215,18 +5733,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.2", + "itoa 1.0.9", "ryu", "serde", ] [[package]] name = "serde_with" -version = "1.13.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b827f2113224f3f19a665136f006709194bdfdcb1fdc1e4b2b5cbac8e0cced54" +checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" dependencies = [ - "rustversion", "serde", "serde_with_macros", ] @@ -5240,16 +5757,16 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "serde_yaml" -version = "0.8.24" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707d15895415db6628332b737c838b88c598522e4dc70647e59b72312924aebc" +checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" dependencies = [ - "indexmap", + "indexmap 1.9.3", "ryu", "serde", "yaml-rust", @@ -5268,26 +5785,15 @@ dependencies = [ "opaque-debug", ] -[[package]] -name = "sha-1" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.10.3", -] - [[package]] name = "sha1" -version = "0.10.1" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77f4e7f65455545c2153c1253d25056825e77ee2533f0e41deb65a93a34852f" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.3", + "digest 0.10.7", ] [[package]] @@ -5305,13 +5811,13 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.2" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.3", + "digest 0.10.7", ] [[package]] @@ -5328,28 +5834,34 @@ dependencies = [ [[package]] name = "sha3" -version = "0.10.1" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881bf8156c87b6301fc5ca6b27f11eeb2761224c7081e69b409d5a1951a70c86" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ - "digest 0.10.3", + "digest 0.10.7", "keccak", ] [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] +[[package]] +name = "shell-words" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" + [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] @@ -5359,14 +5871,20 @@ name = "signals-handler" version = "0.1.0" dependencies = [ "futures", - "tokio 1.18.2", + "tokio 1.34.0", ] [[package]] name = "signature" -version = "1.5.0" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" + +[[package]] +name = "simdutf8" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f054c6c1a6e95179d6f23ed974060dcefb2d9388bb7256900badad682c499de4" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" [[package]] name = "simplelog" @@ -5381,9 +5899,12 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.6" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg 1.1.0", +] [[package]] name = "sled" @@ -5398,27 +5919,27 @@ dependencies = [ "fxhash", "libc", "log", - "parking_lot", + "parking_lot 0.11.2", ] [[package]] name = "smallvec" -version = "1.8.0" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "snapshot-service" version = "0.1.0" -source = "git+https://github.com/input-output-hk/vit-servicing-station.git?branch=master#b7b52dd510c81297c22aaf14ea72219858602b3a" +source = "git+https://github.com/input-output-hk/vit-servicing-station.git?tag=f10.0.0#68484d80cc738d952a72e773a22b4aa5b9c21259" dependencies = [ - "jormungandr-lib", + "jormungandr-lib 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?branch=catalyst-fund9)", "notify", "serde", "serde_json", "sled", "thiserror", - "tokio 1.18.2", + "tokio 1.34.0", "tracing", "voting-hir", "warp", @@ -5432,7 +5953,7 @@ dependencies = [ "chain-addr", "chrono", "futures", - "jormungandr-lib", + "jormungandr-lib 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", "jortestkit", "reqwest 0.10.10", "serde", @@ -5441,8 +5962,8 @@ dependencies = [ "signals-handler", "structopt", "thiserror", - "tokio 1.18.2", - "uuid", + "tokio 1.34.0", + "uuid 0.8.2", "walkdir", "warp", ] @@ -5460,18 +5981,28 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.4" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi 0.3.9", ] +[[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "sparse-array" version = "0.1.0" -source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#6e033ed9cce4857a94817c25e99a4b67a601fef1" +source = "git+https://github.com/input-output-hk/chain-libs.git?branch=catalyst-fund9#1b01f0dbf9282102f394727b4f8637fe4ce1728e" [[package]] name = "spin" @@ -5479,6 +6010,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + [[package]] name = "sscanf" version = "0.1.4" @@ -5499,8 +6036,8 @@ checksum = "d697834866afffd34330ee55f6dbb2cf1eedd44b33cc63b8fdfd87bc3268eeac" dependencies = [ "proc-macro2", "quote", - "regex-syntax", - "syn", + "regex-syntax 0.6.29", + "syn 1.0.109", ] [[package]] @@ -5510,30 +6047,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] -name = "stderrlog" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a53e2eff3e94a019afa6265e8ee04cb05b9d33fe9f5078b14e4e391d155a38" -dependencies = [ - "atty", - "chrono", - "log", - "termcolor", - "thread_local", -] - -[[package]] -name = "stopwatch" -version = "0.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d04b5ebc78da44d3a456319d8bc2783e7d8cc7ccbb5cb4dc3f54afbd93bf728" -dependencies = [ - "num 0.1.42", -] - -[[package]] -name = "strsim" -version = "0.8.0" +name = "strsim" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" @@ -5545,25 +6060,25 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "structmeta" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bd9c2155aa89fb2c2cb87d99a610c689e7c47099b3e9f1c8a8f53faf4e3d2e3" +checksum = "104842d6278bf64aa9d2f182ba4bde31e8aec7a131d29b7f444bb9b344a09e2a" dependencies = [ "proc-macro2", "quote", "structmeta-derive", - "syn", + "syn 1.0.109", ] [[package]] name = "structmeta-derive" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bafede0d0a2f21910f36d47b1558caae3076ed80f6f3ad0fc85a91e6ba7e5938" +checksum = "24420be405b590e2d746d83b01f09af673270cf80e9b003a5fa7b651c58c7d93" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -5587,7 +6102,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -5614,7 +6129,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -5627,7 +6142,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn", + "syn 1.0.109", ] [[package]] @@ -5645,9 +6160,9 @@ checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" [[package]] name = "symmetric-cipher" version = "0.5.0" -source = "git+https://github.com/input-output-hk/chain-wallet-libs.git?branch=master#cd1d4e0a61836c50e193ee140ec74579115de056" +source = "git+https://github.com/input-output-hk/chain-wallet-libs.git?branch=catalyst-fund9#cc383a409996cb470f94c3b7e4a587474c953c5f" dependencies = [ - "cryptoxide 0.4.2", + "cryptoxide 0.4.4", "rand 0.8.5", "thiserror", "zeroize", @@ -5655,13 +6170,36 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.94" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a07e33e919ebcd69113d5be0e4d70c5707004ff45188910106854f38b960df4a" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.39", ] [[package]] @@ -5672,7 +6210,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "unicode-xid", ] @@ -5693,9 +6231,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.23.12" +version = "0.23.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56b1e20ee77901236c389ff74618a899ff5fd34719a7ff0fd1d64f0acca5179a" +checksum = "3977ec2e0520829be45c8a2df70db2bf364714d8a748316a10c3c35d4d2b01c9" dependencies = [ "cfg-if 1.0.0", "core-foundation-sys", @@ -5706,6 +6244,27 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tap" version = "1.0.1" @@ -5714,9 +6273,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.38" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", "libc", @@ -5735,16 +6294,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.3.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if 1.0.0", "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi 0.3.9", + "redox_syscall 0.4.1", + "rustix 0.38.25", + "windows-sys 0.48.0", ] [[package]] @@ -5758,19 +6316,19 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.1.17" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" +checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" dependencies = [ - "libc", - "winapi 0.3.9", + "rustix 0.37.27", + "windows-sys 0.48.0", ] [[package]] name = "termtree" -version = "0.2.4" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "test-strategy" @@ -5781,7 +6339,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta", - "syn", + "syn 1.0.109", ] [[package]] @@ -5795,37 +6353,37 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" dependencies = [ "terminal_size", ] [[package]] name = "thiserror" -version = "1.0.31" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.31" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] name = "thor" version = "0.1.0" -source = "git+https://github.com/input-output-hk/jormungandr.git?branch=master#26000281078521c7a40985f331040a628393fcc4" +source = "git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0#47e874c5792bccd2eb073ef65ea89ac5d0525c04" dependencies = [ "assert_fs", "bech32 0.8.1", @@ -5841,25 +6399,26 @@ dependencies = [ "hex", "jcli", "jormungandr-automation", - "jormungandr-lib", + "jormungandr-lib 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", "jortestkit", "rand 0.8.5", "rand_chacha 0.3.1", - "rand_core 0.6.3", + "rand_core 0.6.4", "serde", "serde_yaml", "structopt", "thiserror", - "time 0.3.9", + "time", ] [[package]] name = "thread_local" -version = "1.0.1" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ - "lazy_static", + "cfg-if 1.0.0", + "once_cell", ] [[package]] @@ -5875,33 +6434,34 @@ dependencies = [ [[package]] name = "time" -version = "0.1.44" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi 0.3.9", -] - -[[package]] -name = "time" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" -dependencies = [ - "itoa 1.0.2", + "deranged", + "itoa 1.0.9", "libc", "num_threads", + "powerfmt", "serde", + "time-core", "time-macros", ] +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + [[package]] name = "time-macros" -version = "0.2.4" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +dependencies = [ + "time-core", +] [[package]] name = "tiny-keccak" @@ -5933,9 +6493,9 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" @@ -5957,21 +6517,20 @@ dependencies = [ [[package]] name = "tokio" -version = "1.18.2" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4903bf0427cf68dddd5aa6a93220756f8be0c34fcfa9f5e6191e103e15a31395" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" dependencies = [ - "bytes 1.1.0", + "backtrace", + "bytes 1.5.0", "libc", - "memchr", - "mio 0.8.3", + "mio 0.8.9", "num_cpus", - "once_cell", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.13", "signal-hook-registry", - "socket2 0.4.4", + "socket2 0.5.5", "tokio-macros", - "winapi 0.3.9", + "windows-sys 0.48.0", ] [[package]] @@ -5980,29 +6539,29 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" dependencies = [ - "pin-project-lite 0.2.9", - "tokio 1.18.2", + "pin-project-lite 0.2.13", + "tokio 1.34.0", ] [[package]] name = "tokio-macros" -version = "1.7.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] name = "tokio-native-tls" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", - "tokio 1.18.2", + "tokio 1.34.0", ] [[package]] @@ -6019,35 +6578,34 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.22.0" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.19.1", - "tokio 1.18.2", - "webpki 0.21.4", + "rustls 0.20.9", + "tokio 1.34.0", + "webpki 0.22.4", ] [[package]] name = "tokio-rustls" -version = "0.23.4" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.20.5", - "tokio 1.18.2", - "webpki 0.22.0", + "rustls 0.21.9", + "tokio 1.34.0", ] [[package]] name = "tokio-stream" -version = "0.1.8" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", - "pin-project-lite 0.2.9", - "tokio 1.18.2", + "pin-project-lite 0.2.13", + "tokio 1.34.0", ] [[package]] @@ -6062,14 +6620,13 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.15.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "511de3f85caf1c98983545490c3d09685fa8eb634e57eec22bb4db271f46cbd8" +checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", - "pin-project", - "tokio 1.18.2", + "tokio 1.34.0", "tungstenite", ] @@ -6093,37 +6650,65 @@ version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "futures-core", "futures-sink", "log", - "pin-project-lite 0.2.9", - "tokio 1.18.2", + "pin-project-lite 0.2.13", + "tokio 1.34.0", ] [[package]] name = "tokio-util" -version = "0.7.2" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f988a1a1adc2fb21f9c12aa96441da33a1728193ae0b95d2be22dbd17fcb4e5c" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "futures-core", "futures-sink", - "pin-project-lite 0.2.9", - "tokio 1.18.2", + "pin-project-lite 0.2.13", + "tokio 1.34.0", "tracing", ] [[package]] name = "toml" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.1.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.1.0", + "toml_datetime", + "winnow", +] + [[package]] name = "tonic" version = "0.6.2" @@ -6132,20 +6717,20 @@ checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a" dependencies = [ "async-stream", "async-trait", - "base64 0.13.0", - "bytes 1.1.0", + "base64 0.13.1", + "bytes 1.5.0", "futures-core", "futures-util", - "h2 0.3.13", + "h2 0.3.22", "http", - "http-body 0.4.4", - "hyper 0.14.18", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-timeout", "percent-encoding", "pin-project", "prost", "prost-derive", - "tokio 1.18.2", + "tokio 1.34.0", "tokio-stream", "tokio-util 0.6.10", "tower", @@ -6164,24 +6749,24 @@ dependencies = [ "proc-macro2", "prost-build", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "tower" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a89fd63ad6adf737582df5db40d286574513c69a11dac5214dc3b5603d6713e" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", - "indexmap", + "indexmap 1.9.3", "pin-project", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.13", "rand 0.8.5", "slab", - "tokio 1.18.2", - "tokio-util 0.7.2", + "tokio 1.34.0", + "tokio-util 0.7.10", "tower-layer", "tower-service", "tracing", @@ -6189,25 +6774,24 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" [[package]] name = "tower-service" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.34" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if 1.0.0", "log", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.13", "tracing-attributes", "tracing-core", ] @@ -6225,25 +6809,35 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.21" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] name = "tracing-core" -version = "0.1.26" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ - "lazy_static", + "once_cell", "valuable", ] +[[package]] +name = "tracing-error" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +dependencies = [ + "tracing", + "tracing-subscriber 0.3.18", +] + [[package]] name = "tracing-futures" version = "0.2.5" @@ -6256,12 +6850,23 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" dependencies = [ - "lazy_static", "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", "tracing-core", ] @@ -6293,24 +6898,24 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log", + "tracing-log 0.1.4", "tracing-serde", ] [[package]] name = "tracing-subscriber" -version = "0.3.6" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77be66445c4eeebb934a7340f227bfe7b338173d3f8c00a60a5a58005c9faecf" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ - "ansi_term 0.12.1", + "nu-ansi-term", "serde", "serde_json", "sharded-slab", "smallvec", "thread_local", "tracing-core", - "tracing-log", + "tracing-log 0.2.0", "tracing-serde", ] @@ -6326,54 +6931,45 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "tungstenite" -version = "0.14.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0b2d8558abd2e276b0a8df5c05a2ec762609344191e5fd23e292c910e9165b5" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ - "base64 0.13.0", "byteorder", - "bytes 1.1.0", + "bytes 1.5.0", + "data-encoding", "http", "httparse", "log", "rand 0.8.5", - "sha-1 0.9.8", + "sha1", "thiserror", "url", "utf-8", ] -[[package]] -name = "twoway" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1" -dependencies = [ - "memchr", -] - [[package]] name = "typed-bytes" version = "0.1.0" -source = "git+https://github.com/input-output-hk/chain-libs.git?branch=master#6e033ed9cce4857a94817c25e99a4b67a601fef1" +source = "git+https://github.com/input-output-hk/chain-libs.git?branch=catalyst-fund9#1b01f0dbf9282102f394727b4f8637fe4ce1728e" [[package]] name = "typenum" -version = "1.15.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "uint" -version = "0.9.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f03af7ccf01dd611cc450a0d10dbc9b745770d096473e2faf0ca6e2d66d1e0" +checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52" dependencies = [ "byteorder", "crunchy", @@ -6383,45 +6979,51 @@ dependencies = [ [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-ident" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.19" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.9.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.9" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "universal-hash" @@ -6433,6 +7035,16 @@ dependencies = [ "subtle", ] +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + [[package]] name = "unreachable" version = "1.0.0" @@ -6450,9 +7062,9 @@ checksum = "f7fdeedbf205afadfe39ae559b75c3240f24e257d0ca27e85f85cb82aa19ac35" [[package]] name = "unsigned-varint" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836" +checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105" [[package]] name = "untrusted" @@ -6460,15 +7072,29 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "url" -version = "2.2.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", - "matches", + "percent-encoding", +] + +[[package]] +name = "url-escape" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44e0ce4d1246d075ca5abec4b41d33e87a6054d08e2366b63205665e950db218" +dependencies = [ "percent-encoding", ] @@ -6484,10 +7110,16 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.6", + "getrandom 0.2.11", "serde", ] +[[package]] +name = "uuid" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" + [[package]] name = "valgrind" version = "0.1.0" @@ -6501,9 +7133,9 @@ dependencies = [ "chain-vote", "hex", "hyper 0.13.10", - "itertools 0.10.3", + "itertools 0.10.5", "jormungandr-automation", - "jormungandr-lib", + "jormungandr-lib 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", "jortestkit", "regex", "reqwest 0.10.10", @@ -6511,7 +7143,7 @@ dependencies = [ "serde_json", "structopt", "thiserror", - "tokio 1.18.2", + "tokio 1.34.0", "url", "vit-servicing-station-lib", "vit-servicing-station-tests", @@ -6547,17 +7179,17 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "versionisator" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a11bb14ba286855b3313b543a6abc357656a005957582958bf7031854cd0a352" +checksum = "19409971e0a30a77927dd4bf8979b9e9efabd00ea3a8a6f162b277213942b6c8" dependencies = [ "platforms", ] [[package]] name = "vit-servicing-station-lib" -version = "0.3.4-dev" -source = "git+https://github.com/input-output-hk/vit-servicing-station.git?branch=master#b7b52dd510c81297c22aaf14ea72219858602b3a" +version = "0.5.0" +source = "git+https://github.com/input-output-hk/vit-servicing-station.git?tag=f10.0.0#68484d80cc738d952a72e773a22b4aa5b9c21259" dependencies = [ "async-trait", "base64 0.12.3", @@ -6577,21 +7209,21 @@ dependencies = [ "strum 0.21.0", "strum_macros 0.21.1", "thiserror", - "time 0.3.9", - "tokio 1.18.2", + "time", + "tokio 1.34.0", "tracing", "tracing-futures", - "tracing-subscriber 0.3.6", + "tracing-subscriber 0.3.18", "voting-hir", "warp", ] [[package]] name = "vit-servicing-station-tests" -version = "0.3.4-dev" -source = "git+https://github.com/input-output-hk/vit-servicing-station.git?branch=master#b7b52dd510c81297c22aaf14ea72219858602b3a" +version = "0.5.0" +source = "git+https://github.com/input-output-hk/vit-servicing-station.git?tag=f10.0.0#68484d80cc738d952a72e773a22b4aa5b9c21259" dependencies = [ - "assert_cmd 2.0.4", + "assert_cmd 2.0.12", "assert_fs", "base64 0.12.3", "cfg-if 0.1.10", @@ -6602,25 +7234,25 @@ dependencies = [ "diesel_migrations", "dyn-clone", "fake", - "hyper 0.14.18", - "itertools 0.10.3", + "hyper 0.14.27", + "itertools 0.10.5", "jortestkit", "lazy_static", "libsqlite3-sys", - "predicates", + "predicates 2.1.5", "pretty_assertions", "quickcheck", "quickcheck_macros", "rand 0.7.3", "rand_core 0.5.1", - "reqwest 0.11.10", + "reqwest 0.11.22", "serde", "serde_json", "structopt", "tempfile", "thiserror", - "time 0.3.9", - "tokio 1.18.2", + "time", + "tokio 1.34.0", "url", "vit-servicing-station-lib", "voting-hir", @@ -6644,7 +7276,7 @@ dependencies = [ "csv", "ctrlc", "custom_debug", - "dialoguer 0.10.1", + "dialoguer 0.10.4", "diffy", "fake", "function_name", @@ -6652,25 +7284,28 @@ dependencies = [ "glob", "hersir", "hex", - "hyper 0.14.18", + "hyper 0.14.27", "image", "indicatif", - "itertools 0.10.3", + "itertools 0.10.5", "jormungandr-automation", - "jormungandr-lib", + "jormungandr-lib 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", "jortestkit", "json", "lazy_static", + "netstat2", + "path-slash", "poldercast 0.14.0-dev", "proptest", "quickcheck", "quickcheck_macros", "rand 0.8.5", "rand_chacha 0.3.1", - "rand_core 0.6.3", + "rand_core 0.6.4", + "rayon", "regex", "reqwest 0.10.10", - "rustls 0.20.5", + "rustls 0.20.9", "rustls-pemfile 0.2.1", "serde", "serde_json", @@ -6681,14 +7316,14 @@ dependencies = [ "tempdir", "thiserror", "thor", - "time 0.3.9", - "tokio 1.18.2", + "time", + "tokio 1.34.0", "tokio-rustls 0.23.4", "tokio-stream", "tracing", "tracing-appender", "tracing-subscriber 0.2.25", - "uuid", + "uuid 0.8.2", "valgrind", "vit-servicing-station-lib", "vit-servicing-station-tests", @@ -6708,9 +7343,9 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "voting-hir" version = "0.1.0" -source = "git+https://github.com/input-output-hk/catalyst-toolbox.git?branch=main#eaf0c3b0409ae237d0dcffd5e82ddadd52f344a1" +source = "git+https://github.com/input-output-hk/catalyst-toolbox.git?branch=catalyst-fund9#386a0936a0328e3f84b515030d881d06250ff446" dependencies = [ - "jormungandr-lib", + "jormungandr-lib 0.15.0 (git+https://github.com/input-output-hk/jormungandr.git?tag=v0.15.0)", "serde", ] @@ -6725,19 +7360,18 @@ dependencies = [ [[package]] name = "walkdir" -version = "2.3.2" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", - "winapi 0.3.9", "winapi-util", ] [[package]] name = "wallet" version = "0.6.0-pre.1" -source = "git+https://github.com/input-output-hk/chain-wallet-libs.git?branch=master#cd1d4e0a61836c50e193ee140ec74579115de056" +source = "git+https://github.com/input-output-hk/chain-wallet-libs.git?branch=catalyst-fund9#cc383a409996cb470f94c3b7e4a587474c953c5f" dependencies = [ "bip39", "cardano-legacy-address", @@ -6747,7 +7381,7 @@ dependencies = [ "chain-impl-mockchain", "chain-path-derivation", "chain-time", - "cryptoxide 0.4.2", + "cryptoxide 0.4.4", "ed25519-bip32 0.4.1", "hashlink", "hdkeygen", @@ -6761,7 +7395,7 @@ dependencies = [ [[package]] name = "wallet-core" version = "0.7.0-pre4" -source = "git+https://github.com/input-output-hk/chain-wallet-libs.git?branch=master#cd1d4e0a61836c50e193ee140ec74579115de056" +source = "git+https://github.com/input-output-hk/chain-wallet-libs.git?branch=catalyst-fund9#cc383a409996cb470f94c3b7e4a587474c953c5f" dependencies = [ "bech32 0.7.3", "bip39", @@ -6782,41 +7416,41 @@ dependencies = [ [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] [[package]] name = "warp" -version = "0.3.2" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cef4e1e9114a4b7f1ac799f16ce71c14de5778500c5450ec6b7b920c55b587e" +checksum = "c1e92e22e03ff1230c03a1a8ee37d2f89cd489e2e541b7550d6afad96faed169" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "futures-channel", "futures-util", "headers", "http", - "hyper 0.14.18", + "hyper 0.14.27", "log", "mime", "mime_guess", - "multipart", + "multer", "percent-encoding", "pin-project", + "rustls-pemfile 1.0.4", "scoped-tls", "serde", "serde_json", "serde_urlencoded", - "tokio 1.18.2", - "tokio-rustls 0.22.0", + "tokio 1.34.0", + "tokio-rustls 0.24.1", "tokio-stream", "tokio-tungstenite", - "tokio-util 0.6.10", + "tokio-util 0.7.10", "tower-service", "tracing", ] @@ -6827,9 +7461,9 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddb4e2b0778508ed42fb55ec8ea09d49053f41f377c53fe6c022ae40f55846d5" dependencies = [ - "hyper 0.14.18", + "hyper 0.14.27", "lazy_static", - "reqwest 0.11.10", + "reqwest 0.11.22", "thiserror", "unicase", "warp", @@ -6841,12 +7475,6 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -6855,9 +7483,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.80" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ "cfg-if 1.0.0", "serde", @@ -6867,24 +7495,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.80" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", - "lazy_static", "log", + "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.30" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -6894,9 +7522,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.80" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6904,28 +7532,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.80" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.80" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "web-sys" -version = "0.3.57" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" dependencies = [ "js-sys", "wasm-bindgen", @@ -6937,18 +7565,18 @@ version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] name = "webpki" -version = "0.22.0" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring", - "untrusted", + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] @@ -6962,28 +7590,26 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.22.3" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf" -dependencies = [ - "webpki 0.22.0", -] +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" [[package]] name = "weezl" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c97e489d8f836838d497091de568cf16b117486d529ec5579233521065bd5e4" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[package]] name = "which" -version = "4.2.5" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "lazy_static", - "libc", + "home", + "once_cell", + "rustix 0.38.25", ] [[package]] @@ -7016,9 +7642,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi 0.3.9", ] @@ -7029,48 +7655,155 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + [[package]] name = "windows-sys" -version = "0.36.1" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + [[package]] name = "windows_aarch64_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.36.1" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.36.1" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "winnow" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +dependencies = [ + "memchr", +] [[package]] name = "winreg" @@ -7083,11 +7816,12 @@ dependencies = [ [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi 0.3.9", + "cfg-if 1.0.0", + "windows-sys 0.48.0", ] [[package]] @@ -7102,18 +7836,18 @@ dependencies = [ [[package]] name = "wyz" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ "tap", ] [[package]] name = "xattr" -version = "0.2.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" dependencies = [ "libc", ] @@ -7129,32 +7863,31 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.5.5" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94693807d016b2f2d2e14420eb3bfcca689311ff775dcf113d74ea624b7cdf07" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn", - "synstructure", + "syn 2.0.39", ] [[package]] name = "zip" -version = "0.6.2" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf225bcf73bb52cbb496e70475c7bd7a3f769df699c0020f6c7bd9a96dcf0b8d" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ - "aes", + "aes 0.8.3", "byteorder", "bzip2", "constant_time_eq", @@ -7162,9 +7895,9 @@ dependencies = [ "crossbeam-utils", "flate2", "hmac 0.12.1", - "pbkdf2 0.10.1", + "pbkdf2 0.11.0", "sha1", - "time 0.3.9", + "time", "zstd", ] @@ -7176,7 +7909,7 @@ checksum = "f0457aa320de98fa42cc4803accc3ae11353e1fecae5aa32446baafd9ccf6e46" dependencies = [ "lazycell", "log", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.13", "rand 0.8.5", "zipkin-types", ] @@ -7192,18 +7925,18 @@ dependencies = [ [[package]] name = "zstd" -version = "0.10.2+zstd.1.5.2" +version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4a6bd64f22b5e3e94b4e238669ff9f10815c27a5180108b849d24174a83847" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "4.1.6+zstd.1.5.2" +version = "5.0.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b61c51bb270702d6167b8ce67340d2754b088d0c091b06e593aa772c3ee9bb" +checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" dependencies = [ "libc", "zstd-sys", @@ -7211,10 +7944,10 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.6.3+zstd.1.5.2" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", - "libc", + "pkg-config", ] diff --git a/Earthfile b/Earthfile new file mode 100644 index 00000000..95e54100 --- /dev/null +++ b/Earthfile @@ -0,0 +1,75 @@ +# Set the Earthly version to 0.7 +VERSION 0.7 +FROM debian:stable-slim + +rust-toolchain: + FROM rust:1.71-slim-bullseye + RUN rustup component add rustfmt + +# Installs Cargo chef +install-chef: + FROM +rust-toolchain + RUN cargo install --debug cargo-chef + +# Prepares the local cache +prepare-cache: + FROM +install-chef + COPY --dir vitup iapyx valgrind integration-tests registration-service registration-verify-service snapshot-trigger-service signals-handler . + COPY Cargo.lock Cargo.toml . + RUN cargo chef prepare + SAVE ARTIFACT recipe.json + SAVE IMAGE --cache-hint + +# Builds the local cache +build-cache: + FROM +install-chef + COPY +prepare-cache/recipe.json ./ + + # Install build dependencies + RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + build-essential \ + libssl-dev \ + libpq-dev \ + libsqlite3-dev \ + pkg-config \ + protobuf-compiler + + RUN cargo chef cook --release + SAVE ARTIFACT target + SAVE ARTIFACT $CARGO_HOME cargo_home + SAVE IMAGE --cache-hint + +# This is the default builder that all other builders should inherit from +builder: + FROM +rust-toolchain + + WORKDIR /src + + # Install build dependencies + RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + build-essential \ + libssl-dev \ + libpq-dev \ + libsqlite3-dev \ + pkg-config \ + protobuf-compiler + COPY --dir vitup iapyx valgrind integration-tests registration-service registration-verify-service snapshot-trigger-service signals-handler . + COPY --dir Cargo.lock Cargo.toml . + COPY +build-cache/cargo_home $CARGO_HOME + COPY +build-cache/target target + SAVE ARTIFACT /src + +build: + FROM +builder + + COPY --dir vitup iapyx valgrind integration-tests registration-service registration-verify-service snapshot-trigger-service signals-handler . + COPY Cargo.toml Cargo.lock ./ + + RUN cargo build --locked --release -p iapyx -p valgrind -p vitup + + SAVE ARTIFACT /src/target/release/iapyx iapyx + SAVE ARTIFACT /src/target/release/iapyx-load iapyx-load + SAVE ARTIFACT /src/target/release/valgrind valgrind + SAVE ARTIFACT /src/target/release/vitup vitup diff --git a/doc/api/vitup/mock-farm/postman_collection.json b/doc/api/vitup/mock-farm/postman_collection.json new file mode 100644 index 00000000..eeab3521 --- /dev/null +++ b/doc/api/vitup/mock-farm/postman_collection.json @@ -0,0 +1,110 @@ +{ + "info": { + "_postman_id": "a54a9a24-ef93-48b5-a447-09a5d61d5075", + "name": "Mock Farm", + "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json", + "_exporter_id": "11181958" + }, + "item": [ + { + "name": "List all active environments", + "request": { + "method": "GET", + "header": [], + "url": { + "raw": "https://127.0.0.1:7070/api/v0/active", + "protocol": "https", + "host": [ + "127", + "0", + "0", + "1" + ], + "port": "7070", + "path": [ + "api", + "v0", + "active" + ] + } + }, + "response": [] + }, + { + "name": "Start new environment with name 'marek' and port = 10010", + "request": { + "method": "POST", + "header": [], + "url": { + "raw": "https://127.0.0.1:7070/api/v0/start/darek", + "protocol": "https", + "host": [ + "127", + "0", + "0", + "1" + ], + "port": "7070", + "path": [ + "api", + "v0", + "start", + "darek" + ] + } + }, + "response": [] + }, + { + "name": "Shutdown existing environment with name 'marek'", + "request": { + "method": "POST", + "header": [], + "url": { + "raw": "https://127.0.0.1:7070/api/v0/start/marek/10010", + "protocol": "https", + "host": [ + "127", + "0", + "0", + "1" + ], + "port": "7070", + "path": [ + "api", + "v0", + "start", + "marek", + "10010" + ] + } + }, + "response": [] + }, + { + "name": "Shutdown existing environment with name 'marek'", + "request": { + "method": "POST", + "header": [], + "url": { + "raw": "https://127.0.0.1:7070/api/v0/shutdown/marek", + "protocol": "https", + "host": [ + "127", + "0", + "0", + "1" + ], + "port": "7070", + "path": [ + "api", + "v0", + "shutdown", + "marek" + ] + } + }, + "response": [] + } + ] +} \ No newline at end of file diff --git a/doc/api/vitup/mock-farm/v0.yaml b/doc/api/vitup/mock-farm/v0.yaml new file mode 100644 index 00000000..07348e5d --- /dev/null +++ b/doc/api/vitup/mock-farm/v0.yaml @@ -0,0 +1,113 @@ +openapi: 3.0.2 + +info: + title: Mock farm REST API + description: Mock Farm Rest API v0 + version: 0.0.1 + contact: + url: 'https://github.com/input-output-hk/vit-testing/' + +servers: + - url: 'https://localhost' + +tags: + - name: active + - name: start + - name: shutdown + +paths: + '/api/v0/active': + get: + description: Lists active mock environments + operationId: Active + tags: + - active + responses: + '200': + description: Success + content: + application/json: + schema: + description: assigned port number + type: string + format: text + '400': + description: Mock env with given ID or port already exists + + '/api/v0/start/{env_name}': + post: + description: Starts new mock env with random free port + operationId: StartEnvRandomPort + tags: + - start + parameters: + - name: env_name + in: path + required: true + schema: + description: Environment name + type: string + pattern: '[0-9a-f]+' + responses: + '200': + description: Success + content: + application/json: + schema: + description: assigned port number + type: string + format: text + '400': + description: Mock env with given ID or port already exists + + '/api/v0/start/{env_name}/{port}': + post: + description: Starts new mock env with random free port + operationId: StartEnv + tags: + - start + parameters: + - name: env_name + in: path + required: true + schema: + description: Environment name + type: string + pattern: '[0-9a-f]+' + responses: + '200': + description: Success + content: + application/json: + schema: + description: assigned port number + type: string + format: text + '400': + description: Mock env with given ID or port already exists + + '/api/v0/shutdown/{env_name}': + post: + description: Shutdown new mock env with random free port + operationId: ShutdownEnv + tags: + - shutdown + parameters: + - name: env_name + in: path + required: true + schema: + description: Environment name + type: string + pattern: '[0-9a-f]+' + responses: + '200': + description: Success + content: + application/json: + schema: + description: assigned port number + type: string + format: text + '404': + description: Mock env with given ID was not found diff --git a/doc/vitup/mock_farm.md b/doc/vitup/mock_farm.md new file mode 100644 index 00000000..f0647978 --- /dev/null +++ b/doc/vitup/mock_farm.md @@ -0,0 +1,27 @@ + +## Mock Farm + +Mock farm is a simple extension for mock service. It allows to run more that one mock at once and give more control to user in term of starting and stopping particular mock instance. + +### Configuration + +This section describe configuration file which can be passed as argument for snapshot service: + +- `port`: port on which registration-service will be exposed, +- `working_directory`: path to folder which config files will be dumped, +- `mocks-port-range`: range of ports assigned for usage, +- `protocol`: decide whether mock farm should be exposed as http or https, +- `local`: should service be exposed on all network interfaces or only 127.0.0.1, +- `token`: token limiting access to environment. Must be provided in header `API-Token` for each request + +Note: it is recommended to run command from `vit-testing/vitup` folder (then no explicit paths are required to be provided). +Configuration file example is available under `vit-testing/vitup/example/mock-farm/config.yaml` + +### Start + +`vitup start mock-farm --config example\mock\mock-farm\config.yaml` + +### Documentation + +- [OpenApi](../api/vitup/mock-farm/v0.yaml) +- [Requests collection](../api/vitup/mock-farm/postman_collection.json) \ No newline at end of file diff --git a/flake.lock b/flake.lock index c30717dc..5bf6d8ad 100644 --- a/flake.lock +++ b/flake.lock @@ -226,20 +226,21 @@ "voting-tools_", "cardano-db-sync", "haskellNix", - "nixpkgs-2111" + "nixpkgs-unstable" ], "utils": "utils_3" }, "locked": { - "lastModified": 1645941037, - "narHash": "sha256-UpPS8L2/95IlWSJBeJAaJmRZHvoJ7FlDVPgIiuwkPCQ=", + "lastModified": 1644195760, + "narHash": "sha256-SXDF/IJZOoCow3qGaUrJSzu96BqI9nQDgj18gVR7hMk=", "owner": "input-output-hk", "repo": "cardano-db-sync", - "rev": "14228a5188dfc0c18b914e7d54b74ff30ec8c586", + "rev": "935e1fe5d5d11d694e9b6c54030a592b85742671", "type": "github" }, "original": { "owner": "input-output-hk", + "ref": "refs/tags/12.0.2", "repo": "cardano-db-sync", "type": "github" } @@ -1982,17 +1983,17 @@ "utils": "utils_5" }, "locked": { - "lastModified": 1646292887, - "narHash": "sha256-p3I7KjIMoGqOGy5s8s9GDWWW3JOnFd40NsqPQJAmLB8=", + "lastModified": 1654672783, + "narHash": "sha256-QfOK1QDUPpX5JflEG2ccRph9zInr5f8C4mo39L4DWNY=", "owner": "input-output-hk", "repo": "voting-tools", - "rev": "e0fc39e0d0920f5a8bdff5b5bbf31e41a1e2b896", + "rev": "6f0e9160531cfd6b84a61293c5ef546c9a49d2b3", "type": "github" }, "original": { "owner": "input-output-hk", "repo": "voting-tools", - "rev": "e0fc39e0d0920f5a8bdff5b5bbf31e41a1e2b896", + "rev": "6f0e9160531cfd6b84a61293c5ef546c9a49d2b3", "type": "github" } } diff --git a/flake.nix b/flake.nix index 15161594..142b9c16 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,7 @@ inputs.rust-overlay.inputs.nixpkgs.follows = "nixpkgs"; inputs.naersk.url = "github:nix-community/naersk"; inputs.naersk.inputs.nixpkgs.follows = "nixpkgs"; - inputs.voting-tools_.url = "github:input-output-hk/voting-tools?rev=98a46754f822689b136ea8ae9049af535309bf87"; + inputs.voting-tools_.url = "github:input-output-hk/voting-tools?rev=6f0e9160531cfd6b84a61293c5ef546c9a49d2b3"; inputs.vit-kedqr.url = "github:input-output-hk/vit-kedqr"; inputs.vit-servicing-station.url = "github:input-output-hk/vit-servicing-station/master"; inputs.jormungandr_.url = "github:input-output-hk/jormungandr/master"; diff --git a/iapyx/Cargo.toml b/iapyx/Cargo.toml index 5609d17e..973c70a4 100644 --- a/iapyx/Cargo.toml +++ b/iapyx/Cargo.toml @@ -8,16 +8,16 @@ edition = "2021" [dependencies] bech32 = "0.8" -wallet-core = { git = "https://github.com/input-output-hk/chain-wallet-libs.git", branch = "master"} -wallet = { git = "https://github.com/input-output-hk/chain-wallet-libs.git", branch = "master"} -hdkeygen = { git = "https://github.com/input-output-hk/chain-wallet-libs.git", branch = "master"} -chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" } -chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" } -chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" } -chain-ser = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" } -chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" } -chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" } -chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" } +wallet-core = { git = "https://github.com/input-output-hk/chain-wallet-libs.git", branch = "catalyst-fund9"} +wallet = { git = "https://github.com/input-output-hk/chain-wallet-libs.git", branch = "catalyst-fund9"} +hdkeygen = { git = "https://github.com/input-output-hk/chain-wallet-libs.git", branch = "catalyst-fund9"} +chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" } +chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" } +chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" } +chain-ser = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" } +chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" } +chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" } +chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" } hex = "0.4" rand = "0.8" dirs = "4.0" @@ -25,13 +25,13 @@ rand_core = "0.6" itertools = "0.10.3" cryptoxide = "0.4.2" ed25519-bip32 = "^0.3.1" -jcli = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "master" } -jormungandr-lib = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "master" } -jormungandr-automation = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "master" } -thor = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "master" } -hersir = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "master" } +jcli = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" } +jormungandr-lib = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" } +jormungandr-automation = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" } +thor = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" } +hersir = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" } jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch = "master" } -catalyst-toolbox = { git = "https://github.com/input-output-hk/catalyst-toolbox.git", branch = "main", features=["test-api"]} +catalyst-toolbox = { git = "https://github.com/input-output-hk/catalyst-toolbox.git", branch = "catalyst-fund9", features=["test-api"]} valgrind = { path = "../valgrind"} hyper = "0.13.6" thiserror = "1.0" @@ -52,7 +52,7 @@ image = "0.23.12" eccoxide = { git = "https://github.com/eugene-babichenko/eccoxide.git", branch = "fast-u64-scalar-mul", features = ["fast-u64-scalar-mul"], optional = true } rayon = "1" bincode = "1.3.3" -cocoon = { git = "https://github.com/dkijania/cocoon.git" } +cocoon = { git = "https://github.com/dkijania/cocoon.git"} [dependencies.reqwest] version = "0.10.6" diff --git a/iapyx/src/load/multi_controller.rs b/iapyx/src/load/multi_controller.rs index 83c082a7..4d8a9995 100644 --- a/iapyx/src/load/multi_controller.rs +++ b/iapyx/src/load/multi_controller.rs @@ -211,4 +211,6 @@ pub enum MultiControllerError { PinRead(#[from] PinReadError), #[error("wallet time error")] WalletTime(#[from] wallet::time::Error), + #[error("no more proposals")] + NoMoreProposals, } diff --git a/iapyx/src/load/request_generators/jormungandr/post/single.rs b/iapyx/src/load/request_generators/jormungandr/post/single.rs index 48e666d1..3b826e92 100644 --- a/iapyx/src/load/request_generators/jormungandr/post/single.rs +++ b/iapyx/src/load/request_generators/jormungandr/post/single.rs @@ -81,10 +81,11 @@ impl WalletRequestGen { let counter = self.vote_cast_counter.advance_single(index).unwrap(); - let proposal = self - .proposals - .get(counter.first().unwrap().first() as usize) - .unwrap(); + let proposal_idx = counter + .first() + .ok_or(MultiControllerError::NoMoreProposals)? + .first(); + let proposal = self.proposals.get(proposal_idx as usize).unwrap(); let choice = Choice::new(*self.options.choose(&mut self.rand).unwrap()); self.multi_controller.vote( index, diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml index 95ee0226..54820fd3 100644 --- a/integration-tests/Cargo.toml +++ b/integration-tests/Cargo.toml @@ -7,27 +7,27 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -jormungandr-lib = { git ="https://github.com/input-output-hk/jormungandr.git", branch = "master" } -jormungandr-automation = { git ="https://github.com/input-output-hk/jormungandr.git", branch = "master" } -thor = { git ="https://github.com/input-output-hk/jormungandr.git", branch = "master" } -hersir = { git ="https://github.com/input-output-hk/jormungandr.git", branch = "master" } -jcli = { git ="https://github.com/input-output-hk/jormungandr.git", branch = "master" } -vit-servicing-station-tests = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "master" } -vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "master" } +jormungandr-lib = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" } +jormungandr-automation = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" } +thor = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" } +hersir = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" } +jcli = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" } +vit-servicing-station-tests = { git = "https://github.com/input-output-hk/vit-servicing-station.git", tag = "f10.0.0" } +vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", tag = "f10.0.0" } jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch="master" } -chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" } -chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" } -chain-ser = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" } -chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" } -vitup = { path = "../vitup"} -iapyx = { path = "../iapyx"} -valgrind = { path = "../valgrind"} +chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" } +chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" } +chain-ser = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" } +chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" } +vitup = { path = "../vitup"} +iapyx = { path = "../iapyx"} +valgrind = { path = "../valgrind"} snapshot-trigger-service = { path = "../snapshot-trigger-service" } registration-service = { path = "../registration-service" } rand_chacha = "0.2" tokio = { version = "1.1", features = ["macros","rt","rt-multi-thread"] } -chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = [ "property-test-api" ] } -catalyst-toolbox = { git = "https://github.com/input-output-hk/catalyst-toolbox.git", branch = "main", features=["test-api"]} +chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9", features = [ "property-test-api" ] } +catalyst-toolbox = { git = "https://github.com/input-output-hk/catalyst-toolbox.git", branch = "catalyst-fund9", features=["test-api"]} thiserror = "1.0" rand = "0.8" libmath = "0.2.1" diff --git a/integration-tests/src/common/mainnet.rs b/integration-tests/src/common/mainnet.rs index 5d606815..c98be55f 100644 --- a/integration-tests/src/common/mainnet.rs +++ b/integration-tests/src/common/mainnet.rs @@ -1,4 +1,4 @@ -use catalyst_toolbox::snapshot::registration::{Delegations, VotingRegistration}; +use catalyst_toolbox::snapshot::CatalystRegistration; use chain_addr::Discrimination; use jormungandr_lib::crypto::account::SigningKey; use vitup::config::Block0Initial; @@ -39,13 +39,12 @@ impl MainnetWallet { self.inner.secret_key() } - pub fn as_voting_registration(&self) -> VotingRegistration { - VotingRegistration { + pub fn as_voting_registration(&self) -> CatalystRegistration { + CatalystRegistration { stake_public_key: self.stake_public_key(), voting_power: self.stake.into(), - reward_address: self.reward_address(), - delegations: Delegations::Legacy(self.inner.identifier().into()), - voting_purpose: 0, + rewards_address: self.reward_address(), + delegations: self.inner.identifier().into(), } } diff --git a/integration-tests/src/common/vote_plan_status.rs b/integration-tests/src/common/vote_plan_status.rs index 1017e247..8057328e 100644 --- a/integration-tests/src/common/vote_plan_status.rs +++ b/integration-tests/src/common/vote_plan_status.rs @@ -32,7 +32,7 @@ impl VotePlanStatusProvider for Block0Configuration { for vote in votes { for vote_plan in active_vote_plan.iter_mut() { - if let Some(mut proposal) = vote_plan + if let Some(proposal) = vote_plan .proposals .iter_mut() .find(|p| p.proposal_id == vote.proposal_id) diff --git a/output.text b/output.text new file mode 100644 index 00000000..e69de29b diff --git a/registration-service/Cargo.toml b/registration-service/Cargo.toml index 27626031..ace4151a 100644 --- a/registration-service/Cargo.toml +++ b/registration-service/Cargo.toml @@ -12,8 +12,8 @@ chrono = { version = "0.4", features = ["serde"] } walkdir = "2.3.1" structopt = "0.3" jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch= "master" } -jormungandr-integration-tests = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "master" } -jormungandr-automation = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "master" } +jormungandr-integration-tests = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" } +jormungandr-automation = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" } futures = "0.3.8" serde = { version = "1", features = ["derive"] } diff --git a/registration-verify-service/Cargo.toml b/registration-verify-service/Cargo.toml index fe2332f3..a89deb51 100644 --- a/registration-verify-service/Cargo.toml +++ b/registration-verify-service/Cargo.toml @@ -11,17 +11,17 @@ chrono = { version = "0.4", features = ["serde"] } walkdir = "2.3.1" structopt = "0.3" jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch= "master" } -jormungandr-integration-tests = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "master" } -jormungandr-lib = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "master" } -catalyst-toolbox = { git = "https://github.com/input-output-hk/catalyst-toolbox.git", branch = "main", features=["test-api"]} +jormungandr-integration-tests = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" } +jormungandr-lib = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" } +catalyst-toolbox = { git = "https://github.com/input-output-hk/catalyst-toolbox.git", branch = "catalyst-fund9", features=["test-api"]} futures = "0.3.8" snapshot-trigger-service = { path = "../snapshot-trigger-service" } serde = { version = "1", features = ["derive"] } warp = "0.3.1" hex = "0.4" -iapyx = { path = "../iapyx"} -chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" } -chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" } +iapyx = { path = "../iapyx"} +chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" } +chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" } thiserror = "1.0" bytes = "1.0" tokio = { version = "1.2", features = ["macros","rt","process"] } diff --git a/snapshot-trigger-service/Cargo.toml b/snapshot-trigger-service/Cargo.toml index 60085dc8..4eb42d80 100644 --- a/snapshot-trigger-service/Cargo.toml +++ b/snapshot-trigger-service/Cargo.toml @@ -12,8 +12,8 @@ chrono = { version = "0.4", features = ["serde"] } walkdir = "2.3.1" structopt = "0.3" jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch= "master" } -jormungandr-lib = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "master" } -chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" } +jormungandr-lib = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" } +chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" } futures = "0.3.8" assert_fs = "1.0" serde = { version = "1", features = ["derive"] } diff --git a/snapshot-trigger-service/src/config/mod.rs b/snapshot-trigger-service/src/config/mod.rs index 963cc0fb..70605e6e 100644 --- a/snapshot-trigger-service/src/config/mod.rs +++ b/snapshot-trigger-service/src/config/mod.rs @@ -38,6 +38,8 @@ impl Configuration { .arg(&self.voting_tools.db) .arg("--db-user") .arg(&self.voting_tools.db_user) + .arg("--db-pass") + .arg(&self.voting_tools.db_pass) .arg("--db-host") .arg(&self.voting_tools.db_host) .arg("--out-file") @@ -49,7 +51,12 @@ impl Configuration { command.arg("--slot-no").arg(slot_no.to_string()); } - println!("Running command: {:?} ", command); + let log_command = format!("{:?}", command); + println!( + "Running command: {} ", + log_command.replace(&self.voting_tools.db_pass, "***") + ); + command.spawn().map_err(Into::into) } @@ -78,6 +85,9 @@ pub struct VotingToolsParams { #[serde(rename = "db-user")] /// db user pub db_user: String, + #[serde(rename = "db-pass")] + /// db pass + pub db_pass: String, /// db host #[serde(rename = "db-host")] pub db_host: String, diff --git a/valgrind/Cargo.toml b/valgrind/Cargo.toml index 6f2c2780..9198a44f 100644 --- a/valgrind/Cargo.toml +++ b/valgrind/Cargo.toml @@ -6,10 +6,10 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -jormungandr-lib = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "master" } -jormungandr-automation = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "master" } -wallet = { git = "https://github.com/input-output-hk/chain-wallet-libs.git", branch = "master" } -wallet-core = { git = "https://github.com/input-output-hk/chain-wallet-libs.git", branch = "master" } +jormungandr-lib = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" } +jormungandr-automation = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" } +wallet = { git = "https://github.com/input-output-hk/chain-wallet-libs.git", branch = "catalyst-fund9" } +wallet-core = { git = "https://github.com/input-output-hk/chain-wallet-libs.git", branch = "catalyst-fund9" } hex = "0.4" itertools = "0.10.3" thiserror = "1.0" @@ -22,19 +22,18 @@ serde_json = "1.0" warp-reverse-proxy = "0.3.2" structopt = "0.3" jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch = "master" } -vit-servicing-station-tests = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "master" } -vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "master" } -chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" } -chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = [ "property-test-api" ] } -chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = [ "property-test-api" ] } -chain-ser = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" } -chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" } -chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" } -chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" } +vit-servicing-station-tests = { git = "https://github.com/input-output-hk/vit-servicing-station.git", tag = "f10.0.0" } +vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", tag = "f10.0.0" } +chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" } +chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9", features = [ "property-test-api" ] } +chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9", features = [ "property-test-api" ] } +chain-ser = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" } +chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" } +chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" } +chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" } url = "2.2.2" [dependencies.reqwest] version = "0.10.10" default-features = false features = ["blocking", "rustls-tls", "json"] - diff --git a/valgrind/src/bin/valgrind.rs b/valgrind/src/bin/valgrind.rs index e6f8c727..4ba2ab9c 100644 --- a/valgrind/src/bin/valgrind.rs +++ b/valgrind/src/bin/valgrind.rs @@ -62,6 +62,11 @@ async fn main() { server_stub.http_node_address(), )); + let stats = warp::path!("node" / "stats").and(reverse_proxy_filter( + "".to_string(), + server_stub.http_node_address(), + )); + let vote = warp::path!("vote" / "active" / ..).and(reverse_proxy_filter( "".to_string(), server_stub.http_node_address(), @@ -69,7 +74,7 @@ async fn main() { let block0_content = server_stub.block0(); - let block0 = warp::path!("block0").map(move || Ok(block0_content.clone())); + let block0 = warp::path!("block0").map(move || block0_content.clone()); root.and( proposals @@ -82,6 +87,7 @@ async fn main() { .or(reviews) .or(settings) .or(explorer) + .or(stats) .or(vote) .or(block0), ) diff --git a/vitup/.gitignore b/vitup/.gitignore index 3a957656..b833fe05 100644 --- a/vitup/.gitignore +++ b/vitup/.gitignore @@ -9,3 +9,4 @@ /prod/ /validate/ /vole.trace +/mock_farm/ \ No newline at end of file diff --git a/vitup/Cargo.toml b/vitup/Cargo.toml index 024e4c22..e37928f9 100644 --- a/vitup/Cargo.toml +++ b/vitup/Cargo.toml @@ -15,26 +15,28 @@ ctrlc = "3.2.1" walkdir = "2.3.1" csv = "1.1" itertools = "0.10.3" -chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" } -chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = [ "property-test-api" ] } -chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = [ "property-test-api" ] } -chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = [ "property-test-api" ] } -chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" } -chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" } +chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" } +chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9", features = [ "property-test-api" ] } +chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9", features = [ "property-test-api" ] } +chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9", features = [ "property-test-api" ] } +chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" } +chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" } proptest = { git = "https://github.com/input-output-hk/proptest.git" } -jormungandr-lib = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "master" } -jormungandr-automation = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "master" } -thor = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "master" } -hersir = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "master" } +jormungandr-lib = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" } +jormungandr-automation = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" } +thor = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" } +hersir = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" } jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch = "master" } -vit-servicing-station-tests = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "master" } -vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "master" } -catalyst-toolbox = { git = "https://github.com/input-output-hk/catalyst-toolbox.git", branch = "main"} -voting-hir = { git = "https://github.com/input-output-hk/catalyst-toolbox.git", branch = "main", features = ["serde"] } +vit-servicing-station-tests = { git = "https://github.com/input-output-hk/vit-servicing-station.git", tag = "f10.0.0" } +vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", tag = "f10.0.0" } +catalyst-toolbox = { git = "https://github.com/input-output-hk/catalyst-toolbox.git", branch = "catalyst-fund9"} +voting-hir = { git = "https://github.com/input-output-hk/catalyst-toolbox.git", branch = "catalyst-fund9", features = ["serde"] } valgrind = { path = "../valgrind" } poldercast = { git = "https://github.com/primetype/poldercast.git", rev = "8305f1560392a9d26673ca996e7646c8834533ef" } rand = "0.8" -time = { version = "0.3.7", features=["serde","serde-well-known","parsing"]} +path-slash = "0.2.0" +netstat2 = "0.9" +time = { version = "0.3.7", features=["serde","serde-well-known","parsing"]} fake = { version = "2.2", features=['chrono','http']} strum = "0.21.0" strum_macros = "0.23.1" @@ -70,6 +72,7 @@ rustls = "0.20.4" rustls-pemfile = "0.2.1" tokio-rustls = "0.23.2" tokio-stream = { version = "0.1.8", features = ["net"] } +rayon = "1" [dev-dependencies] quickcheck = "0.9" diff --git a/vitup/docker/demo/Dockerfile b/vitup/docker/demo/Dockerfile index b148abc1..0487e65a 100644 --- a/vitup/docker/demo/Dockerfile +++ b/vitup/docker/demo/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:18.04 LABEL MAINTAINER IOHK -LABEL description="Jormungandr Voting backend" +LABEL description="Catalyst Voting backend" ARG PREFIX=/app ENV ENV_PREFIX=${PREFIX} @@ -21,17 +21,17 @@ RUN apt-get install -y build-essential pkg-config libssl-dev && \ RUN cd ${ENV_PREFIX} && \ git clone https://github.com/input-output-hk/jormungandr && \ cd jormungandr && \ - git checkout master + git checkout catalyst-fund9 RUN cd ${ENV_PREFIX} && \ git clone https://github.com/input-output-hk/vit-servicing-station && \ cd vit-servicing-station && \ - git checkout master + git checkout catalyst-fund9 RUN cd ${ENV_PREFIX} && \ git clone https://github.com/input-output-hk/vit-testing && \ cd vit-testing && \ - git checkout mulitple_funds + git checkout catalyst-fund9 # install the vit-servicing-station-server from source RUN cd ${ENV_PREFIX}/vit-servicing-station && \ diff --git a/vitup/docker/mock/Dockerfile b/vitup/docker/mock/Dockerfile index df720e05..099f1587 100644 --- a/vitup/docker/mock/Dockerfile +++ b/vitup/docker/mock/Dockerfile @@ -1,8 +1,8 @@ -# Simple dockerfile example to build a catalyst voting backend +# Simple dockerfile example to build a catalyst backend mock FROM ubuntu:18.04 LABEL MAINTAINER IOHK -LABEL description="Catalyst Disruption backend" +LABEL description="Catalyst backend mock" ARG PREFIX=/app ENV ENV_PREFIX=${PREFIX} @@ -21,7 +21,7 @@ RUN apt-get install -y build-essential pkg-config libssl-dev && \ RUN cd ${ENV_PREFIX} && \ git clone https://github.com/input-output-hk/vit-testing && \ cd vit-testing && \ - git checkout mulitple_funds + git checkout catalyst-fund9 RUN cd ${ENV_PREFIX}/vit-testing/vitup && \ ~/.cargo/bin/cargo install --locked --path . diff --git a/vitup/example/mock-farm/config.yaml b/vitup/example/mock-farm/config.yaml new file mode 100644 index 00000000..877fa1c8 --- /dev/null +++ b/vitup/example/mock-farm/config.yaml @@ -0,0 +1,13 @@ +{ + "port": 7070, + "working_directory": "./mock_farm", + "mocks-port-range": { + "start": 8080, + "end": 9090 + }, + "protocol": { + "key_path": "./resources/tls/server.key", + "cert_path": "./resources/tls/server.crt" + }, + "local": true +} \ No newline at end of file diff --git a/vitup/resources/example/challenges.json b/vitup/resources/example/challenges.json index dbbd21c2..cee92f21 100644 --- a/vitup/resources/example/challenges.json +++ b/vitup/resources/example/challenges.json @@ -5,6 +5,7 @@ "description": "What Challenges should the community prioritize to address in Fund6?", "fund_id": "4", "id": "1", + "internal_id": 1, "proposers_rewards": "0", "rewards_total": "400000", "title": "Fund6 Challenge Setting" @@ -15,6 +16,7 @@ "description": "How can application developers drive adoption of Cardano in 2021?", "fund_id": "4", "id": "2", + "internal_id": 2, "proposers_rewards": "200000", "rewards_total": "200000", "title": "Dapps & Integrations" @@ -25,6 +27,7 @@ "description": "How can we create a positive developer experience that helps the developer focus on building successful apps?", "fund_id": "4", "id": "3", + "internal_id": 3, "proposers_rewards": "400000", "rewards_total": "400000", "title": "Developer Ecosystem" @@ -35,6 +38,7 @@ "description": "How can we help the Catalyst community to get better at distributed decision making within the next two Catalyst rounds?", "fund_id": "4", "id": "4", + "internal_id": 4, "proposers_rewards": "50000", "rewards_total": "50000", "title": "Distributed Decision Making" @@ -45,6 +49,7 @@ "description": "How can we encourage entrepreneurs from outside the Cardano ecosystem to submit proposals to Catalyst in the next two funds?", "fund_id": "4", "id": "5", + "internal_id": 5, "proposers_rewards": "50000", "rewards_total": "50000", "title": "Proposer Outreach" @@ -55,6 +60,7 @@ "description": "How can we encourage more meaningful participation in Project Catalyst from community members in the next two funds?", "fund_id": "4", "id": "6", + "internal_id": 6, "proposers_rewards": "50000", "rewards_total": "50000", "title": "Catalyst Value Onboarding" @@ -65,6 +71,7 @@ "description": "How can we mobilize the community to solve local problems using Cardano, through a Local Community Center model supported by the CF?", "fund_id": "4", "id": "7", + "internal_id": 7, "proposers_rewards": "50000", "rewards_total": "50000", "title": "Local Community Centers" diff --git a/vitup/resources/vit_station/up.sql b/vitup/resources/vit_station/up.sql index 56a7ff34..c2170a28 100644 --- a/vitup/resources/vit_station/up.sql +++ b/vitup/resources/vit_station/up.sql @@ -84,8 +84,9 @@ create table api_tokens create table challenges ( - id INTEGER NOT NULL + internal_id INTEGER NOT NULL primary key autoincrement, + id INTEGER NOT NULL UNIQUE, challenge_type VARCHAR NOT NULL, title VARCHAR NOT NULL, description VARCHAR NOT NULL, @@ -141,7 +142,7 @@ FROM INNER JOIN challenges on challenges.id = proposals.challenge_id LEFT JOIN proposal_simple_challenge on proposals.proposal_id = proposal_simple_challenge.proposal_id - and challenges.challenge_type = 'simple' + and (challenges.challenge_type = 'simple' or challenges.challenge_type = 'native') LEFT JOIN proposal_community_choice_challenge on proposals.proposal_id = proposal_community_choice_challenge.proposal_id and challenges.challenge_type = 'community-choice' diff --git a/vitup/src/builders/helpers/qr.rs b/vitup/src/builders/helpers/qr.rs index 7cc56bd6..9a881904 100644 --- a/vitup/src/builders/helpers/qr.rs +++ b/vitup/src/builders/helpers/qr.rs @@ -4,6 +4,7 @@ use chain_crypto::SecretKey; use chain_impl_mockchain::key::EitherEd25519SecretKey; use hersir::builder::WalletTemplate; use image::ImageError; +use rayon::prelude::*; use std::collections::HashMap; use std::fs::File; use std::io::Write; @@ -28,25 +29,31 @@ pub fn generate_qr_and_hashes>( let total = wallets.len(); let folder = folder.as_ref(); - for (idx, (alias, wallet)) in wallets.iter().enumerate() { - let pin = initials - .iter() - .find_map(|(template, pin)| { - if template.alias() == *alias { - Some(pin) - } else { - None - } - }) - .unwrap(); - let png = folder.join(format!("{}_{}.png", alias, pin)); - println!("[{}/{}] Qr dumped to {:?}", idx + 1, total, png); - wallet.save_qr_code(png, &pin_to_bytes(pin)); + wallets + .par_iter() + .enumerate() + .for_each(|(idx, (alias, wallet))| { + let initials = initials.clone(); + let folder = folder.to_owned(); - let hash = folder.join(format!("{}_{}.txt", alias, pin)); - println!("[{}/{}] QR hash dumped to {:?}", idx + 1, total, hash); - wallet.save_qr_code_hash(hash, &pin_to_bytes(pin)); - } + let pin = initials + .iter() + .find_map(|(template, pin)| { + if template.alias() == *alias { + Some(pin) + } else { + None + } + }) + .unwrap(); + let png = folder.join(format!("{}_{}.png", alias, pin)); + println!("[{}/{}] Qr dumped to {:?}", idx + 1, total, png); + wallet.save_qr_code(png, &pin_to_bytes(pin)); + + let hash = folder.join(format!("{}_{}", alias, pin)); + println!("[{}/{}] QR hash dumped to {:?}", idx + 1, total, hash); + wallet.save_qr_code_hash(hash, &pin_to_bytes(pin)); + }); let zero_funds_initial_counts = parameters.initials.block0.zero_funds_count(); diff --git a/vitup/src/cli/mod.rs b/vitup/src/cli/mod.rs index 7b64c7b3..6bde9c4d 100644 --- a/vitup/src/cli/mod.rs +++ b/vitup/src/cli/mod.rs @@ -8,7 +8,7 @@ pub mod validate; use self::time::TimeCommand; use crate::cli::generate::{CommitteeIdCommandArgs, QrCommandArgs, SnapshotCommandArgs}; use crate::cli::start::AdvancedStartCommandArgs; -use crate::cli::start::MockStartCommandArgs; +use crate::cli::start::{MockFarmCommand, MockStartCommandArgs}; use crate::Result; use diff::DiffCommand; use generate::DataCommandArgs; @@ -53,8 +53,10 @@ pub enum StartCommand { Quick(QuickStartCommandArgs), /// start advanced backend from scratch Advanced(AdvancedStartCommandArgs), - // start mock env + /// start mock env Mock(MockStartCommandArgs), + /// start multiple mock environments + MockFarm(MockFarmCommand), } impl StartCommand { @@ -63,6 +65,9 @@ impl StartCommand { Self::Quick(quick_start_command) => quick_start_command.exec(), Self::Advanced(advanced_start_command) => advanced_start_command.exec(), Self::Mock(mock_start_command) => mock_start_command.exec().map_err(Into::into), + Self::MockFarm(mock_farm_start_command) => { + mock_farm_start_command.exec().map_err(Into::into) + } } } } diff --git a/vitup/src/cli/start/mock.rs b/vitup/src/cli/start/mock.rs index 74902f62..aae2fa1e 100644 --- a/vitup/src/cli/start/mock.rs +++ b/vitup/src/cli/start/mock.rs @@ -1,4 +1,4 @@ -use crate::mode::mock::{read_config, start_rest_server, Configuration, Context}; +use crate::mode::mock::{farm, read_config, start_rest_server, Configuration, Context}; use std::sync::Mutex; use std::{path::PathBuf, sync::Arc}; use structopt::StructOpt; @@ -38,6 +38,31 @@ impl MockStartCommandArgs { } } +#[derive(StructOpt, Debug)] +#[structopt(setting = structopt::clap::AppSettings::ColoredHelp)] +pub struct MockFarmCommand { + /// path to config file + #[structopt(long = "config", short = "c")] + pub config: PathBuf, +} + +impl MockFarmCommand { + #[tokio::main] + pub async fn exec(self) -> Result<(), Error> { + let control_context = Arc::new(Mutex::new(farm::Context::new( + farm::read_config(&self.config).unwrap(), + ))); + tokio::spawn(async move { + farm::start_rest_server(control_context.clone()) + .await + .unwrap() + }) + .await + .map(|_| ()) + .map_err(Into::into) + } +} + #[derive(Debug, Error)] #[allow(clippy::large_enum_variant)] pub enum Error { @@ -52,5 +77,7 @@ pub enum Error { #[error(transparent)] Mock(#[from] crate::mode::mock::ContextError), #[error(transparent)] - ServerError(crate::mode::mock::RestError), + Farm(#[from] crate::mode::mock::farm::ContextError), + #[error(transparent)] + ServerError(#[from] crate::mode::mock::RestError), } diff --git a/vitup/src/cli/start/mod.rs b/vitup/src/cli/start/mod.rs index dc111b82..c158ad9f 100644 --- a/vitup/src/cli/start/mod.rs +++ b/vitup/src/cli/start/mod.rs @@ -3,5 +3,5 @@ mod mock; mod quick; pub use advanced::AdvancedStartCommandArgs; -pub use mock::{Error as MockError, MockStartCommandArgs}; +pub use mock::{Error as MockError, MockFarmCommand, MockStartCommandArgs}; pub use quick::QuickStartCommandArgs; diff --git a/vitup/src/config/certs.rs b/vitup/src/config/certs.rs index 996068fa..2c1bd3a4 100644 --- a/vitup/src/config/certs.rs +++ b/vitup/src/config/certs.rs @@ -23,9 +23,9 @@ impl Default for CertificatesBuilder { impl CertificatesBuilder { pub fn build>(self, working_dir: P) -> Result { - let working_dir = working_dir.as_ref().to_path_buf(); - - std::fs::create_dir_all(working_dir.join("tls"))?; + let mut working_dir = working_dir.as_ref().to_path_buf(); + working_dir = working_dir.join("tls"); + std::fs::create_dir_all(&working_dir)?; let key_path = working_dir.join(SERVER_KEY); let mut key_file = diff --git a/vitup/src/mode/interactive/mod.rs b/vitup/src/mode/interactive/mod.rs index 35164572..3c55a6dd 100644 --- a/vitup/src/mode/interactive/mod.rs +++ b/vitup/src/mode/interactive/mod.rs @@ -35,7 +35,7 @@ impl VitInteractiveCommandExec { } } -impl<'a> InteractiveCommandExec for VitInteractiveCommandExec { +impl InteractiveCommandExec for VitInteractiveCommandExec { fn parse_and_exec( &mut self, tokens: Vec, diff --git a/vitup/src/mode/mock/config.rs b/vitup/src/mode/mock/config.rs index c2e309ac..0dea6fa0 100644 --- a/vitup/src/mode/mock/config.rs +++ b/vitup/src/mode/mock/config.rs @@ -21,6 +21,13 @@ pub fn read_config>(config: P) -> Result { serde_json::from_str(&contents).map_err(Into::into) } +pub fn write_config>(configuration: &Configuration, path: P) -> Result<(), Error> { + let content = serde_json::to_string_pretty(&configuration)?; + use std::io::Write; + let mut file = std::fs::File::create(&path)?; + file.write_all(content.as_bytes()).map_err(Into::into) +} + #[derive(Debug, Error)] pub enum Error { #[error("cannot parse configuration")] diff --git a/vitup/src/mode/mock/farm/config/mod.rs b/vitup/src/mode/mock/farm/config/mod.rs new file mode 100644 index 00000000..7d3ac4cb --- /dev/null +++ b/vitup/src/mode/mock/farm/config/mod.rs @@ -0,0 +1,37 @@ +use crate::Result; +use assert_fs::TempDir; +use serde::{Deserialize, Serialize}; +use std::path::Path; +use std::path::PathBuf; +use valgrind::Protocol; + +#[derive(Clone, Debug, Deserialize, Serialize)] +pub struct Config { + pub port: u16, + pub token: Option, + pub working_directory: PathBuf, + pub protocol: Protocol, + pub local: bool, +} + +impl Default for Config { + fn default() -> Self { + Self { + port: 7070, + token: None, + working_directory: TempDir::new().unwrap().into_persistent().to_path_buf(), + protocol: Default::default(), + local: true, + } + } +} + +pub fn read_config>(config: P) -> Result { + let config = config.as_ref(); + if !config.exists() { + return Err(crate::error::Error::CannotFindConfig(config.to_path_buf())); + } + + let contents = std::fs::read_to_string(&config)?; + serde_json::from_str(&contents).map_err(Into::into) +} diff --git a/vitup/src/mode/mock/farm/context.rs b/vitup/src/mode/mock/farm/context.rs new file mode 100644 index 00000000..b4200fe2 --- /dev/null +++ b/vitup/src/mode/mock/farm/context.rs @@ -0,0 +1,125 @@ +pub type ContextLock = Arc>; +use super::config::Config; +use super::MockBootstrap; +use super::MockController; +use crate::mode::mock::Logger; +use std::collections::HashMap; +use std::net::SocketAddr; +use std::path::PathBuf; +use std::sync::Arc; +use std::sync::Mutex; +use thiserror::Error; +use valgrind::Protocol; + +pub type MockId = String; +pub type MockState = HashMap; + +pub struct Context { + config: Config, + state: MockState, + address: SocketAddr, + logger: Logger, +} + +impl Context { + pub fn new(config: Config) -> Self { + Self { + address: if config.local { + ([127, 0, 0, 1], config.port).into() + } else { + ([0, 0, 0, 0], config.port).into() + }, + state: HashMap::new(), + config, + logger: Logger::new(), + } + } + + pub fn log>(&mut self, message: S) { + self.logger.log(message) + } + + pub fn logs(&self) -> Vec { + self.logger.logs() + } + + pub fn clear_logs(&mut self) { + self.logger.clear() + } + + pub fn protocol(&self) -> Protocol { + self.config.protocol.clone() + } + + pub fn address(&self) -> SocketAddr { + self.address + } + + pub fn working_dir(&self) -> PathBuf { + self.config.working_directory.clone() + } + + pub fn state_mut(&mut self) -> &mut MockState { + &mut self.state + } + + pub fn api_token(&self) -> Option { + self.config.token.clone() + } + + #[allow(dead_code)] + pub fn set_api_token(&mut self, api_token: String) { + self.config.token = Some(api_token); + } + + pub fn get_active_mocks(&self) -> HashMap { + self.state + .iter() + .map(|(id, controller)| (id.clone(), controller.port())) + .collect() + } + + pub fn shutdown_mock(&mut self, id: MockId) -> Result { + let mut controller = self.state.remove(&id).ok_or(Error::CannotFindMock(id))?; + let port = controller.port(); + controller.shutdown(); + Ok(port) + } + + pub fn start_mock_on_random_port(&mut self, id: MockId) -> Result { + if self.state.contains_key(&id) { + return Err(Error::EnvironmentAlreadyExist(id)); + } + + let mock_controller = MockBootstrap::new(id.clone()) + .https() + .working_directory(self.config.working_directory.clone()) + .spawn()?; + let port = mock_controller.port(); + self.state.insert(id, mock_controller); + Ok(port) + } + + pub fn start_mock(&mut self, id: MockId, port: u16) -> Result { + let mock_controller = MockBootstrap::new(id.clone()) + .port(port) + .https() + .working_directory(self.config.working_directory.clone()) + .spawn()?; + let port = mock_controller.port(); + self.state.insert(id, mock_controller); + Ok(port) + } +} + +#[derive(Error, Debug)] +pub enum Error { + #[error(transparent)] + Io(#[from] std::io::Error), + #[error(transparent)] + Controller(#[from] super::ControllerError), + #[error("cannot find mock env with id: {0}")] + CannotFindMock(MockId), + #[error("mock env with name: '{0}' already exist, please choose another name")] + EnvironmentAlreadyExist(MockId), +} diff --git a/vitup/src/mode/mock/farm/controller.rs b/vitup/src/mode/mock/farm/controller.rs new file mode 100644 index 00000000..72269039 --- /dev/null +++ b/vitup/src/mode/mock/farm/controller.rs @@ -0,0 +1,161 @@ +use crate::client::rest::VitupDisruptionRestClient; +use crate::client::rest::VitupRest; +use crate::config::CertificatesBuilder; +use crate::mode::mock::config::write_config; +use crate::mode::mock::farm::context::MockId; +use crate::mode::mock::Configuration; +use lazy_static::lazy_static; +use netstat2::{get_sockets_info, AddressFamilyFlags, ProtocolFlags}; +use reqwest::Url; +use serde::Serialize; +use std::path::Path; +use std::path::PathBuf; +use std::process::Child; +use std::process::Command; +use std::{ + collections::HashSet, + sync::atomic::{AtomicU16, Ordering}, +}; +use thiserror::Error; + +lazy_static! { + static ref NEXT_AVAILABLE_PORT_NUMBER: AtomicU16 = AtomicU16::new(10000); + static ref OCCUPIED_PORTS: HashSet = { + let af_flags = AddressFamilyFlags::IPV4; + let proto_flags = ProtocolFlags::TCP | ProtocolFlags::UDP; + get_sockets_info(af_flags, proto_flags) + .unwrap() + .into_iter() + .map(|s| s.local_port()) + .collect::>() + }; +} + +fn get_available_port() -> u16 { + loop { + let candidate_port = NEXT_AVAILABLE_PORT_NUMBER.fetch_add(1, Ordering::SeqCst); + if !(*OCCUPIED_PORTS).contains(&candidate_port) { + return candidate_port; + } + } +} + +pub struct MockBootstrap { + mock_id: MockId, + configuration: Configuration, + working_directory: PathBuf, + https: bool, +} + +impl MockBootstrap { + pub fn new(mock_id: MockId) -> Self { + Self { + mock_id, + configuration: Configuration { + port: get_available_port(), + token: None, + ideascale: false, + working_dir: PathBuf::new(), + protocol: valgrind::Protocol::Http, + local: false, + }, + https: true, + working_directory: PathBuf::new(), + } + } + + pub fn port(mut self, port: u16) -> Self { + self.configuration.port = port; + self + } + + pub fn working_directory>(mut self, working_directory: P) -> Self { + self.working_directory = working_directory.as_ref().to_path_buf(); + self + } + + pub fn https(mut self) -> Self { + self.https = true; + self + } + + pub fn spawn(mut self) -> Result { + if self.https { + let certs = CertificatesBuilder::default().build(&self.working_directory)?; + self.configuration.protocol = certs.into(); + } + + self.configuration.working_dir = self.working_directory.join(&self.mock_id).join("data"); + let mut config_path = self.working_directory.join(&self.mock_id); + std::fs::create_dir_all(&config_path)?; + config_path = config_path.join("config.yaml"); + write_config(&self.configuration, &config_path)?; + + let mut command = Command::new("vitup"); + command + .arg("start") + .arg("mock") + .arg("--config") + .arg(config_path); + + Ok(MockController { + mock_id: self.mock_id, + configuration: self.configuration, + process: command.spawn()?, + }) + } +} + +#[derive(Debug, Serialize)] +pub struct MockController { + mock_id: MockId, + configuration: Configuration, + #[serde(skip_serializing)] + process: Child, +} + +impl MockController { + pub fn port(&self) -> u16 { + self.configuration.port + } + + pub fn is_up(&self) -> bool { + let rest_client = { + if let Some(token) = &self.configuration.token { + VitupRest::new_with_token(token.clone(), self.address()) + } else { + VitupRest::new(self.address()) + } + }; + VitupDisruptionRestClient::from(rest_client).is_up() + } + + pub fn address(&self) -> String { + let mut url = Url::parse("http://127.0.0.1").unwrap(); + url.set_scheme(&self.configuration.protocol.schema()) + .unwrap(); + url.set_port(Some(self.configuration.port)).unwrap(); + url.to_string() + } + + pub fn shutdown(&mut self) { + let _ = self.process.kill(); + } +} + +impl Drop for MockController { + fn drop(&mut self) { + self.shutdown(); + self.process.wait().unwrap(); + } +} + +#[derive(Error, Debug)] +pub enum Error { + #[error(transparent)] + Io(#[from] std::io::Error), + #[error(transparent)] + Certs(#[from] crate::config::certs::Error), + #[error(transparent)] + Config(#[from] crate::mode::mock::config::Error), +} diff --git a/vitup/src/mode/mock/farm/mod.rs b/vitup/src/mode/mock/farm/mod.rs new file mode 100644 index 00000000..4c9e872a --- /dev/null +++ b/vitup/src/mode/mock/farm/mod.rs @@ -0,0 +1,9 @@ +mod config; +mod context; +mod controller; +mod rest; + +pub use config::{read_config, Config}; +pub use context::{Context, ContextLock, Error as ContextError}; +pub use controller::{Error as ControllerError, MockBootstrap, MockController}; +pub use rest::start_rest_server; diff --git a/vitup/src/mode/mock/farm/rest/mod.rs b/vitup/src/mode/mock/farm/rest/mod.rs new file mode 100644 index 00000000..21d56266 --- /dev/null +++ b/vitup/src/mode/mock/farm/rest/mod.rs @@ -0,0 +1,235 @@ +use super::ContextError; +use super::{Context, ContextLock}; +use crate::mode::mock::farm::context::MockId; +use crate::mode::mock::rest::reject::report_invalid; +use futures::StreamExt; +use jortestkit::web::api_token::TokenError; +use jortestkit::web::api_token::{APIToken, APITokenManager, API_TOKEN_HEADER}; +use rustls::KeyLogFile; +use std::convert::Infallible; +use std::fs::{self, File}; +use std::path::Path; +use std::sync::Arc; +use thiserror::Error; +use tokio::net::TcpListener; +use tokio_rustls::TlsAcceptor; +use valgrind::Protocol; +use vit_servicing_station_lib::v0::result::HandlerResult; +use warp::http::header::{HeaderMap, HeaderValue}; +use warp::hyper::service::make_service_fn; +use warp::{reject::Reject, Filter, Rejection, Reply}; + +impl warp::reject::Reject for ContextError {} + +#[allow(clippy::large_enum_variant)] +#[derive(Debug, Error)] +pub enum Error { + #[error("cannot parse uuid")] + CannotParseUuid(#[from] uuid::Error), + #[error(transparent)] + IO(#[from] std::io::Error), + #[error(transparent)] + Hyper(#[from] hyper::Error), + #[error(transparent)] + Rusls(#[from] rustls::Error), + #[error(transparent)] + Crypto(#[from] chain_crypto::hash::Error), + #[error("invalid tls certificate")] + InvalidCertificate, + #[error("invalid tls key")] + InvalidKey, +} + +impl Reject for Error {} + +pub async fn start_rest_server(context: ContextLock) -> Result<(), Error> { + let is_token_enabled = context.lock().unwrap().api_token().is_some(); + let address = context.lock().unwrap().address(); + let protocol = context.lock().unwrap().protocol(); + let with_context = warp::any().map(move || context.clone()); + + let mut default_headers = HeaderMap::new(); + default_headers.insert("Access-Control-Allow-Origin", HeaderValue::from_static("*")); + default_headers.insert("vary", HeaderValue::from_static("Origin")); + + let root = warp::path!("api" / ..); + + let v0 = { + let root = warp::path!("v0" / ..); + + let active = warp::path!("active") + .and(warp::get()) + .and(with_context.clone()) + .and_then(get_active_mocks) + .boxed(); + + let shutdown = warp::path!("shutdown" / String) + .and(warp::post()) + .and(with_context.clone()) + .and_then(shutdown_mock) + .with(warp::reply::with::headers(default_headers.clone())) + .boxed(); + + let start = { + let root = warp::path!("start" / ..); + + let start_mock_on_random_port = warp::path!(String) + .and(warp::post()) + .and(with_context.clone()) + .and_then(start_mock_on_random_port) + .with(warp::reply::with::headers(default_headers.clone())) + .boxed(); + + root.and(start_mock_on_random_port).boxed() + }; + + root.and(active.or(shutdown).or(start)).boxed() + }; + + let api_token_filter = if is_token_enabled { + warp::header::header(API_TOKEN_HEADER) + .and(with_context.clone()) + .and_then(authorize_token) + .and(warp::any()) + .untuple_one() + .boxed() + } else { + warp::any().boxed() + }; + + let cors = warp::cors() + .allow_any_origin() + .allow_methods((vec!["GET", "POST", "OPTIONS", "PUT", "PATCH"]).clone()) + .allow_headers(vec!["content-type"]) + .build(); + + let api = root + .and(api_token_filter.and(v0)) + .recover(report_invalid) + .with(cors); + + match protocol { + Protocol::Https(certs) => { + let tls_cfg = { + let cert = load_cert(&certs.cert_path)?; + let key = load_private_key(&certs.key_path)?; + let mut cfg = rustls::ServerConfig::builder() + .with_safe_defaults() + .with_no_client_auth() + .with_single_cert(cert, key)?; + + cfg.key_log = Arc::new(KeyLogFile::new()); + cfg.alpn_protocols = vec![b"h2".to_vec(), b"http/1.1".to_vec()]; + Arc::new(cfg) + }; + + let tls_acceptor = TlsAcceptor::from(tls_cfg); + let arc_acceptor = Arc::new(tls_acceptor); + + let listener = + tokio_stream::wrappers::TcpListenerStream::new(TcpListener::bind(&address).await?); + + let incoming = + hyper::server::accept::from_stream(listener.filter_map(|socket| async { + match socket { + Ok(stream) => match arc_acceptor.clone().accept(stream).await { + Ok(val) => Some(Ok::<_, hyper::Error>(val)), + Err(e) => { + tracing::warn!("handshake failed {}", e); + None + } + }, + Err(e) => { + tracing::error!("tcp socket outer err: {}", e); + None + } + } + })); + + let svc = warp::service(api); + let service = make_service_fn(move |_| { + let svc = svc.clone(); + async move { Ok::<_, Infallible>(svc) } + }); + + let server = hyper::Server::builder(incoming).serve(service); + + println!("serving at: https://{}", address); + Ok(server.await?) + } + Protocol::Http => { + println!("serving at: http://{}", address); + warp::serve(api).bind(address).await; + Ok(()) + } + } +} + +fn load_cert(filename: &Path) -> Result, Error> { + let certfile = fs::File::open(filename)?; + let mut reader = std::io::BufReader::new(certfile); + + match rustls_pemfile::read_one(&mut reader)? { + Some(rustls_pemfile::Item::X509Certificate(cert)) => Ok(vec![rustls::Certificate(cert)]), + Some(rustls_pemfile::Item::RSAKey(_)) | Some(rustls_pemfile::Item::PKCS8Key(_)) => { + // TODO: a more specific error could be useful (ExpectedCertFoundKey?) + Err(Error::InvalidCertificate) + } + // not a pemfile + None => Err(Error::InvalidCertificate), + } +} + +fn load_private_key(filename: &Path) -> Result { + let keyfile = File::open(filename)?; + let mut reader = std::io::BufReader::new(keyfile); + + match rustls_pemfile::read_one(&mut reader)? { + Some(rustls_pemfile::Item::RSAKey(key)) => Ok(rustls::PrivateKey(key)), + Some(rustls_pemfile::Item::PKCS8Key(key)) => Ok(rustls::PrivateKey(key)), + None | Some(rustls_pemfile::Item::X509Certificate(_)) => Err(Error::InvalidKey), + } +} + +pub async fn get_active_mocks(context: ContextLock) -> Result { + let context_lock = context.lock().unwrap(); + let active = context_lock.get_active_mocks(); + Ok(HandlerResult(Ok(Some(active)))) +} + +pub async fn shutdown_mock(id: MockId, context: ContextLock) -> Result { + let mut context_lock = context.lock().unwrap(); + context_lock.shutdown_mock(id.clone())?; + Ok(HandlerResult(Ok(format!( + "mock environment '{}' was shutdown successfully", + id + )))) +} + +pub async fn start_mock_on_random_port( + id: MockId, + context: ContextLock, +) -> Result { + let mut context_lock = context.lock().unwrap(); + let port = context_lock.start_mock_on_random_port(id)?; + Ok(HandlerResult(Ok(port))) +} + +pub async fn authorize_token( + token: String, + context: Arc>, +) -> Result<(), Rejection> { + let api_token = APIToken::from_string(token).map_err(warp::reject::custom)?; + + if context.lock().unwrap().api_token().is_none() { + return Ok(()); + } + + let manager = APITokenManager::new(context.lock().unwrap().api_token().unwrap()) + .map_err(warp::reject::custom)?; + + if !manager.is_token_valid(api_token) { + return Err(warp::reject::custom(TokenError::UnauthorizedToken)); + } + Ok(()) +} diff --git a/vitup/src/mode/mock/mock_state.rs b/vitup/src/mode/mock/mock_state.rs index 58a73346..fe81f62f 100644 --- a/vitup/src/mode/mock/mock_state.rs +++ b/vitup/src/mode/mock/mock_state.rs @@ -143,7 +143,7 @@ impl MockState { pub fn set_fund_id(&mut self, id: i32) { let funds = self.vit_state.funds_mut(); - let mut fund = funds.first_mut().unwrap(); + let fund = funds.first_mut().unwrap(); fund.id = id; diff --git a/vitup/src/mode/mock/mod.rs b/vitup/src/mode/mock/mod.rs index c9ea879f..c55ed871 100644 --- a/vitup/src/mode/mock/mod.rs +++ b/vitup/src/mode/mock/mod.rs @@ -1,6 +1,7 @@ mod config; mod congestion; mod context; +pub mod farm; mod ledger_state; mod logger; mod mock_state; diff --git a/vitup/src/mode/mock/rest/mod.rs b/vitup/src/mode/mock/rest/mod.rs index ded75728..3e2e1527 100644 --- a/vitup/src/mode/mock/rest/mod.rs +++ b/vitup/src/mode/mock/rest/mod.rs @@ -42,7 +42,7 @@ use voting_hir::VoterHIR; use warp::http::header::{HeaderMap, HeaderValue}; use warp::hyper::service::make_service_fn; use warp::{reject::Reject, Filter, Rejection, Reply}; -mod reject; +pub mod reject; use reject::{report_invalid, ForcedErrorCode, GeneralException, InvalidBatch}; @@ -464,7 +464,7 @@ pub async fn start_rest_server(context: ContextLock) -> Result<(), Error> { .and(with_context.clone()) .map(move |context: ContextLock| { context.lock().unwrap().log("get_block0"); - Ok(context.lock().unwrap().block0_bin()) + context.lock().unwrap().block0_bin() }) .with(warp::reply::with::headers(default_headers.clone())); diff --git a/vitup/src/mode/service/manager/file_lister.rs b/vitup/src/mode/service/manager/file_lister.rs index e92dd395..26d476cf 100644 --- a/vitup/src/mode/service/manager/file_lister.rs +++ b/vitup/src/mode/service/manager/file_lister.rs @@ -1,3 +1,5 @@ +use path_slash::PathBufExt as _; +use path_slash::PathExt as _; use serde::{Deserialize, Serialize}; use std::collections::HashMap; use std::path::Path; @@ -19,9 +21,7 @@ pub const NETWORK: &str = "network"; #[derive(Serialize, Deserialize)] pub struct FolderDump { content: HashMap>, - #[serde()] root: PathBuf, - #[serde()] blockchain_items: Vec, } @@ -65,11 +65,9 @@ impl FolderDump { } pub fn push_path>(&mut self, input: P) { - let path = input.as_ref().display().to_string().replace("'\\'", "/"); - let path = path.replace( - &format!("./{}/", self.root.file_name().unwrap().to_str().unwrap()), - "", - ); + let path = input.as_ref().to_slash().unwrap(); + let replacer = self.root.to_slash().unwrap(); + let path = path.replace(&format!("{}/", replacer), ""); if path.contains(QR_CODES) { self.push_qr_code(path); @@ -111,7 +109,7 @@ pub fn dump_json>(root: P) -> Result { continue; } - data.push_path(entry.path()); + data.push_path(&*entry.path().to_slash().unwrap()); } Ok(data) diff --git a/vitup/src/mode/service/manager/rest.rs b/vitup/src/mode/service/manager/rest.rs index 244e3c4a..a48d14c4 100644 --- a/vitup/src/mode/service/manager/rest.rs +++ b/vitup/src/mode/service/manager/rest.rs @@ -119,12 +119,12 @@ pub async fn start_handler( context_lock.start(); return Ok("start event received".to_owned()).map(|r| warp::reply::json(&r)); } - return Ok(format!( + Ok(format!( "Wrong state to stop operation ('{}'), plase wait until state is '{}'", state, State::Idle )) - .map(|r| warp::reply::json(&r)); + .map(|r| warp::reply::json(&r)) } pub async fn start_default_handler(context: ControlContextLock) -> Result { @@ -134,12 +134,12 @@ pub async fn start_default_handler(context: ControlContextLock) -> Result Result { @@ -149,12 +149,12 @@ pub async fn stop_handler(context: ControlContextLock) -> Result Result { diff --git a/vitup/src/mode/spawn/mod.rs b/vitup/src/mode/spawn/mod.rs index e39ea9ec..e8ab5e77 100644 --- a/vitup/src/mode/spawn/mod.rs +++ b/vitup/src/mode/spawn/mod.rs @@ -10,6 +10,7 @@ use crate::Result; use hersir::builder::SpawnParams; use hersir::config::SessionSettings; use jormungandr_automation::jormungandr::PersistenceMode; +use jormungandr_lib::interfaces::Mempool; use std::path::Path; use std::path::PathBuf; use valgrind::Protocol; @@ -90,6 +91,10 @@ impl NetworkSpawnParams { .persistence_mode(PersistenceMode::Persistent) .persistent_fragment_log(self.working_directory.clone().join("persistent_log")) .jormungandr(self.session_settings.jormungandr.clone()) + .mempool(Mempool { + pool_max_entries: 1_000_000.into(), + ..Default::default() + }) } pub fn proxy_params(&self) -> WalletProxySpawnParams { diff --git a/vitup/vole.trace b/vitup/vole.trace deleted file mode 100644 index 56e7d1eb..00000000 --- a/vitup/vole.trace +++ /dev/null @@ -1,2 +0,0 @@ -May 25 12:41:27.688 DEBUG warp::filter::service: rejected: Rejection(MethodNotAllowed) -May 25 12:41:48.802 DEBUG warp::filter::service: rejected: Rejection(NotFound)