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

added subversion field to result of getinfo

Browse Source
This commit is contained in:
Jakub Matys 2018-04-27 10:53:33 +02:00
parent f05b1175bf
commit ab2ab365a9
7 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bchain/coins/blockchain.go
View File

@ -85,6 +85,10 @@ func (c *blockChainWithMetrics) GetNetworkName() string {
return c.b.GetNetworkName()
}
func (c *blockChainWithMetrics) GetSubversion() string {
return c.b.GetSubversion()
}
func (c *blockChainWithMetrics) GetBestBlockHash() (v string, err error) {
defer func(s time.Time) { c.observeRPCLatency("GetBestBlockHash", s, err) }(time.Now())
return c.b.GetBestBlockHash()

7
bchain/coins/btc/bitcoinrpc.go
View File

@ -29,6 +29,7 @@ type BitcoinRPC struct {
Mempool *bchain.UTXOMempool
ParseBlocks bool
mq *bchain.MQ
Subversion string
}
type configuration struct {
@ -38,6 +39,7 @@ type configuration struct {
RPCTimeout int `json:"rpcTimeout"`
Parse bool `json:"parse"`
ZeroMQBinding string `json:"zeroMQBinding"`
Subversion string `json:"subversion"`
}
// NewBitcoinRPC returns new BitcoinRPC instance.
@ -60,6 +62,7 @@ func NewBitcoinRPC(config json.RawMessage, pushHandler func(bchain.NotificationT
user: c.RPCUser,
password: c.RPCPass,
ParseBlocks: c.Parse,
Subversion: c.Subversion,
}
mq, err := bchain.NewMQ(c.ZeroMQBinding, pushHandler)
@ -119,6 +122,10 @@ func (b *BitcoinRPC) GetNetworkName() string {
return b.Network
}
func (b *BitcoinRPC) GetSubversion() string {
return b.Subversion
}
// getblockhash
type cmdGetBlockHash struct {

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

@ -240,6 +240,10 @@ func (b *EthereumRPC) GetNetworkName() string {
return b.Network
}
func (b *EthereumRPC) GetSubversion() string {
return ""
}
func (b *EthereumRPC) getBestHeader() (*ethtypes.Header, error) {
b.bestHeaderMu.Lock()
defer b.bestHeaderMu.Unlock()

1
bchain/types.go
View File

@ -123,6 +123,7 @@ type BlockChain interface {
// chain info
IsTestnet() bool
GetNetworkName() string
GetSubversion() string
// requests
GetBestBlockHash() (string, error)
GetBestBlockHeight() (uint32, error)

3
configs/bch-testnet.json
View File

@ -4,5 +4,6 @@
"rpcPass": "rpc",
"rpcTimeout": 25,
"parse": true,
"zeroMQBinding": "tcp://127.0.0.1:18434"
"zeroMQBinding": "tcp://127.0.0.1:18434",
"subversion": "/Bitcoin ABC:0.17.0(EB8.0; bitcore-sl)/"
}

3
configs/bch.json
View File

@ -4,5 +4,6 @@
"rpcPass": "rpc",
"rpcTimeout": 25,
"parse": true,
"zeroMQBinding": "tcp://127.0.0.1:8434"
"zeroMQBinding": "tcp://127.0.0.1:8434",
"subversion": "/Bitcoin ABC:0.17.0(EB8.0; bitcore-sl)/"
}

1
server/socketio.go
View File

@ -599,6 +599,7 @@ func (s *SocketIoServer) getInfo() (res resultGetInfo, err error) {
res.Result.Blocks = int(height)
res.Result.Testnet = s.chain.IsTestnet()
res.Result.Network = s.chain.GetNetworkName()
res.Result.Subversion = s.chain.GetSubversion()
return
}