mirror of
https://github.com/ok2/coinbin.git
synced 2026-04-24 11:44:02 +02:00
Merge branch 'hdwallet_bech32' into full_featured
This commit is contained in:
commit
20bf365d29
13
index.html
13
index.html
@ -1206,7 +1206,7 @@
|
|||||||
<p>The path of key derivation</p>
|
<p>The path of key derivation</p>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-8">
|
<div class="col-md-6">
|
||||||
<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>
|
||||||
@ -1231,6 +1231,15 @@
|
|||||||
<input type="text" class="form-control derivation_index_end" value="1">
|
<input type="text" class="form-control derivation_index_end" value="1">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="col-md-2">
|
||||||
|
<b>Address format</b><br>
|
||||||
|
<select class="form-control derivation_addr_format">
|
||||||
|
<option value="bech32">Bech32</option>
|
||||||
|
<option value="segwit">SegWit</option>
|
||||||
|
<option value="legacy">Legacy</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<hr>
|
<hr>
|
||||||
@ -1241,7 +1250,7 @@
|
|||||||
<div class="derived_data">
|
<div class="derived_data">
|
||||||
<table class="table table-striped table-hover">
|
<table class="table table-striped table-hover">
|
||||||
<thead>
|
<thead>
|
||||||
<tr><td><b>Index</b></td><td><b>Address</b><td><b>Private Key (WIF)</b></td></td><td><b>Extended xPub</b></td><td><b>Extended xPrv</b></td></tr>
|
<tr><td><b>Index</b></td><td><b>Address</b></td><td><b>Redeem script</b></td><td><b>Private Key (WIF)</b></td><td><b>Extended xPub</b></td><td><b>Extended xPrv</b></td></tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|||||||
12
js/coin.js
12
js/coin.js
@ -621,10 +621,20 @@
|
|||||||
var privkey = (r.key_bytes).slice(1, 33);
|
var privkey = (r.key_bytes).slice(1, 33);
|
||||||
var privkeyHex = Crypto.util.bytesToHex(privkey);
|
var privkeyHex = Crypto.util.bytesToHex(privkey);
|
||||||
var pubkey = coinjs.newPubkey(privkeyHex);
|
var pubkey = coinjs.newPubkey(privkeyHex);
|
||||||
|
var addr_format = $("#verifyHDaddress .derivation_addr_format").val();
|
||||||
|
if (addr_format == "bech32") {
|
||||||
|
var address = coinjs.bech32Address(pubkey);
|
||||||
|
} else if (addr_format == "segwit") {
|
||||||
|
var address = coinjs.segwitAddress(pubkey);
|
||||||
|
} else {
|
||||||
|
var address = {'address': coinjs.pubkey2address(pubkey),
|
||||||
|
'redeemscript': ''};
|
||||||
|
}
|
||||||
|
|
||||||
r.keys = {'privkey':privkeyHex,
|
r.keys = {'privkey':privkeyHex,
|
||||||
'pubkey':pubkey,
|
'pubkey':pubkey,
|
||||||
'address':coinjs.pubkey2address(pubkey),
|
'address':address.address,
|
||||||
|
'script':address.redeemscript,
|
||||||
'wif':coinjs.privkey2wif(privkeyHex)};
|
'wif':coinjs.privkey2wif(privkeyHex)};
|
||||||
|
|
||||||
} else if(r.key_bytes[0] == 0x02 || r.key_bytes[0] == 0x03) {
|
} else if(r.key_bytes[0] == 0x02 || r.key_bytes[0] == 0x03) {
|
||||||
|
|||||||
@ -1717,6 +1717,7 @@ $(document).ready(function() {
|
|||||||
html += '<tr>';
|
html += '<tr>';
|
||||||
html += '<td>'+i+'</td>';
|
html += '<td>'+i+'</td>';
|
||||||
html += '<td><input type="text" class="form-control" value="'+derived.keys.address+'" readonly></td>';
|
html += '<td><input type="text" class="form-control" value="'+derived.keys.address+'" readonly></td>';
|
||||||
|
html += '<td><input type="text" class="form-control" value="'+derived.keys.script+'" readonly></td>';
|
||||||
html += '<td><input type="text" class="form-control" value="'+((derived.keys.wif)?derived.keys.wif:'')+'" readonly></td>';
|
html += '<td><input type="text" class="form-control" value="'+((derived.keys.wif)?derived.keys.wif:'')+'" readonly></td>';
|
||||||
html += '<td><input type="text" class="form-control" value="'+derived.keys_extended.pubkey+'" readonly></td>';
|
html += '<td><input type="text" class="form-control" value="'+derived.keys_extended.pubkey+'" readonly></td>';
|
||||||
html += '<td><input type="text" class="form-control" value="'+((derived.keys_extended.privkey)?derived.keys_extended.privkey:'')+'" readonly></td>';
|
html += '<td><input type="text" class="form-control" value="'+((derived.keys_extended.privkey)?derived.keys_extended.privkey:'')+'" readonly></td>';
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user