update

diff --git a/app/api/resources.py b/app/api/resources.py
index 082d6a6..f93e3e2 100644 (file)
--- a/app/api/resources.py
+++ b/app/api/resources.py
@@ -13,7 +13,6 @@ from app.model.key import xpub_to_public_key
 from app.model.key import xpub_verify
 from app.model.key import xprv_sign
 from app.model.key import xprv_to_xpub
-from app.model.key import xprv_sign
 from app.model.key import xprv_to_child_xprv
 from app.model.key import xpub_to_child_xpub
 from app.model.receiver import create_P2WPKH_program

diff --git a/app/model/key.py b/app/model/key.py
index 97e74ea..5057d00 100644 (file)
--- a/app/model/key.py
+++ b/app/model/key.py
@@ -18,7 +18,7 @@ def create_entropy():
         entropy_str += hex_str[num]
     return {
         "entropy": entropy_str
-        }
+    }
 
 
 # entropy_to_mnemonic create mnemonic from 128 bits entropy(the entropy_str length is 32)
@@ -62,7 +62,7 @@ def entropy_to_mnemonic(entropy_str):
         mnemonic_str += " "
     return {
         "mnemonic": mnemonic_str[:-1]
-        }
+    }
 
 
 # mnemonic_to_seed create seed from mnemonic
@@ -83,7 +83,7 @@ def mnemonic_to_seed(mnemonic_str):
     seed_str = pbkdf2.PBKDF2(password_str, salt_str, iterations=2048, digestmodule=hashlib.sha512, macmodule=hmac).hexread(64)
     return {
         "seed": seed_str
-        }
+    }
 
 
 # s_str must be >= 32 bytes long and gets rewritten in place.
@@ -116,7 +116,7 @@ def seed_to_root_xprv(seed_str):
     root_xprv_str = prune_root_scalar(hc_str[:64]).hex() + hc_str[64:]
     return {
         "root_xprv": root_xprv_str
-        }
+    }
 
 
 # xprv_to_xpub derives new xpub from xprv
@@ -144,7 +144,7 @@ def xprv_to_xpub(xprv_str):
     xpub_str = xpub.hex()
     return {
         "xpub": xpub_str
-        }
+    }
 
 
 # xprv_to_expanded_private_key create expanded private key from xprv
@@ -163,7 +163,7 @@ def xprv_to_expanded_private_key(xprv_str):
     expanded_private_key_str = xprv_str[:64] + hc_str[64:]
     return {
         "expanded_private_key": expanded_private_key_str
-        }
+    }
 
 
 # xpub_to_public_key create 32 bytes public key from xpub
@@ -182,7 +182,7 @@ def xpub_to_public_key(xpub_str):
     public_key_str = xpub_str[:64]
     return {
         "public_key": public_key_str
-        }
+    }
 
 
 def prune_intermediate_scalar(f):
@@ -248,7 +248,7 @@ def xprv_to_child_xprv(xprv_str, path_list):
     child_xprv_str = xprv_str
     return {
         "child_xprv": child_xprv_str
-        }
+    }
 
 
 # xpub_to_child_xpub create new xpub through the path
@@ -304,7 +304,7 @@ def xpub_to_child_xpub(xpub_str, path_list):
     child_xpub_str = xpub_str
     return {
         "child_xpub": child_xpub_str
-        }
+    }
 
 
 # xprv_sign sign message
@@ -357,7 +357,7 @@ def xprv_sign(xprv_str, message_str):
     signature_str = signature_bytes.hex()
     return {
         "signature": signature_str
-        }
+    }
 
 
 # xpub_verify verify signature
@@ -385,7 +385,7 @@ def xpub_verify(xpub_str, message_str, signature_str):
     result = verify(xpub_to_public_key(xpub_str)['public_key'], signature_str, message_str)['result']
     return {
         "result": result
-        }
+    }
 
 
 def create_new_key():

diff --git a/assets/main.js b/assets/main.js
index f8bc46c..2993b22 100644 (file)
--- a/assets/main.js
+++ b/assets/main.js
@@ -89,10 +89,10 @@ $(function(){
       dataType: 'json',
     }).done(function(data){
       console.log(data);
-      layer.msg('创建成功')
+      layer.msg('签名成功')
       $('#txtSignature').val(data.signature)
     }).fail(function(err){
-      layer.alert('创建失败' + err);
+      layer.alert('签名失败' + err);
     });
   })
   // 清除消息签名
@@ -120,13 +120,9 @@ $(function(){
     }).done(function(data){
       console.log(data);
       layer.msg('验证成功')
-      if (data.result == true) {
-        $('#txtVerifyResult').val("True")
-      } else {
-        $('#txtVerifyResult').val("False")
-      }
+      $('#txtVerifyResult').val(data.result)
     }).fail(function(err){
-      layer.alert('创建失败' + err);
+      layer.alert('验证失败，请检查输入数据格式是否正确' + err);
     });
   })
   // 清除消息签名

diff --git a/key.html b/key.html
index ee971a5..9d16b5d 100644 (file)
--- a/key.html
+++ b/key.html
@@ -210,7 +210,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="txtXpubVerify" placeholder="64 Bytes expanded public key, e.g. " maxlength="128">
+            <input type="text" class="form-control" id="txtXpubVerify" placeholder="64 Bytes expanded public key, e.g. 1b0541a7664cee929edb54d9ef21996b90546918a920a77e1cd6015d97c56563d513bc370335cac51d77f0be5dfe84de024cfee562530b4d873b5f5e2ff4f57c" maxlength="128">
           </div>
         </div>
         <!-- 消息 -->
@@ -236,7 +236,7 @@
         </div>
         <div class="form-group">
           <div class="col-sm-offset-2 col-sm-10">
-            <a id="btnVerifySignatrue" class="btn btn-primary">Verify Signature</a>
+            <a id="btnVerifySignature" class="btn btn-primary">Verify Signature</a>
             <a id="btnResetVerify" class="btn btn-primary">Reset</a>
           </div>
         </div>