adapt insight-api to work with bitcores soop version

This commit is contained in:
Matias Alejo Garcia 2014-03-10 12:46:48 -03:00
parent e19cd9f2ba
commit 040ea6bfb4
11 changed files with 24 additions and 27 deletions

View File

@ -5,7 +5,7 @@
*/
var common = require('./common'),
async = require('async'),
BlockDb = require('../../lib/BlockDb').class();
BlockDb = require('../../lib/BlockDb');
var bdb = new BlockDb();

View File

@ -8,11 +8,9 @@ var async = require('async');
var common = require('./common');
var Rpc = require('../../lib/Rpc');
var TransactionDb = require('../../lib/TransactionDb').default();
var BlockDb = require('../../lib/BlockDb').default();
var tDb = new TransactionDb();
var bdb = new BlockDb();
var tDb = require('../../lib/TransactionDb').default();
var bdb = require('../../lib/BlockDb').default();
exports.send = function(req, res) {
Rpc.sendRawTransaction(req.body.rawtx, function(err, txid) {

View File

@ -41,7 +41,7 @@ first 10%
=> sacando los contenidos adentro de getblock from file de => 4.5s!!
=> con base58 cpp => 21s
=> toda la testnet => 17m
=> toda la testnet => 17m !!
10% de blk2
=> 50s con base58cpp
@ -54,3 +54,7 @@ first 10%
=> 15s comentando desde b.getStandardizedObject()
=> 39s comentando dps b.getStandardizedObject()
Mon Mar 10 11:59:25 ART 2014
10% de blk 0 (testnet)
=> 37s

View File

@ -9,8 +9,8 @@ process.env.NODE_ENV = process.env.NODE_ENV || 'development';
*/
var express = require('express'),
fs = require('fs'),
PeerSync = require('./lib/PeerSync').class(),
HistoricSync = require('./lib/HistoricSync').class();
PeerSync = require('./lib/PeerSync'),
HistoricSync = require('./lib/HistoricSync');
//Initializing system variables
var config = require('./config/config');

View File

@ -1,6 +1,6 @@
'use strict';
var imports = require('soop').imports();
var parent = imports.parent || require('events').EventEmitter;
var imports = require('soop').imports();
var ThisParent = imports.parent || require('events').EventEmitter;
var TIMESTAMP_PREFIX = 'bts-'; // b-ts-<ts> => <hash>
var PREV_PREFIX = 'bpr-'; // b-prev-<hash> => <prev_hash>
var NEXT_PREFIX = 'bne-'; // b-next-<hash> => <next_hash>
@ -26,8 +26,7 @@ var BlockDb = function() {
BlockDb.super(this, arguments);
this.poolMatch = new PoolMatch();
};
BlockDb.parent = parent;
BlockDb.parent = ThisParent;
BlockDb.prototype.close = function(cb) {
db.close(cb);
@ -57,7 +56,6 @@ BlockDb.prototype.add = function(b, cb) {
.put(PREV_PREFIX + b.hash, b.previousblockhash)
.write(function(err){
if (!err) {
self.emit('new_block', {blockid: b.hash});
}
cb(err);
});

View File

@ -1,14 +1,13 @@
'use strict';
var imports = require('soop').imports();
var util = require('util');
var assert = require('assert');
var async = require('async');
var RpcClient = require('bitcore/RpcClient');
var Script = require('bitcore/Script');
var networks = require('bitcore/networks');
var async = require('async');
var config = require('../config/config');
var config = imports.config || require('../config/config');
var Sync = require('./Sync');
var sockets = require('../app/controllers/socket.js');
var BlockExtractor = require('./BlockExtractor.js');

View File

@ -12,7 +12,7 @@ function PeerSync(opts) {
this.connected = false;
this.peerdb = undefined;
this.allowReorgs = false;
this.PeerManager = require('bitcore/PeerManager').createClass({
this.PeerManager = require('soop').load('../node_modules/bitcore/PeerManager',{
network: (config.network === 'testnet' ? networks.testnet : networks.livenet)
});
this.peerman = new this.PeerManager();

View File

@ -3,17 +3,15 @@
var imports = require('soop').imports();
var sockets = require('../app/controllers/socket.js');
var BlockDb = require('./BlockDb').default();
var TransactionDb = require('./TransactionDb').default();
var config = require('../config/config');
var config = imports.config || require('../config/config');
var networks = require('bitcore/networks');
var async = require('async');
function Sync(opts) {
this.opts = opts || {};
this.bDb = new BlockDb(opts);
this.txDb = new TransactionDb(opts);
this.bDb = require('./BlockDb').default();
this.txDb = require('./TransactionDb').default();
this.txDb.on('tx_for_address', this.handleTxForAddress.bind(this));
this.txDb.on('new_tx', this.handleNewTx.bind(this));
this.bDb.on('new_block', this.handleNewBlock.bind(this));

View File

@ -2,7 +2,7 @@
var imports = require('soop').imports();
var parent = imports.parent || require('events').EventEmitter;
var ThisParent = imports.parent || require('events').EventEmitter;
// blockHash -> txid mapping
var IN_BLK_PREFIX = 'txb-'; //txb-<txid>-<block> => 1/0 (connected or not)
@ -39,7 +39,7 @@ var encodedData = require('soop').load('bitcore/util/EncodedData',{
base58: base58
});
var versionedData= require('soop').load('bitcore/util/VersionedData',{
patent: encodedData
parent: encodedData
});
var Address = require('soop').load('bitcore/Address',{
parent: versionedData
@ -51,7 +51,7 @@ var TransactionDb = function() {
TransactionDb.super(this, arguments);
this.network = config.network === 'testnet' ? networks.testnet : networks.livenet;
};
TransactionDb.parent = parent;
TransactionDb.parent = ThisParent;
TransactionDb.prototype.close = function(cb) {
db.close(cb);

View File

@ -3,7 +3,7 @@
process.env.NODE_ENV = process.env.NODE_ENV || 'development';
var PeerSync = require('../lib/PeerSync').class();
var PeerSync = require('../lib/PeerSync');
var PROGRAM_VERSION = '0.1';
var program = require('commander');

View File

@ -7,7 +7,7 @@ process.env.NODE_ENV = process.env.NODE_ENV || 'development';
var SYNC_VERSION = '0.1';
var program = require('commander');
var HistoricSync = require('../lib/HistoricSync').class();
var HistoricSync = require('../lib/HistoricSync');
var async = require('async');
program