diff options
| author | Max K <[email protected]> | 2019-07-14 20:53:40 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-07-14 20:53:40 +0200 |
| commit | c3481480222c16b59926f4b6a7fd9ae034931b86 (patch) | |
| tree | 4d035dc1672a22ccffb429be70843dd7ac1d7573 | |
| parent | Merge branch 'rnicoll-rnicoll/1.14-litecoin-scrypt' into 1.14-maint (diff) | |
| parent | Fix RPC description of supermajority based forks (diff) | |
| download | discoin-1.14.1.tar.xz discoin-1.14.1.zip | |
Merge pull request #1601 from langerhans/1.14-supermajority-rpcv1.14.1
Fix RPC description of supermajority based forks
| -rw-r--r-- | src/rpc/blockchain.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index e1119495f..6d3264130 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -1076,7 +1076,7 @@ static UniValue SoftForkMajorityDesc(int version, CBlockIndex* pindex, const Con CBlockIndex* pstart = pindex; for (int i = 0; i < consensusParams.nMajorityWindow && pstart != NULL; i++) { - if (pstart->nVersion >= version) + if (pstart->GetBaseVersion() >= version) ++nFound; pstart = pstart->pprev; } |