From 9cc9d3ab52ae47f151791d19f744e6b7b5b1dbbf Mon Sep 17 00:00:00 2001 From: Mattie Conover Date: Fri, 6 May 2022 11:14:57 -0700 Subject: [PATCH] Rust dependency cleanup + Lastest stable (#381) * ignore jetbrains IDE configs * Update to stable rust 1.60 * Remove unused deps from cargo projects * allow the previously unused fields to still be unused after new warnings * update dockerfile --- .gitignore | 2 + rust-toolchain | 2 +- rust/Cargo.lock | 323 +++--------------- rust/Dockerfile | 2 +- rust/README.md | 8 +- rust/abacus-core/Cargo.toml | 1 - rust/abacus-test/Cargo.toml | 3 - rust/chains/abacus-ethereum/Cargo.toml | 2 - rust/chains/abacus-ethereum/src/inbox.rs | 2 + rust/chains/abacus-ethereum/src/outbox.rs | 2 + .../abacus-ethereum/src/validator_manager.rs | 3 + rust/tools/balance-exporter/Cargo.toml | 1 - 12 files changed, 56 insertions(+), 295 deletions(-) diff --git a/.gitignore b/.gitignore index 4b5c99187..d497ff772 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,5 @@ typescript/**/tsconfig.tsbuildinfo .yarn/install-state.gz .yarn/cache yarn-error.log + +.idea diff --git a/rust-toolchain b/rust-toolchain index eb3060235..bd664ccfb 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,3 +1,3 @@ [toolchain] -channel = "1.56" +channel = "1.60" profile = "default" diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 8f148bd1b..863d0e8e3 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -79,7 +79,6 @@ dependencies = [ "hex", "lazy_static", "num", - "prometheus", "rocksdb", "serde 1.0.130", "serde_json", @@ -95,7 +94,6 @@ name = "abacus-ethereum" version = "0.1.0" dependencies = [ "abacus-core", - "anyhow", "async-trait", "color-eyre 0.5.11", "ethers", @@ -103,7 +101,6 @@ dependencies = [ "ethers-signers", "hex", "num", - "prometheus", "rocksdb", "serde 1.0.130", "serde_json", @@ -118,14 +115,11 @@ name = "abacus-test" version = "0.1.0" dependencies = [ "abacus-core", - "abacus-ethereum", "async-trait", "color-eyre 0.5.11", - "config", "ethers", "futures-util", "mockall", - "prometheus", "rand 0.8.5", "rocksdb", "serde 1.0.130", @@ -156,7 +150,7 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cipher", "cpufeatures", "opaque-debug 0.3.0", @@ -200,12 +194,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "anyhow" -version = "1.0.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" - [[package]] name = "arrayvec" version = "0.5.2" @@ -270,15 +258,6 @@ dependencies = [ "rustc_version", ] -[[package]] -name = "atomic-shim" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d20fdac7156779a1a30d970e838195558b4810dd06aa69e7c7461bdc518edf9b" -dependencies = [ - "crossbeam", -] - [[package]] name = "atty" version = "0.2.14" @@ -316,7 +295,7 @@ checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "miniz_oxide", "object", @@ -334,7 +313,6 @@ dependencies = [ "futures", "human-panic", "metrics", - "metrics-exporter-prometheus", "serde 1.0.130", "serde_json", "tokio", @@ -624,12 +602,6 @@ dependencies = [ "nom 6.1.2", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -923,31 +895,7 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crossbeam" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" -dependencies = [ - "cfg-if 0.1.10", - "crossbeam-channel 0.4.4", - "crossbeam-deque 0.7.4", - "crossbeam-epoch 0.8.2", - "crossbeam-queue", - "crossbeam-utils 0.7.2", -] - -[[package]] -name = "crossbeam-channel" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" -dependencies = [ - "crossbeam-utils 0.7.2", - "maybe-uninit", + "cfg-if", ] [[package]] @@ -956,19 +904,8 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.5", -] - -[[package]] -name = "crossbeam-deque" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed" -dependencies = [ - "crossbeam-epoch 0.8.2", - "crossbeam-utils 0.7.2", - "maybe-uninit", + "cfg-if", + "crossbeam-utils", ] [[package]] @@ -977,24 +914,9 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" dependencies = [ - "cfg-if 1.0.0", - "crossbeam-epoch 0.9.5", - "crossbeam-utils 0.8.5", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "lazy_static", - "maybe-uninit", - "memoffset 0.5.6", - "scopeguard", + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", ] [[package]] @@ -1003,42 +925,20 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.5", + "cfg-if", + "crossbeam-utils", "lazy_static", - "memoffset 0.6.4", + "memoffset", "scopeguard", ] -[[package]] -name = "crossbeam-queue" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" -dependencies = [ - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static", -] - [[package]] name = "crossbeam-utils" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "lazy_static", ] @@ -1099,16 +999,6 @@ dependencies = [ "cipher", ] -[[package]] -name = "dashmap" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" -dependencies = [ - "cfg-if 1.0.0", - "num_cpus", -] - [[package]] name = "der" version = "0.5.1" @@ -1165,7 +1055,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "dirs-sys-next", ] @@ -1243,15 +1133,9 @@ version = "0.8.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] -[[package]] -name = "endian-type" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" - [[package]] name = "eth-keystore" version = "0.4.1" @@ -1368,7 +1252,7 @@ version = "0.6.0" source = "git+https://github.com/gakonst/ethers-rs?branch=master#81e7fea14b4f9bc4c531856f8cb7cd31a5248918" dependencies = [ "Inflector", - "cfg-if 1.0.0", + "cfg-if", "dunce", "ethers-core", "eyre", @@ -1782,7 +1666,7 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi 0.9.0+wasi-snapshot-preview1", ] @@ -1793,7 +1677,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "libc", "wasi 0.10.2+wasi-snapshot-preview1", @@ -1847,9 +1731,6 @@ name = "hashbrown" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash", -] [[package]] name = "hashers" @@ -2116,7 +1997,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -2179,7 +2060,7 @@ version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19c3a5e0a0b8450278feda242592512e09f61c72e018b8cd5c859482802daf2d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "ecdsa", "elliptic-curve", "sec1", @@ -2284,7 +2165,7 @@ checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" dependencies = [ "arrayvec 0.5.2", "bitflags", - "cfg-if 1.0.0", + "cfg-if", "ryu", "static_assertions", ] @@ -2301,7 +2182,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0cf036d15402bea3c5d4de17b3fce76b3e4a56ebc1f577be0e7a72f7c607cf0" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "winapi", ] @@ -2347,16 +2228,7 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "mach" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -dependencies = [ - "libc", + "cfg-if", ] [[package]] @@ -2374,12 +2246,6 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - [[package]] name = "md-5" version = "0.9.1" @@ -2406,15 +2272,6 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" -[[package]] -name = "memoffset" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.6.4" @@ -2435,22 +2292,6 @@ dependencies = [ "proc-macro-hack", ] -[[package]] -name = "metrics-exporter-prometheus" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343a5ceb38235928e7a5687412590f07e6d281522dcd9ff51246f8856eef5fe5" -dependencies = [ - "hyper", - "ipnet", - "metrics", - "metrics-util", - "parking_lot", - "quanta", - "thiserror", - "tokio", -] - [[package]] name = "metrics-macros" version = "0.4.0" @@ -2465,29 +2306,6 @@ dependencies = [ "syn", ] -[[package]] -name = "metrics-util" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74c9b6aee519e1461b678952d3671652bb341d0664b1188f895a436a4e2e6ffa" -dependencies = [ - "ahash", - "aho-corasick", - "atomic-shim", - "crossbeam-epoch 0.9.5", - "crossbeam-utils 0.8.5", - "dashmap", - "hashbrown", - "indexmap", - "metrics", - "num_cpus", - "ordered-float 2.8.0", - "parking_lot", - "quanta", - "radix_trie", - "sketches-ddsketch", -] - [[package]] name = "mime" version = "0.3.16" @@ -2542,7 +2360,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ab571328afa78ae322493cacca3efac6a0f2e0a67305b4df31fd439ef129ac0" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "downcast", "fragile", "lazy_static", @@ -2557,7 +2375,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7e25b214433f669161f414959594216d8e6ba83b6679d3db96899c0b4639033" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "proc-macro2", "quote", "syn", @@ -2605,15 +2423,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" -[[package]] -name = "nibble_vec" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" -dependencies = [ - "smallvec", -] - [[package]] name = "nom" version = "5.1.2" @@ -2784,7 +2593,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" dependencies = [ "bitflags", - "cfg-if 1.0.0", + "cfg-if", "foreign-types", "libc", "once_cell", @@ -2817,7 +2626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "492848ff47f11b7f9de0443b404e2c5775f695e1af6b7076ca25f999581d547a" dependencies = [ "async-trait", - "crossbeam-channel 0.5.1", + "crossbeam-channel", "futures", "js-sys", "lazy_static", @@ -2888,15 +2697,6 @@ dependencies = [ "num-traits 0.2.14", ] -[[package]] -name = "ordered-float" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97c9d06878b3a851e8026ef94bf7fef9ba93062cd412601da4d9cf369b1cc62d" -dependencies = [ - "num-traits 0.2.14", -] - [[package]] name = "os_str_bytes" version = "4.2.0" @@ -2970,7 +2770,7 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "instant", "libc", "redox_syscall", @@ -3283,7 +3083,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5986aa8d62380092d2f50f8b1cdba9cb9b6731ffd4b25b51fd126b6c3e05b99c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fnv", "lazy_static", "memchr", @@ -3298,22 +3098,6 @@ version = "2.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47c327e191621a2158159df97cdbc2e7074bb4e940275e35abf38eb3d2595754" -[[package]] -name = "quanta" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20afe714292d5e879d8b12740aa223c6a88f118af41870e8b6196e39a02238a8" -dependencies = [ - "crossbeam-utils 0.8.5", - "libc", - "mach", - "once_cell", - "raw-cpuid", - "wasi 0.10.2+wasi-snapshot-preview1", - "web-sys", - "winapi", -] - [[package]] name = "quick-error" version = "1.2.3" @@ -3347,16 +3131,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" -[[package]] -name = "radix_trie" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" -dependencies = [ - "endian-type", - "nibble_vec", -] - [[package]] name = "rand" version = "0.7.3" @@ -3428,15 +3202,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "raw-cpuid" -version = "10.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "929f54e29691d4e6a9cc558479de70db7aa3d98cd6fe7ab86d7507aa2886b9d2" -dependencies = [ - "bitflags", -] - [[package]] name = "rayon" version = "1.5.2" @@ -3444,7 +3209,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221" dependencies = [ "autocfg", - "crossbeam-deque 0.8.1", + "crossbeam-deque", "either", "rayon-core", ] @@ -3455,9 +3220,9 @@ version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4" dependencies = [ - "crossbeam-channel 0.5.1", - "crossbeam-deque 0.8.1", - "crossbeam-utils 0.8.5", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", "num_cpus", ] @@ -4015,7 +3780,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ "block-buffer 0.9.0", - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", @@ -4027,7 +3792,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.10.3", ] @@ -4051,7 +3816,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" dependencies = [ "block-buffer 0.9.0", - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", @@ -4063,7 +3828,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.10.3", ] @@ -4130,12 +3895,6 @@ version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" -[[package]] -name = "sketches-ddsketch" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a77a8fd93886010f05e7ea0720e569d6d16c65329dbe3ec033bbbccccb017b" - [[package]] name = "slab" version = "0.4.5" @@ -4273,7 +4032,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "rand 0.8.5", "redox_syscall", @@ -4372,7 +4131,7 @@ dependencies = [ "byteorder", "integer-encoding", "log", - "ordered-float 1.1.1", + "ordered-float", "threadpool", ] @@ -4539,7 +4298,7 @@ version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -4943,7 +4702,7 @@ version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] @@ -4968,7 +4727,7 @@ version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", diff --git a/rust/Dockerfile b/rust/Dockerfile index 8d12b3b86..1e758baf7 100644 --- a/rust/Dockerfile +++ b/rust/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:experimental -FROM rust:1.56 as builder +FROM rust:1.60 as builder WORKDIR /usr/src # 1a: Prepare for static linking diff --git a/rust/README.md b/rust/README.md index 4b3ba71fa..e3c2fda58 100644 --- a/rust/README.md +++ b/rust/README.md @@ -7,13 +7,13 @@ - setup pre-commit hooks: `cp ../pre-commit.sh ../.git/hooks/pre-commit` - Note: To bypass pre-commit hooks, pass `--no-verify` after commit message -Note: You should be running >= version `1.52.1` of the rustc compiler, you can see that version with this command and should see similar output: +Note: You should be running >= version `1.60.0` of the rustc compiler, you can see that version with this command and should see similar output: ``` $ rustup --version -rustup 1.24.2 (755e2b07e 2021-05-12) +rustup 1.24.3 (ce5817a94 2021-05-31) info: This is the version for the rustup toolchain manager, not the rustc compiler. -info: The currently active `rustc` version is `rustc 1.52.1 (9bc8c42bb 2021-05-09)` +info: The currently active `rustc` version is `rustc 1.60.0 (7737e0b5c 2022-04-04)` ``` ### Useful cargo commands @@ -59,7 +59,7 @@ Some agent sketches: - `updater` - Needs only a connection to the home chain - - Signs upate attestations and submits them to the home chain + - Signs update attestations and submits them to the home chain - `watcher` - Observe the home chain - Observe as many replicas as possible diff --git a/rust/abacus-core/Cargo.toml b/rust/abacus-core/Cargo.toml index ffa2be326..af1fc49dd 100644 --- a/rust/abacus-core/Cargo.toml +++ b/rust/abacus-core/Cargo.toml @@ -22,7 +22,6 @@ serde = {version = "1.0", features = ["derive"]} serde_json = {version = "1.0"} color-eyre = "0.5.0" rocksdb = { git = "https://github.com/rust-rocksdb/rust-rocksdb" } -prometheus = "0.12.0" bytes = { version = "1", features = ["serde"]} num = {version="0", features=["serde"]} diff --git a/rust/abacus-test/Cargo.toml b/rust/abacus-test/Cargo.toml index b7a1a9d8a..9108f4431 100644 --- a/rust/abacus-test/Cargo.toml +++ b/rust/abacus-test/Cargo.toml @@ -6,7 +6,6 @@ edition = "2021" [dependencies] tokio = { version = "1.0.1", features = ["rt", "macros"] } -config = "0.10" serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0", default-features = false } ethers = { git = "https://github.com/gakonst/ethers-rs", branch = "master" } @@ -19,6 +18,4 @@ rand = "0.8.3" rocksdb = { git = "https://github.com/rust-rocksdb/rust-rocksdb" } abacus-core = { path = "../abacus-core" } -abacus-ethereum = { path = "../chains/abacus-ethereum"} tracing = "0.1.26" -prometheus = "0.12.0" diff --git a/rust/chains/abacus-ethereum/Cargo.toml b/rust/chains/abacus-ethereum/Cargo.toml index dda96d547..f879761df 100644 --- a/rust/chains/abacus-ethereum/Cargo.toml +++ b/rust/chains/abacus-ethereum/Cargo.toml @@ -17,12 +17,10 @@ async-trait = { version = "0.1.42", default-features = false } thiserror = { version = "1.0.22", default-features = false } tracing = "0.1.22" color-eyre = "0.5.0" -anyhow = "1" num = "0.4" abacus-core = { path = "../../abacus-core" } tokio = "1.7.1" hex = "0.4.3" -prometheus = "0.12" rocksdb = { git = "https://github.com/rust-rocksdb/rust-rocksdb" } tracing-futures = "0.2.5" diff --git a/rust/chains/abacus-ethereum/src/inbox.rs b/rust/chains/abacus-ethereum/src/inbox.rs index 1de57be2a..e0ec17303 100644 --- a/rust/chains/abacus-ethereum/src/inbox.rs +++ b/rust/chains/abacus-ethereum/src/inbox.rs @@ -42,7 +42,9 @@ where { contract: Arc>, provider: Arc, + #[allow(unused)] from_height: u32, + #[allow(unused)] chunk_size: u32, } diff --git a/rust/chains/abacus-ethereum/src/outbox.rs b/rust/chains/abacus-ethereum/src/outbox.rs index 383ef47b2..3602b5bde 100644 --- a/rust/chains/abacus-ethereum/src/outbox.rs +++ b/rust/chains/abacus-ethereum/src/outbox.rs @@ -34,7 +34,9 @@ where { contract: Arc>, provider: Arc, + #[allow(unused)] from_height: u32, + #[allow(unused)] chunk_size: u32, } diff --git a/rust/chains/abacus-ethereum/src/validator_manager.rs b/rust/chains/abacus-ethereum/src/validator_manager.rs index ca88bc526..91d31ddb7 100644 --- a/rust/chains/abacus-ethereum/src/validator_manager.rs +++ b/rust/chains/abacus-ethereum/src/validator_manager.rs @@ -33,8 +33,11 @@ where M: ethers::providers::Middleware, { contract: Arc>, + #[allow(unused)] domain: u32, + #[allow(unused)] name: String, + #[allow(unused)] provider: Arc, inbox_address: Address, } diff --git a/rust/tools/balance-exporter/Cargo.toml b/rust/tools/balance-exporter/Cargo.toml index ae2991388..cbe1302e4 100644 --- a/rust/tools/balance-exporter/Cargo.toml +++ b/rust/tools/balance-exporter/Cargo.toml @@ -11,7 +11,6 @@ tokio = "1" futures = "0.3" metrics = "0" -metrics-exporter-prometheus = "0" serde_json = "1" serde = "1" color-eyre = "0"