diff --git a/Cargo.lock b/Cargo.lock index b35f9216968..e4a328fbf1d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -104,17 +104,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "async-native-tls" -version = "0.3.3" -source = "git+https://github.com/async-email/async-native-tls.git?rev=b5b5562d6cea77f913d4cbe448058c031833bf17#b5b5562d6cea77f913d4cbe448058c031833bf17" -dependencies = [ - "native-tls", - "thiserror", - "tokio", - "url", -] - [[package]] name = "async-stream" version = "0.3.3" @@ -164,12 +153,6 @@ dependencies = [ "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.1" @@ -191,12 +174,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - [[package]] name = "base64" version = "0.13.0" @@ -232,9 +209,9 @@ checksum = "2da1976d75adbe5fbc88130ecd119529cf1cc6a93ae1546d8696ee66f0d21af1" [[package]] name = "bitvec" -version = "0.20.4" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" +checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b" dependencies = [ "funty", "radium", @@ -254,7 +231,7 @@ dependencies = [ "cfg-if 0.1.10", "constant_time_eq", "crypto-mac 0.8.0", - "digest", + "digest 0.9.0", ] [[package]] @@ -263,15 +240,17 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "block-padding", "generic-array", ] [[package]] -name = "block-padding" -version = "0.2.1" +name = "block-buffer" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" +checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" +dependencies = [ + "generic-array", +] [[package]] name = "bollard" @@ -279,9 +258,9 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "699194c00f3a2effd3358d47f880646818e3d483190b17ebcdf598c654fb77e9" dependencies = [ - "base64 0.13.0", + "base64", "bollard-stubs", - "bytes 1.0.1", + "bytes", "chrono", "ct-logs", "dirs-next", @@ -348,12 +327,6 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" -[[package]] -name = "bytes" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - [[package]] name = "bytes" version = "1.0.1" @@ -411,15 +384,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 = "colored" version = "1.9.3" @@ -673,6 +637,16 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "crypto-common" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" +dependencies = [ + "generic-array", + "typenum", +] + [[package]] name = "crypto-mac" version = "0.8.0" @@ -847,6 +821,16 @@ dependencies = [ "generic-array", ] +[[package]] +name = "digest" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" +dependencies = [ + "block-buffer 0.10.2", + "crypto-common", +] + [[package]] name = "directories-next" version = "2.0.0" @@ -954,12 +938,14 @@ dependencies = [ [[package]] name = "ethabi" -version = "16.0.0" +version = "17.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c98847055d934070b90e806e12d3936b787d0a115068981c1d8dfd5dfef5a5" +checksum = "b69517146dfab88e9238c00c724fd8e277951c3cc6f22b016d72f422a832213e" dependencies = [ "ethereum-types", "hex", + "once_cell", + "regex", "serde", "serde_json", "sha3", @@ -969,9 +955,9 @@ dependencies = [ [[package]] name = "ethbloom" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb684ac8fa8f6c5759f788862bb22ec6fe3cb392f6bfd08e3c64b603661e3f8" +checksum = "11da94e443c60508eb62cf256243a64da87304c2802ac2528847f79d750007ef" dependencies = [ "crunchy", "fixed-hash", @@ -982,9 +968,9 @@ dependencies = [ [[package]] name = "ethereum-types" -version = "0.12.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05136f7057fe789f06e6d41d07b34e6f70d8c86e5693b60f97aaa6553553bdaf" +checksum = "b2827b94c556145446fcce834ca86b7abf0c39a805883fe20e72c5bfdb5a0dc6" dependencies = [ "ethbloom", "fixed-hash", @@ -1002,7 +988,7 @@ checksum = "ec3245a0ca564e7f3c797d20d833a6870f57a728ac967d5225b3ffdef4465011" dependencies = [ "lazy_static", "log", - "rand 0.8.4", + "rand", ] [[package]] @@ -1056,7 +1042,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" dependencies = [ "byteorder", - "rand 0.8.4", + "rand", "rustc-hex", "static_assertions", ] @@ -1119,17 +1105,11 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69a039c3498dc930fe810151a34ba0c1c70b02b8625035592e74432f678591f2" -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - [[package]] name = "funty" -version = "1.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" @@ -1191,7 +1171,7 @@ version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57" dependencies = [ - "autocfg 1.0.1", + "autocfg", "proc-macro-hack", "proc-macro2", "quote", @@ -1222,7 +1202,7 @@ version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78" dependencies = [ - "autocfg 1.0.1", + "autocfg", "futures 0.1.31", "futures-channel", "futures-core", @@ -1254,17 +1234,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.3" @@ -1273,7 +1242,7 @@ checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" dependencies = [ "cfg-if 1.0.0", "libc", - "wasi 0.10.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -1339,7 +1308,7 @@ dependencies = [ "async-trait", "atomic_refcell", "bigdecimal", - "bytes 1.0.1", + "bytes", "chrono", "diesel", "diesel_derives", @@ -1357,13 +1326,13 @@ dependencies = [ "num-bigint", "num-traits", "num_cpus", - "parking_lot", + "parking_lot 0.12.0", "petgraph 0.6.0", "priority-queue", "prometheus", "prost", "prost-types", - "rand 0.6.5", + "rand", "reqwest", "semver", "serde", @@ -1397,7 +1366,7 @@ name = "graph-chain-ethereum" version = "0.25.1" dependencies = [ "anyhow", - "base64 0.13.0", + "base64", "dirs-next", "futures 0.1.31", "graph", @@ -1407,7 +1376,7 @@ dependencies = [ "hex", "http", "itertools", - "jsonrpc-core 17.1.0", + "jsonrpc-core", "lazy_static", "mockall", "prost", @@ -1423,7 +1392,7 @@ dependencies = [ name = "graph-chain-near" version = "0.25.1" dependencies = [ - "base64 0.13.0", + "base64", "diesel", "graph", "graph-core", @@ -1465,7 +1434,7 @@ dependencies = [ "async-stream", "async-trait", "atomic_refcell", - "bytes 0.5.6", + "bytes", "fail", "futures 0.1.31", "futures 0.3.16", @@ -1496,7 +1465,6 @@ dependencies = [ "anyhow", "crossbeam", "defer", - "futures 0.1.31", "graph", "graph-chain-ethereum", "graphql-parser", @@ -1504,7 +1472,7 @@ dependencies = [ "indexmap", "lazy_static", "once_cell", - "parking_lot", + "parking_lot 0.12.0", "pretty_assertions 1.2.0", "stable-hash", "test-store", @@ -1559,7 +1527,6 @@ dependencies = [ name = "graph-runtime-derive" version = "0.25.1" dependencies = [ - "anyhow", "quote", "syn", ] @@ -1586,12 +1553,11 @@ dependencies = [ "async-trait", "atomic_refcell", "bs58", - "bytes 1.0.1", + "bytes", "defer", "ethabi", "futures 0.1.31", "graph", - "graph-graphql", "graph-runtime-derive", "hex", "lazy_static", @@ -1601,7 +1567,7 @@ dependencies = [ "semver", "strum", "strum_macros", - "uuid 0.8.2", + "uuid", "wasmtime", ] @@ -1671,7 +1637,7 @@ dependencies = [ "serde", "serde_derive", "tokio-tungstenite", - "uuid 0.7.4", + "uuid", ] [[package]] @@ -1681,7 +1647,6 @@ dependencies = [ "Inflector", "anyhow", "async-trait", - "backtrace", "blake3", "clap", "derive_more", @@ -1706,11 +1671,11 @@ dependencies = [ "maybe-owned", "pin-utils", "postgres", - "rand 0.6.5", + "rand", "serde", "stable-hash", "test-store", - "uuid 0.8.2", + "uuid", ] [[package]] @@ -1753,7 +1718,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726" dependencies = [ - "bytes 1.0.1", + "bytes", "fnv", "futures-core", "futures-sink", @@ -1778,9 +1743,9 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4c4eb0471fcb85846d8b0690695ef354f9afb11cb03cac2e1d7c9253351afb0" dependencies = [ - "base64 0.13.0", + "base64", "bitflags", - "bytes 1.0.1", + "bytes", "headers-core", "http", "httpdate", @@ -1840,7 +1805,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" dependencies = [ "crypto-mac 0.10.1", - "digest", + "digest 0.9.0", ] [[package]] @@ -1849,7 +1814,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" dependencies = [ - "bytes 1.0.1", + "bytes", "fnv", "itoa", ] @@ -1860,7 +1825,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5" dependencies = [ - "bytes 1.0.1", + "bytes", "http", "pin-project-lite", ] @@ -1898,7 +1863,7 @@ version = "0.14.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b61cf2d1aebcf6e6352c97b81dc2244ca29194be1b276f5d8ad5c6330fffb11" dependencies = [ - "bytes 1.0.1", + "bytes", "futures-channel", "futures-core", "futures-util", @@ -1916,24 +1881,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-proxy" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc" -dependencies = [ - "bytes 1.0.1", - "futures 0.3.16", - "headers", - "http", - "hyper", - "hyper-tls", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - [[package]] name = "hyper-timeout" version = "0.4.1" @@ -1952,7 +1899,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.0.1", + "bytes", "hyper", "native-tls", "tokio", @@ -1981,7 +1928,7 @@ dependencies = [ "cfg-if 1.0.0", "const_fn_assert", "num-traits", - "rand 0.8.4", + "rand", "static_assertions", ] @@ -2004,9 +1951,9 @@ dependencies = [ [[package]] name = "impl-codec" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443" +checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" dependencies = [ "parity-scale-codec", ] @@ -2022,9 +1969,9 @@ dependencies = [ [[package]] name = "impl-serde" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b47ca4d2b6931707a55fce5cf66aff80e2178c8b63bbb4ecb5695cbc870ddf6f" +checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c" dependencies = [ "serde", ] @@ -2046,7 +1993,7 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" dependencies = [ - "autocfg 1.0.1", + "autocfg", "hashbrown", "serde", ] @@ -2057,7 +2004,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f97967975f448f1a7ddb12b0bc41069d09ed6a1c161a92687e057325db35d413" dependencies = [ - "bytes 1.0.1", + "bytes", ] [[package]] @@ -2120,21 +2067,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "jsonrpc-core" -version = "17.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4467ab6dfa369b69e52bd0692e480c4d117410538526a57a304a0f2250fd95e" -dependencies = [ - "futures 0.3.16", - "futures-executor", - "futures-util", - "log", - "serde", - "serde_derive", - "serde_json", -] - [[package]] name = "jsonrpc-core" version = "18.0.0" @@ -2158,11 +2090,11 @@ checksum = "e1dea6e07251d9ce6a552abfb5d7ad6bc290a4596c8dcc3d795fae2bbdc1f3ff" dependencies = [ "futures 0.3.16", "hyper", - "jsonrpc-core 18.0.0", + "jsonrpc-core", "jsonrpc-server-utils", "log", "net2", - "parking_lot", + "parking_lot 0.11.2", "unicase", ] @@ -2172,10 +2104,10 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4" dependencies = [ - "bytes 1.0.1", + "bytes", "futures 0.3.16", "globset", - "jsonrpc-core 18.0.0", + "jsonrpc-core", "lazy_static", "log", "tokio", @@ -2216,9 +2148,9 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" [[package]] name = "lock_api" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" +checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" dependencies = [ "scopeguard", ] @@ -2271,8 +2203,8 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15" dependencies = [ - "block-buffer", - "digest", + "block-buffer 0.9.0", + "digest 0.9.0", "opaque-debug", ] @@ -2288,7 +2220,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" dependencies = [ - "autocfg 1.0.1", + "autocfg", ] [[package]] @@ -2335,7 +2267,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" dependencies = [ "adler", - "autocfg 1.0.1", + "autocfg", ] [[package]] @@ -2461,7 +2393,7 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" dependencies = [ - "autocfg 1.0.1", + "autocfg", "num-integer", "num-traits", "serde", @@ -2473,7 +2405,7 @@ version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" dependencies = [ - "autocfg 1.0.1", + "autocfg", "num-traits", ] @@ -2483,7 +2415,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" dependencies = [ - "autocfg 1.0.1", + "autocfg", ] [[package]] @@ -2553,7 +2485,7 @@ version = "0.9.65" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d" dependencies = [ - "autocfg 1.0.1", + "autocfg", "cc", "libc", "pkg-config", @@ -2571,9 +2503,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "2.3.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" +checksum = "2a7f3fcf5e45fc28b84dcdab6b983e77f197ec01f325a33f404ba6855afd1070" dependencies = [ "arrayvec 0.7.2", "bitvec", @@ -2585,9 +2517,9 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "2.3.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27" +checksum = "2c6e626dc84025ff56bf1476ed0e30d10c84d7f89a475ef46ebabee1095a8fba" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2609,7 +2541,17 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core", + "parking_lot_core 0.8.5", +] + +[[package]] +name = "parking_lot" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.1", ] [[package]] @@ -2626,6 +2568,19 @@ dependencies = [ "winapi", ] +[[package]] +name = "parking_lot_core" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.2.10", + "smallvec", + "windows-sys", +] + [[package]] name = "paste" version = "1.0.5" @@ -2726,7 +2681,7 @@ version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7871ee579860d8183f542e387b176a25f2656b9fb5211e045397f745a68d1c2" dependencies = [ - "bytes 1.0.1", + "bytes", "fallible-iterator", "futures 0.3.16", "log", @@ -2740,14 +2695,14 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff3e0f70d32e20923cabf2df02913be7c1842d4c772db8065c00fcfdd1d1bff3" dependencies = [ - "base64 0.13.0", + "base64", "byteorder", - "bytes 1.0.1", + "bytes", "fallible-iterator", "hmac", "md-5", "memchr", - "rand 0.8.4", + "rand", "sha2", "stringprep", ] @@ -2758,7 +2713,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "430f4131e1b7657b0cd9a2b0c3408d77c9a43a042d300b8c77f981dffcc43a2f" dependencies = [ - "bytes 1.0.1", + "bytes", "fallible-iterator", "postgres-protocol", ] @@ -2833,9 +2788,9 @@ dependencies = [ [[package]] name = "primitive-types" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" +checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a" dependencies = [ "fixed-hash", "impl-codec", @@ -2920,7 +2875,7 @@ dependencies = [ "lazy_static", "libc", "memchr", - "parking_lot", + "parking_lot 0.11.2", "protobuf", "reqwest", "thiserror", @@ -2932,7 +2887,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" dependencies = [ - "bytes 1.0.1", + "bytes", "prost-derive", ] @@ -2942,7 +2897,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "355f634b43cdd80724ee7848f95770e7e70eefa6dcf14fea676216573b8fd603" dependencies = [ - "bytes 1.0.1", + "bytes", "heck 0.3.3", "itertools", "log", @@ -2973,7 +2928,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b" dependencies = [ - "bytes 1.0.1", + "bytes", "prost", ] @@ -3024,47 +2979,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "545c5bc2b880973c9c10e4067418407a0ccaa3091781d1671d46eb35107cb26f" dependencies = [ "log", - "parking_lot", + "parking_lot 0.11.2", "scheduled-thread-pool", ] [[package]] name = "radium" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" - -[[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", - "rand_xorshift", - "winapi", -] - -[[package]] -name = "rand" -version = "0.7.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc 0.2.0", -] +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rand" @@ -3073,29 +2996,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.3", - "rand_hc 0.3.1", -] - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", + "rand_hc", ] [[package]] @@ -3105,31 +3008,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -3138,25 +3017,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "getrandom 0.2.3", -] - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -3165,60 +3026,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" 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", -] - -[[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", -] - -[[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_xorshift" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -dependencies = [ - "rand_core 0.3.1", + "rand_core", ] [[package]] @@ -3227,7 +3035,7 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" dependencies = [ - "autocfg 1.0.1", + "autocfg", "crossbeam-deque", "either", "rayon-core", @@ -3246,15 +3054,6 @@ dependencies = [ "num_cpus", ] -[[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.57" @@ -3276,7 +3075,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" dependencies = [ - "getrandom 0.2.3", + "getrandom", "redox_syscall 0.2.10", ] @@ -3336,8 +3135,8 @@ version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "246e9f61b9bb77df069a947682be06e31ac43ea37862e244a69f177694ea6d22" dependencies = [ - "base64 0.13.0", - "bytes 1.0.1", + "base64", + "bytes", "encoding_rs", "futures-core", "futures-util", @@ -3387,7 +3186,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "999508abb0ae792aabed2460c45b89106d97fe4adac593bdaef433c2605847b5" dependencies = [ - "bytes 1.0.1", + "bytes", "rustc-hex", ] @@ -3424,7 +3223,7 @@ version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ - "base64 0.13.0", + "base64", "log", "ring", "sct", @@ -3480,7 +3279,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc6f74fd1204073fa02d5d5d68bec8021be4c38690b61264b2fdb48083d0e7d7" dependencies = [ - "parking_lot", + "parking_lot 0.11.2", ] [[package]] @@ -3521,18 +3320,18 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.20.3" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d03ceae636d0fed5bae6a7f4f664354c5f4fcedf6eef053fef17e49f837d0a" +checksum = "9c42e6f1735c5f00f51e43e28d6634141f2bcad10931b2609ddd74a86d751260" dependencies = [ "secp256k1-sys", ] [[package]] name = "secp256k1-sys" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "827cb7cce42533829c792fc51b82fbf18b125b45a702ef2c8be77fce65463a7b" +checksum = "957da2573cde917463ece3570eab4a0b3f19de6f1646cde62e6fd3868f566036" dependencies = [ "cc", ] @@ -3672,10 +3471,10 @@ version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a0c8611594e2ab4ebbf06ec7cbbf0a99450b8570e96cbf5188b5d5f6ef18d81" dependencies = [ - "block-buffer", + "block-buffer 0.9.0", "cfg-if 1.0.0", "cpufeatures", - "digest", + "digest 0.9.0", "opaque-debug", ] @@ -3685,23 +3484,21 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" dependencies = [ - "block-buffer", + "block-buffer 0.9.0", "cfg-if 1.0.0", "cpufeatures", - "digest", + "digest 0.9.0", "opaque-debug", ] [[package]] name = "sha3" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" +checksum = "881bf8156c87b6301fc5ca6b27f11eeb2761224c7081e69b409d5a1951a70c86" dependencies = [ - "block-buffer", - "digest", + "digest 0.10.3", "keccak", - "opaque-debug", ] [[package]] @@ -3820,16 +3617,16 @@ dependencies = [ [[package]] name = "soketto" -version = "0.4.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5c71ed3d54db0a699f4948e1bb3e45b450fa31fe602621dee6680361d569c88" +checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" dependencies = [ - "base64 0.12.3", - "bytes 0.5.6", + "base64", + "bytes", "futures 0.3.16", "httparse", "log", - "rand 0.7.3", + "rand", "sha-1", ] @@ -3983,7 +3780,7 @@ checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" dependencies = [ "cfg-if 1.0.0", "libc", - "rand 0.8.4", + "rand", "redox_syscall 0.2.10", "remove_dir_all", "winapi", @@ -4081,7 +3878,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", - "wasi 0.10.0+wasi-snapshot-preview1", + "wasi", "winapi", ] @@ -4124,13 +3921,13 @@ version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a" dependencies = [ - "bytes 1.0.1", + "bytes", "libc", "memchr", "mio", "num_cpus", "once_cell", - "parking_lot", + "parking_lot 0.11.2", "pin-project-lite", "signal-hook-registry", "tokio-macros", @@ -4176,11 +3973,11 @@ checksum = "2d2b1383c7e4fb9a09e292c7c6afb7da54418d53b045f1c1fac7a911411a2b8b" dependencies = [ "async-trait", "byteorder", - "bytes 1.0.1", + "bytes", "fallible-iterator", "futures 0.3.16", "log", - "parking_lot", + "parking_lot 0.11.2", "percent-encoding", "phf", "pin-project-lite", @@ -4198,7 +3995,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" dependencies = [ "pin-project", - "rand 0.8.4", + "rand", "tokio", ] @@ -4244,7 +4041,7 @@ version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592" dependencies = [ - "bytes 1.0.1", + "bytes", "futures-core", "futures-io", "futures-sink", @@ -4270,8 +4067,8 @@ checksum = "796c5e1cd49905e65dd8e700d4cb1dffcbfdb4fc9d017de08c1a537afd83627c" dependencies = [ "async-stream", "async-trait", - "base64 0.13.0", - "bytes 1.0.1", + "base64", + "bytes", "futures-core", "futures-util", "h2", @@ -4317,7 +4114,7 @@ dependencies = [ "futures-util", "indexmap", "pin-project", - "rand 0.8.4", + "rand", "slab", "tokio", "tokio-stream", @@ -4400,14 +4197,14 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fe8dada8c1a3aeca77d6b51a4f1314e0f4b8e438b7b1b71e3ddaca8080e4093" dependencies = [ - "base64 0.13.0", + "base64", "byteorder", - "bytes 1.0.1", + "bytes", "http", "httparse", "input_buffer", "log", - "rand 0.8.4", + "rand", "sha-1", "thiserror", "url", @@ -4416,9 +4213,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.13.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "uint" @@ -4510,22 +4307,13 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" -[[package]] -name = "uuid" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" -dependencies = [ - "rand 0.6.5", -] - [[package]] name = "uuid" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.3", + "getrandom", ] [[package]] @@ -4573,12 +4361,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.10.0+wasi-snapshot-preview1" @@ -4699,7 +4481,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d14d500d5c3dc5f5c097158feee123d64b3097f0d836a2a27dff9c761c73c843" dependencies = [ "anyhow", - "base64 0.13.0", + "base64", "bincode", "directories-next", "errno", @@ -4857,7 +4639,7 @@ dependencies = [ "mach", "memoffset", "more-asserts", - "rand 0.8.4", + "rand", "region", "thiserror", "wasmtime-environ", @@ -4895,12 +4677,12 @@ dependencies = [ [[package]] name = "web3" -version = "0.15.0-graph" -source = "git+https://github.com/graphprotocol/rust-web3?branch=lutter/graph-0.15.0#8310cf686cbe6c3e7585cb5f755810dbf5e8dc91" +version = "0.19.0-graph" +source = "git+https://github.com/graphprotocol/rust-web3?branch=graph-patches-onto-0.18#2760dbd18837bf0b605f8b2e832fd0e27cee00b6" dependencies = [ - "arrayvec 0.5.2", - "async-native-tls", - "base64 0.13.0", + "arrayvec 0.7.2", + "base64", + "bytes", "derive_more", "ethabi", "ethereum-types", @@ -4908,13 +4690,13 @@ dependencies = [ "futures-timer", "headers", "hex", - "hyper", - "hyper-proxy", - "hyper-tls", - "jsonrpc-core 17.1.0", + "idna", + "jsonrpc-core", "log", - "parking_lot", + "once_cell", + "parking_lot 0.12.0", "pin-project", + "reqwest", "rlp", "secp256k1", "serde", @@ -4925,6 +4707,19 @@ dependencies = [ "tokio-stream", "tokio-util", "url", + "web3-async-native-tls", +] + +[[package]] +name = "web3-async-native-tls" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f6d8d1636b2627fe63518d5a9b38a569405d9c9bc665c43c9c341de57227ebb" +dependencies = [ + "native-tls", + "thiserror", + "tokio", + "url", ] [[package]] @@ -4979,6 +4774,49 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-sys" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6" +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.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" + +[[package]] +name = "windows_i686_gnu" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" + +[[package]] +name = "windows_i686_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" + [[package]] name = "winreg" version = "0.7.0" @@ -4990,9 +4828,12 @@ dependencies = [ [[package]] name = "wyz" -version = "0.2.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" +checksum = "30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e" +dependencies = [ + "tap", +] [[package]] name = "yaml-rust" diff --git a/chain/ethereum/Cargo.toml b/chain/ethereum/Cargo.toml index 080de430ad7..368d81de3ad 100644 --- a/chain/ethereum/Cargo.toml +++ b/chain/ethereum/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] futures = "0.1.21" http = "0.2.4" -jsonrpc-core = "17.0.0" +jsonrpc-core = "18.0.0" graph = { path = "../../graph" } lazy_static = "1.2.0" mockall = "0.9.1" diff --git a/chain/ethereum/src/codec.rs b/chain/ethereum/src/codec.rs index 97498157a9f..5ee25c2d8e4 100644 --- a/chain/ethereum/src/codec.rs +++ b/chain/ethereum/src/codec.rs @@ -165,22 +165,18 @@ impl<'a> Into for TransactionTraceAt<'a> { transaction_index: Some(U64::from(self.trace.index as u64)), from: Some(H160::from_slice(&self.trace.from)), to: Some(H160::from_slice(&self.trace.to)), - value: self - .trace - .value - .as_ref() - .map_or_else(|| U256::from(0), |x| x.into()), - gas_price: self - .trace - .gas_price - .as_ref() - .map_or_else(|| U256::from(0), |x| x.into()), + value: self.trace.value.as_ref().map_or(U256::zero(), |x| x.into()), + gas_price: self.trace.gas_price.as_ref().map(|x| x.into()), gas: U256::from(self.trace.gas_used), input: Bytes::from(self.trace.input.clone()), v: None, r: None, s: None, raw: None, + access_list: None, + max_fee_per_gas: None, + max_priority_fee_per_gas: None, + transaction_type: None, } } } @@ -282,6 +278,10 @@ impl Into for &Block { _ => Some(H256::from_slice(&r.state_root)), }, logs_bloom: H2048::from_slice(&r.logs_bloom), + from: H160::from_slice(&t.from), + to: Some(H160::from_slice(&t.to)), + transaction_type: None, + effective_gas_price: None, }) }) .collect(), diff --git a/chain/ethereum/src/ethereum_adapter.rs b/chain/ethereum/src/ethereum_adapter.rs index 54e2a9510f2..2d4abbaf9b5 100644 --- a/chain/ethereum/src/ethereum_adapter.rs +++ b/chain/ethereum/src/ethereum_adapter.rs @@ -505,12 +505,16 @@ impl EthereumAdapter { async move { let req = CallRequest { - from: None, to: Some(contract_address), gas: Some(web3::types::U256::from(ETH_CALL_GAS)), + data: Some(call_data.clone()), + from: None, gas_price: None, value: None, - data: Some(call_data.clone()), + access_list: None, + max_fee_per_gas: None, + max_priority_fee_per_gas: None, + transaction_type: None, }; let result = web3.eth().call(req, Some(block_id)).boxed().await; diff --git a/chain/ethereum/src/transport.rs b/chain/ethereum/src/transport.rs index 9d46ad29d36..2d4302ceb56 100644 --- a/chain/ethereum/src/transport.rs +++ b/chain/ethereum/src/transport.rs @@ -5,6 +5,7 @@ use web3::transports::{http, ipc, ws}; use web3::RequestId; use graph::prelude::*; +use graph::url::Url; use std::future::Future; /// Abstraction over the different web3 transports. @@ -37,10 +38,13 @@ impl Transport { /// /// Note: JSON-RPC over HTTP doesn't always support subscribing to new /// blocks (one such example is Infura's HTTP endpoint). - pub fn new_rpc(rpc: &str, headers: ::http::HeaderMap) -> Self { - http::Http::with_headers(rpc, headers) - .map(|transport| Transport::RPC(transport)) - .expect("Failed to connect to Ethereum RPC") + pub fn new_rpc(rpc: Url, headers: ::http::HeaderMap) -> Self { + // Unwrap: This only fails if something is wrong with the system's TLS config. + let client = reqwest::Client::builder() + .default_headers(headers) + .build() + .unwrap(); + Transport::RPC(http::Http::with_client(client, rpc)) } } diff --git a/chain/ethereum/src/trigger.rs b/chain/ethereum/src/trigger.rs index bc03890e1d0..0414b920dde 100644 --- a/chain/ethereum/src/trigger.rs +++ b/chain/ethereum/src/trigger.rs @@ -380,7 +380,7 @@ impl From<&'_ Transaction> for EthereumTransactionData { to: tx.to, value: tx.value, gas_limit: tx.gas, - gas_price: tx.gas_price, + gas_price: tx.gas_price.unwrap_or(U256::zero()), // EIP-1559 made this optional. input: tx.input.0.clone(), nonce: tx.nonce.clone(), } diff --git a/core/Cargo.toml b/core/Cargo.toml index af5cb242537..19ed5d38d47 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" async-trait = "0.1.50" atomic_refcell = "0.1.8" async-stream = "0.3" -bytes = "0.5" +bytes = "1.0" futures01 = { package="futures", version="0.1.31" } futures = { version="0.3.4", features=["compat"] } graph = { path = "../graph" } diff --git a/graph/Cargo.toml b/graph/Cargo.toml index 209eba63509..fd51ac54038 100644 --- a/graph/Cargo.toml +++ b/graph/Cargo.toml @@ -16,7 +16,7 @@ chrono = "0.4.19" Inflector = "0.11.3" isatty = "0.1.9" reqwest = { version = "0.11.2", features = ["json", "stream", "multipart"] } -ethabi = "16.0" +ethabi = "17.0" hex = "0.4.3" http = "0.2.3" fail = { version = "0.5", features = ["failpoints"] } @@ -26,7 +26,7 @@ lazy_static = "1.4.0" num-bigint = { version = "^0.2.6", features = ["serde"] } num_cpus = "1.13.1" num-traits = "0.2.14" -rand = "0.6.1" +rand = "0.8.4" semver = {version = "1.0.6", features = ["serde"]} serde = { version = "1.0.126", features = ["rc"] } serde_derive = "1.0.125" @@ -53,12 +53,12 @@ prost-types = "0.8.0" futures03 = { version = "0.3.1", package = "futures", features = ["compat"] } wasmparser = "0.78.2" thiserror = "1.0.25" -parking_lot = "0.11.2" +parking_lot = "0.12.0" itertools = "0.10.3" -# Our fork contains patches for custom http headers and to make some block fields optional. +# Our fork contains patches to make some fields optional for Celo and Fantom compatibility. # Without the "arbitrary_precision" feature, we get the error `data did not match any variant of untagged enum Response`. -web3 = { git = "https://github.com/graphprotocol/rust-web3", branch = "lutter/graph-0.15.0", features = ["arbitrary_precision"] } +web3 = { git = "https://github.com/graphprotocol/rust-web3", branch = "graph-patches-onto-0.18", features = ["arbitrary_precision"] } serde_plain = "1.0.0" [dev-dependencies] diff --git a/graph/examples/stress.rs b/graph/examples/stress.rs index cea1da3f4d4..8a5f8daf772 100644 --- a/graph/examples/stress.rs +++ b/graph/examples/stress.rs @@ -4,8 +4,8 @@ use std::iter::FromIterator; use std::sync::atomic::{AtomicUsize, Ordering::SeqCst}; use graph::prelude::{lazy_static, q}; +use rand::SeedableRng; use rand::{rngs::SmallRng, Rng}; -use rand::{FromEntropy, SeedableRng}; use structopt::StructOpt; use graph::util::cache_weight::CacheWeight; @@ -254,7 +254,7 @@ impl ValueMap { for i in 0..size { let kind = rng .as_deref_mut() - .map(|rng| rng.gen_range(0, modulus)) + .map(|rng| rng.gen_range(0..modulus)) .unwrap_or(i % modulus); let value = match kind { @@ -455,7 +455,7 @@ fn stress>(opt: &Opt) { let size = if opt.fixed || opt.obj_size == 0 { opt.obj_size } else { - rng.gen_range(0, opt.obj_size) + rng.gen_range(0..opt.obj_size) }; let before = ALLOCATED.load(SeqCst); let sample = cacheable.sample(size, maybe_rng(opt, &mut rng)); diff --git a/graph/src/data/subgraph/schema.rs b/graph/src/data/subgraph/schema.rs index d898bd2c739..20c1aad682a 100644 --- a/graph/src/data/subgraph/schema.rs +++ b/graph/src/data/subgraph/schema.rs @@ -220,7 +220,7 @@ impl StableHash for SubgraphError { pub fn generate_entity_id() -> String { // Fast crypto RNG from operating system - let mut rng = OsRng::new().unwrap(); + let mut rng = OsRng::default(); // 128 random bits let id_bytes: [u8; 16] = rng.gen(); diff --git a/graphql/Cargo.toml b/graphql/Cargo.toml index 92c1541dd81..84cb1a608d7 100644 --- a/graphql/Cargo.toml +++ b/graphql/Cargo.toml @@ -5,7 +5,6 @@ edition = "2021" [dependencies] crossbeam = "0.8" -futures01 = { package="futures", version="0.1.29" } graph = { path = "../graph" } graphql-parser = "0.4.0" graphql-tools = "0.0.19" @@ -15,7 +14,7 @@ lazy_static = "1.2.0" stable-hash = { git = "https://github.com/graphprotocol/stable-hash" } once_cell = "1.9.0" defer = "0.1" -parking_lot = "0.11" +parking_lot = "0.12" anyhow = "1.0" [dev-dependencies] diff --git a/node/src/chain.rs b/node/src/chain.rs index 12439ab8d3e..ef7a0afd3a8 100644 --- a/node/src/chain.rs +++ b/node/src/chain.rs @@ -10,6 +10,7 @@ use graph::ipfs_client::IpfsClient; use graph::prelude::{anyhow, tokio, BlockNumber}; use graph::prelude::{prost, MetricsRegistry as MetricsRegistryTrait}; use graph::slog::{debug, error, info, o, Logger}; +use graph::url::Url; use graph::util::security::SafeDisplay; use graph_chain_ethereum::{self as ethereum, EthereumAdapterTrait, Transport}; use graph_core::MetricsRegistry; @@ -142,7 +143,7 @@ pub async fn create_ethereum_networks( use crate::config::Transport::*; let transport = match web3.transport { - Rpc => Transport::new_rpc(&web3.url, web3.headers.clone()), + Rpc => Transport::new_rpc(Url::parse(&web3.url)?, web3.headers.clone()), Ipc => Transport::new_ipc(&web3.url).await, Ws => Transport::new_ws(&web3.url).await, }; diff --git a/node/src/manager/commands/run.rs b/node/src/manager/commands/run.rs index d64f6fd1766..eed0bd199e7 100644 --- a/node/src/manager/commands/run.rs +++ b/node/src/manager/commands/run.rs @@ -31,6 +31,7 @@ use graph_core::{ }; use lazy_static::lazy_static; use std::str::FromStr; +use url::Url; pub async fn run( logger: Logger, @@ -362,7 +363,7 @@ async fn create_ethereum_networks( use crate::config::Transport::*; let transport = match web3.transport { - Rpc => Transport::new_rpc(&web3.url, web3.headers.clone()), + Rpc => Transport::new_rpc(Url::parse(&web3.url)?, web3.headers.clone()), Ipc => Transport::new_ipc(&web3.url).await, Ws => Transport::new_ws(&web3.url).await, }; diff --git a/runtime/derive/Cargo.toml b/runtime/derive/Cargo.toml index 10be73b4b6a..a537f824c91 100644 --- a/runtime/derive/Cargo.toml +++ b/runtime/derive/Cargo.toml @@ -9,4 +9,3 @@ proc-macro = true [dependencies] syn = { version = "1.0", features = ["full"] } quote = "1.0" -anyhow = "1.0" diff --git a/runtime/test/Cargo.toml b/runtime/test/Cargo.toml index 4152702b64d..464f8f816c4 100644 --- a/runtime/test/Cargo.toml +++ b/runtime/test/Cargo.toml @@ -10,7 +10,7 @@ graph = { path = "../../graph" } graph-chain-ethereum = { path = "../../chain/ethereum" } graph-runtime-wasm = { path = "../wasm" } graph-core = { path = "../../core" } -graph-mock = { path = "../../mock" } [dev-dependencies] test-store = { path = "../../store/test-store" } +graph-mock = { path = "../../mock" } diff --git a/runtime/wasm/Cargo.toml b/runtime/wasm/Cargo.toml index e076ff074f9..4eebe8988e2 100644 --- a/runtime/wasm/Cargo.toml +++ b/runtime/wasm/Cargo.toml @@ -6,11 +6,10 @@ edition = "2021" [dependencies] async-trait = "0.1.50" atomic_refcell = "0.1.8" -ethabi = "16.0" +ethabi = "17.0" futures = "0.1.21" hex = "0.4.3" graph = { path = "../../graph" } -graph-graphql = { path = "../../graphql" } bs58 = "0.4.0" graph-runtime-derive = { path = "../derive" } semver = "1.0.6" diff --git a/server/websocket/Cargo.toml b/server/websocket/Cargo.toml index 78cb1779815..94b0059361d 100644 --- a/server/websocket/Cargo.toml +++ b/server/websocket/Cargo.toml @@ -12,5 +12,5 @@ lazy_static = "1.2.0" serde = "1.0" serde_derive = "1.0" tokio-tungstenite = "0.14" -uuid = { version = "0.7.2", features = ["v4"] } +uuid = { version = "0.8.1", features = ["v4"] } anyhow = "1.0" diff --git a/store/postgres/Cargo.toml b/store/postgres/Cargo.toml index 8a495f22a1e..b699fba81d0 100644 --- a/store/postgres/Cargo.toml +++ b/store/postgres/Cargo.toml @@ -23,11 +23,10 @@ lazy_static = "1.1" lru_time_cache = "0.11" maybe-owned = "0.3.4" postgres = "0.19.1" -rand = "0.6.1" +rand = "0.8.4" serde = "1.0" uuid = { version = "0.8.1", features = ["v4"] } stable-hash = { git = "https://github.com/graphprotocol/stable-hash" } -backtrace = "0.3" diesel_derives = "1.4.1" anyhow = "1.0.54" git-testament = "0.2.0"