added subversion field to result of getinfo
This commit is contained in:
parent
f05b1175bf
commit
ab2ab365a9
@ -85,6 +85,10 @@ func (c *blockChainWithMetrics) GetNetworkName() string {
|
|||||||
return c.b.GetNetworkName()
|
return c.b.GetNetworkName()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *blockChainWithMetrics) GetSubversion() string {
|
||||||
|
return c.b.GetSubversion()
|
||||||
|
}
|
||||||
|
|
||||||
func (c *blockChainWithMetrics) GetBestBlockHash() (v string, err error) {
|
func (c *blockChainWithMetrics) GetBestBlockHash() (v string, err error) {
|
||||||
defer func(s time.Time) { c.observeRPCLatency("GetBestBlockHash", s, err) }(time.Now())
|
defer func(s time.Time) { c.observeRPCLatency("GetBestBlockHash", s, err) }(time.Now())
|
||||||
return c.b.GetBestBlockHash()
|
return c.b.GetBestBlockHash()
|
||||||
|
|||||||
@ -29,6 +29,7 @@ type BitcoinRPC struct {
|
|||||||
Mempool *bchain.UTXOMempool
|
Mempool *bchain.UTXOMempool
|
||||||
ParseBlocks bool
|
ParseBlocks bool
|
||||||
mq *bchain.MQ
|
mq *bchain.MQ
|
||||||
|
Subversion string
|
||||||
}
|
}
|
||||||
|
|
||||||
type configuration struct {
|
type configuration struct {
|
||||||
@ -38,6 +39,7 @@ type configuration struct {
|
|||||||
RPCTimeout int `json:"rpcTimeout"`
|
RPCTimeout int `json:"rpcTimeout"`
|
||||||
Parse bool `json:"parse"`
|
Parse bool `json:"parse"`
|
||||||
ZeroMQBinding string `json:"zeroMQBinding"`
|
ZeroMQBinding string `json:"zeroMQBinding"`
|
||||||
|
Subversion string `json:"subversion"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewBitcoinRPC returns new BitcoinRPC instance.
|
// NewBitcoinRPC returns new BitcoinRPC instance.
|
||||||
@ -60,6 +62,7 @@ func NewBitcoinRPC(config json.RawMessage, pushHandler func(bchain.NotificationT
|
|||||||
user: c.RPCUser,
|
user: c.RPCUser,
|
||||||
password: c.RPCPass,
|
password: c.RPCPass,
|
||||||
ParseBlocks: c.Parse,
|
ParseBlocks: c.Parse,
|
||||||
|
Subversion: c.Subversion,
|
||||||
}
|
}
|
||||||
|
|
||||||
mq, err := bchain.NewMQ(c.ZeroMQBinding, pushHandler)
|
mq, err := bchain.NewMQ(c.ZeroMQBinding, pushHandler)
|
||||||
@ -119,6 +122,10 @@ func (b *BitcoinRPC) GetNetworkName() string {
|
|||||||
return b.Network
|
return b.Network
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (b *BitcoinRPC) GetSubversion() string {
|
||||||
|
return b.Subversion
|
||||||
|
}
|
||||||
|
|
||||||
// getblockhash
|
// getblockhash
|
||||||
|
|
||||||
type cmdGetBlockHash struct {
|
type cmdGetBlockHash struct {
|
||||||
|
|||||||
@ -240,6 +240,10 @@ func (b *EthereumRPC) GetNetworkName() string {
|
|||||||
return b.Network
|
return b.Network
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (b *EthereumRPC) GetSubversion() string {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
func (b *EthereumRPC) getBestHeader() (*ethtypes.Header, error) {
|
func (b *EthereumRPC) getBestHeader() (*ethtypes.Header, error) {
|
||||||
b.bestHeaderMu.Lock()
|
b.bestHeaderMu.Lock()
|
||||||
defer b.bestHeaderMu.Unlock()
|
defer b.bestHeaderMu.Unlock()
|
||||||
|
|||||||
@ -123,6 +123,7 @@ type BlockChain interface {
|
|||||||
// chain info
|
// chain info
|
||||||
IsTestnet() bool
|
IsTestnet() bool
|
||||||
GetNetworkName() string
|
GetNetworkName() string
|
||||||
|
GetSubversion() string
|
||||||
// requests
|
// requests
|
||||||
GetBestBlockHash() (string, error)
|
GetBestBlockHash() (string, error)
|
||||||
GetBestBlockHeight() (uint32, error)
|
GetBestBlockHeight() (uint32, error)
|
||||||
|
|||||||
@ -4,5 +4,6 @@
|
|||||||
"rpcPass": "rpc",
|
"rpcPass": "rpc",
|
||||||
"rpcTimeout": 25,
|
"rpcTimeout": 25,
|
||||||
"parse": true,
|
"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)/"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -4,5 +4,6 @@
|
|||||||
"rpcPass": "rpc",
|
"rpcPass": "rpc",
|
||||||
"rpcTimeout": 25,
|
"rpcTimeout": 25,
|
||||||
"parse": true,
|
"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)/"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -599,6 +599,7 @@ func (s *SocketIoServer) getInfo() (res resultGetInfo, err error) {
|
|||||||
res.Result.Blocks = int(height)
|
res.Result.Blocks = int(height)
|
||||||
res.Result.Testnet = s.chain.IsTestnet()
|
res.Result.Testnet = s.chain.IsTestnet()
|
||||||
res.Result.Network = s.chain.GetNetworkName()
|
res.Result.Network = s.chain.GetNetworkName()
|
||||||
|
res.Result.Subversion = s.chain.GetSubversion()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user