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

clean up json serialization (#735) 

serialize fewer non-eth types and more eth types - this module is
fraught with issues however since there's no one good "canonical"
encoding to choose - this goes back to the json ser framework lacking
good isolation between projects.
This commit is contained in:
Jacek Sieka 2024-09-30 10:34:47 +02:00 committed by GitHub
parent 6bd6bae86c
commit 00f5fb1fe0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
eth/common/eth_types_json_serialization.nim
View File

@ -6,15 +6,20 @@
{.push raises: [].} {.push raises: [].}
import std/[times, net], json_serialization, nimcrypto/[hash, utils], ./eth_types import std/typetraits, json_serialization, ./eth_types
export json_serialization export json_serialization, eth_types
proc writeValue*(w: var JsonWriter, a: MDigest) {.raises: [IOError].} = # This module contains "convenience formatting" for logging `eth_types` - this
w.writeValue a.data.toHex(true) # formatting does not conform to any particular Ethereum-based standard - in
# particular, it does not conform to the JSON-RPC conventions which instead
# can be found in `nim-web3`.
proc writeValue*(w: var JsonWriter, a: Address) {.raises: [IOError].} =
w.writeValue $a
proc readValue*( proc readValue*(
r: var JsonReader, a: var MDigest r: var JsonReader, a: var Address
) {.inline, raises: [IOError, SerializationError].} = ) {.inline, raises: [IOError, SerializationError].} =
try: try:
a = fromHex(type(a), r.readValue(string)) a = fromHex(type(a), r.readValue(string))
@ -22,7 +27,7 @@ proc readValue*(
raiseUnexpectedValue(r, "Hex string expected") raiseUnexpectedValue(r, "Hex string expected")
proc writeValue*(w: var JsonWriter, a: Hash32) {.raises: [IOError].} = proc writeValue*(w: var JsonWriter, a: Hash32) {.raises: [IOError].} =
w.writeValue a.data.to0xHex() w.writeValue $a
proc readValue*( proc readValue*(
r: var JsonReader, a: var Hash32 r: var JsonReader, a: var Hash32
@ -33,7 +38,7 @@ proc readValue*(
raiseUnexpectedValue(r, "Hex string expected") raiseUnexpectedValue(r, "Hex string expected")
proc writeValue*(w: var JsonWriter, a: FixedBytes) {.raises: [IOError].} = proc writeValue*(w: var JsonWriter, a: FixedBytes) {.raises: [IOError].} =
w.writeValue a.data.to0xHex() w.writeValue $a
proc readValue*[N]( proc readValue*[N](
r: var JsonReader, a: var FixedBytes[N] r: var JsonReader, a: var FixedBytes[N]
@ -51,19 +56,13 @@ proc readValue*(
) {.inline, raises: [IOError, SerializationError].} = ) {.inline, raises: [IOError, SerializationError].} =
value = parse(r.readValue(string), type(value)) value = parse(r.readValue(string), type(value))
proc writeValue*(w: var JsonWriter, value: StInt) {.raises: [IOError].} = proc writeValue*(w: var JsonWriter, t: EthTime) {.inline, raises: [IOError].} =
# The Ethereum Yellow Paper defines the RLP serialization only w.writeValue distinctBase(t)
# for unsigned integers:
{.error: "RLP serialization of signed integers is not allowed".}
discard
proc writeValue*(w: var JsonWriter, t: Time) {.inline, raises: [IOError].} =
w.writeValue t.toUnix()
proc readValue*( proc readValue*(
r: var JsonReader, t: var Time r: var JsonReader, t: var EthTime
) {.inline, raises: [IOError, SerializationError].} = ) {.inline, raises: [IOError, SerializationError].} =
t = fromUnix r.readValue(int) t = EthTime r.readValue(uint64)
proc writeValue*(w: var JsonWriter, value: BlockHashOrNumber) {.raises: [IOError].} = proc writeValue*(w: var JsonWriter, value: BlockHashOrNumber) {.raises: [IOError].} =
w.writeValue $value w.writeValue $value