zcash-hackworks
/
bitcore-node-zcash
mirror of https://github.com/zcash-hackworks/bitcore-node-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add missing updates

This commit is contained in:
Peter Limbach 2014-05-07 15:42:45 +02:00
parent a8b39237ad
commit c08ccc388f
4 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/socket.js
View File

@ -3,7 +3,7 @@
// server-side socket behaviour
// io is a variable already taken in express
var ios = null;
var util = require('bitcore/util/util');
var util = require('bitcore').util;
module.exports.init = function(app, io_ext) {
ios = io_ext;

4
app/models/Address.js
View File

@ -6,7 +6,7 @@ var bitcore = require('bitcore');
var BitcoreAddress = bitcore.Address;
var BitcoreTransaction = bitcore.Transaction;
var BitcoreUtil = bitcore.util;
var Parser = bitcore.util.BinaryParser;
var Parser = bitcore.BinaryParser;
var Buffer = bitcore.Buffer;
var TransactionDb = imports.TransactionDb || require('../../lib/TransactionDb').default();
var CONCURRENCY = 5;
@ -134,7 +134,7 @@ Address.prototype.update = function(next, notxlist) {
var v = txItem.value_sat;
if ( !seen[txItem.txid] ) {
if (!notxlist) {
if (!notxlist) {
txs.push({txid: txItem.txid, ts: txItem.ts});
}
seen[txItem.txid]=1;

2
lib/BlockExtractor.js
View File

@ -2,7 +2,7 @@
var bitcore = require('bitcore'),
Block = bitcore.Block,
networks = bitcore.networks,
Parser = bitcore.util.Parser,
Parser = bitcore.BinaryParser,
fs = require('fs'),
Buffer = bitcore.Buffer,
glob = require('glob'),

22
lib/TransactionDb.js
View File

@ -24,14 +24,15 @@ var MAX_OPEN_FILES = 500;
/**
* Module dependencies.
*/
var Rpc = imports.rpc || require('./Rpc'),
bitcore = require('bitcore'),
util = bitcore.util,
levelup = require('levelup'),
async = require('async'),
config = require('../config/config'),
assert = require('assert');
var bitcore = require('bitcore'),
Rpc = imports.rpc || require('./Rpc'),
util = bitcore.util,
networks = bitcore.networks,
levelup = require('levelup'),
async = require('async'),
config = require('../config/config'),
assert = require('assert');
var db = imports.db || levelup(config.leveldb + '/txs',{maxOpenFiles: MAX_OPEN_FILES} );
var Script = bitcore.Script;
@ -46,8 +47,6 @@ var versionedData= require('soop').load('bitcore/util/VersionedData',{
var Address = require('soop').load('bitcore/lib/Address',{
parent: versionedData
});
var bitutil = bitcore.util.util;
var networks = bitcore.networks;
var TransactionDb = function() {
TransactionDb.super(this, arguments);
@ -290,7 +289,6 @@ TransactionDb.prototype.fromIdWithInfo = function(txid, cb) {
TransactionDb.prototype.fromTxIdN = function(txid, n, confirmations, cb) {
var self = this;
var k = OUTS_PREFIX + txid + '-' + n;
505
db.get(k, function(err, val) {
if (!val || (err && err.notFound)) {
@ -467,7 +465,7 @@ TransactionDb.prototype.getAddrStr = function(s) {
switch (type) {
case Script.TX_PUBKEY:
var chunk = s.captureOne();
addr = new Address(self.network.addressVersion, bitutil.sha256ripe160(chunk));
addr = new Address(self.network.addressVersion, bitcore.util.sha256ripe160(chunk));
addrStrs.push(addr.toString());
break;
case Script.TX_PUBKEYHASH:
@ -482,7 +480,7 @@ TransactionDb.prototype.getAddrStr = function(s) {
var chunks = s.capture();
chunks.forEach(function(chunk) {
if (chunk && Buffer.isBuffer(chunk)) {
var a = new Address(self.network.addressVersion, bitutil.sha256ripe160(chunk));
var a = new Address(self.network.addressVersion, bitcore.util.sha256ripe160(chunk));
addrStrs.push(a.toString());
}
});