Merge branch 'emhane/sanitise-eth68-announcement' of github.com:parad…

…igmxyz/reth into emhane/sanitise-eth68-announcement
paradigmxyz · Jan 29, 2024 · 3766e4d · 3766e4d
2 parents 1211546 + 63b2649
commit 3766e4d
Show file tree

Hide file tree

Showing 127 changed files with 2,873 additions and 2,111 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Makefile b/Makefile
@@ -248,30 +248,79 @@ fmt:
 	cargo +nightly fmt
 
 lint-reth:
-	cargo +nightly clippy --workspace --bin "reth" --lib --examples --tests --benches --features "ethereum $(BIN_OTHER_FEATURES)" -- -D warnings
+	cargo +nightly clippy \
+	--workspace \
+	--bin "reth" \
+	--lib \
+	--examples \
+	--tests \
+	--benches \
+	--features "ethereum $(BIN_OTHER_FEATURES)" \
+	-- -D warnings
 
 lint-op-reth:
-	cargo +nightly clippy --workspace --bin "op-reth" --lib --examples --tests --benches --features "optimism $(BIN_OTHER_FEATURES)" -- -D warnings
+	cargo +nightly clippy \
+	--workspace \
+	--bin "op-reth" \
+	--lib \
+	--examples \
+	--tests \
+	--benches \
+	--features "optimism $(BIN_OTHER_FEATURES)" \
+	-- -D warnings
 
 lint-other-targets:
-	cargo +nightly clippy --workspace --lib --examples --tests --benches --all-features -- -D warnings
+	cargo +nightly clippy \
+	--workspace \
+	--lib \
+	--examples \
+	--tests \
+	--benches \
+	--all-features \
+	-- -D warnings
 
 lint:
+	make fmt && \
 	make lint-reth && \
 	make lint-op-reth && \
 	make lint-other-targets
 
 rustdocs:
-	RUSTDOCFLAGS="--cfg docsrs --show-type-layout --generate-link-to-definition --enable-index-page -Zunstable-options -D warnings" cargo +nightly docs --document-private-items
+	RUSTDOCFLAGS="\
+	--cfg docsrs \
+	--show-type-layout \
+	--generate-link-to-definition \
+	--enable-index-page -Zunstable-options -D warnings" \
+	cargo +nightly docs \
+	--document-private-items
 
 test-reth:
-	cargo test --workspace --bin "reth" --lib --examples --tests --benches --features "ethereum $(BIN_OTHER_FEATURES)"
+	cargo test \
+	--workspace \
+	--bin "reth" \
+	--lib \
+	--examples \
+	--tests \
+	--benches \
+	--features "ethereum $(BIN_OTHER_FEATURES)"
 
 test-op-reth:
-	cargo test --workspace --bin "op-reth" --lib --examples --tests --benches --features "optimism $(BIN_OTHER_FEATURES)"
+	cargo test \
+	--workspace \
+	--bin "op-reth" \
+	--lib --examples \
+	--tests \
+	--benches \
+	--features "optimism $(BIN_OTHER_FEATURES)"
 
 test-other-targets:
-	cargo test --workspace --lib --examples --tests --benches --all-features
+	cargo test \
+	--workspace \
+	--lib \
+	--examples \
+	--tests \
+	--benches \
+	--all-features
 
 test:
 	make test-reth && \

diff --git a/bin/reth/Cargo.toml b/bin/reth/Cargo.toml
@@ -102,6 +102,7 @@ hyper = "0.14.25"
 # misc
 aquamarine.workspace = true
 eyre.workspace = true
+thiserror.workspace = true
 clap = { workspace = true, features = ["derive"] }
 tempfile.workspace = true
 backon = "0.4"