From 479b262361a761cd03b6ce01fb0f6618e69d2741 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Thu, 16 Jan 2014 10:51:39 -0300
Subject: [PATCH] fix hash and time in Block sync

---
 app/models/Block.js | 8 +++++---
 lib/Sync.js         | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/models/Block.js b/app/models/Block.js
index f3603ef4..17010f41 100644
--- a/app/models/Block.js
+++ b/app/models/Block.js
@@ -42,14 +42,16 @@ BlockSchema.path('title').validate(function(title) {
  * Statics
  */
 
-BlockSchema.statics.createTimestamped = function(block, cb) {
+BlockSchema.statics.customCreate = function(block, cb) {
 
   var That= this;
-  var now = Math.round(new Date().getTime() / 1000);
 
   var BlockSchema = mongoose.model('Block', BlockSchema);
+
   var newBlock = new That();
-  newBlock.time = now;
+
+  newBlock.time = block.time ? block.time : Math.round(new Date().getTime() / 1000);
+  newBlock.hash = block.blockHash;
 
   Transaction.createFromArray(block.tx, function(err, inserted_txs) {
     if (err) return cb(err);
diff --git a/lib/Sync.js b/lib/Sync.js
index 6393934f..cd0805af 100644
--- a/lib/Sync.js
+++ b/lib/Sync.js
@@ -113,7 +113,7 @@ function spec() {
   Sync.prototype.storeBlock = function(block, cb) {
     var that = this;
 
-    Block.createTimestamped(block, function(err, b){
+    Block.customCreate(block, function(err, b){
 
       if (b && that.opts.broadcast_blocks) {
         sockets.broadcast_block(b);