update api

diff --git a/app/api/resources.py b/app/api/resources.py
index 993fe52..bee1ff3 100644 (file)
--- a/app/api/resources.py
+++ b/app/api/resources.py
@@ -224,7 +224,11 @@ class Create_QRcode_Base64(Resource):
 class Create_New_Key(Resource):
 
     def post(self):
-        return create_new_key()
+        args = parser.parse_args()
+        entropy = args.get('entropy_str')
+        mnemonic = args.get('mnemonic_str')
+        response = create_new_key(entropy, mnemonic)
+        return response
 
 
 class Create_New_Address(Resource):
@@ -339,7 +343,11 @@ class Get_Gm_Address(Resource):
 class Get_Gm_New_Key(Resource):
 
     def post(self):
-        return get_gm_new_key()
+        args = parser.parse_args()
+        entropy = args.get('entropy_str')
+        mnemonic = args.get('mnemonic_str')
+        response = get_gm_new_key(entropy, mnemonic)
+        return response
 
 class Get_Gm_New_Address(Resource):
 

diff --git a/app/model/key.py b/app/model/key.py
index fc8a02f..ec7fb6d 100644 (file)
--- a/app/model/key.py
+++ b/app/model/key.py
@@ -384,9 +384,14 @@ def xpub_verify(xpub_str, message_str, signature_str):
     }
 
 
-def create_new_key():
-    entropy_str = create_entropy()['entropy']
-    mnemonic_str = entropy_to_mnemonic(entropy_str)['mnemonic']
+def create_new_key(entropy_str, mnemonic_str):
+    if (entropy_str == "") and (mnemonic_str == ""):
+        entropy_str = create_entropy()['entropy']
+        mnemonic_str = entropy_to_mnemonic(entropy_str)['mnemonic']
+    if (entropy_str == "") and (mnemonic_str != ""):
+        pass
+    if entropy_str != "":
+        mnemonic_str = entropy_to_mnemonic(entropy_str)['mnemonic']
     seed_str = mnemonic_to_seed(mnemonic_str)['seed']
     root_xprv_str = seed_to_root_xprv(seed_str)['root_xprv']
     xpub_str = xprv_to_xpub(root_xprv_str)['xpub']

diff --git a/app/model/key_gm.py b/app/model/key_gm.py
index f699212..99ee628 100644 (file)
--- a/app/model/key_gm.py
+++ b/app/model/key_gm.py
@@ -274,9 +274,14 @@ def gm_xpub_verify(xpub_str, message_str, signature_str):
     }
 
 
-def get_gm_new_key():
-    entropy_str = key.create_entropy()['entropy']
-    mnemonic_str = key.entropy_to_mnemonic(entropy_str)['mnemonic']
+def get_gm_new_key(entropy_str, mnemonic_str):
+    if (entropy_str == "") and (mnemonic_str == ""):
+        entropy_str = key.create_entropy()['entropy']
+        mnemonic_str = key.entropy_to_mnemonic(entropy_str)['mnemonic']
+    if (entropy_str == "") and (mnemonic_str != ""):
+        pass
+    if entropy_str != "":
+        mnemonic_str = key.entropy_to_mnemonic(entropy_str)['mnemonic']
     seed_str = key.mnemonic_to_seed(mnemonic_str)['seed']
     root_xprv_str = get_gm_root_xprv(seed_str)['root_xprv']
     xpub_str = get_gm_xpub(root_xprv_str)['xpub']