Call init's parameter interaction before we create the UI options model #6780

jonasschnelli · 2015-10-08T08:05:14Z

Currently optionsModel(QT) parameters interaction overwrites/dominates initial and depending parameter settings. This PR would factor out init's parameter interaction and call it before AppInit2().

Fixes #6773

jonasschnelli · 2015-10-08T08:47:15Z

Force pushed a copy'n'paste fix: s/bool InitParameterInteraction()/void InitParameterInteraction().
Credits to @MarcoFalke on IRC.

maflcko · 2015-10-08T11:58:48Z

Concept ACK.

laanwj · 2015-10-08T16:57:58Z

Concept ACK

paveljanik · 2015-10-08T18:34:02Z

ACK

laanwj · 2015-10-30T09:09:28Z

src/qt/bitcoin.cpp

@@ -381,7 +398,7 @@ void BitcoinApplication::startThread()
 if(coreThread)
 return;
 coreThread = new QThread(this);
- BitcoinCore *executor = new BitcoinCore();
+ executor = new BitcoinCore();
 executor->moveToThread(coreThread);


It's not allowed to use this object [from this thread] after moving it to another thread.
I'd suggest calling InitParameterInteraction() directly from BitcoinApplication::parameterSetup() and not bothering with the stuff in BitcoinCore.

jonasschnelli · 2015-11-13T14:27:43Z

Rebased and fixed the pointer access after moveToThread by following @laanwj advice.

gmaxwell · 2015-11-17T07:37:45Z

Sorry, blocksonly mode caused a need for a small change here, as it needs to get moved. @jonasschnelli mind rebasing?

What about that prune/txindex "interaction" (fails to run), should it move too?

jonasschnelli · 2015-11-17T08:05:15Z

Sorry, blocksonly mode caused a need for a small change here, as it needs to get moved. @jonasschnelli mind rebasing?

Just rebased and moved the -blocksonly interaction to the new function.

What about that prune/txindex "interaction" (fails to run), should it move too?

My idea was to only move "rules" to the new function. Things that evaluate parameters through GetBoolArg or mapArgs, etc. and depending on its state, optional change another startup variable through SoftSetBoolArg, etc.

Pruning and TxIndex are checks that lead to a InitError() (startup termination) and it would require to move the InitError() context to the ParameterInteraction() function.

maflcko · 2015-11-17T22:42:57Z

utACK 51627cc

jonasschnelli · 2015-11-21T09:43:23Z

Would be nice if someone finds time to test this. Binaries: https://bitcoin.jonasschnelli.ch/pulls/6780/
This fixes a ugly bug (#6773) which would be nice to have fixed in 0.12.

fanquake · 2015-11-21T09:44:06Z

Will do.

On Saturday, November 21, 2015, Jonas Schnelli notifications@github.com
wrote:

Would be nice if someone finds time to test this. Binaries:
https://bitcoin.jonasschnelli.ch/pulls/6780/
This fixes a ugly bug (#6773
#6773) which would be nice to
have fixed in 0.12.

—
Reply to this email directly or view it on GitHub
#6780 (comment).

maflcko · 2015-11-21T18:03:58Z

@jonasschnelli

master:

$ src/bitcoind -regtest -connect=127.0.0.1 -server -printtoconsole |grep parameter 
2015-11-21 17:52:56 AppInit2: parameter interaction: -connect set -> setting -dnsseed=0
2015-11-21 17:52:56 AppInit2: parameter interaction: -connect set -> setting -listen=0
2015-11-21 17:52:56 AppInit2: parameter interaction: -listen=0 -> setting -upnp=0
2015-11-21 17:52:56 AppInit2: parameter interaction: -listen=0 -> setting -discover=0
2015-11-21 17:52:56 AppInit2: parameter interaction: -listen=0 -> setting -listenonion=0

$ src/qt/bitcoin-qt -regtest -connect=127.0.0.1 -server -printtoconsole |grep parameter 
2015-11-21 17:53:34 AppInit2: parameter interaction: -connect set -> setting -dnsseed=0

51627cc

$ ~/bitcoin* -regtest -connect=127.0.0.1 -debug=1 -printtoconsole |grep parameter

dcousens · 2015-11-24T01:42:01Z

concept ACK / utACK

jonasschnelli · 2015-11-26T10:37:59Z

I'd like to take this into 0.12 because it fixes a slightly security-critical issue (#6773). Some tested ACKs would be nice (another 5 days left until feature freeze).

maflcko · 2015-11-26T10:50:10Z

@jonasschnelli I am happy to test but the debug.log issue seems not yet resolved? Am I missing something?

laanwj · 2015-11-26T11:11:50Z

utACK. Agree it needs to be in 0.12

Haven't tested any specific cases - I've been holding off on this because the parameter processing is kind of fragile and I haven't properly reasoned it through yet that this doesn't have effect on the precedence of options specified in e.g. configuration files, command line, QSettings.

jonasschnelli · 2015-11-26T13:07:26Z

Thanks @MarcoFalke for pointing out the logging issue. Added another commit that moves the logging initialization.

For reviewers: The critical part are the first 100 lines in AppInit2() because the logging init and the parameter interactions are now before AppInit2().

maflcko · 2015-11-27T07:54:04Z

Sanity tests pass now:

$ src/bitcoind -regtest -connect=127.0.0.1 -server -printtoconsole |egrep "(parameter|Bitcoin)"
2015-11-27 07:39:08 Bitcoin version v0.11.99.0-296c42e (2015-11-26 14:03:27 +0100)
2015-11-27 07:39:08 InitParameterInteraction: parameter interaction: -connect set -> setting -dnsseed=0
2015-11-27 07:39:08 InitParameterInteraction: parameter interaction: -connect set -> setting -listen=0
2015-11-27 07:39:08 InitParameterInteraction: parameter interaction: -listen=0 -> setting -upnp=0
2015-11-27 07:39:08 InitParameterInteraction: parameter interaction: -listen=0 -> setting -discover=0
2015-11-27 07:39:08 InitParameterInteraction: parameter interaction: -listen=0 -> setting -listenonion=0

$ src/qt/bitcoin-qt -regtest -connect=127.0.0.1 -server -printtoconsole |egrep "(parameter|Bitcoin)"
2015-11-27 07:53:02 Bitcoin version v0.11.99.0-296c42e (2015-11-26 14:03:27 +0100)
2015-11-27 07:53:02 InitParameterInteraction: parameter interaction: -connect set -> setting -dnsseed=0
2015-11-27 07:53:02 InitParameterInteraction: parameter interaction: -connect set -> setting -listen=0
2015-11-27 07:53:02 InitParameterInteraction: parameter interaction: -listen=0 -> setting -upnp=0
2015-11-27 07:53:02 InitParameterInteraction: parameter interaction: -listen=0 -> setting -discover=0
2015-11-27 07:53:02 InitParameterInteraction: parameter interaction: -listen=0 -> setting -listenonion=0

maflcko · 2015-11-27T07:54:36Z

utACK 296c42e

maflcko · 2015-11-27T12:17:31Z

src/init.cpp

- LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -walletbroadcast=0\n", __func__);
-#endif
- }
-


@jonasschnelli Trivial white space rebase conflict due to 9a3e1a5. (Looks like you can ignore changes made in master)

…n() function

jonasschnelli · 2015-11-27T12:26:56Z

Thanks @MarcoFalke: rebased!

a46f87f Initialize logging before we do parameter interaction (Jonas Schnelli) df66147 Move -blocksonly parameter interaction to the new ParameterInteraction() function (Jonas Schnelli) 68354e7 [QT] Call inits parameter interaction before we create the options model (Jonas Schnelli) 411b05a Refactor parameter interaction, call it before AppInit2() (Jonas Schnelli)

Misc upstream PRs Cherry-picked from the following upstream PRs: - bitcoin/bitcoin#6077 - Second commit only (first was already applied to 0.11.X and then reverted) - bitcoin/bitcoin#6284 - bitcoin/bitcoin#6489 - bitcoin/bitcoin#6462 - bitcoin/bitcoin#6647 - bitcoin/bitcoin#6235 - bitcoin/bitcoin#6905 - bitcoin/bitcoin#6780 - Excluding second commit (QT) and third commit (requires bitcoin/bitcoin#6993) - bitcoin/bitcoin#6961 - Excluding QT parts, and a small `src/policy/policy.cpp` change which depends on a bunch of other PRs, which we'll have to remember to come back to. - bitcoin/bitcoin#7044 - bitcoin/bitcoin#8856 - bitcoin/bitcoin#9002 Part of #2074 and #2132.

Misc upstream PRs Cherry-picked from the following upstream PRs: - bitcoin/bitcoin#6077 - Second commit only (first was already applied to 0.11.X and then reverted) - bitcoin/bitcoin#6284 - bitcoin/bitcoin#6489 - bitcoin/bitcoin#6235 - bitcoin/bitcoin#6905 - bitcoin/bitcoin#6780 - Excluding second commit (QT) and third commit (requires bitcoin/bitcoin#6993) - bitcoin/bitcoin#6961 - Excluding QT parts, and a small `src/policy/policy.cpp` change which depends on a bunch of other PRs, which we'll have to remember to come back to. - bitcoin/bitcoin#7044 - bitcoin/bitcoin#8856 - bitcoin/bitcoin#9002 Part of #2074 and #2132.

…odel 9182b90 Initialize logging before we do parameter interaction (Jonas Schnelli) dec0787 [QT] Call inits parameter interaction before we create the options model (Jonas Schnelli) 18480ce Refactor parameter interaction, call it before AppInit2() (Jonas Schnelli) Pull request description: Backport of bitcoin#6780 Currently optionsModel(QT) parameters interaction overwrites/dominates initial and depending parameter settings. This PR would factor out init's parameter interaction and call it before AppInit2(). ACKs for top commit: furszy: ACK 9182b90 random-zebra: ACK rebase 9182b90 and merging... Tree-SHA512: f01c9b6603452d59c3fa7df8b8f85998b9c716fd3209f80fc6d4591035c995ad577b217d1d7ffd7f642d16fe130ee922ba0394870ec391b8e972587022962611

…ing the UI model 9182b90 Initialize logging before we do parameter interaction (Jonas Schnelli) dec0787 [QT] Call inits parameter interaction before we create the options model (Jonas Schnelli) 18480ce Refactor parameter interaction, call it before AppInit2() (Jonas Schnelli) Pull request description: Backport of bitcoin#6780 Currently optionsModel(QT) parameters interaction overwrites/dominates initial and depending parameter settings. This PR would factor out init's parameter interaction and call it before AppInit2(). ACKs for top commit: furszy: ACK 9182b90 random-zebra: ACK rebase 9182b90 and merging... Tree-SHA512: f01c9b6603452d59c3fa7df8b8f85998b9c716fd3209f80fc6d4591035c995ad577b217d1d7ffd7f642d16fe130ee922ba0394870ec391b8e972587022962611

…odel 9182b9007559fa6ae945b1e13984dc1971572c28 Initialize logging before we do parameter interaction (Jonas Schnelli) dec078739aca63be8dc7c6e2fbb8267c2dfa86c3 [QT] Call inits parameter interaction before we create the options model (Jonas Schnelli) 18480ce73994d9326b27a0ff7a034e71ec5f0dce Refactor parameter interaction, call it before AppInit2() (Jonas Schnelli) Pull request description: Backport of bitcoin/bitcoin#6780 Currently optionsModel(QT) parameters interaction overwrites/dominates initial and depending parameter settings. This PR would factor out init's parameter interaction and call it before AppInit2(). ACKs for top commit: furszy: ACK 9182b90 random-zebra: ACK rebase 9182b9007559fa6ae945b1e13984dc1971572c28 and merging... Tree-SHA512: f01c9b6603452d59c3fa7df8b8f85998b9c716fd3209f80fc6d4591035c995ad577b217d1d7ffd7f642d16fe130ee922ba0394870ec391b8e972587022962611 # Conflicts: # src/init.cpp

Add -blocksonly option Cherry-picked from the following upstream PRs: - bitcoin/bitcoin#6993 - bitcoin/bitcoin#7046 - bitcoin/bitcoin#6780 - The third commit (we backported the rest in #2390). - bitcoin/bitcoin#7126 - bitcoin/bitcoin#7439 - bitcoin/bitcoin#15990 - Only the `-blocksonly` documentation changes. - bitcoin/bitcoin#16555 - bitcoin/bitcoin#18391 - Only the `-blocksonly` documentation changes. Part of #2074.

jonasschnelli force-pushed the 2015/10/qt_fix_listen branch from afbb733 to e62a033 Compare October 8, 2015 08:44

laanwj added the GUI label Oct 8, 2015

Diapolo mentioned this pull request Oct 21, 2015

-connect doesn't turn off -listen in bitcoin-qt #6773

Closed

laanwj reviewed Oct 30, 2015
View reviewed changes

jonasschnelli force-pushed the 2015/10/qt_fix_listen branch 3 times, most recently from abc1843 to 648d812 Compare November 13, 2015 14:26

jonasschnelli force-pushed the 2015/10/qt_fix_listen branch from 648d812 to 51627cc Compare November 17, 2015 08:00

jonasschnelli added this to the 0.12.0 milestone Nov 18, 2015

maflcko reviewed Nov 27, 2015
View reviewed changes

jonasschnelli added 2 commits November 27, 2015 13:26

Refactor parameter interaction, call it before AppInit2()

411b05a

[QT] Call inits parameter interaction before we create the options model

68354e7

jonasschnelli added 2 commits November 27, 2015 13:26

Move -blocksonly parameter interaction to the new ParameterInteractio…

df66147

…n() function

Initialize logging before we do parameter interaction

a46f87f

jonasschnelli force-pushed the 2015/10/qt_fix_listen branch from 296c42e to a46f87f Compare November 27, 2015 12:26

laanwj merged commit a46f87f into bitcoin:master Nov 27, 2015

maflcko mentioned this pull request Nov 28, 2015

[trivial] Move blocksonly parameter interaction to InitParameterInteraction() #7126

Merged

This was referenced May 18, 2017

mapArgs is modified by setgenerate RPC without locking zcash/zcash#2132

Open

Misc upstream PRs zcash/zcash#2390

Merged

This was referenced Mar 4, 2020

Tracking: Backport upstream network encapsulation PIVX-Project/PIVX#1374

Closed

[Init] Do parameter interaction before creating the UI model PIVX-Project/PIVX#1375

Merged

PRCYDev mentioned this pull request Jan 25, 2021

Tracking: Backport upstream network encapsulation PRCYCoin/PRCYCoin#4

Open

21 tasks

str4d mentioned this pull request Feb 19, 2021

Add -blocksonly option zcash/zcash#4996

Merged

bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Call init's parameter interaction before we create the UI options model #6780

Call init's parameter interaction before we create the UI options model #6780

jonasschnelli commented Oct 8, 2015

jonasschnelli commented Oct 8, 2015

maflcko commented Oct 8, 2015

laanwj commented Oct 8, 2015

paveljanik commented Oct 8, 2015

laanwj Oct 30, 2015

jonasschnelli commented Nov 13, 2015

gmaxwell commented Nov 17, 2015

jonasschnelli commented Nov 17, 2015

maflcko commented Nov 17, 2015

jonasschnelli commented Nov 21, 2015

fanquake commented Nov 21, 2015

maflcko commented Nov 21, 2015

dcousens commented Nov 24, 2015

jonasschnelli commented Nov 26, 2015

maflcko commented Nov 26, 2015

laanwj commented Nov 26, 2015

jonasschnelli commented Nov 26, 2015

maflcko commented Nov 27, 2015

maflcko commented Nov 27, 2015

maflcko Nov 27, 2015

jonasschnelli commented Nov 27, 2015

Call init's parameter interaction before we create the UI options model #6780

Call init's parameter interaction before we create the UI options model #6780

Conversation

jonasschnelli commented Oct 8, 2015

jonasschnelli commented Oct 8, 2015

maflcko commented Oct 8, 2015

laanwj commented Oct 8, 2015

paveljanik commented Oct 8, 2015

laanwj Oct 30, 2015

Choose a reason for hiding this comment

jonasschnelli commented Nov 13, 2015

gmaxwell commented Nov 17, 2015

jonasschnelli commented Nov 17, 2015

maflcko commented Nov 17, 2015

jonasschnelli commented Nov 21, 2015

fanquake commented Nov 21, 2015

maflcko commented Nov 21, 2015

dcousens commented Nov 24, 2015

jonasschnelli commented Nov 26, 2015

maflcko commented Nov 26, 2015

laanwj commented Nov 26, 2015

jonasschnelli commented Nov 26, 2015

maflcko commented Nov 27, 2015

maflcko commented Nov 27, 2015

maflcko Nov 27, 2015

Choose a reason for hiding this comment

jonasschnelli commented Nov 27, 2015