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

Work around a strange codegen issue to fix local sim in CI; Bump LibP2P

This commit is contained in:
Zahary Karadjov 2020-12-01 13:35:55 +02:00 committed by zah
parent 3bdda3dd46
commit 38f7558e50
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
beacon_chain/nimbus_beacon_node.nim
View File

@ -1200,7 +1200,8 @@ programMain:
config.runtimePreset = metadata.runtimePreset
if config.cmd == noCommand:
config.bootstrapNodes.add metadata.bootstrapNodes
for node in mainnetMetadata.bootstrapNodes:
config.bootstrapNodes.add node
if metadata.genesisData.len > 0:
genesisStateContents = newClone metadata.genesisData
@ -1226,20 +1227,23 @@ programMain:
else:
config.runtimePreset = defaultRuntimePreset
when const_preset == "mainnet":
# TODO Remove the ability to override the depositContractAddress
# on the command line in favour of always requiring a custom
# nework file. We have to do this, because any user setting
# would conflict with the default choice of 'mainnet' as a
# --network value.
config.depositContractAddress =
some mainnetMetadata.depositContractAddress
config.depositContractDeployedAt =
some mainnetMetadata.depositContractDeployedAt
if config.cmd == noCommand:
# TODO Remove the ability to override the depositContractAddress
# on the command line in favour of always requiring a custom
# nework file. We have to do this, because any user setting
# would conflict with the default choice of 'mainnet' as a
# --network value.
config.depositContractAddress =
some mainnetMetadata.depositContractAddress
config.depositContractDeployedAt =
some mainnetMetadata.depositContractDeployedAt
config.bootstrapNodes.add mainnetMetadata.bootstrapNodes
genesisStateContents = newClone mainnetMetadata.genesisData
genesisDepositsSnapshotContents = newClone mainnetMetadata.genesisDepositsSnapshot
eth1Network = some mainnet
for node in mainnetMetadata.bootstrapNodes:
config.bootstrapNodes.add node
genesisStateContents = newClone mainnetMetadata.genesisData
genesisDepositsSnapshotContents = newClone mainnetMetadata.genesisDepositsSnapshot
eth1Network = some mainnet
# Single RNG instance for the application - will be seeded on construction
# and avoid using system resources (such as urandom) after that
@ -1515,3 +1519,4 @@ programMain:
of RecordCmd.print:
echo $config.recordPrint

2
vendor/nim-libp2p vendored

@ -1 +1 @@
Subproject commit 5c2a54bdd9fc4f9279cba41d2ca5635842ee9446
Subproject commit b4738d723ceefa3007c7d8f16d17755a661ee50b