Skip to content
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

FOCIL #8946

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

FOCIL #8946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
024e4ed
focil spec config (#8945)
mehdi-aouadi Dec 20, 2024
3bfcc59
Merge branch 'master' into focil
mehdi-aouadi Dec 20, 2024
79c59d0
fix spotless (#8947)
mehdi-aouadi Dec 20, 2024
f0f3f50
8944 focil spec config (#8948)
mehdi-aouadi Dec 20, 2024
2aef737
8944 focil spec config (#8949)
mehdi-aouadi Dec 20, 2024
6bff8e9
Merge branch 'master' into focil
mehdi-aouadi Jan 8, 2025
92ae93d
fix focil spec loader (#8973)
mehdi-aouadi Jan 8, 2025
b1a1f4d
8944 focil spec config (#8977)
mehdi-aouadi Jan 9, 2025
9eff8eb
8944 focil spec config (#8978)
mehdi-aouadi Jan 9, 2025
9f1c122
fix assemble (#8979)
mehdi-aouadi Jan 9, 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
6 changes: 6 additions & 0 deletions ...e-test/java/tech/pegasys/teku/test/acceptance/MergedGenesisInteropModeAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,12 @@ private static TekuNodeConfigBuilder createTekuNodeBuilderForMilestone(
tekuNodeConfigBuilder.withDenebEpoch(UInt64.ZERO);
tekuNodeConfigBuilder.withElectraEpoch(UInt64.ZERO);
break;
case EIP7805:
tekuNodeConfigBuilder.withCapellaEpoch(UInt64.ZERO);
tekuNodeConfigBuilder.withDenebEpoch(UInt64.ZERO);
tekuNodeConfigBuilder.withElectraEpoch(UInt64.ZERO);
tekuNodeConfigBuilder.withEip7805Epoch(UInt64.ZERO);
break;
default:
// Test will reach this whenever a new milestone is added and isn't mapped on the switch.
// This is a way to force us to always remember to validate that a new milestone can start
Expand Down
12 changes: 12 additions & 0 deletions ...ts/src/testFixtures/java/tech/pegasys/teku/test/acceptance/dsl/TekuNodeConfigBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,18 @@ public TekuNodeConfigBuilder withElectraEpoch(final UInt64 electraForkEpoch) {
return this;
}

public TekuNodeConfigBuilder withEip7805Epoch(final UInt64 eip7805ForkEpoch) {
mustBe(NodeType.BEACON_NODE);
LOG.debug("Xnetwork-eip7805-fork-epoch={}", eip7805ForkEpoch);
configMap.put("Xnetwork-eip7805-fork-epoch", eip7805ForkEpoch.toString());
specConfigModifier =
specConfigModifier.andThen(
specConfigBuilder ->
specConfigBuilder.eip7805Builder(
eip7805Builder -> eip7805Builder.eip7805ForkEpoch(eip7805ForkEpoch)));
return this;
}

public TekuNodeConfigBuilder withTrustedSetupFromClasspath(final String trustedSetup)
throws Exception {
mustBe(NodeType.BEACON_NODE);
Expand Down
2 changes: 1 addition & 1 deletion ...resources/tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v1_beacon_blinded_blocks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"in" : "header",
"schema" : {
"type" : "string",
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ],
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7805" ],
"description" : "Version of the block being submitted, if using SSZ encoding."
}
} ],
Expand Down
3 changes: 2 additions & 1 deletion ...ech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v1_beacon_blinded_blocks_{block_id}.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"bellatrix",
"capella",
"deneb",
"electra"
"electra",
"eip7805"
],
"example": "phase0"
}
Expand Down
3 changes: 2 additions & 1 deletion ...tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v1_beacon_blob_sidecars_{block_id}.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
"bellatrix",
"capella",
"deneb",
"electra"
"electra",
"eip7805"
],
"example": "phase0"
}
Expand Down
2 changes: 1 addition & 1 deletion ...on-test/resources/tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v1_beacon_blocks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"in" : "header",
"schema" : {
"type" : "string",
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ],
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7805" ],
"description" : "Version of the block being submitted, if using SSZ encoding."
}
} ],
Expand Down
3 changes: 2 additions & 1 deletion ...ces/tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v1_beacon_light_client_updates.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@
"bellatrix",
"capella",
"deneb",
"electra"
"electra",
"eip7805"
]
},
"data": {
Expand Down
2 changes: 1 addition & 1 deletion ...resources/tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v2_beacon_blinded_blocks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"in" : "header",
"schema" : {
"type" : "string",
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ],
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7805" ],
"description" : "Version of the block being submitted."
}
} ],
Expand Down
2 changes: 1 addition & 1 deletion ...on-test/resources/tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v2_beacon_blocks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"in" : "header",
"schema" : {
"type" : "string",
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ],
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7805" ],
"description" : "Version of the block being submitted."
}
} ],
Expand Down
3 changes: 2 additions & 1 deletion ...egasys/teku/beaconrestapi/beacon/paths/_eth_v2_beacon_blocks_{block_id}_attestations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"bellatrix",
"capella",
"deneb",
"electra"
"electra",
"eip7805"
],
"example": "phase0"
}
Expand Down
5 changes: 3 additions & 2 deletions ...ources/tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v2_beacon_pool_attestations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
"bellatrix",
"capella",
"deneb",
"electra"
"electra",
"eip7805"
],
"example": "phase0"
}
Expand Down Expand Up @@ -85,7 +86,7 @@
"in" : "header",
"schema" : {
"type" : "string",
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ],
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7805" ],
"description" : "Version of the attestations being submitted."
}
} ],
Expand Down
5 changes: 3 additions & 2 deletions .../tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v2_beacon_pool_attester_slashings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
"bellatrix",
"capella",
"deneb",
"electra"
"electra",
"eip7805"
],
"example": "phase0"
}
Expand Down Expand Up @@ -66,7 +67,7 @@
"in" : "header",
"schema" : {
"type" : "string",
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ],
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7805" ],
"description" : "Version of the attester slashing being submitted."
}
} ],
Expand Down
3 changes: 2 additions & 1 deletion .../tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v2_debug_beacon_states_{state_id}.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"bellatrix",
"capella",
"deneb",
"electra"
"electra",
"eip7805"
],
"example": "phase0"
}
Expand Down
2 changes: 1 addition & 1 deletion .../tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v2_validator_aggregate_and_proofs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"in" : "header",
"schema" : {
"type" : "string",
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ],
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7805" ],
"description" : "Version of the aggregate and proofs being submitted."
}
} ],
Expand Down
3 changes: 2 additions & 1 deletion ...tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v2_validator_aggregate_attestation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@
"bellatrix",
"capella",
"deneb",
"electra"
"electra",
"eip7805"
],
"example": "phase0"
}
Expand Down
3 changes: 2 additions & 1 deletion ...sources/tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v3_validator_blocks_{slot}.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@
"bellatrix",
"capella",
"deneb",
"electra"
"electra",
"eip7805"
],
"example": "phase0"
}
Expand Down
2 changes: 1 addition & 1 deletion ...ces/tech/pegasys/teku/beaconrestapi/beacon/schema/GetAggregatedAttestationResponseV2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"properties" : {
"version" : {
"type" : "string",
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ]
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7805" ]
},
"data" : {
"type" : "object",
Expand Down
2 changes: 1 addition & 1 deletion ...t/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/GetAllBlocksAtSlotResponse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"properties" : {
"version" : {
"type" : "string",
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ]
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7805" ]
},
"data" : {
"type" : "array",
Expand Down
2 changes: 1 addition & 1 deletion ...test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/GetBlindedBlockResponse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"properties" : {
"version" : {
"type" : "string",
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ]
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7805" ]
},
"execution_optimistic" : {
"type" : "boolean"
Expand Down
2 changes: 1 addition & 1 deletion ...test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/GetBlobSidecarsResponse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"properties" : {
"version" : {
"type" : "string",
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ]
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7805" ]
},
"execution_optimistic" : {
"type" : "boolean"
Expand Down
2 changes: 1 addition & 1 deletion ...sources/tech/pegasys/teku/beaconrestapi/beacon/schema/GetBlockAttestationsResponseV2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"version" : {
"type" : "string",
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ]
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7805" ]
},
"data" : {
"type" : "object",
Expand Down
2 changes: 1 addition & 1 deletion ...tion-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/GetBlockV2Response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"properties" : {
"version" : {
"type" : "string",
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ]
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7805" ]
},
"execution_optimistic" : {
"type" : "boolean"
Expand Down
2 changes: 1 addition & 1 deletion ...ources/tech/pegasys/teku/beaconrestapi/beacon/schema/GetLightClientBootstrapResponse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"properties" : {
"version" : {
"type" : "string",
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ]
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7805" ]
},
"data" : {
"$ref" : "#/components/schemas/LightClientBootstrap"
Expand Down
2 changes: 1 addition & 1 deletion ...esources/tech/pegasys/teku/beaconrestapi/beacon/schema/GetPoolAttestationsV2Response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"properties" : {
"version" : {
"type" : "string",
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ]
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7805" ]
},
"data" : {
"type" : "array",
Expand Down
2 changes: 1 addition & 1 deletion ...ces/tech/pegasys/teku/beaconrestapi/beacon/schema/GetPoolAttesterSlashingsV2Response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"properties" : {
"version" : {
"type" : "string",
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ]
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7805" ]
},
"data" : {
"type" : "object",
Expand Down
2 changes: 1 addition & 1 deletion ...tion-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/GetStateV2Response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"properties" : {
"version" : {
"type" : "string",
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ]
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7805" ]
},
"execution_optimistic" : {
"type" : "boolean"
Expand Down
2 changes: 1 addition & 1 deletion ...-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/ProduceBlockV3Response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"properties" : {
"version" : {
"type" : "string",
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ]
"enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7805" ]
},
"execution_payload_blinded" : {
"type" : "boolean"
Expand Down
Loading
Loading