Skip to content

Commit e697554

Browse files
PastaPastaPastaPastaPastaPasta
authored
Merge pull request #5255 from knst/bc-bp-missing-4
backport: bitcoin#15584, bitcoin#16060, bitcoin#16465, bitcoin#16477, bitcoin#16680, bitcoin#16714, bitcoin#16941, bitcoin#16991, bitcoin#17453, bitcoin#17696, bitcoin#19058 (last batch for v19)
2 parents e3c8dcc + 8457336 commit e697554

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+623
-449
lines changed

‎.travis.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ after_success:
232232
FILE_ENV="./ci/test/00_setup_env_win64.sh"
233233
234234
- stage: test
235-
name: '32-bit + dash [GOAL: install] [GUI: no BIP70]'
235+
name: '32-bit + dash [GOAL: install] [GUI]'
236236
env: >-
237237
FILE_ENV="./ci/test/00_setup_env_i686.sh"
238238
@@ -250,6 +250,7 @@ after_success:
250250
name: 'x86_64 Linux [GOAL: install] [xenial] [no depends, only system libs, sanitizers: thread (TSan), no wallet]'
251251
env: >-
252252
FILE_ENV="./ci/test/00_setup_env_native_tsan.sh"
253+
TEST_RUNNER_EXTRA="--exclude feature_block" # Not enough memory on travis machines
253254
# x86_64 Linux (no depends, only system libs, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer)
254255
- stage: test
255256
name: 'x86_64 Linux [GOAL: install] [bionic] [no depends, only system libs, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer]'
@@ -276,7 +277,7 @@ after_success:
276277
FILE_ENV="./ci/test/00_setup_env_mac.sh"
277278
278279
- stage: test
279-
name: 'macOS 10.14 native [GOAL: install] [GUI: BIP70 enabled] [no depends]'
280+
name: 'macOS 10.14 native [GOAL: install] [GUI] [no depends]'
280281
os: osx
281282
# Use the most recent version:
282283
# Xcode 11, macOS 10.14, JDK 12.0.1

‎ci/test/00_setup_env_mac_host.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
export LC_ALL=C.UTF-8
88

99
export HOST=x86_64-apple-darwin19
10-
export BREW_PACKAGES="automake berkeley-db4 libtool boost miniupnpc pkg-config protobuf qt qrencode python3 ccache zeromq"
10+
export BREW_PACKAGES="automake berkeley-db4 libtool boost miniupnpc pkg-config qt qrencode python3 ccache zeromq"
1111
export PIP_PACKAGES="zmq"
1212
export RUN_CI_ON_HOST=true
1313
export RUN_UNIT_TESTS=true

‎ci/test/00_setup_env_native_cxx20.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools protobuf-compiler libdbus-1-dev libharfbuzz-dev libprotobuf-dev"
9+
export PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools libdbus-1-dev libharfbuzz-dev"
1010
export DEP_OPTS="NO_UPNP=1 DEBUG=1"
1111
export CPPFLAGS="-DDEBUG_LOCKORDER -DENABLE_DASH_DEBUG -DARENA_DEBUG"
1212
export PYZMQ=true

‎contrib/macdeploy/macdeployqtplus‎

Lines changed: 97 additions & 55 deletions
Large diffs are not rendered by default.

‎doc/productivity.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Table of Contents
1212
* [Multiple working directories with `git worktrees`](#multiple-working-directories-with-git-worktrees)
1313
* [Interactive "dummy rebases" for fixups and execs with `git merge-base`](#interactive-dummy-rebases-for-fixups-and-execs-with-git-merge-base)
1414
* [Writing code](#writing-code)
15-
* [Format C/C++/Protobuf diffs with `clang-format-diff.py`](#format-ccprotobuf-diffs-with-clang-format-diffpy)
15+
* [Format C/C++ diffs with `clang-format-diff.py`](#format-cc-diffs-with-clang-format-diffpy)
1616
* [Format Python diffs with `yapf-diff.py`](#format-python-diffs-with-yapf-diffpy)
1717
* [Rebasing/Merging code](#rebasingmerging-code)
1818
* [More conflict context with `merge.conflictstyle diff3`](#more-conflict-context-with-mergeconflictstyle-diff3)
@@ -119,13 +119,13 @@ You can also set up [upstream refspecs](#reference-prs-easily-with-refspecs) to
119119
Writing code
120120
------------
121121

122-
### Format C/C++/Protobuf diffs with `clang-format-diff.py`
122+
### Format C/C++ diffs with `clang-format-diff.py`
123123

124124
See [contrib/devtools/README.md](/contrib/devtools/README.md#clang-format-diff.py).
125125

126126
### Format Python diffs with `yapf-diff.py`
127127

128-
Usage is exactly the same as [`clang-format-diff.py`](#format-ccprotobuf-diffs-with-clang-format-diffpy). You can get it [here](https://github.com/MarcoFalke/yapf-diff).
128+
Usage is exactly the same as [`clang-format-diff.py`](#format-cc-diffs-with-clang-format-diffpy). You can get it [here](https://github.com/MarcoFalke/yapf-diff).
129129

130130
Rebasing/Merging code
131131
-------------

‎doc/release-notes-16060.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Low-level RPC changes
2+
----------------------
3+
4+
- Soft fork reporting in the `getblockchaininfo` return object has been
5+
updated. For full details, see the RPC help text. In summary:
6+
- The `bip9_softforks` sub-object is no longer returned
7+
- The `softforks` sub-object now returns an object keyed by soft fork name,
8+
rather than an array
9+
- Each softfork object in the `softforks` object contains a `type` value which
10+
is either `buried` (for soft fork deployments where the activation height is
11+
hard-coded into the client implementation), or `bip9` (for soft fork deployments
12+
where activation is controlled by BIP 9 signaling).
13+
14+
- `getblocktemplate` no longer returns a `rules` array containing `CSV`
15+
(the BIP 9 deployments that are currently in active state).

‎src/bitcoin-cli.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ static int AppInitRPC(int argc, char* argv[])
148148
tfm::format(std::cerr, "Error reading configuration file: %s\n", error);
149149
return EXIT_FAILURE;
150150
}
151-
// Check for -testnet or -regtest parameter (BaseParams() calls are only valid after this clause)
151+
// Check for -chain, -testnet or -regtest parameter (BaseParams() calls are only valid after this clause)
152152
try {
153153
SelectBaseParams(gArgs.GetChainName());
154154
} catch (const std::exception& e) {

‎src/bitcoin-tx.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ static int AppInitRawTx(int argc, char* argv[])
8888
return true;
8989
}
9090

91-
// Check for -testnet or -regtest parameter (Params() calls are only valid after this clause)
91+
// Check for -chain, -testnet or -regtest parameter (Params() calls are only valid after this clause)
9292
try {
9393
SelectParams(gArgs.GetChainName());
9494
} catch (const std::exception& e) {

‎src/bitcoind.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ static bool AppInit(int argc, char* argv[])
8888
if (!args.ReadConfigFiles(error, true)) {
8989
return InitError(Untranslated(strprintf("Error reading configuration file: %s\n", error)));
9090
}
91-
// Check for -testnet or -regtest parameter (Params() calls are only valid after this clause)
91+
// Check for -chain, -testnet or -regtest parameter (Params() calls are only valid after this clause)
9292
try {
9393
SelectParams(args.GetChainName());
9494
} catch (const std::exception& e) {

‎src/chainparams.cpp‎

Lines changed: 9 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,8 @@ class CMainParams : public CChainParams {
156156
consensus.BIP34Hash = uint256S("0x000001f35e70f7c5705f64c6c5cc3dea9449e74d5b5c7cf74dad1bcca14a8012");
157157
consensus.BIP65Height = 619382; // 00000000000076d8fcea02ec0963de4abfd01e771fec0863f960c2c64fe6f357
158158
consensus.BIP66Height = 245817; // 00000000000b1fa2dfa312863570e13fae9ca7b5566cb27e55422620b469aefa
159-
consensus.DIP0001Height = 782208;
159+
consensus.CSVHeight = 622944; // 00000000000002e3d3a6224cfce80bae367fd3283d1e5a8ba50e5e60b2d2905d
160+
consensus.DIP0001Height = 782208; // 000000000000000cbc9cb551e8ee1ac7aa223585cbdfb755d3683bafd93679e4
160161
consensus.DIP0003Height = 1028160;
161162
consensus.DIP0003EnforcementHeight = 1047200;
162163
consensus.DIP0003EnforcementHash = uint256S("000000000000002d1734087b4c5afc3133e4e1c3e1a89218f62bcd9bb3d17f81");
@@ -176,18 +177,6 @@ class CMainParams : public CChainParams {
176177
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 1199145601; // January 1, 2008
177178
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 1230767999; // December 31, 2008
178179

179-
// Deployment of BIP68, BIP112, and BIP113.
180-
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].bit = 0;
181-
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1486252800; // Feb 5th, 2017
182-
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1517788800; // Feb 5th, 2018
183-
184-
// Deployment of DIP0001
185-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].bit = 1;
186-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nStartTime = 1508025600; // Oct 15th, 2017
187-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nTimeout = 1539561600; // Oct 15th, 2018
188-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nWindowSize = 4032;
189-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nThresholdStart = 3226; // 80% of 4032
190-
191180
// Deployment of BIP147
192181
consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].bit = 2;
193182
consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nStartTime = 1524477600; // Apr 23th, 2018
@@ -202,13 +191,6 @@ class CMainParams : public CChainParams {
202191
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nWindowSize = 4032;
203192
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nThresholdStart = 3226; // 80% of 4032
204193

205-
// Deployment of DIP0008
206-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].bit = 4;
207-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nStartTime = 1557878400; // May 15th, 2019
208-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nTimeout = 1589500800; // May 15th, 2020
209-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nWindowSize = 4032;
210-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nThresholdStart = 3226; // 80% of 4032
211-
212194
// Deployment of Block Reward Reallocation
213195
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].bit = 5;
214196
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nStartTime = 1601510400; // Oct 1st, 2020
@@ -404,7 +386,8 @@ class CTestNetParams : public CChainParams {
404386
consensus.BIP34Hash = uint256S("0x000008ebb1db2598e897d17275285767717c6acfeac4c73def49fbea1ddcbcb6");
405387
consensus.BIP65Height = 2431; // 0000039cf01242c7f921dcb4806a5994bc003b48c1973ae0c89b67809c2bb2ab
406388
consensus.BIP66Height = 2075; // 0000002acdd29a14583540cb72e1c5cc83783560e38fa7081495d474fe1671f7
407-
consensus.DIP0001Height = 5500;
389+
consensus.CSVHeight = 8064; // 00000005eb94d027e34649373669191188858a22c70f4a6d29105e559124cec7
390+
consensus.DIP0001Height = 5500; // 00000001d60a01d8f1f39011cc6b26e3a1c97a24238cab856c2da71a4dd801a9
408391
consensus.DIP0003Height = 7000;
409392
consensus.DIP0003EnforcementHeight = 7300;
410393
consensus.DIP0003EnforcementHash = uint256S("00000055ebc0e974ba3a3fb785c5ad4365a39637d4df168169ee80d313612f8f");
@@ -424,18 +407,6 @@ class CTestNetParams : public CChainParams {
424407
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 1199145601; // January 1, 2008
425408
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 1230767999; // December 31, 2008
426409

427-
// Deployment of BIP68, BIP112, and BIP113.
428-
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].bit = 0;
429-
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1544655600; // Dec 13th, 2018
430-
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 999999999999ULL;
431-
432-
// Deployment of DIP0001
433-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].bit = 1;
434-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nStartTime = 1544655600; // Dec 13th, 2018
435-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nTimeout = 999999999999ULL;
436-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nWindowSize = 100;
437-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nThresholdStart = 50; // 50% of 100
438-
439410
// Deployment of BIP147
440411
consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].bit = 2;
441412
consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nStartTime = 1544655600; // Dec 13th, 2018
@@ -450,13 +421,6 @@ class CTestNetParams : public CChainParams {
450421
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nWindowSize = 100;
451422
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nThresholdStart = 50; // 50% of 100
452423

453-
// Deployment of DIP0008
454-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].bit = 4;
455-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nStartTime = 1553126400; // Mar 21st, 2019
456-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nTimeout = 999999999999ULL;
457-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nWindowSize = 100;
458-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nThresholdStart = 50; // 50% of 100
459-
460424
// Deployment of Block Reward Reallocation
461425
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].bit = 5;
462426
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nStartTime = 1598918400; // Sep 1st, 2020
@@ -625,6 +589,7 @@ class CDevNetParams : public CChainParams {
625589
consensus.BIP34Height = 1; // BIP34 activated immediately on devnet
626590
consensus.BIP65Height = 1; // BIP65 activated immediately on devnet
627591
consensus.BIP66Height = 1; // BIP66 activated immediately on devnet
592+
consensus.CSVHeight = 1; // BIP68 activated immediately on devnet
628593
consensus.DIP0001Height = 2; // DIP0001 activated immediately on devnet
629594
consensus.DIP0003Height = 2; // DIP0003 activated immediately on devnet
630595
consensus.DIP0003EnforcementHeight = 2; // DIP0003 activated immediately on devnet
@@ -645,18 +610,6 @@ class CDevNetParams : public CChainParams {
645610
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 1199145601; // January 1, 2008
646611
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 1230767999; // December 31, 2008
647612

648-
// Deployment of BIP68, BIP112, and BIP113.
649-
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].bit = 0;
650-
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1506556800; // September 28th, 2017
651-
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 999999999999ULL;
652-
653-
// Deployment of DIP0001
654-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].bit = 1;
655-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nStartTime = 1505692800; // Sep 18th, 2017
656-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nTimeout = 999999999999ULL;
657-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nWindowSize = 100;
658-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nThresholdStart = 50; // 50% of 100
659-
660613
// Deployment of BIP147
661614
consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].bit = 2;
662615
consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nStartTime = 1517792400; // Feb 5th, 2018
@@ -671,13 +624,6 @@ class CDevNetParams : public CChainParams {
671624
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nWindowSize = 100;
672625
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nThresholdStart = 50; // 50% of 100
673626

674-
// Deployment of DIP0008
675-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].bit = 4;
676-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nStartTime = 1553126400; // Mar 21st, 2019
677-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nTimeout = 999999999999ULL;
678-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nWindowSize = 100;
679-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nThresholdStart = 50; // 50% of 100
680-
681627
// Deployment of Block Reward Reallocation
682628
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].bit = 5;
683629
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nStartTime = 1598918400; // Sep 1st, 2020
@@ -917,6 +863,7 @@ class CRegTestParams : public CChainParams {
917863
consensus.BIP34Hash = uint256();
918864
consensus.BIP65Height = 1351; // BIP65 activated on regtest (Used in functional tests)
919865
consensus.BIP66Height = 1251; // BIP66 activated on regtest (Used in functional tests)
866+
consensus.CSVHeight = 432; // CSV activated on regtest (Used in rpc activation tests)
920867
consensus.DIP0001Height = 2000;
921868
consensus.DIP0003Height = 432;
922869
consensus.DIP0003EnforcementHeight = 500;
@@ -936,21 +883,12 @@ class CRegTestParams : public CChainParams {
936883
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].bit = 28;
937884
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 0;
938885
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 999999999999ULL;
939-
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].bit = 0;
940-
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 0;
941-
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 999999999999ULL;
942-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].bit = 1;
943-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nStartTime = 0;
944-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nTimeout = 999999999999ULL;
945886
consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].bit = 2;
946887
consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nStartTime = 0;
947888
consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nTimeout = 999999999999ULL;
948889
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].bit = 3;
949890
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nStartTime = 0;
950891
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nTimeout = 999999999999ULL;
951-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].bit = 4;
952-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nStartTime = 0;
953-
consensus.vDeployments[Consensus::DEPLOYMENT_DIP0008].nTimeout = 999999999999ULL;
954892
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].bit = 5;
955893
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nStartTime = 0;
956894
consensus.vDeployments[Consensus::DEPLOYMENT_REALLOC].nTimeout = 999999999999ULL;
@@ -1009,7 +947,7 @@ class CRegTestParams : public CChainParams {
1009947
m_assumed_blockchain_size = 0;
1010948
m_assumed_chain_state_size = 0;
1011949

1012-
UpdateVersionBitsParametersFromArgs(args);
950+
UpdateActivationParametersFromArgs(args);
1013951
UpdateDIP3ParametersFromArgs(args);
1014952
UpdateDIP8ParametersFromArgs(args);
1015953
UpdateBudgetParametersFromArgs(args);
@@ -1105,7 +1043,7 @@ class CRegTestParams : public CChainParams {
11051043
consensus.vDeployments[d].nFalloffCoeff = nFalloffCoeff;
11061044
}
11071045
}
1108-
void UpdateVersionBitsParametersFromArgs(const ArgsManager& args);
1046+
void UpdateActivationParametersFromArgs(const ArgsManager& args);
11091047

11101048
/**
11111049
* Allows modifying the DIP3 activation and enforcement height
@@ -1171,7 +1109,7 @@ class CRegTestParams : public CChainParams {
11711109
void UpdateLLMQInstantSendDIP0024FromArgs(const ArgsManager& args);
11721110
};
11731111

1174-
void CRegTestParams::UpdateVersionBitsParametersFromArgs(const ArgsManager& args)
1112+
void CRegTestParams::UpdateActivationParametersFromArgs(const ArgsManager& args)
11751113
{
11761114
if (!args.IsArgSet("-vbparams")) return;
11771115

0 commit comments

Comments
 (0)