Skip to content

Updating ref test to 1.5.0 stable #9398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lucassaldanha merged 4 commits into from
May 8, 2025
Merged

Updating ref test to 1.5.0 stable #9398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a10aa2a
Updating ref test to 1.5.0 stable
lucassaldanha May 7, 2025
4e9301a
Updating minimal/swift values
lucassaldanha May 7, 2025
e3bfae3
Fix
lucassaldanha May 8, 2025
30721dd
Fix
lucassaldanha May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ allprojects {
}

def nightly = System.getenv("NIGHTLY") != null
def refTestVersion = nightly ? "nightly" : "v1.5.0-beta.5"
def refTestVersion = nightly ? "nightly" : "v1.5.0"
def blsRefTestVersion = 'v0.1.2'
def slashingProtectionInterchangeRefTestVersion = 'v5.3.0'
def refTestBaseUrl = 'https://github.com/ethereum/consensus-spec-tests/releases/download'
Expand Down
5 changes: 1 addition & 4 deletions ...ntegration-test/java/tech/pegasys/teku/beaconrestapi/v3/GetNewBlockV3IntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import static tech.pegasys.teku.infrastructure.unsigned.UInt64.ONE;
import static tech.pegasys.teku.spec.SpecMilestone.BELLATRIX;
import static tech.pegasys.teku.spec.SpecMilestone.DENEB;
import static tech.pegasys.teku.spec.SpecMilestone.FULU;

import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.io.Resources;
Expand Down Expand Up @@ -56,9 +55,7 @@
import tech.pegasys.teku.spec.datastructures.metadata.BlockContainerAndMetaData;
import tech.pegasys.teku.spec.util.DataStructureUtil;

@TestSpecContext(
allMilestones = true,
ignoredMilestones = FULU) // TODO-fulu eventually we remove this ignore
@TestSpecContext(allMilestones = true)
public class GetNewBlockV3IntegrationTest extends AbstractDataBackedRestAPIIntegrationTest {

private DataStructureUtil dataStructureUtil;
Expand Down
397 changes: 397 additions & 0 deletions ...rc/integration-test/resources/tech/pegasys/teku/beaconrestapi/v3/newBlindedBlockFULU.json
View file
Open in desktop

Large diffs are not rendered by default.

439 changes: 439 additions & 0 deletions ...c/integration-test/resources/tech/pegasys/teku/beaconrestapi/v3/newBlockContentsFULU.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions ...src/referenceTest/java/tech/pegasys/teku/reference/phase0/ssz_static/SszTestExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ public class SszTestExecutor<T extends SszData> implements TestExecutor {
schemas ->
SchemaDefinitionsAltair.required(schemas)
.getSyncAggregatorSelectionDataSchema()))
// TODO-fulu remove ignore after we add DataColumnsByRootIdentifier container
.put("ssz_static/DataColumnsByRootIdentifier", IGNORE_TESTS)
.put("ssz_static/LightClientBootstrap", IGNORE_TESTS)
.put("ssz_static/LightClientFinalityUpdate", IGNORE_TESTS)
.put("ssz_static/LightClientHeader", IGNORE_TESTS)
Expand Down
8 changes: 4 additions & 4 deletions ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/minimal/electra.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD: 2

# Execution
# ---------------------------------------------------------------
# [customized]
MAX_DEPOSIT_REQUESTS_PER_PAYLOAD: 4
# [customized] 2**1 (= 2) withdrawal requests
MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD: 2
# 2**13 (= 8,192) deposit requests
MAX_DEPOSIT_REQUESTS_PER_PAYLOAD: 8192
# 2**4 (= 16) withdrawal requests
MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD: 16

# Withdrawals processing
# ---------------------------------------------------------------
Expand Down
8 changes: 4 additions & 4 deletions ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/swift/electra.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD: 2

# Execution
# ---------------------------------------------------------------
# [customized]
MAX_DEPOSIT_REQUESTS_PER_PAYLOAD: 4
# [customized] 2**1 (= 2) withdrawal requests
MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD: 2
# 2**13 (= 8,192) deposit requests
MAX_DEPOSIT_REQUESTS_PER_PAYLOAD: 8192
# 2**4 (= 16) withdrawal requests
MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD: 16

# Withdrawals processing
# ---------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions fuzz/src/test/java/tech/pegasys/teku/fuzz/FuzzUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@

class FuzzUtilTest {

// TODO-fulu Upgrade to use Fulu state/block etc.
private final Spec spec = TestSpecFactory.createMinimalElectra();
private final SpecVersion specVersion = spec.forMilestone(SpecMilestone.ELECTRA);
private final SchemaDefinitionsElectra schemaDefinitions =
Expand Down
Binary file modified ...esources/minimal/operations/block_header/pyspec_tests/basic_block_header/block.ssz_snappy
View file
Open in desktop
Binary file not shown.
Binary file modified ...resources/minimal/operations/block_header/pyspec_tests/basic_block_header/post.ssz_snappy
View file
Open in desktop
Binary file not shown.
Binary file modified .../resources/minimal/operations/block_header/pyspec_tests/basic_block_header/pre.ssz_snappy
View file
Open in desktop
Binary file not shown.
Binary file modified fuzz/src/test/resources/minimal/sanity/blocks/pyspec_tests/attestation/blocks_0.ssz_snappy
View file
Open in desktop
Binary file not shown.
Binary file modified fuzz/src/test/resources/minimal/sanity/blocks/pyspec_tests/attestation/blocks_1.ssz_snappy
View file
Open in desktop
Binary file not shown.
Binary file modified fuzz/src/test/resources/minimal/sanity/blocks/pyspec_tests/attestation/post.ssz_snappy
View file
Open in desktop
Binary file not shown.
Binary file modified fuzz/src/test/resources/minimal/sanity/blocks/pyspec_tests/attestation/pre.ssz_snappy
View file
Open in desktop
Binary file not shown.
4 changes: 1 addition & 3 deletions ...est/java/tech/pegasys/teku/validator/remote/typedef/handlers/ProduceBlockRequestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import static tech.pegasys.teku.infrastructure.unsigned.UInt64.ONE;
import static tech.pegasys.teku.spec.SpecMilestone.BELLATRIX;
import static tech.pegasys.teku.spec.SpecMilestone.DENEB;
import static tech.pegasys.teku.spec.SpecMilestone.FULU;

import com.google.common.net.MediaType;
import java.util.Optional;
Expand All @@ -49,8 +48,7 @@
import tech.pegasys.teku.spec.schemas.SchemaDefinitionCache;
import tech.pegasys.teku.validator.remote.typedef.AbstractTypeDefRequestTestBase;

// TODO-fulu stop ignoring FULU after Electra release
@TestSpecContext(allMilestones = true, ignoredMilestones = FULU, network = Eth2Network.MINIMAL)
@TestSpecContext(allMilestones = true, network = Eth2Network.MINIMAL)
public class ProduceBlockRequestTest extends AbstractTypeDefRequestTestBase {

private ProduceBlockRequest request;
Expand Down
40 changes: 23 additions & 17 deletions ...src/integration-test/resources/responses/produce_block_responses/newBlindedBlockFULU.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,37 +352,43 @@
"blob_kzg_commitments": [
"0x36d44642cfa8a73b4c27b317e2d9bff5469b1cbe5c05d35f4b2286f9dd9a1da1edf7f9ff3b52088c513683aed613efc8",
"0x49f540426ff48680416a1a43b562d4c24d9e1b5012cefb1979a3c9c1b8fbd42b8517c05e35b3e879984ec65a9ddb52af",
"0xa99a23428f6ee3d80bb91e1cd80e3bc46cad162aa2b9c7bc5e291babfcdf69e17bb59e3819984a1ffcc715b881c2452f"
"0xa99a23428f6ee3d80bb91e1cd80e3bc46cad162aa2b9c7bc5e291babfcdf69e17bb59e3819984a1ffcc715b881c2452f",
"0xbcbb1d422fbac21d01fc8547ab974f9172b015bc5882f0768caa5e73d640216c13d5649714f92a0d43e05864498aa915",
"0x83582f424fd7244f213350c530fd112a5fa71806352876480227941a471efbcb4c76127b24d689436e978f5ff3327e62",
"0x96792942ef2204941676b7f0048626f766aa1798ecf09e0230a8d7e2217fb256e395d8d91f376a31b5afd20bbafae148",
"0x594150410d114a888823a4369a4c1e9b4d1af3b146f383eace5399d4b17e3363cc267b8c513bd892003285f184da4d95",
"0x6c624a41ad5c29cd7d660b626ed53268531df243fdbbaca4fbd4dc9c8cdfeaed644641eb4c9cb880484ac89d4ba2b17b",
"0x32ff5b41cd798bfe9d9dd5dff33af5004014f58dda61327672511244fcbcc44d9de7eece5c7917b77201ff98f64a86c8"
],
"execution_requests": {
"deposits": [
{
"pubkey": "0x82265d267f8473b8b95581d5cff9b19c81ca410538259c96c7418ef433e3c0a89d8ce7f7b91dc0789ceddd7e5f8f1f45",
"withdrawal_credentials": "0x010000000000000000000000594150410d114a888823a4369a4c1e9b4d1af3b1",
"amount": "4704680975884967085",
"signature": "0xb710f44c80db8d91f996614df20b5e9293a578f28f55e4cd65f017063fa9e36eead8417ff871fda70f6f8238fa906376066788d928178215cf5b285a0630956453a2b53fd2ecdd614e247a7c89502de682385310134924ee896501d9a1a5265a",
"index": "4707985942318335341"
},
{
"pubkey": "0xaacb0e7f3717c59e23c32cb07ce03be33c2bb8366da2d27a9954b77f2c9198a1b5f3aea585faffcdfa4800b592c4d5d8",
"withdrawal_credentials": "0x0100000000000000000000007f8344414da8081272a9728d415e47355920f1d5",
"amount": "4701376009451598829",
"index": "4691461101561559469",
"pubkey": "0xaacb0e7f3717c59e23c32cb07ce03be33c2bb8366da2d27a9954b77f2c9198a1b5f3aea585faffcdfa4800b592c4d5d8",
"signature": "0xa9bf2689fe47ca9ac1fb90da3b08259115adab480b4f387669f209ee7747f7451af8f61e4a9c057bc33ffc18f0b08c3407be0a59b8c61c741572f5d28e2a1f6af0fc17db7c3f48901c9267606c3d7831a3d3647b885946fc95fb5689d24f7b8d",
"index": "4691461101561559469"
"withdrawal_credentials": "0x0100000000000000000000007f8344414da8081272a9728d415e47355920f1d5"
},
{
"amount": "4684851168694822957",
"index": "4688156139423158509",
"pubkey": "0xb8fa03e47468016f15b89212a91f203194684e0cbbac07b6cd428fc7e10cb7d8a363985b46972eedd7bc434fc701c4b3",
"signature": "0xa529495633ab9ab138c0756646074fc7753fafbb44389490ddd46048f29267f6b85e46abbc1fe71c42fc98513ed0f6f800ebc9eaa04b484e29af7d7bb0c38b5e088435aee8583a812545b3057c184a4634957604ec0647d1fa81da2d15a5f198",
"withdrawal_credentials": "0x0100000000000000000000003ece09418d9cc1c206477b3f86b61438983ee789"
}
],
"withdrawals": [
{
"source_address": "0x3ece09418d9cc1c206477b3f86b61438983ee789",
"validator_pubkey": "0xb7fbe0486f002e790bb3d674b4259c18c6bf66510576e381e128aee6c2de771d3d5c9dda65b4078b058b2667f30e1637",
"amount": "4689808622639842637"
"amount": "4726163266291795342",
"source_address": "0x01eeb941cebf96b04a6e6129b9adac2fdce3046e",
"validator_pubkey": "0x97995c0a4cf28bb77bfea20753ecd1e3b3469492921c9542d99a1e81355f6d09ea4cbcb35e3b8f1240e8261d20da657b"
}
],
"consolidations": [
{
"source_address": "0x3a51a841aea2347f293797ab3448ea96efec0124",
"source_pubkey": "0x88f8fa6c349ee56559e614799a5788c17fdcde24ea5922a7c7fe6bed8df5c0140aeebbb46d0cadc7a9107e98344194f1",
"target_pubkey": "0x97995c0a4cf28bb77bfea20753ecd1e3b3469492921c9542d99a1e81355f6d09ea4cbcb35e3b8f1240e8261d20da657b"
"source_address": "0x60939c41ee39f30814bd6502db591331fcf2ff47",
"source_pubkey": "0xa4a90125ab79fbbe706de307f1de84a6b0dc21adef413c6a5e91ab58e575164bd13c0517a318394a56adab9326607e82",
"target_pubkey": "0x83feea64397a7a9d3fbac0b9a16ccbfd63c4d4fa5d0fd8bbfa13739148e752ce1e9b1e01654b56cb56a196fd8d64db3f"
}
]
}
Expand Down
80 changes: 49 additions & 31 deletions ...rc/integration-test/resources/responses/produce_block_responses/newBlockContentsFULU.json
View file
Open in desktop

Large diffs are not rendered by default.