From 5b189ce5e22a785d1a3a3ea6a4d34387378df2b4 Mon Sep 17 00:00:00 2001
From: Adam Spitz <adamspitz@status.im>
Date: Fri, 20 Jan 2023 12:18:39 +0100
Subject: [PATCH] EIP-4895: added withdrawals to BlockBody. (#581)

---
 eth/common/eth_types.nim     |  1 +
 eth/common/eth_types_rlp.nim | 38 ++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/eth/common/eth_types.nim b/eth/common/eth_types.nim
index e0f7d7f..38285d4 100644
--- a/eth/common/eth_types.nim
+++ b/eth/common/eth_types.nim
@@ -126,6 +126,7 @@ type
   BlockBody* = object
     transactions*:  seq[Transaction]
     uncles*:        seq[BlockHeader]
+    withdrawals*:   Option[seq[Withdrawal]]   # EIP-4895
 
   Log* = object
     address*:       EthAddress
diff --git a/eth/common/eth_types_rlp.nim b/eth/common/eth_types_rlp.nim
index e34da6e..a865ee7 100644
--- a/eth/common/eth_types_rlp.nim
+++ b/eth/common/eth_types_rlp.nim
@@ -357,6 +357,44 @@ proc rlpHash*[T](v: T): Hash256 =
 
 func blockHash*(h: BlockHeader): KeccakHash {.inline.} = rlpHash(h)
 
+proc append*(w: var RlpWriter, b: BlockBody) =
+  w.append(b.transactions)
+  w.append(b.uncles)
+  if b.withdrawals.isSome:
+    w.append(b.withdrawals.get)
+
+# Is there a better way of doing this? We have tests that call
+# rlp.readRecordType(BlockBody, false), so I overrode
+# `readRecordType` as well as `read`. --Adam
+proc readRecordType*(rlp: var Rlp, T: type BlockBody, wrappedInList: bool): BlockBody =
+  if not wrappedInList:
+    # I think this just means the RLP will contain a list
+    # of transactions (without any uncles or withdrawals).
+    result.transactions = rlp.read(seq[Transaction])
+    result.uncles = @[]
+    result.withdrawals = none[seq[Withdrawal]]()
+  else:
+    let len = rlp.listLen
+
+    if len notin {2, 3}:
+      raise newException(UnsupportedRlpError,
+        "BlockBody elems should be 2 or 3, got " & $len)
+
+    rlp.tryEnterList()
+
+    result.transactions = rlp.read(seq[Transaction])
+    result.uncles       = rlp.read(seq[BlockHeader])
+
+    # EIP-4895
+    result.withdrawals =
+      if len >= 3:
+        some(rlp.read(seq[Withdrawal]))
+      else:
+        none[seq[Withdrawal]]()
+
+proc read*(rlp: var Rlp, T: type BlockBody): T =
+  rlp.readRecordType(BlockBody, true)
+
 proc append*(rlpWriter: var RlpWriter, id: NetworkId) =
   rlpWriter.append(id.uint)