diff --git a/js/coin.js b/js/coin.js index 02ca1c5..5dd56fa 100644 --- a/js/coin.js +++ b/js/coin.js @@ -1296,18 +1296,6 @@ value = coinjs.bytesToNum(this.ins[index].script.chunks[2]); // value found encoded in transaction (THIS IS NON STANDARD) } return {'type':'segwit', 'signed':signed, 'signatures': sigs, 'script': Crypto.util.bytesToHex(this.ins[index].script.chunks[0]), 'value': value}; - - /* } else if((this.ins[index].script.chunks.length <= 3 && this.ins[index].script.chunks.length > 0) && (this.ins[index].script.chunks[0].length == 22 && this.ins[index].script.chunks[0][0] == 0)){ - alert('p2sh'); - // segwit script - var signed = ((this.witness[index]) && this.witness[index].length==2) ? 'true' : 'false'; - var sigs = (signed == 'true') ? 1 : 0; - var value = -1; // no value found - if((this.ins[index].script.chunks[2]) && this.ins[index].script.chunks[2].length==8){ - value = coinjs.bytesToNum(this.ins[index].script.chunks[2]); // value found encoded in transaction (THIS IS NON STANDARD) - } - return {'type':'segwit', 'signed':signed, 'signatures': sigs, 'script': Crypto.util.bytesToHex(this.ins[index].script.chunks[0]), 'value': value}; - */ } else if (this.ins[index].script.chunks[0]==0 && this.ins[index].script.chunks[this.ins[index].script.chunks.length-1][this.ins[index].script.chunks[this.ins[index].script.chunks.length-1].length-1]==174) { // OP_CHECKMULTISIG // multisig script, with signature(s) included return {'type':'multisig', 'signed':'true', 'signatures':this.ins[index].script.chunks.length-2, 'script': Crypto.util.bytesToHex(this.ins[index].script.chunks[this.ins[index].script.chunks.length-1])}; diff --git a/sha1sum b/sha1sum index db1f381..a0b0718 100644 --- a/sha1sum +++ b/sha1sum @@ -3,7 +3,7 @@ 3a09a8fc0cfe828b57fc798d668234d0490ee1a6 ./js/bootstrap-datetimepicker.min.js 253711c6d825de55a8360552573be950da180614 ./js/bootstrap.min.js dda26795fcd22541612067d44cf72ecae62f092b ./js/coinbin.js -d623019884867a13a55832cfb206606ff544e56a ./js/coin.js +eec3c5f1c5f69a34205613f6bf62ff9cc5a8d07a ./js/coin.js 988565bc2cb402d63ed5c5fd7ff47c4278efc2c5 ./js/collapse.js 9ba5ede3d7f9d4c8fd623395f196adfdcf7e970f ./js/crypto-min.js f7c09f2f5a721371e7d478050119f7e2d58e3ef9 ./js/crypto-sha256-hmac.js