add address

diff --git a/assets/main.js b/assets/main.js
index 1dbd41f..7370314 100644 (file)
--- a/assets/main.js
+++ b/assets/main.js
@@ -33,30 +33,42 @@ $(function(){
   // 生成新地址
   $('#btnCreateNewAddress').click(function(){
     console.log('创建新密钥');
+    var xpub_str = $('#txtXpub').val()
+    var account_index_int = $('#txtAccountIndex').val()
+    var address_index_int = $('#txtAddressIndex').val()
+    var change_bool = false
+    if ($("input[name='inlineRadioOptionsChange']:checked").val() == "true") {
+      change_bool = true
+    }
+    var network_str = $("input[name='inlineRadioOptionsNetwork']:checked").val()
     $.ajax({
       method: 'post',  //get or post
-      url: 'http://127.0.0.1:5000/api/v1/create_new_key',
-      data: {},
+      url: 'http://127.0.0.1:5000/api/v1/create_new_address',
+      data: {
+        "xpub_str": xpub_str,
+        "account_index_int": account_index_int,
+        "address_index_int": address_index_int,
+        "change_bool": change_bool,
+        "network_str": network_str
+      },
       dataType: 'json',
     }).done(function(data){
       console.log(data);
       layer.msg('创建成功')
-      $('#txtEntropy').val(data.entropy)
-      $('#txtMnemonics').val(data.mnemonic)
-      $('#txtSeed').val(data.seed)
-      $('#txtRootXprv').val(data.xprv)
-      $('#txtRootXpub').val(data.xpub)
-      $('#imgXprvQRCode').attr('src', 'data:image/jpg;base64,' + data.xprv_base64)
+      $('#txtAddressPath').val(data.path)
+      $('#txtControlProgram').val(data.control_program)
+      $('#txtAddress').val(data.address)
+      $('#imgAddressQRCode').attr('src', 'data:image/jpg;base64,' + data.address_base64)
     }).fail(function(err){
       layer.alert('创建失败' + err);
     });
   })
   // 清除地址
-  $('#btnResetReceiver').click(function(){
+  $('#btnResetAddress').click(function(){
     console.log('清除');
     $('#txtXpub').val('')
-    $('#txtAccountIndex').val('')
-    $('#txtAddressIndex').val('')
+    $('#txtAccountIndex').val('1')
+    $('#txtAddressIndex').val('1')
     $('#txtAddressPath').val('')
     $('#txtControlProgram').val('')
     $('#txtAddress').val('')

diff --git a/key.html b/key.html
index 038f6e4..c317e38 100644 (file)
--- a/key.html
+++ b/key.html
@@ -85,7 +85,7 @@
         <div class="form-group">
           <label class="col-sm-2 control-label">Expanded Public Key</label>
           <div class="col-sm-10">
-            <input type="text" class="form-control" id="txtXpub" placeholder="64 Bytes expanded public key, e.g. 8680afdf7c21f5315d6a40183653c8def35679f8bae870687bc786df54317863c976554fbd99c9f63c7fcefb089f65c5db6a1af4429600384b1d9f2751cef942">
+            <input type="text" class="form-control" id="txtXpub" placeholder="64 Bytes expanded public key, e.g. 8fde12d7c9d6b6cbfbf344edd42f2ed86ae6270b36bab714af5fd5bb3b54adcec4265f1de85ece50f17534e42016ee9404a11fec94ddfadd4a064d27ef3f3f4c">
           </div>
         </div>
         <!-- 账户索引 -->
@@ -133,21 +133,21 @@
         <div class="form-group">
           <label class="col-sm-2 control-label">Address Path</label>
           <div class="col-sm-10">
-            <input type="text" class="form-control" id="txtAddressPath" placeholder="Address Path, e.g. " readonly>
+            <input type="text" class="form-control" id="txtAddressPath" placeholder="Address Path, e.g. m/44/153/1/0/1" readonly>
           </div>
         </div>
         <!-- control program -->
         <div class="form-group">
           <label class="col-sm-2 control-label">Control Program</label>
           <div class="col-sm-10">
-            <input type="text" class="form-control" id="txtControlProgram" placeholder="Control Program, e.g. 001431f2b90b469e89361225aae370f73e5473b9852b" readonly>
+            <input type="text" class="form-control" id="txtControlProgram" placeholder="Control Program, e.g. 00147640f3c34fe4b2b298e54e54a4692a47ce47aa5e" readonly>
           </div>
         </div>
         <!-- 地址 -->
         <div class="form-group">
           <label class="col-sm-2 control-label">Address</label>
           <div class="col-sm-10">
-            <input type="text" class="form-control" id="txtAddress" placeholder="Address, e.g. bm1qx8etjz6xn6ynvy394t3hpae723emnpft3nrwej" readonly>
+            <input type="text" class="form-control" id="txtAddress" placeholder="Address, e.g. sm1qweq08s60ujet9x89fe22g6f2gl8y02j7lgr5v5" readonly>
           </div>
         </div>
         <!-- 根扩展私钥二维码 -->