From cfa977d01ab02819fdfb5bee16b0a72d52ec19db Mon Sep 17 00:00:00 2001 From: cavemanloverboy Date: Tue, 7 Feb 2023 17:27:53 -0700 Subject: [PATCH 1/6] sdrive mods --- .cargo/config | 2 + Cargo.lock | 1119 +++++++++++++++------------- plugin/Cargo.toml | 5 + plugin/src/builders/thread_exec.rs | 67 +- 4 files changed, 672 insertions(+), 521 deletions(-) create mode 100644 .cargo/config diff --git a/.cargo/config b/.cargo/config new file mode 100644 index 000000000..c91c3f38b --- /dev/null +++ b/.cargo/config @@ -0,0 +1,2 @@ +[net] +git-fetch-with-cli = true diff --git a/Cargo.lock b/Cargo.lock index 7dd911001..fd1eef810 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,9 +14,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" dependencies = [ "gimli", ] @@ -69,16 +69,16 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", "once_cell", "version_check 0.9.4", ] [[package]] name = "aho-corasick" -version = "0.7.19" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] @@ -106,10 +106,10 @@ checksum = "cf7d535e1381be3de2c0716c0a1c1e32ad9df1042cddcf7bc18d743569e53319" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.46", - "quote 1.0.21", + "proc-macro2 1.0.51", + "quote 1.0.23", "regex", - "syn 1.0.102", + "syn 1.0.107", ] [[package]] @@ -121,10 +121,10 @@ dependencies = [ "anchor-syn", "anyhow", "bs58 0.4.0", - "proc-macro2 1.0.46", - "quote 1.0.21", + "proc-macro2 1.0.51", + "quote 1.0.23", "rustversion", - "syn 1.0.102", + "syn 1.0.107", ] [[package]] @@ -134,8 +134,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1be64a48e395fe00b8217287f226078be2cf32dae42fdf8a885b997945c3d28" dependencies = [ "anchor-syn", - "proc-macro2 1.0.46", - "syn 1.0.102", + "proc-macro2 1.0.51", + "syn 1.0.107", ] [[package]] @@ -145,9 +145,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38ea6713d1938c0da03656ff8a693b17dc0396da66d1ba320557f07e86eca0d4" dependencies = [ "anchor-syn", - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -158,9 +158,9 @@ checksum = "d401f11efb3644285685f8339829a9786d43ed7490bb1699f33c478d04d5a582" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -172,9 +172,9 @@ dependencies = [ "anchor-syn", "anyhow", "heck 0.3.3", - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -185,9 +185,9 @@ checksum = "6ad769993b5266714e8939e47fbdede90e5c030333c7522d99a4d4748cf26712" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -198,9 +198,9 @@ checksum = "4e677fae4a016a554acdd0e3b7f178d3acafaa7e7ffac6b8690cf4e171f1c116" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -211,9 +211,9 @@ checksum = "340beef6809d1c3fcc7ae219153d981e95a8a277ff31985bd7050e32645dc9a8" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -261,13 +261,13 @@ dependencies = [ "anyhow", "bs58 0.3.1", "heck 0.3.3", - "proc-macro2 1.0.46", + "proc-macro2 1.0.51", "proc-macro2-diagnostics", - "quote 1.0.21", + "quote 1.0.23", "serde", "serde_json", "sha2 0.9.9", - "syn 1.0.102", + "syn 1.0.107", "thiserror", ] @@ -291,9 +291,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.65" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" +checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" [[package]] name = "arrayref" @@ -320,7 +320,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.15", + "time 0.3.17", ] [[package]] @@ -329,9 +329,9 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", "synstructure", ] @@ -341,9 +341,9 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -381,9 +381,9 @@ version = "0.1.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" dependencies = [ - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -398,7 +398,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", ] @@ -411,9 +411,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.66" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" dependencies = [ "addr2line", "cc", @@ -446,11 +446,17 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + [[package]] name = "base64ct" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2b2456fd614d856680dcd9fcc660a51a820fa09daef2e49772b56a193c8474" +checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" [[package]] name = "bincode" @@ -478,16 +484,16 @@ dependencies = [ [[package]] name = "blake3" -version = "1.3.1" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" +checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq", - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -534,8 +540,8 @@ dependencies = [ "borsh-derive-internal", "borsh-schema-derive-internal", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.46", - "syn 1.0.102", + "proc-macro2 1.0.51", + "syn 1.0.107", ] [[package]] @@ -544,9 +550,9 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" dependencies = [ - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -555,9 +561,9 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" dependencies = [ - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -573,9 +579,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.2" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" +checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -609,9 +615,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.11.0" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "bv" @@ -625,22 +631,22 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.12.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f5715e491b5a1598fc2bef5a606847b5dc1d48ea625bd3c02c00de8285591da" +checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.2.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9e1f5fa78f69496407a27ae9ed989e3c3b072310286f5ef385525e4cbc24a9" +checksum = "1aca418a974d83d40a0c1f0c5cba6ff4bc28d8df099109ca459a2118d40b6322" dependencies = [ - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -651,15 +657,15 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.2.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "caps" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938c50180feacea622ef3b8f4a496057c868dcf8ac7a64d781dd8f3f51a9c143" +checksum = "190baaad529bcfbde9e1a19022c42781bdb6ff9de25721abdb8fd98c0807730b" dependencies = [ "libc", "thiserror", @@ -667,9 +673,9 @@ dependencies = [ [[package]] name = "cargo_toml" -version = "0.13.0" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa0e3586af56b3bfa51fca452bd56e8dbbbd5d8d81cbf0b7e4e35b695b537eb8" +checksum = "497049e9477329f8f6a559972ee42e117487d01d1e8c2cc9f836ea6fa23a9e1a" dependencies = [ "serde", "toml", @@ -677,9 +683,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.73" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" dependencies = [ "jobserver", ] @@ -690,18 +696,27 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "chain-drive" +version = "0.1.0" +source = "git+https://github.com/GenesysGo/shadow-drive-clockwork.git#5a44cfd72d538d137ccba9a2f3a719dd65a8de39" +dependencies = [ + "anchor-lang", + "sha2 0.10.6", +] + [[package]] name = "chrono" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" +checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" dependencies = [ "iana-time-zone", "js-sys", "num-integer", "num-traits", "serde", - "time 0.1.44", + "time 0.1.45", "wasm-bindgen", "winapi", ] @@ -742,9 +757,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.22" +version = "3.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" +checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" dependencies = [ "atty", "bitflags", @@ -754,7 +769,7 @@ dependencies = [ "once_cell", "strsim 0.10.0", "termcolor", - "textwrap 0.15.1", + "textwrap 0.16.0", ] [[package]] @@ -763,11 +778,11 @@ version = "3.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" dependencies = [ - "heck 0.4.0", + "heck 0.4.1", "proc-macro-error", - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -786,7 +801,7 @@ dependencies = [ "anyhow", "cargo_toml", "chrono", - "clap 3.2.22", + "clap 3.2.23", "clockwork-client", "clockwork-cron", "clockwork-utils", @@ -794,7 +809,7 @@ dependencies = [ "regex", "serde", "serde_json", - "serde_yaml 0.9.13", + "serde_yaml 0.9.17", "solana-account-decoder", "solana-clap-utils", "solana-cli-config", @@ -838,9 +853,9 @@ dependencies = [ name = "clockwork-macros" version = "1.4.0" dependencies = [ - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -907,6 +922,7 @@ dependencies = [ "bs58 0.4.0", "bugsnag", "cargo_toml", + "chain-drive", "chrono", "clockwork-client", "clockwork-cron", @@ -919,6 +935,7 @@ dependencies = [ "sentry", "serde", "serde_json", + "sha2 0.10.6", "simple-error", "solana-account-decoder", "solana-client", @@ -943,16 +960,15 @@ dependencies = [ [[package]] name = "console" -version = "0.15.2" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c" +checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" dependencies = [ "encode_unicode", "lazy_static", "libc", - "terminal_size", "unicode-width", - "winapi", + "windows-sys 0.42.0", ] [[package]] @@ -983,9 +999,9 @@ checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" [[package]] name = "constant_time_eq" -version = "0.1.5" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" [[package]] name = "core-foundation" @@ -1044,22 +1060,22 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.11" +version = "0.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" +checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset", + "memoffset 0.7.1", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" dependencies = [ "cfg-if", ] @@ -1115,9 +1131,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.78" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f39818dcfc97d45b03953c1292efc4e80954e1583c4aa770bac1383e2310a4" +checksum = "bc831ee6a32dd495436e317595e639a587aa9907bef96fe6e6abc290ab6204e9" dependencies = [ "cc", "cxxbridge-flags", @@ -1127,41 +1143,41 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.78" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e580d70777c116df50c390d1211993f62d40302881e54d4b79727acb83d0199" +checksum = "94331d54f1b1a8895cd81049f7eaaaef9d05a7dcb4d1fd08bf3ff0806246789d" dependencies = [ "cc", "codespan-reporting", "once_cell", - "proc-macro2 1.0.46", - "quote 1.0.21", + "proc-macro2 1.0.51", + "quote 1.0.23", "scratch", - "syn 1.0.102", + "syn 1.0.107", ] [[package]] name = "cxxbridge-flags" -version = "1.0.78" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56a46460b88d1cec95112c8c363f0e2c39afdb237f60583b0b36343bf627ea9c" +checksum = "48dcd35ba14ca9b40d6e4b4b39961f23d835dbb8eed74565ded361d93e1feb8a" [[package]] name = "cxxbridge-macro" -version = "1.0.78" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747b608fecf06b0d72d440f27acc99288207324b793be2c17991839f3d4995ea" +checksum = "81bbeb29798b407ccd82a3324ade1a7286e0d29851475990b612670f6f5124d2" dependencies = [ - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "data-encoding" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" +checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" [[package]] name = "debugid" @@ -1204,11 +1220,12 @@ checksum = "6e5c37193a1db1d8ed868c03ec7b152175f26160a5b740e5e484143877e0adf0" [[package]] name = "dialoguer" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92e7e37ecef6857fdc0c0c5d42fd5b0938e46590c2183cc92dd310a6d078eb1" +checksum = "af3c796f3b0b408d9fd581611b47fa850821fcb84aa640b83a3c1a5be2d691f2" dependencies = [ "console", + "shell-words", "tempfile", "zeroize", ] @@ -1224,9 +1241,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer 0.10.3", "crypto-common", @@ -1260,9 +1277,9 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" dependencies = [ - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -1296,9 +1313,9 @@ checksum = "abe71d579d1812060163dff96056261deb5bf6729b100fa2e36a68b9649ba3d3" [[package]] name = "ed25519" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" +checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ "signature", ] @@ -1331,9 +1348,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "encode_unicode" @@ -1343,9 +1360,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ "cfg-if", ] @@ -1365,28 +1382,28 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8958699f9359f0b04e691a13850d48b7de329138023876d07cbd024c2c820598" dependencies = [ - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "enum_dispatch" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eb359f1476bf611266ac1f5355bc14aeca37b299d0ebccc038ee7058891c9cb" +checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" dependencies = [ "once_cell", - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "env_logger" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" dependencies = [ "atty", "humantime", @@ -1418,9 +1435,9 @@ checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da" [[package]] name = "flate2" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ "crc32fast", "miniz_oxide", @@ -1510,9 +1527,9 @@ version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" dependencies = [ - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -1590,9 +1607,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if", "js-sys", @@ -1603,15 +1620,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.26.2" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" +checksum = "221996f774192f0f718773def8201c4ae31f02616a54ccfc2d358bb0e5cefdec" [[package]] name = "h2" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be" +checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" dependencies = [ "bytes", "fnv", @@ -1655,9 +1672,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -1668,6 +1685,15 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + [[package]] name = "hex" version = "0.4.3" @@ -1696,7 +1722,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -1773,7 +1799,7 @@ dependencies = [ "log 0.3.9", "mime 0.2.6", "num_cpus", - "time 0.1.44", + "time 0.1.45", "traitobject", "typeable", "unicase", @@ -1782,9 +1808,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.20" +version = "0.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" +checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" dependencies = [ "bytes", "futures-channel", @@ -1806,12 +1832,12 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.0" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" +checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ "http", - "hyper 0.14.20", + "hyper 0.14.24", "rustls", "tokio", "tokio-rustls", @@ -1824,7 +1850,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper 0.14.20", + "hyper 0.14.24", "native-tls", "tokio", "tokio-native-tls", @@ -1832,9 +1858,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.51" +version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5a6ef98976b22b3b7f2f3a806f858cb862044cfa66805aa3ad84cb3d3b785ed" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1846,9 +1872,9 @@ dependencies = [ [[package]] name = "iana-time-zone-haiku" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fde6edd6cef363e9359ed3c98ba64590ba9eecba2293eb5a723ab32aee8926aa" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" dependencies = [ "cxx", "cxx-build", @@ -1893,9 +1919,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", "hashbrown 0.12.3", @@ -1933,9 +1959,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.5.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] name = "itertools" @@ -1948,9 +1974,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "jobserver" @@ -1963,9 +1989,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] @@ -1987,9 +2013,12 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" +checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +dependencies = [ + "cpufeatures", +] [[package]] name = "language-tags" @@ -2005,15 +2034,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.135" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "libloading" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ "cfg-if", "winapi", @@ -2069,9 +2098,9 @@ dependencies = [ [[package]] name = "link-cplusplus" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" dependencies = [ "cc", ] @@ -2118,9 +2147,9 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" [[package]] name = "matches" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "memchr" @@ -2130,9 +2159,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memmap2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95af15f345b17af2efc8ead6080fb8bc376f8cec1b35277b935637595fe77498" +checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc" dependencies = [ "libc", ] @@ -2146,6 +2175,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + [[package]] name = "merlin" version = "3.0.0" @@ -2181,9 +2219,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.5.4" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" dependencies = [ "adler", ] @@ -2212,9 +2250,9 @@ dependencies = [ [[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", @@ -2237,19 +2275,28 @@ dependencies = [ "bitflags", "cfg-if", "libc", - "memoffset", + "memoffset 0.6.5", ] [[package]] name = "nom" -version = "7.1.1" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", ] +[[package]] +name = "nom8" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" +dependencies = [ + "memchr", +] + [[package]] name = "ntapi" version = "0.3.7" @@ -2311,9 +2358,9 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -2360,42 +2407,33 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi", + "hermit-abi 0.2.6", "libc", ] [[package]] name = "num_enum" -version = "0.5.7" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" +checksum = "8d829733185c1ca374f17e52b762f24f535ec625d2cc1f070e34c8a9068f341b" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" -dependencies = [ - "proc-macro-crate 1.2.1", - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", -] - -[[package]] -name = "num_threads" -version = "0.1.6" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "2be1598bf1c313dcdd12092e3f1920f463462525a21b7b4e11b4168353d0123e" dependencies = [ - "libc", + "proc-macro-crate 1.3.0", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -2406,27 +2444,27 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.29.0" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" dependencies = [ "memchr", ] [[package]] name = "oid-registry" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d4bda43fd1b844cbc6e6e54b5444e2b1bc7838bce59ad205902cccbb26d6761" +checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" dependencies = [ "asn1-rs", ] [[package]] name = "once_cell" -version = "1.15.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" [[package]] name = "opaque-debug" @@ -2436,9 +2474,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.42" +version = "0.10.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13" +checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" dependencies = [ "bitflags", "cfg-if", @@ -2455,9 +2493,9 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -2468,9 +2506,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.76" +version = "0.9.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5230151e44c0f05157effb743e8d517472843121cf9243e8b81393edb5acd9ce" +checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" dependencies = [ "autocfg", "cc", @@ -2481,9 +2519,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.3.0" +version = "6.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" [[package]] name = "parking_lot" @@ -2493,7 +2531,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core 0.8.5", + "parking_lot_core 0.8.6", ] [[package]] @@ -2503,14 +2541,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.3", + "parking_lot_core 0.9.7", ] [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if", "instant", @@ -2522,15 +2560,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.3" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -2548,14 +2586,14 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", ] [[package]] name = "pem" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" dependencies = [ "base64 0.13.1", ] @@ -2606,9 +2644,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "polyval" @@ -2624,9 +2662,9 @@ dependencies = [ [[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 = "proc-macro-crate" @@ -2639,13 +2677,12 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" +checksum = "66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34" dependencies = [ "once_cell", - "thiserror", - "toml", + "toml_edit", ] [[package]] @@ -2655,9 +2692,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", "version_check 0.9.4", ] @@ -2667,8 +2704,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.46", - "quote 1.0.21", + "proc-macro2 1.0.51", + "quote 1.0.23", "version_check 0.9.4", ] @@ -2683,9 +2720,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.46" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" dependencies = [ "unicode-ident", ] @@ -2696,9 +2733,9 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada" dependencies = [ - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", "version_check 0.9.4", "yansi", ] @@ -2721,9 +2758,9 @@ checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" dependencies = [ "anyhow", "itertools", - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -2776,9 +2813,9 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f832d8958db3e84d2ec93b5eb2272b45aa23cf7f8fe6e79f578896f4e6c231b" +checksum = "b07946277141531aea269befd949ed16b2c85a780ba1043244eda0969e538e54" dependencies = [ "futures-util", "libc", @@ -2799,11 +2836,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ - "proc-macro2 1.0.46", + "proc-macro2 1.0.51", ] [[package]] @@ -2865,7 +2902,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", ] [[package]] @@ -2888,21 +2925,19 @@ dependencies = [ [[package]] name = "rayon" -version = "1.5.3" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" dependencies = [ - "autocfg", - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.3" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -2918,7 +2953,7 @@ checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" dependencies = [ "pem", "ring", - "time 0.3.15", + "time 0.3.17", "yasna", ] @@ -2937,16 +2972,16 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", "redox_syscall", "thiserror", ] [[package]] name = "regex" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ "aho-corasick", "memchr", @@ -2955,9 +2990,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "remove_dir_all" @@ -2970,12 +3005,12 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.12" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc" +checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" dependencies = [ "async-compression", - "base64 0.13.1", + "base64 0.21.0", "bytes", "encoding_rs", "futures-core", @@ -2983,7 +3018,7 @@ dependencies = [ "h2", "http", "http-body", - "hyper 0.14.20", + "hyper 0.14.24", "hyper-rustls", "hyper-tls", "ipnet", @@ -2995,7 +3030,7 @@ dependencies = [ "percent-encoding 2.2.0", "pin-project-lite", "rustls", - "rustls-pemfile 1.0.1", + "rustls-pemfile 1.0.2", "serde", "serde_json", "serde_urlencoded", @@ -3071,9 +3106,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.6" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "log 0.4.17", "ring", @@ -3088,7 +3123,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.1", + "rustls-pemfile 1.0.2", "schannel", "security-framework", ] @@ -3104,24 +3139,24 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64 0.13.1", + "base64 0.21.0", ] [[package]] name = "rustversion" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" +checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" [[package]] name = "safemem" @@ -3131,12 +3166,11 @@ checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" [[package]] name = "schannel" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "lazy_static", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -3147,9 +3181,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scratch" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" [[package]] name = "sct" @@ -3163,9 +3197,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.7.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ "bitflags", "core-foundation", @@ -3176,9 +3210,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.6.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" dependencies = [ "core-foundation-sys", "libc", @@ -3186,9 +3220,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" [[package]] name = "sentry" @@ -3260,50 +3294,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "823923ae5f54a729159d720aa12181673044ee5c79cbda3be09e56f885e5468f" dependencies = [ "debugid", - "getrandom 0.2.7", + "getrandom 0.2.8", "hex", "serde", "serde_json", "thiserror", - "time 0.3.15", + "time 0.3.17", "url 2.3.1", "uuid", ] [[package]] name = "serde" -version = "1.0.145" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.7" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b" +checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.145" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "serde_json" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41feea4228a6f1cd09ec7a3593a682276702cd67b5273544757dae23c096f074" +checksum = "7434af0dc1cbd59268aa98b4c22c131c0584d2232f6fb166efb993e2832e896a" dependencies = [ "itoa", "ryu", @@ -3336,9 +3370,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.13" +version = "0.9.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8613d593412a0deb7bbd8de9d908efff5a0cb9ccd8f62c641e7b2ed2f57291d1" +checksum = "8fb06d4b6cdaef0e0c51fa881acb721bed3c924cfaa71d9c94a3b771dfdf6567" dependencies = [ "indexmap", "itoa", @@ -3349,13 +3383,13 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" +checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -3379,7 +3413,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -3396,14 +3430,20 @@ dependencies = [ [[package]] name = "sha3" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2904bea16a1ae962b483322a1c7b81d976029203aea1f461e51cd7705db7ba9" +checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", "keccak", ] +[[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" @@ -3462,9 +3502,9 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.14.12" +version = "1.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87b4533fe4abfd4c540ece335ad767cc91e93a5263069e2e59225be555c5c839" +checksum = "3476a9ecc99e122f37ed91e6e3e907840fac95a813c4231eef6dae1646b12a2f" dependencies = [ "Inflector", "base64 0.13.1", @@ -3487,9 +3527,9 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" -version = "1.14.12" +version = "1.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceb299cd9df79f4c1abda6f140813f1e451a9a8810d18b84ff9dc3b81f1593c6" +checksum = "536eb4cfe1e6c0699d45222eb0a326be634deff9f1d67ff0e8c303af46265fce" dependencies = [ "bincode", "bytemuck", @@ -3508,9 +3548,9 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "1.14.12" +version = "1.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dde26cacc87164747988cf1cef8e701155188a8d51ed45a7d1be268bc49c41c2" +checksum = "e0cd75d3e7dd5139ba847e27fc30160a9dd8d15381579e2e499da2c34b0fd001" dependencies = [ "chrono", "clap 2.34.0", @@ -3526,9 +3566,9 @@ dependencies = [ [[package]] name = "solana-cli-config" -version = "1.14.12" +version = "1.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aad3cc2faa1721149f1af05b8f10daed33c68b7523bcc82bc7f2835f2ed51746" +checksum = "8312c24dbef52769f8c5ad814ec85b14fcdbab29312bca84d282bc086ea8ec21" dependencies = [ "dirs-next", "lazy_static", @@ -3542,9 +3582,9 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.14.12" +version = "1.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d59b69ee79e5b32f41b381d0e54d81e3a89e3ebe35335a586241dc000e8374" +checksum = "6de56b9046bd69021fdeca08deed17b6a5bf1c035a18cdfaa9e794b0b6da040c" dependencies = [ "async-mutex", "async-trait", @@ -3596,9 +3636,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.14.12" +version = "1.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b80b3dd0cd746511a4bbf9a64a8ddb2b528800437928dd90a1a16ef0e1b95be3" +checksum = "b5a2b03767f3916c4697a1f60e1aa3a47424406933db5c80dd4502564443a6ab" dependencies = [ "bincode", "chrono", @@ -3610,9 +3650,9 @@ dependencies = [ [[package]] name = "solana-faucet" -version = "1.14.12" +version = "1.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e0634db95537eeb77d78f402ea70b513b8bc12ed926b379eca53a1ba5038bbc" +checksum = "ee2847c1b55ad765edf644c7d687c9586ae4cfa21dba734d0381bac28be54821" dependencies = [ "bincode", "byteorder", @@ -3634,9 +3674,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.14.12" +version = "1.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c39813ee5b249cb8ccb325d3639323eb3616e7bb9a2b1502936d7ea20530097" +checksum = "72e131e5e67830c24dea3a916e8bcb8404de36febe015b569c1843282283896b" dependencies = [ "ahash", "blake3", @@ -3668,21 +3708,21 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.14.12" +version = "1.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad43ac27c4b8d7a3ce0e2cb8642a7e3b8ea5e3c29ecea38045a8518519adccf" +checksum = "3ce6b1cbbc9a929eaebb8f009e54d351e411b85f622040e50f9b2d8d0f4a8649" dependencies = [ - "proc-macro2 1.0.46", - "quote 1.0.21", + "proc-macro2 1.0.51", + "quote 1.0.23", "rustc_version", - "syn 1.0.102", + "syn 1.0.107", ] [[package]] name = "solana-geyser-plugin-interface" -version = "1.14.12" +version = "1.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "495f52e8fe04e8b2c9af75539c55a87bf9c2c86d64afc229631e6be436532643" +checksum = "b942f5b94c7aa6b5c9bc0f71b3c3cf8c9683c7b861d75990b37aca8de3fdeae5" dependencies = [ "log 0.4.17", "solana-sdk", @@ -3692,9 +3732,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.14.12" +version = "1.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a18f8d7490f712a4340998fca2b0d35afcdef671320a0e51f40b537363d592" +checksum = "202ab12577144fe5573f3368dcb49246455fd0861aba76bac8a42904366d0313" dependencies = [ "env_logger", "lazy_static", @@ -3703,9 +3743,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.14.12" +version = "1.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e365647d451d2b124d9705e92fcfc6e90790ae317495ff20043b6812eb8c41" +checksum = "e98bf5c9183f9aaa9a7cdb3baa6e34c505b85c51bec24a4c5e3d877c8d55ea9f" dependencies = [ "log 0.4.17", "solana-sdk", @@ -3713,9 +3753,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.14.12" +version = "1.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c4630a427e772ad5a4a64ca43f0d80848af19a1057084c9611a1e71bf027fce" +checksum = "f87de747c0fc1965d1fbc42192478d51f2119cc523dec219ee4877026222223f" dependencies = [ "crossbeam-channel", "gethostname", @@ -3727,12 +3767,12 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.14.12" +version = "1.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740fb87bea9d7b9eee070244441c9079b44fa223224fb1d6bd23da1b8ec0f2b3" +checksum = "f221bbec73c757f039c7ae3d287963caeb19b2e992f7e84ca22aca2b741029d4" dependencies = [ "bincode", - "clap 3.2.22", + "clap 3.2.23", "crossbeam-channel", "log 0.4.17", "nix", @@ -3749,9 +3789,9 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.14.12" +version = "1.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "079105b92b89a0e0b3f238f1c2c40ebffd2171d632236c20f59abac79a8aa978" +checksum = "972fd576895cdbb92022201c617b7a52c1de56118382cb6d72a4ea01d87ca354" dependencies = [ "ahash", "bincode", @@ -3776,9 +3816,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.14.12" +version = "1.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dafff676128fe508ab83147b6fb19534fc33f43ec14789da1f1867e9ea06887" +checksum = "32c5a1723637282e578a21f138eaef6d44fd234ac267525e3ec01569d06c278a" dependencies = [ "base64 0.13.1", "bincode", @@ -3793,14 +3833,14 @@ dependencies = [ "console_error_panic_hook", "console_log", "curve25519-dalek", - "getrandom 0.2.7", + "getrandom 0.2.8", "itertools", "js-sys", "lazy_static", "libc", "libsecp256k1", "log 0.4.17", - "memoffset", + "memoffset 0.6.5", "num-derive", "num-traits", "parking_lot 0.12.1", @@ -3813,7 +3853,7 @@ dependencies = [ "serde_derive", "serde_json", "sha2 0.10.6", - "sha3 0.10.5", + "sha3 0.10.6", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-sdk-macro", @@ -3825,9 +3865,9 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.14.12" +version = "1.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17865dc487a5f38e8f64a8ff3ff14e92a8a71be87ca6ee958ad07f5d1fa4cdf4" +checksum = "d807ad5c1d4fcb72c26d002c7da1ee72e7c7353865f89e426843dcf0f8ab0f3f" dependencies = [ "base64 0.13.1", "bincode", @@ -3852,9 +3892,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.14.12" +version = "1.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82e4deecbe820847c88f091f9b721fad46276575fcfdf177bbc2743731dc25b" +checksum = "d4d1ce0d493fc7fce14ea85fdbf413c90911ad38f2ed97abd66358fc7cf408e6" dependencies = [ "lazy_static", "num_cpus", @@ -3862,9 +3902,9 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.14.12" +version = "1.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09863751b4d9ca46297f0662293561c4a3846abc9cab7b691b091ea9ae3c9340" +checksum = "d2643042cf0d200c4a0524e427c8f7ce563549d877f56316a1419eba80fccf6f" dependencies = [ "console", "dialoguer", @@ -3881,9 +3921,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.14.12" +version = "1.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c702cc57432bc16eab54ad7b5668c2a3cdc72b0f820175972b4857e26ac4f49" +checksum = "7c2284232a7da506454d1e41f348d667119faf9e9c60211f5c62d0bbfb405d8a" dependencies = [ "assert_matches", "base64 0.13.1", @@ -3895,7 +3935,7 @@ dependencies = [ "byteorder", "chrono", "derivation-path", - "digest 0.10.5", + "digest 0.10.6", "ed25519-dalek", "ed25519-dalek-bip32", "generic-array", @@ -3919,7 +3959,7 @@ dependencies = [ "serde_derive", "serde_json", "sha2 0.10.6", - "sha3 0.10.5", + "sha3 0.10.6", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-logger", @@ -3932,22 +3972,22 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.14.12" +version = "1.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f89a14a8f1e7708fe19ee3140125e9d8279945ead74cb09e65c94dd5cf0640c3" +checksum = "66b1eae3692dcafb7e02ea1a463b7e387ed4ada840a324d3857fd7541c14cb0c" dependencies = [ "bs58 0.4.0", - "proc-macro2 1.0.46", - "quote 1.0.21", + "proc-macro2 1.0.51", + "quote 1.0.23", "rustversion", - "syn 1.0.102", + "syn 1.0.107", ] [[package]] name = "solana-streamer" -version = "1.14.12" +version = "1.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7116f13d20003e99f3f8fb5b1b20cb638a8c797ec8fe40dc4840a284bab1e53c" +checksum = "8dd348f960215c21537b6c0b2db6e16862daf23d39060676d2dfeb80ac1c1b1b" dependencies = [ "crossbeam-channel", "futures-util", @@ -3974,9 +4014,9 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "1.14.12" +version = "1.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff48b27221d728dd907400711aa42d07d5fe78c6bf9e35f850c78e89ee800e97" +checksum = "cbb7a4689fb7a1938b2956cd01cba081ebfb02bccda3b7926c5a9090e68b630b" dependencies = [ "Inflector", "base64 0.13.1", @@ -4003,9 +4043,9 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.14.12" +version = "1.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18f9c97e7d62d3e0ef04426cd7731689f5c675e0b4540fa5dca172ab261b57a3" +checksum = "20416b6de4d042ceb2bf4d54c25171afab80ddae9abd5817d4a691623e175070" dependencies = [ "log 0.4.17", "rustc_version", @@ -4019,9 +4059,9 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.14.12" +version = "1.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "694e6ecff6764540b555224308fa3cbccb59135e6029761febdba49d8197faaf" +checksum = "098571b9ad25da26b1e5811bd15173cd0a0b9c6d724768236feebf1bf28e6d98" dependencies = [ "bincode", "log 0.4.17", @@ -4040,9 +4080,9 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.14.12" +version = "1.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32395c4561673f7b4aa1f3a5b5a654eaa363041f67d92f5d680de72293ef7d1b" +checksum = "3fa419f14c8fb7d0c775cbd202377a77f10e80b1b4ac39a8c56aec1910b5c374" dependencies = [ "aes-gcm-siv", "arrayref", @@ -4150,9 +4190,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0547d5945c93f55e1b18bf2a67d1a3d0548561f2687645b22c1c1d4fbb9a8e90" dependencies = [ "bs58 0.4.0", - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -4186,12 +4226,12 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.102" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ - "proc-macro2 1.0.46", - "quote 1.0.21", + "proc-macro2 1.0.51", + "quote 1.0.23", "unicode-ident", ] @@ -4201,9 +4241,9 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", "unicode-xid 0.2.4", ] @@ -4233,23 +4273,13 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] -[[package]] -name = "terminal_size" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "textwrap" version = "0.11.0" @@ -4261,35 +4291,35 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "time" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" dependencies = [ "libc", "wasi 0.10.0+wasi-snapshot-preview1", @@ -4298,21 +4328,30 @@ dependencies = [ [[package]] name = "time" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d634a985c4d4238ec39cacaed2e7ae552fbd3c476b552c1deac3021b7d7eaf0c" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" dependencies = [ "itoa", - "libc", - "num_threads", + "serde", + "time-core", "time-macros", ] +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + [[package]] name = "time-macros" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" +checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +dependencies = [ + "time-core", +] [[package]] name = "tiny-bip39" @@ -4344,9 +4383,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" @@ -4370,20 +4409,20 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.8.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[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", @@ -4443,13 +4482,30 @@ dependencies = [ [[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.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" + +[[package]] +name = "toml_edit" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" +dependencies = [ + "indexmap", + "nom8", + "toml_datetime", +] + [[package]] name = "tower-service" version = "0.3.2" @@ -4474,9 +4530,9 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -4496,9 +4552,9 @@ checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" [[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" @@ -4530,9 +4586,9 @@ checksum = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" [[package]] name = "typenum" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "uname" @@ -4554,15 +4610,15 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "unicode-normalization" @@ -4575,9 +4631,9 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" @@ -4609,9 +4665,9 @@ dependencies = [ [[package]] name = "unsafe-libyaml" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e5fa573d8ac5f1a856f8d7be41d390ee973daf97c806b2c1a465e4e1406e68" +checksum = "bc7ed8ba44ca06be78ea1ad2c3682a43349126c8818054231ee6f4748012aed2" [[package]] name = "untrusted" @@ -4660,11 +4716,11 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "uuid" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" +checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", "serde", ] @@ -4728,9 +4784,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4738,24 +4794,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log 0.4.17", "once_cell", - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ "cfg-if", "js-sys", @@ -4765,38 +4821,38 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ - "quote 1.0.21", + "quote 1.0.23", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", @@ -4814,9 +4870,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ "webpki", ] @@ -4854,46 +4910,84 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.36.1" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" dependencies = [ + "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", "windows_i686_msvc", "windows_x86_64_gnu", + "windows_x86_64_gnullvm", "windows_x86_64_msvc", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + [[package]] name = "windows_aarch64_msvc" -version = "0.36.1" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] name = "windows_i686_gnu" -version = "0.36.1" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] name = "windows_i686_msvc" -version = "0.36.1" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] name = "winreg" @@ -4919,7 +5013,7 @@ dependencies = [ "oid-registry", "rusticata-macros", "thiserror", - "time 0.3.15", + "time 0.3.17", ] [[package]] @@ -4939,11 +5033,11 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "yasna" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346d34a236c9d3e5f3b9b74563f238f955bbd05fa0b8b4efa53c130c43982f4c" +checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" dependencies = [ - "time 0.3.15", + "time 0.3.17", ] [[package]] @@ -4957,13 +5051,13 @@ dependencies = [ [[package]] name = "zeroize_derive" -version = "1.3.2" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" +checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ - "proc-macro2 1.0.46", - "quote 1.0.21", - "syn 1.0.102", + "proc-macro2 1.0.51", + "quote 1.0.23", + "syn 1.0.107", "synstructure", ] @@ -4988,10 +5082,11 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.1+zstd.1.5.2" +version = "2.0.6+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" +checksum = "68a3f9792c0c3dc6c165840a75f47ae1f4da402c2d006881129579f6597e801b" dependencies = [ "cc", "libc", + "pkg-config", ] diff --git a/plugin/Cargo.toml b/plugin/Cargo.toml index 8d2950a10..341c851f2 100644 --- a/plugin/Cargo.toml +++ b/plugin/Cargo.toml @@ -43,6 +43,11 @@ solana-transaction-status = "~1.14.12" thiserror = "1.0.30" tokio = "~1.14.1" futures = "0.3.26" +sha2 = "0.10.6" + + +[dependencies.chain-drive] +git = "https://github.com/GenesysGo/shadow-drive-clockwork.git" [build-dependencies] cargo_toml = "0.13.0" diff --git a/plugin/src/builders/thread_exec.rs b/plugin/src/builders/thread_exec.rs index 64ca4b927..1659f4c6a 100644 --- a/plugin/src/builders/thread_exec.rs +++ b/plugin/src/builders/thread_exec.rs @@ -1,11 +1,14 @@ use std::sync::Arc; +use anchor_lang::{AnchorDeserialize, InstructionData}; +use chain_drive::{instructions::summon::DataToBeSummoned, ID as SHADOW_PORTAL_ID}; use clockwork_client::{ network::state::Worker, thread::state::{Thread, Trigger}, }; use clockwork_utils::automation::PAYER_PUBKEY; use log::info; +use sha2::{Digest, Sha256}; use solana_account_decoder::UiAccountEncoding; use solana_client::{ nonblocking::rpc_client::RpcClient, @@ -44,7 +47,7 @@ pub async fn build_thread_exec_tx( // Build the first instruction of the transaction. let first_instruction = if thread.next_instruction.is_some() { - build_exec_ix(thread, signatory_pubkey, worker_id) + build_exec_ix(thread, signatory_pubkey, worker_id, Arc::clone(&client)).await } else { build_kickoff_ix(thread, signatory_pubkey, worker_id) }; @@ -118,11 +121,15 @@ pub async fn build_thread_exec_tx( if let Some(exec_context) = sim_thread.exec_context { if exec_context.execs_since_slot.lt(&sim_thread.rate_limit) { - ixs.push(build_exec_ix( - sim_thread, - signatory_pubkey, - worker_id, - )); + ixs.push( + build_exec_ix( + sim_thread, + signatory_pubkey, + worker_id, + Arc::clone(&client), + ) + .await, + ); } else { // Exit early if the thread has reached its rate limit. break; @@ -196,7 +203,12 @@ fn build_kickoff_ix(thread: Thread, signatory_pubkey: Pubkey, worker_id: u64) -> kickoff_ix } -fn build_exec_ix(thread: Thread, signatory_pubkey: Pubkey, worker_id: u64) -> Instruction { +async fn build_exec_ix( + thread: Thread, + signatory_pubkey: Pubkey, + worker_id: u64, + client: Arc, +) -> Instruction { // Build the instruction. let thread_pubkey = Thread::pubkey(thread.authority, thread.id); let mut exec_ix = clockwork_client::thread::instruction::thread_exec( @@ -205,7 +217,7 @@ fn build_exec_ix(thread: Thread, signatory_pubkey: Pubkey, worker_id: u64) -> In Worker::pubkey(worker_id), ); - if let Some(next_instruction) = thread.next_instruction { + if let Some(mut next_instruction) = thread.next_instruction { // Inject the target program account. exec_ix.accounts.push(AccountMeta::new_readonly( next_instruction.program_id, @@ -213,7 +225,7 @@ fn build_exec_ix(thread: Thread, signatory_pubkey: Pubkey, worker_id: u64) -> In )); // Inject the worker pubkey as the dynamic "payer" account. - for acc in next_instruction.clone().accounts { + for acc in &next_instruction.accounts { let acc_pubkey = if acc.pubkey == PAYER_PUBKEY { signatory_pubkey } else { @@ -224,7 +236,44 @@ fn build_exec_ix(thread: Thread, signatory_pubkey: Pubkey, worker_id: u64) -> In false => AccountMeta::new_readonly(acc_pubkey, false), }) } + + // If using a shadow portal, append appropriate data + if next_instruction.program_id.eq(&SHADOW_PORTAL_ID) { + match &next_instruction.data[..] { + _data if _data == *UPLOAD_DATA_DISCRIMINATOR => { + // First, determine what data to upload + if let Ok(account_data) = client + .get_account_data(&next_instruction.accounts[1].pubkey) + .await + { + if let Ok(metadata) = DataToBeSummoned::try_from_slice(&account_data) { + if let Ok(response) = reqwest::get(metadata.get_source()).await { + if let Ok(data) = response.bytes().await { + // Check if hash is right + let mut hasher = Sha256::new(); + hasher.update(&data); + if (*hasher.finalize()).eq(&metadata.hash) { + next_instruction.data.append(&mut data.to_vec()); + } + } + } + } + } + } + + _data if _data == *DELETE_DATA_DISCRIMINATOR => { + // do nothing + } + + _ => {} + } + } } exec_ix } + +lazy_static::lazy_static! { + static ref UPLOAD_DATA_DISCRIMINATOR: Vec = chain_drive::instruction::Upload { data: vec![] }.data(); + static ref DELETE_DATA_DISCRIMINATOR: Vec = chain_drive::instruction::Delete {}.data(); +} From 99208db9edd709deba02c976f32ed9f33ea6e168 Mon Sep 17 00:00:00 2001 From: cavemanloverboy Date: Thu, 9 Feb 2023 21:39:06 +0000 Subject: [PATCH 2/6] switch to account-based mods --- Cargo.lock | 108 +++++++++++---------- cli/src/processor/localnet.rs | 16 ++- plugin/Cargo.toml | 17 ++-- plugin/src/builders/thread_exec.rs | 78 ++++++++++++--- plugin/src/events.rs | 20 +++- plugin/src/executors/tx.rs | 151 +++++++++++++++++++++++++++-- plugin/src/plugin.rs | 13 +++ 7 files changed, 319 insertions(+), 84 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fd1eef810..c47be4f8e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -699,9 +699,11 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chain-drive" version = "0.1.0" -source = "git+https://github.com/GenesysGo/shadow-drive-clockwork.git#5a44cfd72d538d137ccba9a2f3a719dd65a8de39" dependencies = [ "anchor-lang", + "chrono", + "clockwork-cron", + "clockwork-sdk", "sha2 0.10.6", ] @@ -3502,9 +3504,9 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.14.14" +version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3476a9ecc99e122f37ed91e6e3e907840fac95a813c4231eef6dae1646b12a2f" +checksum = "87b4533fe4abfd4c540ece335ad767cc91e93a5263069e2e59225be555c5c839" dependencies = [ "Inflector", "base64 0.13.1", @@ -3527,9 +3529,9 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" -version = "1.14.14" +version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "536eb4cfe1e6c0699d45222eb0a326be634deff9f1d67ff0e8c303af46265fce" +checksum = "ceb299cd9df79f4c1abda6f140813f1e451a9a8810d18b84ff9dc3b81f1593c6" dependencies = [ "bincode", "bytemuck", @@ -3548,9 +3550,9 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "1.14.14" +version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd75d3e7dd5139ba847e27fc30160a9dd8d15381579e2e499da2c34b0fd001" +checksum = "dde26cacc87164747988cf1cef8e701155188a8d51ed45a7d1be268bc49c41c2" dependencies = [ "chrono", "clap 2.34.0", @@ -3566,9 +3568,9 @@ dependencies = [ [[package]] name = "solana-cli-config" -version = "1.14.14" +version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8312c24dbef52769f8c5ad814ec85b14fcdbab29312bca84d282bc086ea8ec21" +checksum = "aad3cc2faa1721149f1af05b8f10daed33c68b7523bcc82bc7f2835f2ed51746" dependencies = [ "dirs-next", "lazy_static", @@ -3582,9 +3584,9 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.14.14" +version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6de56b9046bd69021fdeca08deed17b6a5bf1c035a18cdfaa9e794b0b6da040c" +checksum = "d2d59b69ee79e5b32f41b381d0e54d81e3a89e3ebe35335a586241dc000e8374" dependencies = [ "async-mutex", "async-trait", @@ -3636,9 +3638,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.14.14" +version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a2b03767f3916c4697a1f60e1aa3a47424406933db5c80dd4502564443a6ab" +checksum = "b80b3dd0cd746511a4bbf9a64a8ddb2b528800437928dd90a1a16ef0e1b95be3" dependencies = [ "bincode", "chrono", @@ -3650,9 +3652,9 @@ dependencies = [ [[package]] name = "solana-faucet" -version = "1.14.14" +version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2847c1b55ad765edf644c7d687c9586ae4cfa21dba734d0381bac28be54821" +checksum = "9e0634db95537eeb77d78f402ea70b513b8bc12ed926b379eca53a1ba5038bbc" dependencies = [ "bincode", "byteorder", @@ -3674,9 +3676,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.14.14" +version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e131e5e67830c24dea3a916e8bcb8404de36febe015b569c1843282283896b" +checksum = "1c39813ee5b249cb8ccb325d3639323eb3616e7bb9a2b1502936d7ea20530097" dependencies = [ "ahash", "blake3", @@ -3708,9 +3710,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.14.14" +version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ce6b1cbbc9a929eaebb8f009e54d351e411b85f622040e50f9b2d8d0f4a8649" +checksum = "dad43ac27c4b8d7a3ce0e2cb8642a7e3b8ea5e3c29ecea38045a8518519adccf" dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", @@ -3720,9 +3722,9 @@ dependencies = [ [[package]] name = "solana-geyser-plugin-interface" -version = "1.14.14" +version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b942f5b94c7aa6b5c9bc0f71b3c3cf8c9683c7b861d75990b37aca8de3fdeae5" +checksum = "495f52e8fe04e8b2c9af75539c55a87bf9c2c86d64afc229631e6be436532643" dependencies = [ "log 0.4.17", "solana-sdk", @@ -3732,9 +3734,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.14.14" +version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "202ab12577144fe5573f3368dcb49246455fd0861aba76bac8a42904366d0313" +checksum = "13a18f8d7490f712a4340998fca2b0d35afcdef671320a0e51f40b537363d592" dependencies = [ "env_logger", "lazy_static", @@ -3743,9 +3745,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.14.14" +version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98bf5c9183f9aaa9a7cdb3baa6e34c505b85c51bec24a4c5e3d877c8d55ea9f" +checksum = "a3e365647d451d2b124d9705e92fcfc6e90790ae317495ff20043b6812eb8c41" dependencies = [ "log 0.4.17", "solana-sdk", @@ -3753,9 +3755,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.14.14" +version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f87de747c0fc1965d1fbc42192478d51f2119cc523dec219ee4877026222223f" +checksum = "9c4630a427e772ad5a4a64ca43f0d80848af19a1057084c9611a1e71bf027fce" dependencies = [ "crossbeam-channel", "gethostname", @@ -3767,9 +3769,9 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.14.14" +version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f221bbec73c757f039c7ae3d287963caeb19b2e992f7e84ca22aca2b741029d4" +checksum = "740fb87bea9d7b9eee070244441c9079b44fa223224fb1d6bd23da1b8ec0f2b3" dependencies = [ "bincode", "clap 3.2.23", @@ -3789,9 +3791,9 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.14.14" +version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "972fd576895cdbb92022201c617b7a52c1de56118382cb6d72a4ea01d87ca354" +checksum = "079105b92b89a0e0b3f238f1c2c40ebffd2171d632236c20f59abac79a8aa978" dependencies = [ "ahash", "bincode", @@ -3816,9 +3818,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.14.14" +version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32c5a1723637282e578a21f138eaef6d44fd234ac267525e3ec01569d06c278a" +checksum = "0dafff676128fe508ab83147b6fb19534fc33f43ec14789da1f1867e9ea06887" dependencies = [ "base64 0.13.1", "bincode", @@ -3865,9 +3867,9 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.14.14" +version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d807ad5c1d4fcb72c26d002c7da1ee72e7c7353865f89e426843dcf0f8ab0f3f" +checksum = "17865dc487a5f38e8f64a8ff3ff14e92a8a71be87ca6ee958ad07f5d1fa4cdf4" dependencies = [ "base64 0.13.1", "bincode", @@ -3892,9 +3894,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.14.14" +version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d1ce0d493fc7fce14ea85fdbf413c90911ad38f2ed97abd66358fc7cf408e6" +checksum = "f82e4deecbe820847c88f091f9b721fad46276575fcfdf177bbc2743731dc25b" dependencies = [ "lazy_static", "num_cpus", @@ -3902,9 +3904,9 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.14.14" +version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2643042cf0d200c4a0524e427c8f7ce563549d877f56316a1419eba80fccf6f" +checksum = "09863751b4d9ca46297f0662293561c4a3846abc9cab7b691b091ea9ae3c9340" dependencies = [ "console", "dialoguer", @@ -3921,9 +3923,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.14.14" +version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2284232a7da506454d1e41f348d667119faf9e9c60211f5c62d0bbfb405d8a" +checksum = "9c702cc57432bc16eab54ad7b5668c2a3cdc72b0f820175972b4857e26ac4f49" dependencies = [ "assert_matches", "base64 0.13.1", @@ -3972,9 +3974,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.14.14" +version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66b1eae3692dcafb7e02ea1a463b7e387ed4ada840a324d3857fd7541c14cb0c" +checksum = "f89a14a8f1e7708fe19ee3140125e9d8279945ead74cb09e65c94dd5cf0640c3" dependencies = [ "bs58 0.4.0", "proc-macro2 1.0.51", @@ -3985,9 +3987,9 @@ dependencies = [ [[package]] name = "solana-streamer" -version = "1.14.14" +version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd348f960215c21537b6c0b2db6e16862daf23d39060676d2dfeb80ac1c1b1b" +checksum = "7116f13d20003e99f3f8fb5b1b20cb638a8c797ec8fe40dc4840a284bab1e53c" dependencies = [ "crossbeam-channel", "futures-util", @@ -4014,9 +4016,9 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "1.14.14" +version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbb7a4689fb7a1938b2956cd01cba081ebfb02bccda3b7926c5a9090e68b630b" +checksum = "ff48b27221d728dd907400711aa42d07d5fe78c6bf9e35f850c78e89ee800e97" dependencies = [ "Inflector", "base64 0.13.1", @@ -4043,9 +4045,9 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.14.14" +version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20416b6de4d042ceb2bf4d54c25171afab80ddae9abd5817d4a691623e175070" +checksum = "18f9c97e7d62d3e0ef04426cd7731689f5c675e0b4540fa5dca172ab261b57a3" dependencies = [ "log 0.4.17", "rustc_version", @@ -4059,9 +4061,9 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.14.14" +version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "098571b9ad25da26b1e5811bd15173cd0a0b9c6d724768236feebf1bf28e6d98" +checksum = "694e6ecff6764540b555224308fa3cbccb59135e6029761febdba49d8197faaf" dependencies = [ "bincode", "log 0.4.17", @@ -4080,9 +4082,9 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.14.14" +version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fa419f14c8fb7d0c775cbd202377a77f10e80b1b4ac39a8c56aec1910b5c374" +checksum = "32395c4561673f7b4aa1f3a5b5a654eaa363041f67d92f5d680de72293ef7d1b" dependencies = [ "aes-gcm-siv", "arrayref", diff --git a/cli/src/processor/localnet.rs b/cli/src/processor/localnet.rs index 924d72fe3..795504016 100644 --- a/cli/src/processor/localnet.rs +++ b/cli/src/processor/localnet.rs @@ -1,4 +1,4 @@ -use std::io::Write; +use std::{io::Write, process::Stdio}; #[allow(deprecated)] use { @@ -33,19 +33,24 @@ pub fn start( ) -> Result<(), CliError> { check_test_validator_version(); // Start the validator + println!("\nStarting Test Validator\n"); let validator_process = &mut start_test_validator(client, program_infos, network_url, clone_addresses) .map_err(|err| CliError::FailedLocalnet(err.to_string()))?; // Initialize Clockwork + println!("\nMinting Clockwork Token\n"); let mint_pubkey = mint_clockwork_token(client).map_err(|err| CliError::FailedTransaction(err.to_string()))?; super::initialize::initialize(client, mint_pubkey)?; + println!("\nRegistering Worker\n"); register_worker(client).map_err(|err| CliError::FailedTransaction(err.to_string()))?; + println!("\nCreating Threads\n"); create_threads(client, mint_pubkey) .map_err(|err| CliError::FailedTransaction(err.to_string()))?; // Wait for process to be killed. + println!("\nLocalnet Deployed\n"); _ = validator_process.wait(); Ok(()) @@ -240,11 +245,12 @@ fn start_test_validator( .clone_addresses(clone_addresses) .add_programs_with_path(program_infos) .geyser_plugin_config(home_dir) + .stdout(Stdio::null()) .spawn() .expect("Failed to start local test validator"); // Wait for the validator to become healthy - let ms_wait = 10_000; + let ms_wait = 100_000; let mut count = 0; while count < ms_wait { match client.get_block_height() { @@ -260,8 +266,14 @@ fn start_test_validator( } } } + + // let mut process2 = Command::new("solana logs") + // .spawn() + // .expect("failed to start logs"); + if count == ms_wait { process.kill()?; + // process2.kill()?; std::process::exit(1); } diff --git a/plugin/Cargo.toml b/plugin/Cargo.toml index 341c851f2..bbfe59e22 100644 --- a/plugin/Cargo.toml +++ b/plugin/Cargo.toml @@ -33,13 +33,13 @@ sentry = "0.27.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" simple-error = "0.2.3" -solana-account-decoder = "~1.14.12" -solana-client = "~1.14.12" -solana-geyser-plugin-interface = "~1.14.12" -solana-logger = "~1.14.12" -solana-program = "~1.14.12" -solana-sdk = "~1.14.12" -solana-transaction-status = "~1.14.12" +solana-account-decoder = "=1.14.12" +solana-client = "=1.14.12" +solana-geyser-plugin-interface = "=1.14.12" +solana-logger = "=1.14.12" +solana-program = "=1.14.12" +solana-sdk = "=1.14.12" +solana-transaction-status = "=1.14.12" thiserror = "1.0.30" tokio = "~1.14.1" futures = "0.3.26" @@ -47,7 +47,8 @@ sha2 = "0.10.6" [dependencies.chain-drive] -git = "https://github.com/GenesysGo/shadow-drive-clockwork.git" +# git = "https://github.com/GenesysGo/shadow-drive-clockwork.git" +path = "../../shadow-drive-clockwork/programs/chain-drive/" [build-dependencies] cargo_toml = "0.13.0" diff --git a/plugin/src/builders/thread_exec.rs b/plugin/src/builders/thread_exec.rs index 1659f4c6a..155f4d112 100644 --- a/plugin/src/builders/thread_exec.rs +++ b/plugin/src/builders/thread_exec.rs @@ -49,13 +49,14 @@ pub async fn build_thread_exec_tx( let first_instruction = if thread.next_instruction.is_some() { build_exec_ix(thread, signatory_pubkey, worker_id, Arc::clone(&client)).await } else { - build_kickoff_ix(thread, signatory_pubkey, worker_id) + build_kickoff_ix(thread, signatory_pubkey, worker_id, Arc::clone(&client)).await }; // Simulate the transactino and pack as many instructions as possible until we hit mem/cpu limits. // TODO Migrate to versioned transactions. let mut ixs: Vec = vec![ ComputeBudgetInstruction::set_compute_unit_limit(TRANSACTION_COMPUTE_UNIT_LIMIT), + // uploads first_instruction, ]; let mut successful_ixs: Vec = vec![]; @@ -177,7 +178,52 @@ pub async fn build_thread_exec_tx( Some(tx) } -fn build_kickoff_ix(thread: Thread, signatory_pubkey: Pubkey, worker_id: u64) -> Instruction { +async fn build_kickoff_ix( + mut thread: Thread, + signatory_pubkey: Pubkey, + worker_id: u64, + client: Arc, +) -> Instruction { + dbg!(&thread); + if let Some(kickoff_ix) = thread.instructions.get_mut(0) { + // If using a shadow portal, append appropriate data + println!("ix program id: {}", &kickoff_ix.program_id); + println!("shadow portal id: {}", &SHADOW_PORTAL_ID); + if kickoff_ix.program_id.eq(&SHADOW_PORTAL_ID) { + println!("found shadow portal ix"); + println!("ix data is {:?}", &kickoff_ix.data[..]); + println!("upload data is {:?}", &*UPLOAD_DATA_DISCRIMINATOR); + match &kickoff_ix.data[..] { + _data if _data == *UPLOAD_DATA_DISCRIMINATOR => { + // First, determine what data to upload + if let Ok(account_data) = client + .get_account_data(&kickoff_ix.accounts[1].pubkey) + .await + { + if let Ok(metadata) = DataToBeSummoned::try_from_slice(&account_data) { + if let Ok(response) = reqwest::get(dbg!(metadata.get_source())).await { + if let Ok(data) = response.bytes().await { + // Check if hash is right + let mut hasher = Sha256::new(); + hasher.update(dbg!(&data)); + if (*hasher.finalize()).eq(&metadata.hash) { + kickoff_ix.data.append(&mut data.to_vec()); + } + } + } + } + } + } + + _data if _data == *DELETE_DATA_DISCRIMINATOR => { + // do nothing + } + + _ => {} + } + } + } + // Build the instruction. let thread_pubkey = Thread::pubkey(thread.authority, thread.id); let mut kickoff_ix = clockwork_client::thread::instruction::thread_kickoff( @@ -204,20 +250,21 @@ fn build_kickoff_ix(thread: Thread, signatory_pubkey: Pubkey, worker_id: u64) -> } async fn build_exec_ix( - thread: Thread, + mut thread: Thread, signatory_pubkey: Pubkey, worker_id: u64, client: Arc, ) -> Instruction { + dbg!(&thread); // Build the instruction. let thread_pubkey = Thread::pubkey(thread.authority, thread.id); - let mut exec_ix = clockwork_client::thread::instruction::thread_exec( + let mut exec_ix = dbg!(clockwork_client::thread::instruction::thread_exec( signatory_pubkey, thread_pubkey, Worker::pubkey(worker_id), - ); + )); - if let Some(mut next_instruction) = thread.next_instruction { + if let Some(next_instruction) = thread.next_instruction { // Inject the target program account. exec_ix.accounts.push(AccountMeta::new_readonly( next_instruction.program_id, @@ -236,24 +283,31 @@ async fn build_exec_ix( false => AccountMeta::new_readonly(acc_pubkey, false), }) } + } + if let Some(kickoff_ix) = thread.instructions.get_mut(0) { // If using a shadow portal, append appropriate data - if next_instruction.program_id.eq(&SHADOW_PORTAL_ID) { - match &next_instruction.data[..] { + println!("ix program id: {}", &kickoff_ix.program_id); + println!("shadow portal id: {}", &SHADOW_PORTAL_ID); + if kickoff_ix.program_id.eq(&SHADOW_PORTAL_ID) { + println!("found shadow portal ix"); + println!("ix data is {:?}", &kickoff_ix.data[..]); + println!("upload data is {:?}", &*UPLOAD_DATA_DISCRIMINATOR); + match &kickoff_ix.data[..] { _data if _data == *UPLOAD_DATA_DISCRIMINATOR => { // First, determine what data to upload if let Ok(account_data) = client - .get_account_data(&next_instruction.accounts[1].pubkey) + .get_account_data(&kickoff_ix.accounts[1].pubkey) .await { if let Ok(metadata) = DataToBeSummoned::try_from_slice(&account_data) { - if let Ok(response) = reqwest::get(metadata.get_source()).await { + if let Ok(response) = reqwest::get(dbg!(metadata.get_source())).await { if let Ok(data) = response.bytes().await { // Check if hash is right let mut hasher = Sha256::new(); - hasher.update(&data); + hasher.update(dbg!(&data)); if (*hasher.finalize()).eq(&metadata.hash) { - next_instruction.data.append(&mut data.to_vec()); + kickoff_ix.data.append(&mut data.to_vec()); } } } diff --git a/plugin/src/events.rs b/plugin/src/events.rs index b4074b62a..2d311bda2 100644 --- a/plugin/src/events.rs +++ b/plugin/src/events.rs @@ -1,5 +1,6 @@ -use anchor_lang::Discriminator; +use anchor_lang::{AccountDeserialize, AnchorDeserialize, Discriminator}; use bincode::deserialize; +use chain_drive::instructions::summon::DataToBeSummoned; use clockwork_client::{thread::state::Thread, webhook::state::Request}; use log::info; use solana_geyser_plugin_interface::geyser_plugin_interface::{ @@ -12,6 +13,7 @@ pub enum AccountUpdateEvent { Clock { clock: Clock }, HttpRequest { request: Request }, Thread { thread: Thread }, + Upload { metadata: DataToBeSummoned }, } impl TryFrom> for AccountUpdateEvent { @@ -66,6 +68,22 @@ impl TryFrom> for AccountUpdateEvent { }); } + // If the account belongs to shadow program + if dbg!(owner_pubkey).eq(dbg!(&chain_drive::ID)) && account_info.data.len() > 8 { + dbg!("found sdrive ix"); + let d = &account_info.data[..8]; + if dbg!(d).eq(dbg!(&DataToBeSummoned::DISCRIMINATOR)) { + dbg!("found summon account"); + let mut account_info = account_info; + return Ok(AccountUpdateEvent::Upload { + metadata: dbg!(DataToBeSummoned::try_deserialize(&mut account_info.data)) + .map_err(|_| GeyserPluginError::AccountsUpdateError { + msg: "Failed to parse DataToBeSummoned account".into(), + })?, + }); + } + } + Err(GeyserPluginError::AccountsUpdateError { msg: "Account is not relevant to Clockwork plugin".into(), }) diff --git a/plugin/src/executors/tx.rs b/plugin/src/executors/tx.rs index 4d5f0c6a5..fa1a4111b 100644 --- a/plugin/src/executors/tx.rs +++ b/plugin/src/executors/tx.rs @@ -7,26 +7,30 @@ use std::{ }, }; +use anchor_lang::{prelude::AccountMeta, InstructionData}; use async_once::AsyncOnce; use bincode::serialize; +use chain_drive::{instruction::Upload, instructions::summon::DataToBeSummoned}; use clockwork_client::{ network::state::{Pool, Registry, Snapshot, SnapshotFrame, Worker}, thread::state::Thread, }; use lazy_static::lazy_static; use log::info; +use sha2::{Digest, Sha256}; use solana_client::{ nonblocking::{rpc_client::RpcClient, tpu_client::TpuClient}, - rpc_config::RpcSimulateTransactionConfig, + rpc_config::{RpcSendTransactionConfig, RpcSimulateTransactionConfig}, tpu_client::TpuClientConfig, }; use solana_geyser_plugin_interface::geyser_plugin_interface::{ GeyserPluginError, Result as PluginResult, }; -use solana_program::{hash::Hash, message::Message, pubkey::Pubkey}; +use solana_program::{hash::Hash, instruction::Instruction, message::Message, pubkey::Pubkey}; use solana_sdk::{ commitment_config::CommitmentConfig, signature::{Keypair, Signature}, + signer::Signer, transaction::Transaction, }; use tokio::{runtime::Runtime, sync::RwLock}; @@ -386,7 +390,7 @@ impl TxExecutor { if let Some(tx) = crate::builders::build_thread_exec_tx( client.clone(), &self.keypair, - thread.clone(), + thread, thread_pubkey, self.config.worker_id, ) @@ -433,10 +437,13 @@ impl TxExecutor { } async fn simulate_tx(self: Arc, tx: &Transaction) -> PluginResult { - TPU_CLIENT - .get() - .await - .rpc_client() + let rpc_client = Arc::new(RpcClient::new_with_commitment( + LOCAL_RPC_URL.into(), + CommitmentConfig::processed(), + )); + log::debug!("got rpc for sim"); + + rpc_client .simulate_transaction_with_config( tx, RpcSimulateTransactionConfig { @@ -462,13 +469,141 @@ impl TxExecutor { } async fn submit_tx(self: Arc, tx: &Transaction) -> PluginResult { - if !TPU_CLIENT.get().await.send_transaction(tx).await { + // let tpu_client = TPU_CLIENT.get().await; + // log::debug!("got tpu client"); + // let tpu_client: Option = { + // let rpc_client = Arc::new(RpcClient::new_with_commitment( + // LOCAL_RPC_URL.into(), + // CommitmentConfig::processed(), + // )); + // match TpuClient::new( + // rpc_client, + // LOCAL_WEBSOCKET_URL.into(), + // TpuClientConfig::default(), + // ) + // .await + // { + // Ok(tpu_client) => Some(tpu_client), + // Err(err) => { + // log::debug!("failed to get tpu client {err:#?}"); + // None + // } + // } + // }; + // if let Some(client) = tpu_client { + // if !client.send_transaction(tx).await { + // return Err(GeyserPluginError::Custom( + // "Failed to send transaction".into(), + // )); + // } + // } + // log::debug!("got tpu for sub"); + + let rpc_client = Arc::new(RpcClient::new_with_commitment( + LOCAL_RPC_URL.into(), + CommitmentConfig::processed(), + )); + log::debug!("got rpc for sim"); + if !rpc_client + .send_transaction_with_config( + tx, + RpcSendTransactionConfig { + skip_preflight: true, + ..RpcSendTransactionConfig::default() + }, + ) + .await + .is_ok() + { return Err(GeyserPluginError::Custom( "Failed to send transaction".into(), )); } + Ok(tx.clone()) } + + // #[allow(unused_must_use)] + pub(crate) async fn upload_tx( + self: Arc, + metadata: &DataToBeSummoned, + metadata_pubkey: Pubkey, + client: Arc, + ) -> PluginResult<()> { + // TODO: deserialization will happen every time. need to make it only try deser/upload once + if !metadata.uploaded { + if let Ok(response) = reqwest::get(dbg!(metadata.get_source())).await { + if let Ok(data) = response.bytes().await { + // Check if hash is right + let mut hasher = Sha256::new(); + hasher.update(dbg!(&data)); + if (*hasher.finalize()).eq(&metadata.hash) { + let upload = Upload { + data: data.to_vec(), + }; + let upload_ix_data = upload.data(); + let upload_ix = dbg!(Instruction { + program_id: chain_drive::ID, + accounts: vec![ + AccountMeta::new(self.keypair.pubkey(), true), + AccountMeta::new(metadata_pubkey, false), + AccountMeta::new( + Thread::pubkey( + metadata_pubkey, + metadata_pubkey.to_bytes().to_vec(), + ), + false, + ), + AccountMeta::new_readonly(clockwork_client::thread::ID, false), + AccountMeta::new_readonly( + solana_program::system_program::ID, + false + ), + ], + data: upload_ix_data, + }); + let mut transaction = + Transaction::new_with_payer(&[upload_ix], Some(&self.keypair.pubkey())); + transaction.sign( + &[&self.keypair], + client.get_latest_blockhash().await.expect("TODO"), + ); + // dbg!("simulating upload transaction"); + // match self.clone().simulate_tx(&transaction).await { + // Ok(_) => { + dbg!("sending upload transaction"); + let rpc_client = Arc::new(RpcClient::new_with_commitment( + LOCAL_RPC_URL.into(), + CommitmentConfig::processed(), + )); + match rpc_client + .send_transaction_with_config( + &transaction, + RpcSendTransactionConfig { + skip_preflight: true, + ..RpcSendTransactionConfig::default() + }, + ) + .await + { + Ok(sig) => { + dbg!("upload sig {sig}"); + dbg!(sig); + } + Err(_) => { + dbg!("failed to submit upload"); + } + }; + dbg!("sent upload transaction"); + // } + // Err(err) => log::debug!("upload simulation failed {err:#?}"), + // } + } + } + } + } + Ok(()) + } } impl Debug for TxExecutor { diff --git a/plugin/src/plugin.rs b/plugin/src/plugin.rs index f3186c5ef..3c0a647d8 100644 --- a/plugin/src/plugin.rs +++ b/plugin/src/plugin.rs @@ -136,6 +136,19 @@ impl GeyserPlugin for ClockworkPlugin { .await .ok(); } + AccountUpdateEvent::Upload { metadata } => { + inner + .executors + .tx + .clone() + .upload_tx( + &metadata, + account_pubkey, + Arc::clone(&inner.executors.client), + ) + .await + .ok(); + } } } Ok(()) From 95dd5226365232ac03df1540262264c09bdffa1f Mon Sep 17 00:00:00 2001 From: cavemanloverboy Date: Wed, 15 Feb 2023 07:10:49 +0000 Subject: [PATCH 3/6] remove dbgs and revert to using TPU --- plugin/src/executors/tx.rs | 90 +++----------------------------------- 1 file changed, 7 insertions(+), 83 deletions(-) diff --git a/plugin/src/executors/tx.rs b/plugin/src/executors/tx.rs index fa1a4111b..ae2dfbc56 100644 --- a/plugin/src/executors/tx.rs +++ b/plugin/src/executors/tx.rs @@ -469,61 +469,14 @@ impl TxExecutor { } async fn submit_tx(self: Arc, tx: &Transaction) -> PluginResult { - // let tpu_client = TPU_CLIENT.get().await; - // log::debug!("got tpu client"); - // let tpu_client: Option = { - // let rpc_client = Arc::new(RpcClient::new_with_commitment( - // LOCAL_RPC_URL.into(), - // CommitmentConfig::processed(), - // )); - // match TpuClient::new( - // rpc_client, - // LOCAL_WEBSOCKET_URL.into(), - // TpuClientConfig::default(), - // ) - // .await - // { - // Ok(tpu_client) => Some(tpu_client), - // Err(err) => { - // log::debug!("failed to get tpu client {err:#?}"); - // None - // } - // } - // }; - // if let Some(client) = tpu_client { - // if !client.send_transaction(tx).await { - // return Err(GeyserPluginError::Custom( - // "Failed to send transaction".into(), - // )); - // } - // } - // log::debug!("got tpu for sub"); - - let rpc_client = Arc::new(RpcClient::new_with_commitment( - LOCAL_RPC_URL.into(), - CommitmentConfig::processed(), - )); - log::debug!("got rpc for sim"); - if !rpc_client - .send_transaction_with_config( - tx, - RpcSendTransactionConfig { - skip_preflight: true, - ..RpcSendTransactionConfig::default() - }, - ) - .await - .is_ok() - { + if !TPU_CLIENT.get().await.send_transaction(tx).await { return Err(GeyserPluginError::Custom( "Failed to send transaction".into(), )); } - Ok(tx.clone()) } - // #[allow(unused_must_use)] pub(crate) async fn upload_tx( self: Arc, metadata: &DataToBeSummoned, @@ -532,17 +485,17 @@ impl TxExecutor { ) -> PluginResult<()> { // TODO: deserialization will happen every time. need to make it only try deser/upload once if !metadata.uploaded { - if let Ok(response) = reqwest::get(dbg!(metadata.get_source())).await { + if let Ok(response) = reqwest::get(metadata.get_source()).await { if let Ok(data) = response.bytes().await { // Check if hash is right let mut hasher = Sha256::new(); - hasher.update(dbg!(&data)); + hasher.update(&data); if (*hasher.finalize()).eq(&metadata.hash) { let upload = Upload { data: data.to_vec(), }; let upload_ix_data = upload.data(); - let upload_ix = dbg!(Instruction { + let upload_ix = Instruction { program_id: chain_drive::ID, accounts: vec![ AccountMeta::new(self.keypair.pubkey(), true), @@ -557,47 +510,18 @@ impl TxExecutor { AccountMeta::new_readonly(clockwork_client::thread::ID, false), AccountMeta::new_readonly( solana_program::system_program::ID, - false + false, ), ], data: upload_ix_data, - }); + }; let mut transaction = Transaction::new_with_payer(&[upload_ix], Some(&self.keypair.pubkey())); transaction.sign( &[&self.keypair], client.get_latest_blockhash().await.expect("TODO"), ); - // dbg!("simulating upload transaction"); - // match self.clone().simulate_tx(&transaction).await { - // Ok(_) => { - dbg!("sending upload transaction"); - let rpc_client = Arc::new(RpcClient::new_with_commitment( - LOCAL_RPC_URL.into(), - CommitmentConfig::processed(), - )); - match rpc_client - .send_transaction_with_config( - &transaction, - RpcSendTransactionConfig { - skip_preflight: true, - ..RpcSendTransactionConfig::default() - }, - ) - .await - { - Ok(sig) => { - dbg!("upload sig {sig}"); - dbg!(sig); - } - Err(_) => { - dbg!("failed to submit upload"); - } - }; - dbg!("sent upload transaction"); - // } - // Err(err) => log::debug!("upload simulation failed {err:#?}"), - // } + TPU_CLIENT.get().await.send_transaction(&transaction).await; } } } From d1fff8e4f265b805a8ae814bf4d6f22ae8f0c238 Mon Sep 17 00:00:00 2001 From: cavemanloverboy Date: Wed, 15 Feb 2023 07:17:46 +0000 Subject: [PATCH 4/6] revert exec/kickoff ix changes --- plugin/src/builders/thread_exec.rs | 116 +++-------------------------- 1 file changed, 9 insertions(+), 107 deletions(-) diff --git a/plugin/src/builders/thread_exec.rs b/plugin/src/builders/thread_exec.rs index 155f4d112..752c008e7 100644 --- a/plugin/src/builders/thread_exec.rs +++ b/plugin/src/builders/thread_exec.rs @@ -47,9 +47,9 @@ pub async fn build_thread_exec_tx( // Build the first instruction of the transaction. let first_instruction = if thread.next_instruction.is_some() { - build_exec_ix(thread, signatory_pubkey, worker_id, Arc::clone(&client)).await + build_exec_ix(thread, signatory_pubkey, worker_id) } else { - build_kickoff_ix(thread, signatory_pubkey, worker_id, Arc::clone(&client)).await + build_kickoff_ix(thread, signatory_pubkey, worker_id) }; // Simulate the transactino and pack as many instructions as possible until we hit mem/cpu limits. @@ -122,15 +122,11 @@ pub async fn build_thread_exec_tx( if let Some(exec_context) = sim_thread.exec_context { if exec_context.execs_since_slot.lt(&sim_thread.rate_limit) { - ixs.push( - build_exec_ix( - sim_thread, - signatory_pubkey, - worker_id, - Arc::clone(&client), - ) - .await, - ); + ixs.push(build_exec_ix( + sim_thread, + signatory_pubkey, + worker_id, + )); } else { // Exit early if the thread has reached its rate limit. break; @@ -178,52 +174,7 @@ pub async fn build_thread_exec_tx( Some(tx) } -async fn build_kickoff_ix( - mut thread: Thread, - signatory_pubkey: Pubkey, - worker_id: u64, - client: Arc, -) -> Instruction { - dbg!(&thread); - if let Some(kickoff_ix) = thread.instructions.get_mut(0) { - // If using a shadow portal, append appropriate data - println!("ix program id: {}", &kickoff_ix.program_id); - println!("shadow portal id: {}", &SHADOW_PORTAL_ID); - if kickoff_ix.program_id.eq(&SHADOW_PORTAL_ID) { - println!("found shadow portal ix"); - println!("ix data is {:?}", &kickoff_ix.data[..]); - println!("upload data is {:?}", &*UPLOAD_DATA_DISCRIMINATOR); - match &kickoff_ix.data[..] { - _data if _data == *UPLOAD_DATA_DISCRIMINATOR => { - // First, determine what data to upload - if let Ok(account_data) = client - .get_account_data(&kickoff_ix.accounts[1].pubkey) - .await - { - if let Ok(metadata) = DataToBeSummoned::try_from_slice(&account_data) { - if let Ok(response) = reqwest::get(dbg!(metadata.get_source())).await { - if let Ok(data) = response.bytes().await { - // Check if hash is right - let mut hasher = Sha256::new(); - hasher.update(dbg!(&data)); - if (*hasher.finalize()).eq(&metadata.hash) { - kickoff_ix.data.append(&mut data.to_vec()); - } - } - } - } - } - } - - _data if _data == *DELETE_DATA_DISCRIMINATOR => { - // do nothing - } - - _ => {} - } - } - } - +fn build_kickoff_ix(mut thread: Thread, signatory_pubkey: Pubkey, worker_id: u64) -> Instruction { // Build the instruction. let thread_pubkey = Thread::pubkey(thread.authority, thread.id); let mut kickoff_ix = clockwork_client::thread::instruction::thread_kickoff( @@ -249,12 +200,7 @@ async fn build_kickoff_ix( kickoff_ix } -async fn build_exec_ix( - mut thread: Thread, - signatory_pubkey: Pubkey, - worker_id: u64, - client: Arc, -) -> Instruction { +fn build_exec_ix(mut thread: Thread, signatory_pubkey: Pubkey, worker_id: u64) -> Instruction { dbg!(&thread); // Build the instruction. let thread_pubkey = Thread::pubkey(thread.authority, thread.id); @@ -285,49 +231,5 @@ async fn build_exec_ix( } } - if let Some(kickoff_ix) = thread.instructions.get_mut(0) { - // If using a shadow portal, append appropriate data - println!("ix program id: {}", &kickoff_ix.program_id); - println!("shadow portal id: {}", &SHADOW_PORTAL_ID); - if kickoff_ix.program_id.eq(&SHADOW_PORTAL_ID) { - println!("found shadow portal ix"); - println!("ix data is {:?}", &kickoff_ix.data[..]); - println!("upload data is {:?}", &*UPLOAD_DATA_DISCRIMINATOR); - match &kickoff_ix.data[..] { - _data if _data == *UPLOAD_DATA_DISCRIMINATOR => { - // First, determine what data to upload - if let Ok(account_data) = client - .get_account_data(&kickoff_ix.accounts[1].pubkey) - .await - { - if let Ok(metadata) = DataToBeSummoned::try_from_slice(&account_data) { - if let Ok(response) = reqwest::get(dbg!(metadata.get_source())).await { - if let Ok(data) = response.bytes().await { - // Check if hash is right - let mut hasher = Sha256::new(); - hasher.update(dbg!(&data)); - if (*hasher.finalize()).eq(&metadata.hash) { - kickoff_ix.data.append(&mut data.to_vec()); - } - } - } - } - } - } - - _data if _data == *DELETE_DATA_DISCRIMINATOR => { - // do nothing - } - - _ => {} - } - } - } - exec_ix } - -lazy_static::lazy_static! { - static ref UPLOAD_DATA_DISCRIMINATOR: Vec = chain_drive::instruction::Upload { data: vec![] }.data(); - static ref DELETE_DATA_DISCRIMINATOR: Vec = chain_drive::instruction::Delete {}.data(); -} From 49d4f8dd5854b50ee65d90be639fd0d8883d66ce Mon Sep 17 00:00:00 2001 From: cavemanloverboy Date: Tue, 14 Mar 2023 13:53:24 -0700 Subject: [PATCH 5/6] update to current version of contract --- plugin/Cargo.toml | 3 +-- plugin/src/builders/thread_exec.rs | 7 +++--- plugin/src/events.rs | 13 +++++----- plugin/src/executors/tx.rs | 38 +++++++++++++++++++++++++++--- 4 files changed, 45 insertions(+), 16 deletions(-) diff --git a/plugin/Cargo.toml b/plugin/Cargo.toml index bbfe59e22..2189e608b 100644 --- a/plugin/Cargo.toml +++ b/plugin/Cargo.toml @@ -47,8 +47,7 @@ sha2 = "0.10.6" [dependencies.chain-drive] -# git = "https://github.com/GenesysGo/shadow-drive-clockwork.git" -path = "../../shadow-drive-clockwork/programs/chain-drive/" +git = "https://github.com/GenesysGo/shadow-drive-clockwork.git" [build-dependencies] cargo_toml = "0.13.0" diff --git a/plugin/src/builders/thread_exec.rs b/plugin/src/builders/thread_exec.rs index 752c008e7..f820b5133 100644 --- a/plugin/src/builders/thread_exec.rs +++ b/plugin/src/builders/thread_exec.rs @@ -200,15 +200,14 @@ fn build_kickoff_ix(mut thread: Thread, signatory_pubkey: Pubkey, worker_id: u64 kickoff_ix } -fn build_exec_ix(mut thread: Thread, signatory_pubkey: Pubkey, worker_id: u64) -> Instruction { - dbg!(&thread); +fn build_exec_ix(thread: Thread, signatory_pubkey: Pubkey, worker_id: u64) -> Instruction { // Build the instruction. let thread_pubkey = Thread::pubkey(thread.authority, thread.id); - let mut exec_ix = dbg!(clockwork_client::thread::instruction::thread_exec( + let mut exec_ix = clockwork_client::thread::instruction::thread_exec( signatory_pubkey, thread_pubkey, Worker::pubkey(worker_id), - )); + ); if let Some(next_instruction) = thread.next_instruction { // Inject the target program account. diff --git a/plugin/src/events.rs b/plugin/src/events.rs index 2d311bda2..82793fb33 100644 --- a/plugin/src/events.rs +++ b/plugin/src/events.rs @@ -69,17 +69,16 @@ impl TryFrom> for AccountUpdateEvent { } // If the account belongs to shadow program - if dbg!(owner_pubkey).eq(dbg!(&chain_drive::ID)) && account_info.data.len() > 8 { - dbg!("found sdrive ix"); + if owner_pubkey.eq(&chain_drive::ID) && account_info.data.len() > 8 { let d = &account_info.data[..8]; - if dbg!(d).eq(dbg!(&DataToBeSummoned::DISCRIMINATOR)) { - dbg!("found summon account"); + if d.eq(&DataToBeSummoned::DISCRIMINATOR) { let mut account_info = account_info; return Ok(AccountUpdateEvent::Upload { - metadata: dbg!(DataToBeSummoned::try_deserialize(&mut account_info.data)) - .map_err(|_| GeyserPluginError::AccountsUpdateError { + metadata: DataToBeSummoned::try_deserialize(&mut account_info.data).map_err( + |_| GeyserPluginError::AccountsUpdateError { msg: "Failed to parse DataToBeSummoned account".into(), - })?, + }, + )?, }); } } diff --git a/plugin/src/executors/tx.rs b/plugin/src/executors/tx.rs index ae2dfbc56..7ccde5628 100644 --- a/plugin/src/executors/tx.rs +++ b/plugin/src/executors/tx.rs @@ -5,6 +5,7 @@ use std::{ atomic::{AtomicU64, Ordering}, Arc, }, + time::Duration, }; use anchor_lang::{prelude::AccountMeta, InstructionData}; @@ -20,7 +21,7 @@ use log::info; use sha2::{Digest, Sha256}; use solana_client::{ nonblocking::{rpc_client::RpcClient, tpu_client::TpuClient}, - rpc_config::{RpcSendTransactionConfig, RpcSimulateTransactionConfig}, + rpc_config::RpcSimulateTransactionConfig, tpu_client::TpuClientConfig, }; use solana_geyser_plugin_interface::geyser_plugin_interface::{ @@ -495,19 +496,44 @@ impl TxExecutor { data: data.to_vec(), }; let upload_ix_data = upload.data(); + log::info!("upload tx is uploading to {metadata_pubkey}"); + let metadata_token_account = Pubkey::find_program_address( + &[metadata_pubkey.as_ref()], + &chain_drive::ID, + ) + .0; let upload_ix = Instruction { program_id: chain_drive::ID, accounts: vec![ + // uploader AccountMeta::new(self.keypair.pubkey(), true), + // metadata AccountMeta::new(metadata_pubkey, false), + // metadata token account + AccountMeta::new(metadata_token_account, false), + // shdw payout account + AccountMeta::new(chain_drive::payout_account(), false), + // thread AccountMeta::new( Thread::pubkey( metadata_pubkey, - metadata_pubkey.to_bytes().to_vec(), + metadata + .unique_thread + .map(|id| id.to_le_bytes().to_vec()) + .unwrap_or_else(|| { + >::as_ref( + metadata.filename.as_ref(), + ) + .to_vec() + }), ), false, ), + // thread program AccountMeta::new_readonly(clockwork_client::thread::ID, false), + // token program + AccountMeta::new_readonly(chain_drive::TOKEN_PROGRAM_ID, false), + // system program AccountMeta::new_readonly( solana_program::system_program::ID, false, @@ -521,7 +547,13 @@ impl TxExecutor { &[&self.keypair], client.get_latest_blockhash().await.expect("TODO"), ); - TPU_CLIENT.get().await.send_transaction(&transaction).await; + if let Err(e) = client.send_and_confirm_transaction(&transaction).await { + log::error!("upload failed {e:#?}"); + tokio::time::sleep(Duration::from_millis(400)).await; + TPU_CLIENT.get().await.send_transaction(&transaction).await; + }; + } else { + log::error!("invalid hash"); } } } From f7ae265cb3b79a03ba9901a009ccd4feedb95deb Mon Sep 17 00:00:00 2001 From: cavemanloverboy Date: Tue, 14 Mar 2023 13:53:41 -0700 Subject: [PATCH 6/6] commit lock --- Cargo.lock | 785 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 448 insertions(+), 337 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c47be4f8e..4c61ec147 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -106,10 +106,10 @@ checksum = "cf7d535e1381be3de2c0716c0a1c1e32ad9df1042cddcf7bc18d743569e53319" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.51", - "quote 1.0.23", + "proc-macro2 1.0.52", + "quote 1.0.26", "regex", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -121,10 +121,10 @@ dependencies = [ "anchor-syn", "anyhow", "bs58 0.4.0", - "proc-macro2 1.0.51", - "quote 1.0.23", + "proc-macro2 1.0.52", + "quote 1.0.26", "rustversion", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -134,8 +134,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1be64a48e395fe00b8217287f226078be2cf32dae42fdf8a885b997945c3d28" dependencies = [ "anchor-syn", - "proc-macro2 1.0.51", - "syn 1.0.107", + "proc-macro2 1.0.52", + "syn 1.0.109", ] [[package]] @@ -145,9 +145,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38ea6713d1938c0da03656ff8a693b17dc0396da66d1ba320557f07e86eca0d4" dependencies = [ "anchor-syn", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -158,9 +158,9 @@ checksum = "d401f11efb3644285685f8339829a9786d43ed7490bb1699f33c478d04d5a582" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -172,9 +172,9 @@ dependencies = [ "anchor-syn", "anyhow", "heck 0.3.3", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -185,9 +185,9 @@ checksum = "6ad769993b5266714e8939e47fbdede90e5c030333c7522d99a4d4748cf26712" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -198,9 +198,9 @@ checksum = "4e677fae4a016a554acdd0e3b7f178d3acafaa7e7ffac6b8690cf4e171f1c116" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -211,9 +211,9 @@ checksum = "340beef6809d1c3fcc7ae219153d981e95a8a277ff31985bd7050e32645dc9a8" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -261,13 +261,13 @@ dependencies = [ "anyhow", "bs58 0.3.1", "heck 0.3.3", - "proc-macro2 1.0.51", + "proc-macro2 1.0.52", "proc-macro2-diagnostics", - "quote 1.0.23", + "quote 1.0.26", "serde", "serde_json", "sha2 0.9.9", - "syn 1.0.107", + "syn 1.0.109", "thiserror", ] @@ -309,9 +309,9 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "asn1-rs" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf6690c370453db30743b373a60ba498fc0d6d83b11f4abfd87a84a075db5dd4" +checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" dependencies = [ "asn1-rs-derive", "asn1-rs-impl", @@ -320,7 +320,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.17", + "time 0.3.20", ] [[package]] @@ -329,9 +329,9 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", "synstructure", ] @@ -341,9 +341,9 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -377,13 +377,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.64" +version = "0.1.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" +checksum = "b84f9ebcc6c1f5b8cb160f6990096a5c127f423fcb6e1ccc46c370cbdfb75dfc" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -454,9 +454,9 @@ checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" [[package]] name = "base64ct" -version = "1.5.3" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bincode" @@ -508,9 +508,9 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] @@ -540,8 +540,8 @@ dependencies = [ "borsh-derive-internal", "borsh-schema-derive-internal", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.51", - "syn 1.0.107", + "proc-macro2 1.0.52", + "syn 1.0.109", ] [[package]] @@ -550,9 +550,9 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -561,9 +561,9 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -631,9 +631,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" dependencies = [ "bytemuck_derive", ] @@ -644,9 +644,9 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aca418a974d83d40a0c1f0c5cba6ff4bc28d8df099109ca459a2118d40b6322" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -699,19 +699,21 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chain-drive" version = "0.1.0" +source = "git+https://github.com/GenesysGo/shadow-drive-clockwork.git#0e77871a45fda87d606ab483bcace29ab7c2c850" dependencies = [ "anchor-lang", + "anchor-spl", "chrono", - "clockwork-cron", - "clockwork-sdk", + "clockwork-cron 1.4.2 (git+https://github.com/genesysgo/clockwork.git?branch=sdrive)", + "clockwork-sdk 1.4.2 (git+https://github.com/genesysgo/clockwork.git?branch=sdrive)", "sha2 0.10.6", ] [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" dependencies = [ "iana-time-zone", "js-sys", @@ -734,9 +736,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", @@ -782,9 +784,9 @@ checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" dependencies = [ "heck 0.4.1", "proc-macro-error", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -805,13 +807,13 @@ dependencies = [ "chrono", "clap 3.2.23", "clockwork-client", - "clockwork-cron", - "clockwork-utils", + "clockwork-cron 1.4.2", + "clockwork-utils 1.4.2", "dirs-next", "regex", "serde", "serde_json", - "serde_yaml 0.9.17", + "serde_yaml 0.9.19", "solana-account-decoder", "solana-clap-utils", "solana-cli-config", @@ -832,9 +834,9 @@ dependencies = [ "anchor-spl", "bincode", "borsh", - "clockwork-network-program", - "clockwork-thread-program", - "clockwork-utils", + "clockwork-network-program 1.4.2", + "clockwork-thread-program 1.4.2", + "clockwork-utils 1.4.2", "clockwork-webhook-program", "solana-client", "solana-sdk", @@ -851,13 +853,33 @@ dependencies = [ "once_cell", ] +[[package]] +name = "clockwork-cron" +version = "1.4.2" +source = "git+https://github.com/genesysgo/clockwork.git?branch=sdrive#d1fff8e4f265b805a8ae814bf4d6f22ae8f0c238" +dependencies = [ + "chrono", + "nom", + "once_cell", +] + +[[package]] +name = "clockwork-macros" +version = "1.4.0" +dependencies = [ + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", +] + [[package]] name = "clockwork-macros" version = "1.4.0" +source = "git+https://github.com/genesysgo/clockwork.git?branch=sdrive#d1fff8e4f265b805a8ae814bf4d6f22ae8f0c238" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -866,8 +888,19 @@ version = "1.4.2" dependencies = [ "anchor-lang", "anchor-spl", - "clockwork-macros", - "clockwork-utils", + "clockwork-macros 1.4.0", + "clockwork-utils 1.4.2", +] + +[[package]] +name = "clockwork-network-program" +version = "1.4.2" +source = "git+https://github.com/genesysgo/clockwork.git?branch=sdrive#d1fff8e4f265b805a8ae814bf4d6f22ae8f0c238" +dependencies = [ + "anchor-lang", + "anchor-spl", + "clockwork-macros 1.4.0 (git+https://github.com/genesysgo/clockwork.git?branch=sdrive)", + "clockwork-utils 1.4.2 (git+https://github.com/genesysgo/clockwork.git?branch=sdrive)", ] [[package]] @@ -876,21 +909,48 @@ version = "1.4.2" dependencies = [ "anchor-lang", "chrono", - "clockwork-thread-program", + "clockwork-thread-program 1.4.2", "nom", "once_cell", ] +[[package]] +name = "clockwork-sdk" +version = "1.4.2" +source = "git+https://github.com/genesysgo/clockwork.git?branch=sdrive#d1fff8e4f265b805a8ae814bf4d6f22ae8f0c238" +dependencies = [ + "anchor-lang", + "chrono", + "clockwork-thread-program 1.4.2 (git+https://github.com/genesysgo/clockwork.git?branch=sdrive)", + "nom", + "once_cell", +] + +[[package]] +name = "clockwork-thread-program" +version = "1.4.2" +dependencies = [ + "anchor-lang", + "chrono", + "clockwork-cron 1.4.2", + "clockwork-macros 1.4.0", + "clockwork-network-program 1.4.2", + "clockwork-utils 1.4.2", + "static-pubkey", + "version", +] + [[package]] name = "clockwork-thread-program" version = "1.4.2" +source = "git+https://github.com/genesysgo/clockwork.git?branch=sdrive#d1fff8e4f265b805a8ae814bf4d6f22ae8f0c238" dependencies = [ "anchor-lang", "chrono", - "clockwork-cron", - "clockwork-macros", - "clockwork-network-program", - "clockwork-utils", + "clockwork-cron 1.4.2 (git+https://github.com/genesysgo/clockwork.git?branch=sdrive)", + "clockwork-macros 1.4.0 (git+https://github.com/genesysgo/clockwork.git?branch=sdrive)", + "clockwork-network-program 1.4.2 (git+https://github.com/genesysgo/clockwork.git?branch=sdrive)", + "clockwork-utils 1.4.2 (git+https://github.com/genesysgo/clockwork.git?branch=sdrive)", "static-pubkey", "version", ] @@ -904,13 +964,23 @@ dependencies = [ "static-pubkey", ] +[[package]] +name = "clockwork-utils" +version = "1.4.2" +source = "git+https://github.com/genesysgo/clockwork.git?branch=sdrive#d1fff8e4f265b805a8ae814bf4d6f22ae8f0c238" +dependencies = [ + "anchor-lang", + "base64 0.13.1", + "static-pubkey", +] + [[package]] name = "clockwork-webhook-program" version = "1.4.2" dependencies = [ "anchor-lang", - "clockwork-macros", - "clockwork-network-program", + "clockwork-macros 1.4.0", + "clockwork-network-program 1.4.2", ] [[package]] @@ -927,8 +997,8 @@ dependencies = [ "chain-drive", "chrono", "clockwork-client", - "clockwork-cron", - "clockwork-utils", + "clockwork-cron 1.4.2", + "clockwork-utils 1.4.2", "futures", "lazy_static", "log 0.4.17", @@ -985,9 +1055,9 @@ dependencies = [ [[package]] name = "console_log" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501a375961cef1a0d44767200e66e4a559283097e91d0730b1d75dfb2f8a1494" +checksum = "e89f72f65e8501878b8a004d5a1afb780987e2ce2b4532c562e367a72c57499f" dependencies = [ "log 0.4.17", "web-sys", @@ -1001,9 +1071,9 @@ checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" [[package]] name = "constant_time_eq" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" +checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" [[package]] name = "core-foundation" @@ -1041,9 +1111,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" dependencies = [ "cfg-if", "crossbeam-utils", @@ -1051,9 +1121,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -1062,22 +1132,22 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.13" +version = "0.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.7.1", + "memoffset 0.8.0", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ "cfg-if", ] @@ -1133,9 +1203,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.89" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc831ee6a32dd495436e317595e639a587aa9907bef96fe6e6abc290ab6204e9" +checksum = "9a140f260e6f3f79013b8bfc65e7ce630c9ab4388c6a89c71e07226f49487b72" dependencies = [ "cc", "cxxbridge-flags", @@ -1145,34 +1215,34 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.89" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94331d54f1b1a8895cd81049f7eaaaef9d05a7dcb4d1fd08bf3ff0806246789d" +checksum = "da6383f459341ea689374bf0a42979739dc421874f112ff26f829b8040b8e613" dependencies = [ "cc", "codespan-reporting", "once_cell", - "proc-macro2 1.0.51", - "quote 1.0.23", + "proc-macro2 1.0.52", + "quote 1.0.26", "scratch", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "cxxbridge-flags" -version = "1.0.89" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dcd35ba14ca9b40d6e4b4b39961f23d835dbb8eed74565ded361d93e1feb8a" +checksum = "90201c1a650e95ccff1c8c0bb5a343213bdd317c6e600a93075bca2eff54ec97" [[package]] name = "cxxbridge-macro" -version = "1.0.89" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bbeb29798b407ccd82a3324ade1a7286e0d29851475990b612670f6f5124d2" +checksum = "0b75aed41bb2e6367cae39e6326ef817a851db13c13e4f3263714ca3cfb8de56" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -1202,9 +1272,9 @@ dependencies = [ [[package]] name = "der-parser" -version = "8.1.0" +version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d4bc9b0db0a0df9ae64634ac5bdefb7afcb534e182275ca0beadbe486701c1" +checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" dependencies = [ "asn1-rs", "displaydoc", @@ -1247,7 +1317,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ - "block-buffer 0.10.3", + "block-buffer 0.10.4", "crypto-common", "subtle", ] @@ -1279,9 +1349,9 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -1384,9 +1454,9 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8958699f9359f0b04e691a13850d48b7de329138023876d07cbd024c2c820598" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -1396,9 +1466,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" dependencies = [ "once_cell", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -1414,6 +1484,27 @@ dependencies = [ "termcolor", ] +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + [[package]] name = "event-listener" version = "2.5.3" @@ -1422,9 +1513,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "fastrand" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] @@ -1477,9 +1568,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84" +checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549" dependencies = [ "futures-channel", "futures-core", @@ -1492,9 +1583,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" +checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" dependencies = [ "futures-core", "futures-sink", @@ -1502,15 +1593,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" +checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" [[package]] name = "futures-executor" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e" +checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" dependencies = [ "futures-core", "futures-task", @@ -1519,38 +1610,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" +checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" [[package]] name = "futures-macro" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" +checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "futures-sink" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" +checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" [[package]] name = "futures-task" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" +checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" [[package]] name = "futures-util" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" +checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" dependencies = [ "futures-channel", "futures-core", @@ -1622,15 +1713,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "221996f774192f0f718773def8201c4ae31f02616a54ccfc2d358bb0e5cefdec" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" [[package]] name = "h2" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" dependencies = [ "bytes", "fnv", @@ -1751,9 +1842,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -1810,9 +1901,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.24" +version = "0.14.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" +checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" dependencies = [ "bytes", "futures-channel", @@ -1839,7 +1930,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ "http", - "hyper 0.14.24", + "hyper 0.14.25", "rustls", "tokio", "tokio-rustls", @@ -1852,7 +1943,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper 0.14.24", + "hyper 0.14.25", "native-tls", "tokio", "tokio-native-tls", @@ -1959,6 +2050,16 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "io-lifetimes" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3" +dependencies = [ + "libc", + "windows-sys 0.45.0", +] + [[package]] name = "ipnet" version = "2.7.1" @@ -1976,15 +2077,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jobserver" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" dependencies = [ "libc", ] @@ -2036,9 +2137,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" [[package]] name = "libloading" @@ -2113,6 +2214,12 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + [[package]] name = "lock_api" version = "0.4.9" @@ -2161,9 +2268,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memmap2" -version = "0.5.8" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" dependencies = [ "libc", ] @@ -2179,9 +2286,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ "autocfg", ] @@ -2290,15 +2397,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "nom8" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" -dependencies = [ - "memchr", -] - [[package]] name = "ntapi" version = "0.3.7" @@ -2360,9 +2458,9 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -2419,23 +2517,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d829733185c1ca374f17e52b762f24f535ec625d2cc1f070e34c8a9068f341b" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2be1598bf1c313dcdd12092e3f1920f463462525a21b7b4e11b4168353d0123e" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ - "proc-macro-crate 1.3.0", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro-crate 1.3.1", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -2464,9 +2562,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "opaque-debug" @@ -2495,9 +2593,9 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -2679,9 +2777,9 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", "toml_edit", @@ -2694,9 +2792,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", "version_check 0.9.4", ] @@ -2706,8 +2804,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", + "proc-macro2 1.0.52", + "quote 1.0.26", "version_check 0.9.4", ] @@ -2722,9 +2820,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.51" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" dependencies = [ "unicode-ident", ] @@ -2735,9 +2833,9 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", "version_check 0.9.4", "yansi", ] @@ -2760,9 +2858,9 @@ checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" dependencies = [ "anyhow", "itertools", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -2838,11 +2936,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.23" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ - "proc-macro2 1.0.51", + "proc-macro2 1.0.52", ] [[package]] @@ -2927,9 +3025,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ "either", "rayon-core", @@ -2937,9 +3035,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.10.2" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -2955,7 +3053,7 @@ checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" dependencies = [ "pem", "ring", - "time 0.3.17", + "time 0.3.20", "yasna", ] @@ -2996,15 +3094,6 @@ version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - [[package]] name = "reqwest" version = "0.11.14" @@ -3020,7 +3109,7 @@ dependencies = [ "h2", "http", "http-body", - "hyper 0.14.24", + "hyper 0.14.25", "hyper-rustls", "hyper-tls", "ipnet", @@ -3106,6 +3195,20 @@ dependencies = [ "nom", ] +[[package]] +name = "rustix" +version = "0.36.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.45.0", +] + [[package]] name = "rustls" version = "0.20.8" @@ -3150,15 +3253,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "safemem" @@ -3183,9 +3286,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scratch" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" [[package]] name = "sct" @@ -3222,9 +3325,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "sentry" @@ -3301,16 +3404,16 @@ dependencies = [ "serde", "serde_json", "thiserror", - "time 0.3.17", + "time 0.3.20", "url 2.3.1", "uuid", ] [[package]] name = "serde" -version = "1.0.152" +version = "1.0.156" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "314b5b092c0ade17c00142951e50ced110ec27cea304b1037c6969246c2469a4" dependencies = [ "serde_derive", ] @@ -3326,20 +3429,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.156" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "d7e29c4601e36bcec74a223228dce795f4cd3616341a4af93520ca1a837c087d" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "serde_json" -version = "1.0.92" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7434af0dc1cbd59268aa98b4c22c131c0584d2232f6fb166efb993e2832e896a" +checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" dependencies = [ "itoa", "ryu", @@ -3372,9 +3475,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.17" +version = "0.9.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb06d4b6cdaef0e0c51fa881acb721bed3c924cfaa71d9c94a3b771dfdf6567" +checksum = "f82e6c8c047aa50a7328632d067bcae6ef38772a79e28daf32f735e0e4f3dd10" dependencies = [ "indexmap", "itoa", @@ -3448,9 +3551,9 @@ 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", ] @@ -3479,9 +3582,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] @@ -3494,9 +3597,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -3714,10 +3817,10 @@ version = "1.14.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dad43ac27c4b8d7a3ce0e2cb8642a7e3b8ea5e3c29ecea38045a8518519adccf" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", + "proc-macro2 1.0.52", + "quote 1.0.26", "rustc_version", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -3979,10 +4082,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f89a14a8f1e7708fe19ee3140125e9d8279945ead74cb09e65c94dd5cf0640c3" dependencies = [ "bs58 0.4.0", - "proc-macro2 1.0.51", - "quote 1.0.23", + "proc-macro2 1.0.52", + "quote 1.0.26", "rustversion", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -4092,7 +4195,7 @@ dependencies = [ "bincode", "bytemuck", "byteorder", - "cipher 0.4.3", + "cipher 0.4.4", "curve25519-dalek", "getrandom 0.1.16", "itertools", @@ -4192,9 +4295,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0547d5945c93f55e1b18bf2a67d1a3d0548561f2687645b22c1c1d4fbb9a8e90" dependencies = [ "bs58 0.4.0", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -4228,12 +4331,12 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", + "proc-macro2 1.0.52", + "quote 1.0.26", "unicode-ident", ] @@ -4243,9 +4346,9 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", "unicode-xid 0.2.4", ] @@ -4261,16 +4364,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" dependencies = [ "cfg-if", "fastrand", - "libc", "redox_syscall", - "remove_dir_all", - "winapi", + "rustix", + "windows-sys 0.42.0", ] [[package]] @@ -4299,22 +4401,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -4330,9 +4432,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.17" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" dependencies = [ "itoa", "serde", @@ -4348,9 +4450,9 @@ checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" [[package]] name = "time-macros" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" dependencies = [ "time-core", ] @@ -4415,9 +4517,9 @@ version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -4443,9 +4545,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" dependencies = [ "futures-core", "pin-project-lite", @@ -4493,19 +4595,19 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" [[package]] name = "toml_edit" -version = "0.18.1" +version = "0.19.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" +checksum = "08de71aa0d6e348f070457f85af8bd566e2bc452156a423ddf22861b3a953fae" dependencies = [ "indexmap", - "nom8", "toml_datetime", + "winnow", ] [[package]] @@ -4532,9 +4634,9 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -4612,15 +4714,15 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" +checksum = "524b68aca1d05e03fdf03fcdce2c6c94b6daf6d16861ddaa7e4f2b6638a9052c" [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-normalization" @@ -4667,9 +4769,9 @@ dependencies = [ [[package]] name = "unsafe-libyaml" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc7ed8ba44ca06be78ea1ad2c3682a43349126c8818054231ee6f4748012aed2" +checksum = "ad2024452afd3874bf539695e04af6732ba06517424dbf958fdb16a01f3bef6c" [[package]] name = "untrusted" @@ -4803,9 +4905,9 @@ dependencies = [ "bumpalo", "log 0.4.17", "once_cell", - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", "wasm-bindgen-shared", ] @@ -4827,7 +4929,7 @@ version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ - "quote 1.0.23", + "quote 1.0.26", "wasm-bindgen-macro-support", ] @@ -4837,9 +4939,9 @@ version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4936,9 +5038,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -4951,45 +5053,54 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_i686_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "winnow" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "ee7b2c67f962bf5042bfd8b6a916178df33a26eec343ae064cb8e069f638fa6f" +dependencies = [ + "memchr", +] [[package]] name = "winreg" @@ -5015,7 +5126,7 @@ dependencies = [ "oid-registry", "rusticata-macros", "thiserror", - "time 0.3.17", + "time 0.3.20", ] [[package]] @@ -5039,7 +5150,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" dependencies = [ - "time 0.3.17", + "time 0.3.20", ] [[package]] @@ -5057,9 +5168,9 @@ version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ - "proc-macro2 1.0.51", - "quote 1.0.23", - "syn 1.0.107", + "proc-macro2 1.0.52", + "quote 1.0.26", + "syn 1.0.109", "synstructure", ] @@ -5084,9 +5195,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.6+zstd.1.5.2" +version = "2.0.7+zstd.1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a3f9792c0c3dc6c165840a75f47ae1f4da402c2d006881129579f6597e801b" +checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5" dependencies = [ "cc", "libc",