mirror of
https://github.com/sigp/lighthouse.git
synced 2026-05-07 16:55:46 +00:00
resolve merge conflicts
This commit is contained in:
@@ -136,9 +136,11 @@ MAX_REQUEST_BLOB_SIDECARS: 768
|
||||
MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 16384
|
||||
# `6`
|
||||
BLOB_SIDECAR_SUBNET_COUNT: 6
|
||||
# `uint64(6)`
|
||||
MAX_BLOBS_PER_BLOCK: 6
|
||||
|
||||
# DAS
|
||||
CUSTODY_REQUIREMENT: 4
|
||||
DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
|
||||
NUMBER_OF_COLUMNS: 128
|
||||
SAMPLES_PER_SLOT: 8
|
||||
SAMPLES_PER_SLOT: 8
|
||||
|
||||
@@ -119,9 +119,11 @@ MAX_REQUEST_BLOB_SIDECARS: 768
|
||||
MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 16384
|
||||
# `6`
|
||||
BLOB_SIDECAR_SUBNET_COUNT: 6
|
||||
# `uint64(6)`
|
||||
MAX_BLOBS_PER_BLOCK: 6
|
||||
|
||||
# DAS
|
||||
CUSTODY_REQUIREMENT: 4
|
||||
DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
|
||||
NUMBER_OF_COLUMNS: 128
|
||||
SAMPLES_PER_SLOT: 8
|
||||
SAMPLES_PER_SLOT: 8
|
||||
|
||||
@@ -123,9 +123,11 @@ MAX_REQUEST_BLOB_SIDECARS: 768
|
||||
MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
|
||||
# `6`
|
||||
BLOB_SIDECAR_SUBNET_COUNT: 6
|
||||
# `uint64(6)`
|
||||
MAX_BLOBS_PER_BLOCK: 6
|
||||
|
||||
# DAS
|
||||
CUSTODY_REQUIREMENT: 4
|
||||
DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
|
||||
NUMBER_OF_COLUMNS: 128
|
||||
SAMPLES_PER_SLOT: 8
|
||||
SAMPLES_PER_SLOT: 8
|
||||
|
||||
@@ -145,9 +145,11 @@ MAX_REQUEST_BLOB_SIDECARS: 768
|
||||
MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
|
||||
# `6`
|
||||
BLOB_SIDECAR_SUBNET_COUNT: 6
|
||||
# `uint64(6)`
|
||||
MAX_BLOBS_PER_BLOCK: 6
|
||||
|
||||
# DAS
|
||||
CUSTODY_REQUIREMENT: 4
|
||||
DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
|
||||
NUMBER_OF_COLUMNS: 128
|
||||
SAMPLES_PER_SLOT: 8
|
||||
SAMPLES_PER_SLOT: 8
|
||||
|
||||
@@ -119,9 +119,11 @@ MAX_REQUEST_BLOB_SIDECARS: 768
|
||||
MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
|
||||
# `6`
|
||||
BLOB_SIDECAR_SUBNET_COUNT: 6
|
||||
# `uint64(6)`
|
||||
MAX_BLOBS_PER_BLOCK: 6
|
||||
|
||||
# DAS
|
||||
CUSTODY_REQUIREMENT: 4
|
||||
DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
|
||||
NUMBER_OF_COLUMNS: 128
|
||||
SAMPLES_PER_SLOT: 8
|
||||
SAMPLES_PER_SLOT: 8
|
||||
|
||||
Reference in New Issue
Block a user