Skip to content

Commit e80e1d3

Browse files
committed
Rebase FOCIL onto Gloas
1 parent 92dda6f commit e80e1d3

File tree

33 files changed

+718
-1120
lines changed

33 files changed

+718
-1120
lines changed

.github/release-drafter.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,14 @@ categories:
2020
labels:
2121
- gloas
2222
- eip7732
23+
- eip7805
2324
- eip7928
2425

2526
# Features
2627
- title: EIP-6110
2728
label: eip6110
2829
- title: EIP-7441
2930
label: eip7441
30-
- title: EIP-7805
31-
label: eip7805
3231
- title: EIP-8025
3332
label: eip8025
3433

.github/workflows/checks.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ jobs:
9696
- electra
9797
- fulu
9898
- gloas
99-
- eip7805
10099
- eip7928
101100
steps:
102101
- name: Checkout repository

.github/workflows/nightly-tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ jobs:
3232
- electra
3333
- fulu
3434
- gloas
35-
- eip7805
3635
- eip7928
3736
steps:
3837
- name: Checkout repository

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ ALL_EXECUTABLE_SPEC_NAMES = \
1313
gloas \
1414
eip6800 \
1515
eip7441 \
16-
eip7805 \
1716
eip7928
1817

1918
# A list of fake targets.

configs/mainnet.yaml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@ GLOAS_FORK_EPOCH: 18446744073709551615
6161
# EIP7441
6262
EIP7441_FORK_VERSION: 0x08000000 # temporary stub
6363
EIP7441_FORK_EPOCH: 18446744073709551615
64-
# EIP7805
65-
EIP7805_FORK_VERSION: 0x0a000000 # temporary stub
66-
EIP7805_FORK_EPOCH: 18446744073709551615
6764
# EIP7928
6865
EIP7928_FORK_VERSION: 0x0b000000 # temporary stub
6966
EIP7928_FORK_EPOCH: 18446744073709551615
@@ -106,8 +103,6 @@ SYNC_MESSAGE_DUE_BPS_GLOAS: 2500
106103
CONTRIBUTION_DUE_BPS_GLOAS: 5000
107104
# 7500 basis points, 75% of SLOT_DURATION_MS
108105
PAYLOAD_ATTESTATION_DUE_BPS: 7500
109-
110-
# EIP7805
111106
# 7500 basis points, 75% of SLOT_DURATION_MS
112107
VIEW_FREEZE_CUTOFF_BPS: 7500
113108
# 6667 basis points, ~67% of SLOT_DURATION_MS
@@ -222,19 +217,17 @@ MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS: 4096
222217
# Gloas
223218
# 2**7 (= 128) payloads
224219
MAX_REQUEST_PAYLOADS: 128
220+
# 2**4 (= 16) inclusion lists
221+
MAX_REQUEST_INCLUSION_LIST: 16
222+
# 2**13 (= 8,192) bytes
223+
MAX_BYTES_PER_INCLUSION_LIST: 8192
225224

226225
# EIP7441
227226
# 2**8 (= 256) epochs
228227
EPOCHS_PER_SHUFFLING_PHASE: 256
229228
# 2**1 (= 2) epochs
230229
PROPOSER_SELECTION_GAP: 2
231230

232-
# EIP7805
233-
# 2**4 (= 16) inclusion lists
234-
MAX_REQUEST_INCLUSION_LIST: 16
235-
# 2**13 (= 8,192) bytes
236-
MAX_BYTES_PER_INCLUSION_LIST: 8192
237-
238231
# Blob Scheduling
239232
# ---------------------------------------------------------------
240233

configs/minimal.yaml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ GLOAS_FORK_EPOCH: 18446744073709551615
5757
# [customized] EIP7441
5858
EIP7441_FORK_VERSION: 0x08000001
5959
EIP7441_FORK_EPOCH: 18446744073709551615
60-
# [customized] EIP7805
61-
EIP7805_FORK_VERSION: 0x0a000001
62-
EIP7805_FORK_EPOCH: 18446744073709551615
6360
# [customized] EIP7928
6461
EIP7928_FORK_VERSION: 0x0b000001
6562
EIP7928_FORK_EPOCH: 18446744073709551615
@@ -102,8 +99,6 @@ SYNC_MESSAGE_DUE_BPS_GLOAS: 2500
10299
CONTRIBUTION_DUE_BPS_GLOAS: 5000
103100
# 7500 basis points, 75% of SLOT_DURATION_MS
104101
PAYLOAD_ATTESTATION_DUE_BPS: 7500
105-
106-
# EIP7805
107102
# 7500 basis points, 75% of SLOT_DURATION_MS
108103
VIEW_FREEZE_CUTOFF_BPS: 7500
109104
# 6667 basis points, ~67% of SLOT_DURATION_MS
@@ -219,19 +214,17 @@ MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS: 4096
219214
# Gloas
220215
# 2**7 (= 128) payloads
221216
MAX_REQUEST_PAYLOADS: 128
217+
# 2**4 (= 16) inclusion lists
218+
MAX_REQUEST_INCLUSION_LIST: 16
219+
# 2**13 (= 8,192) bytes
220+
MAX_BYTES_PER_INCLUSION_LIST: 8192
222221

223222
# EIP7441
224223
# [customized] 2**2 (= 4) epochs
225224
EPOCHS_PER_SHUFFLING_PHASE: 4
226225
# [customized] 2**0 (= 1) epochs
227226
PROPOSER_SELECTION_GAP: 1
228227

229-
# EIP7805
230-
# 2**4 (= 16) inclusion lists
231-
MAX_REQUEST_INCLUSION_LIST: 16
232-
# 2**13 (= 8,192) bytes
233-
MAX_BYTES_PER_INCLUSION_LIST: 8192
234-
235228
# Blob Scheduling
236229
# ---------------------------------------------------------------
237230

presets/mainnet/eip7805.yaml

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

presets/minimal/eip7805.yaml

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

pysetup/constants.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
GLOAS = "gloas"
1010
EIP6800 = "eip6800"
1111
EIP7441 = "eip7441"
12-
EIP7805 = "eip7805"
1312
EIP7928 = "eip7928"
1413

1514

pysetup/md_doc_paths.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
DENEB,
88
EIP6800,
99
EIP7441,
10-
EIP7805,
1110
EIP7928,
1211
ELECTRA,
1312
FULU,
@@ -26,7 +25,6 @@
2625
GLOAS: FULU,
2726
EIP6800: DENEB,
2827
EIP7441: CAPELLA,
29-
EIP7805: FULU,
3028
EIP7928: FULU,
3129
}
3230

0 commit comments

Comments
 (0)