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

Remove chunked rlpx (#2562) 

* bump nim-eth

* Update make environment
This commit is contained in:
Jordan Hrycaj 2024-08-14 10:56:49 +00:00 committed by GitHub
parent ec7dd5ccf6
commit d148de5b1c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -56,7 +56,6 @@ EXCLUDED_NIM_PACKAGES := \
# we don't want an error here, so we can handle things later, in the ".DEFAULT" target # we don't want an error here, so we can handle things later, in the ".DEFAULT" target
-include $(BUILD_SYSTEM_DIR)/makefiles/variables.mk -include $(BUILD_SYSTEM_DIR)/makefiles/variables.mk
-include ./nimbus/sync/protocol/eth/eth-variables.mk
# debugging tools + testing tools # debugging tools + testing tools
TOOLS := \ TOOLS := \

4
README.md
View File

@ -231,10 +231,6 @@ available.)
cases when the `gc` is involved in a memory corruption or corruption cases when the `gc` is involved in a memory corruption or corruption
camouflage. camouflage.
* ENABLE_CHUNKED_RLPX=0<br>
Disable legacy chunked RLPx messages which are enabled by default for
synchronising against `Nethermind` nodes
* ENABLE_EVMC=1<br> * ENABLE_EVMC=1<br>
Enable mostly EVMC compliant wrapper around the native Nim VM Enable mostly EVMC compliant wrapper around the native Nim VM

2
nimbus/compile_info.nim
View File

@ -23,8 +23,6 @@ const
warningMsg = block: warningMsg = block:
var rc = "*** Compiling with " & VmName var rc = "*** Compiling with " & VmName
rc &= ", eth/68" rc &= ", eth/68"
when defined(chunked_rlpx_enabled):
rc &= ", chunked-rlpx"
when defined(boehmgc): when defined(boehmgc):
rc &= ", boehm/gc" rc &= ", boehm/gc"
when 0 < coreDbBaseConfigExtras.len: when 0 < coreDbBaseConfigExtras.len:

18
nimbus/sync/protocol/eth/eth-variables.mk
View File

@ -1,18 +0,0 @@
# Copyright (c) 2024 Status Research & Development GmbH. Licensed under
# either of:
# - Apache License, version 2.0
# - MIT license
# at your option. This file may not be copied, modified, or distributed except
# according to those terms.
# GNU-Makefile include
#
# When running make, the instructions here will define the variable
# "NIM_ETH_PARAMS" which should be appended to the nim compiler options.
# chunked messages enabled by default, use ENABLE_CHUNKED_RLPX=0 to disable
ifneq ($(if $(ENABLE_CHUNKED_RLPX),$(ENABLE_CHUNKED_RLPX),1),0)
NIM_ETH_PARAMS := $(NIM_ETH_PARAMS) -d:chunked_rlpx_enabled
endif
# End

2
vendor/nim-eth vendored

@ -1 +1 @@
Subproject commit 56f72c7a664f8b3ca5938c7de0a95a8fed8c7efa Subproject commit 951150227350381bbabe596a714f9450571c16d0