Set version to 0.30.1-hf1

This reverts commit 9fea06ad84.

src/ripple/protocol/impl/BuildInfo.cpp

@@ -35,7 +35,7 @@ char const* getRawVersionString ()
     //
     //  The build version number (edit this for each release)
     //
-        "0.30.1"
+        "0.30.1-hf1"
     //
     //  Must follow the format described here:
     //

src/ripple/rpc/handlers/AccountTx.cpp

@@ -163,7 +163,7 @@ Json::Value doAccountTx (RPC::Context& context)
                 {
                     auto meta = it.second->getJson (1);
                     addPaymentDeliveredAmount (meta, context, it.first, it.second);
-                    jvObj[jss::meta] = meta;
+                    jvObj[jss::meta] = std::move(meta);
 
                     std::uint32_t uLedgerIndex = it.second->getLgrSeq ();
 

src/ripple/rpc/handlers/AccountTxOld.cpp

@@ -29,6 +29,7 @@
 #include <ripple/resource/Fees.h>
 #include <ripple/rpc/Context.h>
 #include <ripple/rpc/impl/LookupLedger.h>
+#include <ripple/rpc/impl/Utilities.h>
 #include <ripple/server/Role.h>
 
 namespace ripple {
@@ -183,7 +184,10 @@ Json::Value doAccountTxOld (RPC::Context& context)
                 {
                     std::uint32_t uLedgerIndex = it->second->getLgrSeq ();
 
-                    jvObj[jss::meta]           = it->second->getJson (0);
+                    auto meta = it->second->getJson(0);
+                    addPaymentDeliveredAmount(meta, context, it->first, it->second);
+                    jvObj[jss::meta] = std::move(meta);
+
                     jvObj[jss::validated]
                             = bValidated
                             && uValidatedMin <= uLedgerIndex

src/ripple/rpc/impl/Utilities.cpp

@@ -39,22 +39,31 @@ addPaymentDeliveredAmount (
 {
     // We only want to add a "delivered_amount" field if the transaction
     // succeeded - otherwise nothing could have been delivered.
-    if (!transaction || transaction->getResult () != tesSUCCESS)
+    if (! transaction)
         return;
 
     auto serializedTx = transaction->getSTransaction ();
+    if (! serializedTx || serializedTx->getTxnType () != ttPAYMENT)
+        return;
 
-    if (!serializedTx || serializedTx->getTxnType () != ttPAYMENT)
+    if (transactionMeta)
+    {
+        if (transactionMeta->getResultTER() != tesSUCCESS)
             return;
 
         // If the transaction explicitly specifies a DeliveredAmount in the
         // metadata then we use it.
-    if (transactionMeta && transactionMeta->hasDeliveredAmount ())
+        if (transactionMeta->hasDeliveredAmount ())
         {
             meta[jss::delivered_amount] =
                 transactionMeta->getDeliveredAmount ().getJson (1);
             return;
         }
+    }
+    else if (transaction->getResult() != tesSUCCESS)
+    {
+        return;
+    }
 
     // Ledger 4594095 is the first ledger in which the DeliveredAmount field
     // was present when a partial payment was made and its absence indicates