diff --git a/Cargo.lock b/Cargo.lock index a798b0a80..824beb91f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10,84 +10,62 @@ checksum = "8b5ace29ee3216de37c0546865ad08edef58b0f9e76838ed8959a84a990e58c5" [[package]] name = "actix-codec" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78d1833b3838dbe990df0f1f87baf640cf6146e898166afe401839d1b001e570" +checksum = "1d5dbeb2d9e51344cb83ca7cc170f1217f9fe25bfc50160e6e200b5c31c1019a" dependencies = [ "bitflags", - "bytes 0.5.6", + "bytes 1.0.1", "futures-core", "futures-sink", "log 0.4.11", - "pin-project 0.4.27", - "tokio 0.2.22", - "tokio-util 0.3.1", -] - -[[package]] -name = "actix-connect" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177837a10863f15ba8d3ae3ec12fac1099099529ed20083a27fdfe247381d0dc" -dependencies = [ - "actix-codec", - "actix-rt", - "actix-service", - "actix-utils", - "derive_more", - "either", - "futures-util", - "http 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.11", - "trust-dns-proto", - "trust-dns-resolver", + "pin-project-lite 0.2.4", + "tokio 1.6.0", + "tokio-util 0.6.7", ] [[package]] name = "actix-http" -version = "2.1.0" +version = "3.0.0-beta.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "404df68c297f73b8d36c9c9056404913d25905a8f80127b0e5fe147c9c4b9f02" +checksum = "3cd16d6b846983ffabfd081e1a67abd7698094fcbe7b3d9bcf1acbc6f546a516" dependencies = [ "actix-codec", - "actix-connect", - "actix-rt", + "actix-rt 2.2.0", "actix-service", - "actix-threadpool", + "actix-tls", "actix-utils", + "ahash", "base64 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags", "brotli2", - "bytes 0.5.6", - "cookie 0.14.3", - "copyless", + "bytes 1.0.1", + "bytestring", "derive_more", - "either", "encoding_rs", "flate2", - "futures-channel", "futures-core", "futures-util", - "fxhash", - "h2 0.2.7", - "http 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "h2 0.3.3", + "http 0.2.4", "httparse", - "indexmap", "itoa 0.4.6", "language-tags", - "lazy_static", + "local-channel", "log 0.4.11", "mime", + "once_cell 1.7.2", "percent-encoding 2.1.0", "pin-project 1.0.7", - "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "pin-project-lite 0.2.4", + "rand 0.8.3", "regex 1.4.2", "serde 1.0.117", - "serde_json 1.0.59", - "serde_urlencoded 0.6.1", "sha-1", - "slab", - "time 0.2.22", + "smallvec 1.6.1", + "time 0.2.27", + "tokio 1.6.0", + "zstd", ] [[package]] @@ -100,14 +78,24 @@ dependencies = [ "syn 1.0.72", ] +[[package]] +name = "actix-macros" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2f86cd6857c135e6e9fe57b1619a88d1f94a7df34c00e11fe13e64fd3438837" +dependencies = [ + "quote 1.0.7", + "syn 1.0.72", +] + [[package]] name = "actix-router" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd1f7dbda1645bf7da33554db60891755f6c01c1b2169e2f4c492098d30c235" +checksum = "2ad299af73649e1fc893e333ccf86f377751eb95ff875d095131574c6f43452c" dependencies = [ "bytestring", - "http 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.2.4", "log 0.4.11", "regex 1.4.2", "serde 1.0.117", @@ -119,57 +107,52 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "143fcc2912e0d1de2bcf4e2f720d2a60c28652ab4179685a1ee159e0fb3db227" dependencies = [ - "actix-macros", + "actix-macros 0.1.2", "actix-threadpool", "copyless", "futures-channel", "futures-util", - "smallvec 1.4.2", + "smallvec 1.6.1", "tokio 0.2.22", ] +[[package]] +name = "actix-rt" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc7d7cd957c9ed92288a7c3c96af81fa5291f65247a76a34dac7b6af74e52ba0" +dependencies = [ + "actix-macros 0.2.1", + "futures-core", + "tokio 1.6.0", +] + [[package]] name = "actix-server" -version = "1.0.4" +version = "2.0.0-beta.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45407e6e672ca24784baa667c5d32ef109ccdd8d5e0b5ebb9ef8a67f4dfb708e" +checksum = "26369215fcc3b0176018b3b68756a8bcc275bb000e6212e454944913a1f9bf87" dependencies = [ - "actix-codec", - "actix-rt", + "actix-rt 2.2.0", "actix-service", "actix-utils", - "futures-channel", - "futures-util", + "futures-core", "log 0.4.11", - "mio 0.6.22", - "mio-uds", + "mio 0.7.11", "num_cpus", "slab", - "socket2 0.3.15", + "tokio 1.6.0", ] [[package]] name = "actix-service" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0052435d581b5be835d11f4eb3bce417c8af18d87ddf8ace99f8e67e595882bb" -dependencies = [ - "futures-util", - "pin-project 0.4.27", -] - -[[package]] -name = "actix-testing" -version = "1.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47239ca38799ab74ee6a8a94d1ce857014b2ac36f242f70f3f75a66f691e791c" +checksum = "77f5f9d66a8730d0fae62c26f3424f5751e5518086628a40b7ab6fca4a705034" dependencies = [ - "actix-macros", - "actix-rt", - "actix-server", - "actix-service", - "log 0.4.11", - "socket2 0.3.15", + "futures-core", + "paste", + "pin-project-lite 0.2.4", ] [[package]] @@ -189,80 +172,77 @@ dependencies = [ [[package]] name = "actix-tls" -version = "2.0.0" +version = "3.0.0-beta.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24789b7d7361cf5503a504ebe1c10806896f61e96eca9a7350e23001aca715fb" +checksum = "65b7bb60840962ef0332f7ea01a57d73a24d2cb663708511ff800250bbfef569" dependencies = [ "actix-codec", + "actix-rt 2.2.0", "actix-service", "actix-utils", - "futures-util", + "derive_more", + "futures-core", + "http 0.2.4", + "log 0.4.11", + "tokio-util 0.6.7", ] [[package]] name = "actix-utils" -version = "2.0.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9022dec56632d1d7979e59af14f0597a28a830a9c1c7fec8b2327eb9f16b5a" +checksum = "e491cbaac2e7fc788dfff99ff48ef317e23b3cf63dbaf7aaab6418f40f92aa94" dependencies = [ - "actix-codec", - "actix-rt", - "actix-service", - "bitflags", - "bytes 0.5.6", - "either", - "futures-channel", - "futures-sink", - "futures-util", - "log 0.4.11", - "pin-project 0.4.27", - "slab", + "local-waker", + "pin-project-lite 0.2.4", ] [[package]] name = "actix-web" -version = "3.2.0" +version = "4.0.0-beta.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88344b7a5ef27e5e09e73565379f69273dd3e2d29e82afc381b84d170d0a5631" +checksum = "c503f726f895e55dac39adeafd14b5ee00cc956796314e9227fc7ae2e176f443" dependencies = [ "actix-codec", "actix-http", - "actix-macros", + "actix-macros 0.2.1", "actix-router", - "actix-rt", + "actix-rt 2.2.0", "actix-server", "actix-service", - "actix-testing", - "actix-threadpool", - "actix-tls", "actix-utils", "actix-web-codegen", - "awc", - "bytes 0.5.6", + "ahash", + "bytes 1.0.1", + "cfg-if 1.0.0", + "cookie 0.15.0", "derive_more", + "either", "encoding_rs", - "futures-channel", "futures-core", "futures-util", - "fxhash", + "itoa 0.4.6", + "language-tags", "log 0.4.11", "mime", + "once_cell 1.7.2", + "paste", "pin-project 1.0.7", "regex 1.4.2", "serde 1.0.117", "serde_json 1.0.59", - "serde_urlencoded 0.6.1", - "socket2 0.3.15", - "time 0.2.22", - "tinyvec 1.0.1", + "serde_urlencoded 0.7.0", + "smallvec 1.6.1", + "socket2 0.4.0", + "time 0.2.27", "url 2.2.0", ] [[package]] name = "actix-web-codegen" -version = "0.4.0" +version = "0.5.0-beta.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad26f77093333e0e7c6ffe54ebe3582d908a104e448723eec6d43d08b07143fb" +checksum = "0d048c6986743105c1e8e9729fbc8d5d1667f2f62393a58be8d85a7d9a5a6c8d" dependencies = [ "proc-macro2 1.0.26", "quote 1.0.7", @@ -271,14 +251,15 @@ dependencies = [ [[package]] name = "actix-web-opentelemetry" -version = "0.9.0" +version = "0.11.0-beta.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d10b9d36fd431016fb3ad4be804c7c35f685661a327bdc1a15aaff8eff8bcc4b" +checksum = "e3da9973a56ad884f87290014a13567b02a463fbd17dd40c1c637298eabf156e" dependencies = [ "actix-http", "actix-web", + "awc", "futures 0.3.7", - "opentelemetry", + "opentelemetry 0.15.0", "opentelemetry-semantic-conventions", "serde 1.0.117", ] @@ -364,6 +345,17 @@ dependencies = [ "stream-cipher 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "ahash" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98" +dependencies = [ + "getrandom 0.2.3", + "once_cell 1.7.2", + "version_check", +] + [[package]] name = "aho-corasick" version = "0.7.15" @@ -424,7 +416,7 @@ dependencies = [ name = "anonify-eth-driver" version = "0.5.4" dependencies = [ - "actix-rt", + "actix-rt 1.1.1", "anonify-ecall-types", "anyhow 1.0.34", "bincode 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -439,14 +431,14 @@ dependencies = [ "frame-types", "hex", "once_cell 1.7.2", - "opentelemetry", + "opentelemetry 0.11.2", "parking_lot 0.10.2", "serde_json 1.0.59", "sgx_types 1.1.3", "thiserror 1.0.22", "tracing", "tracing-futures", - "tracing-opentelemetry", + "tracing-opentelemetry 0.10.0", "web3", ] @@ -580,26 +572,28 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "awc" -version = "2.0.1" +version = "3.0.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "425980a1e58e5030a3e4b065a3d577c8f0e16142ea9d81f30614eae810c98577" +checksum = "364ef81705bf38403a3c3da4fab9eeec1e1503cd72dd6cd7c4259d2a6b08aa98" dependencies = [ "actix-codec", "actix-http", - "actix-rt", + "actix-rt 2.2.0", "actix-service", "base64 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", - "bytes 0.5.6", + "bytes 1.0.1", "cfg-if 1.0.0", "derive_more", "futures-core", + "itoa 0.4.6", "log 0.4.11", "mime", "percent-encoding 2.1.0", - "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "pin-project-lite 0.2.4", + "rand 0.8.3", "serde 1.0.117", "serde_json 1.0.59", - "serde_urlencoded 0.6.1", + "serde_urlencoded 0.7.0", ] [[package]] @@ -612,7 +606,7 @@ dependencies = [ "chrono 0.4.19", "dyn-clone", "futures 0.3.7", - "http 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.2.4", "log 0.4.11", "oauth2", "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -636,7 +630,7 @@ dependencies = [ "bytes 1.0.1", "chrono 0.4.19", "futures 0.3.7", - "http 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.2.4", "log 0.4.11", "md5", "once_cell 1.7.2", @@ -966,11 +960,11 @@ checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" [[package]] name = "bytestring" -version = "0.1.5" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7c05fa5172da78a62d9949d662d2ac89d4cc7355d7b49adee5163f1fb3f363" +checksum = "90706ba19e97b90786e19dc0d5e2abd80008d99d4c0c5d1ad0b5e72cec7c494d" dependencies = [ - "bytes 0.5.6", + "bytes 1.0.1", ] [[package]] @@ -1005,6 +999,9 @@ name = "cc" version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1770ced377336a88a67c473594ccc14eca6f4559217c34f64aac8f83d641b40" +dependencies = [ + "jobserver", +] [[package]] name = "cfg-if" @@ -1160,7 +1157,7 @@ dependencies = [ "encode_unicode", "lazy_static", "libc", - "parking_lot 0.11.0", + "parking_lot 0.7.1", "regex 1.4.2", "termios", "unicode-width", @@ -1206,12 +1203,12 @@ dependencies = [ [[package]] name = "cookie" -version = "0.14.3" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784ad0fbab4f3e9cef09f20e0aea6000ae08d2cb98ac4c0abc53df18803d702f" +checksum = "ffdf8865bac3d9a3bde5bde9088ca431b11f5d37c7a578b8086af77248b76627" dependencies = [ "percent-encoding 2.1.0", - "time 0.2.22", + "time 0.2.27", "version_check", ] @@ -1290,6 +1287,16 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "crossbeam-channel" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils 0.8.5", +] + [[package]] name = "crossbeam-deque" version = "0.7.3" @@ -1297,7 +1304,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" dependencies = [ "crossbeam-epoch", - "crossbeam-utils", + "crossbeam-utils 0.7.2", "maybe-uninit", ] @@ -1309,7 +1316,7 @@ checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ "autocfg 1.0.1", "cfg-if 0.1.10", - "crossbeam-utils", + "crossbeam-utils 0.7.2", "lazy_static", "maybe-uninit", "memoffset", @@ -1323,7 +1330,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" dependencies = [ "cfg-if 0.1.10", - "crossbeam-utils", + "crossbeam-utils 0.7.2", "maybe-uninit", ] @@ -1338,6 +1345,16 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "crossbeam-utils" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +dependencies = [ + "cfg-if 1.0.0", + "lazy_static", +] + [[package]] name = "crunchy" version = "0.2.2" @@ -1617,18 +1634,6 @@ dependencies = [ "sgx_tstd", ] -[[package]] -name = "enum-as-inner" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595" -dependencies = [ - "heck", - "proc-macro2 1.0.26", - "quote 1.0.7", - "syn 1.0.72", -] - [[package]] name = "env_logger" version = "0.7.1" @@ -1723,7 +1728,7 @@ dependencies = [ "frame-host", "opentelemetry-jaeger", "state-runtime-node-server", - "tracing-opentelemetry", + "tracing-opentelemetry 0.11.0", "tracing-subscriber", ] @@ -1989,7 +1994,7 @@ dependencies = [ "frame-config", "frame-retrier", "frame-sodium", - "http 0.2.1 (git+https://github.com/mesalock-linux/http-sgx?rev=sgx_1.1.3)", + "http 0.2.1", "lazy_static", "log 0.4.14", "num-bigint", @@ -2014,7 +2019,7 @@ dependencies = [ name = "frame-retrier" version = "0.5.4" dependencies = [ - "actix-rt", + "actix-rt 2.2.0", "sgx_tstd", "tracing", ] @@ -2242,15 +2247,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.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "generic-array" version = "0.8.3" @@ -2359,7 +2355,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.2.4", "indexmap", "slab", "tokio 0.2.22", @@ -2379,7 +2375,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.2.4", "indexmap", "slab", "tokio 1.6.0", @@ -2488,17 +2484,6 @@ dependencies = [ "hmac 0.7.1 (git+https://github.com/mesalock-linux/rustcrypto-MACs-sgx)", ] -[[package]] -name = "hostname" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ - "libc", - "match_cfg", - "winapi 0.3.9", -] - [[package]] name = "http" version = "0.1.21" @@ -2510,17 +2495,6 @@ dependencies = [ "itoa 0.4.6", ] -[[package]] -name = "http" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" -dependencies = [ - "bytes 0.5.6", - "fnv 1.0.7", - "itoa 0.4.6", -] - [[package]] name = "http" version = "0.2.1" @@ -2532,6 +2506,17 @@ dependencies = [ "sgx_tstd", ] +[[package]] +name = "http" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" +dependencies = [ + "bytes 1.0.1", + "fnv 1.0.7", + "itoa 0.4.6", +] + [[package]] name = "http-body" version = "0.1.0" @@ -2551,7 +2536,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" dependencies = [ "bytes 0.5.6", - "http 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.2.4", ] [[package]] @@ -2561,7 +2546,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9" dependencies = [ "bytes 1.0.1", - "http 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.2.4", "pin-project-lite 0.2.4", ] @@ -2655,7 +2640,7 @@ dependencies = [ "futures-core", "futures-util", "h2 0.2.7", - "http 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.2.4", "http-body 0.3.1", "httparse", "httpdate", @@ -2679,7 +2664,7 @@ dependencies = [ "futures-core", "futures-util", "h2 0.3.3", - "http 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.2.4", "http-body 0.4.2", "httparse", "httpdate", @@ -2700,7 +2685,7 @@ checksum = "f93ec5be69758dfc06b9b29efa9d6e9306e387c85eb362c603912eead2ad98c7" dependencies = [ "bytes 0.5.6", "futures 0.3.7", - "http 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.2.4", "hyper 0.13.9", "hyper-tls 0.4.3", "native-tls", @@ -2842,7 +2827,7 @@ checksum = "48dc51180a9b377fd75814d0cc02199c20f8e99433d6762f650d39cdbbd3b56f" name = "integration-tests" version = "0.5.4" dependencies = [ - "actix-rt", + "actix-rt 2.2.0", "anonify-ecall-types", "anonify-eth-driver", "eth-deployer", @@ -2893,18 +2878,6 @@ dependencies = [ "libc", ] -[[package]] -name = "ipconfig" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7" -dependencies = [ - "socket2 0.3.15", - "widestring", - "winapi 0.3.9", - "winreg 0.6.2", -] - [[package]] name = "ipnet" version = "2.3.0" @@ -2934,6 +2907,15 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" +[[package]] +name = "jobserver" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "972f5ae5d1cb9c6ae417789196c803205313edde988685da5e3aae0827b9e7fd" +dependencies = [ + "libc", +] + [[package]] name = "js-sys" version = "0.3.45" @@ -3031,7 +3013,7 @@ dependencies = [ name = "key-vault-node-server" version = "0.5.4" dependencies = [ - "actix-rt", + "actix-rt 2.2.0", "actix-web", "anonify-eth-driver", "anyhow 1.0.34", @@ -3069,9 +3051,9 @@ dependencies = [ [[package]] name = "language-tags" -version = "0.2.2" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" +checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" [[package]] name = "lazy_static" @@ -3119,10 +3101,22 @@ dependencies = [ ] [[package]] -name = "linked-hash-map" -version = "0.5.3" +name = "local-channel" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" +checksum = "6246c68cf195087205a0512559c97e15eaf95198bf0e206d662092cdcb03fe9f" +dependencies = [ + "futures-core", + "futures-sink", + "futures-util", + "local-waker", +] + +[[package]] +name = "local-waker" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84f9a2d3e27ce99ce2c3aad0b09b1a7b916293ea9b2bf624c13fe646fadd8da4" [[package]] name = "lock_api" @@ -3130,6 +3124,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" dependencies = [ + "owning_ref", "scopeguard 0.3.3", ] @@ -3169,21 +3164,6 @@ dependencies = [ "sgx_tstd", ] -[[package]] -name = "lru-cache" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - [[package]] name = "matchers" version = "0.0.1" @@ -3482,7 +3462,7 @@ checksum = "10ad4d0136960353683efa6160b9c867088b4b8f567b762cd37420a10ce32703" dependencies = [ "base64 0.12.3", "chrono 0.4.19", - "http 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.2.4", "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.11.3", "serde 1.0.117", @@ -3638,27 +3618,64 @@ dependencies = [ "tokio 0.2.22", ] +[[package]] +name = "opentelemetry" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514d24875c140ed269eecc2d1b56d7b71b573716922a763c317fb1b1b4b58f15" +dependencies = [ + "async-trait", + "futures 0.3.7", + "js-sys", + "lazy_static", + "percent-encoding 2.1.0", + "pin-project 1.0.7", + "rand 0.8.3", + "thiserror 1.0.22", +] + +[[package]] +name = "opentelemetry" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff27b33e30432e7b9854936693ca103d8591b0501f7ae9f633de48cda3bf2a67" +dependencies = [ + "async-trait", + "crossbeam-channel", + "dashmap", + "fnv 1.0.7", + "futures 0.3.7", + "js-sys", + "lazy_static", + "percent-encoding 2.1.0", + "pin-project 1.0.7", + "rand 0.8.3", + "thiserror 1.0.22", + "tokio 1.6.0", + "tokio-stream", +] + [[package]] name = "opentelemetry-jaeger" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c604a73595f605a852c431ef9c6bbacc7b911f094900905fd2f684b6fc44b4" +checksum = "a5677b3a361784aff6e2b1b30dbdb5f85f4ec57ff2ced41d9a481ad70a9d0b57" dependencies = [ "async-trait", "lazy_static", - "opentelemetry", + "opentelemetry 0.12.0", "thiserror 1.0.22", "thrift", - "tokio 0.2.22", + "tokio 1.6.0", ] [[package]] name = "opentelemetry-semantic-conventions" -version = "0.3.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3839dd2c931dc1aabcf964623ad74478fa97b3a88ad073d9e107aea36520c21d" +checksum = "748502c9b5621d7f0fe9cf26cb75bc773a04ce8f1c2b9ce44c3e01045aac6b6d" dependencies = [ - "opentelemetry", + "opentelemetry 0.15.0", ] [[package]] @@ -3670,6 +3687,15 @@ dependencies = [ "num-traits 0.2.14", ] +[[package]] +name = "owning_ref" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce" +dependencies = [ + "stable_deref_trait", +] + [[package]] name = "parity-crypto" version = "0.4.2" @@ -3784,7 +3810,7 @@ dependencies = [ "cloudabi 0.0.3", "libc", "redox_syscall", - "smallvec 1.4.2", + "smallvec 1.6.1", "winapi 0.3.9", ] @@ -3799,10 +3825,16 @@ dependencies = [ "instant", "libc", "redox_syscall", - "smallvec 1.4.2", + "smallvec 1.6.1", "winapi 0.3.9", ] +[[package]] +name = "paste" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" + [[package]] name = "pbkdf2" version = "0.3.0" @@ -4523,7 +4555,7 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "http 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.2.4", "http-body 0.4.2", "hyper 0.14.5", "hyper-rustls", @@ -4551,16 +4583,6 @@ dependencies = [ "winreg 0.7.0", ] -[[package]] -name = "resolv-conf" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11834e137f3b14e309437a8276714eed3a80d1ef894869e510f2c0c0b98b9f4a" -dependencies = [ - "hostname", - "quick-error", -] - [[package]] name = "ring" version = "0.16.15" @@ -4616,7 +4638,7 @@ dependencies = [ "base64 0.12.3", "blake2b_simd", "constant_time_eq", - "crossbeam-utils", + "crossbeam-utils 0.7.2", ] [[package]] @@ -4962,18 +4984,6 @@ dependencies = [ "url 1.7.2", ] -[[package]] -name = "serde_urlencoded" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" -dependencies = [ - "dtoa", - "itoa 0.4.6", - "serde 1.0.117", - "url 2.2.0", -] - [[package]] name = "serde_urlencoded" version = "0.7.0" @@ -5213,9 +5223,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.4.2" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252" +checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" [[package]] name = "socket2" @@ -5260,11 +5270,17 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "standback" -version = "0.2.11" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4e0831040d2cf2bdfd51b844be71885783d489898a192f254ae25d57cce725c" +checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" dependencies = [ "version_check", ] @@ -5284,7 +5300,7 @@ dependencies = [ name = "state-runtime-node-server" version = "0.5.4" dependencies = [ - "actix-rt", + "actix-rt 2.2.0", "actix-web", "anonify-ecall-types", "anonify-eth-driver", @@ -5296,7 +5312,7 @@ dependencies = [ "frame-sodium", "hex", "integration-tests", - "opentelemetry", + "opentelemetry 0.11.2", "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.59", @@ -5307,7 +5323,7 @@ dependencies = [ "tracing", "tracing-core", "tracing-futures", - "tracing-opentelemetry", + "tracing-opentelemetry 0.10.0", "tracing-subscriber", "web3", ] @@ -5620,9 +5636,9 @@ dependencies = [ [[package]] name = "time" -version = "0.2.22" +version = "0.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55b7151c9065e80917fbf285d9a5d1432f60db41d170ccafc749a136b41a93af" +checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" dependencies = [ "const_fn", "libc", @@ -5695,21 +5711,6 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117" -[[package]] -name = "tinyvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b78a366903f506d2ad52ca8dc552102ffdd3e937ba8a227f024dc1d1eae28575" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - [[package]] name = "tokio" version = "0.1.22" @@ -5810,7 +5811,7 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.7.2", "futures 0.1.30", ] @@ -5863,7 +5864,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.7.2", "futures 0.1.30", "lazy_static", "log 0.4.11", @@ -5930,7 +5931,7 @@ checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" dependencies = [ "crossbeam-deque", "crossbeam-queue", - "crossbeam-utils", + "crossbeam-utils 0.7.2", "futures 0.1.30", "lazy_static", "log 0.4.11", @@ -5945,7 +5946,7 @@ version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.7.2", "futures 0.1.30", "slab", "tokio-executor", @@ -6026,7 +6027,7 @@ dependencies = [ "futures-core", "futures-util", "h2 0.3.3", - "http 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.2.4", "http-body 0.4.2", "hyper 0.14.5", "percent-encoding 2.1.0", @@ -6176,7 +6177,20 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1706e1f42970e09aa0635deb4f4607e8704a4390427d5f0062bf59240338bcc" dependencies = [ - "opentelemetry", + "opentelemetry 0.11.2", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber", +] + +[[package]] +name = "tracing-opentelemetry" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccdf13c28f1654fe806838f28c5b9cb23ca4c0eae71450daa489f50e523ceb1" +dependencies = [ + "opentelemetry 0.12.0", "tracing", "tracing-core", "tracing-log", @@ -6207,7 +6221,7 @@ dependencies = [ "serde 1.0.117", "serde_json 1.0.59", "sharded-slab", - "smallvec 1.4.2", + "smallvec 1.6.1", "thread_local", "tracing", "tracing-core", @@ -6215,46 +6229,6 @@ dependencies = [ "tracing-serde", ] -[[package]] -name = "trust-dns-proto" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdd7061ba6f4d4d9721afedffbfd403f20f39a4301fee1b70d6fcd09cca69f28" -dependencies = [ - "async-trait", - "backtrace", - "enum-as-inner", - "futures 0.3.7", - "idna 0.2.0", - "lazy_static", - "log 0.4.11", - "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 1.4.2", - "thiserror 1.0.22", - "tokio 0.2.22", - "url 2.2.0", -] - -[[package]] -name = "trust-dns-resolver" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f23cdfdc3d8300b3c50c9e84302d3bd6d860fb9529af84ace6cf9665f181b77" -dependencies = [ - "backtrace", - "cfg-if 0.1.10", - "futures 0.3.7", - "ipconfig", - "lazy_static", - "log 0.4.11", - "lru-cache", - "resolv-conf", - "smallvec 1.4.2", - "thiserror 1.0.22", - "tokio 0.2.22", - "trust-dns-proto", -] - [[package]] name = "try-lock" version = "0.2.3" @@ -6279,7 +6253,7 @@ dependencies = [ "base64 0.11.0", "bytes 0.5.6", "chrono 0.4.19", - "http 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "http 0.2.4", "mime", ] @@ -6334,7 +6308,7 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" dependencies = [ - "tinyvec 0.3.4", + "tinyvec", ] [[package]] @@ -6655,12 +6629,6 @@ dependencies = [ "libc", ] -[[package]] -name = "widestring" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" - [[package]] name = "winapi" version = "0.2.8" @@ -6838,3 +6806,32 @@ dependencies = [ "syn 1.0.72", "synstructure 0.12.4", ] + +[[package]] +name = "zstd" +version = "0.7.0+zstd.1.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9428752481d8372e15b1bf779ea518a179ad6c771cca2d2c60e4fbff3cc2cd52" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "3.1.0+zstd.1.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa1926623ad7fe406e090555387daf73db555b948134b4d73eac5eb08fb666d" +dependencies = [ + "libc", + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "1.5.0+zstd.1.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e6c094340240369025fc6b731b054ee2a834328fa584310ac96aa4baebdc465" +dependencies = [ + "cc", + "libc", +] diff --git a/example/erc20/server/Cargo.toml b/example/erc20/server/Cargo.toml index efb29e1a9..82f450d19 100644 --- a/example/erc20/server/Cargo.toml +++ b/example/erc20/server/Cargo.toml @@ -8,12 +8,12 @@ edition = "2018" state-runtime-node-server = { path = "../../../nodes/state-runtime/server", default-features = false } anonify-eth-driver = { path = "../../../modules/anonify-eth-driver", default-features = false } frame-host = { path = "../../../frame/host" } -actix-web = "3" +actix-web = "4.0.0-beta.1" failure = "0.1" tracing-subscriber = "0.2" -actix-web-opentelemetry = "0.9" -opentelemetry-jaeger = { version = "0.10", features = ["tokio"] } -tracing-opentelemetry = "0.10" +actix-web-opentelemetry = "0.11.0-beta.4" +opentelemetry-jaeger = { version = "0.11", features = ["tokio"] } +tracing-opentelemetry = "0.11" [features] default = ["backup-enable"] diff --git a/example/erc20/server/src/main.rs b/example/erc20/server/src/main.rs index bc91e0ef0..1d2c1739b 100644 --- a/example/erc20/server/src/main.rs +++ b/example/erc20/server/src/main.rs @@ -41,7 +41,7 @@ async fn main() -> io::Result<()> { HttpServer::new(move || { App::new() .wrap(RequestTracing::new()) - .data(server.clone()) + .app_data(server.clone()) .route("/api/v1/health", web::get().to(handle_health_check)) .route("/api/v1/state", web::post().to(handle_send_command)) .route("/api/v1/state", web::get().to(handle_get_state)) diff --git a/example/key-vault/server/Cargo.toml b/example/key-vault/server/Cargo.toml index 235d96e19..1585b8824 100644 --- a/example/key-vault/server/Cargo.toml +++ b/example/key-vault/server/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" key-vault-node-server = { path = "../../../nodes/key-vault", default-features = false } anonify-eth-driver = { path = "../../../modules/anonify-eth-driver", default-features = false } frame-host = { path = "../../../frame/host" } -actix-web = "3" +actix-web = "4.0.0-beta.1" failure = "0.1" tracing-subscriber = "0.2" diff --git a/example/key-vault/server/src/main.rs b/example/key-vault/server/src/main.rs index 27f116897..1a62ca1ee 100644 --- a/example/key-vault/server/src/main.rs +++ b/example/key-vault/server/src/main.rs @@ -24,7 +24,7 @@ async fn main() -> io::Result<()> { HttpServer::new(move || { App::new() - .data(server.clone()) + .app_data(server.clone()) .route("/api/v1/health", web::get().to(handle_health_check)) }) .bind(my_node_url)? diff --git a/frame/retrier/Cargo.toml b/frame/retrier/Cargo.toml index 24e329f09..0e453bc83 100644 --- a/frame/retrier/Cargo.toml +++ b/frame/retrier/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] sgx_tstd = { rev = "v1.1.3", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true } tracing = { version = "0.1", default-features = false } -actix-rt = { version = "1.1", optional = true } +actix-rt = { version = "2.2", optional = true } [features] default = ["std"] diff --git a/frame/retrier/src/retry.rs b/frame/retrier/src/retry.rs index 713ae0221..62a437b63 100644 --- a/frame/retrier/src/retry.rs +++ b/frame/retrier/src/retry.rs @@ -86,7 +86,7 @@ where curr_tries + 1, res ); - actix_rt::time::delay_for(delay).await; + actix_rt::time::sleep(delay).await; } else { // if it overs the number of retries return res; diff --git a/nodes/key-vault/Cargo.toml b/nodes/key-vault/Cargo.toml index 85869f3a2..5f6c28283 100644 --- a/nodes/key-vault/Cargo.toml +++ b/nodes/key-vault/Cargo.toml @@ -5,7 +5,7 @@ authors = ["LayerX Labs "] edition = "2018" [dependencies] -actix-web = "3" +actix-web = "4.0.0-beta.1" anyhow = "1.0" sgx_types = "1.1.1" tracing = "0.1" @@ -21,11 +21,11 @@ anonify-eth-driver = { path = "../../modules/anonify-eth-driver" } state-runtime-node-server = { path = "../../nodes/state-runtime/server" } state-runtime-node-api = { path = "../../nodes/state-runtime/api" } test-utils = { path = "../../tests/utils" } -actix-rt = "1.1" +actix-rt = "2.2" serde_json = "1.0" once_cell = "1.5.2" web3 = "0.14" sgx_urts = "1.1.1" rand_core = "0.5" rand = "0.7" -tracing-core = "0.1" \ No newline at end of file +tracing-core = "0.1" diff --git a/nodes/state-runtime/server/Cargo.toml b/nodes/state-runtime/server/Cargo.toml index 5d5bbecbe..c4b9e796d 100644 --- a/nodes/state-runtime/server/Cargo.toml +++ b/nodes/state-runtime/server/Cargo.toml @@ -12,8 +12,8 @@ frame-host = { path = "../../../frame/host" } frame-common = { path = "../../../frame/common" } frame-config = { path = "../../../frame/config" } sgx_types = "1.1.1" -actix-web = "3" -actix-rt = "1.1" +actix-web = "4.0.0-beta.1" +actix-rt = "2.2" failure = "0.1" tracing = "0.1" tracing-subscriber = "0.2" diff --git a/scripts/pre-build.sh b/scripts/pre-build.sh index 547f1791d..e9d756bdd 100755 --- a/scripts/pre-build.sh +++ b/scripts/pre-build.sh @@ -13,5 +13,5 @@ cargo build echo 'build Anonify_common_t.o' cd ${ANONIFY_ROOT}/scripts -make DEBUG=1 ENCLAVE_DIR=example/erc20/enclave/erc20 ENCLAVE_PKG_NAME=erc20 ../build/Anonify_common_t.o -make DEBUG=1 TEST=1 ENCLAVE_DIR=example/erc20/enclave/erc20 ENCLAVE_PKG_NAME=erc20 ../build/Anonify_test_t.o +make DEBUG=1 ENCLAVE_DIR=example/erc20/enclave ENCLAVE_PKG_NAME=erc20 ../build/Anonify_common_t.o +make DEBUG=1 TEST=1 ENCLAVE_DIR=example/erc20/enclave ENCLAVE_PKG_NAME=erc20 ../build/Anonify_test_t.o diff --git a/tests/integration/Cargo.toml b/tests/integration/Cargo.toml index d80bf8600..d5c4a47c2 100644 --- a/tests/integration/Cargo.toml +++ b/tests/integration/Cargo.toml @@ -14,7 +14,7 @@ frame-host = { path = "../../frame/host" } anonify-eth-driver = { path = "../../modules/anonify-eth-driver" } anonify-ecall-types = { path = "../../modules/anonify-ecall-types" } test-utils = { path = "../utils" } -actix-rt = "1.1" +actix-rt = "2.2" tracing = "0.1" tracing-subscriber = "0.2" tracing-core = "0.1"