mirror of
https://git.wownero.com/wownero/wownero.git
synced 2024-08-15 01:03:23 +00:00
Merge pull request #6763
728ba38b1
rpc: always send raw txes through P2P (don't use bootstrap daemon) (xiphon)
This commit is contained in:
commit
27b49033fd
1 changed files with 55 additions and 42 deletions
|
@ -1120,11 +1120,23 @@ namespace cryptonote
|
||||||
bool core_rpc_server::on_send_raw_tx(const COMMAND_RPC_SEND_RAW_TX::request& req, COMMAND_RPC_SEND_RAW_TX::response& res, const connection_context *ctx)
|
bool core_rpc_server::on_send_raw_tx(const COMMAND_RPC_SEND_RAW_TX::request& req, COMMAND_RPC_SEND_RAW_TX::response& res, const connection_context *ctx)
|
||||||
{
|
{
|
||||||
RPC_TRACKER(send_raw_tx);
|
RPC_TRACKER(send_raw_tx);
|
||||||
bool ok;
|
|
||||||
if (use_bootstrap_daemon_if_necessary<COMMAND_RPC_SEND_RAW_TX>(invoke_http_mode::JON, "/sendrawtransaction", req, res, ok))
|
|
||||||
return ok;
|
|
||||||
|
|
||||||
CHECK_CORE_READY();
|
const bool restricted = m_restricted && ctx;
|
||||||
|
|
||||||
|
bool skip_validation = false;
|
||||||
|
if (!restricted)
|
||||||
|
{
|
||||||
|
boost::shared_lock<boost::shared_mutex> lock(m_bootstrap_daemon_mutex);
|
||||||
|
if (m_bootstrap_daemon.get() != nullptr)
|
||||||
|
{
|
||||||
|
skip_validation = !check_core_ready();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
CHECK_CORE_READY();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
CHECK_PAYMENT_MIN1(req, res, COST_PER_TX_RELAY, false);
|
CHECK_PAYMENT_MIN1(req, res, COST_PER_TX_RELAY, false);
|
||||||
|
|
||||||
std::string tx_blob;
|
std::string tx_blob;
|
||||||
|
@ -1144,48 +1156,49 @@ namespace cryptonote
|
||||||
}
|
}
|
||||||
res.sanity_check_failed = false;
|
res.sanity_check_failed = false;
|
||||||
|
|
||||||
const bool restricted = m_restricted && ctx;
|
if (!skip_validation)
|
||||||
|
|
||||||
tx_verification_context tvc{};
|
|
||||||
if(!m_core.handle_incoming_tx({tx_blob, crypto::null_hash}, tvc, (req.do_not_relay ? relay_method::none : relay_method::local), false) || tvc.m_verifivation_failed)
|
|
||||||
{
|
{
|
||||||
res.status = "Failed";
|
tx_verification_context tvc{};
|
||||||
std::string reason = "";
|
if(!m_core.handle_incoming_tx({tx_blob, crypto::null_hash}, tvc, (req.do_not_relay ? relay_method::none : relay_method::local), false) || tvc.m_verifivation_failed)
|
||||||
if ((res.low_mixin = tvc.m_low_mixin))
|
|
||||||
add_reason(reason, "bad ring size");
|
|
||||||
if ((res.double_spend = tvc.m_double_spend))
|
|
||||||
add_reason(reason, "double spend");
|
|
||||||
if ((res.invalid_input = tvc.m_invalid_input))
|
|
||||||
add_reason(reason, "invalid input");
|
|
||||||
if ((res.invalid_output = tvc.m_invalid_output))
|
|
||||||
add_reason(reason, "invalid output");
|
|
||||||
if ((res.too_big = tvc.m_too_big))
|
|
||||||
add_reason(reason, "too big");
|
|
||||||
if ((res.overspend = tvc.m_overspend))
|
|
||||||
add_reason(reason, "overspend");
|
|
||||||
if ((res.fee_too_low = tvc.m_fee_too_low))
|
|
||||||
add_reason(reason, "fee too low");
|
|
||||||
if ((res.too_few_outputs = tvc.m_too_few_outputs))
|
|
||||||
add_reason(reason, "too few outputs");
|
|
||||||
const std::string punctuation = reason.empty() ? "" : ": ";
|
|
||||||
if (tvc.m_verifivation_failed)
|
|
||||||
{
|
{
|
||||||
LOG_PRINT_L0("[on_send_raw_tx]: tx verification failed" << punctuation << reason);
|
res.status = "Failed";
|
||||||
|
std::string reason = "";
|
||||||
|
if ((res.low_mixin = tvc.m_low_mixin))
|
||||||
|
add_reason(reason, "bad ring size");
|
||||||
|
if ((res.double_spend = tvc.m_double_spend))
|
||||||
|
add_reason(reason, "double spend");
|
||||||
|
if ((res.invalid_input = tvc.m_invalid_input))
|
||||||
|
add_reason(reason, "invalid input");
|
||||||
|
if ((res.invalid_output = tvc.m_invalid_output))
|
||||||
|
add_reason(reason, "invalid output");
|
||||||
|
if ((res.too_big = tvc.m_too_big))
|
||||||
|
add_reason(reason, "too big");
|
||||||
|
if ((res.overspend = tvc.m_overspend))
|
||||||
|
add_reason(reason, "overspend");
|
||||||
|
if ((res.fee_too_low = tvc.m_fee_too_low))
|
||||||
|
add_reason(reason, "fee too low");
|
||||||
|
if ((res.too_few_outputs = tvc.m_too_few_outputs))
|
||||||
|
add_reason(reason, "too few outputs");
|
||||||
|
const std::string punctuation = reason.empty() ? "" : ": ";
|
||||||
|
if (tvc.m_verifivation_failed)
|
||||||
|
{
|
||||||
|
LOG_PRINT_L0("[on_send_raw_tx]: tx verification failed" << punctuation << reason);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
LOG_PRINT_L0("[on_send_raw_tx]: Failed to process tx" << punctuation << reason);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
LOG_PRINT_L0("[on_send_raw_tx]: Failed to process tx" << punctuation << reason);
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(tvc.m_relay == relay_method::none)
|
if(tvc.m_relay == relay_method::none)
|
||||||
{
|
{
|
||||||
LOG_PRINT_L0("[on_send_raw_tx]: tx accepted, but not relayed");
|
LOG_PRINT_L0("[on_send_raw_tx]: tx accepted, but not relayed");
|
||||||
res.reason = "Not relayed";
|
res.reason = "Not relayed";
|
||||||
res.not_relayed = true;
|
res.not_relayed = true;
|
||||||
res.status = CORE_RPC_STATUS_OK;
|
res.status = CORE_RPC_STATUS_OK;
|
||||||
return true;
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NOTIFY_NEW_TRANSACTIONS::request r;
|
NOTIFY_NEW_TRANSACTIONS::request r;
|
||||||
|
|
Loading…
Reference in a new issue