From 6a4c563cedd1d55711e9f5be9805c5f7318ba007 Mon Sep 17 00:00:00 2001 From: Denis Angell Date: Mon, 18 Mar 2024 12:38:25 +0100 Subject: [PATCH 01/13] fix invalid operands to binary expression ('basic_ostream>' and 'Json::Value') --- src/ripple/app/misc/NegativeUNLVote.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/ripple/app/misc/NegativeUNLVote.cpp b/src/ripple/app/misc/NegativeUNLVote.cpp index 8343d4774..214053191 100644 --- a/src/ripple/app/misc/NegativeUNLVote.cpp +++ b/src/ripple/app/misc/NegativeUNLVote.cpp @@ -155,8 +155,7 @@ NegativeUNLVote::addReportingTx( JLOG(j_.debug()) << "R-UNL: ledger seq=" << seq << ", add a ttUNL_REPORT (active_val) Tx with txID: " << txID - << ", size=" << s.size() << ", " - << repUnlTx.getJson(JsonOptions::none); + << ", size=" << s.size(); } } } @@ -210,8 +209,7 @@ NegativeUNLVote::addImportVLTx( JLOG(j_.debug()) << "R-UNL: ledger seq=" << seq << ", add a ttUNL_REPORT (import_vl) Tx with txID: " << txID - << ", size=" << s.size() << ", " - << repUnlTx.getJson(JsonOptions::none); + << ", size=" << s.size(); } } } From 4aa79b61003a4f9c5bdc5094b44ed0ec0e6aefc9 Mon Sep 17 00:00:00 2001 From: Denis Angell Date: Mon, 18 Mar 2024 12:59:05 +0100 Subject: [PATCH 02/13] Update ClaimReward_test.cpp --- src/test/app/ClaimReward_test.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/app/ClaimReward_test.cpp b/src/test/app/ClaimReward_test.cpp index 9581c98a9..85a6ba62e 100644 --- a/src/test/app/ClaimReward_test.cpp +++ b/src/test/app/ClaimReward_test.cpp @@ -17,7 +17,9 @@ */ //============================================================================== +#include #include +#include #include namespace ripple { From c1274d2a128def2a3700081300d857c7991a3efc Mon Sep 17 00:00:00 2001 From: Denis Angell Date: Mon, 18 Mar 2024 13:02:03 +0100 Subject: [PATCH 03/13] Update ServerDefinitions_test.cpp --- src/test/rpc/ServerDefinitions_test.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/rpc/ServerDefinitions_test.cpp b/src/test/rpc/ServerDefinitions_test.cpp index 7727f3934..ff3b2e7fb 100644 --- a/src/test/rpc/ServerDefinitions_test.cpp +++ b/src/test/rpc/ServerDefinitions_test.cpp @@ -19,6 +19,7 @@ #include #include +#include #include #include #include From 8360ff8bc2afb20d429dc87f46c2f9378b4d8308 Mon Sep 17 00:00:00 2001 From: Denis Angell Date: Mon, 18 Mar 2024 13:03:05 +0100 Subject: [PATCH 04/13] more linting --- src/test/app/Invoke_test.cpp | 1 + src/test/jtx/impl/paychan.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/test/app/Invoke_test.cpp b/src/test/app/Invoke_test.cpp index 20ffd796c..06bc45a3f 100644 --- a/src/test/app/Invoke_test.cpp +++ b/src/test/app/Invoke_test.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include namespace ripple { diff --git a/src/test/jtx/impl/paychan.cpp b/src/test/jtx/impl/paychan.cpp index da2ad3d38..50cbf209a 100644 --- a/src/test/jtx/impl/paychan.cpp +++ b/src/test/jtx/impl/paychan.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include #include From 945f737706e84a5a618717a90619c5aaadeb9455 Mon Sep 17 00:00:00 2001 From: Denis Angell Date: Mon, 18 Mar 2024 13:09:01 +0100 Subject: [PATCH 05/13] Update ServerInfo.cpp --- src/ripple/rpc/handlers/ServerInfo.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ripple/rpc/handlers/ServerInfo.cpp b/src/ripple/rpc/handlers/ServerInfo.cpp index 03850b60e..5009be739 100644 --- a/src/ripple/rpc/handlers/ServerInfo.cpp +++ b/src/ripple/rpc/handlers/ServerInfo.cpp @@ -19,6 +19,7 @@ #include #include +#include #include #include #include From b3984c166da686fdedd6f72e394c1ce72ddaa11c Mon Sep 17 00:00:00 2001 From: Denis Angell Date: Mon, 18 Mar 2024 13:13:09 +0100 Subject: [PATCH 06/13] misc --- src/ripple/ledger/impl/ApplyViewBase.cpp | 1 + src/test/jtx/impl/escrow.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/ripple/ledger/impl/ApplyViewBase.cpp b/src/ripple/ledger/impl/ApplyViewBase.cpp index dc98a35f7..1946f5c04 100644 --- a/src/ripple/ledger/impl/ApplyViewBase.cpp +++ b/src/ripple/ledger/impl/ApplyViewBase.cpp @@ -19,6 +19,7 @@ #include #include +#include namespace ripple { namespace detail { diff --git a/src/test/jtx/impl/escrow.cpp b/src/test/jtx/impl/escrow.cpp index 2fb1e22f1..ad41c8a5f 100644 --- a/src/test/jtx/impl/escrow.cpp +++ b/src/test/jtx/impl/escrow.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include #include From 78a96dd633577e34ffd3b6c7feaa18ba464d0fce Mon Sep 17 00:00:00 2001 From: Denis Angell Date: Mon, 18 Mar 2024 13:17:10 +0100 Subject: [PATCH 07/13] add missing headers --- src/ripple/app/hook/impl/applyHook.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ripple/app/hook/impl/applyHook.cpp b/src/ripple/app/hook/impl/applyHook.cpp index 99a330764..122a3f175 100644 --- a/src/ripple/app/hook/impl/applyHook.cpp +++ b/src/ripple/app/hook/impl/applyHook.cpp @@ -1,12 +1,16 @@ #include #include #include +#include #include #include #include +#include +#include #include #include #include +#include #include #include #include From e801ead39d5d39c708e9934587816333b61bcc1b Mon Sep 17 00:00:00 2001 From: Denis Angell Date: Mon, 18 Mar 2024 14:52:00 +0100 Subject: [PATCH 08/13] fix more headers --- Builds/CMake/RippledCore.cmake | 12 ++++++------ src/ripple/app/hook/impl/applyHook.cpp | 1 + src/ripple/app/misc/NegativeUNLVote.cpp | 1 + src/ripple/app/tx/impl/GenesisMint.cpp | 1 + src/ripple/app/tx/impl/Import.cpp | 1 + src/ripple/app/tx/impl/Invoke.cpp | 1 + src/ripple/app/tx/impl/Remit.cpp | 3 +++ src/ripple/app/tx/impl/SetSignerList.cpp | 8 ++++---- src/ripple/app/tx/impl/SetSignerList.h | 12 ++++++++++++ src/ripple/app/tx/impl/applySteps.cpp | 3 +++ src/ripple/protocol/STValidation.h | 3 +-- src/test/app/GenesisMint_test.cpp | 14 +++++--------- src/test/app/Remit_test.cpp | 1 - src/test/app/SetHookTSH_test.cpp | 8 ++++++++ src/test/jtx/impl/acctdelete.cpp | 1 + src/test/jtx/impl/network.cpp | 1 + src/test/jtx/offer.h | 1 + 17 files changed, 50 insertions(+), 22 deletions(-) diff --git a/Builds/CMake/RippledCore.cmake b/Builds/CMake/RippledCore.cmake index c3fd51bc7..82cb71cd4 100644 --- a/Builds/CMake/RippledCore.cmake +++ b/Builds/CMake/RippledCore.cmake @@ -433,13 +433,17 @@ target_sources (rippled PRIVATE src/ripple/app/tx/impl/CancelOffer.cpp src/ripple/app/tx/impl/CashCheck.cpp src/ripple/app/tx/impl/Change.cpp + src/ripple/app/tx/impl/ClaimReward.cpp src/ripple/app/tx/impl/CreateCheck.cpp src/ripple/app/tx/impl/CreateOffer.cpp src/ripple/app/tx/impl/CreateTicket.cpp src/ripple/app/tx/impl/DeleteAccount.cpp src/ripple/app/tx/impl/DepositPreauth.cpp src/ripple/app/tx/impl/Escrow.cpp + src/ripple/app/tx/impl/GenesisMint.cpp + src/ripple/app/tx/impl/Import.cpp src/ripple/app/tx/impl/InvariantCheck.cpp + src/ripple/app/tx/impl/Invoke.cpp src/ripple/app/tx/impl/NFTokenAcceptOffer.cpp src/ripple/app/tx/impl/NFTokenBurn.cpp src/ripple/app/tx/impl/NFTokenCancelOffer.cpp @@ -448,14 +452,10 @@ target_sources (rippled PRIVATE src/ripple/app/tx/impl/OfferStream.cpp src/ripple/app/tx/impl/PayChan.cpp src/ripple/app/tx/impl/Payment.cpp + src/ripple/app/tx/impl/Remit.cpp src/ripple/app/tx/impl/SetAccount.cpp - src/ripple/app/tx/impl/SetRegularKey.cpp src/ripple/app/tx/impl/SetHook.cpp - src/ripple/app/tx/impl/ClaimReward.cpp - src/ripple/app/tx/impl/GenesisMint.cpp - src/ripple/app/tx/impl/Import.cpp - src/ripple/app/tx/impl/Invoke.cpp - src/ripple/app/tx/impl/Remit.cpp + src/ripple/app/tx/impl/SetRegularKey.cpp src/ripple/app/tx/impl/SetSignerList.cpp src/ripple/app/tx/impl/SetTrust.cpp src/ripple/app/tx/impl/SignerEntries.cpp diff --git a/src/ripple/app/hook/impl/applyHook.cpp b/src/ripple/app/hook/impl/applyHook.cpp index 122a3f175..f75316c71 100644 --- a/src/ripple/app/hook/impl/applyHook.cpp +++ b/src/ripple/app/hook/impl/applyHook.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/src/ripple/app/misc/NegativeUNLVote.cpp b/src/ripple/app/misc/NegativeUNLVote.cpp index 214053191..ff01dad92 100644 --- a/src/ripple/app/misc/NegativeUNLVote.cpp +++ b/src/ripple/app/misc/NegativeUNLVote.cpp @@ -19,6 +19,7 @@ #include #include +#include #include namespace ripple { diff --git a/src/ripple/app/tx/impl/GenesisMint.cpp b/src/ripple/app/tx/impl/GenesisMint.cpp index dd2a10214..8b4dce3fb 100644 --- a/src/ripple/app/tx/impl/GenesisMint.cpp +++ b/src/ripple/app/tx/impl/GenesisMint.cpp @@ -23,6 +23,7 @@ #include #include #include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/Import.cpp b/src/ripple/app/tx/impl/Import.cpp index d136c7d67..f65db487a 100644 --- a/src/ripple/app/tx/impl/Import.cpp +++ b/src/ripple/app/tx/impl/Import.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include diff --git a/src/ripple/app/tx/impl/Invoke.cpp b/src/ripple/app/tx/impl/Invoke.cpp index 08a14bf32..387c6bae0 100644 --- a/src/ripple/app/tx/impl/Invoke.cpp +++ b/src/ripple/app/tx/impl/Invoke.cpp @@ -22,6 +22,7 @@ #include #include #include +#include namespace ripple { diff --git a/src/ripple/app/tx/impl/Remit.cpp b/src/ripple/app/tx/impl/Remit.cpp index e8c527df3..58b3da015 100644 --- a/src/ripple/app/tx/impl/Remit.cpp +++ b/src/ripple/app/tx/impl/Remit.cpp @@ -23,6 +23,9 @@ #include #include #include +#include +#include + namespace ripple { TxConsequences diff --git a/src/ripple/app/tx/impl/SetSignerList.cpp b/src/ripple/app/tx/impl/SetSignerList.cpp index 62bd6ac67..8f23d42c9 100644 --- a/src/ripple/app/tx/impl/SetSignerList.cpp +++ b/src/ripple/app/tx/impl/SetSignerList.cpp @@ -153,8 +153,8 @@ SetSignerList::preCompute() // NOTE: This way of computing the OwnerCount associated with a SignerList // is valid until the featureMultiSignReserve amendment passes. Once it // passes then just 1 OwnerCount is associated with a SignerList. -static int -signerCountBasedOwnerCountDelta(std::size_t entryCount, Rules const& rules) +int +SetSignerList::signerCountBasedOwnerCountDelta(std::size_t entryCount, Rules const& rules) { // We always compute the full change in OwnerCount, taking into account: // o The fact that we're adding/removing a SignerList and @@ -176,8 +176,8 @@ signerCountBasedOwnerCountDelta(std::size_t entryCount, Rules const& rules) return 2 + static_cast(entryCount); } -static TER -removeSignersFromLedger( +TER +SetSignerList::removeSignersFromLedger( Application& app, ApplyView& view, Keylet const& accountKeylet, diff --git a/src/ripple/app/tx/impl/SetSignerList.h b/src/ripple/app/tx/impl/SetSignerList.h index c80c6ba08..1b54e05d2 100644 --- a/src/ripple/app/tx/impl/SetSignerList.h +++ b/src/ripple/app/tx/impl/SetSignerList.h @@ -71,6 +71,18 @@ class SetSignerList : public Transactor AccountID const& account, beast::Journal j); + static TER + removeSignersFromLedger( + Application& app, + ApplyView& view, + Keylet const& accountKeylet, + Keylet const& ownerDirKeylet, + Keylet const& signerListKeylet, + beast::Journal j); + + static int + signerCountBasedOwnerCountDelta(std::size_t entryCount, Rules const& rules); + private: static void writeSignersToSLE( diff --git a/src/ripple/app/tx/impl/applySteps.cpp b/src/ripple/app/tx/impl/applySteps.cpp index d94d2c0dc..5edf27472 100644 --- a/src/ripple/app/tx/impl/applySteps.cpp +++ b/src/ripple/app/tx/impl/applySteps.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -39,12 +40,14 @@ #include #include #include +#include #include #include #include #include #include #include +#include namespace ripple { diff --git a/src/ripple/protocol/STValidation.h b/src/ripple/protocol/STValidation.h index edd922e7b..903e5d837 100644 --- a/src/ripple/protocol/STValidation.h +++ b/src/ripple/protocol/STValidation.h @@ -171,8 +171,7 @@ STValidation::STValidation( { if (checkSignature && !isValid()) { - JLOG(debugLog().error()) << "Invalid signature in validation: " - << getJson(JsonOptions::none); + JLOG(debugLog().error()) << "Invalid signature in validation"; Throw("Invalid signature in validation"); } diff --git a/src/test/app/GenesisMint_test.cpp b/src/test/app/GenesisMint_test.cpp index 3abcf0c85..9904f3715 100644 --- a/src/test/app/GenesisMint_test.cpp +++ b/src/test/app/GenesisMint_test.cpp @@ -15,8 +15,8 @@ */ //============================================================================== -#include #include +#include #include #include @@ -94,7 +94,7 @@ struct GenesisMint_test : public beast::unit_test::suite using namespace jtx; using namespace std::literals::chrono_literals; - Env env{*this, envconfig(), features, nullptr}; + Env env{*this, envconfig(), features}; auto const alice = Account("alice"); auto const bob = Account("bob"); auto const invoker = Account("invoker"); @@ -133,11 +133,7 @@ struct GenesisMint_test : public beast::unit_test::suite using namespace jtx; using namespace std::literals::chrono_literals; - Env env{*this, envconfig(), features, nullptr}; - // Env env{*this, envconfig(), features, nullptr, - // // beast::severities::kWarning - // beast::severities::kTrace - // }; + Env env{*this, envconfig(), features}; auto const alice = Account("alice"); auto const bob = Account("bob"); auto const invoker = Account("invoker"); @@ -639,7 +635,7 @@ struct GenesisMint_test : public beast::unit_test::suite using namespace jtx; using namespace std::literals::chrono_literals; - Env env{*this, envconfig(), features, nullptr}; + Env env{*this, envconfig(), features}; auto const alice = Account("alice"); auto const bob = Account("bob"); env.fund(XRP(10000), alice, bob); @@ -661,7 +657,7 @@ struct GenesisMint_test : public beast::unit_test::suite using namespace jtx; using namespace std::literals::chrono_literals; - Env env{*this, envconfig(), features, nullptr}; + Env env{*this, envconfig(), features}; auto const alice = Account("alice"); auto const bob = Account("bob"); env.fund(XRP(10000), alice, bob); diff --git a/src/test/app/Remit_test.cpp b/src/test/app/Remit_test.cpp index d71b4091e..ac527c9db 100644 --- a/src/test/app/Remit_test.cpp +++ b/src/test/app/Remit_test.cpp @@ -2132,7 +2132,6 @@ struct Remit_test : public beast::unit_test::suite auto const delta = USD(100); env(remit::remit(alice, bob), remit::amts({delta})); env.close(); - auto xferRate = transferRate(*env.current(), gw); auto const postAlice = env.balance(alice, USD.issue()); BEAST_EXPECT(env.balance(bob, USD.issue()) == preBob + delta); BEAST_EXPECT(to_string(postAlice.value()) == tc.result); diff --git a/src/test/app/SetHookTSH_test.cpp b/src/test/app/SetHookTSH_test.cpp index 3e209c0fb..ec45edd60 100644 --- a/src/test/app/SetHookTSH_test.cpp +++ b/src/test/app/SetHookTSH_test.cpp @@ -18,6 +18,7 @@ */ //============================================================================== +#include #include #include #include @@ -31,6 +32,13 @@ namespace ripple { namespace test { +#define BEAST_REQUIRE(x) \ + { \ + BEAST_EXPECT(!!(x)); \ + if (!(x)) \ + return; \ + } + struct SetHookTSH_test : public beast::unit_test::suite { private: diff --git a/src/test/jtx/impl/acctdelete.cpp b/src/test/jtx/impl/acctdelete.cpp index f7d9aa9b6..ea104e22b 100644 --- a/src/test/jtx/impl/acctdelete.cpp +++ b/src/test/jtx/impl/acctdelete.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include #include diff --git a/src/test/jtx/impl/network.cpp b/src/test/jtx/impl/network.cpp index ec5192068..e08976ca3 100644 --- a/src/test/jtx/impl/network.cpp +++ b/src/test/jtx/impl/network.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include #include #include diff --git a/src/test/jtx/offer.h b/src/test/jtx/offer.h index 2ff9725ae..874f59722 100644 --- a/src/test/jtx/offer.h +++ b/src/test/jtx/offer.h @@ -23,6 +23,7 @@ #include #include #include +#include namespace ripple { namespace test { From 5b2b9159558bf7b7229e12573f7cb1065df20e58 Mon Sep 17 00:00:00 2001 From: Denis Angell Date: Mon, 18 Mar 2024 14:57:35 +0100 Subject: [PATCH 09/13] clang-format --- src/ripple/app/tx/impl/SetSignerList.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ripple/app/tx/impl/SetSignerList.cpp b/src/ripple/app/tx/impl/SetSignerList.cpp index 8f23d42c9..096c573f5 100644 --- a/src/ripple/app/tx/impl/SetSignerList.cpp +++ b/src/ripple/app/tx/impl/SetSignerList.cpp @@ -154,7 +154,9 @@ SetSignerList::preCompute() // is valid until the featureMultiSignReserve amendment passes. Once it // passes then just 1 OwnerCount is associated with a SignerList. int -SetSignerList::signerCountBasedOwnerCountDelta(std::size_t entryCount, Rules const& rules) +SetSignerList::signerCountBasedOwnerCountDelta( + std::size_t entryCount, + Rules const& rules) { // We always compute the full change in OwnerCount, taking into account: // o The fact that we're adding/removing a SignerList and From 17af0756654594733113169049ec8a47a6ce31a9 Mon Sep 17 00:00:00 2001 From: Denis Angell Date: Mon, 25 Mar 2024 09:12:33 +0100 Subject: [PATCH 10/13] revert remove json log --- src/ripple/app/misc/NegativeUNLVote.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ripple/app/misc/NegativeUNLVote.cpp b/src/ripple/app/misc/NegativeUNLVote.cpp index ff01dad92..cd964ac6c 100644 --- a/src/ripple/app/misc/NegativeUNLVote.cpp +++ b/src/ripple/app/misc/NegativeUNLVote.cpp @@ -156,7 +156,8 @@ NegativeUNLVote::addReportingTx( JLOG(j_.debug()) << "R-UNL: ledger seq=" << seq << ", add a ttUNL_REPORT (active_val) Tx with txID: " << txID - << ", size=" << s.size(); + << ", size=" << s.size() << ", " + << repUnlTx.getJson(JsonOptions::none); } } } @@ -210,7 +211,8 @@ NegativeUNLVote::addImportVLTx( JLOG(j_.debug()) << "R-UNL: ledger seq=" << seq << ", add a ttUNL_REPORT (import_vl) Tx with txID: " << txID - << ", size=" << s.size(); + << ", size=" << s.size() << ", " + << repUnlTx.getJson(JsonOptions::none); } } } From aaccf9b5b2862a7e3df6d3523f7116bef9b31076 Mon Sep 17 00:00:00 2001 From: Denis Angell Date: Mon, 25 Mar 2024 09:12:55 +0100 Subject: [PATCH 11/13] revert remove json log --- src/ripple/protocol/STValidation.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ripple/protocol/STValidation.h b/src/ripple/protocol/STValidation.h index 903e5d837..edd922e7b 100644 --- a/src/ripple/protocol/STValidation.h +++ b/src/ripple/protocol/STValidation.h @@ -171,7 +171,8 @@ STValidation::STValidation( { if (checkSignature && !isValid()) { - JLOG(debugLog().error()) << "Invalid signature in validation"; + JLOG(debugLog().error()) << "Invalid signature in validation: " + << getJson(JsonOptions::none); Throw("Invalid signature in validation"); } From c55a97c51a5f19ecc4153426fdfb08aaad4c0d4c Mon Sep 17 00:00:00 2001 From: Denis Angell Date: Mon, 25 Mar 2024 09:27:17 +0100 Subject: [PATCH 12/13] Update STValidation.h --- src/ripple/protocol/STValidation.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ripple/protocol/STValidation.h b/src/ripple/protocol/STValidation.h index edd922e7b..903e5d837 100644 --- a/src/ripple/protocol/STValidation.h +++ b/src/ripple/protocol/STValidation.h @@ -171,8 +171,7 @@ STValidation::STValidation( { if (checkSignature && !isValid()) { - JLOG(debugLog().error()) << "Invalid signature in validation: " - << getJson(JsonOptions::none); + JLOG(debugLog().error()) << "Invalid signature in validation"; Throw("Invalid signature in validation"); } From 03569dbb114c77bc76f0f2da9e568ced2187ec41 Mon Sep 17 00:00:00 2001 From: Denis Angell Date: Tue, 14 May 2024 12:03:07 +0200 Subject: [PATCH 13/13] add correct imports --- src/ripple/app/tx/impl/Import.cpp | 2 ++ src/ripple/protocol/STValidation.h | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ripple/app/tx/impl/Import.cpp b/src/ripple/app/tx/impl/Import.cpp index 0a430bfbe..d40a80eba 100644 --- a/src/ripple/app/tx/impl/Import.cpp +++ b/src/ripple/app/tx/impl/Import.cpp @@ -24,12 +24,14 @@ #include #include #include +#include #include #include #include #include #include #include +#include #include #include #include diff --git a/src/ripple/protocol/STValidation.h b/src/ripple/protocol/STValidation.h index 903e5d837..edd922e7b 100644 --- a/src/ripple/protocol/STValidation.h +++ b/src/ripple/protocol/STValidation.h @@ -171,7 +171,8 @@ STValidation::STValidation( { if (checkSignature && !isValid()) { - JLOG(debugLog().error()) << "Invalid signature in validation"; + JLOG(debugLog().error()) << "Invalid signature in validation: " + << getJson(JsonOptions::none); Throw("Invalid signature in validation"); }