GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-16 13:01:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 25ad2c623a into merged_master (Bitcoin PR #18740)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-26 01:08:47 +00:00
commit 51965ad1e6
23 changed files with 264 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/interfaces/node.cpp
View file

@ -27,6 +27,7 @@
#include <sync.h>
#include <txmempool.h>
#include <ui_interface.h>
#include <util/ref.h>
#include <util/system.h>
#include <util/translation.h>
#include <validation.h>
@ -80,7 +81,7 @@ public:
bool appInitMain() override
{
m_context.chain = MakeChain(m_context);
return AppInitMain(m_context);
return AppInitMain(m_context_ref, m_context);
}
void appShutdown() override
{
@ -225,7 +226,7 @@ public:
CFeeRate getDustRelayFee() override { return ::dustRelayFee; }
UniValue executeRpc(const std::string& command, const UniValue& params, const std::string& uri) override
{
JSONRPCRequest req;
JSONRPCRequest req(m_context_ref);
req.params = params;
req.strMethod = command;
req.URI = uri;
@ -323,6 +324,7 @@ public:
}
NodeContext* context() override { return &m_context; }
NodeContext m_context;
util::Ref m_context_ref{m_context};
};
} // namespace