From 95d6567adc963d27299d887637f12a45325f08bd Mon Sep 17 00:00:00 2001 From: Dave Belvedere <90095005+dbelv@users.noreply.github.com> Date: Mon, 21 Nov 2022 06:38:41 +1000 Subject: [PATCH] chore: bump trezor, fix clippy (#1871) * chore: bump trezor, fix clippy * update cargo lock Co-authored-by: Dave Belvedere Co-authored-by: Georgios Konstantopoulos --- Cargo.lock | 33 +++++++-------------------------- ethers-core/src/types/block.rs | 2 +- ethers-signers/Cargo.toml | 2 +- 3 files changed, 9 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1829cc1c..d5784d56 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1182,7 +1182,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60" dependencies = [ "crunchy", - "fixed-hash 0.8.0", + "fixed-hash", "impl-codec", "impl-rlp", "impl-serde", @@ -1197,11 +1197,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81224dc661606574f5a0f28c9947d0ee1d93ff11c5f1c4e7272f52e8c0b5483c" dependencies = [ "ethbloom", - "fixed-hash 0.8.0", + "fixed-hash", "impl-codec", "impl-rlp", "impl-serde", - "primitive-types 0.12.1", + "primitive-types", "scale-info", "uint", ] @@ -1550,15 +1550,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "fixed-hash" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" -dependencies = [ - "static_assertions", -] - [[package]] name = "fixed-hash" version = "0.8.0" @@ -2859,23 +2850,13 @@ dependencies = [ "yansi", ] -[[package]] -name = "primitive-types" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a" -dependencies = [ - "fixed-hash 0.7.0", - "uint", -] - [[package]] name = "primitive-types" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66" dependencies = [ - "fixed-hash 0.8.0", + "fixed-hash", "impl-codec", "impl-rlp", "impl-serde", @@ -4207,15 +4188,15 @@ dependencies = [ [[package]] name = "trezor-client" -version = "0.0.6" +version = "0.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "659ac74f0f26e4150ad6ffe155db8ee1727ea13a1b1b0ff0e7807e5befdb3aaf" +checksum = "3d3e4b569b95a8d24d10b2e8f60196348eb15023d50d2b38a4463e7f150afd27" dependencies = [ "byteorder", "hex", "hidapi-rusb", "log", - "primitive-types 0.11.1", + "primitive-types", "protobuf", "rusb", ] diff --git a/ethers-core/src/types/block.rs b/ethers-core/src/types/block.rs index 768507d6..b4f81d1c 100644 --- a/ethers-core/src/types/block.rs +++ b/ethers-core/src/types/block.rs @@ -186,7 +186,7 @@ impl Block { // Casting to i64 is safe because the timestamp is guaranteed to be less than 2^63. // TODO: It would be nice if there was `TryInto for U256`. let secs = self.timestamp.as_u64() as i64; - Ok(Utc.timestamp(secs, 0)) + Ok(Utc.timestamp_opt(secs, 0).unwrap()) } } diff --git a/ethers-signers/Cargo.toml b/ethers-signers/Cargo.toml index bc69359d..7e17df8e 100644 --- a/ethers-signers/Cargo.toml +++ b/ethers-signers/Cargo.toml @@ -29,7 +29,7 @@ yubihsm = { version = "0.41.0", features = ["secp256k1", "http", "usb"], optiona futures-util = { version = "^0.3", optional = true } futures-executor = { version = "^0.3", optional = true } semver = { version = "1.0.14", optional = true } -trezor-client = { version = "0.0.6", optional = true, default-features = false, features = [ +trezor-client = { version = "0.0.7", optional = true, default-features = false, features = [ "f_ethereum", ] }