-
-
-
Inputs and Outputs
-
-
-
-
-
- | Total Input |
- {{tx.valueIn}} BTC |
-
-
- | Total Output |
- {{tx.valueOut}} BTC |
-
-
- | Fees |
- {{tx.feeds}} BTC |
-
-
-
-
+
+
+
Feeds: {{tx.feeds}}
+
+
+
+
+
+
+
+
+
+
Summary
+
+
+
+ | Size |
+ {{tx.size}} (bytes) |
+
+
+ | Received Time |
+ {{tx.time * 1000|date:'medium'}} |
+
+
+ | Block |
+ Block |
+
+
+
+
+
+
Inputs and Outputs
+
+
+
+ | Total Input |
+ {{tx.valueIn}} BTC |
+
+
+ | Total Output |
+ {{tx.valueOut}} BTC |
+
+
+ | Fees |
+ {{tx.feeds}} BTC |
+
+
+
diff --git a/server.js b/server.js
index 1d61a87..1f49503 100644
--- a/server.js
+++ b/server.js
@@ -24,7 +24,7 @@ var express = require('express'),
var config = require('./config/config');
//Bootstrap db connection
-var db = mongoose.connect(config.db);
+mongoose.connect(config.db);
//Bootstrap models
var models_path = __dirname + '/app/models';
@@ -44,16 +44,19 @@ var walk = function(path) {
walk(models_path);
// historic_sync process
+var historicSync = {};
if (!config.disableHistoricSync) {
- var hs = new HistoricSync();
- hs.init({
- skip_db_connection: true,
+ historicSync = new HistoricSync();
+ historicSync.init({
+ skipDbConnection: true,
+ shouldBroadcast: true,
networkName: config.network
}, function() {
- hs.import_history({
- reverse: 1,
- }, function(){
- console.log('historic_sync finished!');
+ historicSync.smart_import(function(err){
+ var txt= 'ended.';
+ if (err) txt = 'ABORTED with error: ' + err.message;
+
+ console.log('[historic_sync] ' + txt, historicSync.syncInfo);
});
});
}
@@ -63,7 +66,7 @@ if (!config.disableHistoricSync) {
if (!config.disableP2pSync) {
var ps = new PeerSync();
ps.init({
- skip_db_connection: true,
+ skipDbConnection: true,
broadcast_txs: true,
broadcast_blocks: true
}, function() {
@@ -76,7 +79,7 @@ if (!config.disableP2pSync) {
var app = express();
//express settings
-require('./config/express')(app, db);
+require('./config/express')(app, historicSync);
//Bootstrap routes
require('./config/routes')(app);
diff --git a/util/sync.js b/util/sync.js
index 569ca78..b7f6e03 100755
--- a/util/sync.js
+++ b/util/sync.js
@@ -4,8 +4,6 @@
process.env.NODE_ENV = process.env.NODE_ENV || 'development';
-require('buffertools').extend();
-
var SYNC_VERSION = '0.1';
var program = require('commander');
var HistoricSync = require('../lib/HistoricSync').class();
@@ -14,35 +12,45 @@ var async = require('async');
program
.version(SYNC_VERSION)
.option('-N --network [livenet]', 'Set bitcoin network [testnet]', 'testnet')
+ .option('-S --smart', 'genesis stored? uptoexisting = 1', 1)
.option('-D --destroy', 'Remove current DB (and start from there)', 0)
.option('-R --reverse', 'Sync backwards', 0)
+ .option('-U --uptoexisting', 'Sync only until an existing block is found', 0)
.parse(process.argv);
var historicSync = new HistoricSync({
networkName: program.network
});
+/* TODO: Sure?
if (program.remove) {
}
-
+*/
async.series([
function(cb) {
historicSync.init(program, cb);
},
function(cb) {
- historicSync.import_history(program, function(err, count) {
- if (err) {
- console.log('CRITICAL ERROR: ', err);
- }
- else {
- console.log('Done! [%d blocks]', count, err);
- }
- cb();
- });
+ if (program.smart) {
+ historicSync.smart_import(cb);
+ }
+ else {
+ historicSync.import_history({
+ destroy: program.destroy,
+ reverse: program.reverse,
+ upToExisting: program.uptoexisting,
+ }, cb);
+ }
},
- function(cb) {
+ ],
+ function(err) {
historicSync.close();
- cb();
-}]);
+ if (err) {
+ console.log('CRITICAL ERROR: ', err);
+ }
+ else {
+ console.log('Finished.\n Status:\n', historicSync.syncInfo);
+ }
+});