gui: Delay interfaces::Node initialization

ryanofsky · ryanofsky · commit 519cae8fd6e4 · 2020-08-26T05:52:31.000-04:00
This is needed to allow bitcoin-gui to connect to existing node process with
-ipcconnect instead of spawning a new process. It's possible to spawn a new
bitcoin-node process without knowing the current data dir or network, but
connecting to an existing bitcoin-node requires knowing the datadir and network
first.
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
@@ -249,7 +249,6 @@ void BitcoinApplication::createPaymentServer()
 void BitcoinApplication::createOptionsModel(bool resetSettings)
 {
     optionsModel = new OptionsModel(this, resetSettings);
-    optionsModel->setNode(node());
 }
 
 void BitcoinApplication::createWindow(const NetworkStyle *networkStyle)
@@ -264,7 +263,6 @@ void BitcoinApplication::createSplashScreen(const NetworkStyle *networkStyle)
 {
     assert(!m_splash);
     m_splash = new SplashScreen(nullptr, networkStyle);
-    m_splash->setNode(node());
     // We don't hold a direct pointer to the splash screen after creation, but the splash
     // screen will take care of deleting itself when finish() happens.
     m_splash->show();
@@ -276,6 +274,8 @@ void BitcoinApplication::setNode(interfaces::Node& node)
 {
     assert(!m_node);
     m_node = &node;
+    if (optionsModel) optionsModel->setNode(*m_node);
+    if (m_splash) m_splash->setNode(*m_node);
 }
 
 bool BitcoinApplication::baseInitialize()
@@ -465,7 +465,6 @@ int GuiMain(int argc, char* argv[])
 #endif
 
     BitcoinApplication app;
-    app.setNode(*node);
 
     /// 2. Parse command-line options. We do this after qt in order to show an error if there are problems parsing these
     // Command-line options take precedence:
@@ -599,6 +598,8 @@ int GuiMain(int argc, char* argv[])
     if (gArgs.GetBoolArg("-splash", DEFAULT_SPLASHSCREEN) && !gArgs.GetBoolArg("-min", false))
         app.createSplashScreen(networkStyle.data());
 
+    app.setNode(*node);
+
     int rv = EXIT_SUCCESS;
     try
     {
diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp
@@ -139,10 +139,12 @@ void SplashScreen::setNode(interfaces::Node& node)
     assert(!m_node);
     m_node = &node;
     subscribeToCoreSignals();
+    if (m_shutdown) m_node->startShutdown();
 }
 
 void SplashScreen::shutdown()
 {
+    m_shutdown = true;
     if (m_node) m_node->startShutdown();
 }
 
diff --git a/src/qt/splashscreen.h b/src/qt/splashscreen.h
@@ -62,6 +62,7 @@ public Q_SLOTS:
     int curAlignment;
 
     interfaces::Node* m_node = nullptr;
+    bool m_shutdown = false;
     std::unique_ptr<interfaces::Handler> m_handler_init_message;
     std::unique_ptr<interfaces::Handler> m_handler_show_progress;
     std::unique_ptr<interfaces::Handler> m_handler_load_wallet;

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,6 @@ void BitcoinApplication::createPaymentServer()`
`249`	`249`	`void BitcoinApplication::createOptionsModel(bool resetSettings)`
`250`	`250`	`{`
`251`	`251`	`optionsModel = new OptionsModel(this, resetSettings);`
`252`		`- optionsModel->setNode(node());`
`253`	`252`	`}`
`254`	`253`
`255`	`254`	`void BitcoinApplication::createWindow(const NetworkStyle *networkStyle)`
`@@ -264,7 +263,6 @@ void BitcoinApplication::createSplashScreen(const NetworkStyle *networkStyle)`
`264`	`263`	`{`
`265`	`264`	`assert(!m_splash);`
`266`	`265`	`m_splash = new SplashScreen(nullptr, networkStyle);`
`267`		`- m_splash->setNode(node());`
`268`	`266`	`// We don't hold a direct pointer to the splash screen after creation, but the splash`
`269`	`267`	`// screen will take care of deleting itself when finish() happens.`
`270`	`268`	`m_splash->show();`
`@@ -276,6 +274,8 @@ void BitcoinApplication::setNode(interfaces::Node& node)`
`276`	`274`	`{`
`277`	`275`	`assert(!m_node);`
`278`	`276`	`m_node = &node;`
	`277`	`+ if (optionsModel) optionsModel->setNode(*m_node);`
	`278`	`+ if (m_splash) m_splash->setNode(*m_node);`
`279`	`279`	`}`
`280`	`280`
`281`	`281`	`bool BitcoinApplication::baseInitialize()`
`@@ -465,7 +465,6 @@ int GuiMain(int argc, char* argv[])`
`465`	`465`	`#endif`
`466`	`466`
`467`	`467`	`BitcoinApplication app;`
`468`		`- app.setNode(*node);`
`469`	`468`
`470`	`469`	`/// 2. Parse command-line options. We do this after qt in order to show an error if there are problems parsing these`
`471`	`470`	`// Command-line options take precedence:`
`@@ -599,6 +598,8 @@ int GuiMain(int argc, char* argv[])`
`599`	`598`	`if (gArgs.GetBoolArg("-splash", DEFAULT_SPLASHSCREEN) && !gArgs.GetBoolArg("-min", false))`
`600`	`599`	`app.createSplashScreen(networkStyle.data());`
`601`	`600`
	`601`	`+ app.setNode(*node);`
	`602`	`+`
`602`	`603`	`int rv = EXIT_SUCCESS;`
`603`	`604`	`try`
`604`	`605`	`{`
Original file line number	Diff line number	Diff line change
`@@ -139,10 +139,12 @@ void SplashScreen::setNode(interfaces::Node& node)`
`139`	`139`	`assert(!m_node);`
`140`	`140`	`m_node = &node;`
`141`	`141`	`subscribeToCoreSignals();`
	`142`	`+ if (m_shutdown) m_node->startShutdown();`
`142`	`143`	`}`
`143`	`144`
`144`	`145`	`void SplashScreen::shutdown()`
`145`	`146`	`{`
	`147`	`+ m_shutdown = true;`
`146`	`148`	`if (m_node) m_node->startShutdown();`
`147`	`149`	`}`
`148`	`150`