Merge master (1.7.3) into develop (1.8.0-b4)

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

@@ -265,7 +265,7 @@ CashCheck::doApply()
     // directly on a View.
     PaymentSandbox psb(&ctx_.view());
 
-    auto const sleCheck = psb.peek(keylet::check(ctx_.tx[sfCheckID]));
+    auto sleCheck = psb.peek(keylet::check(ctx_.tx[sfCheckID]));
     if (!sleCheck)
     {
         JLOG(j_.fatal()) << "Precheck did not verify check's existence.";
@@ -273,10 +273,8 @@ CashCheck::doApply()
     }
 
     AccountID const srcId{sleCheck->getAccountID(sfAccount)};
-    auto const sleSrc = psb.peek(keylet::account(srcId));
-    auto const sleDst = psb.peek(keylet::account(account_));
-
-    if (!sleSrc || !sleDst)
+    if (!psb.exists(keylet::account(srcId)) ||
+        !psb.exists(keylet::account(account_)))
     {
         JLOG(ctx_.journal.fatal())
             << "Precheck did not verify source or destination's existence.";
@@ -295,7 +293,7 @@ CashCheck::doApply()
     // work to do...
     auto viewJ = ctx_.app.journal("View");
     auto const optDeliverMin = ctx_.tx[~sfDeliverMin];
-    bool const doFix1623{ctx_.view().rules().enabled(fix1623)};
+    bool const doFix1623{psb.rules().enabled(fix1623)};
 
     if (srcId != account_)
     {
@@ -304,7 +302,7 @@ CashCheck::doApply()
         // Flow() doesn't do XRP to XRP transfers.
         if (sendMax.native())
         {
-            // Here we need to calculate the amount of XRP sleSrc can send.
+            // Here we need to calculate the amount of XRP src can send.
             // The amount they have available is their balance minus their
             // reserve.
             //
@@ -376,6 +374,8 @@ CashCheck::doApply()
                 //     a. this (destination) account and
                 //     b. issuing account (not sending account).
 
+                auto const sleDst = psb.peek(keylet::account(account_));
+
                 // Can the account cover the trust line's reserve?
                 if (std::uint32_t const ownerCount = {sleDst->at(sfOwnerCount)};
                     mPriorBalance < psb.fees().accountReserve(ownerCount + 1))
@@ -412,6 +412,8 @@ CashCheck::doApply()
                 }
                 // clang-format on
 
+                psb.update(sleDst);
+
                 // Note that we _don't_ need to be careful about destroying
                 // the trust line if the check cashing fails.  The transaction
                 // machinery will automatically clean it up.
@@ -478,37 +480,42 @@ CashCheck::doApply()
                     // Set the delivered_amount metadata.
                     ctx_.deliver(result.actualAmountOut);
             }
+
             // Set the delivered amount metadata in all cases, not just
             // for DeliverMin.
             if (checkCashMakesTrustLine)
                 ctx_.deliver(result.actualAmountOut);
+
+            sleCheck = psb.peek(keylet::check(ctx_.tx[sfCheckID]));
         }
     }
 
     // Check was cashed.  If not a self send (and it shouldn't be), remove
     // check link from destination directory.
-    if (srcId != account_)
+    if (srcId != account_ &&
+        !psb.dirRemove(
+            keylet::ownerDir(account_),
+            sleCheck->at(sfDestinationNode),
+            sleCheck->key(),
+            true))
     {
-        std::uint64_t const page = {sleCheck->at(sfDestinationNode)};
-        if (!ctx_.view().dirRemove(
-                keylet::ownerDir(account_), page, sleCheck->key(), true))
-        {
-            JLOG(j_.fatal()) << "Unable to delete check from destination.";
-            return tefBAD_LEDGER;
-        }
+        JLOG(j_.fatal()) << "Unable to delete check from destination.";
+        return tefBAD_LEDGER;
     }
+
     // Remove check from check owner's directory.
+    if (!psb.dirRemove(
+            keylet::ownerDir(srcId),
+            sleCheck->at(sfOwnerNode),
+            sleCheck->key(),
+            true))
     {
-        std::uint64_t const page = {sleCheck->at(sfOwnerNode)};
-        if (!ctx_.view().dirRemove(
-                keylet::ownerDir(srcId), page, sleCheck->key(), true))
-        {
-            JLOG(j_.fatal()) << "Unable to delete check from owner.";
-            return tefBAD_LEDGER;
-        }
+        JLOG(j_.fatal()) << "Unable to delete check from owner.";
+        return tefBAD_LEDGER;
     }
+
     // If we succeeded, update the check owner's reserve.
-    adjustOwnerCount(psb, sleSrc, -1, viewJ);
+    adjustOwnerCount(psb, psb.peek(keylet::account(srcId)), -1, viewJ);
 
     // Remove check from ledger.
     psb.erase(sleCheck);

src/ripple/protocol/impl/Feature.cpp

@@ -131,7 +131,7 @@ detail::supportedAmendments()
         "fix1781",
         "HardenedValidations",
         "fixAmendmentMajorityCalc",
-        //"NegativeUNL",      // Commented out to prevent automatic enablement
+        "NegativeUNL",
         "TicketBatch",
         "FlowSortStrands",
         "fixSTAmountCanonicalize",

src/ripple/protocol/impl/tokens.cpp

@@ -149,7 +149,7 @@ encodeBase58(
 static std::string
 decodeBase58(std::string const& s)
 {
-    auto psz = s.c_str();
+    auto psz = reinterpret_cast<unsigned char const*>(s.c_str());
     auto remain = s.size();
     // Skip and count leading zeroes
     int zeroes = 0;