fix tsh

Co-authored-by: Denis Angell <dangell@transia.co>

.github/workflows/clang-format.yml

@@ -4,21 +4,32 @@ on: [push, pull_request]
 
 jobs:
   check:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       CLANG_VERSION: 10
     steps:
     - uses: actions/checkout@v3
-    - name: Install clang-format
+    # - name: Install clang-format
+    #   run: |
+    #     codename=$( lsb_release --codename --short )
+    #     sudo tee /etc/apt/sources.list.d/llvm.list >/dev/null <<EOF
+    #     deb http://apt.llvm.org/${codename}/ llvm-toolchain-${codename}-${CLANG_VERSION} main
+    #     deb-src http://apt.llvm.org/${codename}/ llvm-toolchain-${codename}-${CLANG_VERSION} main
+    #     EOF
+    #     wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add
+    #     sudo apt-get update -y
+    #     sudo apt-get install -y clang-format-${CLANG_VERSION}
+
+    # Temporary fix until this commit is merged
+    # https://github.com/XRPLF/rippled/commit/552377c76f55b403a1c876df873a23d780fcc81c
+    - name: Download and install clang-format
       run: |
-        codename=$( lsb_release --codename --short )
-        sudo tee /etc/apt/sources.list.d/llvm.list >/dev/null <<EOF
-        deb http://apt.llvm.org/${codename}/ llvm-toolchain-${codename}-${CLANG_VERSION} main
-        deb-src http://apt.llvm.org/${codename}/ llvm-toolchain-${codename}-${CLANG_VERSION} main
-        EOF
-        wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add
-        sudo apt-get update
-        sudo apt-get install clang-format-${CLANG_VERSION}
+        sudo apt-get update -y
+        sudo apt-get install -y libtinfo5
+        curl -LO https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/clang+llvm-10.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz
+        tar -xf clang+llvm-10.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz
+        sudo mv clang+llvm-10.0.1-x86_64-linux-gnu-ubuntu-16.04 /opt/clang-10
+        sudo ln -s /opt/clang-10/bin/clang-format /usr/local/bin/clang-format-10
     - name: Format src/ripple
       run: find src/ripple -type f \( -name '*.cpp' -o -name '*.h' -o -name '*.ipp' \) -print0 | xargs -0 clang-format-${CLANG_VERSION} -i
     - name: Format src/test

src/ripple/app/consensus/RCLConsensus.cpp

@@ -498,15 +498,11 @@ RCLConsensus::Adaptor::doAccept(
 
     for (auto const& item : *result.txns.map_)
     {
-#ifndef DEBUG
         try
         {
-#endif
             retriableTxs.insert(
                 std::make_shared<STTx const>(SerialIter{item.slice()}));
             JLOG(j_.debug()) << "    Tx: " << item.key();
-
-#ifndef DEBUG
         }
         catch (std::exception const& ex)
         {
@@ -514,7 +510,6 @@ RCLConsensus::Adaptor::doAccept(
             JLOG(j_.warn())
                 << "    Tx: " << item.key() << " throws: " << ex.what();
         }
-#endif
     }
 
     auto built = buildLCL(

src/ripple/app/ledger/impl/BuildLedger.cpp

@@ -116,10 +116,8 @@ applyTransactions(
         {
             auto const txid = it->first.getTXID();
 
-#ifndef DEBUG
             try
             {
-#endif
                 if (pass == 0 && built->txExists(txid))
                 {
                     it = txns.erase(it);
@@ -142,7 +140,6 @@ applyTransactions(
                     case ApplyResult::Retry:
                         ++it;
                 }
-#ifndef DEBUG
             }
             catch (std::exception const& ex)
             {
@@ -151,7 +148,6 @@ applyTransactions(
                 failed.insert(txid);
                 it = txns.erase(it);
             }
-#endif
         }
 
         JLOG(j.debug()) << (certainRetry ? "Pass: " : "Final pass: ") << pass

src/ripple/app/misc/impl/AccountTxPaging.cpp

@@ -44,8 +44,7 @@ convertBlobsToTxResult(
 
     auto tr = std::make_shared<Transaction>(txn, reason, app);
 
-    auto metaset =
-        std::make_shared<TxMeta>(tr->getID(), tr->getLedger(), rawMeta);
+    auto metaset = std::make_shared<TxMeta>(tr->getID(), ledger_index, rawMeta);
 
     // if properly formed meta is available we can use it to generate ctid
     if (metaset->getAsObject().isFieldPresent(sfTransactionIndex))

src/ripple/app/tx/impl/SetRemarks.cpp

@@ -25,6 +25,7 @@
 #include <ripple/protocol/Indexes.h>
 #include <ripple/protocol/PublicKey.h>
 #include <ripple/protocol/Quality.h>
+#include <ripple/protocol/TxFlags.h>
 #include <ripple/protocol/st.h>
 
 namespace ripple {
@@ -313,22 +314,21 @@ SetRemarks::preclaim(PreclaimContext const& ctx)
 TER
 SetRemarks::doApply()
 {
-    auto j = ctx_.journal;
     Sandbox sb(&ctx_.view());
 
     auto const sle = sb.read(keylet::account(account_));
     if (!sle)
-        return terNO_ACCOUNT;
+        return tefINTERNAL;
 
     auto const objID = ctx_.tx[sfObjectID];
     auto sleO = sb.peek(keylet::unchecked(objID));
     if (!sleO)
-        return terNO_ACCOUNT;
+        return tefINTERNAL;
 
     std::optional<AccountID> issuer = getRemarksIssuer(sleO);
 
     if (!issuer || *issuer != account_)
-        return tecNO_PERMISSION;
+        return tefINTERNAL;
 
     auto const& remarksTxn = ctx_.tx.getFieldArray(sfRemarks);
 
@@ -400,7 +400,7 @@ SetRemarks::doApply()
     }
 
     if (newRemarks.size() > 32)
-        return tecTOO_MANY_REMARKS;
+        return tefINTERNAL;
 
     if (newRemarks.empty() && sleO->isFieldPresent(sfRemarks))
         sleO->makeFieldAbsent(sfRemarks);

src/ripple/app/tx/impl/Transactor.cpp

@@ -1506,15 +1506,13 @@ Transactor::addWeakTSHFromSandbox(detail::ApplyViewBase const& pv)
 TER
 Transactor::doTSH(
     bool strong,  // only strong iff true, only weak iff false
+    std::vector<std::pair<AccountID, bool>> tsh,
     hook::HookStateMap& stateMap,
     std::vector<hook::HookResult>& results,
     std::shared_ptr<STObject const> const& provisionalMeta)
 {
     auto& view = ctx_.view();
 
-    std::vector<std::pair<AccountID, bool>> tsh =
-        hook::getTransactionalStakeHolders(ctx_.tx, view);
-
     // add the extra TSH marked out by the specific transactor (if applicable)
     if (!strong)
         for (auto& weakTsh : additionalWeakTSH_)
@@ -1772,6 +1770,9 @@ Transactor::operator()()
     // application to the ledger
     std::map<AccountID, std::set<uint256>> aawMap;
 
+    std::vector<std::pair<AccountID, bool>> tsh =
+        hook::getTransactionalStakeHolders(ctx_.tx, ctx_.view());
+
     // Pre-application (Strong TSH) Hooks are executed here
     // These TSH have the right to rollback.
     // Weak TSH and callback are executed post-application.
@@ -1800,7 +1801,7 @@ Transactor::operator()()
             // (who have the right to rollback the txn), any weak TSH will be
             // executed after doApply has been successful (callback as well)
 
-            result = doTSH(true, stateMap, hookResults, {});
+            result = doTSH(true, tsh, stateMap, hookResults, {});
         }
 
         // write state if all chains executed successfully
@@ -2054,7 +2055,7 @@ Transactor::operator()()
         hook::HookStateMap stateMap;
         std::vector<hook::HookResult> weakResults;
 
-        doTSH(false, stateMap, weakResults, proMeta);
+        doTSH(false, tsh, stateMap, weakResults, proMeta);
 
         // execute any hooks that nominated for 'again as weak'
         for (auto const& [accID, hookHashes] : aawMap)

src/ripple/app/tx/impl/Transactor.h

@@ -188,6 +188,7 @@ protected:
     TER
     doTSH(
         bool strong,  // only do strong TSH iff true, otheriwse only weak
+        std::vector<std::pair<AccountID, bool>> tsh,
         hook::HookStateMap& stateMap,
         std::vector<hook::HookResult>& result,
         std::shared_ptr<STObject const> const& provisionalMeta);

src/ripple/app/tx/impl/apply.cpp

@@ -168,10 +168,8 @@ applyTransaction(
     JLOG(j.debug()) << "TXN " << txn.getTransactionID()
                     << (retryAssured ? "/retry" : "/final");
 
-#ifndef DEBUG
     try
     {
-#endif
         auto const result = apply(app, view, txn, flags, j);
         if (result.second)
         {
@@ -191,14 +189,12 @@ applyTransaction(
 
         JLOG(j.debug()) << "Transaction retry: " << transHuman(result.first);
         return ApplyResult::Retry;
-#ifndef DEBUG
     }
     catch (std::exception const& ex)
     {
         JLOG(j.warn()) << "Throws: " << ex.what();
         return ApplyResult::Fail;
     }
-#endif
 }
 
 }  // namespace ripple

src/ripple/app/tx/impl/applySteps.cpp

@@ -591,19 +591,15 @@ preflight(
 {
     PreflightContext const pfctx(app, tx, rules, flags, j);
 
-#ifndef DEBUG
     try
     {
-#endif
         return {pfctx, invoke_preflight(pfctx)};
-#ifndef DEBUG
     }
     catch (std::exception const& e)
     {
         JLOG(j.fatal()) << "apply: " << e.what();
         return {pfctx, {tefEXCEPTION, TxConsequences{tx}}};
     }
-#endif
 }
 
 PreclaimResult
@@ -640,21 +636,17 @@ preclaim(
             preflightResult.j);
     }
 
-#ifndef DEBUG
     try
     {
-#endif
         if (!isTesSuccess(ctx->preflightResult))
             return {*ctx, ctx->preflightResult};
         return {*ctx, invoke_preclaim(*ctx)};
-#ifndef DEBUG
     }
     catch (std::exception const& e)
     {
         JLOG(ctx->j.fatal()) << "apply: " << e.what();
         return {*ctx, tefEXCEPTION};
     }
-#endif
 }
 
 XRPAmount
@@ -678,10 +670,8 @@ doApply(PreclaimResult const& preclaimResult, Application& app, OpenView& view)
         // info to recover.
         return {tefEXCEPTION, false};
     }
-#ifndef DEBUG
     try
     {
-#endif
         if (!preclaimResult.likelyToClaimFee)
             return {preclaimResult.ter, false};
 
@@ -694,14 +684,12 @@ doApply(PreclaimResult const& preclaimResult, Application& app, OpenView& view)
             preclaimResult.flags,
             preclaimResult.j);
         return invoke_apply(ctx);
-#ifndef DEBUG
     }
     catch (std::exception const& e)
     {
         JLOG(preclaimResult.j.fatal()) << "apply: " << e.what();
         return {tefEXCEPTION, false};
     }
-#endif
 }
 
 }  // namespace ripple

src/ripple/rpc/handlers/ServerDefinitions.cpp

@@ -396,6 +396,8 @@ private:
                 return "SetRegularKey";
             if (inp == "HookSet")
                 return "SetHook";
+            if (inp == "RemarksSet")
+                return "SetRemarks";
             return inp;
         };
 

src/test/app/Import_test.cpp

@@ -5469,7 +5469,11 @@ class Import_test : public beast::unit_test::suite
         // burn 100'000 coins
         {
             test::jtx::Env env{
-                *this, network::makeNetworkVLConfig(21337, keys)};
+                *this,
+                network::makeNetworkVLConfig(21337, keys),
+                nullptr,
+                beast::severities::kDisabled,
+            };
 
             auto const envCoins = env.current()->info().drops;
             BEAST_EXPECT(envCoins == 100'000'000'000'000'000);
@@ -5509,7 +5513,11 @@ class Import_test : public beast::unit_test::suite
         // burn all coins
         {
             test::jtx::Env env{
-                *this, network::makeNetworkVLConfig(21337, keys)};
+                *this,
+                network::makeNetworkVLConfig(21337, keys),
+                nullptr,
+                beast::severities::kDisabled,
+            };
 
             auto const envCoins = env.current()->info().drops;
             BEAST_EXPECT(envCoins == 100'000'000'000'000'000);
@@ -5549,7 +5557,11 @@ class Import_test : public beast::unit_test::suite
         // burn no coins
         {
             test::jtx::Env env{
-                *this, network::makeNetworkVLConfig(21337, keys)};
+                *this,
+                network::makeNetworkVLConfig(21337, keys),
+                nullptr,
+                beast::severities::kDisabled,
+            };
 
             auto const envCoins = env.current()->info().drops;
             BEAST_EXPECT(envCoins == 100'000'000'000'000'000);

src/test/app/SetRemarks_test.cpp

@@ -377,10 +377,8 @@ struct SetRemarks_test : public beast::unit_test::suite
         //----------------------------------------------------------------------
         // doApply
 
-        // terNO_ACCOUNT
-        // tecNO_TARGET
-        // tecNO_PERMISSION
-        // tecTOO_MANY_REMARKS
+        // All checks in doApply are done in preclaim.
+        BEAST_EXPECT(1);
     }
 
     void

src/test/rpc/Catalogue_test.cpp

@@ -101,8 +101,7 @@ class Catalogue_test : public beast::unit_test::suite
     {
         testcase("catalogue_create: Invalid parameters");
         using namespace test::jtx;
-        Env env{
-            *this, envconfig(), features, nullptr, beast::severities::kInfo};
+        Env env{*this, envconfig(), features};
 
         // No parameters
         {
@@ -177,8 +176,7 @@ class Catalogue_test : public beast::unit_test::suite
         using namespace test::jtx;
 
         // Create environment and some test ledgers
-        Env env{
-            *this, envconfig(), features, nullptr, beast::severities::kInfo};
+        Env env{*this, envconfig(), features};
         prepareLedgerData(env, 5);
 
         boost::filesystem::path tempDir =
@@ -217,8 +215,7 @@ class Catalogue_test : public beast::unit_test::suite
     {
         testcase("catalogue_load: Invalid parameters");
         using namespace test::jtx;
-        Env env{
-            *this, envconfig(), features, nullptr, beast::severities::kInfo};
+        Env env{*this, envconfig(), features};
 
         // No parameters
         {
@@ -265,8 +262,7 @@ class Catalogue_test : public beast::unit_test::suite
         using namespace test::jtx;
 
         // Create environment and test data
-        Env env{
-            *this, envconfig(), features, nullptr, beast::severities::kInfo};
+        Env env{*this, envconfig(), features};
         prepareLedgerData(env, 5);
 
         // Store some key state information before catalogue creation
@@ -322,8 +318,7 @@ class Catalogue_test : public beast::unit_test::suite
             *this,
             test::jtx::envconfig(test::jtx::port_increment, 3),
             features,
-            nullptr,
-            beast::severities::kInfo};
+        };
 
         // Now load the catalogue
         Json::Value params{Json::objectValue};
@@ -518,8 +513,7 @@ class Catalogue_test : public beast::unit_test::suite
                     return cfg;
                 }),
                 features,
-                nullptr,
-                beast::severities::kInfo};
+            };
             prepareLedgerData(env1, 5);
 
             // Create catalogue with network ID 123
@@ -544,8 +538,7 @@ class Catalogue_test : public beast::unit_test::suite
                     return cfg;
                 }),
                 features,
-                nullptr,
-                beast::severities::kInfo};
+            };
 
             {
                 Json::Value params{Json::objectValue};
@@ -568,8 +561,7 @@ class Catalogue_test : public beast::unit_test::suite
         using namespace test::jtx;
 
         // Create environment and test data
-        Env env{
-            *this, envconfig(), features, nullptr, beast::severities::kInfo};
+        Env env{*this, envconfig(), features};
         prepareLedgerData(env, 3);
 
         boost::filesystem::path tempDir =
@@ -660,8 +652,7 @@ class Catalogue_test : public beast::unit_test::suite
         using namespace test::jtx;
 
         // Create environment and test data
-        Env env{
-            *this, envconfig(), features, nullptr, beast::severities::kInfo};
+        Env env{*this, envconfig(), features};
         prepareLedgerData(env, 3);
 
         boost::filesystem::path tempDir =
@@ -736,8 +727,7 @@ class Catalogue_test : public beast::unit_test::suite
         using namespace test::jtx;
 
         // Create environment and test data
-        Env env{
-            *this, envconfig(), features, nullptr, beast::severities::kInfo};
+        Env env{*this, envconfig(), features};
         prepareLedgerData(env, 5);
 
         boost::filesystem::path tempDir =
@@ -826,8 +816,7 @@ class Catalogue_test : public beast::unit_test::suite
         using namespace test::jtx;
 
         // Create environment
-        Env env{
-            *this, envconfig(), features, nullptr, beast::severities::kInfo};
+        Env env{*this, envconfig(), features};
 
         boost::filesystem::path tempDir =
             boost::filesystem::temp_directory_path() /