couple of bug fixes with transaction building
This commit is contained in:
parent
fd81fafdff
commit
739aee3c0f
3 changed files with 8 additions and 4 deletions
|
@ -846,6 +846,9 @@
|
||||||
var multi = coinjs.pubkeys2MultisigAddress(pubkeys, r.signaturesRequired);
|
var multi = coinjs.pubkeys2MultisigAddress(pubkeys, r.signaturesRequired);
|
||||||
r.address = multi['address'];
|
r.address = multi['address'];
|
||||||
r.type = 'multisig__'; // using __ for now to differentiat from the other object .type == "multisig"
|
r.type = 'multisig__'; // using __ for now to differentiat from the other object .type == "multisig"
|
||||||
|
var rs = Crypto.util.bytesToHex(s.buffer);
|
||||||
|
r.redeemscript = rs;
|
||||||
|
|
||||||
} else if((s.chunks.length==2) && (s.buffer[0] == 0 && s.buffer[1] == 20)){ // SEGWIT
|
} else if((s.chunks.length==2) && (s.buffer[0] == 0 && s.buffer[1] == 20)){ // SEGWIT
|
||||||
r = {};
|
r = {};
|
||||||
r.type = "segwit__";
|
r.type = "segwit__";
|
||||||
|
@ -859,6 +862,8 @@
|
||||||
r.pubkey = Crypto.util.bytesToHex(s.chunks[3]);
|
r.pubkey = Crypto.util.bytesToHex(s.chunks[3]);
|
||||||
r.checklocktimeverify = coinjs.bytesToNum(s.chunks[0].slice());
|
r.checklocktimeverify = coinjs.bytesToNum(s.chunks[0].slice());
|
||||||
r.address = coinjs.simpleHodlAddress(r.pubkey, r.checklocktimeverify).address;
|
r.address = coinjs.simpleHodlAddress(r.pubkey, r.checklocktimeverify).address;
|
||||||
|
var rs = Crypto.util.bytesToHex(s.buffer);
|
||||||
|
r.redeemscript = rs;
|
||||||
r.type = "hodl__";
|
r.type = "hodl__";
|
||||||
}
|
}
|
||||||
} catch(e) {
|
} catch(e) {
|
||||||
|
|
|
@ -876,7 +876,6 @@ $(document).ready(function() {
|
||||||
|
|
||||||
var host = $(this).attr('rel');
|
var host = $(this).attr('rel');
|
||||||
|
|
||||||
|
|
||||||
if(host=='chain.so_litecoin'){
|
if(host=='chain.so_litecoin'){
|
||||||
listUnspentChainso_Litecoin(redeem);
|
listUnspentChainso_Litecoin(redeem);
|
||||||
} else if(host=='chain.so_dogecoin'){
|
} else if(host=='chain.so_dogecoin'){
|
||||||
|
|
6
sha1sum
6
sha1sum
|
@ -1,9 +1,9 @@
|
||||||
---- Version 1.4 2018.06.19 ---
|
---- Version 1.4 2018.08.26 ---
|
||||||
77e4519962e2f6a9fc93342137dbb31c33b76b04 ./js/aes.js
|
77e4519962e2f6a9fc93342137dbb31c33b76b04 ./js/aes.js
|
||||||
3a09a8fc0cfe828b57fc798d668234d0490ee1a6 ./js/bootstrap-datetimepicker.min.js
|
3a09a8fc0cfe828b57fc798d668234d0490ee1a6 ./js/bootstrap-datetimepicker.min.js
|
||||||
253711c6d825de55a8360552573be950da180614 ./js/bootstrap.min.js
|
253711c6d825de55a8360552573be950da180614 ./js/bootstrap.min.js
|
||||||
988f99187ab356bc5d12b61572f463e1785c15c2 ./js/coinbin.js
|
360d139cc59e199429a0567e77f2415048e51da6 ./js/coinbin.js
|
||||||
8b4163122d907f9c363b9afd8809490f5ba202c8 ./js/coin.js
|
d7e828cea4e9af4934cc500d022cb1b6ce12cbb0 ./js/coin.js
|
||||||
988565bc2cb402d63ed5c5fd7ff47c4278efc2c5 ./js/collapse.js
|
988565bc2cb402d63ed5c5fd7ff47c4278efc2c5 ./js/collapse.js
|
||||||
9ba5ede3d7f9d4c8fd623395f196adfdcf7e970f ./js/crypto-min.js
|
9ba5ede3d7f9d4c8fd623395f196adfdcf7e970f ./js/crypto-min.js
|
||||||
f7c09f2f5a721371e7d478050119f7e2d58e3ef9 ./js/crypto-sha256-hmac.js
|
f7c09f2f5a721371e7d478050119f7e2d58e3ef9 ./js/crypto-sha256-hmac.js
|
||||||
|
|
Loading…
Reference in a new issue