Skip to content

Commit 8e8930c

Browse files
committed
Merge branch 'dev' into upgrade-to-electra-tests
2 parents cdfe808 + 60cd223 commit 8e8930c

File tree

3 files changed

+1
-101
lines changed

3 files changed

+1
-101
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Features are researched and developed in parallel, and then consolidated into se
2727

2828
| Seq. | Code Name | Fork Epoch | Specs |
2929
| - | - | - | - |
30-
| 5 | **Electra** | TBD | <ul><li>Core</li><ul><li>[Beacon Chain changes](specs/electra/beacon-chain.md)</li><li>[Electra fork](specs/electra/fork.md)</li></ul><li>Additions</li><ul><li>[Light client sync protocol changes](specs/electra/light-client/sync-protocol.md) ([fork](specs/electra/light-client/fork.md), [full node](specs/electra/light-client/full-node.md), [networking](specs/electra/light-client/p2p-interface.md))</li><li>[Honest validator guide changes](specs/electra/validator.md)</li><li>[P2P networking](specs/electra/p2p-interface.md)</li></ul></ul> |
30+
| 5 | **Electra** | TBD | <ul><li>Core</li><ul><li>[Beacon Chain changes](specs/electra/beacon-chain.md)</li><li>[Electra fork](specs/electra/fork.md)</li></ul><li>Additions</li><ul><li>[Light client sync protocol changes](specs/electra/light-client/sync-protocol.md) ([fork](specs/electra/light-client/fork.md), [networking](specs/electra/light-client/p2p-interface.md))</li><li>[Honest validator guide changes](specs/electra/validator.md)</li><li>[P2P networking](specs/electra/p2p-interface.md)</li></ul></ul> |
3131

3232
### Outdated Specifications
3333

specs/electra/light-client/full-node.md

Lines changed: 0 additions & 74 deletions
This file was deleted.

specs/electra/light-client/sync-protocol.md

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
- [Modified `current_sync_committee_gindex_at_slot`](#modified-current_sync_committee_gindex_at_slot)
1919
- [Modified `next_sync_committee_gindex_at_slot`](#modified-next_sync_committee_gindex_at_slot)
2020
- [Modified `get_lc_execution_root`](#modified-get_lc_execution_root)
21-
- [Modified `is_valid_light_client_header`](#modified-is_valid_light_client_header)
2221

2322
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
2423
<!-- /TOC -->
@@ -152,28 +151,3 @@ def get_lc_execution_root(header: LightClientHeader) -> Root:
152151

153152
return Root()
154153
```
155-
156-
### Modified `is_valid_light_client_header`
157-
158-
```python
159-
def is_valid_light_client_header(header: LightClientHeader) -> bool:
160-
epoch = compute_epoch_at_slot(header.beacon.slot)
161-
162-
if epoch < DENEB_FORK_EPOCH:
163-
if header.execution.blob_gas_used != uint64(0) or header.execution.excess_blob_gas != uint64(0):
164-
return False
165-
166-
if epoch < CAPELLA_FORK_EPOCH:
167-
return (
168-
header.execution == ExecutionPayloadHeader()
169-
and header.execution_branch == ExecutionBranch()
170-
)
171-
172-
return is_valid_merkle_branch(
173-
leaf=get_lc_execution_root(header),
174-
branch=header.execution_branch,
175-
depth=floorlog2(EXECUTION_PAYLOAD_GINDEX),
176-
index=get_subtree_index(EXECUTION_PAYLOAD_GINDEX),
177-
root=header.beacon.body_root,
178-
)
179-
```

0 commit comments

Comments
 (0)