Proposed 1.7.0-b1

.github/pull_request_template.md

@@ -0,0 +1,55 @@
+<!--
+This PR template helps you to write a good pull request description.
+Please feel free to include additional useful information even beyond what is requested below.
+-->
+
+## High Level Overview of Change
+
+<!--
+Please include a summary of the changes.
+This may be a direct input to the release notes.
+If too broad, please consider splitting into multiple PRs.
+If a relevant task or issue, please link it here.
+-->
+
+### Context of Change
+
+<!--
+Please include the context of a change.
+If a bug fix, when was the bug introduced? What was the behavior?
+If a new feature, why was this architecture chosen? What were the alternatives?
+If a refactor, how is this better than the previous implementation?
+
+If there is a spec or design document for this feature, please link it here.
+-->
+
+### Type of Change
+
+<!--
+Please check [x] relevant options, delete irrelevant ones.
+-->
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] Refactor (non-breaking change that only restructures code)
+- [ ] Tests (You added tests for code that already exists, or your new feature included in this PR)
+- [ ] Documentation Updates
+- [ ] Release
+
+<!--
+## Before / After
+If relevant, use this section for an English description of the change at a technical level.
+If this change affects an API, examples should be included here.
+-->
+
+<!--
+## Test Plan
+If helpful, please describe the tests that you ran to verify your changes and provide instructions so that others can reproduce.
+This section may not be needed if your change includes thoroughly commented unit tests.
+-->
+
+<!--
+## Future Tasks
+For future tasks related to PR.
+-->

Builds/CMake/RippledCore.cmake

@@ -237,6 +237,7 @@ install (
     src/ripple/protocol/STVector256.h
     src/ripple/protocol/SecretKey.h
     src/ripple/protocol/Seed.h
+    src/ripple/protocol/SeqProxy.h
     src/ripple/protocol/Serializer.h
     src/ripple/protocol/Sign.h
     src/ripple/protocol/SystemParameters.h
@@ -385,6 +386,7 @@ target_sources (rippled PRIVATE
   src/ripple/app/misc/NegativeUNLVote.cpp
   src/ripple/app/misc/NetworkOPs.cpp
   src/ripple/app/misc/SHAMapStoreImp.cpp
+  src/ripple/app/misc/detail/impl/WorkSSL.cpp
   src/ripple/app/misc/impl/AccountTxPaging.cpp
   src/ripple/app/misc/impl/AmendmentTable.cpp
   src/ripple/app/misc/impl/LoadFeeTrack.cpp
@@ -411,7 +413,6 @@ target_sources (rippled PRIVATE
   src/ripple/app/tx/impl/BookTip.cpp
   src/ripple/app/tx/impl/CancelCheck.cpp
   src/ripple/app/tx/impl/CancelOffer.cpp
-  src/ripple/app/tx/impl/CancelTicket.cpp
   src/ripple/app/tx/impl/CashCheck.cpp
   src/ripple/app/tx/impl/Change.cpp
   src/ripple/app/tx/impl/CreateCheck.cpp
@@ -663,6 +664,7 @@ target_sources (rippled PRIVATE
   src/test/app/DeliverMin_test.cpp
   src/test/app/DepositAuth_test.cpp
   src/test/app/Discrepancy_test.cpp
+  src/test/app/DNS_test.cpp
   src/test/app/Escrow_test.cpp
   src/test/app/FeeVote_test.cpp
   src/test/app/Flow_test.cpp
@@ -867,6 +869,7 @@ target_sources (rippled PRIVATE
   src/test/overlay/cluster_test.cpp
   src/test/overlay/short_read_test.cpp
   src/test/overlay/compression_test.cpp
+  src/test/overlay/reduce_relay_test.cpp
   #[===============================[
      test sources:
        subdir: peerfinder
@@ -889,6 +892,7 @@ target_sources (rippled PRIVATE
   src/test/protocol/STValidation_test.cpp
   src/test/protocol/SecretKey_test.cpp
   src/test/protocol/Seed_test.cpp
+  src/test/protocol/SeqProxy_test.cpp
   src/test/protocol/TER_test.cpp
   src/test/protocol/digest_test.cpp
   src/test/protocol/types_test.cpp

bin/ci/ubuntu/build-and-test.sh

@@ -136,6 +136,7 @@ else
     # ORDER matters here...sorted in approximately
     # descending execution time (longest running tests at top)
     declare -a manual_tests=(
+        'ripple.ripple_data.reduce_relay_simulate'
         'ripple.ripple_data.digest'
         'ripple.tx.Offer_manual'
         'ripple.app.PayStrandAllPairs'

cfg/rippled-example.cfg

@@ -453,6 +453,13 @@
 #
 #
 #
+# [max_transactions]
+#
+#   Configure the maximum number of transactions to have in the job queue
+#
+#   Must be a number between 100 and 1000, defaults to 250
+# 
+#
 # [overlay]
 #
 #   Controls settings related to the peer to peer overlay.
@@ -506,14 +513,6 @@
 #       than the original transaction's fee, or meet the current open
 #       ledger fee to be considered. Default: 25.
 #
-#   multi_txn_percent = <number>
-#
-#       If a client submits multiple transactions (different sequence
-#       numbers), later transactions must pay a fee at least <number>
-#       percent higher than the transaction with the previous sequence
-#       number.
-#       Default: -90.
-#
 #   minimum_escalation_multiplier = <number>
 #
 #       At ledger close time, the median fee level of the transactions

src/ripple/app/consensus/RCLConsensus.cpp

@@ -157,7 +157,7 @@ RCLConsensus::Adaptor::share(RCLCxPeerPos const& peerPos)
     auto const sig = peerPos.signature();
     prop.set_signature(sig.data(), sig.size());
 
-    app_.overlay().relay(prop, peerPos.suppressionID());
+    app_.overlay().relay(prop, peerPos.suppressionID(), peerPos.publicKey());
 }
 
 void

src/ripple/app/ledger/LedgerMaster.h

@@ -148,14 +148,13 @@ class LedgerMaster : public Stoppable, public AbstractFetchPackContainer
     void
     applyHeldTransactions();
 
-    /** Get all the transactions held for a particular account.
-        This is normally called when a transaction for that
-        account is successfully applied to the open
-        ledger so those transactions can be resubmitted without
-        waiting for ledger close.
+    /** Get the next transaction held for a particular account if any.
+        This is normally called when a transaction for that account is
+        successfully applied to the open ledger so the next transaction
+        can be resubmitted without waiting for ledger close.
     */
-    std::vector<std::shared_ptr<STTx const>>
-    pruneHeldTransactions(AccountID const& account, std::uint32_t const seq);
+    std::shared_ptr<STTx const>
+    popAcctTransaction(std::shared_ptr<STTx const> const& tx);
 
     /** Get a ledger's hash by sequence number using the cache
      */

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

@@ -543,14 +543,12 @@ LedgerMaster::applyHeldTransactions()
     mHeldTransactions.reset(app_.openLedger().current()->info().parentHash);
 }
 
-std::vector<std::shared_ptr<STTx const>>
-LedgerMaster::pruneHeldTransactions(
-    AccountID const& account,
-    std::uint32_t const seq)
+std::shared_ptr<STTx const>
+LedgerMaster::popAcctTransaction(std::shared_ptr<STTx const> const& tx)
 {
     std::lock_guard sl(m_mutex);
 
-    return mHeldTransactions.prune(account, seq);
+    return mHeldTransactions.popAcctTransaction(tx);
 }
 
 LedgerIndex

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

@@ -228,15 +228,12 @@ fillJsonQueue(Object& json, LedgerFill const& fill)
         txJson[jss::fee_level] = to_string(tx.feeLevel);
         if (tx.lastValid)
             txJson[jss::LastLedgerSequence] = *tx.lastValid;
-        if (tx.consequences)
-        {
-            txJson[jss::fee] = to_string(tx.consequences->fee);
-            auto spend = tx.consequences->potentialSpend + tx.consequences->fee;
-            txJson[jss::max_spend_drops] = to_string(spend);
-            auto authChanged =
-                tx.consequences->category == TxConsequences::blocker;
-            txJson[jss::auth_change] = authChanged;
-        }
+
+        txJson[jss::fee] = to_string(tx.consequences.fee());
+        auto const spend =
+            tx.consequences.potentialSpend() + tx.consequences.fee();
+        txJson[jss::max_spend_drops] = to_string(spend);
+        txJson[jss::auth_change] = tx.consequences.isBlocker();
 
         txJson[jss::account] = to_string(tx.account);
         txJson["retries_remaining"] = tx.retriesRemaining;

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

@@ -63,7 +63,7 @@ class LocalTx
         , m_expire(index + holdLedgers)
         , m_id(txn->getTransactionID())
         , m_account(txn->getAccountID(sfAccount))
-        , m_seq(txn->getSequence())
+        , m_seqProxy(txn->getSeqProxy())
     {
         if (txn->isFieldPresent(sfLastLedgerSequence))
             m_expire =
@@ -76,10 +76,10 @@ class LocalTx
         return m_id;
     }
 
-    std::uint32_t
-    getSeq() const
+    SeqProxy
+    getSeqProxy() const
     {
-        return m_seq;
+        return m_seqProxy;
     }
 
     bool
@@ -105,7 +105,7 @@ class LocalTx
     LedgerIndex m_expire;
     uint256 m_id;
     AccountID m_account;
-    std::uint32_t m_seq;
+    SeqProxy m_seqProxy;
 };
 
 //------------------------------------------------------------------------------
@@ -138,7 +138,6 @@ class LocalTxsImp : public LocalTxs
             for (auto const& it : m_txns)
                 tset.insert(it.getTX());
         }
-
         return tset;
     }
 
@@ -156,11 +155,28 @@ class LocalTxsImp : public LocalTxs
             if (view.txExists(txn.getID()))
                 return true;
 
-            std::shared_ptr<SLE const> sle =
-                view.read(keylet::account(txn.getAccount()));
-            if (!sle)
+            AccountID const acctID = txn.getAccount();
+            auto const sleAcct = view.read(keylet::account(acctID));
+
+            if (!sleAcct)
                 return false;
-            return sle->getFieldU32(sfSequence) > txn.getSeq();
+
+            SeqProxy const acctSeq =
+                SeqProxy::sequence(sleAcct->getFieldU32(sfSequence));
+            SeqProxy const seqProx = txn.getSeqProxy();
+
+            if (seqProx.isSeq())
+                return acctSeq > seqProx;  // Remove tefPAST_SEQ
+
+            if (seqProx.isTicket() && acctSeq.value() <= seqProx.value())
+                // Keep ticket from the future.  Note, however, that the
+                // transaction will not be held indefinitely since LocalTxs
+                // will only hold a transaction for a maximum of 5 ledgers.
+                return false;
+
+            // Ticket should have been created by now.  Remove if ticket
+            // does not exist.
+            return !view.exists(keylet::ticket(acctID, seqProx));
         });
     }