GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 7f0f853373 into merged_master (Bitcoin PR bitcoin/bitcoin#23005)

Browse source
This commit is contained in:
Byron Hambly 2023-05-25 08:59:33 +00:00
commit c8c72768d0
8 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/init.cpp
View file

@ -1229,11 +1229,6 @@ bool MainchainRPCCheck()
bool AppInitInterfaces(NodeContext& node)
{
node.chain = node.init->makeChain();
// Create client interfaces for wallets that are supposed to be loaded
// according to -wallet and -disablewallet options. This only constructs
// the interfaces, it doesn't load wallet data. Wallets actually get loaded
// when load() and start() interface methods are called below.
g_wallet_init_interface.Construct(node);
return true;
}
@ -1302,6 +1297,13 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
GetMainSignals().RegisterBackgroundSignalScheduler(*node.scheduler);
// Create client interfaces for wallets that are supposed to be loaded
// according to -wallet and -disablewallet options. This only constructs
// the interfaces, it doesn't load wallet data. Wallets actually get loaded
// when load() and start() interface methods are called below.
g_wallet_init_interface.Construct(node);
uiInterface.InitWallet();
/* Register RPC commands regardless of -server setting so they will be
* available in the GUI RPC console even if external calls are disabled.
*/