[FOLD] Update get_aggregate_price with historical data, and other ref…

…actoring

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

@@ -43,11 +43,17 @@ SetOracle::preflight(PreflightContext const& ctx)
         return temINVALID_FLAG;
     }
 
-    if (ctx.tx.getFieldArray(sfPriceDataSeries).size() > maxOracleDataSeries)
+    auto const dataSeries = ctx.tx.getFieldArray(sfPriceDataSeries);
+    if (dataSeries.size() == 0 || dataSeries.size() > maxOracleDataSeries)
     {
-        JLOG(ctx.j.debug()) << "Oracle Set: price data series too large";
+        JLOG(ctx.j.debug()) << "Oracle Set: invalid price data series size";
         return temARRAY_SIZE;
     }
+    for (auto const& entry : dataSeries)
+    {
+        if (!entry.isFieldPresent(sfSymbolPrice))
+            return temMALFORMED;
+    }
 
     if (ctx.tx.getFieldVL(sfProvider).size() > maxOracleProvider)
     {
@@ -84,6 +90,7 @@ SetOracle::preclaim(PreclaimContext const& ctx)
         pairs.emplace(hash);
     }
 
+    // update
     if (auto const sle = ctx.view.read(keylet::oracle(
             ctx.tx.getAccountID(sfAccount), ctx.tx[sfOracleSequence])))
     {
@@ -103,14 +110,15 @@ SetOracle::preclaim(PreclaimContext const& ctx)
                 pairs.emplace(hash);
         }
     }
+    // create
     else
     {
         if (!ctx.tx.isFieldPresent(sfProvider) ||
             !ctx.tx.isFieldPresent(sfSymbolClass))
             return temMALFORMED;
     }
 
-    if (pairs.size() == 0 || pairs.size() > 10)
+    if (pairs.size() > maxOracleDataSeries)
         return temARRAY_SIZE;
 
     auto const sleSetter =
@@ -140,10 +148,9 @@ applySet(
 {
     auto const oracleID = keylet::oracle(account_, ctx_.tx[sfOracleSequence]);
 
+    // update
     if (auto sle = sb.peek(oracleID))
     {
-        // update Oracle
-
         hash_map<uint256, STObject> pairs;
         // collect current pairs
         for (auto const& entry : sle->getFieldArray(sfPriceDataSeries))
@@ -153,8 +160,6 @@ applySet(
                 sfSymbol, entry.getFieldCurrency(sfSymbol));
             priceData.setFieldCurrency(
                 sfPriceUnit, entry.getFieldCurrency(sfPriceUnit));
-            priceData.setFieldU64(sfSymbolPrice, 0);
-            priceData.setFieldU8(sfScale, 0);
             pairs.emplace(
                 sha512Half(
                     entry.getFieldCurrency(sfSymbol).currency(),
@@ -171,7 +176,8 @@ applySet(
             {
                 iter->second.setFieldU64(
                     sfSymbolPrice, entry.getFieldU64(sfSymbolPrice));
-                iter->second.setFieldU8(sfScale, entry.getFieldU8(sfScale));
+                if (entry.isFieldPresent(sfScale))
+                    iter->second.setFieldU8(sfScale, entry.getFieldU8(sfScale));
             }
             else
             {
@@ -182,7 +188,8 @@ applySet(
                     sfPriceUnit, entry.getFieldCurrency(sfPriceUnit));
                 priceData.setFieldU64(
                     sfSymbolPrice, entry.getFieldU64(sfSymbolPrice));
-                priceData.setFieldU8(sfScale, entry.getFieldU8(sfScale));
+                if (entry.isFieldPresent(sfScale))
+                    priceData.setFieldU8(sfScale, entry.getFieldU8(sfScale));
                 pairs.emplace(
                     sha512Half(
                         entry.getFieldCurrency(sfSymbol).currency(),
@@ -200,10 +207,9 @@ applySet(
 
         sb.update(sle);
     }
+    // create
     else
     {
-        // create new Oracle
-
         sle = std::make_shared<SLE>(oracleID);
         sle->setAccountID(sfOwner, ctx_.tx.getAccountID(sfAccount));
         sle->setFieldVL(sfProvider, ctx_.tx[sfProvider]);

src/ripple/protocol/impl/InnerObjectFormats.cpp

@@ -141,8 +141,8 @@ InnerObjectFormats::InnerObjectFormats()
         {
             {sfSymbol, soeREQUIRED},
             {sfPriceUnit, soeREQUIRED},
-            {sfSymbolPrice, soeREQUIRED},
-            {sfScale, soeREQUIRED},
+            {sfSymbolPrice, soeOPTIONAL},
+            {sfScale, soeDEFAULT},
         });
 }
 

src/ripple/protocol/jss.h

@@ -208,6 +208,7 @@ JSS(auth_accounts);               // out: amm_info
 JSS(auth_change);                 // out: AccountInfo
 JSS(auth_change_queued);          // out: AccountInfo
 JSS(available);                   // out: ValidatorList
+JSS(average);                     // out: get_aggregate_price
 JSS(avg_bps_recv);                // out: Peers
 JSS(avg_bps_sent);                // out: Peers
 JSS(balance);                     // out: AccountLines
@@ -307,6 +308,7 @@ JSS(enabled);                 // out: AmendmentTable
 JSS(engine_result);           // out: NetworkOPs, TransactionSign, Submit
 JSS(engine_result_code);      // out: NetworkOPs, TransactionSign, Submit
 JSS(engine_result_message);   // out: NetworkOPs, TransactionSign, Submit
+JSS(entire_set);              // out: get_aggregate_price
 JSS(ephemeral_key);           // out: ValidatorInfo
                               // in/out: Manifest
 JSS(error);                   // out: error
@@ -616,7 +618,6 @@ JSS(signing_keys);              // out: ValidatorList
 JSS(signing_time);              // out: NetworkOPs
 JSS(signer_list);               // in: AccountObjects
 JSS(signer_lists);              // in/out: AccountInfo
-JSS(simple_average);            // out: get_aggregate_price
 JSS(size);                      // out: get_aggregate_price
 JSS(snapshot);                  // in: Subscribe
 JSS(source_account);            // in: PathRequest, RipplePathFind
@@ -660,6 +661,7 @@ JSS(time_interval);           // out: AMM Auction Slot
 JSS(track);                   // out: PeerImp
 JSS(traffic);                 // out: Overlay
 JSS(trim);                    // in: get_aggregate_price
+JSS(trimmed_set);             // out: get_aggregate_price
 JSS(total);                   // out: counters
 JSS(total_bytes_recv);        // out: Peers
 JSS(total_bytes_sent);        // out: Peers