transaction syncing working!

This commit is contained in:
Matias Alejo Garcia 2014-01-08 01:37:29 -03:00
parent 1063af6f90
commit ca28ed62b4
3 changed files with 112 additions and 18 deletions

115
Sync.js
View File

@ -24,9 +24,7 @@ function spec(b) {
} }
this.rpc.getBlock(blockHash, function(err, blockInfo) { this.rpc.getBlock(blockHash, function(err, blockInfo) {
if (err) { if (err) return cb(err);
return cb(err);
}
if ( ! ( blockInfo.result.height % 1000) ) { if ( ! ( blockInfo.result.height % 1000) ) {
var h = blockInfo.result.height, var h = blockInfo.result.height,
@ -57,6 +55,7 @@ function spec(b) {
var that = this; var that = this;
var genesisHash = this.network.genesisBlock.hash.reverse().toString('hex'); var genesisHash = this.network.genesisBlock.hash.reverse().toString('hex');
console.log("Syncing Blocks...");
if (reindex) if (reindex)
return this.getNextBlock(genesisHash, cb); 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); 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) { Sync.prototype.start = function (opts, next) {
@ -106,18 +169,46 @@ function spec(b) {
return cb(); return cb();
}, },
function(cb) { function(cb) {
that.syncBlocks(opts.reindex, function(err) {
if (err) {
return cb(err);
} if (! opts.skip_blocks) {
db.close(); that.syncBlocks(opts.reindex, function(err) {
if (err) {
return cb(err);
}
console.log("\tBlocks done.");
return cb();
});
}
else {
return cb(); 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) { function(err) {
if (err) return next(er); if (err) {
db.close();
return next(err);
}
return next(); return next();
}); });
}); });

View File

@ -25,7 +25,11 @@ var TransactionSchema = new Schema({
type: Array, type: Array,
default: [], default: [],
}, },
blockhash: String, blockhash: {
type: String,
index: true,
default: null,
},
confirmations: Number, confirmations: Number,
time: Number, time: Number,
blocktime: Number, blocktime: Number,

View File

@ -13,6 +13,8 @@ program
.option('-N --network [livenet]', 'Set bitcoin network [testnet]', 'testnet') .option('-N --network [livenet]', 'Set bitcoin network [testnet]', 'testnet')
.option('-R --reindex', 'Force reindexing', '0') .option('-R --reindex', 'Force reindexing', '0')
.option('-D --destroy', 'Remove current DB', '0') .option('-D --destroy', 'Remove current DB', '0')
.option('--skip_blocks', 'Sync blocks')
.option('--skip_txs', 'Sync transactions')
.parse(process.argv); .parse(process.argv);
var sync = new Sync({ networkName: program.network }); var sync = new Sync({ networkName: program.network });
@ -21,12 +23,9 @@ if (program.remove) {
} }
sync.start({ sync.start( program, function(err){
reindex: program.reindex,
destroy: program.destroy,
}, function(err){
if (err) { if (err) {
console.log(err); console.log("CRITICAL ERROR: ", err);
} }
else { else {
console.log('Done!'); console.log('Done!');