diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-12-12 13:32:35 -0600 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-12-12 13:32:35 -0600 |
| commit | 3531cc5fd2889ec5cdd3aecd0e3ba6672fec2e02 (patch) | |
| tree | a0abff5ebc21fce520afcdb60a6955b9ffb3c183 /src/rpc/daemon_handler.cpp | |
| parent | 411f1b0ee30f1d424621eb856841dc82d2f161c2 (diff) | |
| parent | 5d7ae2d2791c0244a221872a7ac62627abb81896 (diff) | |
| download | monzero-core-3531cc5fd2889ec5cdd3aecd0e3ba6672fec2e02.tar.gz monzero-core-3531cc5fd2889ec5cdd3aecd0e3ba6672fec2e02.tar.xz monzero-core-3531cc5fd2889ec5cdd3aecd0e3ba6672fec2e02.zip | |
Merge pull request #5965
5d7ae2d Adding support for hidden (anonymity) txpool (vtnerd)
Diffstat (limited to 'src/rpc/daemon_handler.cpp')
| -rw-r--r-- | src/rpc/daemon_handler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rpc/daemon_handler.cpp b/src/rpc/daemon_handler.cpp index d7e081af3..0b6cd6c7a 100644 --- a/src/rpc/daemon_handler.cpp +++ b/src/rpc/daemon_handler.cpp @@ -28,6 +28,7 @@ #include "daemon_handler.h" +#include <boost/uuid/nil_generator.hpp> // likely included by daemon_handler.h's includes, // but including here for clarity #include "cryptonote_core/cryptonote_core.h" @@ -288,10 +289,9 @@ namespace rpc return; } - cryptonote_connection_context fake_context = AUTO_VAL_INIT(fake_context); tx_verification_context tvc = AUTO_VAL_INIT(tvc); - if(!m_core.handle_incoming_tx({tx_blob, crypto::null_hash}, tvc, false, false, !relay) || tvc.m_verifivation_failed) + if(!m_core.handle_incoming_tx({tx_blob, crypto::null_hash}, tvc, (relay ? relay_method::local : relay_method::none), false) || tvc.m_verifivation_failed) { if (tvc.m_verifivation_failed) { @@ -368,7 +368,7 @@ namespace rpc NOTIFY_NEW_TRANSACTIONS::request r; r.txs.push_back(tx_blob); - m_core.get_protocol()->relay_transactions(r, fake_context); + m_core.get_protocol()->relay_transactions(r, boost::uuids::nil_uuid(), epee::net_utils::zone::invalid); //TODO: make sure that tx has reached other nodes here, probably wait to receive reflections from other nodes res.status = Message::STATUS_OK; |
