Fixes #13213. Mostly, I layed out the concept to open the PR for refinement and getting feedback if the approach is okay. Changes are expected.
Two points:
TESTNET_BLOCK_CHAIN_SIZE and TESTNET_CHAIN_STATE_SIZE is certainly not optimal; I just checked the size of my testnet3 related dirs and set them to little bit higher values. Which values should be used?Thanks!
Thanks for addressing this issue.
We generally try to avoid having explicit branching on the network type. Instead, I would suggest adding a variable to CChainParams (which is initialized differently in the different network versions).
I will update this PR with the CChainParams approach.
Don’t forget to update the release process document as well.
@jonasschnelli, if #13229 is acceptable, I prefer dropping this PR in favor of #13229. No need to re-do the work here and your approach seems better.
Just as a heads up, it seems that #13229 also explicitly branches the network type (see @sipa’s suggestion above). I’m new to the code base and I can’t tell for sure if using CChainParams for this Qt issue will be better for the rest of the code as a whole.
What do you think?
m_assumed_size (similar to “assumed valid”).
@jonasschnelli, if #13229 is acceptable, I prefer dropping this PR in favor of #13229. No need to re-do the work here and your approach seems better.
Please continue with this and feel free to grab code from 13229…
I had the feeling that this would be GUI only and not appropriate to put Into the chainparams holder… but @sipa and @MarcoFalke think its better there which I guess they are right…
22@@ -23,6 +23,7 @@ Before every major release:
23
24 * Update hardcoded [seeds](/contrib/seeds/README.md), see [this pull request](https://github.com/bitcoin/bitcoin/pull/7415) for an example.
25 * Update [`BLOCK_CHAIN_SIZE`](/src/qt/intro.cpp) to the current size plus some overhead.
320@@ -317,6 +321,8 @@ class CRegTestParams : public CChainParams {
321 pchMessageStart[3] = 0xda;
322 nDefaultPort = 18444;
323 nPruneAfterHeight = 1000;
324+ m_assumed_blockchain_size = 200;
0 or 1? :)
It doesn’t matter, and it’s also unpredictable, as it depends on what blocks are created (regtest is purely for testing purposes, and all blocks are typically explicitly created in the test; there is no real network).
11@@ -12,6 +12,7 @@
12
13 #include <qt/guiutil.h>
14
15+#include <chainparams.h>
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
Reviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
28-static const uint64_t CHAIN_STATE_SIZE = 3;
29+/* Total required space (in GB) depending on user choice (prune, not prune) */
30+static uint64_t requiredSpace;
31+
32+/* Check free space asynchronously to prevent hanging the UI thread.
33 /* Total required space (in GB) depending on user choice (prune, not prune) */
/* on the line above :-)
21@@ -22,10 +22,10 @@
22 #include <cmath>
23
24 static const uint64_t GB_BYTES = 1000000000LL;
25-/* Minimum free space (in GB) needed for data directory */
26-constexpr uint64_t BLOCK_CHAIN_SIZE = 220;
27-/* Minimum free space (in GB) needed for data directory when pruned; Does not include prune target */
28-static const uint64_t CHAIN_STATE_SIZE = 3;
29+/* Total required space (in GB) depending on user choice (prune, not prune) */
30+static uint64_t requiredSpace;
requiredSpace is redefined four lines below :-)
- Creates m_assumed_blockchain_size and m_assumed_chain_state_size on CChainParams.
- Implements access to CChainParams' m_assumed_blockchain_size and m_assumed_chain_state_size on node interface.
- Implements m_assumed_blockchain_size and m_assumed_chain_state_size on qt/intro via node interface.
- Updates release process document with the new CChainParam's values.
202@@ -201,8 +203,15 @@ bool Intro::pickDataDirectory(interfaces::Node& node)
203
204 if(!fs::exists(GUIUtil::qstringToBoostPath(dataDir)) || gArgs.GetBoolArg("-choosedatadir", DEFAULT_CHOOSE_DATADIR) || settings.value("fReset", false).toBool() || gArgs.GetBoolArg("-resetguisettings", false))
205 {
206+ /* Use selectParams here to guarantee Params() can be used by node interface */
207+ try {
208+ node.selectParams(gArgs.GetChainName());
209+ } catch(std::exception) {
( :-)
198@@ -201,8 +199,15 @@ bool Intro::pickDataDirectory(interfaces::Node& node)
199
200 if(!fs::exists(GUIUtil::qstringToBoostPath(dataDir)) || gArgs.GetBoolArg("-choosedatadir", DEFAULT_CHOOSE_DATADIR) || settings.value("fReset", false).toBool() || gArgs.GetBoolArg("-resetguisettings", false))
201 {
202+ /* Use selectParams here to guarantee Params() can be used by node interface */
203+ try {
204+ node.selectParams(gArgs.GetChainName());
205+ } catch (const std::exception&) {
206+ return false;
selectParams
106@@ -107,6 +107,8 @@ class CMainParams : public CChainParams {
107 pchMessageStart[3] = 0xd9;
108 nDefaultPort = 8333;
109 nPruneAfterHeight = 100000;
110+ m_assumed_blockchain_size = 200;
206+ return false;
207+ }
208+
209 /* If current default data directory does not exist, let the user choose one */
210- Intro intro;
211+ Intro intro(0, node.getAssumedBlockchainSize(), node.getAssumedChainStateSize());
s/0/nullptr/