diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index aff9a71b4ad..7cccf26efa5 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -54,6 +54,20 @@ jobs: done echo "skip_ci=$SKIP_CI" >> $GITHUB_OUTPUT + lockbud: + name: lockbud + runs-on: ubuntu-latest + container: + image: eserilev/lockbud:latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Install dependencies + run: apt update && apt install -y cmake + - name: Generate code coverage + run: | + cargo lockbud -k deadlock -b -l=openssl,openssl-sys,native-tls,tokio,tokio-stream,tokio-util,ethereum_hashing + target-branch-check: name: target-branch-check runs-on: ubuntu-latest diff --git a/Cargo.lock b/Cargo.lock index 3a063e7e0e7..493cc9ad121 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -168,7 +168,6 @@ dependencies = [ "alloy-eips", "alloy-primitives", "alloy-rlp", - "c-kzg", ] [[package]] @@ -201,10 +200,6 @@ dependencies = [ "alloy-eip7702", "alloy-primitives", "alloy-rlp", - "c-kzg", - "derive_more 1.0.0", - "once_cell", - "serde", "sha2 0.10.8", ] @@ -220,7 +215,7 @@ dependencies = [ "cfg-if", "const-hex", "derive_arbitrary", - "derive_more 0.99.18", + "derive_more", "getrandom", "hex-literal", "itoa", @@ -1164,8 +1159,6 @@ dependencies = [ "glob", "hex", "libc", - "once_cell", - "serde", ] [[package]] @@ -2031,26 +2024,6 @@ dependencies = [ "syn 2.0.77", ] -[[package]] -name = "derive_more" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" -dependencies = [ - "derive_more-impl", -] - -[[package]] -name = "derive_more-impl" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.77", -] - [[package]] name = "diesel" version = "2.2.3" @@ -4555,7 +4528,7 @@ source = "git+https://github.com/sigp/libmdbx-rs?rev=e6ff4b9377c1619bcf0bfdf52be dependencies = [ "bitflags 1.3.2", "byteorder", - "derive_more 0.99.18", + "derive_more", "indexmap 1.9.3", "libc", "mdbx-sys", @@ -6573,7 +6546,7 @@ checksum = "5e617cc9058daa5e1fe5a0d23ed745773a5ee354111dad1ec0235b0cc16b6730" dependencies = [ "cfg-if", "darwin-libproc", - "derive_more 0.99.18", + "derive_more", "glob", "mach2", "nix 0.24.3", @@ -7341,7 +7314,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024" dependencies = [ "cfg-if", - "derive_more 0.99.18", + "derive_more", "parity-scale-codec 3.6.12", "scale-info-derive", ] diff --git a/Cargo.toml b/Cargo.toml index 125231ad20e..fc135d01f29 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -97,7 +97,7 @@ edition = "2021" [workspace.dependencies] alloy-primitives = "0.8" alloy-rlp = "0.3.4" -alloy-consensus = "0.3.0" +alloy-consensus = { version = "0.3.1", default-features = false } anyhow = "1" arbitrary = { version = "1", features = ["derive"] } async-channel = "1.9.0" diff --git a/consensus/state_processing/src/consensus_context.rs b/consensus/state_processing/src/consensus_context.rs index b0eaf3422d3..db23953739a 100644 --- a/consensus/state_processing/src/consensus_context.rs +++ b/consensus/state_processing/src/consensus_context.rs @@ -147,6 +147,7 @@ impl ConsensusContext { } } + #[allow(elided_named_lifetimes)] pub fn get_indexed_attestation<'a>( &'a mut self, state: &BeaconState,