From 8a1aa6b8fd9213094209ae52a2f3bacbf794c3f0 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 7 Jan 2014 14:12:44 -0300
Subject: [PATCH 1/8] reindex option for sync

---
 package.json |  1 +
 util/sync.js | 69 +++++++++++++++++++++++++++++++---------------------
 2 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 0fc2f268..51a566e7 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
   },
   "dependencies": {
     "classtool": "*",
+    "commander": "*",
     "express": "~3.4.7",
     "jade": "~1.0.2",
     "mongoose": "~3.8.3",
diff --git a/util/sync.js b/util/sync.js
index 9aff4453..f1be0a85 100755
--- a/util/sync.js
+++ b/util/sync.js
@@ -1,8 +1,11 @@
 #!/usr/bin/env node
 
 process.env.NODE_ENV = process.env.NODE_ENV || 'development';
+
 require('buffertools').extend();
 
+var SYNC_VERSION     = '0.1';
+var program          = require('commander');
 var util             = require('util');
 var RpcClient        = require('../node_modules/bitcore/RpcClient').class();
 var networks         = require('../node_modules/bitcore/networks');
@@ -11,10 +14,37 @@ var Block            = require('../app/models/Block');
 var config           = require('../config/config');
 var mongoose         = require('mongoose');
 
-var networkName      = process.argv[2] || 'testnet';
+program
+	.version(SYNC_VERSION)
+	.option('-N --network [livenet]', 'Set bitcoin network [livenet]', 'livenet')
+	.option('-R --reindex', 'Force reindexing', '0')
+	.parse(process.argv);
+
+var networkName      = program.network;
 var network          = networkName == 'testnet' ? networks.testnet : networks.livenet;
 
 
+
+mongoose.connect(config.db);
+var db    = mongoose.connection;
+var rpc   = new RpcClient(config.bitcoind);
+
+
+db.on('error', console.error.bind(console, 'connection error:'));
+
+db.once('open', function callback () {
+
+  syncBlocks(network, program.reindex, function(err) {
+    if (err) {
+      console.log(err);
+    }
+    mongoose.connection.close();
+  });
+});
+
+
+
+
 function getNextBlock(blockHash,cb) {
 
   if ( !blockHash ) {
@@ -47,43 +77,26 @@ function getNextBlock(blockHash,cb) {
 
 }
 
-function syncBlocks(network, cb) {
+function syncBlocks(network, reindex, cb) {
+
+  var genesisHash =  network.genesisBlock.hash.reverse().toString('hex');
+
+  if (reindex) 
+    return getNextBlock(genesisHash, cb);
+
 
   Block.findOne({}, {}, { sort: { 'confirmations' : 1 } }, function(err, block) {
-    if (err) {
-      return cb(err);
-    }
-
-
+    if (err) return cb(err);
 
     var nextHash = 
       block && block.hash 
       ? block.hash
-      : network.genesisBlock.hash.reverse().toString('hex')
+      : genesisHash
       ;
 
     
     console.log('Starting at hash: ' + nextHash);
-    getNextBlock(nextHash, cb);
+    return getNextBlock(nextHash, cb);
   });
 }
 
-
-mongoose.connect(config.db);
-
-var db    = mongoose.connection;
-var rpc   = new RpcClient(config.bitcoind);
-
-
-db.on('error', console.error.bind(console, 'connection error:'));
-db.once('open', function callback () {
-  syncBlocks(network, function(err) {
-    if (err) {
-      console.log(err);
-    }
-    mongoose.connection.close();
-  });
-});
-
-
-

From d8093fe681c63831bff92ebe088746bc4fb019a2 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 7 Jan 2014 15:21:59 -0300
Subject: [PATCH 2/8] move sync to a class for testing

---
 Sync.js | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 Sync.js

diff --git a/Sync.js b/Sync.js
new file mode 100644
index 00000000..df300608
--- /dev/null
+++ b/Sync.js
@@ -0,0 +1,99 @@
+require('classtool');
+
+function spec(b) {
+  var mongoose  = require('mongoose');
+  var util      = require('util');
+
+  var RpcClient = require('bitcore/RpcClient').class();
+  var networks  = require('bitcore/networks');
+
+  var config    = require('./config/config');
+  var Block     = require('./app/models/Block');
+
+  function Sync(config) {
+    this.network = config.networkName == 'testnet' ? networks.testnet : networks.livenet;
+  }
+
+  Sync.prototype.getNextBlock = function (blockHash,cb) {
+    var that = this;
+
+    if ( !blockHash ) {
+      return cb();
+    }
+
+    this.rpc.getBlock(blockHash, function(err, blockInfo) {
+      if (err) {
+        return cb(err); 
+      }
+
+      if ( ! ( blockInfo.result.height % 1000) ) {
+        var h = blockInfo.result.height,
+            d = blockInfo.result.confirmations;
+        console.log( util.format("Height: %d/%d [%d%%]", h, d, 100*h/(h+d)));
+      }
+
+      Block.create( blockInfo.result, function(err, inBlock) {
+
+        // E11000 => already exists
+        if (err && ! err.toString().match(/E11000/)) {
+          return cb(err);
+        }
+
+        return that.getNextBlock(blockInfo.result.nextblockhash, cb);
+
+      });
+    });
+  }
+
+  Sync.prototype.syncBlocks = function (reindex, cb)  {
+
+    var that        = this;
+    var genesisHash = this.network.genesisBlock.hash.reverse().toString('hex');
+
+    if (reindex) 
+      return this.getNextBlock(genesisHash, cb);
+
+
+    Block.findOne({}, {}, { sort: { 'confirmations' : 1 } }, function(err, block) {
+      if (err) return cb(err);
+
+      var nextHash = 
+        block && block.hash 
+        ? block.hash
+        : genesisHash
+        ;
+
+      
+      console.log('Starting at hash: ' + nextHash);
+      return that.getNextBlock(nextHash, cb);
+    });
+  }
+
+
+  Sync.prototype.start = function (reindex, cb)  {
+
+
+    mongoose.connect(config.db);
+    var db    = mongoose.connection;
+    this.rpc   = new RpcClient(config.bitcoind);
+    var that  = this;
+
+
+    db.on('error', console.error.bind(console, 'connection error:'));
+
+    db.once('open', function callback () {
+
+      that.syncBlocks(reindex, function(err) {
+        if (err) {
+          return cb(err);
+
+        }
+        mongoose.connection.close();
+        return cb();
+      });
+    });
+  }
+  return Sync;
+};
+module.defineClass(spec);
+ 

From 34cff77e4219011f7cb775e9cad56077f734efb2 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 7 Jan 2014 16:49:42 -0300
Subject: [PATCH 3/8] transaction exploding from blocks

---
 Gruntfile.js              | 16 +++----
 Sync.js                   | 45 ++++++++++++++----
 app/models/Block.js       | 33 ++++++++++++-
 app/models/Transaction.js | 41 ++++++++++++++++
 package.json              |  1 +
 util/sync.js              | 99 +++++++--------------------------------
 6 files changed, 133 insertions(+), 102 deletions(-)
 create mode 100644 app/models/Transaction.js

diff --git a/Gruntfile.js b/Gruntfile.js
index 743d9845..ab534a16 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -39,6 +39,13 @@ module.exports = function(grunt) {
         }
       }
     },
+    mochaTest: {
+      options: {
+        reporter: 'spec',
+      },
+      src: ['test/*.js']
+    },
+
     nodemon: {
       dev: {
         options: {
@@ -61,13 +68,6 @@ module.exports = function(grunt) {
         logConcurrentOutput: true
       }
     },
-    mochaTest: {
-      options: {
-        reporter: 'spec',
-        require: 'server.js'
-      },
-      src: ['test/*.js']
-    },
     env: {
       test: {
         NODE_ENV: 'test'
@@ -87,7 +87,7 @@ module.exports = function(grunt) {
   grunt.option('force', true);
 
   //Default task(s).
-  grunt.registerTask('default', ['jshint', 'concurrent']);
+  grunt.registerTask('default', ['jshint','concurrent']);
   
   //Test task.
   grunt.registerTask('test', ['env:test', 'mochaTest']);
diff --git a/Sync.js b/Sync.js
index df300608..7269c8ff 100644
--- a/Sync.js
+++ b/Sync.js
@@ -6,9 +6,11 @@ function spec(b) {
 
   var RpcClient = require('bitcore/RpcClient').class();
   var networks  = require('bitcore/networks');
+  var async     = require('async');
 
   var config    = require('./config/config');
   var Block     = require('./app/models/Block');
+  var Transaction=require('./app/models/Transaction');
 
   function Sync(config) {
     this.network = config.networkName == 'testnet' ? networks.testnet : networks.livenet;
@@ -39,8 +41,13 @@ function spec(b) {
           return cb(err);
         }
 
-        return that.getNextBlock(blockInfo.result.nextblockhash, cb);
-
+        if (inBlock) {
+          inBlock.explodeTransactions(function (err) {
+            return that.getNextBlock(blockInfo.result.nextblockhash, cb);
+          });
+        }
+        else  
+          return that.getNextBlock(blockInfo.result.nextblockhash, cb);
       });
     });
   }
@@ -70,7 +77,7 @@ function spec(b) {
   }
 
 
-  Sync.prototype.start = function (reindex, cb)  {
+  Sync.prototype.start = function (opts, next)  {
 
 
     mongoose.connect(config.db);
@@ -81,15 +88,35 @@ function spec(b) {
 
     db.on('error', console.error.bind(console, 'connection error:'));
 
-    db.once('open', function callback () {
+    db.once('open', function (){
 
-      that.syncBlocks(reindex, function(err) {
-        if (err) {
-          return cb(err);
+      async.series([ 
+        function(cb){
+          if (opts.destroy) {
+            console.log("Deleting Blocks...");
+            Block.remove().exec(cb);
+          }
+        },
+        function(cb){
+          if (opts.destroy) {
+            console.log("Deleting TXs...");
+            Transaction.remove().exec(cb);
+          }
+        },
+        function(cb) {
+          that.syncBlocks(opts.reindex, function(err) {
+            if (err) {
+              return cb(err);
 
+            }
+            db.close();
+            return cb();
+          });
         }
-        mongoose.connection.close();
-        return cb();
+      ],
+      function(err) {
+        if (err) return next(er);
+        return next();
       });
     });
   }
diff --git a/app/models/Block.js b/app/models/Block.js
index 53272b52..511cd7cc 100644
--- a/app/models/Block.js
+++ b/app/models/Block.js
@@ -3,9 +3,11 @@
 /**
  * Module dependencies.
  */
-var mongoose = require('mongoose'),
-    Schema = mongoose.Schema;
+var mongoose    = require('mongoose'),
+    Schema      = mongoose.Schema;
 
+var async       = require('async');
+var Transaction = require('./Transaction');
 
 /**
  * Block Schema
@@ -38,6 +40,32 @@ var BlockSchema = new Schema({
   },
 });
 
+BlockSchema.methods.explodeTransactions = function(next) {
+
+  //  console.log('exploding %s', this.hash, typeof this.tx);
+
+  async.forEach( this.tx, 
+    function(tx, callback) {
+      // console.log('procesing TX %s', tx);
+      Transaction.create({ hash: tx }, function(err) {
+        if (err && ! err.toString().match(/E11000/)) {
+          return callback();
+        }
+        if (err) {
+
+          return callback(err);
+        }
+        return callback();
+
+      });
+    },
+    function(err) {
+      if (err) return next(err);
+      return next();
+    }
+  );
+};
+
 /**
  * Validations
  */
@@ -65,4 +93,5 @@ BlockSchema.statics.fromHash = function(hash, cb) {
   }).exec(cb);
 };
 
+
 module.exports = mongoose.model('Block', BlockSchema);
diff --git a/app/models/Transaction.js b/app/models/Transaction.js
new file mode 100644
index 00000000..ba8678ec
--- /dev/null
+++ b/app/models/Transaction.js
@@ -0,0 +1,41 @@
+'use strict';
+
+/**
+ * Module dependencies.
+ */
+var mongoose = require('mongoose'),
+    Schema = mongoose.Schema;
+
+
+/**
+ */
+var TransactionSchema = new Schema({
+  hash: {
+    type: String,
+    index: true,
+    unique: true,
+  },
+  parsed: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+/**
+ * Statics
+ */
+
+TransactionSchema.statics.load = function(id, cb) {
+  this.findOne({
+    _id: id
+  }).exec(cb);
+};
+
+
+TransactionSchema.statics.fromHash = function(hash, cb) {
+  this.findOne({
+    hash: hash,
+  }).exec(cb);
+};
+
+module.exports = mongoose.model('Transaction', TransactionSchema);
diff --git a/package.json b/package.json
index 51a566e7..1dd908e4 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
     "postinstall": "node node_modules/bower/bin/bower install"
   },
   "dependencies": {
+    "async": "*",
     "classtool": "*",
     "commander": "*",
     "express": "~3.4.7",
diff --git a/util/sync.js b/util/sync.js
index f1be0a85..9a2bbbf8 100755
--- a/util/sync.js
+++ b/util/sync.js
@@ -6,97 +6,30 @@ require('buffertools').extend();
 
 var SYNC_VERSION     = '0.1';
 var program          = require('commander');
-var util             = require('util');
-var RpcClient        = require('../node_modules/bitcore/RpcClient').class();
-var networks         = require('../node_modules/bitcore/networks');
-
-var Block            = require('../app/models/Block');
-var config           = require('../config/config');
-var mongoose         = require('mongoose');
+var Sync             = require('../Sync').class();
 
 program
 	.version(SYNC_VERSION)
-	.option('-N --network [livenet]', 'Set bitcoin network [livenet]', 'livenet')
+	.option('-N --network [livenet]', 'Set bitcoin network [testnet]', 'testnet')
 	.option('-R --reindex', 'Force reindexing', '0')
+	.option('-D --destroy', 'Remove current DB', '0')
 	.parse(process.argv);
 
-var networkName      = program.network;
-var network          = networkName == 'testnet' ? networks.testnet : networks.livenet;
+var sync = new Sync({ networkName: program.network });
 
+if (program.remove) {
 
+}
 
-mongoose.connect(config.db);
-var db    = mongoose.connection;
-var rpc   = new RpcClient(config.bitcoind);
-
-
-db.on('error', console.error.bind(console, 'connection error:'));
-
-db.once('open', function callback () {
-
-  syncBlocks(network, program.reindex, function(err) {
-    if (err) {
-      console.log(err);
-    }
-    mongoose.connection.close();
-  });
+sync.start({
+  reindex:  program.reindex,
+  destroy:  program.destroy,
+}, function(err){
+  if (err) {
+    console.log(err);
+  }
+  else {
+    console.log('Done!');
+  }
 });
 
-
-
-
-function getNextBlock(blockHash,cb) {
-
-  if ( !blockHash ) {
-    console.log("done");
-    return cb();
-  }
-
-  rpc.getBlock(blockHash, function(err, blockInfo) {
-    if (err) {
-      return cb(err); 
-    }
-
-    if ( ! ( blockInfo.result.height % 1000) ) {
-      var h = blockInfo.result.height,
-          d = blockInfo.result.confirmations;
-      console.log( util.format("Height: %d/%d [%d%%]", h, d, 100*h/(h+d)));
-    }
-
-    Block.create( blockInfo.result, function(err, inBlock) {
-
-      // E11000 => already exists
-      if (err && ! err.toString().match(/E11000/)) {
-        return cb(err);
-      }
-
-      return getNextBlock(blockInfo.result.nextblockhash, cb);
-
-    });
-  });
-
-}
-
-function syncBlocks(network, reindex, cb) {
-
-  var genesisHash =  network.genesisBlock.hash.reverse().toString('hex');
-
-  if (reindex) 
-    return getNextBlock(genesisHash, cb);
-
-
-  Block.findOne({}, {}, { sort: { 'confirmations' : 1 } }, function(err, block) {
-    if (err) return cb(err);
-
-    var nextHash = 
-      block && block.hash 
-      ? block.hash
-      : genesisHash
-      ;
-
-    
-    console.log('Starting at hash: ' + nextHash);
-    return getNextBlock(nextHash, cb);
-  });
-}
-

From 1063af6f90293c4bbc774633cdf941f6e17a34fd Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 7 Jan 2014 21:03:48 -0300
Subject: [PATCH 4/8] fix bug in drop DBs + Transation with many fields in
 mongo

---
 Sync.js                   |  6 ++++--
 app/models/Block.js       |  4 ++--
 app/models/Transaction.js | 31 +++++++++++++++++++++++++------
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/Sync.js b/Sync.js
index 7269c8ff..287f8f80 100644
--- a/Sync.js
+++ b/Sync.js
@@ -94,14 +94,16 @@ function spec(b) {
         function(cb){
           if (opts.destroy) {
             console.log("Deleting Blocks...");
-            Block.remove().exec(cb);
+            return Block.remove().exec(cb);
           }
+          return cb();
         },
         function(cb){
           if (opts.destroy) {
             console.log("Deleting TXs...");
-            Transaction.remove().exec(cb);
+            return Transaction.remove().exec(cb);
           }
+          return cb();
         },
         function(cb) {
           that.syncBlocks(opts.reindex, function(err) {
diff --git a/app/models/Block.js b/app/models/Block.js
index 511cd7cc..3ce94ef0 100644
--- a/app/models/Block.js
+++ b/app/models/Block.js
@@ -44,10 +44,10 @@ BlockSchema.methods.explodeTransactions = function(next) {
 
   //  console.log('exploding %s', this.hash, typeof this.tx);
 
-  async.forEach( this.tx, 
+  async.forEach( this.tx,
     function(tx, callback) {
       // console.log('procesing TX %s', tx);
-      Transaction.create({ hash: tx }, function(err) {
+      Transaction.create({ txid: tx }, function(err) {
         if (err && ! err.toString().match(/E11000/)) {
           return callback();
         }
diff --git a/app/models/Transaction.js b/app/models/Transaction.js
index ba8678ec..fcd1240e 100644
--- a/app/models/Transaction.js
+++ b/app/models/Transaction.js
@@ -10,15 +10,25 @@ var mongoose = require('mongoose'),
 /**
  */
 var TransactionSchema = new Schema({
-  hash: {
+  txid: {
     type: String,
     index: true,
     unique: true,
   },
-  parsed: {
-    type: Boolean,
-    default: false,
+  version: Number,
+  locktime: Number,
+  vin: {
+    type: Array,
+    default: [],
   },
+  vout: {
+    type: Array,
+    default: [],
+  },
+  blockhash: String,
+  confirmations: Number,
+  time: Number,
+  blocktime: Number,
 });
 
 /**
@@ -32,10 +42,19 @@ TransactionSchema.statics.load = function(id, cb) {
 };
 
 
-TransactionSchema.statics.fromHash = function(hash, cb) {
+TransactionSchema.statics.fromID = function(txid, cb) {
   this.findOne({
-    hash: hash,
+    txid: txid,
   }).exec(cb);
 };
 
+/*
+ * virtual
+ */
+
+// ugly? new object every call?
+TransactionSchema.virtual('date').get(function () {
+  return new Date(this.time);
+});
+
 module.exports = mongoose.model('Transaction', TransactionSchema);

From ca28ed62b4fe153af7897268cb8505ccdf530470 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Wed, 8 Jan 2014 01:37:29 -0300
Subject: [PATCH 5/8] transaction syncing working!

---
 Sync.js                   | 115 ++++++++++++++++++++++++++++++++++----
 app/models/Transaction.js |   6 +-
 util/sync.js              |   9 ++-
 3 files changed, 112 insertions(+), 18 deletions(-)

diff --git a/Sync.js b/Sync.js
index 287f8f80..788dbddd 100644
--- a/Sync.js
+++ b/Sync.js
@@ -24,9 +24,7 @@ function spec(b) {
     }
 
     this.rpc.getBlock(blockHash, function(err, blockInfo) {
-      if (err) {
-        return cb(err); 
-      }
+      if (err) return cb(err); 
 
       if ( ! ( blockInfo.result.height % 1000) ) {
         var h = blockInfo.result.height,
@@ -57,6 +55,7 @@ function spec(b) {
     var that        = this;
     var genesisHash = this.network.genesisBlock.hash.reverse().toString('hex');
 
+    console.log("Syncing Blocks...");
     if (reindex) 
       return this.getNextBlock(genesisHash, cb);
 
@@ -71,12 +70,76 @@ function spec(b) {
         ;
 
       
-      console.log('Starting at hash: ' + nextHash);
+      console.log('\tStarting at hash: ' + nextHash);
       return that.getNextBlock(nextHash, cb);
     });
   }
 
 
+  var progress_bar = function(string, current, total) {
+      console.log( util.format("\t%s %d/%d [%d%%]", 
+        string, current, total, parseInt(100 * current/total))
+      );
+  }
+
+  Sync.prototype.syncTXs = function (reindex, cb)  {
+
+    var that        = this;
+
+    console.log("Syncing TXs...");
+    if (reindex) {
+      // TODO?
+    }
+      
+
+    Transaction.find({blockHash: null}, function(err, txs) {
+      if (err) return cb(err);
+
+      var read = 0;
+      var pull = 0;
+      var write = 0;
+      var total = txs.length;
+      console.log("\tneed to pull %d txs", total);
+
+      if (!total) return cb();
+
+      async.each(txs, 
+        function(tx, next){
+          if (! tx.txid) {
+            console.log("NO TXID skipping...", tx);
+            return next();
+          }
+
+          if ( ! ( read++ % 1000) ) 
+            progress_bar('read', read, total);
+
+
+          that.rpc.getRawTransaction(tx.txid, 1,  function(err, txInfo) {
+
+            if ( ! ( pull++ % 1000) ) 
+              progress_bar('\tpull', pull, total);
+
+            if (!err && txInfo) {
+              Transaction.update({txid: tx.txid}, txInfo.result, function(err) {
+                if (err) return next(err); 
+
+                if ( ! ( write++ % 1000) ) 
+                  progress_bar('\t\twrite', write, total);
+
+                return next(); 
+              });
+            }
+            else return next(); 
+          });
+        },
+        function(err){
+          if (err) return cb(err);
+          return cb(err);
+        }
+      );
+    });
+  }
+
   Sync.prototype.start = function (opts, next)  {
 
 
@@ -106,18 +169,46 @@ function spec(b) {
           return cb();
         },
         function(cb) {
-          that.syncBlocks(opts.reindex, function(err) {
-            if (err) {
-              return cb(err);
 
-            }
-            db.close();
+          if (! opts.skip_blocks) {
+            that.syncBlocks(opts.reindex, function(err) {
+              if (err) {
+                return cb(err);
+
+              }
+              console.log("\tBlocks done.");
+
+              return cb();
+            });
+          }
+          else {
             return cb();
-          });
-        }
+          }
+        },
+        function(cb) {
+          if (! opts.skip_txs) {
+            that.syncTXs(opts.reindex, function(err) {
+              if (err) {
+                return cb(err);
+
+              }
+              return cb();
+            });
+          }
+          else {
+            return cb();
+          }
+        },
+        function(cb) {
+          db.close();
+          return cb();
+        },
       ],
       function(err) {
-        if (err) return next(er);
+        if (err) {
+          db.close();
+          return next(err);
+        }
         return next();
       });
     });
diff --git a/app/models/Transaction.js b/app/models/Transaction.js
index fcd1240e..566a480a 100644
--- a/app/models/Transaction.js
+++ b/app/models/Transaction.js
@@ -25,7 +25,11 @@ var TransactionSchema = new Schema({
     type: Array,
     default: [],
   },
-  blockhash: String,
+  blockhash: {
+    type: String,
+    index: true,
+    default: null,
+  },
   confirmations: Number,
   time: Number,
   blocktime: Number,
diff --git a/util/sync.js b/util/sync.js
index 9a2bbbf8..22d1a53d 100755
--- a/util/sync.js
+++ b/util/sync.js
@@ -13,6 +13,8 @@ program
 	.option('-N --network [livenet]', 'Set bitcoin network [testnet]', 'testnet')
 	.option('-R --reindex', 'Force reindexing', '0')
 	.option('-D --destroy', 'Remove current DB', '0')
+	.option('--skip_blocks', 'Sync blocks')
+	.option('--skip_txs', 'Sync transactions')
 	.parse(process.argv);
 
 var sync = new Sync({ networkName: program.network });
@@ -21,12 +23,9 @@ if (program.remove) {
 
 }
 
-sync.start({
-  reindex:  program.reindex,
-  destroy:  program.destroy,
-}, function(err){
+sync.start( program, function(err){
   if (err) {
-    console.log(err);
+    console.log("CRITICAL ERROR: ", err);
   }
   else {
     console.log('Done!');

From dac973c65fc5a7ca405b6617e5cf4295f456132e Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Wed, 8 Jan 2014 01:40:57 -0300
Subject: [PATCH 6/8] tx syncing v2

---
 Sync.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Sync.js b/Sync.js
index 788dbddd..ae7d23ef 100644
--- a/Sync.js
+++ b/Sync.js
@@ -16,6 +16,12 @@ function spec(b) {
     this.network = config.networkName == 'testnet' ? networks.testnet : networks.livenet;
   }
 
+  var progress_bar = function(string, current, total) {
+      console.log( util.format("\t%s %d/%d [%d%%]", 
+        string, current, total, parseInt(100 * current/total))
+      );
+  }
+
   Sync.prototype.getNextBlock = function (blockHash,cb) {
     var that = this;
 
@@ -29,7 +35,7 @@ function spec(b) {
       if ( ! ( blockInfo.result.height % 1000) ) {
         var h = blockInfo.result.height,
             d = blockInfo.result.confirmations;
-        console.log( util.format("Height: %d/%d [%d%%]", h, d, 100*h/(h+d)));
+        progress_bar('height', h, h + d);    
       }
 
       Block.create( blockInfo.result, function(err, inBlock) {
@@ -76,12 +82,6 @@ function spec(b) {
   }
 
 
-  var progress_bar = function(string, current, total) {
-      console.log( util.format("\t%s %d/%d [%d%%]", 
-        string, current, total, parseInt(100 * current/total))
-      );
-  }
-
   Sync.prototype.syncTXs = function (reindex, cb)  {
 
     var that        = this;
@@ -92,7 +92,7 @@ function spec(b) {
     }
       
 
-    Transaction.find({blockHash: null}, function(err, txs) {
+    Transaction.find({blockhash: null}, function(err, txs) {
       if (err) return cb(err);
 
       var read = 0;

From 7002363841e431b1389d7ffe0a0ecc9c6f2e0dc2 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Wed, 8 Jan 2014 01:47:20 -0300
Subject: [PATCH 7/8] TX API working + sync

---
 app/controllers/transactions.js | 33 +++++++++++++++++++++++++++++++++
 config/routes.js                |  8 +++++---
 2 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 app/controllers/transactions.js

diff --git a/app/controllers/transactions.js b/app/controllers/transactions.js
new file mode 100644
index 00000000..8bf4635c
--- /dev/null
+++ b/app/controllers/transactions.js
@@ -0,0 +1,33 @@
+'use strict';
+
+
+var Transaction = require('../models/Transaction');
+//, _ = require('lodash');
+
+
+
+/**
+ * Module dependencies.
+ */
+
+
+/**
+ * Find block by hash ...
+ */
+exports.transaction = function(req, res, next, txid) {
+  Transaction.fromID(txid, function(err, tx) {
+    if (err) return next(err);
+    if (!tx) return next(new Error('Failed to load TX ' + txid));
+    req.transaction = tx;
+    next();
+  });
+};
+
+
+/**
+ * Show block 
+ */
+exports.show = function(req, res) {
+  res.jsonp(req.transaction);
+};
+
diff --git a/config/routes.js b/config/routes.js
index 7150af08..507378f0 100644
--- a/config/routes.js
+++ b/config/routes.js
@@ -7,11 +7,13 @@ module.exports = function(app) {
   app.get('/', index.render);
 
   //Block routes
-
   var blocks = require('../app/controllers/blocks');
   app.get('/block/:blockHash', blocks.show);
- 
-
   app.param('blockHash', blocks.block);
+
+  var transactions = require('../app/controllers/transactions');
+  app.get('/tx/:txid', transactions.show);
+ 
+  app.param('txid', transactions.transaction);
   
 };

From 06207b6c17392ddc071ea003654c4ec0ab222c6f Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Wed, 8 Jan 2014 02:00:37 -0300
Subject: [PATCH 8/8] readme updated

---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index eb30b464..c9868152 100644
--- a/README.md
+++ b/README.md
@@ -58,12 +58,21 @@ $ npm install -g bower
     
   Run sync from mystery repository:
     $ utils/sync.js
+
+check utils/sync.js --help for options.
+
   
 ### Blocks
 ```
   /block/[:hash]
   /block/00000000a967199a2fad0877433c93df785a8d8ce062e5f9b451cd1397bdbf62
 ```
+### Transactions 
+```
+  /tx/[:txid]
+  /tx/525de308971eabd941b139f46c7198b5af9479325c2395db7f2fb5ae8562556c
+```
+