Merge pull request #173 from ripple/remove-storage-interface

Do not use ripple-lib storage interface

api/transactions.js

@@ -34,18 +34,19 @@ module.exports = {
  *  @param {submission response} response The response received from the 'proposed' event
  */
 function submitTransaction(data, response, callback) {
-
   function prepareTransaction(async_callback) {
     data.transaction.secret(data.secret);
     data.transaction.clientID(data.client_resource_id);
     async_callback(null, data.transaction);
   };
 
-  function blockDuplicates(transaction, async_callback) {    
+  function blockDuplicates(transaction, async_callback) {
     var type = transaction.tx_json.TransactionType;
+
     if (type !== 'Payment' && type !== 'OfferCreate' && type !== 'OfferCancel') {
       return async_callback(null, transaction);
     }
+
     dbinterface.getTransaction({
       source_account: transaction.tx_json.Account,
       client_resource_id: data.client_resource_id,
@@ -54,6 +55,7 @@ function submitTransaction(data, response, callback) {
         if (error) {
           return async_callback(error);
         }
+
         if (db_record && db_record.state !== 'failed') {
           async_callback(new errors.ApiError('Duplicate Transaction. ' +
             'A record already exists in the database for a transaction of this type ' +
@@ -70,10 +72,7 @@ function submitTransaction(data, response, callback) {
     transaction.remote = remote;
 
     var ledgerIndex = remote._ledger_current_index;
-
-    if (!isNaN(ledgerIndex)) {
-      transaction.lastLedger(Number(ledgerIndex) + module.exports.DEFAULT_LEDGER_BUFFER);
-    }
+    transaction.lastLedger(Number(ledgerIndex) + module.exports.DEFAULT_LEDGER_BUFFER);
 
     transaction.once('error', async_callback);
 
@@ -82,6 +81,20 @@ function submitTransaction(data, response, callback) {
       async_callback(null, transaction._clientID);
     });
 
+    function saveTransaction() {
+      dbinterface.saveTransaction(transaction.summary());
+    };
+
+    transaction.once('proposed', function() {
+      saveTransaction();
+
+      // Save transaction after every subsequent submission
+      transaction.on('submitted', saveTransaction);
+
+      // Save on state change
+      transaction.on('state', saveTransaction);
+    });
+
     transaction.submit();
   };
 
@@ -250,7 +263,6 @@ function getTransactionHelper(request, response, callback) {
       async_callback(null, transaction);
     });
   };
-
 };
 
 /**
@@ -280,7 +292,6 @@ function getTransactionHelper(request, response, callback) {
  *  @param {Array of transactions in JSON format} transactions
  */
 function getAccountTransactions(options, response, callback) {
-
   var steps = [
     validateOptions,
     queryTransactions,

lib/db-interface.js

@@ -150,6 +150,8 @@ DI.saveTransaction = function(transaction, callback) {
   assert(transaction.tx_json.Account,
     'Transaction missing property: tx_json.Account');
   //assert(transaction.clientID, 'Transaction missing property: clientID');
+
+  // Transaction shouldn't be saved unless it was successfully submitted
   assert(transaction.submitIndex,
     'Transaction missing property: submitIndex');
   assert(transaction.submittedIDs,
@@ -207,11 +209,7 @@ DI.saveTransaction = function(transaction, callback) {
 
     var info = txData.hash + ': ' + txData.rippled_result;
 
-    if (txData.finalized) {
-      logger.info('[DB] Saved transaction: finalized: ' + info);
-    } else if (txData.state === 'submitted') {
-      logger.info('[DB] Saved transaction: submitted: ' + info);
-    }
+    logger.info('[DB] Saved transaction: ' + txData.state + ': ' + info);
 
     return res;
   })

lib/remote.js

@@ -4,8 +4,7 @@ var dbinterface = require('./db-interface');
 var logger = require('./logger.js').logger;
 
 var remoteOpts = {
-  servers: config.get('rippled_servers'),
-  storage: dbinterface
+  servers: config.get('rippled_servers')
 };
 
 if (config.get('debug')) {