Skip to content

fix: outstanding ssz issues after #1430 #1432

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
merged 5 commits into from
Apr 16, 2025
Merged

fix: outstanding ssz issues after #1430 #1432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fb9a4c5
Added missing schemas to the match_schema macro
rodrigo-o Apr 15, 2025
a3cc4bb
Some minor fixes to types
rodrigo-o Apr 15, 2025
e820129
Fix some blob sidecar related configs and move others to the correct …
rodrigo-o Apr 15, 2025
2b6614f
Merge branch 'electra-support' into fix-outstanding-ssz-issues
rodrigo-o Apr 15, 2025
2a50593
Fixed MaxBlobCommitmentsPerBlock value for minimal
rodrigo-o Apr 15, 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: 4 additions & 2 deletions config/networks/mainnet/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,14 @@ ATTESTATION_SUBNET_PREFIX_BITS: 6
# Deneb
# `2**7` (=128)
MAX_REQUEST_BLOCKS_DENEB: 128
# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK
MAX_REQUEST_BLOB_SIDECARS: 768
# `2**12` (= 4096 epochs, ~18 days)
MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
# `6`
BLOB_SIDECAR_SUBNET_COUNT: 6
## 6 blobs
MAX_BLOBS_PER_BLOCK: 6
# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK (= 128 * 6) sidecars
MAX_REQUEST_BLOB_SIDECARS: 768

# Whisk
# `Epoch(2**8)`
Expand Down
6 changes: 4 additions & 2 deletions config/networks/minimal/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,14 @@ ATTESTATION_SUBNET_PREFIX_BITS: 6
# Deneb
# `2**7` (=128)
MAX_REQUEST_BLOCKS_DENEB: 128
# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK
MAX_REQUEST_BLOB_SIDECARS: 768
# `2**12` (= 4096 epochs, ~18 days)
MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
# `6`
BLOB_SIDECAR_SUBNET_COUNT: 6
## 6 blobs
MAX_BLOBS_PER_BLOCK: 6
# MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK (= 128 * 6) sidecars
MAX_REQUEST_BLOB_SIDECARS: 768

# Whisk
WHISK_EPOCHS_PER_SHUFFLING_PHASE: 4
Expand Down
8 changes: 3 additions & 5 deletions config/presets/minimal/deneb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
# `uint64(4096)`
FIELD_ELEMENTS_PER_BLOB: 4096
# [customized]
MAX_BLOB_COMMITMENTS_PER_BLOCK: 16
# `uint64(6)`
MAX_BLOBS_PER_BLOCK: 6
# [customized] `floorlog2(get_generalized_index(BeaconBlockBody, 'blob_kzg_commitments')) + 1 + ceillog2(MAX_BLOB_COMMITMENTS_PER_BLOCK)` = 4 + 1 + 4 = 9
KZG_COMMITMENT_INCLUSION_PROOF_DEPTH: 9
MAX_BLOB_COMMITMENTS_PER_BLOCK: 32
# [customized] floorlog2(get_generalized_index(BeaconBlockBody, 'blob_kzg_commitments')) + 1 + ceillog2(MAX_BLOB_COMMITMENTS_PER_BLOCK) (= 4 + 1 + 5 = 10)
KZG_COMMITMENT_INCLUSION_PROOF_DEPTH: 10
2 changes: 1 addition & 1 deletion lib/types/beacon_chain/beacon_block_body.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ defmodule Types.BeaconBlockBody do
# max MAX_DEPOSITS
deposits: list(Types.Deposit.t()),
# max MAX_VOLUNTARY_EXITS
voluntary_exits: list(Types.VoluntaryExit.t()),
voluntary_exits: list(Types.SignedVoluntaryExit.t()),
sync_aggregate: Types.SyncAggregate.t(),
execution_payload: Types.ExecutionPayload.t(),
# max MAX_BLS_TO_EXECUTION_CHANGES
Expand Down
4 changes: 2 additions & 2 deletions native/ssz_nif/src/ssz_types/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ impl Config for Minimal {
type SyncCommitteeSize = U32;
type MaxWithdrawalsPerPayload = U4;
type FieldElementsPerBlob = U4096;
type MaxBlobCommitmentsPerBlock = U16;
type KzgCommitmentInclusionProofDepth = U9;
type MaxBlobCommitmentsPerBlock = U32;
type KzgCommitmentInclusionProofDepth = U10;
type MaxCommitteesPerSlot = U4;
// Electra added fields
type MaxDepositRequestsPerPayload = U4;
Expand Down
Loading