X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2Findex.html;h=7f306f4d1777542d19c8e5b38426d7cafe9139ce;hb=20871923323a9be5114f9e030a5bc08b9461aec9;hp=9da3e2561a1bc3a716e2be3fa537a00533128fca;hpb=fe8f2d140d9c9e260ebeab7135aa5197b27df406;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git

diff --git a/src/index.html b/src/index.html
index 9da3e25..7f306f4 100644
--- a/src/index.html
+++ b/src/index.html
@@ -114,7 +114,7 @@
         <div class="container">
 
             <h1 class="text-center">Mnemonic Code Converter</h1>
-            <p class="version">v0.2.7</p>
+            <p class="version">v0.3.0</p>
             <hr>
             <div class="row">
                 <div class="col-md-12">
@@ -193,6 +193,8 @@
                                     <div class="filtered col-sm-9 form-control-static"></div>
                                     <label class="col-sm-3 control-label">Raw Binary</label>
                                     <div class="binary col-sm-9 form-control-static"></div>
+                                    <label class="col-sm-3 control-label">Word Indexes</label>
+                                    <div class="word-indexes col-sm-9 form-control-static">&nbsp;</div>
                                     <label class="col-sm-3 control-label">Mnemonic Length</label>
                                     <div class="col-sm-9">
                                         <select class="mnemonic-length form-control">
@@ -223,7 +225,7 @@
                             <div class="col-sm-10 checkbox">
                                 <label>
                                     <input type="checkbox" class="use-entropy">
-                                    <span>Supply my own source of entropy</span>
+                                    <span>Show entropy details</span>
                                 </label>
                             </div>
                         </div>
@@ -277,7 +279,7 @@
                             <label for="litecoin-use-ltub" class="col-sm-2 control-label">Prefixes</label>
                             <div class="col-sm-10 checkbox">
                                 <label>
-                                    <input type="checkbox" id="litecoin-use-ltub" class="litecoin-use-ltub">
+                                    <input type="checkbox" id="litecoin-use-ltub" class="litecoin-use-ltub" checked="checked">
                                     Use <code>Ltpv / Ltub</code> instead of <code>xprv / xpub</code>
                                 </label>
                             </div>
@@ -301,6 +303,9 @@
                         <li id="bip49-tab">
                             <a href="#bip49" role="tab" data-toggle="tab">BIP49</a>
                         </li>
+                        <li id="bip141-tab">
+                            <a href="#bip141" role="tab" data-toggle="tab">BIP141</a>
+                        </li>
                     </ul>
                     <div class="derivation-type tab-content">
                         <div id="bip44" class="tab-pane active">
@@ -415,13 +420,6 @@
                                         <span>Use hardened addresses</span>
                                     </label>
                                 </div>
-                                <div class="form-group">
-                                    <div class="col-sm-2"></div>
-                                    <label class="col-sm-10">
-                                        <input class="p2wpkh-nested-in-p2sh" type="checkbox">
-                                        <span>Use SegWit addresses (ie P2WPKH Nested In P2SH)</span>
-                                    </label>
-                                </div>
                                 <div class="form-group">
                                     <label for="core-path" class="col-sm-2 control-label">Bitcoin Core</label>
                                     <div class="col-sm-10">
@@ -551,6 +549,43 @@
                                 </div>
                             </form>
                         </div>
+                        <div id="bip141" class="tab-pane">
+                            <form class="form-horizontal" role="form">
+                                <br>
+                                <div class="unavailable hidden">
+                                    <div class="form-group">
+                                        <div class="col-sm-2"></div>
+                                        <div class="col-sm-10">
+                                            <p>BIP141 is unavailable for this coin.</p>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="available">
+                                    <div class="col-sm-2"></div>
+                                    <div class="col-sm-10">
+                                        <p>
+                                            For more info see the
+                                            <a href="https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki" target="_blank">BIP141 spec</a>
+                                        </p>
+                                    </div>
+                                    <div class="form-group">
+                                        <label for="bip141-path" class="col-sm-2 control-label">BIP32 Derivation Path</label>
+                                        <div class="col-sm-10">
+                                            <input id="bip141-path" type="text" class="bip141-path form-control" value="m/0">
+                                        </div>
+                                    </div>
+                                    <div class="form-group">
+                                        <label class="col-sm-2 control-label">Script Semantics</label>
+                                        <div class="col-sm-10">
+                                            <select class="form-control bip141-semantics">
+                                                <option value="p2wpkh">P2WPKH</option>
+                                                <option value="p2wpkh-p2sh" selected>P2WPKH nested in P2SH</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                </div>
+                            </form>
+                        </div>
                     </div>
                     <form class="form-horizontal" role="form">
                         <div class="form-group">
@@ -574,7 +609,7 @@
             <div class="row">
                 <div class="col-md-12">
                     <h2>Derived Addresses</h2>
-                    <p>Note these addreses are derived from the BIP32 Extended Key</p>
+                    <p>Note these addresses are derived from the BIP32 Extended Key</p>
                 </div>
                 <div class="col-md-12 use-bitpay-addresses-container hidden">
                     <div class="checkbox">
@@ -622,9 +657,12 @@
                     </table>
                 </div>
             </div>
-            <span>Show more rows</span>:
+            <span>Show</span>
             <input type="number" class="rows-to-add" value="20">
-            <button class="more">Show</button>
+            <button class="more">more rows</button>
+            <span>starting from index</span>
+            <input type="number" class="more-rows-start-index">
+            <span>(leave blank to generate from next index)</span>
 
             <hr>
 
@@ -671,7 +709,7 @@
                         </span>
                         <span>This means flipping a fair coin, rolling a fair dice, noise measurements etc.</span>
                         <span>
-                            Do <strong>NOT</strong> use phrases from books, lyrics from songs, your birthday or steet address,
+                            Do <strong>NOT</strong> use phrases from books, lyrics from songs, your birthday or street address,
                             keyboard mashing, or anything you <i>think</i> is random, because chances are overwhelming it isn't
                             random enough for the needs of this tool.
                         </span>
@@ -832,8 +870,9 @@
         <script src="js/bootstrap.min.js"></script>
         <script src="js/levenshtein.js"></script>
         <script src="js/jquery.qrcode.min.js"></script>
-        <script src="js/bitcoinjs-3-1-1.js"></script>
+        <script src="js/bitcoinjs-3.3.0.js"></script>
         <script src="js/bitcoinjs-extensions.js"></script>
+        <script src="js/segwit-parameters.js"></script>
         <script src="js/ethereumjs-util.js"></script>
         <script src="js/ripple-util.js"></script>
         <script src="js/sjcl-bip39.js"></script>