status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

use consensus spec v1.4.0-beta.3 test vectors (#5512)

This commit is contained in:
tersec 2023-10-19 05:14:02 +00:00 committed by GitHub
parent d52e8165d5
commit 9fd52ebe9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
beacon_chain/conf.nim
View File

@ -1454,15 +1454,9 @@ proc engineApiUrls*(config: BeaconNodeConf): seq[EngineApiUrl] =
proc loadKzgTrustedSetup*(): Result[void, string] = proc loadKzgTrustedSetup*(): Result[void, string] =
const const
vendorDir = currentSourcePath.parentDir.replace('\\', '/') & "/../vendor" vendorDir = currentSourcePath.parentDir.replace('\\', '/') & "/../vendor"
trustedSetupDir = vendorDir & "/nim-kzg4844/kzg4844/csources/src" trustedSetup = staticRead(
vendorDir & "/nim-kzg4844/kzg4844/csources/src/trusted_setup.txt")
const trustedSetup =
when const_preset == "mainnet":
staticRead trustedSetupDir & "/trusted_setup.txt"
elif const_preset == "minimal":
staticRead trustedSetupDir & "/trusted_setup_4.txt"
else:
""
if const_preset == "mainnet" or const_preset == "minimal": if const_preset == "mainnet" or const_preset == "minimal":
Kzg.loadTrustedSetupFromString(trustedSetup) Kzg.loadTrustedSetupFromString(trustedSetup)
else: else:

2
beacon_chain/spec/datatypes/base.nim
View File

@ -74,7 +74,7 @@ export
tables, results, json_serialization, timer, sszTypes, beacon_time, crypto, tables, results, json_serialization, timer, sszTypes, beacon_time, crypto,
digest, presets digest, presets
const SPEC_VERSION* = "1.4.0-beta.2-hotfix" const SPEC_VERSION* = "1.4.0-beta.3"
## Spec version we're aiming to be compatible with, right now ## Spec version we're aiming to be compatible with, right now
const const

4
beacon_chain/spec/presets/minimal/deneb_preset.nim
View File

@ -6,10 +6,10 @@
# at your option. This file may not be copied, modified, or distributed except according to those terms. # at your option. This file may not be copied, modified, or distributed except according to those terms.
# Minimal preset - Deneb # Minimal preset - Deneb
# https://github.com/ethereum/consensus-specs/blob/v1.4.0-beta.2/presets/minimal/deneb.yaml # https://github.com/ethereum/consensus-specs/blob/v1.4.0-beta.3/presets/minimal/deneb.yaml
const const
# [customized] # [customized]
FIELD_ELEMENTS_PER_BLOB*: uint64 = 4 FIELD_ELEMENTS_PER_BLOB*: uint64 = 4096
# [customized] # [customized]
MAX_BLOB_COMMITMENTS_PER_BLOCK*: uint64 = 16 MAX_BLOB_COMMITMENTS_PER_BLOCK*: uint64 = 16
# `uint64(6)` # `uint64(6)`

4
scripts/launch_local_testnet.sh
View File

@ -398,11 +398,9 @@ openssl rand -hex 32 | tr -d "\n" > "${JWT_FILE}"
if [[ "$CONST_PRESET" == "minimal" ]]; then if [[ "$CONST_PRESET" == "minimal" ]]; then
SECONDS_PER_SLOT=6 SECONDS_PER_SLOT=6
SLOTS_PER_EPOCH=8 SLOTS_PER_EPOCH=8
FIELD_ELEMENTS_PER_BLOB=4
else else
SECONDS_PER_SLOT=12 SECONDS_PER_SLOT=12
SLOTS_PER_EPOCH=32 SLOTS_PER_EPOCH=32
FIELD_ELEMENTS_PER_BLOB=4096
fi fi
VALIDATORS_DIR="${DATA_DIR}/validators" VALIDATORS_DIR="${DATA_DIR}/validators"
@ -712,7 +710,7 @@ done
if [[ "${REUSE_BINARIES}" == "0" || "${BINARIES_MISSING}" == "1" ]]; then if [[ "${REUSE_BINARIES}" == "0" || "${BINARIES_MISSING}" == "1" ]]; then
log "Rebuilding binaries ${BINARIES}" log "Rebuilding binaries ${BINARIES}"
${MAKE} -j ${NPROC} LOG_LEVEL=TRACE NIMFLAGS="${NIMFLAGS} -d:local_testnet -d:const_preset=${CONST_PRESET} -d:web3_consensus_const_preset=${CONST_PRESET} -d:FIELD_ELEMENTS_PER_BLOB=${FIELD_ELEMENTS_PER_BLOB}" ${BINARIES} ${MAKE} -j ${NPROC} LOG_LEVEL=TRACE NIMFLAGS="${NIMFLAGS} -d:local_testnet -d:const_preset=${CONST_PRESET} -d:web3_consensus_const_preset=mainnet -d:FIELD_ELEMENTS_PER_BLOB=4096" ${BINARIES}
fi fi
if [[ "${RUN_NIMBUS_ETH1}" == "1" ]]; then if [[ "${RUN_NIMBUS_ETH1}" == "1" ]]; then

2
vendor/nim-eth2-scenarios vendored

@ -1 +1 @@
Subproject commit 0fcc13e755d7646d0274b9fa6c3ddfb2b434bc3b Subproject commit 03013f7c5fb8d7443de8f8e60dda0d7bae84d99f

2
vendor/nim-kzg4844 vendored

@ -1 +1 @@
Subproject commit 6c406c70ad8cde6ab56320158dd969beb45322ef Subproject commit 104aad8bc7352246b34cf7c55f65a3f880ccaa18