diff --git a/Cargo.lock b/Cargo.lock index ca2fdbe17..0525c086c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -33,7 +33,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" dependencies = [ - "generic-array 0.14.6", + "generic-array", ] [[package]] @@ -46,7 +46,7 @@ dependencies = [ "cipher 0.3.0", "cpufeatures", "ctr 0.8.0", - "opaque-debug 0.3.0", + "opaque-debug", ] [[package]] @@ -151,7 +151,7 @@ dependencies = [ "itertools", "proc-macro-error", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -201,13 +201,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.65" +version = "0.1.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "095183a3539c7c7649b2beb87c2d3f0591f3a7fed07761cc546d244e27e0238c" +checksum = "86ea188f25f0255d8f92797797c97ebf5631fa88178beb1a46fdf5622c9a00e4" dependencies = [ "proc-macro2 1.0.52", - "quote 1.0.23", - "syn 1.0.109", + "quote 1.0.26", + "syn 2.0.5", ] [[package]] @@ -261,7 +261,7 @@ checksum = "8a8c1df849285fbacd587de7818cc7d13be6cd2cbcd47a04fb1801b0e2706e33" dependencies = [ "proc-macro-error", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -310,28 +310,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" -[[package]] -name = "base58" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5024ee8015f02155eee35c711107ddd9a9bf3cb689cf2a9089c97e79b6e1ae83" - -[[package]] -name = "base58check" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ee2fe4c9a0c84515f136aaae2466744a721af6d63339c18689d9e995d74d99b" -dependencies = [ - "base58", - "sha2 0.8.2", -] - -[[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.1" @@ -396,7 +374,7 @@ dependencies = [ "lazycell", "peeking_take_while", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "regex", "rustc-hash", "shlex", @@ -447,34 +425,13 @@ dependencies = [ "wyz", ] -[[package]] -name = "blake2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" -dependencies = [ - "digest 0.10.6", -] - -[[package]] -name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding 0.1.5", - "byte-tools", - "byteorder", - "generic-array 0.12.4", -] - [[package]] name = "block-buffer" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "generic-array 0.14.6", + "generic-array", ] [[package]] @@ -483,16 +440,7 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" dependencies = [ - "generic-array 0.14.6", -] - -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", + "generic-array", ] [[package]] @@ -501,7 +449,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a90ec2df9600c28a01c56c4784c9207a96d2451833aeceb8cc97e4c9548bb78" dependencies = [ - "generic-array 0.14.6", + "generic-array", ] [[package]] @@ -530,6 +478,9 @@ name = "bs58" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" +dependencies = [ + "sha2 0.9.9", +] [[package]] name = "bstr" @@ -553,12 +504,6 @@ version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - [[package]] name = "bytemuck" version = "1.13.1" @@ -691,7 +636,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" dependencies = [ - "generic-array 0.14.6", + "generic-array", ] [[package]] @@ -762,7 +707,7 @@ dependencies = [ "heck", "proc-macro-error", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -797,9 +742,9 @@ dependencies = [ "convert_case 0.6.0", "parity-scale-codec", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "serde", - "syn 1.0.109", + "syn 2.0.5", ] [[package]] @@ -814,9 +759,9 @@ dependencies = [ [[package]] name = "coins-bip32" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3b95d26eace980ade01e0ea8d996f7d5ae7031f9c5f258317ec82e400f33c1" +checksum = "b30a84aab436fcb256a2ab3c80663d8aec686e6bae12827bb05fef3e1e439c9f" dependencies = [ "bincode", "bs58", @@ -824,7 +769,7 @@ dependencies = [ "digest 0.10.6", "getrandom 0.2.8", "hmac", - "k256 0.11.6", + "k256 0.13.0", "lazy_static", "serde", "sha2 0.10.6", @@ -833,9 +778,9 @@ dependencies = [ [[package]] name = "coins-bip39" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a05ceda6ab4876de899fe23e8a171b200be9a346289bce12d41311e4bce2f104" +checksum = "efb68f3b6c3fee83828ecd8d463f360a397c32aaeb35bd931c01e5ddf5631c69" dependencies = [ "bitvec 0.17.4", "coins-bip32", @@ -843,7 +788,7 @@ dependencies = [ "hex", "hmac", "once_cell", - "pbkdf2", + "pbkdf2 0.12.1", "rand 0.8.5", "sha2 0.10.6", "thiserror", @@ -852,16 +797,15 @@ dependencies = [ [[package]] name = "coins-core" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87637d08a1dd6bfa3bcd697f0a4de6c1b3a03e085b9d841a7e9cde4ccb61514b" +checksum = "9b949a1c63fb7eb591eb7ba438746326aedf0ae843e51ec92ba6bec5bb382c4f" dependencies = [ - "base58check", - "base64 0.12.3", + "base64 0.21.0", "bech32", - "blake2", + "bs58", "digest 0.10.6", - "generic-array 0.14.6", + "generic-array", "hex", "ripemd", "serde", @@ -892,7 +836,7 @@ dependencies = [ "directories", "serde", "thiserror", - "toml", + "toml 0.5.11", ] [[package]] @@ -1097,7 +1041,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" dependencies = [ - "generic-array 0.14.6", + "generic-array", "rand_core 0.6.4", "subtle", "zeroize", @@ -1109,7 +1053,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071c0f5945634bc9ba7a452f492377dd6b1993665ddb58f28704119b32f07a9a" dependencies = [ - "generic-array 0.14.6", + "generic-array", "rand_core 0.6.4", "subtle", "zeroize", @@ -1121,7 +1065,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array 0.14.6", + "generic-array", "typenum", ] @@ -1178,7 +1122,7 @@ dependencies = [ "codespan-reporting", "once_cell", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "scratch", "syn 1.0.109", ] @@ -1196,7 +1140,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" dependencies = [ "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -1229,7 +1173,7 @@ dependencies = [ "fnv", "ident_case", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "strsim 0.9.3", "syn 1.0.109", ] @@ -1243,7 +1187,7 @@ dependencies = [ "fnv", "ident_case", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "strsim 0.10.0", "syn 1.0.109", ] @@ -1255,7 +1199,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" dependencies = [ "darling_core 0.10.2", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -1266,7 +1210,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b36230598a2d5de7ec1c6f51f72d8a99a9208daff41de2084d06e3fd3ea56685" dependencies = [ "darling_core 0.14.3", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -1335,7 +1279,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8beee4701e2e229e8098bbdecdca12449bc3e322f137d269182fa1291e20bd00" dependencies = [ "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -1348,7 +1292,7 @@ dependencies = [ "darling 0.10.2", "derive_builder_core", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -1360,7 +1304,7 @@ checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef" dependencies = [ "darling 0.10.2", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -1372,7 +1316,7 @@ checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case 0.4.0", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "rustc_version", "syn 1.0.109", ] @@ -1383,22 +1327,13 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" -[[package]] -name = "digest" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -dependencies = [ - "generic-array 0.12.4", -] - [[package]] name = "digest" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.6", + "generic-array", ] [[package]] @@ -1579,7 +1514,7 @@ checksum = "cb0188e3c3ba8df5753894d54461f0e39bc91741dc5b22e1c46999ec2c71f4e4" dependencies = [ "enum-ordinalize", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -1600,7 +1535,7 @@ dependencies = [ "der 0.6.1", "digest 0.10.6", "ff 0.12.1", - "generic-array 0.14.6", + "generic-array", "group 0.12.1", "pkcs8 0.9.0", "rand_core 0.6.4", @@ -1619,7 +1554,7 @@ dependencies = [ "crypto-bigint 0.5.0", "digest 0.10.6", "ff 0.13.0", - "generic-array 0.14.6", + "generic-array", "group 0.13.0", "pkcs8 0.10.1", "rand_core 0.6.4", @@ -1690,7 +1625,7 @@ checksum = "570d109b813e904becc80d8d5da38376818a143348413f7149f1340fe04754d4" dependencies = [ "heck", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -1702,7 +1637,7 @@ checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ "heck", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -1715,7 +1650,7 @@ dependencies = [ "num-bigint", "num-traits", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "rustc_version", "syn 1.0.109", ] @@ -1727,7 +1662,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e88bcb3a067a6555d577aba299e75eff9942da276e6506fc6274327daa026132" dependencies = [ "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -1763,7 +1698,7 @@ dependencies = [ "digest 0.10.6", "hex", "hmac", - "pbkdf2", + "pbkdf2 0.11.0", "rand 0.8.5", "scrypt", "serde", @@ -1824,8 +1759,8 @@ dependencies = [ [[package]] name = "ethers-contract" -version = "2.0.0" -source = "git+https://github.com/gakonst/ethers-rs#18a049b4c49965fbb4efbb394891767dc0fa1fa9" +version = "2.0.1" +source = "git+https://github.com/gakonst/ethers-rs#80ac3947d066bb3e3148edaecf8cd54792452bb2" dependencies = [ "ethers-contract-abigen", "ethers-contract-derive", @@ -1842,11 +1777,10 @@ dependencies = [ [[package]] name = "ethers-contract-abigen" -version = "2.0.0" -source = "git+https://github.com/gakonst/ethers-rs#18a049b4c49965fbb4efbb394891767dc0fa1fa9" +version = "2.0.1" +source = "git+https://github.com/gakonst/ethers-rs#80ac3947d066bb3e3148edaecf8cd54792452bb2" dependencies = [ "Inflector", - "cfg-if", "dunce", "ethers-core", "ethers-etherscan", @@ -1855,35 +1789,35 @@ dependencies = [ "hex", "prettyplease", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "regex", "reqwest", "serde", "serde_json", "syn 1.0.109", "tokio", - "toml", + "toml 0.7.3", "url", "walkdir", ] [[package]] name = "ethers-contract-derive" -version = "2.0.0" -source = "git+https://github.com/gakonst/ethers-rs#18a049b4c49965fbb4efbb394891767dc0fa1fa9" +version = "2.0.1" +source = "git+https://github.com/gakonst/ethers-rs#80ac3947d066bb3e3148edaecf8cd54792452bb2" dependencies = [ "ethers-contract-abigen", "ethers-core", "hex", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] [[package]] name = "ethers-core" -version = "2.0.0" -source = "git+https://github.com/gakonst/ethers-rs#18a049b4c49965fbb4efbb394891767dc0fa1fa9" +version = "2.0.1" +source = "git+https://github.com/gakonst/ethers-rs#80ac3947d066bb3e3148edaecf8cd54792452bb2" dependencies = [ "arrayvec", "bytes", @@ -1892,7 +1826,7 @@ dependencies = [ "convert_case 0.6.0", "elliptic-curve 0.13.2", "ethabi", - "generic-array 0.14.6", + "generic-array", "getrandom 0.2.8", "hex", "k256 0.13.0", @@ -1902,7 +1836,6 @@ dependencies = [ "proc-macro2 1.0.52", "rand 0.8.5", "rlp", - "rlp-derive", "serde", "serde_json", "strum", @@ -1915,15 +1848,14 @@ dependencies = [ [[package]] name = "ethers-etherscan" -version = "2.0.0" -source = "git+https://github.com/gakonst/ethers-rs#18a049b4c49965fbb4efbb394891767dc0fa1fa9" +version = "2.0.1" +source = "git+https://github.com/gakonst/ethers-rs#80ac3947d066bb3e3148edaecf8cd54792452bb2" dependencies = [ "ethers-core", "getrandom 0.2.8", "reqwest", "semver 1.0.17", "serde", - "serde-aux", "serde_json", "thiserror", "tracing", @@ -1931,8 +1863,8 @@ dependencies = [ [[package]] name = "ethers-middleware" -version = "2.0.0" -source = "git+https://github.com/gakonst/ethers-rs#18a049b4c49965fbb4efbb394891767dc0fa1fa9" +version = "2.0.1" +source = "git+https://github.com/gakonst/ethers-rs#80ac3947d066bb3e3148edaecf8cd54792452bb2" dependencies = [ "async-trait", "auto_impl", @@ -1941,6 +1873,7 @@ dependencies = [ "ethers-etherscan", "ethers-providers", "ethers-signers", + "futures-channel", "futures-locks", "futures-util", "instant", @@ -1956,12 +1889,13 @@ dependencies = [ [[package]] name = "ethers-providers" -version = "2.0.0" -source = "git+https://github.com/gakonst/ethers-rs#18a049b4c49965fbb4efbb394891767dc0fa1fa9" +version = "2.0.1" +source = "git+https://github.com/gakonst/ethers-rs#80ac3947d066bb3e3148edaecf8cd54792452bb2" dependencies = [ "async-trait", "auto_impl", "base64 0.21.0", + "bytes", "enr 0.8.0", "ethers-core", "futures-channel", @@ -1972,8 +1906,8 @@ dependencies = [ "hashers", "hex", "http", + "instant", "once_cell", - "parking_lot 0.11.2", "pin-project", "reqwest", "serde", @@ -1986,15 +1920,14 @@ dependencies = [ "url", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-timer", "web-sys", "ws_stream_wasm", ] [[package]] name = "ethers-signers" -version = "2.0.0" -source = "git+https://github.com/gakonst/ethers-rs#18a049b4c49965fbb4efbb394891767dc0fa1fa9" +version = "2.0.1" +source = "git+https://github.com/gakonst/ethers-rs#80ac3947d066bb3e3148edaecf8cd54792452bb2" dependencies = [ "async-trait", "coins-bip32", @@ -2031,12 +1964,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - [[package]] name = "fastrand" version = "1.9.0" @@ -2162,9 +2089,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" +checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" dependencies = [ "futures-core", "futures-sink", @@ -2172,9 +2099,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" +checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" [[package]] name = "futures-executor" @@ -2189,9 +2116,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" +checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" [[package]] name = "futures-locks" @@ -2205,26 +2132,26 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" +checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" dependencies = [ "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] [[package]] name = "futures-sink" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" +checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" [[package]] name = "futures-task" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" +checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" [[package]] name = "futures-timer" @@ -2238,9 +2165,9 @@ dependencies = [ [[package]] name = "futures-util" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" +checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" dependencies = [ "futures-channel", "futures-core", @@ -2263,15 +2190,6 @@ dependencies = [ "byteorder", ] -[[package]] -name = "generic-array" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" -dependencies = [ - "typenum", -] - [[package]] name = "generic-array" version = "0.14.6" @@ -2313,7 +2231,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" dependencies = [ - "opaque-debug 0.3.0", + "opaque-debug", "polyval", ] @@ -2841,7 +2759,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" dependencies = [ "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -2886,8 +2804,8 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" dependencies = [ - "block-padding 0.3.2", - "generic-array 0.14.6", + "block-padding", + "generic-array", ] [[package]] @@ -2897,9 +2815,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", ] [[package]] @@ -3074,7 +2989,7 @@ dependencies = [ "heck", "proc-macro-crate", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -3400,7 +3315,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "731f8ecebd9f3a4aa847dfe75455e4757a45da40a7793d2f0b1f9b6ed18b23f3" dependencies = [ "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -3491,7 +3406,7 @@ checksum = "832663583d5fa284ca8810bf7015e46c9fff9622d3cf34bd1eea5003fec06dd0" dependencies = [ "cfg-if", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -3512,7 +3427,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a7d5f7076603ebc68de2dc6a650ec331a062a13abaa346975be747bbfa4b789" dependencies = [ "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -3683,7 +3598,7 @@ checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -3708,12 +3623,6 @@ version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" -[[package]] -name = "opaque-debug" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - [[package]] name = "opaque-debug" version = "0.3.0" @@ -3741,7 +3650,7 @@ checksum = "003b2be5c6c53c1cfeb0a238b8a1c3915cd410feb684457a36c10038f764bb1c" dependencies = [ "bytes", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -3805,7 +3714,7 @@ checksum = "86b26a931f824dd4eca30b3e43bb4f31cd5f0d3a403c5f5ff27106b805bfde7b" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -3871,17 +3780,6 @@ dependencies = [ "windows-sys 0.45.0", ] -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core 0.6.4", - "subtle", -] - [[package]] name = "paste" version = "1.0.11" @@ -3893,11 +3791,18 @@ name = "pbkdf2" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +dependencies = [ + "digest 0.10.6", +] + +[[package]] +name = "pbkdf2" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0ca0b5a68607598bf3bad68f32227a8164f6254833f84eafaac409cd6746c31" dependencies = [ "digest 0.10.6", "hmac", - "password-hash", - "sha2 0.10.6", ] [[package]] @@ -3957,7 +3862,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -4038,7 +3943,7 @@ checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" dependencies = [ "cfg-if", "cpufeatures", - "opaque-debug 0.3.0", + "opaque-debug", "universal-hash", ] @@ -4119,9 +4024,9 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.1.23" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ "proc-macro2 1.0.52", "syn 1.0.109", @@ -4159,7 +4064,7 @@ checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", "version_check", ] @@ -4171,7 +4076,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "version_check", ] @@ -4294,9 +4199,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.23" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2 1.0.52", ] @@ -4495,7 +4400,6 @@ dependencies = [ "http", "http-body", "hyper", - "hyper-rustls", "ipnet", "js-sys", "log", @@ -4503,19 +4407,15 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", - "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", - "tokio-rustls", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", "winreg", ] @@ -4656,7 +4556,7 @@ version = "0.1.0" dependencies = [ "discv5", "enr 0.8.0", - "generic-array 0.14.6", + "generic-array", "hex", "rand 0.8.5", "reth-net-common", @@ -4728,14 +4628,14 @@ name = "reth-ecies" version = "0.1.0" dependencies = [ "aes 0.8.2", - "block-padding 0.3.2", + "block-padding", "byteorder", "cipher 0.4.3", "ctr 0.9.2", "digest 0.10.6", "educe", "futures", - "generic-array 0.14.6", + "generic-array", "hex-literal", "hmac", "pin-project", @@ -4902,10 +4802,10 @@ dependencies = [ "metrics", "once_cell", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "regex", "serial_test", - "syn 1.0.109", + "syn 2.0.5", "trybuild", ] @@ -5113,8 +5013,8 @@ name = "reth-rlp-derive" version = "0.1.1" dependencies = [ "proc-macro2 1.0.52", - "quote 1.0.23", - "syn 1.0.109", + "quote 1.0.26", + "syn 2.0.5", ] [[package]] @@ -5466,6 +5366,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec" dependencies = [ "bytes", + "rlp-derive", "rustc-hex", ] @@ -5476,7 +5377,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a" dependencies = [ "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -5637,7 +5538,7 @@ checksum = "303959cf613a6f6efd19ed4b4ad5bf79966a13352716299ad532cfb115f4205c" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -5680,7 +5581,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f9e24d2b632954ded8ab2ef9fea0a0c769ea56ea98bddbafbad22caeeadf45d" dependencies = [ "hmac", - "pbkdf2", + "pbkdf2 0.11.0", "salsa20", "sha2 0.10.6", ] @@ -5703,7 +5604,7 @@ checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ "base16ct 0.1.1", "der 0.6.1", - "generic-array 0.14.6", + "generic-array", "pkcs8 0.9.0", "subtle", "zeroize", @@ -5717,7 +5618,7 @@ checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e" dependencies = [ "base16ct 0.2.0", "der 0.7.1", - "generic-array 0.14.6", + "generic-array", "pkcs8 0.10.1", "subtle", "zeroize", @@ -5814,16 +5715,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde-aux" -version = "4.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c599b3fd89a75e0c18d6d2be693ddb12cccaf771db4ff9e39097104808a014c0" -dependencies = [ - "serde", - "serde_json", -] - [[package]] name = "serde_derive" version = "1.0.152" @@ -5831,7 +5722,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -5846,6 +5737,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -5882,7 +5782,7 @@ checksum = "a1966009f3c05f095697c537312f5415d1e3ed31ce0a56942bac4c771c5c335e" dependencies = [ "darling 0.14.3", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -5907,7 +5807,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b64f9e531ce97c88b4778aad0ceee079216071cffec6ac9b904277f8f92e7fe3" dependencies = [ "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -5921,7 +5821,7 @@ dependencies = [ "cfg-if", "cpufeatures", "digest 0.9.0", - "opaque-debug 0.3.0", + "opaque-debug", ] [[package]] @@ -5946,18 +5846,6 @@ dependencies = [ "digest 0.10.6", ] -[[package]] -name = "sha2" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" -dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "fake-simd", - "opaque-debug 0.2.3", -] - [[package]] name = "sha2" version = "0.9.9" @@ -5968,7 +5856,7 @@ dependencies = [ "cfg-if", "cpufeatures", "digest 0.9.0", - "opaque-debug 0.3.0", + "opaque-debug", ] [[package]] @@ -6222,7 +6110,7 @@ checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ "heck", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "rustversion", "syn 1.0.109", ] @@ -6306,7 +6194,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89c2d1c76a26822187a1fbb5964e3fff108bc208f02e820ab9dac1234f6b388a" +dependencies = [ + "proc-macro2 1.0.52", + "quote 1.0.26", "unicode-ident", ] @@ -6317,7 +6216,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", "unicode-xid 0.2.4", ] @@ -6376,7 +6275,7 @@ checksum = "a9186daca5c58cb307d09731e0ba06b13fd6c036c90672b9bfc31cecf76cf689" dependencies = [ "cargo_metadata", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "serde", "strum_macros", ] @@ -6391,7 +6290,7 @@ dependencies = [ "if_chain", "lazy_static", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "subprocess", "syn 1.0.109", "test-fuzz-internal", @@ -6435,7 +6334,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" dependencies = [ "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -6537,7 +6436,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -6615,19 +6514,36 @@ dependencies = [ "serde", ] +[[package]] +name = "toml" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + [[package]] name = "toml_datetime" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +dependencies = [ + "serde", +] [[package]] name = "toml_edit" -version = "0.19.4" +version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1eb0622d28f4b9c90adc4ea4b2b46b47663fde9ac5fafcb14a1369d5508825" +checksum = "dc18466501acd8ac6a3f615dd29a3438f8ca6bb3b19537138b3106e575621274" dependencies = [ "indexmap", + "serde", + "serde_spanned", "toml_datetime", "winnow", ] @@ -6739,7 +6655,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -6824,7 +6740,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "258bc1c4f8e2e73a977812ab339d503e6feeb92700f6d07a6de4d321522d5c08" dependencies = [ "lazy_static", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -7071,7 +6987,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" dependencies = [ - "generic-array 0.14.6", + "generic-array", "subtle", ] @@ -7088,7 +7004,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2e7e85a0596447f0f2ac090e16bc4c516c6fe91771fb0c0ccf7fa3dae896b9c" dependencies = [ "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", ] @@ -7208,7 +7124,7 @@ dependencies = [ "log", "once_cell", "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", "wasm-bindgen-shared", ] @@ -7231,7 +7147,7 @@ version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ - "quote 1.0.23", + "quote 1.0.26", "wasm-bindgen-macro-support", ] @@ -7242,7 +7158,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", @@ -7254,21 +7170,6 @@ version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" -[[package]] -name = "wasm-timer" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" -dependencies = [ - "futures", - "js-sys", - "parking_lot 0.11.2", - "pin-utils", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "web-sys" version = "0.3.61" @@ -7499,7 +7400,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ "proc-macro2 1.0.52", - "quote 1.0.23", + "quote 1.0.26", "syn 1.0.109", "synstructure", ] diff --git a/crates/metrics/metrics-derive/Cargo.toml b/crates/metrics/metrics-derive/Cargo.toml index dcfa599e2..2682ccbd3 100644 --- a/crates/metrics/metrics-derive/Cargo.toml +++ b/crates/metrics/metrics-derive/Cargo.toml @@ -11,7 +11,7 @@ proc-macro = true [dependencies] proc-macro2 = "1.0" -syn = { version = "1.0", features = ["extra-traits"] } +syn = { version = "2.0", features = ["extra-traits"] } quote = "1.0" regex = "1.6.0" once_cell = "1.17.0" diff --git a/crates/metrics/metrics-derive/src/expand.rs b/crates/metrics/metrics-derive/src/expand.rs index 23290a345..bd2f9fefd 100644 --- a/crates/metrics/metrics-derive/src/expand.rs +++ b/crates/metrics/metrics-derive/src/expand.rs @@ -2,7 +2,7 @@ use once_cell::sync::Lazy; use quote::{quote, ToTokens}; use regex::Regex; use syn::{ - punctuated::Punctuated, Attribute, Data, DeriveInput, Error, Lit, LitBool, LitStr, + punctuated::Punctuated, Attribute, Data, DeriveInput, Error, Expr, Lit, LitBool, LitStr, MetaNameValue, Result, Token, }; @@ -168,7 +168,7 @@ pub(crate) struct MetricsAttr { } impl MetricsAttr { - const DEFAULT_SEPARATOR: &str = "."; + const DEFAULT_SEPARATOR: &'static str = "."; fn separator(&self) -> String { match &self.separator { @@ -189,18 +189,22 @@ fn parse_metrics_attr(node: &DeriveInput) -> Result { metrics_attr.parse_args_with(Punctuated::::parse_terminated)?; let (mut scope, mut separator, mut dynamic) = (None, None, None); for kv in parsed { + let lit = match kv.value { + Expr::Lit(ref expr) => &expr.lit, + _ => continue, + }; if kv.path.is_ident("scope") { if scope.is_some() { return Err(Error::new_spanned(kv, "Duplicate `scope` value provided.")) } - let scope_lit = parse_str_lit(&kv.lit)?; + let scope_lit = parse_str_lit(lit)?; validate_metric_name(&scope_lit)?; scope = Some(scope_lit); } else if kv.path.is_ident("separator") { if separator.is_some() { return Err(Error::new_spanned(kv, "Duplicate `separator` value provided.")) } - let separator_lit = parse_str_lit(&kv.lit)?; + let separator_lit = parse_str_lit(lit)?; if !SUPPORTED_SEPARATORS.contains(&&*separator_lit.value()) { return Err(Error::new_spanned( kv, @@ -219,7 +223,7 @@ fn parse_metrics_attr(node: &DeriveInput) -> Result { if dynamic.is_some() { return Err(Error::new_spanned(kv, "Duplicate `dynamic` flag provided.")) } - dynamic = Some(parse_bool_lit(&kv.lit)?.value); + dynamic = Some(parse_bool_lit(lit)?.value); } else { return Err(Error::new_spanned(kv, "Unsupported attribute entry.")) } @@ -254,16 +258,20 @@ fn parse_metric_fields(node: &DeriveInput) -> Result>> { let parsed = metric_attr .parse_args_with(Punctuated::::parse_terminated)?; for kv in parsed { + let lit = match kv.value { + Expr::Lit(ref expr) => &expr.lit, + _ => continue, + }; if kv.path.is_ident("describe") { if describe.is_some() { return Err(Error::new_spanned(kv, "Duplicate `describe` value provided.")) } - describe = Some(parse_str_lit(&kv.lit)?); + describe = Some(parse_str_lit(lit)?); } else if kv.path.is_ident("rename") { if rename.is_some() { return Err(Error::new_spanned(kv, "Duplicate `rename` value provided.")) } - let rename_lit = parse_str_lit(&kv.lit)?; + let rename_lit = parse_str_lit(lit)?; validate_metric_name(&rename_lit)?; rename = Some(rename_lit) } else { @@ -304,7 +312,7 @@ fn parse_single_attr<'a, T: WithAttrs + ToTokens>( token: &'a T, ident: &str, ) -> Result> { - let mut attr_iter = token.attrs().iter().filter(|a| a.path.is_ident(ident)); + let mut attr_iter = token.attrs().iter().filter(|a| a.path().is_ident(ident)); if let Some(attr) = attr_iter.next() { if let Some(next_attr) = attr_iter.next() { Err(Error::new_spanned( @@ -333,15 +341,16 @@ fn parse_single_required_attr<'a, T: WithAttrs + ToTokens>( fn parse_docs_to_string(token: &T) -> Result> { let mut doc_str = None; for attr in token.attrs().iter() { - let meta = attr.parse_meta()?; - if let syn::Meta::NameValue(meta) = meta { - if let syn::Lit::Str(doc) = meta.lit { - let doc_value = doc.value().trim().to_string(); - doc_str = Some( - doc_str - .map(|prev_doc_value| format!("{prev_doc_value} {doc_value}")) - .unwrap_or(doc_value), - ); + if let syn::Meta::NameValue(ref meta) = attr.meta { + if let Expr::Lit(ref lit) = meta.value { + if let Lit::Str(ref doc) = lit.lit { + let doc_value = doc.value().trim().to_string(); + doc_str = Some( + doc_str + .map(|prev_doc_value| format!("{prev_doc_value} {doc_value}")) + .unwrap_or(doc_value), + ); + } } } } diff --git a/crates/metrics/metrics-derive/tests/compile-fail/metrics_attr.stderr b/crates/metrics/metrics-derive/tests/compile-fail/metrics_attr.stderr index a8a3716c7..5121258d5 100644 --- a/crates/metrics/metrics-derive/tests/compile-fail/metrics_attr.stderr +++ b/crates/metrics/metrics-derive/tests/compile-fail/metrics_attr.stderr @@ -17,11 +17,12 @@ error: Either `scope = ..` or `dynamic = true` must be set. 16 | | struct CustomMetrics3; | |______________________^ -error: expected literal - --> tests/compile-fail/metrics_attr.rs:19:19 +error: Either `scope = ..` or `dynamic = true` must be set. + --> tests/compile-fail/metrics_attr.rs:19:1 | -19 | #[metrics(scope = value)] - | ^^^^^ +19 | / #[metrics(scope = value)] +20 | | struct CustomMetrics4; + | |______________________^ error: Value **must** be a string literal. --> tests/compile-fail/metrics_attr.rs:23:19 @@ -41,11 +42,12 @@ error: Duplicate `scope` value provided. 31 | #[metrics(scope = "some_scope", scope = "another_scope")] | ^^^^^^^^^^^^^^^^^^^^^^^ -error: expected literal - --> tests/compile-fail/metrics_attr.rs:35:23 +error: Either `scope = ..` or `dynamic = true` must be set. + --> tests/compile-fail/metrics_attr.rs:35:1 | -35 | #[metrics(separator = value)] - | ^^^^^ +35 | / #[metrics(separator = value)] +36 | | struct CustomMetrics8; + | |______________________^ error: Value **must** be a string literal. --> tests/compile-fail/metrics_attr.rs:39:23 diff --git a/crates/rlp/rlp-derive/Cargo.toml b/crates/rlp/rlp-derive/Cargo.toml index 361521898..cb41704d9 100644 --- a/crates/rlp/rlp-derive/Cargo.toml +++ b/crates/rlp/rlp-derive/Cargo.toml @@ -10,6 +10,6 @@ repository = "https://github.com/paradigmxyz/reth" proc-macro = true [dependencies] -syn = "1" +syn = "2" quote = "1" proc-macro2 = "1" diff --git a/crates/rlp/rlp-derive/src/utils.rs b/crates/rlp/rlp-derive/src/utils.rs index 1897f7f0c..f4d4c8767 100644 --- a/crates/rlp/rlp-derive/src/utils.rs +++ b/crates/rlp/rlp-derive/src/utils.rs @@ -1,6 +1,6 @@ use proc_macro2::TokenStream; use quote::quote; -use syn::{Attribute, DataStruct, Error, Field, Meta, NestedMeta, Result, Type, TypePath}; +use syn::{Attribute, DataStruct, Error, Field, Meta, Result, Type, TypePath}; pub(crate) const EMPTY_STRING_CODE: u8 = 0x80; @@ -19,18 +19,21 @@ pub(crate) fn parse_struct<'a>( } pub(crate) fn attributes_include(attrs: &[Attribute], attr_name: &str) -> bool { - attrs.iter().any(|attr| { - if attr.path.is_ident("rlp") { - if let Ok(Meta::List(meta)) = attr.parse_meta() { - if let Some(NestedMeta::Meta(meta)) = meta.nested.first() { - return meta.path().is_ident(attr_name) + for attr in attrs.iter() { + if attr.path().is_ident("rlp") { + if let Meta::List(meta) = &attr.meta { + let mut is_attr = false; + let _ = meta.parse_nested_meta(|meta| { + is_attr = meta.path.is_ident(attr_name); + Ok(()) + }); + if is_attr { + return true } - return false - } else { } } - false - }) + } + false } pub(crate) fn is_optional(field: &Field) -> bool { diff --git a/crates/storage/codecs/derive/Cargo.toml b/crates/storage/codecs/derive/Cargo.toml index 66c2a56ca..68081dd61 100644 --- a/crates/storage/codecs/derive/Cargo.toml +++ b/crates/storage/codecs/derive/Cargo.toml @@ -20,7 +20,7 @@ proc-macro = true [dependencies] proc-macro2 = "1.0.47" quote = "1.0" -syn = { version = "1.0", features = ["full"] } +syn = { version = "2.0", features = ["full"] } convert_case = "0.6.0" # codecs diff --git a/crates/storage/codecs/derive/src/compact/mod.rs b/crates/storage/codecs/derive/src/compact/mod.rs index fb003ccc4..3af29b4b8 100644 --- a/crates/storage/codecs/derive/src/compact/mod.rs +++ b/crates/storage/codecs/derive/src/compact/mod.rs @@ -119,7 +119,7 @@ fn load_field(field: &syn::Field, fields: &mut FieldList, is_enum: bool) { } else { let should_compact = is_flag_type(&ftype) || field.attrs.iter().any(|attr| { - attr.path.segments.iter().any(|path| path.ident == "maybe_zero") + attr.path().segments.iter().any(|path| path.ident == "maybe_zero") }); fields.push(FieldTypes::StructField((