Skip to content

Commit

Permalink
fix block-view
Browse files Browse the repository at this point in the history
  • Loading branch information
@guybrush
guybrush committed Jun 27, 2022
1 parent cf55f97 commit b6d1cb0
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 40 deletions.
4 changes: 2 additions & 2 deletions db/db.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1221,7 +1221,7 @@ func saveBlocks(blocks map[uint64]map[string]*types.Block, tx *sql.Tx) error {
}()

stmtBlock, err := tx.Prepare(`
INSERT INTO blocks (epoch, slot, blockroot, parentroot, stateroot, signature, randaoreveal, graffiti, graffiti_text, eth1data_depositroot, eth1data_depositcount, eth1data_blockhash, syncaggregate_bits, syncaggregate_signature, proposerslashingscount, attesterslashingscount, attestationscount, depositscount, voluntaryexitscount, syncaggregate_participation, proposer, status, exec_parenthash, exec_fee_recipient, exec_stateroot, exec_receiptroot, exec_logsbloom, exec_random, exec_block_number, exec_gas_limit, exec_gas_used, exec_timestamp, exec_extra_data, exec_base_fee_per_gas, exec_blockhash, exec_transactioncount)
INSERT INTO blocks (epoch, slot, blockroot, parentroot, stateroot, signature, randaoreveal, graffiti, graffiti_text, eth1data_depositroot, eth1data_depositcount, eth1data_blockhash, syncaggregate_bits, syncaggregate_signature, proposerslashingscount, attesterslashingscount, attestationscount, depositscount, voluntaryexitscount, syncaggregate_participation, proposer, status, exec_parenthash, exec_fee_recipient, exec_state_root, exec_receipts_root, exec_logs_bloom, exec_random, exec_block_number, exec_gas_limit, exec_gas_used, exec_timestamp, exec_extra_data, exec_base_fee_per_gas, exec_block_hash, exec_transactions_count)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27, $28, $29, $30, $31, $32, $33, $34, $35, $36)
ON CONFLICT (slot, blockroot) DO NOTHING`)
if err != nil {
Expand Down Expand Up @@ -1365,7 +1365,7 @@ func saveBlocks(blocks map[uint64]map[string]*types.Block, tx *sql.Tx) error {
stateRoot = b.ExecutionPayload.StateRoot
receiptRoot = b.ExecutionPayload.ReceiptsRoot
logsBloom = b.ExecutionPayload.LogsBloom
random = b.ExecutionPayload.PrevRandao
random = b.ExecutionPayload.Random
blockNumber = b.ExecutionPayload.BlockNumber
gasLimit = b.ExecutionPayload.GasLimit
gasUsed = b.ExecutionPayload.GasUsed
Expand Down
6 changes: 4 additions & 2 deletions handlers/block.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ func Block(w http.ResponseWriter, r *http.Request) {
if err != nil {
data.Meta.Title = fmt.Sprintf("%v - Slot %v - beaconcha.in - %v", utils.Config.Frontend.SiteName, slotOrHash, time.Now().Year())
data.Meta.Path = "/block/" + slotOrHash
logger.Errorf("error retrieving block data: %v", err)
logger.Errorf("error retrieving blockPageData: %v", err)
err = blockNotFoundTemplate.ExecuteTemplate(w, "layout", data)

if err != nil {
Expand All @@ -156,7 +156,9 @@ func Block(w http.ResponseWriter, r *http.Request) {
data.Meta.Path = fmt.Sprintf("/block/%v", blockPageData.Slot)

blockPageData.Ts = utils.SlotToTime(blockPageData.Slot)
blockPageData.ExecTime = time.Unix(int64(blockPageData.ExecTimestamp), 0)
if blockPageData.ExecTimestamp.Valid {
blockPageData.ExecTime = time.Unix(int64(blockPageData.ExecTimestamp.Int64), 0)
}
blockPageData.SlashingsCount = blockPageData.AttesterSlashingsCount + blockPageData.ProposerSlashingsCount

err = db.ReaderDb.Get(&blockPageData.NextSlot, "SELECT slot FROM blocks WHERE slot > $1 ORDER BY slot LIMIT 1", blockPageData.Slot)
Expand Down
2 changes: 1 addition & 1 deletion rpc/lighthouse.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ func (lc *LighthouseClient) blockFromResponse(parsedHeaders *StandardBeaconHeade
StateRoot: payload.StateRoot,
ReceiptsRoot: payload.ReceiptsRoot,
LogsBloom: payload.LogsBloom,
PrevRandao: payload.PrevRandao,
Random: payload.PrevRandao,
BlockNumber: uint64(payload.BlockNumber),
GasLimit: uint64(payload.GasLimit),
GasUsed: uint64(payload.GasUsed),
Expand Down
29 changes: 14 additions & 15 deletions tables.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,21 +301,20 @@ create table blocks

-- https://ethereum.github.io/beacon-APIs/#/Beacon/getBlockV2
-- https://github.com/ethereum/consensus-specs/blob/v1.1.9/specs/bellatrix/beacon-chain.md#executionpayload
-- RPC-NAME
exec_parenthash bytea, -- parent_hash
exec_fee_recipient bytea, -- fee_recipient
exec_stateroot bytea, -- state_root
exec_receiptroot bytea, -- receipts_root
exec_logsbloom bytea, -- logs_bloom
exec_random bytea, -- prev_randao
exec_block_number int, -- block_number
exec_gas_limit int, -- gas_limit
exec_gas_used int, -- gas_used
exec_timestamp int, -- timestamp
exec_extra_data bytea, -- extra_data
exec_base_fee_per_gas bigint, -- base_fee_per_gas
exec_blockhash bytea, -- block_hash
exec_transactioncount int,
exec_parent_hash bytea,
exec_fee_recipient bytea,
exec_state_root bytea,
exec_receipts_root bytea,
exec_logs_bloom bytea,
exec_random bytea,
exec_block_number int,
exec_gas_limit int,
exec_gas_used int,
exec_timestamp int,
exec_extra_data bytea,
exec_base_fee_per_gas bigint,
exec_block_hash bytea,
exec_transactions_count int not null default 0,

primary key (slot, blockroot)
);
Expand Down
10 changes: 5 additions & 5 deletions templates/block/overview.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,22 +172,22 @@

<div class="row p-1">
<div class="col-md-2"><span data-toggle="tooltip" data-placement="top" title="Block Number, the height, not the slot">Block Number:</span></div>
<div class="col-md-10 text-monospace text-break">{{.ExecNumber}}</div>
<div class="col-md-10 text-monospace text-break">{{.ExecBlockNumber.Int64}}</div>
</div>

<div class="row p-1">
<div class="col-md-2"><span data-toggle="tooltip" data-placement="top" title="Gas Limit">Gas Limit:</span></div>
<div class="col-md-10 text-monospace text-break">{{.ExecGasLimit}}</div>
<div class="col-md-10 text-monospace text-break">{{.ExecGasLimit.Int64}}</div>
</div>

<div class="row p-1">
<div class="col-md-2"><span data-toggle="tooltip" data-placement="top" title="Gas Used">Gas Used:</span></div>
<div class="col-md-10 text-monospace text-break">{{.ExecGasUsed}}</div>
<div class="col-md-10 text-monospace text-break">{{.ExecGasUsed.Int64}}</div>
</div>

<div class="row p-1">
<div class="col-md-2"><span data-toggle="tooltip" data-placement="top" title="Timestamp">Timestamp:</span></div>
<div class="col-md-5 text-monospace text-break">{{.ExecTimestamp}}</div>
<div class="col-md-5 text-monospace text-break">{{.ExecTimestamp.Int64}}</div>
<div class="col-md-5"><span aria-ethereum-date="{{.ExecTimestamp}}">{{.ExecTime}}</span> (<span aria-ethereum-date="{{.ExecTimestamp}}" aria-ethereum-date-format="FROMNOW"></span>)</div>
</div>

Expand All @@ -200,7 +200,7 @@

<div class="row p-1">
<div class="col-md-2"><span data-toggle="tooltip" data-placement="top" title="Base fee per gas">Base fee per gas:</span></div>
<div class="col-md-10 text-monospace text-break">{{.ExecBaseFeePerGas}}</div>
<div class="col-md-10 text-monospace text-break">{{.ExecBaseFeePerGas.Int64}}</div>
</div>

<div class="row p-1">
Expand Down
2 changes: 1 addition & 1 deletion types/exporter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ type ExecutionPayload struct {
StateRoot []byte
ReceiptsRoot []byte
LogsBloom []byte
PrevRandao []byte
Random []byte
BlockNumber uint64
GasLimit uint64
GasUsed uint64
Expand Down
28 changes: 14 additions & 14 deletions types/templates.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -549,21 +549,21 @@ type BlockPageData struct {
VotingValidatorsCount uint64
Mainnet bool

ExecParentHash []byte `db:"exec_parenthash"`
ExecFeeRecipient []byte `db:"exec_fee_recipient"`
ExecStateRoot []byte `db:"exec_stateroot"`
ExecReceiptRoot []byte `db:"exec_receiptroot"`
ExecLogsBloom []byte `db:"exec_logsbloom"`
ExecRandom []byte `db:"exec_random"`
ExecNumber uint64 `db:"exec_block_number"`
ExecGasLimit uint64 `db:"exec_gas_limit"`
ExecGasUsed uint64 `db:"exec_gas_used"`
ExecTimestamp uint64 `db:"exec_timestamp"`
ExecParentHash []byte `db:"exec_parent_hash"`
ExecFeeRecipient []byte `db:"exec_fee_recipient"`
ExecStateRoot []byte `db:"exec_state_root"`
ExecReceiptsRoot []byte `db:"exec_receipts_root"`
ExecLogsBloom []byte `db:"exec_logs_bloom"`
ExecRandom []byte `db:"exec_random"`
ExecBlockNumber sql.NullInt64 `db:"exec_block_number"`
ExecGasLimit sql.NullInt64 `db:"exec_gas_limit"`
ExecGasUsed sql.NullInt64 `db:"exec_gas_used"`
ExecTimestamp sql.NullInt64 `db:"exec_timestamp"`
ExecTime time.Time
ExecExtraData []byte `db:"exec_extra_data"`
ExecBaseFeePerGas uint64 `db:"exec_base_fee_per_gas"`
ExecBlockHash []byte `db:"exec_blockhash"`
ExecTransactionsCount uint64 `db:"exec_transactioncount"`
ExecExtraData []byte `db:"exec_extra_data"`
ExecBaseFeePerGas sql.NullInt64 `db:"exec_base_fee_per_gas"`
ExecBlockHash []byte `db:"exec_block_hash"`
ExecTransactionsCount uint64 `db:"exec_transactions_count"`

Transactions []*BlockPageTransaction

Expand Down

0 comments on commit b6d1cb0

Please sign in to comment.