status-im/nimbus-eth1
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth1.git synced 2025-01-12 13:24:21 +00:00
Code Issues Projects Releases Wiki Activity

Remove local block body rlp fix (#1555)

Browse Source 
* Remove local block body rlp fix

why:
  Fix moved to `nim-eth` module

* Update nim-eth bumper
This commit is contained in:
Jordan Hrycaj 2023-04-21 20:08:18 +01:00 committed by GitHub
parent 21ef655b9c
commit 0387afb7b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nimbus/sync/protocol/eth/eth_types.nim
View File

@ -46,16 +46,6 @@ const
maxReceiptsFetch* = 256 maxReceiptsFetch* = 256
maxHeadersFetch* = 192 maxHeadersFetch* = 192
# Kludge, should be fixed in `eth/common/eth_types_rlp.append()`
proc ethAppend*(w: var RlpWriter, b: BlockBody) =
w.startList 2 + b.withdrawals.isSome.ord # <--- this line was missing
w.append(b.transactions)
w.append(b.uncles)
if b.withdrawals.isSome:
w.append(b.withdrawals.unsafeGet)
proc notImplemented(name: string) = proc notImplemented(name: string) =
debug "Method not implemented", meth = name debug "Method not implemented", meth = name

4
nimbus/sync/protocol/eth66.nim
View File

@ -76,10 +76,6 @@ const
trEthSendNewBlockHashes* = trEthSendNewBlockHashes* =
">> " & prettyEthProtoName & " Sending NewBlockHashes" ">> " & prettyEthProtoName & " Sending NewBlockHashes"
# Kludge, should be fixed in `eth/common/eth_types_rlp`
proc append(w: var RlpWriter, b: BlockBody) =
w.ethAppend b
p2pProtocol eth66(version = ethVersion, p2pProtocol eth66(version = ethVersion,
rlpxName = "eth", rlpxName = "eth",
peerState = EthPeerState, peerState = EthPeerState,

4
nimbus/sync/protocol/eth67.nim
View File

@ -76,10 +76,6 @@ const
trEthSendNewBlockHashes* = trEthSendNewBlockHashes* =
">> " & prettyEthProtoName & " Sending NewBlockHashes" ">> " & prettyEthProtoName & " Sending NewBlockHashes"
# Kludge, should be fixed in `eth/common/eth_types_rlp`
proc append(w: var RlpWriter, b: BlockBody) =
w.ethAppend b
p2pProtocol eth67(version = ethVersion, p2pProtocol eth67(version = ethVersion,
rlpxName = "eth", rlpxName = "eth",
peerState = EthPeerState, peerState = EthPeerState,

6
tests/test_sync_snap/test_calc.nim
View File

@ -33,11 +33,6 @@ var
# Private helpers for `test_calcAccountsListSizes()` # Private helpers for `test_calcAccountsListSizes()`
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Kludge, should be fixed in `eth/common/eth_types_rlp`
proc append(w: var RlpWriter, b: BlockBody) =
## helper for ` test_calcBlockBodyTranscode()`
w.ethAppend b
proc `==`(a,b: ChainId): bool {.borrow.} proc `==`(a,b: ChainId): bool {.borrow.}
## helper for ` test_calcBlockBodyTranscode()` ## helper for ` test_calcBlockBodyTranscode()`
@ -188,7 +183,6 @@ proc test_calcTrieNodeTranscode*() =
proc test_calcBlockBodyTranscode*() = proc test_calcBlockBodyTranscode*() =
## RLP encode/decode a list of `BlockBody` objects. Note that tere is/was a ## RLP encode/decode a list of `BlockBody` objects. Note that tere is/was a
## problem in `eth/common/eth_types_rlp.append()` for `BlockBody` encoding. ## problem in `eth/common/eth_types_rlp.append()` for `BlockBody` encoding.
## This has been fixed temporarily via `protocol/eth/eth_types.ethAppend()`.
let blkSeq = @[ let blkSeq = @[
BlockBody( BlockBody(
transactions: @[ transactions: @[

2
vendor/nim-eth vendored

@ -1 +1 @@
Subproject commit 25b0da02801a216fe7fc8cba5aaf0d5c0138e267 Subproject commit 9a1d35f803d4ae2bda0ede2356cc3213977a3d60