support for new bitcore version ~0.1.6
This commit is contained in:
parent
645da13bee
commit
ae4769555b
|
@ -17,7 +17,7 @@ exports.show = function(req, res) {
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
var option = req.query.q;
|
var option = req.query.q;
|
||||||
var statusObject = Status.new();
|
var statusObject = new Status();
|
||||||
|
|
||||||
var returnJsonp = function (err) {
|
var returnJsonp = function (err) {
|
||||||
if (err || ! statusObject)
|
if (err || ! statusObject)
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
//var imports = require('soop').imports();
|
var imports = require('soop').imports();
|
||||||
var async = require('async');
|
var async = require('async');
|
||||||
var BitcoreAddress = require('bitcore/Address');
|
var BitcoreAddress = require('bitcore/Address');
|
||||||
var BitcoreTransaction = require('bitcore/Transaction');
|
var BitcoreTransaction = require('bitcore/Transaction');
|
||||||
var BitcoreUtil = require('bitcore/util/util');
|
var BitcoreUtil = require('bitcore/util/util');
|
||||||
var Parser = require('bitcore/util/BinaryParser');
|
var Parser = require('bitcore/util/BinaryParser');
|
||||||
var Buffer = require('buffer').Buffer;
|
var Buffer = require('buffer').Buffer;
|
||||||
var TransactionDb = require('../../lib/TransactionDb').default();
|
var TransactionDb = imports.TransactionDb || require('../../lib/TransactionDb').default();
|
||||||
var CONCURRENCY = 5;
|
var CONCURRENCY = 5;
|
||||||
|
|
||||||
function Address(addrStr) {
|
function Address(addrStr) {
|
||||||
|
@ -84,7 +84,7 @@ Address.prototype.getUtxo = function(next) {
|
||||||
if (!self.addrStr) return next();
|
if (!self.addrStr) return next();
|
||||||
|
|
||||||
var ret = [];
|
var ret = [];
|
||||||
var db = new TransactionDb();
|
var db = TransactionDb;
|
||||||
|
|
||||||
db.fromAddr(self.addrStr, function(err,txOut){
|
db.fromAddr(self.addrStr, function(err,txOut){
|
||||||
if (err) return next(err);
|
if (err) return next(err);
|
||||||
|
@ -121,7 +121,7 @@ Address.prototype.update = function(next) {
|
||||||
if (!self.addrStr) return next();
|
if (!self.addrStr) return next();
|
||||||
|
|
||||||
var txs = [];
|
var txs = [];
|
||||||
var db = new TransactionDb();
|
var db = TransactionDb;
|
||||||
async.series([
|
async.series([
|
||||||
function (cb) {
|
function (cb) {
|
||||||
var seen={};
|
var seen={};
|
||||||
|
|
|
@ -3,12 +3,11 @@
|
||||||
|
|
||||||
var async = require('async');
|
var async = require('async');
|
||||||
var RpcClient = require('bitcore/RpcClient');
|
var RpcClient = require('bitcore/RpcClient');
|
||||||
var BlockDb = require('../../lib/BlockDb');
|
|
||||||
var config = require('../../config/config');
|
var config = require('../../config/config');
|
||||||
var rpc = new RpcClient(config.bitcoind);
|
var rpc = new RpcClient(config.bitcoind);
|
||||||
|
|
||||||
function Status() {
|
function Status() {
|
||||||
this.bDb = new BlockDb();
|
this.bDb = require('../../lib/BlockDb').default();
|
||||||
}
|
}
|
||||||
|
|
||||||
Status.prototype.getInfo = function(next) {
|
Status.prototype.getInfo = function(next) {
|
||||||
|
|
|
@ -20,7 +20,7 @@ var db = imports.db || levelup(config.leveldb + '/blocks',{maxOpenFiles: MAX_OP
|
||||||
var Rpc = imports.rpc || require('./Rpc');
|
var Rpc = imports.rpc || require('./Rpc');
|
||||||
var PoolMatch = imports.poolMatch || require('soop').load('./PoolMatch',config);
|
var PoolMatch = imports.poolMatch || require('soop').load('./PoolMatch',config);
|
||||||
|
|
||||||
var TransactionDb = require('./TransactionDb.js').default();
|
var tDb = require('./TransactionDb.js').default();
|
||||||
|
|
||||||
var BlockDb = function() {
|
var BlockDb = function() {
|
||||||
BlockDb.super(this, arguments);
|
BlockDb.super(this, arguments);
|
||||||
|
@ -56,6 +56,7 @@ BlockDb.prototype.add = function(b, cb) {
|
||||||
.put(PREV_PREFIX + b.hash, b.previousblockhash)
|
.put(PREV_PREFIX + b.hash, b.previousblockhash)
|
||||||
.write(function(err){
|
.write(function(err){
|
||||||
if (!err) {
|
if (!err) {
|
||||||
|
self.emit('new_block', {blockid: b.hash});
|
||||||
}
|
}
|
||||||
cb(err);
|
cb(err);
|
||||||
});
|
});
|
||||||
|
@ -160,10 +161,9 @@ BlockDb.prototype.has = function(hash, cb) {
|
||||||
};
|
};
|
||||||
|
|
||||||
BlockDb.prototype.getPoolInfo = function(tx, cb) {
|
BlockDb.prototype.getPoolInfo = function(tx, cb) {
|
||||||
var tr = new TransactionDb();
|
|
||||||
var self = this;
|
var self = this;
|
||||||
|
|
||||||
tr._getInfo(tx, function(e, a) {
|
tDb._getInfo(tx, function(e, a) {
|
||||||
if (e) return cb(false);
|
if (e) return cb(false);
|
||||||
|
|
||||||
if (a.isCoinBase) {
|
if (a.isCoinBase) {
|
||||||
|
|
|
@ -8,7 +8,7 @@ process.env.NODE_ENV = process.env.NODE_ENV || 'development';
|
||||||
var assert = require('assert'),
|
var assert = require('assert'),
|
||||||
fs = require('fs'),
|
fs = require('fs'),
|
||||||
util = require('util'),
|
util = require('util'),
|
||||||
TransactionDb = require('../../lib/TransactionDb').class();
|
TransactionDb = require('../../lib/TransactionDb').default();
|
||||||
|
|
||||||
var txItemsValid = JSON.parse(fs.readFileSync('test/integration/txitems.json'));
|
var txItemsValid = JSON.parse(fs.readFileSync('test/integration/txitems.json'));
|
||||||
var txDb;
|
var txDb;
|
||||||
|
@ -16,7 +16,7 @@ var txDb;
|
||||||
describe('TransactionDb fromIdWithInfo', function(){
|
describe('TransactionDb fromIdWithInfo', function(){
|
||||||
|
|
||||||
before(function(c) {
|
before(function(c) {
|
||||||
txDb = new TransactionDb();
|
txDb = TransactionDb;
|
||||||
return c();
|
return c();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -118,7 +118,7 @@ describe('TransactionDb fromIdWithInfo', function(){
|
||||||
describe('TransactionDb Outs', function(){
|
describe('TransactionDb Outs', function(){
|
||||||
|
|
||||||
before(function(c) {
|
before(function(c) {
|
||||||
txDb = new TransactionDb();
|
txDb = TransactionDb;
|
||||||
return c();
|
return c();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@ var txDb;
|
||||||
describe('TransactionDb Expenses', function(){
|
describe('TransactionDb Expenses', function(){
|
||||||
|
|
||||||
before(function(c) {
|
before(function(c) {
|
||||||
txDb = new TransactionDb();
|
txDb = TransactionDb;
|
||||||
|
|
||||||
// lets spend!
|
// lets spend!
|
||||||
async.each(Object.keys(spentValid),
|
async.each(Object.keys(spentValid),
|
||||||
|
|
|
@ -6,8 +6,8 @@ process.env.NODE_ENV = process.env.NODE_ENV || 'development';
|
||||||
|
|
||||||
var assert = require('assert'),
|
var assert = require('assert'),
|
||||||
fs = require('fs'),
|
fs = require('fs'),
|
||||||
Address = require('../../app/models/Address').class(),
|
Address = require('../../app/models/Address'),
|
||||||
TransactionDb = require('../../lib/TransactionDb').class(),
|
TransactionDb = require('../../lib/TransactionDb').default(),
|
||||||
addrValid = JSON.parse(fs.readFileSync('test/integration/addr.json')),
|
addrValid = JSON.parse(fs.readFileSync('test/integration/addr.json')),
|
||||||
utxoValid = JSON.parse(fs.readFileSync('test/integration/utxo.json'));
|
utxoValid = JSON.parse(fs.readFileSync('test/integration/utxo.json'));
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@ var txDb;
|
||||||
describe('Address balances', function() {
|
describe('Address balances', function() {
|
||||||
|
|
||||||
before(function(c) {
|
before(function(c) {
|
||||||
txDb = new TransactionDb();
|
txDb = TransactionDb;
|
||||||
return c();
|
return c();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -10,14 +10,14 @@ var TESTING_BLOCK = '000000000185678d3d7ecc9962c96418174431f93fe20bf216d55652724
|
||||||
var
|
var
|
||||||
assert = require('assert'),
|
assert = require('assert'),
|
||||||
// config = require('../../config/config'),
|
// config = require('../../config/config'),
|
||||||
BlockDb = require('../../lib/BlockDb').class();
|
BlockDb = require('../../lib/BlockDb').default();
|
||||||
|
|
||||||
var bDb;
|
var bDb;
|
||||||
|
|
||||||
describe('BlockDb fromHashWithInfo', function() {
|
describe('BlockDb fromHashWithInfo', function() {
|
||||||
|
|
||||||
before(function(c) {
|
before(function(c) {
|
||||||
bDb = new BlockDb();
|
bDb = BlockDb;
|
||||||
return c();
|
return c();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@ process.env.NODE_ENV = process.env.NODE_ENV || 'development';
|
||||||
|
|
||||||
var assert = require('assert'),
|
var assert = require('assert'),
|
||||||
config = require('../../config/config'),
|
config = require('../../config/config'),
|
||||||
BlockExtractor = require('../../lib/BlockExtractor').class(),
|
BlockExtractor = require('../../lib/BlockExtractor'),
|
||||||
networks = require('bitcore/networks'),
|
networks = require('bitcore/networks'),
|
||||||
util = require('bitcore/util/util');
|
util = require('bitcore/util/util');
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ var START_TS = 1;
|
||||||
var END_TS = '1296688928~'; // 2/2/2011 23:23PM
|
var END_TS = '1296688928~'; // 2/2/2011 23:23PM
|
||||||
|
|
||||||
var assert = require('assert'),
|
var assert = require('assert'),
|
||||||
BlockDb = require('../../lib/BlockDb').class();
|
BlockDb = require('../../lib/BlockDb').default();
|
||||||
|
|
||||||
var bDb;
|
var bDb;
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ describe('BlockDb getBlocksByDate', function(){
|
||||||
|
|
||||||
|
|
||||||
before(function(c) {
|
before(function(c) {
|
||||||
bDb = new BlockDb();
|
bDb = BlockDb;
|
||||||
return c();
|
return c();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var BlockDb = require('../../lib/BlockDb').class();
|
var BlockDb = require('../../lib/BlockDb').default();
|
||||||
var height_needed = 180000;
|
var height_needed = 180000;
|
||||||
var bDb = new BlockDb();
|
var bDb = BlockDb;
|
||||||
|
|
||||||
var expect = require('chai').expect;
|
var expect = require('chai').expect;
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
process.env.NODE_ENV = process.env.NODE_ENV || 'development';
|
process.env.NODE_ENV = process.env.NODE_ENV || 'development';
|
||||||
|
|
||||||
var assert = require('assert'),
|
var assert = require('assert'),
|
||||||
Status = require('../../app/models/Status').class();
|
Status = require('../../app/models/Status');
|
||||||
|
|
||||||
describe('Status', function(){
|
describe('Status', function(){
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ var chai = require('chai'),
|
||||||
expect = chai.expect,
|
expect = chai.expect,
|
||||||
sinon = require('sinon');
|
sinon = require('sinon');
|
||||||
|
|
||||||
var PeerSync = require('../../lib/PeerSync.js').class();
|
var PeerSync = require('../../lib/PeerSync.js');
|
||||||
describe('PeerSync', function() {
|
describe('PeerSync', function() {
|
||||||
var ps;
|
var ps;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue