Merge remote-tracking branch 'origin/release-v6.0.1' into unstable

sigp · Dec 10, 2024 · c5a48a9 · c5a48a9
2 parents fec502d + 3b8254a
commit c5a48a9
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/.github/workflows/local-testnet.yml b/.github/workflows/local-testnet.yml
@@ -40,7 +40,7 @@ jobs:
         run: |
           echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
           sudo apt update
-          sudo apt install -y kurtosis-cli=1.3.1
+          sudo apt install -y kurtosis-cli
           kurtosis analytics disable
 
       - name: Download Docker image artifact
@@ -86,7 +86,7 @@ jobs:
         run: |
           echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
           sudo apt update
-          sudo apt install -y kurtosis-cli=1.3.1
+          sudo apt install -y kurtosis-cli
           kurtosis analytics disable
 
       - name: Download Docker image artifact
@@ -121,7 +121,7 @@ jobs:
         run: |
           echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
           sudo apt update
-          sudo apt install -y kurtosis-cli=1.3.1
+          sudo apt install -y kurtosis-cli
           kurtosis analytics disable
 
       - name: Download Docker image artifact

diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
@@ -83,6 +83,11 @@ jobs:
     runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "CI", "large"]') || 'ubuntu-latest'  }}
     steps:
     - uses: actions/checkout@v4
+    # Set Java version to 21. (required since Web3Signer 24.12.0).
+    - uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: '21'
     - name: Get latest version of stable Rust
       if: env.SELF_HOSTED_RUNNERS == 'false'
       uses: moonrepo/setup-rust@v1

diff --git a/Makefile b/Makefile
@@ -240,7 +240,7 @@ install-audit:
 	cargo install --force cargo-audit
 
 audit-CI:
-	cargo audit
+	cargo audit --ignore RUSTSEC-2024-0421
 
 # Runs `cargo vendor` to make sure dependencies can be vendored for packaging, reproducibility and archival purpose.
 vendor:

diff --git a/beacon_node/network/src/subnet_service/mod.rs b/beacon_node/network/src/subnet_service/mod.rs
@@ -213,6 +213,7 @@ impl<T: BeaconChainTypes> SubnetService<T> {
     #[cfg(test)]
     pub(crate) fn is_subscribed(&self, subnet: &Subnet) -> bool {
         self.subscriptions.contains_key(subnet)
+            || self.permanent_attestation_subscriptions.contains(subnet)
     }
 
     /// Processes a list of validator subscriptions.

diff --git a/beacon_node/network/src/subnet_service/tests/mod.rs b/beacon_node/network/src/subnet_service/tests/mod.rs
@@ -225,7 +225,7 @@ mod test {
         let mut committee_count = 1;
         let mut subnet = Subnet::Attestation(
             SubnetId::compute_subnet::<MainnetEthSpec>(
-                current_slot,
+                subscription_slot,
                 committee_index,
                 committee_count,
                 &subnet_service.beacon_chain.spec,
@@ -250,7 +250,7 @@ mod test {
 
         let subscriptions = vec![get_subscription(
             committee_index,
-            current_slot,
+            subscription_slot,
             committee_count,
             true,
         )];
@@ -556,7 +556,8 @@ mod test {
         subnet_service.validator_subscriptions(vec![sub1, sub2].into_iter());
 
         // Unsubscription event should happen at the end of the slot.
-        let events = get_events(&mut subnet_service, None, 1).await;
+        // We wait for 2 slots, to avoid timeout issues
+        let events = get_events(&mut subnet_service, None, 2).await;
 
         let expected_subscription =
             SubnetServiceMessage::Subscribe(Subnet::Attestation(subnet_id1));
@@ -567,6 +568,7 @@ mod test {
             assert_eq!(expected_subscription, events[0]);
             assert_eq!(expected_unsubscription, events[2]);
         }
+        // Check that there are no more subscriptions
         assert_eq!(subnet_service.subscriptions().count(), 0);
 
         println!("{events:?}");

diff --git a/scripts/tests/doppelganger_protection.sh b/scripts/tests/doppelganger_protection.sh
@@ -71,7 +71,7 @@ if [[ "$BEHAVIOR" == "failure" ]]; then
     # This process should not last longer than 2 epochs
     vc_1_range_start=0
     vc_1_range_end=$(($KEYS_PER_NODE - 1))
-    vc_1_keys_artifact_id="1-lighthouse-geth-$vc_1_range_start-$vc_1_range_end-0"
+    vc_1_keys_artifact_id="1-lighthouse-geth-$vc_1_range_start-$vc_1_range_end"
     service_name=vc-1-doppelganger
 
     kurtosis service add \
@@ -107,7 +107,7 @@ if [[ "$BEHAVIOR" == "success" ]]; then
 
     vc_4_range_start=$(($KEYS_PER_NODE * 3))
     vc_4_range_end=$(($KEYS_PER_NODE * 4 - 1))
-    vc_4_keys_artifact_id="4-lighthouse-geth-$vc_4_range_start-$vc_4_range_end-0"
+    vc_4_keys_artifact_id="4-lighthouse-geth-$vc_4_range_start-$vc_4_range_end"
     service_name=vc-4
 
     kurtosis service add \