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

support special characters in network metadata paths (#6141)

This commit is contained in:
tersec 2024-03-26 21:47:42 +00:00 committed by GitHub
parent c9f59083a4
commit 21daaad754
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
beacon_chain/networking/network_metadata.nim
View File

@ -8,7 +8,7 @@
{.push raises: [].} {.push raises: [].}
import import
std/[sequtils, strutils, os], std/os,
stew/[byteutils, objects], stew/shims/macros, nimcrypto/hash, stew/[byteutils, objects], stew/shims/macros, nimcrypto/hash,
web3/[conversions], web3/[conversions],
web3/primitives as web3types, web3/primitives as web3types,
@ -16,6 +16,11 @@ import
eth/common/eth_types_json_serialization, eth/common/eth_types_json_serialization,
../spec/[eth2_ssz_serialization, forks] ../spec/[eth2_ssz_serialization, forks]
from std/sequtils import deduplicate, filterIt, mapIt
from std/strutils import
escape, parseBiggestUInt, replace, splitLines, startsWith, strip,
toLowerAscii
# TODO(zah): # TODO(zah):
# We can compress the embedded states with snappy before embedding them here. # We can compress the embedded states with snappy before embedding them here.
@ -236,7 +241,7 @@ when const_preset == "gnosis":
chiadoGenesisSize* {.importc: "gnosis_chiado_genesis_size".}: int chiadoGenesisSize* {.importc: "gnosis_chiado_genesis_size".}: int
# let `.incbin` in assembly file find the binary file through search path # let `.incbin` in assembly file find the binary file through search path
{.passc: "-I" & vendorDir.} {.passc: "-I" & escape(vendorDir).}
{.compile: "network_metadata_gnosis.S".} {.compile: "network_metadata_gnosis.S".}
else: else:
@ -263,9 +268,6 @@ when const_preset == "gnosis":
checkForkConsistency(network.cfg) checkForkConsistency(network.cfg)
for network in [gnosisMetadata, chiadoMetadata]: for network in [gnosisMetadata, chiadoMetadata]:
doAssert network.cfg.ALTAIR_FORK_EPOCH < FAR_FUTURE_EPOCH
doAssert network.cfg.BELLATRIX_FORK_EPOCH < FAR_FUTURE_EPOCH
doAssert network.cfg.CAPELLA_FORK_EPOCH < FAR_FUTURE_EPOCH
doAssert network.cfg.DENEB_FORK_EPOCH < FAR_FUTURE_EPOCH doAssert network.cfg.DENEB_FORK_EPOCH < FAR_FUTURE_EPOCH
doAssert network.cfg.ELECTRA_FORK_EPOCH == FAR_FUTURE_EPOCH doAssert network.cfg.ELECTRA_FORK_EPOCH == FAR_FUTURE_EPOCH
static: doAssert ConsensusFork.high == ConsensusFork.Deneb static: doAssert ConsensusFork.high == ConsensusFork.Deneb
@ -287,7 +289,7 @@ elif const_preset == "mainnet":
{.pop.} {.pop.}
# let `.incbin` in assembly file find the binary file through search path # let `.incbin` in assembly file find the binary file through search path
{.passc: "-I" & vendorDir.} {.passc: "-I" & escape(vendorDir).}
{.compile: "network_metadata_mainnet.S".} {.compile: "network_metadata_mainnet.S".}
else: else:
@ -329,9 +331,6 @@ elif const_preset == "mainnet":
checkForkConsistency(network.cfg) checkForkConsistency(network.cfg)
for network in [mainnetMetadata, praterMetadata, sepoliaMetadata, holeskyMetadata]: for network in [mainnetMetadata, praterMetadata, sepoliaMetadata, holeskyMetadata]:
doAssert network.cfg.ALTAIR_FORK_EPOCH < FAR_FUTURE_EPOCH
doAssert network.cfg.BELLATRIX_FORK_EPOCH < FAR_FUTURE_EPOCH
doAssert network.cfg.CAPELLA_FORK_EPOCH < FAR_FUTURE_EPOCH
doAssert network.cfg.DENEB_FORK_EPOCH < FAR_FUTURE_EPOCH doAssert network.cfg.DENEB_FORK_EPOCH < FAR_FUTURE_EPOCH
doAssert network.cfg.ELECTRA_FORK_EPOCH == FAR_FUTURE_EPOCH doAssert network.cfg.ELECTRA_FORK_EPOCH == FAR_FUTURE_EPOCH
static: doAssert ConsensusFork.high == ConsensusFork.Deneb static: doAssert ConsensusFork.high == ConsensusFork.Deneb

11
env.sh
View File

@ -1,9 +1,15 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# beacon_chain
# Copyright (c) 2020-2024 Status Research & Development GmbH
# Licensed and distributed under either of
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
# at your option. This file may not be copied, modified, or distributed except according to those terms.
# We use ${BASH_SOURCE[0]} instead of $0 to allow sourcing this file # We use ${BASH_SOURCE[0]} instead of $0 to allow sourcing this file
# and we fall back to a Zsh-specific special var to also support Zsh. # and we fall back to a Zsh-specific special var to also support Zsh.
REL_PATH="$(dirname ${BASH_SOURCE[0]:-${(%):-%x}})" REL_PATH="$(dirname ${BASH_SOURCE[0]:-${(%):-%x}})"
ABS_PATH="$(cd ${REL_PATH}; pwd)" ABS_PATH="$(cd "${REL_PATH}"; pwd)"
# Activate nvm only when this file is sourced without arguments: # Activate nvm only when this file is sourced without arguments:
if [ -z "$*" ]; then if [ -z "$*" ]; then
@ -32,5 +38,4 @@ if [ -f "${USER_ENV_FILE}" ]; then
set +o allexport set +o allexport
fi fi
source ${ABS_PATH}/vendor/nimbus-build-system/scripts/env.sh source "${ABS_PATH}/vendor/nimbus-build-system/scripts/env.sh"