From 571b98d7f77ad58294c4ba7c100b145a466c8fae Mon Sep 17 00:00:00 2001
From: tersec <tersec@users.noreply.github.com>
Date: Thu, 1 Dec 2022 12:55:42 +0000
Subject: [PATCH] avoid invalid codegen/UB by avoiding case object discriminant
 assignment (#566)

---
 eth/common/eth_types.nim | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/eth/common/eth_types.nim b/eth/common/eth_types.nim
index b846176..5e59c96 100644
--- a/eth/common/eth_types.nim
+++ b/eth/common/eth_types.nim
@@ -244,19 +244,19 @@ func toBlockNonce*(n: uint64): BlockNonce =
 func toUint*(n: BlockNonce): uint64 =
   uint64.fromBytesBE(n)
 
-proc newAccount*(nonce: AccountNonce = 0, balance: UInt256 = 0.u256): Account =
+func newAccount*(nonce: AccountNonce = 0, balance: UInt256 = 0.u256): Account =
   result.nonce = nonce
   result.balance = balance
   result.storageRoot = EMPTY_ROOT_HASH
   result.codeHash = EMPTY_CODE_HASH
 
-proc hasStatus*(rec: Receipt): bool {.inline.} =
+func hasStatus*(rec: Receipt): bool {.inline.} =
   rec.isHash == false
 
-proc hasStateRoot*(rec: Receipt): bool {.inline.} =
+func hasStateRoot*(rec: Receipt): bool {.inline.} =
   rec.isHash == true
 
-proc stateRoot*(rec: Receipt): Hash256 {.inline.} =
+func stateRoot*(rec: Receipt): Hash256 {.inline.} =
   doAssert(rec.hasStateRoot)
   rec.hash
 
@@ -272,14 +272,14 @@ func destination*(tx: Transaction): EthAddress =
 func init*(T: type BlockHashOrNumber, str: string): T
           {.raises: [ValueError, Defect].} =
   if str.startsWith "0x":
-    if str.len != sizeof(result.hash.data) * 2 + 2:
+    if str.len != sizeof(default(T).hash.data) * 2 + 2:
       raise newException(ValueError, "Block hash has incorrect length")
 
-    result.isHash = true
-    hexToByteArray(str, result.hash.data)
+    var res = T(isHash: true)
+    hexToByteArray(str, res.hash.data)
+    res
   else:
-    result.isHash = false
-    result.number = parseBiggestUInt str
+    T(isHash: false, number: parseBiggestUInt str)
 
 func `$`*(x: BlockHashOrNumber): string =
   if x.isHash: