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

reenable incbin on 64-bit platforms (#4988) 

turns out we're still making releases for 32-bit platforms 😲
This commit is contained in:
Jacek Sieka 2023-05-24 22:43:41 +02:00 committed by GitHub
parent f904206e13
commit 74b670a4c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
beacon_chain/networking/network_metadata.nim
View File

@ -34,9 +34,7 @@ export
const const
vendorDir = currentSourcePath.parentDir.replace('\\', '/') & "/../../vendor" vendorDir = currentSourcePath.parentDir.replace('\\', '/') & "/../../vendor"
# TODO: Currently, this breaks the Linux/ARM packaging due incbinEnabled* = sizeof(pointer) == 8
# to a toolchain incompatibility problem
incbinEnabled* = false
type type
Eth1BlockHash* = ethtypes.BlockHash Eth1BlockHash* = ethtypes.BlockHash
@ -174,9 +172,6 @@ proc loadEth2NetworkMetadata*(
readBootEnr(bootEnrPath)) readBootEnr(bootEnrPath))
genesisData = if loadGenesis and fileExists(genesisPath): genesisData = if loadGenesis and fileExists(genesisPath):
when incbinEnabled:
toBytes readFile(genesisPath)
else:
readFile(genesisPath) readFile(genesisPath)
else: else:
"" ""
@ -193,7 +188,9 @@ proc loadEth2NetworkMetadata*(
bootstrapNodes: bootstrapNodes, bootstrapNodes: bootstrapNodes,
depositContractBlock: depositContractBlock, depositContractBlock: depositContractBlock,
depositContractBlockHash: depositContractBlockHash, depositContractBlockHash: depositContractBlockHash,
genesisData: genesisData, genesisData:
when incbinEnabled: toBytes genesisData
else: genesisData,
genesisDepositsSnapshot: genesisDepositsSnapshot) genesisDepositsSnapshot: genesisDepositsSnapshot)
except PresetIncompatibleError as err: except PresetIncompatibleError as err: