RanchiMall/blockbook
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return ethereum consensus layer node version via API

Browse Source
This commit is contained in:
Martin Boehm 2022-08-26 17:42:03 +02:00 committed by Martin
parent 76b6f93059
commit 835d0e07ba
13 changed files with 120 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
api/worker.go
View File

@ -2075,19 +2075,20 @@ func (w *Worker) GetSystemInfo(internal bool) (*SystemInfo, error) {
About: Text.BlockbookAbout,
}
backendInfo := &common.BackendInfo{
BackendError: backendError,
BestBlockHash: ci.Bestblockhash,
Blocks: ci.Blocks,
Chain: ci.Chain,
Difficulty: ci.Difficulty,
Headers: ci.Headers,
ProtocolVersion: ci.ProtocolVersion,
SizeOnDisk: ci.SizeOnDisk,
Subversion: ci.Subversion,
Timeoffset: ci.Timeoffset,
Version: ci.Version,
Warnings: ci.Warnings,
Consensus: ci.Consensus,
BackendError: backendError,
BestBlockHash: ci.Bestblockhash,
Blocks: ci.Blocks,
Chain: ci.Chain,
Difficulty: ci.Difficulty,
Headers: ci.Headers,
ProtocolVersion: ci.ProtocolVersion,
SizeOnDisk: ci.SizeOnDisk,
Subversion: ci.Subversion,
Timeoffset: ci.Timeoffset,
Version: ci.Version,
Warnings: ci.Warnings,
ConsensusVersion: ci.ConsensusVersion,
Consensus: ci.Consensus,
}
w.is.SetBackendInfo(backendInfo)
glog.Info("GetSystemInfo, ", time.Since(start))

44
bchain/coins/eth/ethrpc.go
View File

@ -4,7 +4,9 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"math/big"
"net/http"
"strconv"
"strings"
"sync"
@ -46,6 +48,7 @@ type Configuration struct {
QueryBackendOnMempoolResync bool `json:"queryBackendOnMempoolResync"`
ProcessInternalTransactions bool `json:"processInternalTransactions"`
ProcessZeroInternalTransactions bool `json:"processZeroInternalTransactions"`
ConsensusNodeVersionURL string `json:"consensusNodeVersion"`
}
// EthereumRPC is an interface to JSON-RPC eth service.
@ -335,6 +338,37 @@ func (b *EthereumRPC) GetSubversion() string {
return ""
}
func (b *EthereumRPC) getConsensusVersion() string {
if b.ChainConfig.ConsensusNodeVersionURL == "" {
return ""
}
httpClient := &http.Client{
Timeout: 2 * time.Second,
}
resp, err := httpClient.Get(b.ChainConfig.ConsensusNodeVersionURL)
if err != nil || resp.StatusCode != http.StatusOK {
glog.Error("getConsensusVersion ", err)
return ""
}
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
glog.Error("getConsensusVersion ", err)
return ""
}
type consensusVersion struct {
Data struct {
Version string `json:"version"`
} `json:"data"`
}
var v consensusVersion
err = json.Unmarshal(body, &v)
if err != nil {
glog.Error("getConsensusVersion ", err)
return ""
}
return v.Data.Version
}
// GetChainInfo returns information about the connected backend
func (b *EthereumRPC) GetChainInfo() (*bchain.ChainInfo, error) {
h, err := b.getBestHeader()
@ -351,11 +385,13 @@ func (b *EthereumRPC) GetChainInfo() (*bchain.ChainInfo, error) {
if err := b.rpc.CallContext(ctx, &ver, "web3_clientVersion"); err != nil {
return nil, err
}
consensusVersion := b.getConsensusVersion()
rv := &bchain.ChainInfo{
Blocks: int(h.Number.Int64()),
Bestblockhash: h.Hash().Hex(),
Difficulty: h.Difficulty.String(),
Version: ver,
Blocks: int(h.Number.Int64()),
Bestblockhash: h.Hash().Hex(),
Difficulty: h.Difficulty.String(),
Version: ver,
ConsensusVersion: consensusVersion,
}
idi := int(id.Uint64())
if idi == 1 {

25
bchain/types.go
View File

@ -192,18 +192,19 @@ type MempoolEntry struct {
// ChainInfo is used to get information about blockchain
type ChainInfo struct {
Chain string `json:"chain"`
Blocks int `json:"blocks"`
Headers int `json:"headers"`
Bestblockhash string `json:"bestblockhash"`
Difficulty string `json:"difficulty"`
SizeOnDisk int64 `json:"size_on_disk"`
Version string `json:"version"`
Subversion string `json:"subversion"`
ProtocolVersion string `json:"protocolversion"`
Timeoffset float64 `json:"timeoffset"`
Warnings string `json:"warnings"`
Consensus interface{} `json:"consensus,omitempty"`
Chain string `json:"chain"`
Blocks int `json:"blocks"`
Headers int `json:"headers"`
Bestblockhash string `json:"bestblockhash"`
Difficulty string `json:"difficulty"`
SizeOnDisk int64 `json:"size_on_disk"`
Version string `json:"version"`
Subversion string `json:"subversion"`
ProtocolVersion string `json:"protocolversion"`
Timeoffset float64 `json:"timeoffset"`
Warnings string `json:"warnings"`
ConsensusVersion string `json:"consensus_version,omitempty"`
Consensus interface{} `json:"consensus,omitempty"`
}
// RPCError defines rpc error returned by backend

27
common/internalstate.go
View File

@ -31,19 +31,20 @@ type InternalStateColumn struct {
// BackendInfo is used to get information about blockchain
type BackendInfo struct {
BackendError string `json:"error,omitempty"`
Chain string `json:"chain,omitempty"`
Blocks int `json:"blocks,omitempty"`
Headers int `json:"headers,omitempty"`
BestBlockHash string `json:"bestBlockHash,omitempty"`
Difficulty string `json:"difficulty,omitempty"`
SizeOnDisk int64 `json:"sizeOnDisk,omitempty"`
Version string `json:"version,omitempty"`
Subversion string `json:"subversion,omitempty"`
ProtocolVersion string `json:"protocolVersion,omitempty"`
Timeoffset float64 `json:"timeOffset,omitempty"`
Warnings string `json:"warnings,omitempty"`
Consensus interface{} `json:"consensus,omitempty"`
BackendError string `json:"error,omitempty"`
Chain string `json:"chain,omitempty"`
Blocks int `json:"blocks,omitempty"`
Headers int `json:"headers,omitempty"`
BestBlockHash string `json:"bestBlockHash,omitempty"`
Difficulty string `json:"difficulty,omitempty"`
SizeOnDisk int64 `json:"sizeOnDisk,omitempty"`
Version string `json:"version,omitempty"`
Subversion string `json:"subversion,omitempty"`
ProtocolVersion string `json:"protocolVersion,omitempty"`
Timeoffset float64 `json:"timeOffset,omitempty"`
Warnings string `json:"warnings,omitempty"`
ConsensusVersion string `json:"consensus_version,omitempty"`
Consensus interface{} `json:"consensus,omitempty"`
}
// InternalState contains the data of the internal state

3
configs/coins/ethereum.json
View File

@ -51,10 +51,11 @@
"mempool_sub_workers": 2,
"block_addresses_to_keep": 300,
"additional_params": {
"consensusNodeVersion": "http://localhost:7536/eth/v1/node/version",
"mempoolTxTimeoutHours": 48,
"queryBackendOnMempoolResync": false,
"fiat_rates": "coingecko",
"fiat_rates_params": "{\"url\": \"https://api.coingecko.com/api/v3\", \"coin\": \"ethereum\", \"periodSeconds\": 60}"
"fiat_rates_params": "{\"url\": \"https://api.coingecko.com/api/v3\", \"coin\": \"ethereum\",\"platformIdentifier\": \"ethereum\",\"platformVsCurrency\": \"eth\",\"periodSeconds\": 900}"
}
}
},

1
configs/coins/ethereum_archive.json
View File

@ -51,6 +51,7 @@
"mempool_sub_workers": 2,
"block_addresses_to_keep": 600,
"additional_params": {
"consensusNodeVersion": "http://localhost:7516/eth/v1/node/version",
"address_aliases": true,
"mempoolTxTimeoutHours": 48,
"processInternalTransactions": true,

1
configs/coins/ethereum_testnet_goerli.json
View File

@ -51,6 +51,7 @@
"mempool_sub_workers": 2,
"block_addresses_to_keep": 3000,
"additional_params": {
"consensusNodeVersion": "http://localhost:17526/eth/v1/node/version",
"mempoolTxTimeoutHours": 12,
"queryBackendOnMempoolResync": false
}

1
configs/coins/ethereum_testnet_goerli_archive.json
View File

@ -51,6 +51,7 @@
"mempool_sub_workers": 2,
"block_addresses_to_keep": 3000,
"additional_params": {
"consensusNodeVersion": "http://localhost:17506/eth/v1/node/version",
"address_aliases": true,
"mempoolTxTimeoutHours": 12,
"processInternalTransactions": true,

1
configs/coins/ethereum_testnet_ropsten.json
View File

@ -51,6 +51,7 @@
"mempool_sub_workers": 2,
"block_addresses_to_keep": 3000,
"additional_params": {
"consensusNodeVersion": "http://localhost:17536/eth/v1/node/version",
"mempoolTxTimeoutHours": 12,
"queryBackendOnMempoolResync": false
}

1
configs/coins/ethereum_testnet_ropsten_archive.json
View File

@ -51,6 +51,7 @@
"mempool_sub_workers": 2,
"block_addresses_to_keep": 3000,
"additional_params": {
"consensusNodeVersion": "http://localhost:17516/eth/v1/node/version",
"address_aliases": true,
"mempoolTxTimeoutHours": 12,
"processInternalTransactions": true,

27
db/sync.go
View File

@ -58,19 +58,20 @@ func (w *SyncWorker) updateBackendInfo() {
ci = &bchain.ChainInfo{}
}
w.is.SetBackendInfo(&common.BackendInfo{
BackendError: backendError,
BestBlockHash: ci.Bestblockhash,
Blocks: ci.Blocks,
Chain: ci.Chain,
Difficulty: ci.Difficulty,
Headers: ci.Headers,
ProtocolVersion: ci.ProtocolVersion,
SizeOnDisk: ci.SizeOnDisk,
Subversion: ci.Subversion,
Timeoffset: ci.Timeoffset,
Version: ci.Version,
Warnings: ci.Warnings,
Consensus: ci.Consensus,
BackendError: backendError,
BestBlockHash: ci.Bestblockhash,
Blocks: ci.Blocks,
Chain: ci.Chain,
Difficulty: ci.Difficulty,
Headers: ci.Headers,
ProtocolVersion: ci.ProtocolVersion,
SizeOnDisk: ci.SizeOnDisk,
Subversion: ci.Subversion,
Timeoffset: ci.Timeoffset,
Version: ci.Version,
Warnings: ci.Warnings,
ConsensusVersion: ci.ConsensusVersion,
Consensus: ci.Consensus,
})
}

14
server/websocket.go
View File

@ -569,9 +569,10 @@ func (s *WebsocketServer) getInfo() (interface{}, error) {
return nil, err
}
type backendInfo struct {
Version string `json:"version,omitempty"`
Subversion string `json:"subversion,omitempty"`
Consensus interface{} `json:"consensus,omitempty"`
Version string `json:"version,omitempty"`
Subversion string `json:"subversion,omitempty"`
ConsensusVersion string `json:"consensus_version,omitempty"`
Consensus interface{} `json:"consensus,omitempty"`
}
type info struct {
Name string `json:"name"`
@ -594,9 +595,10 @@ func (s *WebsocketServer) getInfo() (interface{}, error) {
Block0Hash: s.block0hash,
Testnet: s.chain.IsTestnet(),
Backend: backendInfo{
Version: bi.Version,
Subversion: bi.Subversion,
Consensus: bi.Consensus,
Version: bi.Version,
Subversion: bi.Subversion,
ConsensusVersion: bi.ConsensusVersion,
Consensus: bi.Consensus,
},
}, nil
}

10
static/templates/index.html
View File

@ -72,14 +72,24 @@
<td>Version</td>
<td class="data">{{$be.Version}}</td>
</tr>
{{- if $be.Subversion -}}
<tr>
<td>Subversion</td>
<td class="data">{{$be.Subversion}}</td>
</tr>
{{- end -}}
{{- if $be.ProtocolVersion -}}
<tr>
<td>Protocol Version</td>
<td class="data">{{$be.ProtocolVersion}}</td>
</tr>
{{- end -}}
{{- if $be.ConsensusVersion -}}
<tr>
<td>Consensus Version</td>
<td class="data">{{$be.ConsensusVersion}}</td>
</tr>
{{- end -}}
<tr>
<td>Last Block</td>
<td class="data">{{$be.Blocks}}</td>