Skip to content

Commit 811b857

Browse files
committed
Update consensus-spec-tests to v1.6.0
1 parent 95d7087 commit 811b857

2 files changed

Lines changed: 6 additions & 13 deletions

File tree

http_api/src/standard.rs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2917,21 +2917,14 @@ pub async fn validator_block_v3<P: Preset, W: Wait>(
29172917
let version = validator_block.value.phase();
29182918
let blinded = validator_block.value.is_blinded();
29192919

2920-
// 'Uplift' validator block to signed beacon block for consensus reward calculation
2921-
let signed_beacon_block = match validator_block.value.clone() {
2922-
ValidatorBlindedBlock::BeaconBlock(beacon_block) => beacon_block.with_zero_signature(),
2923-
ValidatorBlindedBlock::BlindedBeaconBlock(blinded_block) => {
2924-
blinded_block.with_default_payload().with_zero_signature()
2925-
}
2926-
};
2927-
29282920
let consensus_block_value = block_rewards
29292921
.map(|rewards| Uint256::from_u64(rewards.total) * WEI_IN_GWEI)
29302922
.or_else(|| {
29312923
warn_with_peers!(
2932-
"unable to calculate block rewards for validator block {:?} at slot {slot}",
2933-
signed_beacon_block.message().hash_tree_root(),
2924+
"unable to calculate block rewards for validator block (blinded: {blinded}) \
2925+
at slot {slot}",
29342926
);
2927+
29352928
None
29362929
});
29372930

scripts/download_spec_tests.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
set -euo pipefail
33

4-
SPEC_VERSION="${SPEC_VERSION:-v1.6.0-beta.1}"
4+
SPEC_VERSION="${SPEC_VERSION:-v1.6.0}"
55
TESTS_DIR="consensus-spec-tests"
66
VERSION_FILE="${TESTS_DIR}/.version"
77
BASE_URL="https://github.com/ethereum/consensus-specs/releases/download/${SPEC_VERSION}"
@@ -36,7 +36,7 @@ mkdir -p "$TESTS_DIR"
3636
download_tarball() {
3737
local tarball_name="$1"
3838
local download_url="${BASE_URL}/${tarball_name}.tar.gz"
39-
39+
4040
if command -v curl >/dev/null 2>&1; then
4141
curl -fsSL "$download_url" | tar -xz -C "$TESTS_DIR"
4242
elif command -v wget >/dev/null 2>&1; then
@@ -45,7 +45,7 @@ download_tarball() {
4545
echo "Error: No download tool found. Please install curl or wget."
4646
exit 1
4747
fi
48-
48+
4949
echo "${tarball_name}.tar.gz extracted"
5050
}
5151

0 commit comments

Comments
 (0)