Skip to content

Commit

Permalink
Block / REST explorer
Browse files Browse the repository at this point in the history
  • Loading branch information
arnetheduck committed Nov 16, 2021
1 parent 5f148d9 commit 36bb2cf
Show file tree
Hide file tree
Showing 30 changed files with 1,683 additions and 3 deletions.
10 changes: 10 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -207,3 +207,13 @@
[submodule "vendor/eth2-networks"]
path = vendor/eth2-networks
url = https://github.com/eth2-clients/eth2-networks.git

[submodule "vendor/DOtherSide"]
path = vendor/DOtherSide
url = https://github.com/filcuc/DOtherSide.git
branch = master
[submodule "vendor/nimqml"]
path = vendor/nimqml
url = https://github.com/filcuc/nimqml.git
branch = master

6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ TOOLS := \
process_dashboard \
stack_sizes \
nimbus_validator_client \
nimbus_signing_process
nimbus_signing_process \
ngui
.PHONY: $(TOOLS)

# bench_bls_sig_agggregation TODO reenable after bls v0.10.1 changes
Expand All @@ -62,7 +63,8 @@ TOOLS_DIRS := \
ncli \
nbench \
research \
tools
tools \
ngui
TOOLS_CSV := $(subst $(SPACE),$(COMMA),$(TOOLS))

.PHONY: \
Expand Down
2 changes: 1 addition & 1 deletion beacon_chain/spec/eth2_apis/eth2_rest_serialization.nim
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# at your option. This file may not be copied, modified, or distributed except according to those terms.

import
std/[typetraits],
std/[json, typetraits],
stew/[results, base10, byteutils, endians2],
presto,
libp2p/peerid,
Expand Down
66 changes: 66 additions & 0 deletions ngui/attestationlist.nim
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
import
std/[sequtils, tables],
NimQml,
../beacon_chain/spec/eth2_apis/rest_beacon_client,
../beacon_chain/spec/helpers,
../beacon_chain/ssz/merkleization,
./objecttablemodel, ./utils

type
AttestationInfo* = object
slot*: int
index*: int
beacon_block_root*: string
source_epoch*: int
source_root*: string
target_epoch*: int
target_root*: string
aggregation_bits*: string

proc toAttestationInfo*(v: Attestation): AttestationInfo =
AttestationInfo(
slot: v.data.slot.int,
index: v.data.index.int,
beacon_block_root: toBlockLink(v.data.beacon_block_root),
source_epoch: v.data.source.epoch.int,
source_root: toBlockLink(v.data.source.root),
target_epoch: v.data.target.epoch.int,
target_root: toBlockLink(v.data.target.root),
aggregation_bits: $v.aggregation_bits,
)

QtObject:
type AttestationList* = ref object of QAbstractTableModel
# TODO this could be a generic ObjectTableModel, except generics + method don't work..
data: ObjectTableModelImpl[AttestationInfo]

proc setup(self: AttestationList) = self.QAbstractTableModel.setup

proc delete(self: AttestationList) =
self.QAbstractTableModel.delete

proc newAttestationList*(data: seq[Attestation]): AttestationList =
new(result, delete)
result.data = ObjectTableModelImpl[AttestationInfo](items: data.mapIt(it.toAttestationInfo()))
result.setup

method rowCount(self: AttestationList, index: QModelIndex = nil): int =
self.data.rowCount(index)

method columnCount(self: AttestationList, index: QModelIndex = nil): int =
self.data.columnCount(index)

method headerData*(self: AttestationList, section: int, orientation: QtOrientation, role: int): QVariant =
self.data.headerData(section, orientation, role)

method data(self: AttestationList, index: QModelIndex, role: int): QVariant =
self.data.data(index, role)

method roleNames(self: AttestationList): Table[int, string] =
self.data.roleNames()

proc setNewData*(self: AttestationList, v: seq[Attestation]) =
self.data.setNewData(self, v.mapIt(it.toAttestationInfo()))

proc sort*(self: AttestationList, section: int) {.slot.} =
self.data.sort(self, section)
51 changes: 51 additions & 0 deletions ngui/attesterslashinglist.nim
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import
std/[sequtils, tables],
NimQml,
../beacon_chain/spec/eth2_apis/rest_beacon_client,
../beacon_chain/spec/[helpers],
./objecttablemodel, ./utils

type
AttesterSlashingInfo* = object
info*: string

proc toAttesterSlashingInfo*(v: AttesterSlashing): AttesterSlashingInfo =
AttesterSlashingInfo(
info: $v
)

QtObject:
type AttesterSlashingList* = ref object of QAbstractTableModel
# TODO this could be a generic ObjectTableModel, except generics + method don't work..
data: ObjectTableModelImpl[AttesterSlashingInfo]

proc setup(self: AttesterSlashingList) = self.QAbstractTableModel.setup

proc delete(self: AttesterSlashingList) =
self.QAbstractTableModel.delete

proc newAttesterSlashingList*(data: openArray[AttesterSlashing]): AttesterSlashingList =
new(result, delete)
result.data = ObjectTableModelImpl[AttesterSlashingInfo](items: data.mapIt(it.toAttesterSlashingInfo()))
result.setup

method rowCount(self: AttesterSlashingList, index: QModelIndex = nil): int =
self.data.rowCount(index)

method columnCount(self: AttesterSlashingList, index: QModelIndex = nil): int =
self.data.columnCount(index)

method headerData*(self: AttesterSlashingList, section: int, orientation: QtOrientation, role: int): QVariant =
self.data.headerData(section, orientation, role)

method data(self: AttesterSlashingList, index: QModelIndex, role: int): QVariant =
self.data.data(index, role)

method roleNames(self: AttesterSlashingList): Table[int, string] =
self.data.roleNames()

proc setNewData*(self: AttesterSlashingList, v: openArray[AttesterSlashing]) =
self.data.setNewData(self, v.mapIt(it.toAttesterSlashingInfo()))

proc sort*(self: AttesterSlashingList, section: int) {.slot.} =
self.data.sort(self, section)
95 changes: 95 additions & 0 deletions ngui/blockmodel.nim
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
import NimQml

import
std/[sequtils, times],
NimQml,
../beacon_chain/spec/eth2_apis/rest_beacon_client,
../beacon_chain/spec/datatypes/[phase0, altair],
"."/[
attestationlist, depositlist, attesterslashinglist, proposerslashinglist,
voluntaryexitlist, utils]

QtObject:
type
BlockModel* = ref object of QObject
blck: phase0.SignedBeaconBlock
attestationsx: AttestationList
depositsx: DepositList
attester_slashingsx: AttesterSlashingList
proposer_slashingsx: ProposerSlashingList
voluntary_exitsx: VoluntaryExitList
genesis_time*: uint64

proc delete*(self: BlockModel) =
self.QObject.delete

proc setup*(self: BlockModel) =
self.QObject.setup

proc newBlockModel*(blck: phase0.SignedBeaconBlock, genesis_time: uint64): BlockModel =
let res = BlockModel(
blck: blck,
attestationsx: newAttestationList(blck.message.body.attestations.asSeq()),
depositsx: newDepositList(blck.message.body.deposits.mapIt(it.toDepositInfo())),
attester_slashingsx: newAttesterSlashingList(blck.message.body.attester_slashings.asSeq()),
proposer_slashingsx: newProposerSlashingList(blck.message.body.proposer_slashings.asSeq()),
voluntary_exitsx: newVoluntaryExitList(blck.message.body.voluntary_exits.asSeq()),
genesis_time: genesis_time,
)
res.setup()
res

proc `blck=`*(self: BlockModel, blck: phase0.SignedBeaconBlock) =
self.blck = blck
self.attestationsx.setNewData(blck.message.body.attestations.asSeq())
self.depositsx.setNewData(blck.message.body.deposits.mapIt(it.toDepositInfo()))
self.attester_slashingsx.setNewData(blck.message.body.attester_slashings.asSeq())
self.proposer_slashingsx.setNewData(blck.message.body.proposer_slashings.asSeq())
self.voluntary_exitsx.setNewData(blck.message.body.voluntary_exits.asSeq())

proc slot*(self: BlockModel): int {.slot.} = self.blck.message.slot.int
QtProperty[int] slot: read = slot

proc time*(self: BlockModel): string {.slot.} =
let t = self.genesis_time + self.blck.message.slot * SECONDS_PER_SLOT
$fromUnix(t.int64).utc
QtProperty[string] time: read = time

proc root*(self: BlockModel): string {.slot.} = toDisplayHex(self.blck.root.data)
QtProperty[string] root: read = root

proc proposer_index*(self: BlockModel): int {.slot.} = self.blck.message.proposer_index.int
QtProperty[int] proposer_index: read = proposer_index

proc parent_root*(self: BlockModel): string {.slot.} = toBlockLink(self.blck.message.parent_root)
QtProperty[string] parent_root: read = parent_root

proc state_root*(self: BlockModel): string {.slot.} = toDisplayHex(self.blck.message.state_root.data)
QtProperty[string] state_root: read = state_root

proc randao_reveal*(self: BlockModel): string {.slot.} = toDisplayHex(self.blck.message.body.randao_reveal)
QtProperty[string] randao_reveal: read = randao_reveal

proc eth1_data*(self: BlockModel): string {.slot.} = RestJson.encode(self.blck.message.body.eth1_data, pretty=true)
QtProperty[string] eth1_data: read = eth1_data

proc graffiti*(self: BlockModel): string {.slot.} = $self.blck.message.body.graffiti
QtProperty[string] graffiti: read = graffiti

proc proposer_slashings*(self: BlockModel): QVariant {.slot.} = newQVariant(self.proposer_slashingsx)
QtProperty[QVariant] proposer_slashings: read = proposer_slashings

proc attester_slashings*(self: BlockModel): QVariant {.slot.} = newQVariant(self.attester_slashingsx)
QtProperty[QVariant] attester_slashings: read = attester_slashings

proc attestations*(self: BlockModel): QVariant {.slot.} = newQVariant(self.attestationsx)
QtProperty[QVariant] attestations: read = attestations

proc deposits*(self: BlockModel): QVariant {.slot.} = newQVariant(self.depositsx)
QtProperty[QVariant] deposits: read = deposits

proc voluntary_exits*(self: BlockModel): QVariant {.slot.} = newQVariant(self.voluntary_exitsx)
QtProperty[QVariant] voluntary_exits: read = voluntary_exits

proc signature*(self: BlockModel): string {.slot.} = toDisplayHex(self.blck.signature)
QtProperty[string] signature: read = signature
56 changes: 56 additions & 0 deletions ngui/depositlist.nim
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
import
std/[tables],
NimQml,
../beacon_chain/spec/datatypes/base,
./objecttablemodel, ./utils

type
DepositInfo* = object
pubkey*: string
withdrawal_credentials*: string
amount*: uint64
signature*: string

proc toDepositInfo*(v: Deposit): DepositInfo =
DepositInfo(
pubkey: toDisplayHex(v.data.pubkey.toRaw()),
withdrawal_credentials: toDisplayHex(v.data.withdrawal_credentials),
amount: v.data.amount,
signature: toDisplayHex(v.data.signature),
)

QtObject:
type DepositList* = ref object of QAbstractTableModel
# TODO this could be a generic ObjectTableModel, except generics + method don't work..
data: ObjectTableModelImpl[DepositInfo]

proc setup(self: DepositList) = self.QAbstractTableModel.setup

proc delete(self: DepositList) =
self.QAbstractTableModel.delete

proc newDepositList*(data: seq[DepositInfo]): DepositList =
new(result, delete)
result.data = ObjectTableModelImpl[DepositInfo](items: data)
result.setup

method rowCount(self: DepositList, index: QModelIndex = nil): int =
self.data.rowCount(index)

method columnCount(self: DepositList, index: QModelIndex = nil): int =
self.data.columnCount(index)

method headerData*(self: DepositList, section: int, orientation: QtOrientation, role: int): QVariant =
self.data.headerData(section, orientation, role)

method data(self: DepositList, index: QModelIndex, role: int): QVariant =
self.data.data(index, role)

method roleNames(self: DepositList): Table[int, string] =
self.data.roleNames()

proc setNewData*(self: DepositList, v: seq[DepositInfo]) =
self.data.setNewData(self, v)

proc sort*(self: DepositList, section: int) {.slot.} =
self.data.sort(self, section)
52 changes: 52 additions & 0 deletions ngui/epochmodel.nim
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import NimQml

import
../beacon_chain/spec/eth2_apis/rest_beacon_client,
./slotlist

QtObject:
type
EpochModel* = ref object of QObject
client: RestClientRef
epoch: int
slotList: SlotList

proc delete*(self: EpochModel) =
self.QObject.delete

proc setup*(self: EpochModel) =
self.QObject.setup

proc newEpochModel*(client: RestClientRef, epoch: int): EpochModel =
let data = client.loadSlots(epoch.Epoch)
let res = EpochModel(client: client, epoch: epoch, slotList: newSlotList(data))
res.setup()
res

proc epoch*(self: EpochModel): int {.slot.} = self.epoch
proc epochChanged*(self: EpochModel, v: int) {.signal.}
QtProperty[int] epoch:
read = epoch
notify = epochChanged

proc getSlotList*(self: EpochModel): QVariant {.slot.} = newQVariant(self.slotList)
QtProperty[QVariant] slotList: read = getSlotList

proc setNewData*(self: EpochModel, epoch: int, data: seq[SlotInfo]) =
self.epoch = epoch
self.epochChanged(epoch)

self.slotList.setNewData(data)

proc reload(self: EpochModel) {.slot.} =
self.slotList.setNewData(self.client.loadSlots(self.epoch.Epoch))

proc next(self: EpochModel) {.slot.} =
self.epoch = self.epoch + 1
self.epochChanged(self.epoch)
self.reload() # TODO listen to epochchanged

proc prev(self: EpochModel) {.slot.} =
self.epoch = self.epoch - 1
self.epochChanged(self.epoch)
self.reload() # TODO listen to epochchanged

0 comments on commit 36bb2cf

Please sign in to comment.