diff --git a/Cargo.lock b/Cargo.lock index 610417bb9e..0ffcf18c97 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,7 +28,7 @@ dependencies = [ "parking_lot 0.12.1", "pin-project-lite 0.2.9", "smallvec 1.10.0", - "tokio 1.20.1", + "tokio", "tokio-util 0.7.3", ] @@ -50,7 +50,7 @@ checksum = "7ea16c295198e958ef31930a6ef37d0fb64e9ca3b6116e6b93a8bdae96ee1000" dependencies = [ "actix-macros", "futures-core", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -210,7 +210,7 @@ dependencies = [ "starcoin-rpc-api", "starcoin-types", "starcoin-vm-types", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -314,11 +314,11 @@ version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "345fd392ab01f746c717b1357165b76f0b67a60192007b234058c9045fdcf695" dependencies = [ - "bytes 0.5.6", "flate2", "futures-core", "memchr", "pin-project-lite 0.2.9", + "tokio", ] [[package]] @@ -530,7 +530,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" dependencies = [ - "byteorder 1.4.3", + "byteorder", "safemem", ] @@ -540,7 +540,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" dependencies = [ - "byteorder 1.4.3", + "byteorder", ] [[package]] @@ -767,7 +767,7 @@ checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" dependencies = [ "block-padding 0.1.5", "byte-tools", - "byteorder 1.4.3", + "byteorder", "generic-array 0.12.4", ] @@ -885,12 +885,6 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5377c8865e74a160d21f29c2d40669f53286db6eab59b88540cbb12ffc8b835" -[[package]] -name = "byteorder" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855" - [[package]] name = "byteorder" version = "1.4.3" @@ -903,16 +897,10 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" dependencies = [ - "byteorder 1.4.3", + "byteorder", "iovec", ] -[[package]] -name = "bytes" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - [[package]] name = "bytes" version = "1.2.1" @@ -1619,7 +1607,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b810a8449931679f64cd7eef1bbd0fa315801b6d5d9cdc1ace2804d6529eee18" dependencies = [ - "byteorder 1.4.3", + "byteorder", "fnv", "rand 0.7.3", ] @@ -1646,7 +1634,7 @@ version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" dependencies = [ - "byteorder 1.4.3", + "byteorder", "digest 0.9.0", "rand_core 0.5.1", "subtle", @@ -1659,7 +1647,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44339b9ecede7f72a0d3b012bf9bb5a616dc8bfde23ce544e42da075c87198f0" dependencies = [ - "byteorder 1.4.3", + "byteorder", "digest 0.9.0", "fiat-crypto", "rand_core 0.6.3", @@ -1864,7 +1852,7 @@ dependencies = [ "starcoin-transaction-builder", "starcoin-types", "starcoin-vm-types", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -1936,6 +1924,12 @@ dependencies = [ "syn 1.0.107", ] +[[package]] +name = "destructure_traitobject" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7" + [[package]] name = "deunicode" version = "0.4.3" @@ -2080,7 +2074,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea" dependencies = [ - "byteorder 1.4.3", + "byteorder", "quick-error 1.2.3", ] @@ -2143,15 +2137,16 @@ checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" [[package]] name = "elasticsearch" -version = "7.10.0-alpha.1" +version = "8.5.0-alpha.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "178d260175cbe5578029036dad1a7411eb5c669dcf12e9c3f50e699e6ca3ef7b" +checksum = "40d9bd57d914cc66ce878f098f63ed7b5d5b64c30644a5adb950b008f874a6c6" dependencies = [ "base64 0.11.0", - "bytes 0.5.6", + "bytes 1.2.1", "dyn-clone", + "lazy_static 1.4.0", "percent-encoding 2.1.0", - "reqwest 0.10.10", + "reqwest", "rustc_version 0.2.3", "serde 1.0.151", "serde_json", @@ -2356,7 +2351,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11498d382790b7a8f2fd211780bec78619bba81cdad3a283997c0c41f836759c" dependencies = [ - "byteorder 1.4.3", + "byteorder", "rand 0.7.3", "rustc-hex", "static_assertions", @@ -2368,7 +2363,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" dependencies = [ - "byteorder 1.4.3", + "byteorder", "rand 0.8.5", "rustc-hex", "static_assertions", @@ -2426,7 +2421,7 @@ dependencies = [ "backtrace", "bcs", "bcs-ext", - "byteorder 1.4.3", + "byteorder", "criterion", "hex", "mirai-annotations", @@ -2591,7 +2586,7 @@ checksum = "fde5a672a61f96552aa5ed9fd9c81c3fbdae4be9b1e205d6eaf17c83705adc0f" dependencies = [ "futures 0.3.21", "pin-project-lite 0.2.9", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -2689,7 +2684,7 @@ dependencies = [ "starcoin-rpc-api", "starcoin-types", "starcoin-vm-types", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -2843,26 +2838,6 @@ dependencies = [ "smallvec 1.10.0", ] -[[package]] -name = "h2" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" -dependencies = [ - "bytes 0.5.6", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio 0.2.25", - "tokio-util 0.3.1", - "tracing", - "tracing-futures", -] - [[package]] name = "h2" version = "0.3.13" @@ -2877,7 +2852,7 @@ dependencies = [ "http", "indexmap", "slab", - "tokio 1.20.1", + "tokio", "tokio-util 0.7.3", "tracing", ] @@ -3008,16 +2983,6 @@ dependencies = [ "itoa 1.0.2", ] -[[package]] -name = "http-body" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" -dependencies = [ - "bytes 0.5.6", - "http", -] - [[package]] name = "http-body" version = "0.4.5" @@ -3035,12 +3000,6 @@ version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" -[[package]] -name = "httpdate" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" - [[package]] name = "httpdate" version = "1.0.2" @@ -3078,30 +3037,6 @@ dependencies = [ "url 1.7.2", ] -[[package]] -name = "hyper" -version = "0.13.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" -dependencies = [ - "bytes 0.5.6", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.2.7", - "http", - "http-body 0.3.1", - "httparse", - "httpdate 0.3.2", - "itoa 0.4.8", - "pin-project 1.0.11", - "socket2 0.3.19", - "tokio 0.2.25", - "tower-service", - "tracing", - "want", -] - [[package]] name = "hyper" version = "0.14.20" @@ -3112,33 +3047,20 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.3.13", + "h2", "http", - "http-body 0.4.5", + "http-body", "httparse", - "httpdate 1.0.2", + "httpdate", "itoa 1.0.2", "pin-project-lite 0.2.9", "socket2 0.4.4", - "tokio 1.20.1", + "tokio", "tower-service", "tracing", "want", ] -[[package]] -name = "hyper-tls" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" -dependencies = [ - "bytes 0.5.6", - "hyper 0.13.10", - "native-tls", - "tokio 0.2.25", - "tokio-tls 0.3.1", -] - [[package]] name = "hyper-tls" version = "0.5.0" @@ -3148,7 +3070,7 @@ dependencies = [ "bytes 1.2.1", "hyper 0.14.20", "native-tls", - "tokio 1.20.1", + "tokio", "tokio-native-tls", ] @@ -3507,7 +3429,7 @@ dependencies = [ "derive_more", "futures 0.3.21", "hyper 0.14.20", - "hyper-tls 0.5.0", + "hyper-tls", "jsonrpc-core", "jsonrpc-pubsub", "jsonrpc-server-utils", @@ -3515,7 +3437,7 @@ dependencies = [ "parity-tokio-ipc", "serde 1.0.151", "serde_json", - "tokio 1.20.1", + "tokio", "url 1.7.2", "websocket", ] @@ -3615,7 +3537,7 @@ dependencies = [ "jsonrpc-core", "lazy_static 1.4.0", "log 0.4.17", - "tokio 1.20.1", + "tokio", "tokio-stream", "tokio-util 0.6.10", "unicase 2.6.0", @@ -3877,7 +3799,7 @@ checksum = "385ae5f44e84f51e17014c9f1d98464121d3b1b182c167a0b4482d6250c61926" dependencies = [ "asynchronous-codec 0.6.1", "base64 0.13.0", - "byteorder 1.4.3", + "byteorder", "bytes 1.2.1", "fnv", "futures 0.3.21", @@ -4387,9 +4309,9 @@ checksum = "a94d21414c1f4a51209ad204c1776a3d0765002c76c6abcb602a6f09f1e881c7" [[package]] name = "log4rs" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "893eaf59f4bef8e2e94302adf56385db445a0306b9823582b0b8d5a06d8822f3" +checksum = "d36ca1786d9e79b8193a68d480a0907b612f109537115c6ff655a3a1967533fd" dependencies = [ "anyhow", "arc-swap", @@ -4408,7 +4330,7 @@ dependencies = [ "serde_yaml", "thiserror", "thread-id", - "typemap", + "typemap-ors", "winapi 0.3.9", ] @@ -4506,8 +4428,9 @@ dependencies = [ [[package]] name = "merkletree" -version = "0.22.0" -source = "git+https://github.com/filecoin-project/merkletree?rev=3b1d98c43b341aed935152c5c1535c17d1b21d20#3b1d98c43b341aed935152c5c1535c17d1b21d20" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d348b5b0d1707be1c8a727b7078daa08e2a3051d63b35715a19c35a324d2aaac" dependencies = [ "anyhow", "arrayref", @@ -4535,16 +4458,6 @@ version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" -[[package]] -name = "mime_guess" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" -dependencies = [ - "mime 0.3.16", - "unicase 2.6.0", -] - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -4774,7 +4687,7 @@ dependencies = [ "once_cell", "read-write-set", "read-write-set-dynamic", - "reqwest 0.11.11", + "reqwest", "serde 1.0.151", "serde_json", "serde_yaml", @@ -5057,7 +4970,7 @@ dependencies = [ "petgraph 0.5.1", "ptree", "regex", - "reqwest 0.11.11", + "reqwest", "serde 1.0.151", "serde_yaml", "sha2 0.9.9", @@ -5110,7 +5023,7 @@ dependencies = [ "starcoin-vm-types", "stdlib", "tempfile", - "tokio 1.20.1", + "tokio", "vm-status-translator", "walkdir", ] @@ -5148,7 +5061,7 @@ dependencies = [ "serde 1.0.151", "serde_json", "simplelog", - "tokio 1.20.1", + "tokio", "toml", ] @@ -5177,7 +5090,7 @@ dependencies = [ "serde 1.0.151", "serde_json", "tera", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -5428,7 +5341,7 @@ checksum = "48ee4ea82141951ac6379f964f71b20876d43712bea8faf6dd1a375e08a46499" dependencies = [ "arrayref", "bs58 0.4.0", - "byteorder 1.4.3", + "byteorder", "data-encoding", "multihash", "percent-encoding 2.1.0", @@ -5544,7 +5457,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "345b8ab5bd4e71a2986663e88c56856699d060e78e152e6e9d7966fcd5491297" dependencies = [ "anyhow", - "byteorder 1.4.3", + "byteorder", "libc", "netlink-packet-utils", ] @@ -5557,7 +5470,7 @@ checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab" dependencies = [ "anyhow", "bitflags", - "byteorder 1.4.3", + "byteorder", "libc", "netlink-packet-core", "netlink-packet-utils", @@ -5570,7 +5483,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25af9cf0dc55498b7bd94a1508af7a78706aa0ab715a73c5169273e03c84845e" dependencies = [ "anyhow", - "byteorder 1.4.3", + "byteorder", "paste", "thiserror", ] @@ -5587,7 +5500,7 @@ dependencies = [ "netlink-packet-core", "netlink-sys", "thiserror", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -6210,7 +6123,7 @@ dependencies = [ "libc", "log 0.4.17", "rand 0.7.3", - "tokio 1.20.1", + "tokio", "winapi 0.3.9", ] @@ -6220,7 +6133,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5983d3929ad50f12c3eb9a6743f19d691866ecd44da74c0a3308c3f8a56df0c6" dependencies = [ - "byteorder 1.4.3", + "byteorder", "bytes 0.4.12", "httparse", "log 0.4.17", @@ -6634,14 +6547,13 @@ dependencies = [ [[package]] name = "positioned-io" -version = "0.2.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c405a565f48a728dbb07fa1770e30791b0fa3e6344c1e5615225ce84049354d6" +checksum = "09b9485cf7f528baf34edd811ec8283a168864912e11d0b7d3e0510738761114" dependencies = [ - "byteorder 0.5.3", - "kernel32-sys", + "byteorder", "libc", - "winapi 0.2.8", + "winapi 0.3.9", ] [[package]] @@ -6812,7 +6724,7 @@ dependencies = [ "memchr", "parking_lot 0.12.1", "protobuf", - "reqwest 0.11.11", + "reqwest", "thiserror", ] @@ -6824,7 +6736,7 @@ checksum = "1e0d9cc07f18492d879586c92b485def06bc850da3118075cd45d50e9c95b0e5" dependencies = [ "bit-set", "bitflags", - "byteorder 1.4.3", + "byteorder", "lazy_static 1.4.0", "num-traits 0.2.15", "quick-error 2.0.1", @@ -7384,59 +7296,23 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "reqwest" -version = "0.10.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" -dependencies = [ - "async-compression", - "base64 0.13.0", - "bytes 0.5.6", - "encoding_rs", - "futures-core", - "futures-util", - "http", - "http-body 0.3.1", - "hyper 0.13.10", - "hyper-tls 0.4.3", - "ipnet", - "js-sys", - "lazy_static 1.4.0", - "log 0.4.17", - "mime 0.3.16", - "mime_guess", - "native-tls", - "percent-encoding 2.1.0", - "pin-project-lite 0.2.9", - "serde 1.0.151", - "serde_json", - "serde_urlencoded", - "tokio 0.2.25", - "tokio-tls 0.3.1", - "url 2.2.2", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg 0.7.0", -] - [[package]] name = "reqwest" version = "0.11.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92" dependencies = [ + "async-compression", "base64 0.13.0", "bytes 1.2.1", "encoding_rs", "futures-core", "futures-util", - "h2 0.3.13", + "h2", "http", - "http-body 0.4.5", + "http-body", "hyper 0.14.20", - "hyper-tls 0.5.0", + "hyper-tls", "ipnet", "js-sys", "lazy_static 1.4.0", @@ -7448,8 +7324,9 @@ dependencies = [ "serde 1.0.151", "serde_json", "serde_urlencoded", - "tokio 1.20.1", + "tokio", "tokio-native-tls", + "tokio-util 0.7.3", "tower-service", "url 2.2.2", "wasm-bindgen", @@ -8613,7 +8490,7 @@ dependencies = [ "starcoin-types", "stest", "tempfile", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -8622,7 +8499,7 @@ version = "1.13.0-alpha" dependencies = [ "anyhow", "bcs-ext", - "byteorder 1.4.3", + "byteorder", "itertools", "lru", "mirai-annotations", @@ -8664,7 +8541,7 @@ dependencies = [ "starcoin-txpool-api", "starcoin-types", "stest", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -8703,7 +8580,7 @@ dependencies = [ "stest", "test-helper", "thiserror", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -8794,7 +8671,7 @@ dependencies = [ "stest", "test-helper", "thiserror", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -8850,7 +8727,7 @@ dependencies = [ "stdlib", "stest", "test-helper", - "tokio 1.20.1", + "tokio", "vm-status-translator", ] @@ -8899,7 +8776,7 @@ name = "starcoin-consensus" version = "1.13.0-alpha" dependencies = [ "anyhow", - "byteorder 1.4.3", + "byteorder", "cryptonight-rs", "futures 0.3.21", "hex", @@ -8970,7 +8847,7 @@ version = "1.13.0-alpha" dependencies = [ "aes-gcm 0.9.4", "anyhow", - "byteorder 1.4.3", + "byteorder", "hmac 0.12.1", "pbkdf2", "rand 0.8.5", @@ -9080,7 +8957,7 @@ dependencies = [ "starcoin-transaction-builder", "starcoin-types", "tiny_http", - "tokio 1.20.1", + "tokio", "tokio-executor 0.2.0-alpha.6", ] @@ -9195,7 +9072,7 @@ dependencies = [ "starcoin-logger", "starcoin-rpc-api", "starcoin-types", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -9272,7 +9149,7 @@ dependencies = [ "stest", "test-helper", "thiserror", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -9284,7 +9161,7 @@ dependencies = [ "anyhow", "async-std", "async-trait", - "byteorder 1.4.3", + "byteorder", "clap 3.2.15", "dyn-clone", "futures 0.3.21", @@ -9315,7 +9192,7 @@ dependencies = [ "starcoin-types", "stest", "thiserror", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -9453,7 +9330,7 @@ dependencies = [ "stest", "tempfile", "test-helper", - "tokio 1.20.1", + "tokio", "zeroize", ] @@ -9500,7 +9377,7 @@ dependencies = [ "starcoin-vm-types", "stest", "test-helper", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -9576,7 +9453,7 @@ dependencies = [ "stest", "thiserror", "timeout-join-handler", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -9759,7 +9636,7 @@ dependencies = [ "stest", "test-helper", "thiserror", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -9852,7 +9729,7 @@ dependencies = [ "stest", "test-helper", "thiserror", - "tokio 1.20.1", + "tokio", "vm-status-translator", ] @@ -9873,7 +9750,7 @@ dependencies = [ "serde 1.0.151", "stest", "thiserror", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -9912,7 +9789,7 @@ dependencies = [ "starcoin-vm-types", "stest", "test-helper", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -9968,7 +9845,7 @@ version = "1.13.0-alpha" dependencies = [ "anyhow", "bcs-ext", - "byteorder 1.4.3", + "byteorder", "chrono", "coarsetime", "forkable-jellyfish-merkle", @@ -10000,7 +9877,7 @@ name = "starcoin-stratum" version = "1.13.0-alpha" dependencies = [ "anyhow", - "byteorder 1.4.3", + "byteorder", "futures 0.3.21", "hex", "jsonrpc-core", @@ -10078,7 +9955,7 @@ dependencies = [ "sysinfo", "test-helper", "thiserror", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -10179,7 +10056,7 @@ dependencies = [ "starcoin-vm-types", "stdlib", "tempfile", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -10200,7 +10077,7 @@ dependencies = [ "starcoin-state-api", "starcoin-transaction-builder", "starcoin-types", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -10241,7 +10118,7 @@ dependencies = [ "stest", "tempfile", "test-helper", - "tokio 1.20.1", + "tokio", "trace-time", "transaction-pool", ] @@ -10270,7 +10147,7 @@ dependencies = [ "starcoin-txpool-api", "starcoin-types", "stest", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -10279,7 +10156,7 @@ version = "1.13.0-alpha" dependencies = [ "anyhow", "bcs-ext", - "byteorder 1.4.3", + "byteorder", "bytes 1.2.1", "forkable-jellyfish-merkle", "hex", @@ -10417,7 +10294,7 @@ dependencies = [ "starcoin-logger", "stest-macro", "timeout-join-handler", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -10462,7 +10339,7 @@ dependencies = [ "starcoin-logger", "stest", "thiserror", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -10722,7 +10599,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" dependencies = [ - "byteorder 1.4.3", + "byteorder", "dirs", "winapi 0.3.9", ] @@ -10821,7 +10698,7 @@ dependencies = [ "stdlib", "stest", "thiserror", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -11041,23 +10918,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" -[[package]] -name = "tokio" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" -dependencies = [ - "bytes 0.5.6", - "fnv", - "futures-core", - "iovec", - "lazy_static 1.4.0", - "memchr", - "mio 0.6.23", - "pin-project-lite 0.1.12", - "slab", -] - [[package]] name = "tokio" version = "1.20.1" @@ -11140,7 +11000,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" dependencies = [ "native-tls", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -11170,7 +11030,7 @@ checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" dependencies = [ "futures-core", "pin-project-lite 0.2.9", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -11219,30 +11079,6 @@ dependencies = [ "tokio-io", ] -[[package]] -name = "tokio-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" -dependencies = [ - "native-tls", - "tokio 0.2.25", -] - -[[package]] -name = "tokio-util" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" -dependencies = [ - "bytes 0.5.6", - "futures-core", - "futures-sink", - "log 0.4.17", - "pin-project-lite 0.1.12", - "tokio 0.2.25", -] - [[package]] name = "tokio-util" version = "0.6.10" @@ -11254,7 +11090,7 @@ dependencies = [ "futures-sink", "log 0.4.17", "pin-project-lite 0.2.9", - "tokio 1.20.1", + "tokio", ] [[package]] @@ -11267,7 +11103,7 @@ dependencies = [ "futures-core", "futures-sink", "pin-project-lite 0.2.9", - "tokio 1.20.1", + "tokio", "tracing", ] @@ -11314,7 +11150,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160" dependencies = [ "cfg-if 1.0.0", - "log 0.4.17", "pin-project-lite 0.2.9", "tracing-attributes", "tracing-core", @@ -11340,16 +11175,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project 1.0.11", - "tracing", -] - [[package]] name = "traitobject" version = "0.1.0" @@ -11461,12 +11286,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0685c84d5d54d1c26f7d3eb96cd41550adb97baed141a761cf335d3d33bcd0ae" [[package]] -name = "typemap" -version = "0.3.3" +name = "typemap-ors" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" +checksum = "a68c24b707f02dd18f1e4ccceb9d49f2058c2fb86384ef9972592904d7a28867" dependencies = [ - "unsafe-any", + "unsafe-any-ors", ] [[package]] @@ -11487,7 +11312,7 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9db035e67dfaf7edd9aebfe8676afcd63eed53c8a4044fed514c8cccf1835177" dependencies = [ - "byteorder 1.4.3", + "byteorder", "crunchy", "rustc-hex", "static_assertions", @@ -11499,7 +11324,7 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52" dependencies = [ - "byteorder 1.4.3", + "byteorder", "crunchy", "hex", "static_assertions", @@ -11653,12 +11478,12 @@ dependencies = [ ] [[package]] -name = "unsafe-any" -version = "0.4.2" +name = "unsafe-any-ors" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" +checksum = "e0a303d30665362d9680d7d91d78b23f5f899504d4f08b3c4cf08d055d87c0ad" dependencies = [ - "traitobject", + "destructure_traitobject", ] [[package]] @@ -11848,8 +11673,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" dependencies = [ "cfg-if 1.0.0", - "serde 1.0.151", - "serde_json", "wasm-bindgen-macro", ] @@ -11968,7 +11791,7 @@ dependencies = [ "tokio-io", "tokio-reactor", "tokio-tcp", - "tokio-tls 0.2.1", + "tokio-tls", "unicase 1.4.2", "url 1.7.2", "websocket-base", @@ -11982,7 +11805,7 @@ checksum = "5e3810f0d00c4dccb54c30a4eee815e703232819dec7b007db115791c42aa374" dependencies = [ "base64 0.10.1", "bitflags", - "byteorder 1.4.3", + "byteorder", "bytes 0.4.12", "futures 0.1.31", "native-tls", @@ -11991,7 +11814,7 @@ dependencies = [ "tokio-codec", "tokio-io", "tokio-tcp", - "tokio-tls 0.2.1", + "tokio-tls", ] [[package]] @@ -12175,15 +11998,6 @@ dependencies = [ "winapi 0.3.9", ] -[[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 = "winreg" version = "0.10.1" diff --git a/Cargo.toml b/Cargo.toml index 17e23d90af..861dad7190 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -271,7 +271,7 @@ difference = "2.0.0" dirs-next = "2.0.0" dyn-clone = "1.0.8" either = "~1" -elasticsearch = "7.10.0-alpha.1" +elasticsearch = "8.5.0-alpha.1" ethereum-types = "0.9" starcoin-executor-benchmark = { path = "executor/benchmark" } fnv = "1.0.6" @@ -292,7 +292,7 @@ hyper = { version = "0.14.12", features = ["full"] } include_dir = { version = "0.6.2", features = ["search"] } indicatif = "0.16.2" ip_network = "0.3.4" -io-lifetimes = "0.7.2" +io-lifetimes = "1.0.5" itertools = "0.10.3" jpst = "0.1.1" jsonpath = "0.1.1" @@ -320,9 +320,9 @@ libsecp256k1 = "0.7.1" linked-hash-map = "0.5.6" linked_hash_set = "0.1.3" log = { version = "0.4.16" } -log4rs = { version = "1.0.0", features = ["background_rotation", "gzip"] } +log4rs = { version = "1.2.0", features = ["background_rotation", "gzip"] } lru = "0.7.8" -merkletree = { git = "https://github.com/filecoin-project/merkletree", rev = "3b1d98c43b341aed935152c5c1535c17d1b21d20" } +merkletree = { version = "0.22.1" } mirai-annotations = "1.10.1" move-binary-format = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" } move-bytecode-source-map = { git = "https://github.com/starcoinorg/move", rev = "a781b641dd345c3e8f3e83ed080597f6c23a157c" }