Merge pull request #328 from matiu/base58check
fix base58check binary version
This commit is contained in:
commit
a0ebb1d2e1
@ -259,7 +259,7 @@ function spec() {
|
|||||||
|
|
||||||
|
|
||||||
var s = new Script(o.s);
|
var s = new Script(o.s);
|
||||||
var addrs = self.sync.getAddrStr(s);
|
var addrs = self.sync.txDb.getAddrStr(s);
|
||||||
|
|
||||||
// support only for p2pubkey p2pubkeyhash and p2sh
|
// support only for p2pubkey p2pubkeyhash and p2sh
|
||||||
if (addrs.length === 1) {
|
if (addrs.length === 1) {
|
||||||
|
|||||||
@ -35,10 +35,9 @@ function spec(b) {
|
|||||||
var db = b.db || levelup(config.leveldb + '/txs');
|
var db = b.db || levelup(config.leveldb + '/txs');
|
||||||
var Script = require('bitcore/Script').class();
|
var Script = require('bitcore/Script').class();
|
||||||
// This is 0.1.2 => c++ version of base57-native
|
// This is 0.1.2 => c++ version of base57-native
|
||||||
var base58 = require('base58-native');
|
var base58 = require('base58-native').base58Check;
|
||||||
var encodedData = require('bitcore/util/EncodedData').class({
|
var encodedData = require('bitcore/util/EncodedData').class({
|
||||||
// TODO: check why c++ implementation differs
|
base58: base58
|
||||||
//base58: base58
|
|
||||||
});
|
});
|
||||||
var versionedData = require('bitcore/util/VersionedData').class({
|
var versionedData = require('bitcore/util/VersionedData').class({
|
||||||
superclass: encodedData
|
superclass: encodedData
|
||||||
@ -698,18 +697,6 @@ function spec(b) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
TransactionDb.prototype.setOrphan = function(blockHash, next) {
|
|
||||||
// var self = this;
|
|
||||||
|
|
||||||
//Get Txs
|
|
||||||
// TODO
|
|
||||||
|
|
||||||
//Mark Tx's output as fromOrphan
|
|
||||||
//Mark Tx's outpoiunt as fromOrphan. Undo spents
|
|
||||||
return next();
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
return TransactionDb;
|
return TransactionDb;
|
||||||
}
|
}
|
||||||
module.defineClass(spec);
|
module.defineClass(spec);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user