diff --git a/Cargo.lock b/Cargo.lock index e483b0ae4c..3eff817e33 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -174,15 +174,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -[[package]] -name = "bitmaps" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" -dependencies = [ - "typenum", -] - [[package]] name = "blake2b-rs" version = "0.1.5" @@ -1376,7 +1367,7 @@ dependencies = [ "num-traits", "rand_core 0.5.1", "rand_os 0.2.2", - "rand_xoshiro 0.3.1", + "rand_xoshiro", "rayon", "serde", "serde_derive", @@ -2409,34 +2400,6 @@ dependencies = [ "xmltree", ] -[[package]] -name = "im" -version = "14.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "696059c87b83c5a258817ecd67c3af915e3ed141891fc35a1e79908801cf0ce7" -dependencies = [ - "bitmaps", - "rand_core 0.5.1", - "rand_xoshiro 0.4.0", - "sized-chunks 0.5.3", - "typenum", - "version_check", -] - -[[package]] -name = "im" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111c1983f3c5bb72732df25cddacee9b546d08325fb584b5ebd38148be7b0246" -dependencies = [ - "bitmaps", - "rand_core 0.5.1", - "rand_xoshiro 0.4.0", - "sized-chunks 0.6.2", - "typenum", - "version_check", -] - [[package]] name = "includedir" version = "0.5.0" @@ -2814,8 +2777,7 @@ dependencies = [ [[package]] name = "metrics" version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b70227ece8711a1aa2f99655efd795d0cff297a5b9fe39645a93aacf6ad39d" +source = "git+https://github.com/nervosnetwork/metrics-rs?tag=metrics-runtime-v0.13.1-patch.1#4fd13f6b93022c5ec0f415515948648eaec34317" dependencies = [ "metrics-core", ] @@ -2823,14 +2785,12 @@ dependencies = [ [[package]] name = "metrics-core" version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c064b3a1ff41f4bf6c91185c8a0caeccf8a8a27e9d0f92cc54cf3dbec812f48" +source = "git+https://github.com/nervosnetwork/metrics-rs?tag=metrics-runtime-v0.13.1-patch.1#4fd13f6b93022c5ec0f415515948648eaec34317" [[package]] name = "metrics-exporter-http" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14017d204ae062dc5c68a321e3dbdcd9b30181305cb6b067932f7f03f754e27" +source = "git+https://github.com/nervosnetwork/metrics-rs?tag=metrics-runtime-v0.13.1-patch.1#4fd13f6b93022c5ec0f415515948648eaec34317" dependencies = [ "hyper 0.13.7", "log 0.4.11", @@ -2840,8 +2800,7 @@ dependencies = [ [[package]] name = "metrics-exporter-log" version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3fc63816bd5f8bde5eb31ce471f9633adc69ba1c55b44191b4d5fc7e263e8ab" +source = "git+https://github.com/nervosnetwork/metrics-rs?tag=metrics-runtime-v0.13.1-patch.1#4fd13f6b93022c5ec0f415515948648eaec34317" dependencies = [ "log 0.4.11", "metrics-core", @@ -2851,8 +2810,7 @@ dependencies = [ [[package]] name = "metrics-observer-json" version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe930460a6c336b8f873dcfb28da3f805fd0dbadbea7beaf3042c7fb1d9fcd3" +source = "git+https://github.com/nervosnetwork/metrics-rs?tag=metrics-runtime-v0.13.1-patch.1#4fd13f6b93022c5ec0f415515948648eaec34317" dependencies = [ "hdrhistogram", "metrics-core", @@ -2863,8 +2821,7 @@ dependencies = [ [[package]] name = "metrics-observer-prometheus" version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bfe24ad8285ef8b239232135a65f89cc5fa4690bbfaf8907f4bef38f8b08eba" +source = "git+https://github.com/nervosnetwork/metrics-rs?tag=metrics-runtime-v0.13.1-patch.1#4fd13f6b93022c5ec0f415515948648eaec34317" dependencies = [ "hdrhistogram", "metrics-core", @@ -2874,8 +2831,7 @@ dependencies = [ [[package]] name = "metrics-observer-yaml" version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83f66811013592560efc75d75a92d6e2f415a11b52f085e51d9fb4d1edec6335" +source = "git+https://github.com/nervosnetwork/metrics-rs?tag=metrics-runtime-v0.13.1-patch.1#4fd13f6b93022c5ec0f415515948648eaec34317" dependencies = [ "hdrhistogram", "metrics-core", @@ -2886,13 +2842,11 @@ dependencies = [ [[package]] name = "metrics-runtime" version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce0e4f69639ccc0c6b2f0612164f9817349eb25545ed1ffb5ef3e1e1c1d220b4" +source = "git+https://github.com/nervosnetwork/metrics-rs?tag=metrics-runtime-v0.13.1-patch.1#4fd13f6b93022c5ec0f415515948648eaec34317" dependencies = [ "arc-swap", "atomic-shim", "crossbeam-utils 0.7.2", - "im 15.0.0", "metrics", "metrics-core", "metrics-exporter-http", @@ -2908,8 +2862,7 @@ dependencies = [ [[package]] name = "metrics-util" version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11f8090a8886339f9468a04eeea0711e4cf27538b134014664308041307a1c5" +source = "git+https://github.com/nervosnetwork/metrics-rs?tag=metrics-runtime-v0.13.1-patch.1#4fd13f6b93022c5ec0f415515948648eaec34317" dependencies = [ "crossbeam-epoch 0.8.2", "serde", @@ -3831,15 +3784,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_xoshiro" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9fcdd2e881d02f1d9390ae47ad8e5696a9e4be7b547a1da2afbc61973217004" -dependencies = [ - "rand_core 0.5.1", -] - [[package]] name = "ratelimit_meter" version = "5.0.0" @@ -4186,18 +4130,28 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "sentry" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd0927ec4a785fc4328abe9089afbe074b3874983b3373fc328a73a9f8310cb" +source = "git+https://github.com/nervosnetwork/sentry-rust?tag=sentry-v0.19.1-patch.1#1cdb9ff77562df2bf0e091940d762f285d686000" dependencies = [ "httpdate", "reqwest 0.10.8", - "sentry-backtrace", + "sentry-backtrace 0.19.1 (git+https://github.com/nervosnetwork/sentry-rust?tag=sentry-v0.19.1-patch.1)", "sentry-contexts", "sentry-core", "sentry-failure", "sentry-panic", ] +[[package]] +name = "sentry-backtrace" +version = "0.19.1" +source = "git+https://github.com/nervosnetwork/sentry-rust?tag=sentry-v0.19.1-patch.1#1cdb9ff77562df2bf0e091940d762f285d686000" +dependencies = [ + "backtrace", + "lazy_static", + "regex", + "sentry-core", +] + [[package]] name = "sentry-backtrace" version = "0.19.1" @@ -4213,8 +4167,7 @@ dependencies = [ [[package]] name = "sentry-contexts" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d607b3be0593e026f1c089f0086c244429fe3026eca8e075e8f9e834703ee4c0" +source = "git+https://github.com/nervosnetwork/sentry-rust?tag=sentry-v0.19.1-patch.1#1cdb9ff77562df2bf0e091940d762f285d686000" dependencies = [ "hostname", "lazy_static", @@ -4228,10 +4181,8 @@ dependencies = [ [[package]] name = "sentry-core" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9c118347dc0958e66f8b0f3866f0d85bbf8a63bffe64603baebe3f989e929e6" +source = "git+https://github.com/nervosnetwork/sentry-rust?tag=sentry-v0.19.1-patch.1#1cdb9ff77562df2bf0e091940d762f285d686000" dependencies = [ - "im 14.3.0", "lazy_static", "rand 0.7.3", "sentry-types", @@ -4240,11 +4191,10 @@ dependencies = [ [[package]] name = "sentry-failure" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8599d375040329e106653a133a1d876af53df8b504cff1de7b6f4471fd41eec3" +source = "git+https://github.com/nervosnetwork/sentry-rust?tag=sentry-v0.19.1-patch.1#1cdb9ff77562df2bf0e091940d762f285d686000" dependencies = [ "failure", - "sentry-backtrace", + "sentry-backtrace 0.19.1 (git+https://github.com/nervosnetwork/sentry-rust?tag=sentry-v0.19.1-patch.1)", "sentry-core", ] @@ -4255,25 +4205,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e7af2bac3f98831b6e674666a41731592eba9fc0730c78feb7429ceae7f8832" dependencies = [ "log 0.4.11", - "sentry-backtrace", + "sentry-backtrace 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)", "sentry-core", ] [[package]] name = "sentry-panic" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3943c3fc7fff39244158b625bb2235a27e7e4d0b862b5e52cb57db51e6a6e6e" +source = "git+https://github.com/nervosnetwork/sentry-rust?tag=sentry-v0.19.1-patch.1#1cdb9ff77562df2bf0e091940d762f285d686000" dependencies = [ - "sentry-backtrace", + "sentry-backtrace 0.19.1 (git+https://github.com/nervosnetwork/sentry-rust?tag=sentry-v0.19.1-patch.1)", "sentry-core", ] [[package]] name = "sentry-types" version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87b41bac48a3586249431fa9efb88cd1414c3455117eb57c02f5bda9634e158d" +source = "git+https://github.com/nervosnetwork/sentry-rust?tag=sentry-v0.19.1-patch.1#1cdb9ff77562df2bf0e091940d762f285d686000" dependencies = [ "chrono", "debugid", @@ -4390,26 +4338,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" -[[package]] -name = "sized-chunks" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59044ea371ad781ff976f7b06480b9f0180e834eda94114f2afb4afc12b7718" -dependencies = [ - "bitmaps", - "typenum", -] - -[[package]] -name = "sized-chunks" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec31ceca5644fa6d444cc77548b88b67f46db6f7c71683b0f9336e671830d2f" -dependencies = [ - "bitmaps", - "typenum", -] - [[package]] name = "slab" version = "0.4.2" diff --git a/Cargo.toml b/Cargo.toml index 7d51dbaa6a..3fd934fa93 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -81,3 +81,11 @@ jemallocator = { version = "0.3.0", features = ["unprefixed_malloc_on_supported_ default = [] deadlock_detection = ["ckb-bin/deadlock_detection"] profiling = ["jemallocator/profiling", "ckb-bin/profiling"] + +[patch.crates-io] +# Interim patch to fix RUSTSEC-2020-0041. +metrics = { git = "https://github.com/nervosnetwork/metrics-rs", tag = "metrics-runtime-v0.13.1-patch.1" } +metrics-runtime = { git = "https://github.com/nervosnetwork/metrics-rs", tag = "metrics-runtime-v0.13.1-patch.1" } +metrics-core = { git = "https://github.com/nervosnetwork/metrics-rs", tag = "metrics-runtime-v0.13.1-patch.1" } +sentry = { git = "https://github.com/nervosnetwork/sentry-rust", tag = "sentry-v0.19.1-patch.1" } +sentry-core = { git = "https://github.com/nervosnetwork/sentry-rust", tag = "sentry-v0.19.1-patch.1" }