diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-09-24 17:15:50 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-09-24 17:24:06 -0400 |
| commit | 4dac24db23d121ec21080f04e210227c4ff5d281 (patch) | |
| tree | 5a52e0cac560035ee69bcee8f5d06be92f3366e2 /src/rpc/blockchain.cpp | |
| parent | 990fc0de1afdfac8b711f39d9dbbab0c5f88a4c5 (diff) | |
| parent | 6fa901fb4726ddac025d5396ecf09d047a8aa9a1 (diff) | |
| download | bitcoin-4dac24db23d121ec21080f04e210227c4ff5d281.tar.xz | |
Merge #13311: Don't edit Chainparams after initialization
6fa901fb47 Don't edit Chainparams after initialization (Jorge Timón)
980b38f8a1 MOVEONLY: Move versionbits info out of versionbits.o (Jorge Timón)
Pull request description:
This encapsulates the "-vbparams" option, which is only meant for regtest, directly on CRegTestParams.
This is a refactor and doesn't change functionality.
Related to https://github.com/bitcoin/bitcoin/pull/8994
Tree-SHA512: 79771d729a63a720e743a9c77d5e2d80369f072d66202a43c1304e83a7d0ef7c6103d4968a03aea9666cc89a7203c618da972124a677b38cfe62ddaeb28f9f5d
Diffstat (limited to 'src/rpc/blockchain.cpp')
| -rw-r--r-- | src/rpc/blockchain.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index 47ee4fd6db..1eca0277b0 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -30,6 +30,7 @@ #include <utilstrencodings.h> #include <hash.h> #include <validationinterface.h> +#include <versionbitsinfo.h> #include <warnings.h> #include <assert.h> |