diff --git a/.github/workflows/picashot.yml b/.github/workflows/picashot.yml index 419b7276e64..c27f712731b 100644 --- a/.github/workflows/picashot.yml +++ b/.github/workflows/picashot.yml @@ -1,4 +1,4 @@ -name: Check Runtime +name: Picasso and Dali Snapshot on: workflow_dispatch: schedule: @@ -19,9 +19,8 @@ jobs: docker system prune --force --all --volumes - name: Run ansible playbook - working-directory: "./.maintain/playbooks" run: | - ansible-playbook -l _mainnet_collator_yes picashot.yml -i picasso-gcp.yaml --user root -e 'ansible_python_interpreter=/usr/bin/python3' + ansible-playbook -l _mainnet_collator_yes /opt/ansible/inventory/picashot.yml -i /opt/ansible/inventory/picasso-gcp.yaml --user root -e 'ansible_python_interpreter=/usr/bin/python3' dalishot: runs-on: @@ -38,6 +37,5 @@ jobs: docker system prune --force --all --volumes - name: Run ansible playbook - working-directory: "./.maintain/playbooks" run: | - ansible-playbook -l _collator_node_yes picashot.yml -i gcp.yaml --user runner -e 'ansible_python_interpreter=/usr/bin/python3' + ansible-playbook -l _collator_node_yes /opt/ansible/inventory/dalishot.yml -i /opt/ansible/inventory/gcp.yaml --user runner -e 'ansible_python_interpreter=/usr/bin/python3' diff --git a/.maintain/playbooks/dalishot.yml b/.maintain/playbooks/dalishot.yml new file mode 100644 index 00000000000..100ef8813db --- /dev/null +++ b/.maintain/playbooks/dalishot.yml @@ -0,0 +1,19 @@ +--- +- name: Create Backup for Picasso nodes + hosts: all + become: root + tasks: + - name: Run Backup Script + become: true + shell: | + #!/bin/bash + DATE=$(date +'%m-%d-%Y') + HOST=$(echo $HOSTNAME) + FILENAME=$HOST-$DATE.zip + BACKUP_DIR="/var/lib/composable-data/chains" + GS_BUCKET="dali-chachacha-data-store" + sudo zip -r $FILENAME $BACKUP_DIR + sudo gsutil mv $FILENAME gs://$GS_BUCKET/ + args: + executable: /bin/bash + register: stdout \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 8849e9463dc..c0f9f4e48c2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -42,15 +42,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" -[[package]] -name = "aead" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" -dependencies = [ - "generic-array 0.14.5", -] - [[package]] name = "aead" version = "0.4.3" @@ -60,17 +51,6 @@ dependencies = [ "generic-array 0.14.5", ] -[[package]] -name = "aes" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" -dependencies = [ - "aes-soft", - "aesni", - "cipher 0.2.5", -] - [[package]] name = "aes" version = "0.7.5" @@ -78,59 +58,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if 1.0.0", - "cipher 0.3.0", + "cipher", "cpufeatures 0.2.1", "opaque-debug 0.3.0", ] -[[package]] -name = "aes-gcm" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da" -dependencies = [ - "aead 0.3.2", - "aes 0.6.0", - "cipher 0.2.5", - "ctr 0.6.0", - "ghash 0.3.1", - "subtle", -] - [[package]] name = "aes-gcm" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" dependencies = [ - "aead 0.4.3", - "aes 0.7.5", - "cipher 0.3.0", - "ctr 0.8.0", - "ghash 0.4.4", + "aead", + "aes", + "cipher", + "ctr", + "ghash", "subtle", ] -[[package]] -name = "aes-soft" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" -dependencies = [ - "cipher 0.2.5", - "opaque-debug 0.3.0", -] - -[[package]] -name = "aesni" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" -dependencies = [ - "cipher 0.2.5", - "opaque-debug 0.3.0", -] - [[package]] name = "ahash" version = "0.7.6" @@ -241,16 +187,6 @@ dependencies = [ "futures-core", ] -[[package]] -name = "async-dup" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7427a12b8dc09291528cfb1da2447059adb4a257388c2acd6497a79d55cf6f7c" -dependencies = [ - "futures-io", - "simple-mutex", -] - [[package]] name = "async-executor" version = "1.4.1" @@ -279,23 +215,6 @@ dependencies = [ "futures-lite", "num_cpus", "once_cell", - "tokio", -] - -[[package]] -name = "async-h1" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8101020758a4fc3a7c326cb42aa99e9fa77cbfb76987c128ad956406fe1f70a7" -dependencies = [ - "async-channel", - "async-dup", - "async-std", - "futures-core", - "http-types", - "httparse", - "log 0.4.14", - "pin-project 1.0.10", ] [[package]] @@ -352,41 +271,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "async-session" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345022a2eed092cd105cc1b26fd61c341e100bd5fcbbd792df4baf31c2cc631f" -dependencies = [ - "anyhow", - "async-std", - "async-trait", - "base64 0.12.3", - "bincode", - "blake3", - "chrono", - "hmac 0.8.1", - "kv-log-macro", - "rand 0.7.3", - "serde", - "serde_json", - "sha2 0.9.9", -] - -[[package]] -name = "async-sse" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53bba003996b8fd22245cd0c59b869ba764188ed435392cf2796d03b805ade10" -dependencies = [ - "async-channel", - "async-std", - "http-types", - "log 0.4.14", - "memchr", - "pin-project-lite 0.1.12", -] - [[package]] name = "async-std" version = "1.10.0" @@ -557,12 +441,6 @@ dependencies = [ "byteorder", ] -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - [[package]] name = "base64" version = "0.13.0" @@ -1172,7 +1050,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fee7ad89dc1128635074c268ee661f90c3f7e83d9fd12910608c36b47d6c3412" dependencies = [ "cfg-if 1.0.0", - "cipher 0.3.0", + "cipher", "cpufeatures 0.1.5", "zeroize", ] @@ -1183,19 +1061,13 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1580317203210c517b6d44794abfbe600698276db18127e37ad3e69bf5e848e5" dependencies = [ - "aead 0.4.3", + "aead", "chacha20", - "cipher 0.3.0", + "cipher", "poly1305", "zeroize", ] -[[package]] -name = "chameleon" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12bd83544cd11113170ce1eee45383928f3f720bc8b305af18c2a3da3547e1ae" - [[package]] name = "chrono" version = "0.4.19" @@ -1205,8 +1077,7 @@ dependencies = [ "libc", "num-integer", "num-traits", - "serde", - "time 0.1.44", + "time", "winapi 0.3.9", ] @@ -1221,15 +1092,6 @@ dependencies = [ "unsigned-varint 0.5.1", ] -[[package]] -name = "cipher" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" -dependencies = [ - "generic-array 0.14.5", -] - [[package]] name = "cipher" version = "0.3.0" @@ -1322,23 +1184,6 @@ dependencies = [ "cc", ] -[[package]] -name = "collator-sidecar" -version = "0.1.0" -dependencies = [ - "async-std", - "common", - "env_logger 0.8.4", - "jsonrpc-core-client", - "picasso-runtime", - "sc-rpc", - "serde", - "structopt", - "tide", - "tokio", - "url 1.7.2", -] - [[package]] name = "color-eyre" version = "0.5.11" @@ -1596,12 +1441,6 @@ dependencies = [ "cache-padded", ] -[[package]] -name = "const_fn" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" - [[package]] name = "constant_time_eq" version = "0.1.5" @@ -1614,23 +1453,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" -[[package]] -name = "cookie" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" -dependencies = [ - "aes-gcm 0.8.0", - "base64 0.13.0", - "hkdf", - "hmac 0.10.1", - "percent-encoding 2.1.0", - "rand 0.8.4", - "sha2 0.9.9", - "time 0.2.27", - "version_check 0.9.4", -] - [[package]] name = "core-foundation" version = "0.9.2" @@ -1711,12 +1533,6 @@ dependencies = [ "libc", ] -[[package]] -name = "cpuid-bool" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" - [[package]] name = "cranelift-bforest" version = "0.78.0" @@ -1887,16 +1703,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "crypto-mac" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" -dependencies = [ - "generic-array 0.14.5", - "subtle", -] - [[package]] name = "crypto-mac" version = "0.11.1" @@ -1913,7 +1719,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" dependencies = [ - "sct 0.6.1", + "sct", ] [[package]] @@ -1926,22 +1732,13 @@ dependencies = [ "syn 1.0.85", ] -[[package]] -name = "ctr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" -dependencies = [ - "cipher 0.2.5", -] - [[package]] name = "ctr" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" dependencies = [ - "cipher 0.3.0", + "cipher", ] [[package]] @@ -2431,51 +2228,6 @@ dependencies = [ "xcm-executor", ] -[[package]] -name = "darling" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0d720b8683f8dd83c65155f0530560cba68cd2bf395f6513a483caee57ff7f4" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a340f241d2ceed1deb47ae36c4144b2707ec7dd0b649f894cb39bb595986324" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2 1.0.36", - "quote 1.0.14", - "strsim 0.10.0", - "syn 1.0.85", -] - -[[package]] -name = "darling_macro" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c41b3b7352feb3211a0d743dc5700a4e3b60f51bd2b368892d1e0f9a95f44b" -dependencies = [ - "darling_core", - "quote 1.0.14", - "syn 1.0.85", -] - -[[package]] -name = "dashmap" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" -dependencies = [ - "cfg-if 1.0.0", - "num_cpus", -] - [[package]] name = "data-encoding" version = "2.3.2" @@ -2605,12 +2357,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - [[package]] name = "dns-parser" version = "0.8.0" @@ -2621,12 +2367,6 @@ dependencies = [ "quick-error 1.2.3", ] -[[package]] -name = "dotenv" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" - [[package]] name = "downcast-rs" version = "1.2.0" @@ -2778,19 +2518,6 @@ dependencies = [ "termcolor", ] -[[package]] -name = "env_logger" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" -dependencies = [ - "atty", - "humantime 2.1.0", - "log 0.4.14", - "regex", - "termcolor", -] - [[package]] name = "env_logger" version = "0.9.0" @@ -2810,15 +2537,6 @@ version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68b91989ae21441195d7d9b9993a2f9295c7e1a8c96255d8b729accddc124797" -[[package]] -name = "envy" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f47e0157f2cb54f5ae1bd371b30a2ae4311e1c028f575cd4e81de7353215965" -dependencies = [ - "serde", -] - [[package]] name = "errno" version = "0.2.8" @@ -2932,29 +2650,6 @@ dependencies = [ "instant", ] -[[package]] -name = "faucet-server" -version = "0.1.0" -dependencies = [ - "async-std", - "common", - "dotenv", - "env_logger 0.8.4", - "envy", - "hex", - "hmac 0.11.0", - "log 0.4.14", - "serde", - "serde_urlencoded", - "sha2 0.9.9", - "sp-core", - "structopt", - "subxt", - "subxt-clients", - "tide", - "tokio", -] - [[package]] name = "fdlimit" version = "0.2.1" @@ -2964,22 +2659,6 @@ dependencies = [ "libc", ] -[[package]] -name = "femme" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af1a24f391a5a94d756db5092c6576aad494b88a71a5a36b20c67b63e0df034" -dependencies = [ - "cfg-if 0.1.10", - "js-sys", - "log 0.4.14", - "serde", - "serde_derive", - "serde_json", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "file-per-thread-logger" version = "0.1.4" @@ -3475,8 +3154,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a1387e07917c711fb4ee4f48ea0adb04a3c9739e53ef85bf43ae1edc2937a8b" dependencies = [ "futures-io", - "rustls 0.19.1", - "webpki 0.21.4", + "rustls", + "webpki", ] [[package]] @@ -3565,16 +3244,6 @@ dependencies = [ "wasi 0.10.0+wasi-snapshot-preview1", ] -[[package]] -name = "ghash" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375" -dependencies = [ - "opaque-debug 0.3.0", - "polyval 0.4.5", -] - [[package]] name = "ghash" version = "0.4.4" @@ -3582,7 +3251,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" dependencies = [ "opaque-debug 0.3.0", - "polyval 0.5.3", + "polyval", ] [[package]] @@ -3768,16 +3437,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b07f60793ff0a4d9cef0f18e63b5357e06209987153a64648c972c1e5aff336f" -[[package]] -name = "hkdf" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ab2f639c231793c5f6114bdb9bbe50a7dbbfcd7c7c6bd8475dec2d991e964f" -dependencies = [ - "digest 0.9.0", - "hmac 0.10.1", -] - [[package]] name = "hmac" version = "0.8.1" @@ -3788,16 +3447,6 @@ dependencies = [ "digest 0.9.0", ] -[[package]] -name = "hmac" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" -dependencies = [ - "crypto-mac 0.10.1", - "digest 0.9.0", -] - [[package]] name = "hmac" version = "0.11.0" @@ -3852,41 +3501,6 @@ dependencies = [ "pin-project-lite 0.2.8", ] -[[package]] -name = "http-client" -version = "6.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea880b03c18a7e981d7fb3608b8904a98425d53c440758fcebf7d934aa56547c" -dependencies = [ - "async-trait", - "cfg-if 1.0.0", - "dashmap", - "http-types", - "log 0.4.14", -] - -[[package]] -name = "http-types" -version = "2.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" -dependencies = [ - "anyhow", - "async-channel", - "async-std", - "base64 0.13.0", - "cookie", - "futures-lite", - "infer", - "pin-project-lite 0.2.8", - "rand 0.7.3", - "serde", - "serde_json", - "serde_qs", - "serde_urlencoded", - "url 2.2.2", -] - [[package]] name = "httparse" version = "1.5.1" @@ -3926,7 +3540,7 @@ dependencies = [ "log 0.3.9", "mime 0.2.6", "num_cpus", - "time 0.1.44", + "time", "traitobject", "typeable", "unicase 1.4.2", @@ -3967,27 +3581,11 @@ dependencies = [ "futures-util", "hyper 0.14.16", "log 0.4.14", - "rustls 0.19.1", - "rustls-native-certs 0.5.0", - "tokio", - "tokio-rustls 0.22.0", - "webpki 0.21.4", -] - -[[package]] -name = "hyper-rustls" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" -dependencies = [ - "http", - "hyper 0.14.16", - "log 0.4.14", - "rustls 0.20.2", - "rustls-native-certs 0.6.1", + "rustls", + "rustls-native-certs", "tokio", - "tokio-rustls 0.23.2", - "webpki-roots 0.22.2", + "tokio-rustls", + "webpki", ] [[package]] @@ -4003,12 +3601,6 @@ dependencies = [ "tokio-native-tls", ] -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - [[package]] name = "idna" version = "0.1.5" @@ -4139,12 +3731,6 @@ dependencies = [ "serde", ] -[[package]] -name = "infer" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" - [[package]] name = "instant" version = "0.1.12" @@ -4495,43 +4081,10 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6373a33d987866ccfe1af4bc11b089dce941764313f9fd8b7cf13fcb51b72dc5" dependencies = [ - "jsonrpsee-proc-macros 0.4.1", - "jsonrpsee-types 0.4.1", - "jsonrpsee-utils 0.4.1", - "jsonrpsee-ws-client 0.4.1", -] - -[[package]] -name = "jsonrpsee" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5b02d34b7d70caa454dcf79914d70d9ef6edecef84b9261f499a9f3521b7935" -dependencies = [ - "jsonrpsee-http-client", - "jsonrpsee-proc-macros 0.5.1", - "jsonrpsee-types 0.5.1", - "jsonrpsee-utils 0.5.1", - "jsonrpsee-ws-client 0.5.1", -] - -[[package]] -name = "jsonrpsee-http-client" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea17b6d6da182fc4b293e0bebea5cc72e194d9392f485fb4051488af3edd1cd" -dependencies = [ - "async-trait", - "fnv", - "hyper 0.14.16", - "hyper-rustls 0.23.0", - "jsonrpsee-types 0.5.1", - "jsonrpsee-utils 0.5.1", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", - "url 2.2.2", + "jsonrpsee-proc-macros", + "jsonrpsee-types", + "jsonrpsee-utils", + "jsonrpsee-ws-client", ] [[package]] @@ -4547,18 +4100,6 @@ dependencies = [ "syn 1.0.85", ] -[[package]] -name = "jsonrpsee-proc-macros" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfdf283c6c3403ce9969700177bbcf35a695576fc2d993f38ab32a690631a96" -dependencies = [ - "proc-macro-crate 1.1.0", - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.85", -] - [[package]] name = "jsonrpsee-types" version = "0.4.1" @@ -4578,95 +4119,39 @@ dependencies = [ "thiserror", ] -[[package]] -name = "jsonrpsee-types" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d822e0fc7be95e5085da5d61508bf5e3d5c1614dd235402086ec5c1cb15bdfa" -dependencies = [ - "anyhow", - "async-trait", - "beef", - "futures-channel", - "futures-util", - "hyper 0.14.16", - "serde", - "serde_json", - "soketto", - "thiserror", - "tracing", -] - [[package]] name = "jsonrpsee-utils" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0109c4f972058f3b1925b73a17210aff7b63b65967264d0045d15ee88fe84f0c" dependencies = [ - "arrayvec 0.7.2", - "beef", - "jsonrpsee-types 0.4.1", -] - -[[package]] -name = "jsonrpsee-utils" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e722316d556c5228624fb1cc7ea672f6ed163e60183e93f11d3ee979417331cb" -dependencies = [ - "arrayvec 0.7.2", - "beef", - "futures-util", - "hyper 0.14.16", - "jsonrpsee-types 0.5.1", -] - -[[package]] -name = "jsonrpsee-ws-client" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559aa56fc402af206c00fc913dc2be1d9d788dcde045d14df141a535245d35ef" -dependencies = [ - "arrayvec 0.7.2", - "async-trait", - "fnv", - "futures 0.3.19", - "http", - "jsonrpsee-types 0.4.1", - "log 0.4.14", - "pin-project 1.0.10", - "rustls-native-certs 0.5.0", - "serde", - "serde_json", - "soketto", - "thiserror", - "tokio", - "tokio-rustls 0.22.0", - "tokio-util", + "arrayvec 0.7.2", + "beef", + "jsonrpsee-types", ] [[package]] name = "jsonrpsee-ws-client" -version = "0.5.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "664d2c9443cb1171e2414c66e0f0b44040eb2cff073455a0d168984eee178159" +checksum = "559aa56fc402af206c00fc913dc2be1d9d788dcde045d14df141a535245d35ef" dependencies = [ + "arrayvec 0.7.2", "async-trait", "fnv", "futures 0.3.19", "http", - "jsonrpsee-types 0.5.1", + "jsonrpsee-types", + "log 0.4.14", "pin-project 1.0.10", - "rustls-native-certs 0.6.1", + "rustls-native-certs", "serde", "serde_json", "soketto", "thiserror", "tokio", - "tokio-rustls 0.23.2", + "tokio-rustls", "tokio-util", - "tracing", - "webpki-roots 0.22.2", ] [[package]] @@ -5325,7 +4810,7 @@ dependencies = [ "rw-stream-sink", "soketto", "url 2.2.2", - "webpki-roots 0.21.1", + "webpki-roots", ] [[package]] @@ -7670,30 +7155,6 @@ dependencies = [ "serde", ] -[[package]] -name = "parachain-utils" -version = "0.1.0" -dependencies = [ - "common", - "derive_more", - "env_logger 0.8.4", - "envy", - "hex", - "jsonrpc-core-client", - "log 0.4.14", - "parity-scale-codec", - "sc-rpc", - "serde", - "sp-core", - "sp-io", - "sp-runtime", - "structopt", - "subxt", - "subxt-clients", - "tokio", - "url 1.7.2", -] - [[package]] name = "parity-db" version = "0.3.5" @@ -9306,17 +8767,6 @@ dependencies = [ "universal-hash", ] -[[package]] -name = "polyval" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" -dependencies = [ - "cpuid-bool", - "opaque-debug 0.3.0", - "universal-hash", -] - [[package]] name = "polyval" version = "0.5.3" @@ -10007,7 +9457,7 @@ version = "0.10.0-dev" source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "env_logger 0.9.0", - "jsonrpsee 0.4.1", + "jsonrpsee", "log 0.4.14", "parity-scale-codec", "serde", @@ -10188,12 +9638,6 @@ dependencies = [ "xcm-executor", ] -[[package]] -name = "route-recognizer" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56770675ebc04927ded3e60633437841581c285dc6236109ea25fbf3beb7b59e" - [[package]] name = "rpassword" version = "5.0.1" @@ -10275,20 +9719,8 @@ dependencies = [ "base64 0.13.0", "log 0.4.14", "ring", - "sct 0.6.1", - "webpki 0.21.4", -] - -[[package]] -name = "rustls" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d37e5e2290f3e040b594b1a9e04377c2c671f1a1cfd9bfdef82106ac1c113f84" -dependencies = [ - "log 0.4.14", - "ring", - "sct 0.7.0", - "webpki 0.22.0", + "sct", + "webpki", ] [[package]] @@ -10298,32 +9730,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" dependencies = [ "openssl-probe", - "rustls 0.19.1", + "rustls", "schannel", "security-framework", ] -[[package]] -name = "rustls-native-certs" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca9ebdfa27d3fc180e42879037b5338ab1c040c06affd00d8338598e7800943" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" -dependencies = [ - "base64 0.13.0", -] - [[package]] name = "rusty-fork" version = "0.2.2" @@ -10386,7 +9797,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c0fbb5f676da676c260ba276a8f43a8dc67cf02d1438423aeb1c677a7212686" dependencies = [ - "cipher 0.3.0", + "cipher", ] [[package]] @@ -11050,7 +10461,7 @@ dependencies = [ "futures-timer 3.0.2", "hex", "hyper 0.14.16", - "hyper-rustls 0.22.1", + "hyper-rustls", "num_cpus", "once_cell", "parity-scale-codec", @@ -11450,16 +10861,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "secrecy" version = "0.8.0" @@ -11574,17 +10975,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_qs" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6" -dependencies = [ - "percent-encoding 2.1.0", - "serde", - "thiserror", -] - [[package]] name = "serde_urlencoded" version = "0.7.0" @@ -11790,15 +11180,6 @@ dependencies = [ "substrate-simnode", ] -[[package]] -name = "simple-mutex" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38aabbeafa6f6dead8cebf246fe9fae1f9215c8d29b3a69f93bd62a9e4a3dcd6" -dependencies = [ - "event-listener", -] - [[package]] name = "slab" version = "0.4.5" @@ -11853,7 +11234,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6142f7c25e94f6fd25a32c3348ec230df9109b463f59c8c7acc4bd34936babb7" dependencies = [ - "aes-gcm 0.9.4", + "aes-gcm", "blake2", "chacha20poly1305", "rand 0.8.4", @@ -12625,15 +12006,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check 0.9.4", -] - [[package]] name = "static_assertions" version = "1.1.0" @@ -12678,55 +12050,6 @@ dependencies = [ "rand 0.8.4", ] -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version 0.2.3", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "serde", - "serde_derive", - "syn 1.0.85", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2 1.0.36", - "quote 1.0.14", - "serde", - "serde_derive", - "serde_json", - "sha1", - "syn 1.0.85", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - [[package]] name = "strsim" version = "0.8.0" @@ -12915,83 +12238,6 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" -[[package]] -name = "subxt" -version = "0.15.0" -source = "git+https://github.com/composableFi/subxt?branch=seun-0.9.13#eed5021ba10dc0762de5886b31b9b1f6ff26e2a0" -dependencies = [ - "async-trait", - "bitvec", - "chameleon", - "frame-metadata", - "futures 0.3.19", - "hex", - "jsonrpsee 0.5.1", - "log 0.4.14", - "num-traits", - "parity-scale-codec", - "scale-info", - "serde", - "serde_json", - "sp-core", - "sp-runtime", - "sp-version", - "subxt-macro", - "thiserror", - "url 2.2.2", -] - -[[package]] -name = "subxt-clients" -version = "0.1.0" -dependencies = [ - "parity-scale-codec", - "subxt", -] - -[[package]] -name = "subxt-codegen" -version = "0.2.0" -source = "git+https://github.com/composableFi/subxt?branch=seun-0.9.13#eed5021ba10dc0762de5886b31b9b1f6ff26e2a0" -dependencies = [ - "async-trait", - "darling", - "frame-metadata", - "heck 0.3.3", - "parity-scale-codec", - "proc-macro-crate 0.1.5", - "proc-macro-error", - "proc-macro2 1.0.36", - "quote 1.0.14", - "scale-info", - "syn 1.0.85", -] - -[[package]] -name = "subxt-macro" -version = "0.1.0" -source = "git+https://github.com/composableFi/subxt?branch=seun-0.9.13#eed5021ba10dc0762de5886b31b9b1f6ff26e2a0" -dependencies = [ - "async-trait", - "darling", - "frame-metadata", - "heck 0.3.3", - "parity-scale-codec", - "proc-macro-crate 0.1.5", - "proc-macro-error", - "proc-macro2 1.0.36", - "quote 1.0.14", - "scale-info", - "subxt-codegen", - "syn 1.0.85", -] - -[[package]] -name = "sval" -version = "1.0.0-alpha.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45f6ee7c7b87caf59549e9fe45d6a69c75c8019e79e212a835c5da0e92f0ba08" - [[package]] name = "syn" version = "0.15.44" @@ -13127,29 +12373,6 @@ dependencies = [ "threadpool", ] -[[package]] -name = "tide" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c459573f0dd2cc734b539047f57489ea875af8ee950860ded20cf93a79a1dee0" -dependencies = [ - "async-h1", - "async-session", - "async-sse", - "async-std", - "async-trait", - "femme", - "futures-util", - "http-client", - "http-types", - "kv-log-macro", - "log 0.4.14", - "pin-project-lite 0.2.8", - "route-recognizer", - "serde", - "serde_json", -] - [[package]] name = "time" version = "0.1.44" @@ -13161,44 +12384,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "time" -version = "0.2.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" -dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb", - "time-macros", - "version_check 0.9.4", - "winapi 0.3.9", -] - -[[package]] -name = "time-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2 1.0.36", - "quote 1.0.14", - "standback", - "syn 1.0.85", -] - [[package]] name = "tiny-bip39" version = "0.8.2" @@ -13339,20 +12524,9 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ - "rustls 0.19.1", - "tokio", - "webpki 0.21.4", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27d5f2b839802bd8267fa19b0530f5a08b9c08cd417976be2a65d130fe1c11b" -dependencies = [ - "rustls 0.20.2", + "rustls", "tokio", - "webpki 0.22.0", + "webpki", ] [[package]] @@ -13613,7 +12787,7 @@ name = "try-runtime-cli" version = "0.10.0-dev" source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ - "jsonrpsee 0.4.1", + "jsonrpsee", "log 0.4.14", "parity-scale-codec", "remote-externalities", @@ -13857,7 +13031,6 @@ dependencies = [ "idna 0.2.3", "matches", "percent-encoding 2.1.0", - "serde", ] [[package]] @@ -13873,7 +13046,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79923f7731dc61ebfba3633098bf3ac533bbd35ccd8c57e7088d9a5eebe0263f" dependencies = [ "ctor", - "sval", "version_check 0.9.4", ] @@ -13992,8 +13164,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" dependencies = [ "cfg-if 1.0.0", - "serde", - "serde_json", "wasm-bindgen-macro", ] @@ -14286,32 +13456,13 @@ dependencies = [ "untrusted", ] -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "webpki-roots" version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" dependencies = [ - "webpki 0.21.4", -] - -[[package]] -name = "webpki-roots" -version = "0.22.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552ceb903e957524388c4d3475725ff2c8b7960922063af6ce53c9a43da07449" -dependencies = [ - "webpki 0.22.0", + "webpki", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 55ba0eae1ca..f39575485f9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,8 +24,6 @@ std = [ "composable-node/std" ] members = [ "runtime/common", "runtime/primitives", - "utils/faucet-server", - "utils/parachain-utils", "frame/*", "integration-tests", "integration-tests/simnode", @@ -33,8 +31,6 @@ members = [ "runtime/picasso", "runtime/dali", "runtime/composable", - "utils/subxt-clients", - "utils/collator-sidecar", "utils/price-feed" ]