update BumpSequence to allow bumping through the entire uint64 space

This makes it compliant with the proposal dated 02-Feb-2018
stellar/stellar-protocol#53

src/test/TestExceptions.cpp

@@ -267,8 +267,6 @@ throwIf(BumpSequenceResult const& result)
     {
     case BUMP_SEQUENCE_SUCCESS:
         break;
-    case BUMP_SEQUENCE_TOO_FAR:
-        throw ex_BUMP_SEQUENCE_TOO_FAR{};
     default:
         throw ex_UNKNOWN{};
     }

src/test/TestExceptions.h

@@ -45,8 +45,6 @@ TEST_EXCEPTION(ex_ALLOW_TRUST_TRUST_NOT_REQUIRED)
 TEST_EXCEPTION(ex_ALLOW_TRUST_CANT_REVOKE)
 TEST_EXCEPTION(ex_ALLOW_TRUST_SELF_NOT_ALLOWED)
 
-TEST_EXCEPTION(ex_BUMP_SEQUENCE_TOO_FAR)
-
 TEST_EXCEPTION(ex_CREATE_ACCOUNT_MALFORMED)
 TEST_EXCEPTION(ex_CREATE_ACCOUNT_UNDERFUNDED)
 TEST_EXCEPTION(ex_CREATE_ACCOUNT_LOW_RESERVE)

src/transactions/BumpSequenceOpFrame.cpp

@@ -41,22 +41,13 @@ BumpSequenceOpFrame::doApply(Application& app, LedgerDelta& delta,
 {
     SequenceNumber current = mSourceAccount->getSeqNum();
 
-    SequenceNumber maxBump = ledgerManager.getCurrentLedgerHeader().ledgerSeq;
-    maxBump = (maxBump << 32) - 1;
-
-    if (mBumpSequenceOp.bumpTo > maxBump)
+    // Apply the bump (bump succeeds silently if bumpTo <= current)
+    if (mBumpSequenceOp.bumpTo > current)
     {
-        app.getMetrics()
-            .NewMeter({"op-bump-sequence", "failure", "too-far"}, "operation")
-            .Mark();
-        innerResult().code(BUMP_SEQUENCE_TOO_FAR);
-        return false;
+        mSourceAccount->setSeqNum(mBumpSequenceOp.bumpTo);
+        mSourceAccount->storeChange(delta, ledgerManager.getDatabase());
     }
 
-    // Apply the bump (bump succeeds silently if bumpTo < current)
-    mSourceAccount->setSeqNum(std::max(mBumpSequenceOp.bumpTo, current));
-    mSourceAccount->storeChange(delta, ledgerManager.getDatabase());
-
     // Return successful results
     innerResult().code(BUMP_SEQUENCE_SUCCESS);
     app.getMetrics()

src/transactions/BumpSequenceTests.cpp

@@ -37,40 +37,34 @@ TEST_CASE("bump sequence", "[tx][bumpsequence]")
     auto a = root.create("A", lm.getMinBalance(0) + 1000);
     auto b = root.create("B", lm.getMinBalance(0) + 1000);
 
-    // close the ledger (this is required as bumpseq cannot work for
-    // an account just created)
-    closeLedgerOn(*app, 2, 1, 1, 2018);
-
-    SequenceNumber maxSeqNum =
-        (uint64(lm.getCurrentLedgerHeader().ledgerSeq) << 32) - 1;
-
-    for_versions_from(10, *app, [&]() {
-        SECTION("test success")
-        {
-            SECTION("min jump")
+    SECTION("test success")
+    {
+        for_versions_from(10, *app, [&]() {
+            SECTION("small bump")
             {
                 auto newSeq = a.loadSequenceNumber() + 2;
                 a.bumpSequence(newSeq);
                 REQUIRE(a.loadSequenceNumber() == newSeq);
             }
-            SECTION("max jump")
+            SECTION("large bump")
             {
-                a.bumpSequence(maxSeqNum);
-                REQUIRE(a.loadSequenceNumber() == maxSeqNum);
+                auto newSeq = UINT64_MAX;
+                a.bumpSequence(newSeq);
+                REQUIRE(a.loadSequenceNumber() == newSeq);
             }
-        }
-        SECTION("errors")
-        {
-            SECTION("too far")
+            SECTION("backward jump (no-op)")
             {
-                auto prev = a.loadSequenceNumber();
-                REQUIRE_THROWS_AS(a.bumpSequence(maxSeqNum + 1),
-                                  ex_BUMP_SEQUENCE_TOO_FAR);
-                REQUIRE(a.loadSequenceNumber() == prev + 1);
+                auto oldSeq = a.loadSequenceNumber();
+                a.bumpSequence(1);
+                // tx consumes sequence, bumpSequence doesn't do anything
+                REQUIRE(a.loadSequenceNumber() == oldSeq + 1);
             }
-        }
-    });
-    for_versions_to(9, *app, [&]() {
-        REQUIRE_THROWS_AS(a.bumpSequence(maxSeqNum), ex_opNOT_SUPPORTED);
-    });
+        });
+    }
+    SECTION("not supported")
+    {
+        for_versions_to(9, *app, [&]() {
+            REQUIRE_THROWS_AS(a.bumpSequence(1), ex_opNOT_SUPPORTED);
+        });
+    }
 }

src/xdr/Stellar-transaction.x

@@ -670,10 +670,9 @@ default:
 enum BumpSequenceResultCode
 {
     // codes considered as "success" for the operation
-    BUMP_SEQUENCE_SUCCESS = 0,
+    BUMP_SEQUENCE_SUCCESS = 0
     // codes considered as "failure" for the operation
-    BUMP_SEQUENCE_TOO_FAR =
-        -1 // operation would bump past the maximum sequence number allowed
+    // (this operation never fails)
 };
 
 union BumpSequenceResult switch (BumpSequenceResultCode code)