2021-03-26 06:52:01 +00:00
|
|
|
# beacon_chain
|
|
|
|
# Copyright (c) 2018-2021 Status Research & Development GmbH
|
|
|
|
# Licensed and distributed under either of
|
|
|
|
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
|
|
|
|
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
|
|
|
|
# at your option. This file may not be copied, modified, or distributed except according to those terms.
|
|
|
|
|
|
|
|
{.push raises: [Defect].}
|
|
|
|
|
2021-03-26 14:11:06 +00:00
|
|
|
# The serializations in this file are approximations of
|
|
|
|
# https://ethereum.github.io/eth2.0-APIs/#/ but where written before the standard
|
|
|
|
# had materialized - they've now made it out to releases which means the easiest
|
|
|
|
# thing to do is to maintain them as-is, even if there are mismatches. In
|
|
|
|
# particular, numbers are serialized as strings in the eth2 API - here, they
|
|
|
|
# use numbers instead.
|
|
|
|
#
|
|
|
|
# Using numbers creates problems - uint64 which often appears in eth2 can't
|
|
|
|
# portably be represented since many json parsers balk at anything >2^53 and
|
|
|
|
# start losing precision. The other issue is the json parser in nim - it can't
|
|
|
|
# handle numbers >2^63, either crashing or giving wrong results:
|
|
|
|
# https://github.com/status-im/nimbus-eth2/issues/2430
|
|
|
|
|
2020-05-22 17:04:52 +00:00
|
|
|
import
|
|
|
|
# Standard library
|
2021-03-26 14:11:06 +00:00
|
|
|
std/[tables, typetraits],
|
2020-06-03 13:52:02 +00:00
|
|
|
|
2020-05-22 17:04:52 +00:00
|
|
|
# Nimble packages
|
2021-03-05 13:12:00 +00:00
|
|
|
stew/byteutils,
|
2020-05-22 17:04:52 +00:00
|
|
|
json_rpc/jsonmarshal,
|
|
|
|
|
|
|
|
# Local modules
|
2021-08-03 15:17:11 +00:00
|
|
|
../../ssz/types,
|
2021-08-12 13:08:20 +00:00
|
|
|
../datatypes/base
|
2020-10-28 18:51:38 +00:00
|
|
|
|
2021-08-12 13:08:20 +00:00
|
|
|
export jsonmarshal, base
|
2021-03-26 14:11:06 +00:00
|
|
|
|
2020-10-28 18:51:38 +00:00
|
|
|
proc toJsonHex(data: openArray[byte]): string =
|
|
|
|
# Per the eth2 API spec, hex arrays are printed with leading 0x
|
|
|
|
"0x" & toHex(data)
|
2020-05-22 17:04:52 +00:00
|
|
|
|
2021-03-26 06:52:01 +00:00
|
|
|
proc fromJson*(n: JsonNode, argName: string, result: var ValidatorPubKey) {.raises: [Defect, ValueError].} =
|
2020-06-29 17:30:19 +00:00
|
|
|
n.kind.expect(JString, argName)
|
performance fixes (#2259)
* performance fixes
* don't mark tree cache as dirty on read-only List accesses
* store only blob in memory for keys and signatures, parse blob lazily
* compare public keys by blob instead of parsing / converting to raw
* compare Eth2Digest using non-constant-time comparison
* avoid some unnecessary validator copying
This branch will in particular speed up deposit processing which has
been slowing down block replay.
Pre (mainnet, 1600 blocks):
```
All time are ms
Average, StdDev, Min, Max, Samples, Test
Validation is turned off meaning that no BLS operations are performed
3450.269, 0.000, 3450.269, 3450.269, 1, Initialize DB
0.417, 0.822, 0.036, 21.098, 1400, Load block from database
16.521, 0.000, 16.521, 16.521, 1, Load state from database
27.906, 50.846, 8.104, 1507.633, 1350, Apply block
52.617, 37.029, 20.640, 135.938, 50, Apply epoch block
```
Post:
```
3502.715, 0.000, 3502.715, 3502.715, 1, Initialize DB
0.080, 0.560, 0.035, 21.015, 1400, Load block from database
17.595, 0.000, 17.595, 17.595, 1, Load state from database
15.706, 11.028, 8.300, 107.537, 1350, Apply block
33.217, 12.622, 17.331, 60.580, 50, Apply epoch block
```
* more perf fixes
* load EpochRef cache into StateCache more aggressively
* point out security concern with public key cache
* reuse proposer index from state when processing block
* avoid genericAssign in a few more places
* don't parse key when signature is unparseable
* fix `==` overload for Eth2Digest
* preallocate validator list when getting active validators
* speed up proposer index calculation a little bit
* reuse cache when replaying blocks in ncli_db
* avoid a few more copying loops
```
Average, StdDev, Min, Max, Samples, Test
Validation is turned off meaning that no BLS operations are performed
3279.158, 0.000, 3279.158, 3279.158, 1, Initialize DB
0.072, 0.357, 0.035, 13.400, 1400, Load block from database
17.295, 0.000, 17.295, 17.295, 1, Load state from database
5.918, 9.896, 0.198, 98.028, 1350, Apply block
15.888, 10.951, 7.902, 39.535, 50, Apply epoch block
0.000, 0.000, 0.000, 0.000, 0, Database block store
```
* clear full balance cache before processing rewards and penalties
```
All time are ms
Average, StdDev, Min, Max, Samples, Test
Validation is turned off meaning that no BLS operations are performed
3947.901, 0.000, 3947.901, 3947.901, 1, Initialize DB
0.124, 0.506, 0.026, 202.370, 363345, Load block from database
97.614, 0.000, 97.614, 97.614, 1, Load state from database
0.186, 0.188, 0.012, 99.561, 357262, Advance slot, non-epoch
14.161, 5.966, 1.099, 395.511, 11524, Advance slot, epoch
1.372, 4.170, 0.017, 276.401, 363345, Apply block, no slot processing
0.000, 0.000, 0.000, 0.000, 0, Database block store
```
2021-01-25 12:04:18 +00:00
|
|
|
var tmp = ValidatorPubKey.fromHex(n.getStr()).tryGet()
|
|
|
|
if not tmp.loadWithCache().isSome():
|
|
|
|
raise (ref ValueError)(msg: "Invalid public BLS key")
|
|
|
|
result = tmp
|
2020-05-22 17:04:52 +00:00
|
|
|
|
|
|
|
proc `%`*(pubkey: ValidatorPubKey): JsonNode =
|
2020-10-28 18:51:38 +00:00
|
|
|
newJString(toJsonHex(toRaw(pubkey)))
|
2020-05-22 17:04:52 +00:00
|
|
|
|
2021-03-26 06:52:01 +00:00
|
|
|
proc fromJson*(n: JsonNode, argName: string, result: var List) {.raises: [Defect, ValueError].} =
|
2020-05-22 17:04:52 +00:00
|
|
|
fromJson(n, argName, asSeq result)
|
|
|
|
|
|
|
|
proc `%`*(list: List): JsonNode = %(asSeq(list))
|
|
|
|
|
2021-03-26 06:52:01 +00:00
|
|
|
proc fromJson*(n: JsonNode, argName: string, result: var BitList) {.raises: [Defect, ValueError].} =
|
2021-01-31 23:33:40 +00:00
|
|
|
n.kind.expect(JString, argName)
|
|
|
|
result = type(result)(hexToSeqByte(n.getStr()))
|
2020-05-22 17:04:52 +00:00
|
|
|
|
2021-01-31 23:33:40 +00:00
|
|
|
proc `%`*(bitlist: BitList): JsonNode =
|
|
|
|
newJString(toJsonHex(seq[byte](BitSeq(bitlist))))
|
2020-05-22 17:04:52 +00:00
|
|
|
|
2021-03-26 06:52:01 +00:00
|
|
|
proc fromJson*(n: JsonNode, argName: string, result: var ValidatorSig) {.raises: [Defect, ValueError].} =
|
2020-06-29 17:30:19 +00:00
|
|
|
n.kind.expect(JString, argName)
|
2020-05-22 17:04:52 +00:00
|
|
|
result = ValidatorSig.fromHex(n.getStr()).tryGet()
|
|
|
|
|
|
|
|
proc `%`*(value: ValidatorSig): JsonNode =
|
2020-10-28 18:51:38 +00:00
|
|
|
newJString(toJsonHex(toRaw(value)))
|
2020-05-22 17:04:52 +00:00
|
|
|
|
2021-03-26 06:52:01 +00:00
|
|
|
proc fromJson*(n: JsonNode, argName: string, result: var TrustedSig) {.raises: [Defect, ValueError].} =
|
2021-01-31 23:33:40 +00:00
|
|
|
n.kind.expect(JString, argName)
|
|
|
|
hexToByteArray(n.getStr(), result.data)
|
|
|
|
|
|
|
|
proc `%`*(value: TrustedSig): JsonNode =
|
|
|
|
newJString(toJsonHex(toRaw(value)))
|
|
|
|
|
2021-03-26 06:52:01 +00:00
|
|
|
proc fromJson*(n: JsonNode, argName: string, result: var Version) {.raises: [Defect, ValueError].} =
|
2020-06-29 17:30:19 +00:00
|
|
|
n.kind.expect(JString, argName)
|
2020-05-27 17:06:28 +00:00
|
|
|
hexToByteArray(n.getStr(), array[4, byte](result))
|
|
|
|
|
|
|
|
proc `%`*(value: Version): JsonNode =
|
2020-10-28 18:51:38 +00:00
|
|
|
newJString(toJsonHex(distinctBase(value)))
|
2020-05-27 17:06:28 +00:00
|
|
|
|
2020-10-07 13:02:54 +00:00
|
|
|
template genFromJsonForIntType(T: untyped) =
|
2021-03-26 06:52:01 +00:00
|
|
|
proc fromJson*(n: JsonNode, argName: string, result: var T) {.raises: [Defect, ValueError].} =
|
2020-05-22 17:04:52 +00:00
|
|
|
n.kind.expect(JInt, argName)
|
2020-10-28 18:51:38 +00:00
|
|
|
let asInt = n.getBiggestInt()
|
2020-11-27 19:48:33 +00:00
|
|
|
when T is Epoch:
|
|
|
|
if asInt == -1:
|
|
|
|
# TODO: This is a major hack here. Since the json library
|
|
|
|
# cannot handle properly 0xffffffff when serializing and
|
|
|
|
# deserializing uint64 values, we detect one known wrong
|
|
|
|
# result, appering in most `Validator` records. To fix
|
|
|
|
# this issue, we'll have to switch to nim-json-serialization
|
|
|
|
# in nim-json-rpc or work towards implementing a fix upstream.
|
|
|
|
result = FAR_FUTURE_EPOCH
|
|
|
|
return
|
2020-10-07 13:02:54 +00:00
|
|
|
if asInt < 0:
|
2020-11-27 19:48:33 +00:00
|
|
|
# signed -> unsigned conversions are unchecked
|
|
|
|
# https://github.com/nim-lang/RFCs/issues/175
|
2020-10-07 13:02:54 +00:00
|
|
|
raise newException(
|
|
|
|
ValueError, "JSON-RPC input is an unexpected negative value")
|
|
|
|
result = T(asInt)
|
2020-05-22 17:04:52 +00:00
|
|
|
|
|
|
|
genFromJsonForIntType(Epoch)
|
|
|
|
genFromJsonForIntType(Slot)
|
|
|
|
genFromJsonForIntType(CommitteeIndex)
|
2020-09-14 11:13:30 +00:00
|
|
|
genFromJsonForIntType(ValidatorIndex)
|
2020-05-22 17:04:52 +00:00
|
|
|
|
2021-03-26 14:11:06 +00:00
|
|
|
proc `%`*(value: Epoch): JsonNode =
|
|
|
|
# In nim <= 1.2.6, `uint64` was silently cast to int64 resulting in
|
|
|
|
# FAR_FUTURE_EPOCH showing as -1 - this is a hack to maintain that behaviour
|
|
|
|
# in a world where a Defect or an actual correct value is used - the eth2
|
|
|
|
# REST api instead prints all epochs and similar large numbers as strings!
|
|
|
|
# See also https://github.com/status-im/nimbus-eth2/issues/2430
|
|
|
|
newJInt(cast[int64](value))
|
|
|
|
|
|
|
|
proc `%`*(value: Slot): JsonNode =
|
|
|
|
newJInt(cast[int64](value))
|
|
|
|
|
2020-10-28 18:51:38 +00:00
|
|
|
proc `%`*(value: GraffitiBytes): JsonNode =
|
|
|
|
newJString(toJsonHex(distinctBase(value)))
|
2020-06-29 17:30:19 +00:00
|
|
|
|
2021-03-26 06:52:01 +00:00
|
|
|
proc fromJson*(n: JsonNode, argName: string, value: var GraffitiBytes) {.raises: [Defect, ValueError].} =
|
2020-06-29 17:30:19 +00:00
|
|
|
n.kind.expect(JString, argName)
|
|
|
|
value = GraffitiBytes.init n.getStr()
|
|
|
|
|
2020-05-22 17:04:52 +00:00
|
|
|
proc `%`*(value: CommitteeIndex): JsonNode =
|
2020-10-28 18:51:38 +00:00
|
|
|
newJInt(value.BiggestInt)
|
2020-09-14 11:13:30 +00:00
|
|
|
|
|
|
|
proc `%`*(value: ValidatorIndex): JsonNode =
|
2020-10-28 18:51:38 +00:00
|
|
|
newJInt(value.BiggestInt)
|
|
|
|
|
|
|
|
proc `%`*(value: Eth2Digest): JsonNode =
|
|
|
|
newJString(toJsonHex(value.data))
|
|
|
|
|
2021-03-26 06:52:01 +00:00
|
|
|
proc fromJson*(n: JsonNode, argName: string, result: var Eth2Digest) {.raises: [Defect, ValueError].} =
|
2020-10-28 18:51:38 +00:00
|
|
|
n.kind.expect(JString, argName)
|
|
|
|
hexToByteArray(n.getStr(), result.data)
|
2021-01-31 23:33:40 +00:00
|
|
|
|
|
|
|
proc `%`*(value: BitSeq): JsonNode =
|
|
|
|
newJString(toJsonHex(value.bytes))
|
|
|
|
|
2021-03-26 06:52:01 +00:00
|
|
|
proc fromJson*(n: JsonNode, argName: string, result: var BitSeq) {.raises: [Defect, ValueError].} =
|
2021-01-31 23:33:40 +00:00
|
|
|
n.kind.expect(JString, argName)
|
|
|
|
result = BitSeq(hexToSeqByte(n.getStr()))
|