Fix transaction sequencing

XRPLF · Jul 28, 2015 · fae22b7 · fae22b7
1 parent 4568b39
commit fae22b7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/src/core/transactionmanager.js b/src/core/transactionmanager.js
@@ -728,8 +728,7 @@ TransactionManager.prototype.submit = function(tx) {
 
   if (typeof tx.tx_json.Sequence !== 'number') {
     // Honor manually-set sequences
-    this._nextSequence += 1;
-    tx.tx_json.Sequence = this._nextSequence;
+    tx.tx_json.Sequence = this._nextSequence++;
   }
 
   tx.once('cleanup', function() {

diff --git a/test/transaction-manager-test.js b/test/transaction-manager-test.js
@@ -425,6 +425,8 @@ describe('TransactionManager', function() {
     rippled.once('request_submit', function(m, req) {
       assert.strictEqual(m.tx_blob, SerializedObject.from_json(
         transaction.tx_json).to_hex());
+      assert.strictEqual(new SerializedObject(m.tx_blob).to_json().Sequence,
+                         ACCOUNT_INFO_RESPONSE.result.account_data.Sequence);
       assert.strictEqual(transactionManager.getPending().length(), 1);
       req.sendResponse(SUBMIT_RESPONSE, {id: m.id});
       setImmediate(function() {
@@ -463,6 +465,8 @@ describe('TransactionManager', function() {
     rippled.once('request_submit', function(m, req) {
       assert.strictEqual(m.tx_blob, SerializedObject.from_json(
         transaction.tx_json).to_hex());
+      assert.strictEqual(new SerializedObject(m.tx_blob).to_json().Sequence,
+                         ACCOUNT_INFO_RESPONSE.result.account_data.Sequence);
       assert.strictEqual(transactionManager.getPending().length(), 1);
       req.sendResponse(SUBMIT_TEC_RESPONSE, {id: m.id});
       setImmediate(function() {
@@ -506,13 +510,15 @@ describe('TransactionManager', function() {
 
       switch (deserialized.TransactionType) {
         case 'Payment':
-          assert.strictEqual(transactionManager.getPending().length(), 1);
           assert.deepEqual(deserialized, transaction.tx_json);
+          assert.strictEqual(transactionManager.getPending().length(), 1);
           req.sendResponse(SUBMIT_TER_RESPONSE, {id: m.id});
           break;
         case 'AccountSet':
           assert.strictEqual(deserialized.Account, ACCOUNT.address);
           assert.strictEqual(deserialized.Flags, 2147483648);
+          assert.strictEqual(deserialized.Sequence,
+                             ACCOUNT_INFO_RESPONSE.result.account_data.Sequence);
           req.sendResponse(SUBMIT_RESPONSE, {id: m.id});
           req.closeLedger();
           break;
@@ -568,9 +574,9 @@ describe('TransactionManager', function() {
     });
 
     rippled.on('request_submit', function(m, req) {
-      assert.strictEqual(transactionManager.getPending().length(), 1);
       assert.strictEqual(m.tx_blob, SerializedObject.from_json(
         transaction.tx_json).to_hex());
+      assert.strictEqual(transactionManager.getPending().length(), 1);
       req.sendResponse(SUBMIT_TEF_RESPONSE, {id: m.id});
     });
 
@@ -626,9 +632,11 @@ describe('TransactionManager', function() {
     });
 
     rippled.on('request_submit', function(m, req) {
-      assert.strictEqual(transactionManager.getPending().length(), 1);
       assert.strictEqual(m.tx_blob, SerializedObject.from_json(
         transaction.tx_json).to_hex());
+      assert.strictEqual(new SerializedObject(m.tx_blob).to_json().Sequence,
+                         ACCOUNT_INFO_RESPONSE.result.account_data.Sequence);
+      assert.strictEqual(transactionManager.getPending().length(), 1);
       req.sendResponse(SUBMIT_TEL_RESPONSE, {id: m.id});
     });
 
@@ -729,9 +737,11 @@ describe('TransactionManager', function() {
     });
 
     rippled.on('request_submit', function(m, req) {
-      assert.strictEqual(transactionManager.getPending().length(), 1);
       assert.strictEqual(m.tx_blob, SerializedObject.from_json(
         transaction.tx_json).to_hex());
+      assert.strictEqual(new SerializedObject(m.tx_blob).to_json().Sequence,
+                         ACCOUNT_INFO_RESPONSE.result.account_data.Sequence);
+      assert.strictEqual(transactionManager.getPending().length(), 1);
 
       /* eslint-disable max-len */
 
@@ -787,9 +797,11 @@ describe('TransactionManager', function() {
     });
 
     rippled.on('request_submit', function(m, req) {
-      assert.strictEqual(transactionManager.getPending().length(), 1);
       assert.strictEqual(m.tx_blob, SerializedObject.from_json(
         transaction.tx_json).to_hex());
+      assert.strictEqual(new SerializedObject(m.tx_blob).to_json().Sequence,
+                         ACCOUNT_INFO_RESPONSE.result.account_data.Sequence);
+      assert.strictEqual(transactionManager.getPending().length(), 1);
       req.sendResponse(SUBMIT_TEL_RESPONSE, {id: m.id});
     });
 
@@ -852,9 +864,11 @@ describe('TransactionManager', function() {
     });
 
     rippled.on('request_submit', function(m, req) {
-      assert.strictEqual(transactionManager.getPending().length(), 1);
       assert.strictEqual(m.tx_blob, SerializedObject.from_json(
         transaction.tx_json).to_hex());
+      assert.strictEqual(new SerializedObject(m.tx_blob).to_json().Sequence,
+                         ACCOUNT_INFO_RESPONSE.result.account_data.Sequence);
+      assert.strictEqual(transactionManager.getPending().length(), 1);
 
       req.sendResponse(SUBMIT_TOO_BUSY_ERROR, {id: m.id});
     });