Skip to content

Commit

Permalink
Merge pull request #7 from paxosglobal/CHAINS-4196-fix-merge
Browse files Browse the repository at this point in the history
CHAINS-4196 - fix bad upstream merge
  • Loading branch information
gitteri authored Jun 27, 2024
2 parents e23a7f6 + ac97ebb commit 7daa64b
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions rpcclient/infrastructure.go
Original file line number Diff line number Diff line change
Expand Up @@ -1589,9 +1589,9 @@ func (c *Client) BackendVersion() (BackendVersion, error) {
// Parse the btcd version and cache it.
case nil:
log.Debugf("Detected btcd version: %v", info.Version)
version := Btcd
c.backendVersion = &version
return *c.backendVersion, nil
version := parseBtcdVersion(info.Version)
c.backendVersion = version
return c.backendVersion, nil
default:
log.Debugf("Could not detect bitcoind version from GetInfo. error: %v", err)
}
Expand All @@ -1604,12 +1604,12 @@ func (c *Client) BackendVersion() (BackendVersion, error) {
log.Debugf("Could not detect bitcoind version from GetNetworkInfo. error: %v", err)
}

// assume the network is beyond v0.19
// assume the network is beyond v0.25
if networkInfo == nil {
log.Debug("Could not detect bitcoind version. Assuming post v0.19")
version := BitcoindPost19
version := BitcoindPost25
c.backendVersion = &version
return BitcoindPost19, nil
return BitcoindPost25, nil
}

// Parse the bitcoind version and cache it.
Expand Down

0 comments on commit 7daa64b

Please sign in to comment.