DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Auto merge of #3535 - bitcartel:fix_regtest_signrawtransaction, r=str4d

Browse Source 
Do not use APPROX_RELEASE_HEIGHT to get consensus branch id in regtest mode.

Closes #3534
This commit is contained in:
Homu
2018-09-22 11:35:27 -07:00
parent fbbbb1cc82 4c4e1718b1
commit e6f6c5d08c
4 changed files with 52 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/rpc/rawtransaction.cpp
View File

@@ -918,8 +918,11 @@ UniValue signrawtransaction(const UniValue& params, bool fHelp)
bool fHashSingle = ((nHashType & ~SIGHASH_ANYONECANPAY) == SIGHASH_SINGLE);
// Use the approximate release height if it is greater so offline nodes
// have a better estimation of the current height and will be more likely to
// determine the correct consensus branch ID.
int chainHeight = std::max(chainActive.Height() + 1, APPROX_RELEASE_HEIGHT);
// determine the correct consensus branch ID. Regtest mode ignores release height.
int chainHeight = chainActive.Height() + 1;
if (Params().NetworkIDString() != "regtest") {
chainHeight = std::max(chainHeight, APPROX_RELEASE_HEIGHT);
}
// Grab the current consensus branch ID
auto consensusBranchId = CurrentEpochBranchId(chainHeight, Params().GetConsensus());