diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-06-02 17:55:16 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-06-02 17:55:19 -0400 |
| commit | e42c959c1dccf91d1e4bb20a502a3e4590ad279b (patch) | |
| tree | bd6979bf529d28f3f2f215dae2a6cfa61e2c1c6a /src/rpc | |
| parent | a62f0ed64f8bbbdfe6467ac5ce92ef5b5222d1bd (diff) | |
| parent | 412d5fe8791c417bf46fc55a5bb8d59be98a33db (diff) | |
| download | bitcoin-e42c959c1dccf91d1e4bb20a502a3e4590ad279b.tar.xz | |
Merge #19019: [0.20] Fix GBT: Restore "!segwit" and "csv" to "rules" key
412d5fe8791c417bf46fc55a5bb8d59be98a33db QA: feature_segwit: Check that template "rules" includes "!segwit" as appropriate (Luke Dashjr)
2abe8cc3b760219cfa434e4c96e9f8d3611d0037 Bugfix: Include "csv","!segwit" in "rules" (Luke Dashjr)
Pull request description:
Original branch merges cleanly (no rebase needed)
See also #17946
ACKs for top commit:
jnewbery:
utACK 412d5fe8791c417bf46fc55a5bb8d59be98a33db
Tree-SHA512: 8b269f7782c10f02dc245cc377d91f594474eade6a32184a49fa2ed3928d91917e4b83eefee6947bfb5ffff54eca2781f8cf2169c1f0ad3fefca1d4b3cf304dd
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/mining.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index 94590e0da4..5a0af2a056 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -637,6 +637,8 @@ static UniValue getblocktemplate(const JSONRPCRequest& request) result.pushKV("capabilities", aCaps); UniValue aRules(UniValue::VARR); + aRules.push_back("csv"); + if (!fPreSegWit) aRules.push_back("!segwit"); UniValue vbavailable(UniValue::VOBJ); for (int j = 0; j < (int)Consensus::MAX_VERSION_BITS_DEPLOYMENTS; ++j) { Consensus::DeploymentPos pos = Consensus::DeploymentPos(j); |