diff --git a/core/src/replay_stage.rs b/core/src/replay_stage.rs index c9ce1fabbf..f9dfc8b90d 100644 --- a/core/src/replay_stage.rs +++ b/core/src/replay_stage.rs @@ -1593,10 +1593,7 @@ impl ReplayStage { root_slot, my_pubkey, rpc_subscriptions, - NewBankOptions { - vote_only_bank, - simulation_bank: false, - }, + NewBankOptions { vote_only_bank }, ); let tpu_bank = bank_forks.write().unwrap().insert(tpu_bank); diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index e09b3a4961..c043960efb 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -45,7 +45,7 @@ dependencies = [ "cfg-if 1.0.0", "cipher", "cpufeatures 0.2.1", - "opaque-debug 0.3.0", + "opaque-debug", ] [[package]] @@ -71,7 +71,7 @@ checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ "getrandom 0.2.4", "once_cell", - "version_check 0.9.2", + "version_check", ] [[package]] @@ -95,7 +95,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -104,12 +104,6 @@ version = "1.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0" -[[package]] -name = "arc-swap" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5d78ce20460b82d3fa150275ed9d55e21064fc7951177baacf86a145c4a4b1f" - [[package]] name = "arrayref" version = "0.3.6" @@ -140,27 +134,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" -[[package]] -name = "async-stream" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171374e7e3b2504e0e5236e3b59260560f9fe94bfe9ac39ba5e4e929c5590625" -dependencies = [ - "async-stream-impl", - "futures-core", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "648ed8c8d2ce5409ccd57453d9d1b214b342a0d69376a6feda1fd6cae3299308" -dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.6", - "syn 1.0.67", -] - [[package]] name = "async-trait" version = "0.1.52" @@ -180,35 +153,15 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi", "libc", - "winapi 0.3.9", + "winapi", ] -[[package]] -name = "autocfg" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" - [[package]] name = "autocfg" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" -[[package]] -name = "backoff" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" -dependencies = [ - "futures-core", - "getrandom 0.2.4", - "instant", - "pin-project-lite", - "rand 0.8.2", - "tokio", -] - [[package]] name = "backtrace" version = "0.3.48" @@ -222,31 +175,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base-x" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" - -[[package]] -name = "base64" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" -dependencies = [ - "byteorder 1.4.3", - "safemem", -] - -[[package]] -name = "base64" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" -dependencies = [ - "byteorder 1.4.3", -] - [[package]] name = "base64" version = "0.12.3" @@ -259,12 +187,6 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" -[[package]] -name = "base64ct" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "874f8444adcb4952a8bc51305c8be95c8ec8237bb0d2e78d2e039f771f8828a0" - [[package]] name = "bincode" version = "1.3.3" @@ -274,25 +196,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bindgen" -version = "0.59.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2 1.0.24", - "quote 1.0.6", - "regex", - "rustc-hash", - "shlex", -] - [[package]] name = "bitflags" version = "1.3.2" @@ -328,25 +231,13 @@ dependencies = [ "digest 0.10.1", ] -[[package]] -name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding 0.1.5", - "byte-tools", - "byteorder 1.4.3", - "generic-array 0.12.3", -] - [[package]] name = "block-buffer" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "block-padding 0.2.1", + "block-padding", "generic-array 0.14.5", ] @@ -359,15 +250,6 @@ dependencies = [ "generic-array 0.14.5", ] -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - [[package]] name = "block-padding" version = "0.2.1" @@ -431,15 +313,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "memchr", -] - [[package]] name = "bumpalo" version = "3.3.0" @@ -456,12 +329,6 @@ dependencies = [ "serde", ] -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - [[package]] name = "bytemuck" version = "1.7.3" @@ -496,13 +363,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "0.4.12" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -dependencies = [ - "byteorder 1.4.3", - "iovec", -] +checksum = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1" [[package]] name = "bytes" @@ -551,15 +414,6 @@ dependencies = [ "jobserver", ] -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - [[package]] name = "cfg-if" version = "0.1.10" @@ -582,8 +436,8 @@ dependencies = [ "num-integer", "num-traits", "serde", - "time 0.1.43", - "winapi 0.3.9", + "time", + "winapi", ] [[package]] @@ -604,17 +458,6 @@ dependencies = [ "generic-array 0.14.5", ] -[[package]] -name = "clang-sys" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa66045b9cb23c2e9c1520732030608b02ee07e5cfaa5a521ec15ded7fa24c90" -dependencies = [ - "glob", - "libc", - "libloading", -] - [[package]] name = "clap" version = "2.33.3" @@ -630,15 +473,6 @@ dependencies = [ "vec_map", ] -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags", -] - [[package]] name = "combine" version = "3.8.1" @@ -664,7 +498,7 @@ dependencies = [ "regex", "terminal_size", "unicode-width", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -683,62 +517,16 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "501a375961cef1a0d44767200e66e4a559283097e91d0730b1d75dfb2f8a1494" dependencies = [ - "log 0.4.14", + "log", "web-sys", ] -[[package]] -name = "const-oid" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" - -[[package]] -name = "const_fn" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" - [[package]] name = "constant_time_eq" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "core-foundation" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "core_affinity" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f8a03115cc34fb0d7c321dd154a3914b3ca082ccc5c11d91bf7117dbbe7171f" -dependencies = [ - "kernel32-sys", - "libc", - "num_cpus", - "winapi 0.2.8", -] - [[package]] name = "cpufeatures" version = "0.1.4" @@ -773,7 +561,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.5", + "crossbeam-utils", ] [[package]] @@ -784,7 +572,7 @@ checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", - "crossbeam-utils 0.8.5", + "crossbeam-utils", ] [[package]] @@ -794,23 +582,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.5", + "crossbeam-utils", "lazy_static", "memoffset", "scopeguard", ] -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg 1.0.0", - "cfg-if 0.1.10", - "lazy_static", -] - [[package]] name = "crossbeam-utils" version = "0.8.5" @@ -903,15 +680,6 @@ dependencies = [ "rayon", ] -[[package]] -name = "der" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" -dependencies = [ - "const-oid", -] - [[package]] name = "derivation-path" version = "0.1.3" @@ -932,19 +700,6 @@ dependencies = [ "syn 1.0.67", ] -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case", - "proc-macro2 1.0.24", - "quote 1.0.6", - "rustc_version 0.4.0", - "syn 1.0.67", -] - [[package]] name = "dialoguer" version = "0.9.0" @@ -1014,15 +769,9 @@ checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", "redox_users", - "winapi 0.3.9", + "winapi", ] -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - [[package]] name = "dlopen" version = "0.1.8" @@ -1032,7 +781,7 @@ dependencies = [ "dlopen_derive", "lazy_static", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1096,9 +845,9 @@ dependencies = [ [[package]] name = "either" -version = "1.6.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" [[package]] name = "elf" @@ -1165,7 +914,7 @@ checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" dependencies = [ "atty", "humantime", - "log 0.4.14", + "log", "regex", "termcolor", ] @@ -1178,7 +927,7 @@ checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" dependencies = [ "atty", "humantime", - "log 0.4.14", + "log", "regex", "termcolor", ] @@ -1191,7 +940,7 @@ checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" dependencies = [ "errno-dragonfly", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1204,21 +953,6 @@ dependencies = [ "libc", ] -[[package]] -name = "etcd-client" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d267091320c099e5b53e81261e7fc01c5280d308da0444f7cd4ee94696569820" -dependencies = [ - "http", - "prost", - "tokio", - "tokio-stream", - "tonic", - "tonic-build", - "tower-service", -] - [[package]] name = "failure" version = "0.1.8" @@ -1241,21 +975,6 @@ dependencies = [ "synstructure", ] -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - -[[package]] -name = "fast-math" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2465292146cdfc2011350fe3b1c616ac83cf0faeedb33463ba1c332ed8948d66" -dependencies = [ - "ieee754", -] - [[package]] name = "fastrand" version = "1.6.0" @@ -1265,17 +984,6 @@ dependencies = [ "instant", ] -[[package]] -name = "fd-lock" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcef756dea9cf3db5ce73759cf0467330427a786b47711b8d6c97620d718ceb9" -dependencies = [ - "cfg-if 1.0.0", - "rustix", - "windows-sys", -] - [[package]] name = "feature-probe" version = "0.1.1" @@ -1291,15 +999,9 @@ dependencies = [ "cfg-if 0.1.10", "libc", "redox_syscall 0.1.56", - "winapi 0.3.9", + "winapi", ] -[[package]] -name = "fixedbitset" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e" - [[package]] name = "flate2" version = "1.0.22" @@ -1318,21 +1020,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "form_urlencoded" version = "1.0.1" @@ -1340,43 +1027,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" dependencies = [ "matches", - "percent-encoding 2.1.0", + "percent-encoding", ] -[[package]] -name = "fs_extra" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" - -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - -[[package]] -name = "futures" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" - [[package]] name = "futures" version = "0.3.19" @@ -1417,7 +1070,6 @@ dependencies = [ "futures-core", "futures-task", "futures-util", - "num_cpus", ] [[package]] @@ -1455,7 +1107,6 @@ version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164" dependencies = [ - "futures 0.1.31", "futures-channel", "futures-core", "futures-io", @@ -1468,15 +1119,6 @@ dependencies = [ "slab", ] -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder 1.4.3", -] - [[package]] name = "generic-array" version = "0.12.3" @@ -1494,7 +1136,7 @@ checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" dependencies = [ "serde", "typenum", - "version_check 0.9.2", + "version_check", ] [[package]] @@ -1504,7 +1146,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e692e296bfac1d2533ef168d0b60ff5897b8b70a4009276834014dd8924cc028" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1536,60 +1178,22 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c" -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - -[[package]] -name = "globset" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd" -dependencies = [ - "aho-corasick", - "bstr", - "fnv", - "log 0.4.14", - "regex", -] - -[[package]] -name = "goauth" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f3d68c8343245dc047982651b5afb8bd659c9959ed72efe5a73bf22684e5fd" -dependencies = [ - "arc-swap", - "futures 0.3.19", - "log 0.4.14", - "reqwest", - "serde", - "serde_derive", - "serde_json", - "simpl", - "smpl_jwt", - "time 0.3.7", - "tokio", -] - [[package]] name = "goblin" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b1800b95efee8ad4ef04517d4d69f8e209e763b1668f1179aeeedd0e454da55" dependencies = [ - "log 0.4.14", + "log", "plain", "scroll", ] [[package]] name = "h2" -version = "0.3.11" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f1f717ddc7b2ba36df7e871fd88db79326551d3d6f1fc406fbfd28b582ff8e" +checksum = "825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726" dependencies = [ "bytes 1.1.0", "fnv", @@ -1622,15 +1226,6 @@ dependencies = [ "ahash", ] -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "hermit-abi" version = "0.1.13" @@ -1646,12 +1241,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "histogram" -version = "0.6.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cb882ccb290b8646e554b157ab0b71e64e8d5bef775cd66b6531e52d302669" - [[package]] name = "hmac" version = "0.8.1" @@ -1694,31 +1283,30 @@ dependencies = [ [[package]] name = "http" -version = "0.2.6" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" +checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" dependencies = [ - "bytes 1.1.0", + "bytes 0.5.4", "fnv", - "itoa 1.0.1", + "itoa 0.4.5", ] [[package]] name = "http-body" -version = "0.4.4" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" +checksum = "2861bd27ee074e5ee891e8b539837a9430012e249d7f0ca2d795650f579c1994" dependencies = [ "bytes 1.1.0", "http", - "pin-project-lite", ] [[package]] name = "httparse" -version = "1.5.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" +checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" [[package]] name = "httpdate" @@ -1734,28 +1322,9 @@ checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a" [[package]] name = "hyper" -version = "0.10.16" +version = "0.14.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273" -dependencies = [ - "base64 0.9.3", - "httparse", - "language-tags", - "log 0.3.9", - "mime 0.2.6", - "num_cpus", - "time 0.1.43", - "traitobject", - "typeable", - "unicase 1.4.2", - "url 1.7.2", -] - -[[package]] -name = "hyper" -version = "0.14.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7ec3e62bdc98a2f0393a5048e4c30ef659440ea6e0e572965103e72bd836f55" +checksum = "0b61cf2d1aebcf6e6352c97b81dc2244ca29194be1b276f5d8ad5c6330fffb11" dependencies = [ "bytes 1.1.0", "futures-channel", @@ -1782,50 +1351,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" dependencies = [ "futures-util", - "hyper 0.14.16", - "log 0.4.14", + "hyper", + "log", "rustls 0.19.0", "tokio", "tokio-rustls 0.22.0", "webpki 0.21.2", ] -[[package]] -name = "hyper-timeout" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" -dependencies = [ - "hyper 0.14.16", - "pin-project-lite", - "tokio", - "tokio-io-timeout", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes 1.1.0", - "hyper 0.14.16", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "idna" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.2.0" @@ -1837,12 +1370,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "ieee754" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9007da9cacbd3e6343da136e98b0d2df013f553d35bdec8b518f07bea768e19c" - [[package]] name = "index_list" version = "0.2.7" @@ -1855,9 +1382,8 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" dependencies = [ - "autocfg 1.0.0", + "autocfg", "hashbrown", - "rayon", ] [[package]] @@ -1881,24 +1407,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "io-lifetimes" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ef6787e7f0faedc040f95716bdd0e62bcfcf4ba93da053b62dea2691c13864" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] - [[package]] name = "ipnet" version = "2.3.0" @@ -1953,172 +1461,33 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "json5" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1" -dependencies = [ - "pest", - "pest_derive", - "serde", -] - -[[package]] -name = "jsonrpc-client-transports" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b99d4207e2a04fb4581746903c2bb7eb376f88de9c699d0f3e10feeac0cd3a" -dependencies = [ - "derive_more", - "futures 0.3.19", - "jsonrpc-core", - "jsonrpc-pubsub", - "jsonrpc-server-utils", - "log 0.4.14", - "parity-tokio-ipc", - "serde", - "serde_json", - "tokio", - "url 1.7.2", - "websocket", -] - [[package]] name = "jsonrpc-core" version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" dependencies = [ - "futures 0.3.19", + "futures", "futures-executor", "futures-util", - "log 0.4.14", + "log", "serde", "serde_derive", "serde_json", ] -[[package]] -name = "jsonrpc-core-client" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b51da17abecbdab3e3d4f26b01c5ec075e88d3abe3ab3b05dc9aa69392764ec0" -dependencies = [ - "futures 0.3.19", - "jsonrpc-client-transports", -] - -[[package]] -name = "jsonrpc-derive" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b939a78fa820cdfcb7ee7484466746a7377760970f6f9c6fe19f9edcc8a38d2" -dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.24", - "quote 1.0.6", - "syn 1.0.67", -] - -[[package]] -name = "jsonrpc-http-server" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1dea6e07251d9ce6a552abfb5d7ad6bc290a4596c8dcc3d795fae2bbdc1f3ff" -dependencies = [ - "futures 0.3.19", - "hyper 0.14.16", - "jsonrpc-core", - "jsonrpc-server-utils", - "log 0.4.14", - "net2", - "parking_lot 0.11.2", - "unicase 2.6.0", -] - -[[package]] -name = "jsonrpc-ipc-server" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382bb0206323ca7cda3dcd7e245cea86d37d02457a02a975e3378fb149a48845" -dependencies = [ - "futures 0.3.19", - "jsonrpc-core", - "jsonrpc-server-utils", - "log 0.4.14", - "parity-tokio-ipc", - "parking_lot 0.11.2", - "tower-service", -] - -[[package]] -name = "jsonrpc-pubsub" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240f87695e6c6f62fb37f05c02c04953cf68d6408b8c1c89de85c7a0125b1011" -dependencies = [ - "futures 0.3.19", - "jsonrpc-core", - "lazy_static", - "log 0.4.14", - "parking_lot 0.11.2", - "rand 0.7.3", - "serde", -] - -[[package]] -name = "jsonrpc-server-utils" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4" -dependencies = [ - "bytes 1.1.0", - "futures 0.3.19", - "globset", - "jsonrpc-core", - "lazy_static", - "log 0.4.14", - "tokio", - "tokio-stream", - "tokio-util", - "unicase 2.6.0", -] - [[package]] name = "keccak" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "language-tags" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" - [[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "libc" version = "0.2.117" @@ -2132,27 +1501,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" dependencies = [ "cfg-if 1.0.0", - "winapi 0.3.9", -] - -[[package]] -name = "libm" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" - -[[package]] -name = "librocksdb-sys" -version = "0.6.1+6.28.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc587013734dadb7cf23468e531aa120788b87243648be42e2d3a072186291" -dependencies = [ - "bindgen", - "bzip2-sys", - "cc", - "glob", - "libc", - "libz-sys", + "winapi", ] [[package]] @@ -2222,38 +1571,12 @@ dependencies = [ "libsecp256k1-core", ] -[[package]] -name = "libz-sys" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - [[package]] name = "linked-hash-map" version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" -[[package]] -name = "linux-raw-sys" -version = "0.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95f5690fef754d905294c56f7ac815836f2513af966aa47f2e07ac79be07827f" - -[[package]] -name = "lock_api" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" -dependencies = [ - "scopeguard", -] - [[package]] name = "lock_api" version = "0.4.5" @@ -2263,15 +1586,6 @@ dependencies = [ "scopeguard", ] -[[package]] -name = "log" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -dependencies = [ - "log 0.4.14", -] - [[package]] name = "log" version = "0.4.14" @@ -2281,33 +1595,12 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "lru" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "274353858935c992b13c0ca408752e2121da852d07dec7ce5f108c77dfa14d1f" -dependencies = [ - "hashbrown", -] - -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - [[package]] name = "matches" version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - [[package]] name = "memchr" version = "2.4.0" @@ -2338,7 +1631,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" dependencies = [ - "autocfg 1.0.0", + "autocfg", ] [[package]] @@ -2353,27 +1646,12 @@ dependencies = [ "zeroize", ] -[[package]] -name = "mime" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" -dependencies = [ - "log 0.3.9", -] - [[package]] name = "mime" version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "miniz_oxide" version = "0.4.4" @@ -2381,26 +1659,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" dependencies = [ "adler", - "autocfg 1.0.0", -] - -[[package]] -name = "mio" -version = "0.6.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" -dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log 0.4.14", - "miow 0.2.2", - "net2", - "slab", - "winapi 0.2.8", + "autocfg", ] [[package]] @@ -2410,22 +1669,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" dependencies = [ "libc", - "log 0.4.14", - "miow 0.3.7", + "log", + "miow", "ntapi", - "winapi 0.3.9", -] - -[[package]] -name = "miow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", + "winapi", ] [[package]] @@ -2434,7 +1681,7 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2458,30 +1705,6 @@ dependencies = [ "syn 1.0.67", ] -[[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - -[[package]] -name = "native-tls" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d" -dependencies = [ - "lazy_static", - "libc", - "log 0.4.14", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "net2" version = "0.2.37" @@ -2490,7 +1713,7 @@ checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" dependencies = [ "cfg-if 0.1.10", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2506,24 +1729,13 @@ dependencies = [ "memoffset", ] -[[package]] -name = "nom" -version = "7.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109" -dependencies = [ - "memchr", - "minimal-lexical", - "version_check 0.9.2", -] - [[package]] name = "ntapi" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a31937dea023539c72ddae0e3571deadc1414b300483fa7aaec176168cfa9d2" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2532,7 +1744,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74e768dff5fb39a41b3bcd30bb25cf989706c90d028d1ad71971987aa309d535" dependencies = [ - "autocfg 1.0.0", + "autocfg", "num-integer", "num-traits", ] @@ -2554,7 +1766,7 @@ version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba" dependencies = [ - "autocfg 1.0.0", + "autocfg", "num-traits", ] @@ -2564,7 +1776,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" dependencies = [ - "autocfg 1.0.0", + "autocfg", ] [[package]] @@ -2599,15 +1811,6 @@ dependencies = [ "syn 1.0.67", ] -[[package]] -name = "num_threads" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ba99ba6393e2c3734791401b66902d981cb03bf190af674ca69949b6d5fb15" -dependencies = [ - "libc", -] - [[package]] name = "number_prefix" version = "0.4.0" @@ -2626,61 +1829,12 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" -[[package]] -name = "opaque-debug" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - [[package]] name = "opaque-debug" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -[[package]] -name = "openssl" -version = "0.10.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "foreign-types", - "libc", - "once_cell", - "openssl-sys", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-src" -version = "111.17.0+1.1.1m" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d6a336abd10814198f66e2a91ccd7336611f30334119ca8ce300536666fcf4" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" -dependencies = [ - "autocfg 1.0.0", - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - [[package]] name = "opentelemetry" version = "0.16.0" @@ -2689,10 +1843,10 @@ checksum = "e1cf9b1c4e9a6c4de793c632496fa490bdc0e1eea73f0c91394f7b6990935d22" dependencies = [ "async-trait", "crossbeam-channel", - "futures 0.3.19", + "futures", "js-sys", "lazy_static", - "percent-encoding 2.1.0", + "percent-encoding", "pin-project", "rand 0.8.2", "thiserror", @@ -2722,31 +1876,6 @@ dependencies = [ "syn 1.0.67", ] -[[package]] -name = "parity-tokio-ipc" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9981e32fb75e004cc148f5fb70342f393830e0a4aa62e3cc93b50976218d42b6" -dependencies = [ - "futures 0.3.19", - "libc", - "log 0.4.14", - "rand 0.7.3", - "tokio", - "winapi 0.3.9", -] - -[[package]] -name = "parking_lot" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" -dependencies = [ - "lock_api 0.3.4", - "parking_lot_core 0.6.2", - "rustc_version 0.2.3", -] - [[package]] name = "parking_lot" version = "0.11.2" @@ -2754,23 +1883,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", - "lock_api 0.4.5", - "parking_lot_core 0.8.5", -] - -[[package]] -name = "parking_lot_core" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" -dependencies = [ - "cfg-if 0.1.10", - "cloudabi", - "libc", - "redox_syscall 0.1.56", - "rustc_version 0.2.3", - "smallvec 0.6.14", - "winapi 0.3.9", + "lock_api", + "parking_lot_core", ] [[package]] @@ -2783,8 +1897,8 @@ dependencies = [ "instant", "libc", "redox_syscall 0.2.10", - "smallvec 1.6.1", - "winapi 0.3.9", + "smallvec", + "winapi", ] [[package]] @@ -2805,86 +1919,12 @@ dependencies = [ "digest 0.10.1", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "pem" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9a3b09a20e374558580a4914d3b7d89bd61b954a5a5e1dcbea98753addb1947" -dependencies = [ - "base64 0.13.0", -] - -[[package]] -name = "percent-encoding" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - [[package]] name = "percent-encoding" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" -[[package]] -name = "pest" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" -dependencies = [ - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2 1.0.24", - "quote 1.0.6", - "syn 1.0.67", -] - -[[package]] -name = "pest_meta" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d" -dependencies = [ - "maplit", - "pest", - "sha-1 0.8.2", -] - -[[package]] -name = "petgraph" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" -dependencies = [ - "fixedbitset", - "indexmap", -] - [[package]] name = "pin-project" version = "1.0.5" @@ -2917,17 +1957,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pkcs8" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" -dependencies = [ - "der", - "spki", - "zeroize", -] - [[package]] name = "pkg-config" version = "0.3.17" @@ -2948,7 +1977,7 @@ checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" dependencies = [ "cfg-if 1.0.0", "cpufeatures 0.2.1", - "opaque-debug 0.3.0", + "opaque-debug", "universal-hash", ] @@ -2977,7 +2006,7 @@ dependencies = [ "proc-macro2 1.0.24", "quote 1.0.6", "syn 1.0.67", - "version_check 0.9.2", + "version_check", ] [[package]] @@ -2988,15 +2017,9 @@ checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.6", - "version_check 0.9.2", + "version_check", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - [[package]] name = "proc-macro2" version = "0.4.30" @@ -3015,120 +2038,13 @@ dependencies = [ "unicode-xid 0.2.0", ] -[[package]] -name = "prost" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" -dependencies = [ - "bytes 1.1.0", - "prost-derive", -] - -[[package]] -name = "prost-build" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" -dependencies = [ - "bytes 1.1.0", - "heck", - "itertools 0.10.3", - "lazy_static", - "log 0.4.14", - "multimap", - "petgraph", - "prost", - "prost-types", - "regex", - "tempfile", - "which", -] - -[[package]] -name = "prost-derive" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" -dependencies = [ - "anyhow", - "itertools 0.10.3", - "proc-macro2 1.0.24", - "quote 1.0.6", - "syn 1.0.67", -] - -[[package]] -name = "prost-types" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" -dependencies = [ - "bytes 1.1.0", - "prost", -] - [[package]] name = "qstring" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d464fae65fff2680baf48019211ce37aaec0c78e9264c84a3e484717f965104e" dependencies = [ - "percent-encoding 2.1.0", -] - -[[package]] -name = "quinn" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a84d97630b137463c8e6802adc1dfe9de81457b41bb1ac59189e6761ab9255" -dependencies = [ - "bytes 1.1.0", - "futures-channel", - "futures-util", - "fxhash", - "quinn-proto", - "quinn-udp", - "rustls 0.20.2", - "thiserror", - "tokio", - "tracing", - "webpki 0.22.0", -] - -[[package]] -name = "quinn-proto" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063dedf7983c8d57db474218f258daa85b627de6f2dbc458b690a93b1de790e8" -dependencies = [ - "bytes 1.1.0", - "fxhash", - "rand 0.8.2", - "ring", - "rustls 0.20.2", - "rustls-native-certs", - "rustls-pemfile", - "slab", - "thiserror", - "tinyvec", - "tracing", - "webpki 0.22.0", -] - -[[package]] -name = "quinn-udp" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7996776e9ee3fc0e5c14476c1a640a17e993c847ae9c81191c2c102fbef903" -dependencies = [ - "futures-util", - "libc", - "mio 0.7.13", - "quinn-proto", - "socket2", - "tokio", - "tracing", + "percent-encoding", ] [[package]] @@ -3149,25 +2065,6 @@ dependencies = [ "proc-macro2 1.0.24", ] -[[package]] -name = "rand" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -dependencies = [ - "autocfg 0.1.7", - "libc", - "rand_chacha 0.1.1", - "rand_core 0.4.2", - "rand_hc 0.1.0", - "rand_isaac", - "rand_jitter", - "rand_os", - "rand_pcg 0.1.2", - "rand_xorshift", - "winapi 0.3.9", -] - [[package]] name = "rand" version = "0.7.3" @@ -3179,7 +2076,7 @@ dependencies = [ "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc 0.2.0", - "rand_pcg 0.2.1", + "rand_pcg", ] [[package]] @@ -3194,16 +2091,6 @@ dependencies = [ "rand_hc 0.3.0", ] -[[package]] -name = "rand_chacha" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -dependencies = [ - "autocfg 0.1.7", - "rand_core 0.3.1", -] - [[package]] name = "rand_chacha" version = "0.2.2" @@ -3224,21 +2111,6 @@ dependencies = [ "rand_core 0.6.3", ] -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - [[package]] name = "rand_core" version = "0.5.1" @@ -3257,15 +2129,6 @@ dependencies = [ "getrandom 0.2.4", ] -[[package]] -name = "rand_hc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "rand_hc" version = "0.2.0" @@ -3284,50 +2147,6 @@ dependencies = [ "rand_core 0.6.3", ] -[[package]] -name = "rand_isaac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_jitter" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -dependencies = [ - "libc", - "rand_core 0.4.2", - "winapi 0.3.9", -] - -[[package]] -name = "rand_os" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.4.2", - "rdrand", - "winapi 0.3.9", -] - -[[package]] -name = "rand_pcg" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -dependencies = [ - "autocfg 0.1.7", - "rand_core 0.4.2", -] - [[package]] name = "rand_pcg" version = "0.2.1" @@ -3337,22 +2156,13 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_xorshift" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "rayon" version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" dependencies = [ - "autocfg 1.0.0", + "autocfg", "crossbeam-deque", "either", "rayon-core", @@ -3366,32 +2176,11 @@ checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" dependencies = [ "crossbeam-channel", "crossbeam-deque", - "crossbeam-utils 0.8.5", + "crossbeam-utils", "lazy_static", "num_cpus", ] -[[package]] -name = "rcgen" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2296a75ce93ea619bd9686d9f4b060f28845236e67d8666bcd02954e872b400" -dependencies = [ - "pem", - "ring", - "time 0.3.7", - "yasna", -] - -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "redox_syscall" version = "0.1.56" @@ -3417,20 +2206,6 @@ dependencies = [ "redox_syscall 0.2.10", ] -[[package]] -name = "reed-solomon-erasure" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170bac0d8306941e101df0caaa6518b10bc4232dd36c34f1cb78b8a063024db" -dependencies = [ - "cc", - "libc", - "libm", - "parking_lot 0.11.2", - "smallvec 1.6.1", - "spin 0.9.2", -] - [[package]] name = "regex" version = "1.5.4" @@ -3454,7 +2229,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3470,25 +2245,22 @@ dependencies = [ "futures-util", "http", "http-body", - "hyper 0.14.16", + "hyper", "hyper-rustls", - "hyper-tls", "ipnet", "js-sys", "lazy_static", - "log 0.4.14", - "mime 0.3.16", - "native-tls", - "percent-encoding 2.1.0", + "log", + "mime", + "percent-encoding", "pin-project-lite", "rustls 0.19.0", "serde", "serde_json", "serde_urlencoded", "tokio", - "tokio-native-tls", "tokio-rustls 0.22.0", - "url 2.2.2", + "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -3496,12 +2268,6 @@ dependencies = [ "winreg", ] -[[package]] -name = "retain_mut" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51dd4445360338dab5116712bee1388dc727991d51969558a8882ab552e6db30" - [[package]] name = "ring" version = "0.16.20" @@ -3511,20 +2277,10 @@ dependencies = [ "cc", "libc", "once_cell", - "spin 0.5.2", + "spin", "untrusted", "web-sys", - "winapi 0.3.9", -] - -[[package]] -name = "rocksdb" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "620f4129485ff1a7128d184bc687470c21c7951b64779ebc9cfdad3dcd920290" -dependencies = [ - "libc", - "librocksdb-sys", + "winapi", ] [[package]] @@ -3534,7 +2290,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3567,20 +2323,6 @@ dependencies = [ "semver 1.0.5", ] -[[package]] -name = "rustix" -version = "0.32.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cee647393af53c750e15dcbf7781cdd2e550b246bde76e46c326e7ea3c73773" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "winapi 0.3.9", -] - [[package]] name = "rustls" version = "0.19.0" @@ -3588,7 +2330,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "064fd21ff87c6e87ed4506e68beb42459caa4a0e2eb144932e6776768556980b" dependencies = [ "base64 0.13.0", - "log 0.4.14", + "log", "ring", "sct 0.6.0", "webpki 0.21.2", @@ -3600,33 +2342,12 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d37e5e2290f3e040b594b1a9e04377c2c671f1a1cfd9bfdef82106ac1c113f84" dependencies = [ - "log 0.4.14", + "log", "ring", "sct 0.7.0", "webpki 0.22.0", ] -[[package]] -name = "rustls-native-certs" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca9ebdfa27d3fc180e42879037b5338ab1c040c06affd00d8338598e7800943" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" -dependencies = [ - "base64 0.13.0", -] - [[package]] name = "rustversion" version = "1.0.6" @@ -3639,12 +2360,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed3d612bc64430efeb3f7ee6ef26d590dce0c43249217bddc62112540c7941e1" -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - [[package]] name = "same-file" version = "1.0.6" @@ -3654,16 +2369,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "schannel" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" -dependencies = [ - "lazy_static", - "winapi 0.3.9", -] - [[package]] name = "scopeguard" version = "1.1.0" @@ -3710,29 +2415,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "security-framework" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fed7948b6c68acbb6e20c334f55ad635dc0f75506963de4464289fbd3b051ac" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a57321bf8bc2362081b2599912d2961fe899c0efadf1b4b2f8d48b3e253bb96c" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "semver" version = "0.9.0" @@ -3818,18 +2500,6 @@ dependencies = [ "yaml-rust", ] -[[package]] -name = "sha-1" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" -dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "fake-simd", - "opaque-debug 0.2.3", -] - [[package]] name = "sha-1" version = "0.9.6" @@ -3840,24 +2510,9 @@ dependencies = [ "cfg-if 1.0.0", "cpufeatures 0.1.4", "digest 0.9.0", - "opaque-debug 0.3.0", + "opaque-debug", ] -[[package]] -name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - [[package]] name = "sha2" version = "0.9.8" @@ -3868,7 +2523,7 @@ dependencies = [ "cfg-if 1.0.0", "cpufeatures 0.2.1", "digest 0.9.0", - "opaque-debug 0.3.0", + "opaque-debug", ] [[package]] @@ -3891,7 +2546,7 @@ dependencies = [ "block-buffer 0.9.0", "digest 0.9.0", "keccak", - "opaque-debug 0.3.0", + "opaque-debug", ] [[package]] @@ -3913,27 +2568,11 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "shlex" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" - -[[package]] -name = "signal-hook" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d" -dependencies = [ - "libc", - "signal-hook-registry", -] - [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6" dependencies = [ "libc", ] @@ -3944,49 +2583,18 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65211b7b6fc3f14ff9fc7a2011a434e3e6880585bd2e9e9396315ae24cbf7852" -[[package]] -name = "simpl" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a30f10c911c0355f80f1c2faa8096efc4a58cdf8590b954d5b395efa071c711" - [[package]] name = "slab" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" -[[package]] -name = "smallvec" -version = "0.6.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" -dependencies = [ - "maybe-uninit", -] - [[package]] name = "smallvec" version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" -[[package]] -name = "smpl_jwt" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4370044f8b20f944e05c35d77edd3518e6f21fc4de77e593919f287c6a3f428a" -dependencies = [ - "base64 0.13.0", - "log 0.4.14", - "openssl", - "serde", - "serde_derive", - "serde_json", - "simpl", - "time 0.2.27", -] - [[package]] name = "socket2" version = "0.4.4" @@ -3994,22 +2602,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" dependencies = [ "libc", - "winapi 0.3.9", -] - -[[package]] -name = "soketto" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" -dependencies = [ - "base64 0.13.0", - "bytes 1.1.0", - "futures 0.3.19", - "httparse", - "log 0.4.14", - "rand 0.8.2", - "sha-1 0.9.6", + "winapi", ] [[package]] @@ -4033,43 +2626,13 @@ dependencies = [ "zstd", ] -[[package]] -name = "solana-accountsdb-plugin-interface" -version = "1.10.0" -dependencies = [ - "log 0.4.14", - "solana-sdk", - "solana-transaction-status", - "thiserror", -] - -[[package]] -name = "solana-accountsdb-plugin-manager" -version = "1.10.0" -dependencies = [ - "bs58 0.4.0", - "crossbeam-channel", - "json5", - "libloading", - "log 0.4.14", - "serde_json", - "solana-accountsdb-plugin-interface", - "solana-measure", - "solana-metrics", - "solana-rpc", - "solana-runtime", - "solana-sdk", - "solana-transaction-status", - "thiserror", -] - [[package]] name = "solana-address-lookup-table-program" version = "1.10.0" dependencies = [ "bincode", "bytemuck", - "log 0.4.14", + "log", "num-derive", "num-traits", "rustc_version 0.4.0", @@ -4086,7 +2649,7 @@ name = "solana-banks-client" version = "1.10.0" dependencies = [ "borsh", - "futures 0.3.19", + "futures", "solana-banks-interface", "solana-program 1.10.0", "solana-sdk", @@ -4111,7 +2674,7 @@ version = "1.10.0" dependencies = [ "bincode", "crossbeam-channel", - "futures 0.3.19", + "futures", "solana-banks-interface", "solana-runtime", "solana-sdk", @@ -4128,7 +2691,7 @@ version = "1.10.0" dependencies = [ "bv", "fnv", - "log 0.4.14", + "log", "rand 0.7.3", "rayon", "rustc_version 0.4.0", @@ -4146,7 +2709,7 @@ dependencies = [ "bincode", "byteorder 1.4.3", "libsecp256k1 0.6.0", - "log 0.4.14", + "log", "solana-measure", "solana-metrics", "solana-program-runtime", @@ -4164,8 +2727,8 @@ dependencies = [ "byteorder 1.4.3", "elf", "itertools 0.10.3", - "log 0.4.14", - "miow 0.3.7", + "log", + "miow", "net2", "solana-account-decoder", "solana-bpf-loader-program", @@ -4468,17 +3031,6 @@ dependencies = [ "solana-program 1.10.0", ] -[[package]] -name = "solana-bpf-rust-simulation" -version = "1.10.0" -dependencies = [ - "solana-logger 1.10.0", - "solana-program 1.10.0", - "solana-program-test", - "solana-sdk", - "solana-validator", -] - [[package]] name = "solana-bpf-rust-spoof1" version = "1.10.0" @@ -4529,7 +3081,7 @@ dependencies = [ name = "solana-bucket-map" version = "1.10.0" dependencies = [ - "log 0.4.14", + "log", "memmap2 0.5.2", "modular-bitfield", "rand 0.7.3", @@ -4551,7 +3103,7 @@ dependencies = [ "thiserror", "tiny-bip39", "uriparse", - "url 2.2.2", + "url", ] [[package]] @@ -4563,7 +3115,7 @@ dependencies = [ "serde", "serde_derive", "serde_yaml", - "url 2.2.2", + "url", ] [[package]] @@ -4601,7 +3153,7 @@ dependencies = [ "futures-util", "indicatif", "jsonrpc-core", - "log 0.4.14", + "log", "rayon", "reqwest", "semver 1.0.5", @@ -4622,7 +3174,7 @@ dependencies = [ "tokio-stream", "tokio-tungstenite", "tungstenite", - "url 2.2.2", + "url", ] [[package]] @@ -4645,94 +3197,6 @@ dependencies = [ "solana-sdk", ] -[[package]] -name = "solana-core" -version = "1.10.0" -dependencies = [ - "ahash", - "base64 0.12.3", - "bincode", - "bs58 0.4.0", - "chrono", - "crossbeam-channel", - "dashmap", - "etcd-client", - "fs_extra", - "histogram", - "itertools 0.10.3", - "log 0.4.14", - "lru", - "rand 0.7.3", - "rand_chacha 0.2.2", - "rayon", - "retain_mut", - "rustc_version 0.4.0", - "serde", - "serde_derive", - "solana-accountsdb-plugin-manager", - "solana-address-lookup-table-program", - "solana-bloom", - "solana-client", - "solana-entry", - "solana-frozen-abi 1.10.0", - "solana-frozen-abi-macro 1.10.0", - "solana-gossip", - "solana-ledger", - "solana-measure", - "solana-metrics", - "solana-net-utils", - "solana-perf", - "solana-poh", - "solana-program-runtime", - "solana-rayon-threadlimit", - "solana-replica-lib", - "solana-rpc", - "solana-runtime", - "solana-sdk", - "solana-send-transaction-service", - "solana-streamer", - "solana-transaction-status", - "solana-vote-program", - "sys-info", - "sysctl", - "tempfile", - "thiserror", - "tokio", - "trees", -] - -[[package]] -name = "solana-download-utils" -version = "1.10.0" -dependencies = [ - "console", - "indicatif", - "log 0.4.14", - "reqwest", - "solana-runtime", - "solana-sdk", -] - -[[package]] -name = "solana-entry" -version = "1.10.0" -dependencies = [ - "bincode", - "crossbeam-channel", - "dlopen", - "dlopen_derive", - "log 0.4.14", - "rand 0.7.3", - "rayon", - "serde", - "solana-measure", - "solana-merkle-tree", - "solana-metrics", - "solana-perf", - "solana-rayon-threadlimit", - "solana-sdk", -] - [[package]] name = "solana-faucet" version = "1.10.0" @@ -4741,7 +3205,7 @@ dependencies = [ "byteorder 1.4.3", "clap", "crossbeam-channel", - "log 0.4.14", + "log", "serde", "serde_derive", "solana-clap-utils", @@ -4764,7 +3228,7 @@ dependencies = [ "bs58 0.3.1", "bv", "generic-array 0.14.5", - "log 0.4.14", + "log", "memmap2 0.1.0", "rustc_version 0.2.3", "serde", @@ -4782,7 +3246,7 @@ dependencies = [ "bs58 0.4.0", "bv", "generic-array 0.14.5", - "log 0.4.14", + "log", "memmap2 0.5.2", "rustc_version 0.4.0", "serde", @@ -4814,108 +3278,6 @@ dependencies = [ "syn 1.0.67", ] -[[package]] -name = "solana-genesis-utils" -version = "1.10.0" -dependencies = [ - "solana-download-utils", - "solana-runtime", - "solana-sdk", -] - -[[package]] -name = "solana-gossip" -version = "1.10.0" -dependencies = [ - "bincode", - "bv", - "clap", - "crossbeam-channel", - "flate2", - "indexmap", - "itertools 0.10.3", - "log 0.4.14", - "lru", - "matches", - "num-traits", - "rand 0.7.3", - "rand_chacha 0.2.2", - "rayon", - "rustc_version 0.4.0", - "serde", - "serde_bytes", - "serde_derive", - "solana-bloom", - "solana-clap-utils", - "solana-client", - "solana-entry", - "solana-frozen-abi 1.10.0", - "solana-frozen-abi-macro 1.10.0", - "solana-ledger", - "solana-logger 1.10.0", - "solana-measure", - "solana-metrics", - "solana-net-utils", - "solana-perf", - "solana-rayon-threadlimit", - "solana-runtime", - "solana-sdk", - "solana-streamer", - "solana-version", - "solana-vote-program", - "thiserror", -] - -[[package]] -name = "solana-ledger" -version = "1.10.0" -dependencies = [ - "bincode", - "byteorder 1.4.3", - "chrono", - "chrono-humanize", - "crossbeam-channel", - "fs_extra", - "futures 0.3.19", - "itertools 0.10.3", - "lazy_static", - "libc", - "log 0.4.14", - "num-derive", - "num-traits", - "num_cpus", - "prost", - "rand 0.7.3", - "rand_chacha 0.2.2", - "rayon", - "reed-solomon-erasure", - "rocksdb", - "rustc_version 0.4.0", - "serde", - "serde_bytes", - "sha2 0.10.1", - "solana-bpf-loader-program", - "solana-entry", - "solana-frozen-abi 1.10.0", - "solana-frozen-abi-macro 1.10.0", - "solana-measure", - "solana-metrics", - "solana-perf", - "solana-program-runtime", - "solana-rayon-threadlimit", - "solana-runtime", - "solana-sdk", - "solana-storage-bigtable", - "solana-storage-proto", - "solana-transaction-status", - "solana-vote-program", - "tempfile", - "thiserror", - "tokio", - "tokio-stream", - "trees", -] - [[package]] name = "solana-logger" version = "1.7.6" @@ -4924,7 +3286,7 @@ checksum = "ec7c514fe57f8c5042fa88c19f5711c67f264db723d9d79379fcb78dd1f09bbf" dependencies = [ "env_logger 0.8.4", "lazy_static", - "log 0.4.14", + "log", ] [[package]] @@ -4933,26 +3295,17 @@ version = "1.10.0" dependencies = [ "env_logger 0.9.0", "lazy_static", - "log 0.4.14", + "log", ] [[package]] name = "solana-measure" version = "1.10.0" dependencies = [ - "log 0.4.14", + "log", "solana-sdk", ] -[[package]] -name = "solana-merkle-tree" -version = "1.10.0" -dependencies = [ - "fast-math", - "matches", - "solana-program 1.10.0", -] - [[package]] name = "solana-metrics" version = "1.10.0" @@ -4960,7 +3313,7 @@ dependencies = [ "crossbeam-channel", "gethostname", "lazy_static", - "log 0.4.14", + "log", "reqwest", "solana-sdk", ] @@ -4972,7 +3325,7 @@ dependencies = [ "bincode", "clap", "crossbeam-channel", - "log 0.4.14", + "log", "nix", "rand 0.7.3", "serde", @@ -4982,7 +3335,7 @@ dependencies = [ "solana-sdk", "solana-version", "tokio", - "url 2.2.2", + "url", ] [[package]] @@ -4999,7 +3352,7 @@ dependencies = [ "fnv", "lazy_static", "libc", - "log 0.4.14", + "log", "nix", "rand 0.7.3", "rayon", @@ -5011,23 +3364,6 @@ dependencies = [ "solana-vote-program", ] -[[package]] -name = "solana-poh" -version = "1.10.0" -dependencies = [ - "core_affinity", - "crossbeam-channel", - "log 0.4.14", - "solana-entry", - "solana-ledger", - "solana-measure", - "solana-metrics", - "solana-runtime", - "solana-sdk", - "solana-sys-tuner", - "thiserror", -] - [[package]] name = "solana-program" version = "1.7.6" @@ -5045,7 +3381,7 @@ dependencies = [ "itertools 0.9.0", "lazy_static", "libsecp256k1 0.5.0", - "log 0.4.14", + "log", "num-derive", "num-traits", "rand 0.7.3", @@ -5084,10 +3420,10 @@ dependencies = [ "js-sys", "lazy_static", "libsecp256k1 0.6.0", - "log 0.4.14", + "log", "num-derive", "num-traits", - "parking_lot 0.11.2", + "parking_lot", "rand 0.7.3", "rustc_version 0.4.0", "rustversion", @@ -5112,7 +3448,7 @@ dependencies = [ "itertools 0.10.3", "libc", "libloading", - "log 0.4.14", + "log", "num-derive", "num-traits", "rustc_version 0.4.0", @@ -5132,7 +3468,7 @@ dependencies = [ "base64 0.12.3", "bincode", "chrono-humanize", - "log 0.4.14", + "log", "serde", "solana-banks-client", "solana-banks-server", @@ -5160,10 +3496,10 @@ version = "1.10.0" dependencies = [ "console", "dialoguer", - "log 0.4.14", + "log", "num-derive", "num-traits", - "parking_lot 0.11.2", + "parking_lot", "qstring", "semver 1.0.5", "solana-sdk", @@ -5171,71 +3507,6 @@ dependencies = [ "uriparse", ] -[[package]] -name = "solana-replica-lib" -version = "1.10.0" -dependencies = [ - "crossbeam-channel", - "futures-util", - "log 0.4.14", - "prost", - "solana-rpc", - "solana-runtime", - "solana-sdk", - "tokio", - "tonic", - "tonic-build", -] - -[[package]] -name = "solana-rpc" -version = "1.10.0" -dependencies = [ - "base64 0.12.3", - "bincode", - "bs58 0.4.0", - "crossbeam-channel", - "dashmap", - "itertools 0.10.3", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "jsonrpc-http-server", - "jsonrpc-pubsub", - "libc", - "log 0.4.14", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "soketto", - "solana-account-decoder", - "solana-client", - "solana-entry", - "solana-faucet", - "solana-gossip", - "solana-ledger", - "solana-measure", - "solana-metrics", - "solana-perf", - "solana-poh", - "solana-rayon-threadlimit", - "solana-runtime", - "solana-sdk", - "solana-send-transaction-service", - "solana-storage-bigtable", - "solana-streamer", - "solana-transaction-status", - "solana-version", - "solana-vote-program", - "spl-token", - "stream-cancel", - "thiserror", - "tokio", - "tokio-util", -] - [[package]] name = "solana-runtime" version = "1.10.0" @@ -5256,7 +3527,7 @@ dependencies = [ "index_list", "itertools 0.10.3", "lazy_static", - "log 0.4.14", + "log", "memmap2 0.5.2", "num-derive", "num-traits", @@ -5314,7 +3585,7 @@ dependencies = [ "js-sys", "lazy_static", "libsecp256k1 0.6.0", - "log 0.4.14", + "log", "memmap2 0.5.2", "num-derive", "num-traits", @@ -5369,7 +3640,7 @@ name = "solana-send-transaction-service" version = "1.10.0" dependencies = [ "crossbeam-channel", - "log 0.4.14", + "log", "solana-metrics", "solana-runtime", "solana-sdk", @@ -5380,7 +3651,7 @@ name = "solana-stake-program" version = "1.10.0" dependencies = [ "bincode", - "log 0.4.14", + "log", "num-derive", "num-traits", "rustc_version 0.4.0", @@ -5396,108 +3667,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "solana-storage-bigtable" -version = "1.10.0" -dependencies = [ - "backoff", - "bincode", - "bzip2", - "enum-iterator", - "flate2", - "goauth", - "log 0.4.14", - "openssl", - "prost", - "prost-types", - "serde", - "serde_derive", - "smpl_jwt", - "solana-metrics", - "solana-sdk", - "solana-storage-proto", - "solana-transaction-status", - "thiserror", - "tonic", - "zstd", -] - -[[package]] -name = "solana-storage-proto" -version = "1.10.0" -dependencies = [ - "bincode", - "bs58 0.4.0", - "prost", - "serde", - "solana-account-decoder", - "solana-sdk", - "solana-transaction-status", - "tonic-build", -] - -[[package]] -name = "solana-streamer" -version = "1.10.0" -dependencies = [ - "crossbeam-channel", - "futures-util", - "histogram", - "itertools 0.10.3", - "libc", - "log 0.4.14", - "nix", - "pem", - "pkcs8", - "quinn", - "rand 0.7.3", - "rcgen", - "rustls 0.20.2", - "solana-metrics", - "solana-perf", - "solana-sdk", - "thiserror", - "tokio", -] - -[[package]] -name = "solana-sys-tuner" -version = "1.10.0" -dependencies = [ - "clap", - "libc", - "log 0.4.14", - "nix", - "solana-logger 1.10.0", - "solana-version", - "sysctl", - "unix_socket2", - "users", -] - -[[package]] -name = "solana-test-validator" -version = "1.10.0" -dependencies = [ - "base64 0.12.3", - "log 0.4.14", - "serde_derive", - "serde_json", - "solana-cli-output", - "solana-client", - "solana-core", - "solana-gossip", - "solana-ledger", - "solana-logger 1.10.0", - "solana-net-utils", - "solana-program-test", - "solana-rpc", - "solana-runtime", - "solana-sdk", - "solana-streamer", - "tokio", -] - [[package]] name = "solana-transaction-status" version = "1.10.0" @@ -5507,7 +3676,7 @@ dependencies = [ "bincode", "bs58 0.4.0", "lazy_static", - "log 0.4.14", + "log", "serde", "serde_derive", "serde_json", @@ -5523,62 +3692,11 @@ dependencies = [ "thiserror", ] -[[package]] -name = "solana-validator" -version = "1.10.0" -dependencies = [ - "chrono", - "clap", - "console", - "core_affinity", - "crossbeam-channel", - "fd-lock", - "indicatif", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "jsonrpc-ipc-server", - "jsonrpc-server-utils", - "libc", - "log 0.4.14", - "num_cpus", - "rand 0.7.3", - "serde", - "serde_json", - "signal-hook", - "solana-clap-utils", - "solana-cli-config", - "solana-client", - "solana-core", - "solana-download-utils", - "solana-entry", - "solana-faucet", - "solana-genesis-utils", - "solana-gossip", - "solana-ledger", - "solana-logger 1.10.0", - "solana-metrics", - "solana-net-utils", - "solana-perf", - "solana-poh", - "solana-replica-lib", - "solana-rpc", - "solana-runtime", - "solana-sdk", - "solana-send-transaction-service", - "solana-streamer", - "solana-test-validator", - "solana-version", - "solana-vote-program", - "symlink", - "tikv-jemallocator", -] - [[package]] name = "solana-version" version = "1.10.0" dependencies = [ - "log 0.4.14", + "log", "rustc_version 0.4.0", "serde", "serde_derive", @@ -5592,7 +3710,7 @@ name = "solana-vote-program" version = "1.10.0" dependencies = [ "bincode", - "log 0.4.14", + "log", "num-derive", "num-traits", "rustc_version 0.4.0", @@ -5658,12 +3776,12 @@ dependencies = [ "goblin", "hash32", "libc", - "log 0.4.14", + "log", "rand 0.7.3", "rustc-demangle", "scroll", "thiserror", - "time 0.1.43", + "time", ] [[package]] @@ -5672,22 +3790,6 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" -[[package]] -name = "spin" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "511254be0c5bcf062b019a6c89c01a664aa359ded62f78aa72c6fc137c0590e5" - -[[package]] -name = "spki" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" -dependencies = [ - "base64ct", - "der", -] - [[package]] name = "spl-associated-token-account" version = "1.0.3" @@ -5727,81 +3829,12 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check 0.9.2", -] - [[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version 0.2.3", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.6", - "serde", - "serde_derive", - "syn 1.0.67", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2 1.0.24", - "quote 1.0.6", - "serde", - "serde_derive", - "serde_json", - "sha1", - "syn 1.0.67", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - -[[package]] -name = "stream-cancel" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0a9eb2715209fb8cc0d942fcdff45674bfc9f0090a0d897e85a22955ad159b" -dependencies = [ - "futures-core", - "pin-project", - "tokio", -] - [[package]] name = "strsim" version = "0.8.0" @@ -5854,29 +3887,6 @@ dependencies = [ "unicode-xid 0.2.0", ] -[[package]] -name = "sys-info" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b3a0d0aba8bf96a0e1ddfdc352fc53b3df7f39318c71854910c3c4b024ae52c" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "sysctl" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb3f7a32e17639e3705d2e05da40f485877cb97fdf0f3240e519e525e6cdb4d" -dependencies = [ - "bitflags", - "byteorder 1.4.3", - "libc", - "thiserror", - "walkdir", -] - [[package]] name = "tar" version = "0.4.38" @@ -5896,7 +3906,7 @@ checksum = "b85d0a9369a919ba0db919b142a2b704cd207dfc676f7a43c2d105d0bc225487" dependencies = [ "anyhow", "fnv", - "futures 0.3.19", + "futures", "humantime", "opentelemetry", "pin-project", @@ -5934,7 +3944,7 @@ dependencies = [ "libc", "redox_syscall 0.2.10", "remove_dir_all", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -5953,7 +3963,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bd2d183bd3fac5f5fe38ddbeb4dc9aec4a39a9d7d59e7491d900302da01cbe1" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -5994,27 +4004,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "tikv-jemalloc-sys" -version = "0.4.2+5.2.1-patched.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5844e429d797c62945a566f8da4e24c7fe3fbd5d6617fd8bf7a0b7dc1ee0f22e" -dependencies = [ - "cc", - "fs_extra", - "libc", -] - -[[package]] -name = "tikv-jemallocator" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c14a5a604eb8715bc5785018a37d00739b180bcf609916ddf4393d33d49ccdf" -dependencies = [ - "libc", - "tikv-jemalloc-sys", -] - [[package]] name = "time" version = "0.1.43" @@ -6022,55 +4011,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" dependencies = [ "libc", - "winapi 0.3.9", -] - -[[package]] -name = "time" -version = "0.2.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" -dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb", - "time-macros", - "version_check 0.9.2", - "winapi 0.3.9", -] - -[[package]] -name = "time" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "004cbc98f30fa233c61a38bc77e96a9106e65c88f2d3bef182ae952027e5753d" -dependencies = [ - "libc", - "num_threads", -] - -[[package]] -name = "time-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2 1.0.24", - "quote 1.0.6", - "standback", - "syn 1.0.67", + "winapi", ] [[package]] @@ -6116,56 +4057,14 @@ dependencies = [ "bytes 1.1.0", "libc", "memchr", - "mio 0.7.13", + "mio", "num_cpus", "once_cell", - "parking_lot 0.11.2", + "parking_lot", "pin-project-lite", "signal-hook-registry", "tokio-macros", - "winapi 0.3.9", -] - -[[package]] -name = "tokio-codec" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "tokio-io", -] - -[[package]] -name = "tokio-executor" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" -dependencies = [ - "crossbeam-utils 0.7.2", - "futures 0.1.31", -] - -[[package]] -name = "tokio-io" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "log 0.4.14", -] - -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", + "winapi", ] [[package]] @@ -6179,35 +4078,6 @@ dependencies = [ "syn 1.0.67", ] -[[package]] -name = "tokio-native-tls" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-reactor" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" -dependencies = [ - "crossbeam-utils 0.7.2", - "futures 0.1.31", - "lazy_static", - "log 0.4.14", - "mio 0.6.23", - "num_cpus", - "parking_lot 0.9.0", - "slab", - "tokio-executor", - "tokio-io", - "tokio-sync", -] - [[package]] name = "tokio-rustls" version = "0.22.0" @@ -6257,41 +4127,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-sync" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee" -dependencies = [ - "fnv", - "futures 0.1.31", -] - -[[package]] -name = "tokio-tcp" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "iovec", - "mio 0.6.23", - "tokio-io", - "tokio-reactor", -] - -[[package]] -name = "tokio-tls" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "354b8cd83825b3c20217a9dc174d6a0c67441a2fae5c41bcb1ea6679f6ae0f7c" -dependencies = [ - "futures 0.1.31", - "native-tls", - "tokio-io", -] - [[package]] name = "tokio-tungstenite" version = "0.16.1" @@ -6299,7 +4134,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e80b39df6afcc12cdf752398ade96a6b9e99c903dfdc36e53ad10b9c366bca72" dependencies = [ "futures-util", - "log 0.4.14", + "log", "rustls 0.20.2", "tokio", "tokio-rustls 0.23.2", @@ -6316,9 +4151,8 @@ checksum = "ec31e5cc6b46e653cf57762f36f71d5e6386391d88a72fd6db4508f8f676fb29" dependencies = [ "bytes 1.1.0", "futures-core", - "futures-io", "futures-sink", - "log 0.4.14", + "log", "pin-project-lite", "slab", "tokio", @@ -6333,82 +4167,11 @@ dependencies = [ "serde", ] -[[package]] -name = "tonic" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a" -dependencies = [ - "async-stream", - "async-trait", - "base64 0.13.0", - "bytes 1.1.0", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper 0.14.16", - "hyper-timeout", - "percent-encoding 2.1.0", - "pin-project", - "prost", - "prost-derive", - "tokio", - "tokio-rustls 0.22.0", - "tokio-stream", - "tokio-util", - "tower", - "tower-layer", - "tower-service", - "tracing", - "tracing-futures", -] - -[[package]] -name = "tonic-build" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757" -dependencies = [ - "proc-macro2 1.0.24", - "prost-build", - "quote 1.0.6", - "syn 1.0.67", -] - -[[package]] -name = "tower" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5651b5f6860a99bd1adb59dbfe1db8beb433e73709d9032b413a77e2fb7c066a" -dependencies = [ - "futures-core", - "futures-util", - "indexmap", - "pin-project", - "pin-project-lite", - "rand 0.8.2", - "slab", - "tokio", - "tokio-stream", - "tokio-util", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62" - [[package]] name = "tower-service" -version = "0.3.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" +checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" [[package]] name = "tracing" @@ -6417,7 +4180,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" dependencies = [ "cfg-if 1.0.0", - "log 0.4.14", + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -6443,16 +4206,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - [[package]] name = "tracing-opentelemetry" version = "0.15.0" @@ -6476,18 +4229,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "traitobject" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" - -[[package]] -name = "trees" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de5f738ceab88e2491a94ddc33c3feeadfa95fedc60363ef110845df12f3878" - [[package]] name = "try-lock" version = "0.2.2" @@ -6505,53 +4246,23 @@ dependencies = [ "bytes 1.1.0", "http", "httparse", - "log 0.4.14", + "log", "rand 0.8.2", "rustls 0.20.2", - "sha-1 0.9.6", + "sha-1", "thiserror", - "url 2.2.2", + "url", "utf-8", "webpki 0.22.0", "webpki-roots 0.22.1", ] -[[package]] -name = "typeable" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" - [[package]] name = "typenum" version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" -[[package]] -name = "ucd-trie" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" - -[[package]] -name = "unicase" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" -dependencies = [ - "version_check 0.1.5", -] - -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check 0.9.2", -] - [[package]] name = "unicode-bidi" version = "0.3.4" @@ -6570,12 +4281,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" - [[package]] name = "unicode-width" version = "0.1.8" @@ -6604,15 +4309,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "unix_socket2" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b57c6eace16c00eccb98a28e85db3370eab0685bdd5e13831d59e2bcb49a1d8a" -dependencies = [ - "libc", -] - [[package]] name = "unreachable" version = "1.0.0" @@ -6638,17 +4334,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "url" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -dependencies = [ - "idna 0.1.5", - "matches", - "percent-encoding 1.0.1", -] - [[package]] name = "url" version = "2.2.2" @@ -6656,19 +4341,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" dependencies = [ "form_urlencoded", - "idna 0.2.0", + "idna", "matches", - "percent-encoding 2.1.0", -] - -[[package]] -name = "users" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4227e95324a443c9fcb06e03d4d85e91aabe9a5a02aa818688b6918b6af486" -dependencies = [ - "libc", - "log 0.4.14", + "percent-encoding", ] [[package]] @@ -6677,24 +4352,12 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7" -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - [[package]] name = "vec_map" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" -[[package]] -name = "version_check" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" - [[package]] name = "version_check" version = "0.9.2" @@ -6714,7 +4377,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" dependencies = [ "same-file", - "winapi 0.3.9", + "winapi", "winapi-util", ] @@ -6724,7 +4387,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" dependencies = [ - "log 0.4.14", + "log", "try-lock", ] @@ -6758,7 +4421,7 @@ checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" dependencies = [ "bumpalo", "lazy_static", - "log 0.4.14", + "log", "proc-macro2 1.0.24", "quote 1.0.6", "syn 1.0.67", @@ -6854,64 +4517,6 @@ dependencies = [ "webpki 0.22.0", ] -[[package]] -name = "websocket" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413b37840b9e27b340ce91b319ede10731de8c72f5bc4cb0206ec1ca4ce581d0" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "hyper 0.10.16", - "native-tls", - "rand 0.6.5", - "tokio-codec", - "tokio-io", - "tokio-reactor", - "tokio-tcp", - "tokio-tls", - "unicase 1.4.2", - "url 1.7.2", - "websocket-base", -] - -[[package]] -name = "websocket-base" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e3810f0d00c4dccb54c30a4eee815e703232819dec7b007db115791c42aa374" -dependencies = [ - "base64 0.10.1", - "bitflags", - "byteorder 1.4.3", - "bytes 0.4.12", - "futures 0.1.31", - "native-tls", - "rand 0.6.5", - "sha1", - "tokio-codec", - "tokio-io", - "tokio-tcp", - "tokio-tls", -] - -[[package]] -name = "which" -version = "4.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a5a7e487e921cf220206864a94a89b6c6905bfc19f1057fa26a4cb360e5c1d2" -dependencies = [ - "either", - "lazy_static", - "libc", -] - -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - [[package]] name = "winapi" version = "0.3.9" @@ -6922,12 +4527,6 @@ dependencies = [ "winapi-x86_64-pc-windows-gnu", ] -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" @@ -6940,7 +4539,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -6949,66 +4548,13 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows-sys" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030b7ff91626e57a05ca64a07c481973cbb2db774e4852c9c7ca342408c6a99a" -dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_msvc" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29277a4435d642f775f63c7d1faeb927adba532886ce0287bd985bffb16b6bca" - -[[package]] -name = "windows_i686_gnu" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1145e1989da93956c68d1864f32fb97c8f561a8f89a5125f6a2b7ea75524e4b8" - -[[package]] -name = "windows_i686_msvc" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a09e3a0d4753b73019db171c1339cd4362c8c44baf1bcea336235e955954a6" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca64fcb0220d58db4c119e050e7af03c69e6f4f415ef69ec1773d9aab422d5a" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08cabc9f0066848fef4bc6a1c1668e6efce38b661d2aeec75d18d8617eebb5f1" - [[package]] name = "winreg" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "ws2_32-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -dependencies = [ - "winapi 0.2.8", - "winapi-build", + "winapi", ] [[package]] @@ -7029,15 +4575,6 @@ dependencies = [ "linked-hash-map", ] -[[package]] -name = "yasna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346d34a236c9d3e5f3b9b74563f238f955bbd05fa0b8b4efa53c130c43982f4c" -dependencies = [ - "time 0.3.7", -] - [[package]] name = "zeroize" version = "1.3.0" diff --git a/programs/bpf/Cargo.toml b/programs/bpf/Cargo.toml index dfc22d63db..14e96e8a90 100644 --- a/programs/bpf/Cargo.toml +++ b/programs/bpf/Cargo.toml @@ -26,7 +26,6 @@ itertools = "0.10.1" log = "0.4.11" miow = "0.3.6" net2 = "0.2.37" -solana-account-decoder = { path = "../../account-decoder", version = "=1.10.0" } solana-bpf-rust-invoke = { path = "rust/invoke", version = "=1.10.0"} solana-bpf-loader-program = { path = "../bpf_loader", version = "=1.10.0"} solana-bpf-rust-realloc = { path = "rust/realloc", version = "=1.10.0"} @@ -39,6 +38,7 @@ solana-runtime = { path = "../../runtime", version = "=1.10.0" } solana-program-runtime = { path = "../../program-runtime", version = "=1.10.0" } solana-sdk = { path = "../../sdk", version = "=1.10.0" } solana-transaction-status = { path = "../../transaction-status", version = "=1.10.0" } +solana-account-decoder = { path = "../../account-decoder", version = "=1.10.0" } [[bench]] name = "bpf_loader" @@ -83,7 +83,6 @@ members = [ "rust/sha", "rust/sibling_inner_instruction", "rust/sibling_instruction", - "rust/simulation", "rust/spoof1", "rust/spoof1_system", "rust/sysvar", diff --git a/programs/bpf/build.rs b/programs/bpf/build.rs index 225c232a1e..4d6be86a55 100644 --- a/programs/bpf/build.rs +++ b/programs/bpf/build.rs @@ -93,7 +93,6 @@ fn main() { "sha", "sibling_inner_instruction", "sibling_instruction", - "simulation", "spoof1", "spoof1_system", "upgradeable", diff --git a/programs/bpf/rust/simulation/Cargo.toml b/programs/bpf/rust/simulation/Cargo.toml deleted file mode 100644 index 6b9e88349d..0000000000 --- a/programs/bpf/rust/simulation/Cargo.toml +++ /dev/null @@ -1,28 +0,0 @@ -[package] -name = "solana-bpf-rust-simulation" -version = "1.10.0" -description = "Solana BPF Program Simulation Differences" -authors = ["Solana Maintainers "] -repository = "https://github.com/solana-labs/solana" -license = "Apache-2.0" -homepage = "https://solana.com/" -documentation = "https://docs.rs/solana-bpf-rust-simulation" -edition = "2021" - -[features] -test-bpf = [] - -[dependencies] -solana-program = { path = "../../../../sdk/program", version = "=1.10.0" } - -[dev-dependencies] -solana-logger = { path = "../../../../logger", version = "=1.10.0" } -solana-program-test = { path = "../../../../program-test", version = "=1.10.0" } -solana-sdk = { path = "../../../../sdk", version = "=1.10.0" } -solana-validator = { path = "../../../../validator", version = "=1.10.0" } - -[lib] -crate-type = ["cdylib", "lib"] - -[package.metadata.docs.rs] -targets = ["x86_64-unknown-linux-gnu"] diff --git a/programs/bpf/rust/simulation/src/lib.rs b/programs/bpf/rust/simulation/src/lib.rs deleted file mode 100644 index e177cfa343..0000000000 --- a/programs/bpf/rust/simulation/src/lib.rs +++ /dev/null @@ -1,39 +0,0 @@ -use solana_program::{ - account_info::{next_account_info, AccountInfo}, - clock::Clock, - declare_id, entrypoint, - entrypoint::ProgramResult, - msg, - pubkey::Pubkey, - sysvar::Sysvar, -}; -use std::convert::TryInto; - -declare_id!("Sim1jD5C35odT8mzctm8BWnjic8xW5xgeb5MbcbErTo"); - -entrypoint!(process_instruction); - -pub fn process_instruction( - _program_id: &Pubkey, - accounts: &[AccountInfo], - _instruction_data: &[u8], -) -> ProgramResult { - let account_info_iter = &mut accounts.iter(); - let slot_account = next_account_info(account_info_iter)?; - - // Slot is an u64 at the end of the structure - let data = slot_account.data.borrow(); - let slot: u64 = u64::from_le_bytes(data[data.len() - 8..].try_into().unwrap()); - - let clock = Clock::get().unwrap(); - - msg!("next_slot is {:?} ", slot); - msg!("clock is in slot {:?} ", clock.slot); - if clock.slot >= slot { - msg!("On-chain"); - } else { - panic!("Simulation"); - } - - Ok(()) -} diff --git a/programs/bpf/rust/simulation/tests/lib.rs b/programs/bpf/rust/simulation/tests/lib.rs deleted file mode 100644 index 1628f6f366..0000000000 --- a/programs/bpf/rust/simulation/tests/lib.rs +++ /dev/null @@ -1,41 +0,0 @@ -#![cfg(feature = "test-bpf")] - -use { - solana_bpf_rust_simulation::process_instruction, - solana_program_test::{processor, tokio, ProgramTest}, - solana_sdk::{ - instruction::{AccountMeta, Instruction}, - pubkey::Pubkey, - signature::Signer, - sysvar, - transaction::Transaction, - }, -}; - -#[tokio::test] -async fn no_panic() { - let program_id = Pubkey::new_unique(); - let program_test = ProgramTest::new( - "solana_bpf_rust_simulation", - program_id, - processor!(process_instruction), - ); - - let mut context = program_test.start_with_context().await; - let transaction = Transaction::new_signed_with_payer( - &[Instruction { - program_id, - accounts: vec![AccountMeta::new_readonly(sysvar::slot_history::id(), false)], - data: vec![], - }], - Some(&context.payer.pubkey()), - &[&context.payer], - context.last_blockhash, - ); - - context - .banks_client - .process_transaction_with_preflight(transaction) - .await - .unwrap(); -} diff --git a/programs/bpf/rust/simulation/tests/validator.rs b/programs/bpf/rust/simulation/tests/validator.rs deleted file mode 100644 index 337c3f37ab..0000000000 --- a/programs/bpf/rust/simulation/tests/validator.rs +++ /dev/null @@ -1,38 +0,0 @@ -#![cfg(feature = "test-bpf")] - -use { - solana_program::{ - instruction::{AccountMeta, Instruction}, - pubkey::Pubkey, - sysvar, - }, - solana_sdk::{signature::Signer, transaction::Transaction}, - solana_validator::test_validator::*, -}; - -#[test] -fn no_panic() { - solana_logger::setup_with_default("solana_program_runtime=debug"); - let program_id = Pubkey::new_unique(); - - let (test_validator, payer) = TestValidatorGenesis::default() - .add_program("solana_bpf_rust_simulation", program_id) - .start(); - let rpc_client = test_validator.get_rpc_client(); - let blockhash = rpc_client.get_latest_blockhash().unwrap(); - - let transaction = Transaction::new_signed_with_payer( - &[Instruction { - program_id, - accounts: vec![AccountMeta::new_readonly(sysvar::slot_history::id(), false)], - data: vec![], - }], - Some(&payer.pubkey()), - &[&payer], - blockhash, - ); - - rpc_client - .send_and_confirm_transaction(&transaction) - .unwrap(); -} diff --git a/rpc/src/rpc.rs b/rpc/src/rpc.rs index 934b1bacd5..843686bbfe 100644 --- a/rpc/src/rpc.rs +++ b/rpc/src/rpc.rs @@ -3472,7 +3472,7 @@ pub mod rpc_full { let preflight_commitment = config .preflight_commitment .map(|commitment| CommitmentConfig { commitment }); - let preflight_bank = meta.bank(preflight_commitment); + let preflight_bank = &*meta.bank(preflight_commitment); let transaction = sanitize_transaction(unsanitized_tx)?; let signature = *transaction.signature(); @@ -3569,7 +3569,7 @@ pub mod rpc_full { let (_, mut unsanitized_tx) = decode_and_deserialize::(data, encoding)?; - let bank = meta.bank(config.commitment); + let bank = &*meta.bank(config.commitment); if config.replace_recent_blockhash { if config.sig_verify { return Err(Error::invalid_params( @@ -3637,7 +3637,7 @@ pub mod rpc_full { }; Ok(new_response( - &bank, + bank, RpcSimulateTransactionResult { err: result.err(), logs: Some(logs), diff --git a/runtime/src/accounts.rs b/runtime/src/accounts.rs index e48e368a3d..6dc827d688 100644 --- a/runtime/src/accounts.rs +++ b/runtime/src/accounts.rs @@ -199,16 +199,9 @@ impl Accounts { } } - pub fn new_from_parent( - parent: &Accounts, - slot: Slot, - parent_slot: Slot, - simulation_bank: bool, - ) -> Self { + pub fn new_from_parent(parent: &Accounts, slot: Slot, parent_slot: Slot) -> Self { let accounts_db = parent.accounts_db.clone(); - if !simulation_bank { - accounts_db.set_hash(slot, parent_slot); - } + accounts_db.set_hash(slot, parent_slot); Self { accounts_db, account_locks: Mutex::new(AccountLocks::default()), diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index 00cc68914c..9bd354b9e4 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -1035,18 +1035,6 @@ pub trait DropCallback: fmt::Debug { fn clone_box(&self) -> Box; } -/// Noop callback on dropping banks is useful for simulation banks, which are -/// new banks created from a frozen bank, but should not be purged in the same -/// way. -#[derive(Debug, Clone)] -struct NoopDropCallback; -impl DropCallback for NoopDropCallback { - fn callback(&self, _b: &Bank) {} - fn clone_box(&self) -> Box { - Box::new(self.clone()) - } -} - #[derive(Debug, PartialEq, Serialize, Deserialize, AbiExample, Clone, Copy)] pub struct RewardInfo { pub reward_type: RewardType, @@ -1265,7 +1253,6 @@ struct LoadVoteAndStakeAccountsResult { #[derive(Debug, Default)] pub struct NewBankOptions { pub vote_only_bank: bool, - pub simulation_bank: bool, } impl Bank { @@ -1540,10 +1527,7 @@ impl Bank { new_bank_options: NewBankOptions, ) -> Self { let mut time = Measure::start("bank::new_from_parent"); - let NewBankOptions { - vote_only_bank, - simulation_bank, - } = new_bank_options; + let NewBankOptions { vote_only_bank } = new_bank_options; parent.freeze(); assert_ne!(slot, parent.slot()); @@ -1557,7 +1541,6 @@ impl Bank { &parent.rc.accounts, slot, parent.slot(), - simulation_bank, )), parent: RwLock::new(Some(parent.clone())), slot, @@ -1647,20 +1630,6 @@ impl Bank { let (feature_set, feature_set_time) = Measure::this(|_| parent.feature_set.clone(), (), "feature_set_creation"); - let drop_callback = if simulation_bank { - RwLock::new(OptionalDropCallback(Some(Box::new(NoopDropCallback)))) - } else { - RwLock::new(OptionalDropCallback( - parent - .drop_callback - .read() - .unwrap() - .0 - .as_ref() - .map(|drop_callback| drop_callback.clone_box()), - )) - }; - let mut new = Bank { rc, src, @@ -1714,7 +1683,15 @@ impl Bank { transaction_log_collector_config, transaction_log_collector: Arc::new(RwLock::new(TransactionLogCollector::default())), feature_set, - drop_callback, + drop_callback: RwLock::new(OptionalDropCallback( + parent + .drop_callback + .read() + .unwrap() + .0 + .as_ref() + .map(|drop_callback| drop_callback.clone_box()), + )), freeze_started: AtomicBool::new(false), cost_tracker: RwLock::new(CostTracker::default()), sysvar_cache: RwLock::new(SysvarCache::default()), @@ -3495,26 +3472,12 @@ impl Bank { /// Run transactions against a frozen bank without committing the results pub fn simulate_transaction( - self: &Arc, + &self, transaction: SanitizedTransaction, ) -> TransactionSimulationResult { assert!(self.is_frozen(), "simulation bank must be frozen"); - // Simulation detection countermeasure 1: Create a new child bank for the simulation. This - // ensures comparing the slot values between the Clock and SlotHistory sysvars does not - // reveal that the program is running in simulation. - // - // Reference: https://opcodes.fr/en/publications/2022-01/detecting-transaction-simulation/ - let bank = Bank::new_from_parent_with_options( - self, - &Pubkey::default(), - self.slot().saturating_add(1), - NewBankOptions { - simulation_bank: true, - ..NewBankOptions::default() - }, - ); - bank.simulate_transaction_unchecked(transaction) + self.simulate_transaction_unchecked(transaction) } /// Run transactions against a bank without committing the results; does not check if the bank