anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

txpropal MERGE working!

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-04-11 01:09:42 -03:00
commit 81be01d197
4 changed files with 554 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

16
js/models/PublicKeyRing.js
View file

@ -201,11 +201,19 @@ PublicKeyRing.prototype.getAddress = function (index, isChange) {
var script = this.getRedeemScript(index,isChange);
var hash = coinUtil.sha256ripe160(script.getBuffer());
var version = this.network.addressScript;
var version = this.network.P2SHVersion;
var addr = new Address(version, hash);
return addr.as('base58');
return addr;
};
PublicKeyRing.prototype.getScriptPubKeyHex = function (index, isChange) {
this._checkIndexRange(index, isChange);
var addr = this.getAddress(index,isChange);
return Script.createP2SH(addr.payload()).getBuffer().toString('hex');
};
//generate a new address, update index.
PublicKeyRing.prototype.generateAddress = function(isChange) {
@ -237,11 +245,11 @@ PublicKeyRing.prototype.getRedeemScriptMap = function () {
var ret = {};
for (var i=0; i<this.changeAddressIndex; i++) {
ret[this.getAddress(i,true)] = this.getRedeemScript(i,true);
ret[this.getAddress(i,true)] = this.getRedeemScript(i,true).getBuffer().toString('hex');
}
for (var i=0; i<this.addressIndex; i++) {
ret[this.getAddress(i)] = this.getRedeemScript(i);
ret[this.getAddress(i)] = this.getRedeemScript(i).getBuffer().toString('hex');
}
return ret;
};