kaizenkodo/CoinBin
2
0
Fork 0
mirror of https://github.com/ok2/coinbin.git synced 2026-04-24 11:44:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: kaizenkodo:master
Branches Tags
kaizenkodo:master
kaizenkodo:full_featured
kaizenkodo:hdwallet_bech32
kaizenkodo:hd_wallet_seed
kaizenkodo:1.6
kaizenkodo:1.5
kaizenkodo:1.4a
kaizenkodo:1.4
kaizenkodo:1.3
kaizenkodo:1.2a
kaizenkodo:1.2
kaizenkodo:1.1
..
compare: kaizenkodo:1.6
Branches Tags
kaizenkodo:master
kaizenkodo:full_featured
kaizenkodo:hdwallet_bech32
kaizenkodo:hd_wallet_seed
kaizenkodo:1.6
kaizenkodo:1.5
kaizenkodo:1.4a
kaizenkodo:1.4
kaizenkodo:1.3
kaizenkodo:1.2a
kaizenkodo:1.2
kaizenkodo:1.1

No commits in common. "master" and "1.6" have entirely different histories.
master ... 1.6

4 changed files with 33 additions and 66 deletions
Show Stats Expand all files Collapse all files

19
index.html
View File

@ -597,7 +597,7 @@
<h2>Transaction <small>Create a new transaction</small></h2> <h2>Transaction <small>Create a new transaction</small></h2>
<p>Use this page to create a raw transaction</p> <p>Use this page to create a raw transaction</p>
<b>Address, WIF key, Redeem Script or Transaction ID</b>: <b>Address, WIF key or Redeem Script</b>:
<div class="input-group"> <div class="input-group">
<span class="input-group-btn"> <span class="input-group-btn">
<button class="btn btn-info qrcodeScanner" type="button" data-toggle="modal" data-target="#modalQrcodeScanner" forward-result="#redeemFrom"><span class="glyphicon glyphicon-camera"></span></button> <button class="btn btn-info qrcodeScanner" type="button" data-toggle="modal" data-target="#modalQrcodeScanner" forward-result="#redeemFrom"><span class="glyphicon glyphicon-camera"></span></button>
@ -1193,14 +1193,14 @@
<div class="row"> <div class="row">
<div class="col-md-8"> <div class="col-md-8">
<b>Path</b><br> <b>Path</b><br>
<select class="form-control" id="hdpathtype"> <select class="form-control" id="hdpathtype"">
<option value="simple">Simple: m/i</option> <option value="simple">Simple: m/i</option>
<option value="custom">Custom</option> <option value="custom">Custom</option>
</select> </select>
<div id="hdpath" class="hidden" style="margin-top:4px"> <div id="hdpath" class="hidden" style="margin-top:4px">
<span class="input-group"> <span class="input-group">
<input type="text" class="form-control" value="m/0/1" title="WARNING: see #settings page when using hardened paths!"> <br> <input type="text" class="form-control" value="m/0/1"> <br>
<span class="input-group-addon"> / </span> <span class="input-group-addon"> / </span>
</span> </span>
</div> </div>
@ -1456,19 +1456,6 @@
</div> </div>
</div> </div>
<hr>
<div class="row">
<div class="col-md-12">
<b>HD wallet hardened path derivation</b>: <br>
<p class="text-muted">The path derivation for hardened paths was calculated wrong in earlier versions of coinb.in. Please select the old path derivation to recover HD wallet keys generated with older version of coinb.in.</p>
<select class="form-control" id="coinjs_derivation">
<option value="bip32_derivation">BIP32 compliant derivation</option>
<option value="coinbin_broken">Old (broken) coinb.in path derivation</option>
</select>
</div>
</div>
<br> <br>
<div id="statusSettings" class="hidden alert"> <div id="statusSettings" class="hidden alert">

51
js/coin.js
View File

@ -18,8 +18,6 @@
coinjs.compressed = false; coinjs.compressed = false;
coinjs.hd_derivation = "bip32_derivation";
/* other vars */ /* other vars */
coinjs.developer = '33tht1bKDgZVxb39MnZsWa8oxHXHvUYE4G'; //bitcoin coinjs.developer = '33tht1bKDgZVxb39MnZsWa8oxHXHvUYE4G'; //bitcoin
@ -687,11 +685,7 @@
r.derive = function(i){ r.derive = function(i){
i = (i)?i:0; i = (i)?i:0;
if ((i >= 0x80000000) && (coinjs.hd_derivation == "bip32_derivation")) { var blob = (Crypto.util.hexToBytes(this.keys.pubkey)).concat(coinjs.numToBytes(i,4).reverse());
var blob = (Crypto.util.hexToBytes("00").concat(Crypto.util.hexToBytes(this.keys.privkey)).concat(coinjs.numToBytes(i,4).reverse()));
} else {
var blob = (Crypto.util.hexToBytes(this.keys.pubkey)).concat(coinjs.numToBytes(i,4).reverse());
}
var j = new jsSHA(Crypto.util.bytesToHex(blob), 'HEX'); var j = new jsSHA(Crypto.util.bytesToHex(blob), 'HEX');
var hash = j.getHMAC(Crypto.util.bytesToHex(r.chain_code), "HEX", "SHA-512", "HEX"); var hash = j.getHMAC(Crypto.util.bytesToHex(r.chain_code), "HEX", "SHA-512", "HEX");
@ -1098,37 +1092,32 @@
var unspent = xmlDoc.getElementsByTagName("unspent")[0]; var unspent = xmlDoc.getElementsByTagName("unspent")[0];
if(unspent){ for(i=1;i<=unspent.childElementCount;i++){
for(i=1;i<=unspent.childElementCount;i++){ var u = xmlDoc.getElementsByTagName("unspent_"+i)[0]
var u = xmlDoc.getElementsByTagName("unspent_"+i)[0] var txhash = (u.getElementsByTagName("tx_hash")[0].childNodes[0].nodeValue).match(/.{1,2}/g).reverse().join("")+'';
var txhash = (u.getElementsByTagName("tx_hash")[0].childNodes[0].nodeValue).match(/.{1,2}/g).reverse().join("")+''; var n = u.getElementsByTagName("tx_output_n")[0].childNodes[0].nodeValue;
var n = u.getElementsByTagName("tx_output_n")[0].childNodes[0].nodeValue; var scr = script || u.getElementsByTagName("script")[0].childNodes[0].nodeValue;
var scr = script || u.getElementsByTagName("script")[0].childNodes[0].nodeValue;
if(segwit){ if(segwit){
/* this is a small hack to include the value with the redeemscript to make the signing procedure smoother. /* this is a small hack to include the value with the redeemscript to make the signing procedure smoother.
It is not standard and removed during the signing procedure. */ It is not standard and removed during the signing procedure. */
s = coinjs.script(); s = coinjs.script();
s.writeBytes(Crypto.util.hexToBytes(script)); s.writeBytes(Crypto.util.hexToBytes(script));
s.writeOp(0); s.writeOp(0);
s.writeBytes(coinjs.numToBytes(u.getElementsByTagName("value")[0].childNodes[0].nodeValue*1, 8)); s.writeBytes(coinjs.numToBytes(u.getElementsByTagName("value")[0].childNodes[0].nodeValue*1, 8));
scr = Crypto.util.bytesToHex(s.buffer); scr = Crypto.util.bytesToHex(s.buffer);
}
var seq = sequence || false;
self.addinput(txhash, n, scr, seq);
value += u.getElementsByTagName("value")[0].childNodes[0].nodeValue*1;
total++;
} }
var seq = sequence || false;
self.addinput(txhash, n, scr, seq);
value += u.getElementsByTagName("value")[0].childNodes[0].nodeValue*1;
total++;
} }
x.result = xmlDoc.getElementsByTagName("result")[0].childNodes[0].nodeValue; x.unspent = $(xmlDoc).find("unspent");
x.unspent = unspent;
x.value = value; x.value = value;
x.total = total; x.total = total;
x.response = xmlDoc.getElementsByTagName("response")[0].childNodes[0].nodeValue;
return callback(x); return callback(x);
}); });
} }

21
js/coinbin.js
View File

@ -1076,7 +1076,9 @@ $(document).ready(function() {
var n = $(o).find("output_no").text(); var n = $(o).find("output_no").text();
var amount = (($(o).find("value").text()*1)).toFixed(8); var amount = (($(o).find("value").text()*1)).toFixed(8);
var scr = $(o).find("script").text(); var script = coinjs.script();
var s = script.spendToScript($(o).find("address").text());
var scr = Crypto.util.bytesToHex(s.buffer);
addOutput(tx, n, scr, amount); addOutput(tx, n, scr, amount);
@ -1701,23 +1703,15 @@ $(document).ready(function() {
function deriveHDaddress() { function deriveHDaddress() {
var hd = coinjs.hd($("#verifyHDaddress .hdKey").html()); var hd = coinjs.hd($("#verifyHDaddress .hdKey").html());
var index_start = $("#verifyHDaddress .derivation_index_start").val(); var index_start = $("#verifyHDaddress .derivation_index_start").val()*1;
if ((index_start.length > 1) && (index_start[index_start.length - 1] == '\'')) { var index_end = $("#verifyHDaddress .derivation_index_end").val()*1;
var use_private_index = '\'';
index_start = index_start.replace(/[']/, "") * 1;
} else {
var use_private_index = '';
index_start = index_start.replace(/[']/, "") * 1;
}
var index_end = $("#verifyHDaddress .derivation_index_end").val().replace(/[']/, "") * 1;
$("#verifyHDaddress .derivation_index_end").val(index_end + use_private_index);
var html = ''; var html = '';
$("#verifyHDaddress .derived_data table tbody").html(""); $("#verifyHDaddress .derived_data table tbody").html("");
for(var i=index_start;i<=index_end;i++){ for(var i=index_start;i<=index_end;i++){
if($("#hdpathtype option:selected").val()=='simple'){ if($("#hdpathtype option:selected").val()=='simple'){
var derived = hd.derive(i); var derived = hd.derive(i);
} else { } else {
var derived = hd.derive_path(($("#hdpath input").val().replace(/\/+$/, ""))+'/'+i+use_private_index); var derived = hd.derive_path(($("#hdpath input").val().replace(/\/+$/, ""))+'/'+i);
} }
html += '<tr>'; html += '<tr>';
html += '<td>'+i+'</td>'; html += '<td>'+i+'</td>';
@ -1922,8 +1916,6 @@ $(document).ready(function() {
coinjs.hdkey.pub = $("#coinjs_hdpub").val()*1; coinjs.hdkey.pub = $("#coinjs_hdpub").val()*1;
coinjs.hdkey.prv = $("#coinjs_hdprv").val()*1; coinjs.hdkey.prv = $("#coinjs_hdprv").val()*1;
coinjs.hd_derivation = $("#coinjs_derivation").val();
configureBroadcast(); configureBroadcast();
configureGetUnspentTx(); configureGetUnspentTx();
@ -1969,7 +1961,6 @@ $(document).ready(function() {
$("#coinjs_multisig").val(o[2]); $("#coinjs_multisig").val(o[2]);
$("#coinjs_hdpub").val(o[3]); $("#coinjs_hdpub").val(o[3]);
$("#coinjs_hdprv").val(o[4]); $("#coinjs_hdprv").val(o[4]);
$("#coinjs_derivation").val(o[7]);
// hide/show custom screen // hide/show custom screen
if($("option:selected",this).val()=="custom"){ if($("option:selected",this).val()=="custom"){

8
sha1sum
View File

@ -1,9 +1,9 @@
---- Version 1.6 2020.10.02 ---- ---- Version 1.6 2020.07.06 ----
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
cb5717166bf1c99abbd75a06013067c4a5897d5a ./js/coinbin.js 7dd75e07389808d57261bca630a5bab55ce9faef ./js/coinbin.js
911fb7bdba24269029f27659e4040cd991b2307c ./js/coin.js 228cdcf29d33a5eadd360e85a6220e4853ee4590 ./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
@ -31,5 +31,5 @@ de51a8494180a6db074af2dee2383f0a363c5b08 ./fonts/glyphicons-halflings-regular.s
278e49a86e634da6f2a02f3b47dd9d2a8f26210f ./fonts/glyphicons-halflings-regular.woff 278e49a86e634da6f2a02f3b47dd9d2a8f26210f ./fonts/glyphicons-halflings-regular.woff
44bc1850f570972267b169ae18f1cb06b611ffa2 ./fonts/glyphicons-halflings-regular.ttf 44bc1850f570972267b169ae18f1cb06b611ffa2 ./fonts/glyphicons-halflings-regular.ttf
ee481606d8d48f402d152fa632ba9e5f9da7f169 ./README.md ee481606d8d48f402d152fa632ba9e5f9da7f169 ./README.md
a706e95f6436ee4a31dc26b17a9ac8ab1f0d3750 ./index.html 5054e03cff2cfcd1ce5296fe2659ca2d46d64fe4 ./index.html
7130b64e3ef4cf6f2f1550e902f081c58dc053de ./test.html 7130b64e3ef4cf6f2f1550e902f081c58dc053de ./test.html