diff --git a/Cargo.lock b/Cargo.lock index 9232ff07..a4a1f94b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -91,9 +91,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c0df63cb2955042487fad3aefd2c6e3ae7389ac5dc1beb28921de0b69f779d4" +checksum = "68803225a7b13e47191bab76f2687382b60d259e8cf37f6e1893658b84bb9479" [[package]] name = "arrayref" @@ -499,7 +499,7 @@ dependencies = [ [[package]] name = "coins-ledger" version = "0.1.0" -source = "git+https://github.com/summa-tx/bitcoins-rs#f53291fe9c5cae8007ff6e3c5384a5db839c9963" +source = "git+https://github.com/summa-tx/bitcoins-rs?branch=master#f53291fe9c5cae8007ff6e3c5384a5db839c9963" dependencies = [ "async-trait", "blake2b_simd", @@ -530,9 +530,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e143857ef5e50b46bba431bb0ed990426912f5eea85d6048214d8196d83efed" +checksum = "c5d82796b70971fbb603900a5edc797a4d9be0f9ec1257f83a1dba0aa374e3e9" [[package]] name = "constant_time_eq" @@ -651,6 +651,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "der" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51f59c66c30bb7445c8320a5f9233e437e3572368099f25532a59054328899b4" +dependencies = [ + "const-oid", +] + [[package]] name = "digest" version = "0.9.0" @@ -662,9 +671,9 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.9.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f488ad19df443921d9fa5b9ce13a282b552709c511d2d90b1fd635e0204d74d5" +checksum = "41fbdb4ff710acb4db8ca29f93b897529ea6d6a45626d5183b47e012aa6ae7e4" dependencies = [ "elliptic-curve", "hmac", @@ -702,9 +711,9 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "elliptic-curve" -version = "0.7.1" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d02ac72d4e61713e291a2ae644c1bd82be82c21b9a0de2271e0aa6886b7e0b4" +checksum = "592b1c857559479c056b73a3053c717108a70e4dce320ad28c79c63f5c2e62ba" dependencies = [ "bitvec 0.18.4", "digest", @@ -794,7 +803,6 @@ dependencies = [ "ethers-middleware", "ethers-providers", "ethers-signers", - "futures", "futures-util", "once_cell", "pin-project 1.0.2", @@ -899,7 +907,6 @@ dependencies = [ "reqwest", "rustc-hex", "serde", - "serde-aux", "serde_json", "thiserror", "tokio", @@ -1029,9 +1036,9 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" [[package]] name = "funty" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ba62103ce691c2fd80fbae2213dfdda9ce60804973ac6b6e97de818ea7f52c8" +checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" [[package]] name = "futures" @@ -1084,16 +1091,16 @@ checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb" [[package]] name = "futures-lite" -version = "1.11.2" +version = "1.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6c079abfac3ab269e2927ec048dabc89d009ebfdda6b8ee86624f30c689658" +checksum = "b4481d0cd0de1d204a4fa55e7d45f07b1d958abcb06714b3446438e2eff695fb" dependencies = [ "fastrand", "futures-core", "futures-io", "memchr", "parking", - "pin-project-lite 0.1.11", + "pin-project-lite 0.2.0", "waker-fn", ] @@ -1440,9 +1447,9 @@ dependencies = [ [[package]] name = "k256" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aebc14f2c1f2c5fd414f878084102b9ccb100fd90706e35979cd70a32f5d938" +checksum = "e443f962f64bcd3753b09e9d6c3733986a81e49b2a36c3c2faaedbe2c3a8e7dd" dependencies = [ "cfg-if 1.0.0", "ecdsa", @@ -1711,9 +1718,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.31" +version = "0.10.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d008f51b1acffa0d3450a68606e6a51c123012edaacb0f4e1426bd978869187" +checksum = "038d43985d1ddca7a9900630d8cd031b56e4794eecc2e9ea39dd17aa04399a70" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -1731,9 +1738,9 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" [[package]] name = "openssl-sys" -version = "0.9.59" +version = "0.9.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de52d8eabd217311538a39bba130d7dea1f1e118010fee7a033d966845e7d5fe" +checksum = "921fc71883267538946025deffb622905ecad223c28efbfdef9bb59a0175f3e6" dependencies = [ "autocfg", "cc", @@ -1744,9 +1751,9 @@ dependencies = [ [[package]] name = "p256" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cead7739968fb4c7622c6664a9a3de0c9d92cb9e75b3a5f2467aad99b3cd3f5" +checksum = "39f37a291d378ba3291c1fa4e925edb6729c8593d4c6064be79e4a4c12fa2d97" dependencies = [ "ecdsa", "elliptic-curve", @@ -1755,9 +1762,9 @@ dependencies = [ [[package]] name = "p384" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d97796d16cdc6bca56f1177aecaefb62c057fd8a0faa8b861e24d77a9e8993a" +checksum = "ea33960aac2200d19a5c9ab06a11ebd48a37a23144496632c358182e6765d80b" dependencies = [ "ecdsa", "elliptic-curve", @@ -1856,11 +1863,11 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkcs8" -version = "0.1.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6529960a627342f19f68d43a07b268c98fd347e68668df3743a3cb9211c0975f" +checksum = "b4839a901843f3942576e65857f0ebf2e190ef7024d3c62a94099ba3f819ad1d" dependencies = [ - "const-oid", + "der", ] [[package]] @@ -1948,9 +1955,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" +checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" dependencies = [ "proc-macro2", ] @@ -2216,13 +2223,11 @@ dependencies = [ [[package]] name = "serde-aux" -version = "0.6.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae50f53d4b01e854319c1f5b854cd59471f054ea7e554988850d3f36ca1dc852" +checksum = "3a16764e861bd10990815d72767548131b2084079170bedec7cbf5a8ade2daeb" dependencies = [ - "chrono", "serde", - "serde_derive", "serde_json", ] @@ -2329,13 +2334,12 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" [[package]] name = "socket2" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c29947abdee2a218277abeca306f25789c938e500ea5a9d4b12a5a504466902" +checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall", "winapi 0.3.9", ] @@ -2353,15 +2357,15 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "subtle" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd" +checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" [[package]] name = "syn" -version = "1.0.54" +version = "1.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2af957a63d6bd42255c359c93d9bfdb97076bd3b820897ce55ffbfbf107f44" +checksum = "a571a711dddd09019ccc628e1b17fe87c59b09d513c06c026877aa708334f37a" dependencies = [ "proc-macro2", "quote", @@ -2559,21 +2563,9 @@ dependencies = [ "cfg-if 1.0.0", "log", "pin-project-lite 0.2.0", - "tracing-attributes", "tracing-core", ] -[[package]] -name = "tracing-attributes" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e0ccfc3378da0cce270c946b676a376943f5cd16aeba64568e7939806f4ada" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "tracing-core" version = "0.1.17" @@ -2940,9 +2932,9 @@ dependencies = [ [[package]] name = "yubihsm" -version = "0.36.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51532710eb5ea9e981ee3553f60c252a5ef7e6a4275ec529756fb6c39dee78c1" +checksum = "c1a94c32e288e71c5dfb4851b91ce0d997e8ad96b0ce4db28ab108f406df6124" dependencies = [ "aes", "anomaly", diff --git a/ethers-contract/Cargo.toml b/ethers-contract/Cargo.toml index 2d1e01dd..6c568c18 100644 --- a/ethers-contract/Cargo.toml +++ b/ethers-contract/Cargo.toml @@ -10,25 +10,23 @@ repository = "https://github.com/gakonst/ethers-rs" keywords = ["ethereum", "web3", "celo", "ethers"] [dependencies] +ethers-providers = { version = "0.1.3", path = "../ethers-providers", default-features = false } +ethers-core = { version = "0.1.3", path = "../ethers-core", default-features = false } + ethers-contract-abigen = { version = "0.1.3", path = "ethers-contract-abigen", optional = true } ethers-contract-derive = { version = "0.1.3", path = "ethers-contract-derive", optional = true } -ethers-providers = { version = "0.1.3", path = "../ethers-providers" } -ethers-core = { version = "0.1.3", path = "../ethers-core" } - -serde = { version = "1.0.110", default-features = false } -serde_json = "1.0.55" +serde = { version = "1.0.118", default-features = false } +serde_json = { version = "1.0.60", default-features = false } rustc-hex = { version = "2.1.0", default-features = false } -thiserror = { version = "1.0.15", default-features = false } -once_cell = { version = "1.3.1", default-features = false } -futures = "0.3.5" -futures-util = "0.3.8" -pin-project = "1.0.2" +thiserror = { version = "1.0.22", default-features = false } +once_cell = { version = "1.5.2", default-features = false } +pin-project = {version = "1.0.2", default-features = false } +futures-util = { version = "0.3.8", default-features = false } [dev-dependencies] ethers = { version = "0.1.3", path = "../ethers" } tokio = { version = "0.2.21", default-features = false, features = ["macros"] } -serde_json = "1.0.55" ethers-signers = { version = "0.1.3", path = "../ethers-signers" } ethers-middleware = { version = "0.1.3", path = "../ethers-middleware" } diff --git a/ethers-contract/ethers-contract-abigen/Cargo.toml b/ethers-contract/ethers-contract-abigen/Cargo.toml index 0124a0ac..b0112429 100644 --- a/ethers-contract/ethers-contract-abigen/Cargo.toml +++ b/ethers-contract/ethers-contract-abigen/Cargo.toml @@ -12,7 +12,7 @@ keywords = ["ethereum", "web3", "celo", "ethers"] [dependencies] ethers-core = { version = "0.1.3", path = "../../ethers-core" } -anyhow = "1.0" +anyhow = "1.0.36" curl = "0.4" Inflector = "0.11" proc-macro2 = "1.0" diff --git a/ethers-contract/src/stream.rs b/ethers-contract/src/stream.rs index 938c796f..c8671902 100644 --- a/ethers-contract/src/stream.rs +++ b/ethers-contract/src/stream.rs @@ -1,5 +1,5 @@ use ethers_core::types::{Log, U256}; -use futures::stream::{Stream, StreamExt}; +use futures_util::stream::{Stream, StreamExt}; use pin_project::pin_project; use std::pin::Pin; use std::task::{Context, Poll}; diff --git a/ethers-core/Cargo.toml b/ethers-core/Cargo.toml index c9ddda06..1133d3c4 100644 --- a/ethers-core/Cargo.toml +++ b/ethers-core/Cargo.toml @@ -11,31 +11,31 @@ keywords = ["ethereum", "web3", "celo", "ethers"] [dependencies] # ethereum related -ethereum-types = { version = "0.9.2", default-features = false, features = ["serialize"] } -rlp = { version = "0.4.5", default-features = false } +ethereum-types = { version = "0.9.2", default-features = false } +rlp = { version = "0.4.6", default-features = false } ethabi = { package = "ethabi-next", version = "12.0.0", default-features = false } arrayvec = { version = "0.5.1", default-features = false } # crypto -ecdsa = { version = "0.9.0", features = ["std"] } -elliptic-curve = { version = "0.7.1", features = ["arithmetic"] } -generic-array = "0.14.4" -k256 = { version = "0.6.0", default-features = false, features = ["keccak256", "ecdsa"] } -rand = "0.7.2" +ecdsa = { version = "0.10.2", default-features = false, features = ["std"] } +elliptic-curve = { version = "0.8.4", default-features = false } +generic-array = { version = "0.14.4", default-features = false } +k256 = { version = "0.7.1", default-features = false, features = ["keccak256", "ecdsa"] } +rand = { version = "0.7.1", default-features = false } tiny-keccak = { version = "2.0.2", default-features = false } # misc -serde = { version = "1.0.110", default-features = false, features = ["derive"] } -serde_json = { version = "1.0.53", default-features = false, features = ["alloc"] } +serde = { version = "1.0.118", default-features = false, features = ["derive"] } +serde_json = { version = "1.0.60", default-features = false } rustc-hex = { version = "2.1.0", default-features = false } -thiserror = { version = "1.0.15", default-features = false } -glob = "0.3.0" +thiserror = { version = "1.0.22", default-features = false } +glob = { version = "0.3.0", default-features = false } [dev-dependencies] ethers = { version = "0.1.3", path = "../ethers" } serde_json = { version = "1.0.53", default-features = false } -bincode = "1.2.1" +bincode = { version = "1.2.1", default-features = false } [features] celo = [] # celo support extends the transaction format with extra fields diff --git a/ethers-middleware/Cargo.toml b/ethers-middleware/Cargo.toml index b455dc4b..d61df37f 100644 --- a/ethers-middleware/Cargo.toml +++ b/ethers-middleware/Cargo.toml @@ -14,31 +14,29 @@ all-features = true rustdoc-args = ["--cfg", "docsrs"] [dependencies] -ethers-core = { version = "0.1.3", path = "../ethers-core" } -ethers-providers = { version = "0.1.3", path = "../ethers-providers" } -ethers-signers = { version = "0.1.3", path = "../ethers-signers" } +ethers-core = { version = "0.1.3", path = "../ethers-core", default-features = false } +ethers-providers = { version = "0.1.3", path = "../ethers-providers", default-features = false } +ethers-signers = { version = "0.1.3", path = "../ethers-signers", default-features = false } -async-trait = { version = "0.1.31", default-features = false } -serde = { version = "1.0.110", default-features = false, features = ["derive"] } -thiserror = { version = "1.0.15", default-features = false } - -futures-util = { version = "0.3.5", default-features = false } +async-trait = { version = "0.1.42", default-features = false } +serde = { version = "1.0.118", default-features = false, features = ["derive"] } +thiserror = { version = "1.0.22", default-features = false } +futures-util = { version = "0.3.8", default-features = false } +tracing = { version = "0.1.22", default-features = false } +tracing-futures = { version = "0.2.4", default-features = false } # for gas oracles -serde-aux = "0.6.1" -reqwest = { version = "0.10.4", default-features = false, features = ["json", "rustls-tls"] } -url = { version = "2.1.1", default-features = false } +serde-aux = { version = "2.1.0", default-features = false } +reqwest = { version = "0.10.10", default-features = false, features = ["json", "rustls-tls"] } +url = { version = "2.2.0", default-features = false } # optional for runtime tokio = { version = "0.2.22", optional = true } async-std = { version = "1.6.5", optional = true } -tracing = "0.1.22" -tracing-futures = "0.2.4" [dev-dependencies] ethers = { version = "0.1.3", path = "../ethers" } futures-executor = { version = "0.3.5", features = ["thread-pool"] } - rustc-hex = "2.1.0" tokio = { version = "0.2.21", default-features = false, features = ["rt-core", "macros"] } diff --git a/ethers-providers/Cargo.toml b/ethers-providers/Cargo.toml index 4b979370..24a7284d 100644 --- a/ethers-providers/Cargo.toml +++ b/ethers-providers/Cargo.toml @@ -14,37 +14,35 @@ all-features = true rustdoc-args = ["--cfg", "docsrs"] [dependencies] -ethers-core = { version = "0.1.3", path = "../ethers-core" } +ethers-core = { version = "0.1.3", path = "../ethers-core", default-features = false } -async-trait = { version = "0.1.31", default-features = false } -reqwest = { version = "0.10.4", default-features = false, features = ["json", "rustls-tls"] } -serde = { version = "1.0.110", default-features = false, features = ["derive"] } -serde_json = { version = "1.0.53", default-features = false } -thiserror = { version = "1.0.15", default-features = false } -url = { version = "2.1.1", default-features = false } +async-trait = { version = "0.1.42", default-features = false } +reqwest = { version = "0.10.10", default-features = false, features = ["json", "rustls-tls"] } +serde = { version = "1.0.118", default-features = false, features = ["derive"] } +serde_json = { version = "1.0.60", default-features = false } +thiserror = { version = "1.0.22", default-features = false } +url = { version = "2.2.0", default-features = false } +auto_impl = { version = "0.4.1", default-features = false } # required for implementing stream on the filters -futures-core = { version = "0.3.5", default-features = false } -futures-util = { version = "0.3.5", default-features = false } +futures-core = { version = "0.3.8", default-features = false } +futures-util = { version = "0.3.8", default-features = false } futures-timer = { version = "3.0.2", default-features = false } futures-channel = { version = "0.3.8", default-features = false } pin-project = { version = "1.0.2", default-features = false } +# tracing +tracing = { version = "0.1.22", default-features = false } +tracing-futures = { version = "0.2.4", default-features = false } + # ws support async-std and tokio runtimes for the convenience methods async-tungstenite = { version = "0.6.0", default-features = false, optional = true } async-std = { version = "1.6.2", default-features = false, optional = true } tokio = { version = "0.2.21", default-features = false, optional = true } - # needed for tls -real-tokio-native-tls = { package = "tokio-native-tls", version = "0.1.0", optional = true } +real-tokio-native-tls = { package = "tokio-native-tls", version = "0.1.0", default-features = false, optional = true } async-tls = { version = "0.7.0", optional = true } -# needed for parsing while deserialization in gas oracles -serde-aux = "0.6.1" -auto_impl = "0.4.1" -tracing = "0.1.22" -tracing-futures = "0.2.4" - [dev-dependencies] ethers = { version = "0.1.3", path = "../ethers" } diff --git a/ethers-signers/Cargo.toml b/ethers-signers/Cargo.toml index 7d2b34d8..88ae1983 100644 --- a/ethers-signers/Cargo.toml +++ b/ethers-signers/Cargo.toml @@ -15,26 +15,25 @@ rustdoc-args = ["--cfg", "docsrs"] [dependencies] ethers-core = { version = "0.1.3", path = "../ethers-core" } -thiserror = { version = "1.0.15", default-features = false } -futures-util = { version = "0.3.5", default-features = false } -futures-executor = { version = "0.3.5", default-features = false } -serde = { version = "1.0.112", default-features = false } +thiserror = { version = "1.0.22", default-features = false } +futures-util = { version = "0.3.8", default-features = false } +futures-executor = { version = "0.3.8", default-features = false } +serde = { version = "1.0.118", default-features = false } -coins-ledger = { git = "https://github.com/summa-tx/bitcoins-rs", optional = true } -rustc-hex = { version = "2.1.0" } -async-trait = "0.1.40" -elliptic-curve = { version = "0.7.1", features = ["arithmetic"] } -sha2 = { version = "0.9.1" } -rand = "0.7.3" - -yubihsm = { version = "0.36.0", features = ["secp256k1", "http", "usb"], optional = true } +coins-ledger = { git = "https://github.com/summa-tx/bitcoins-rs", default-features = false, optional = true, branch = "master" } +rustc-hex = { version = "2.1.0", default-features = false } +async-trait = { version = "0.1.40", default-features = false } +elliptic-curve = { version = "0.8.4", default-features = false } +sha2 = { version = "0.9.2", default-features = false } +rand = { version = "0.7.3", default-features = false } +yubihsm = { version = "0.37.0", features = ["secp256k1", "http", "usb"], optional = true } [dev-dependencies] ethers = { version = "0.1.3", path = "../ethers" } -yubihsm = { version = "0.36.0", features = ["secp256k1", "usb", "mockhsm"] } +yubihsm = { version = "0.37.0", features = ["secp256k1", "usb", "mockhsm"] } -tokio = { version = "0.2.21", features = ["macros"] } -serde_json = "1.0.55" +tokio = { version = "0.2.21", default-features = false, features = ["macros"] } +serde_json = { version = "1.0.55", default-features = false } [features] celo = ["ethers-core/celo"]