add get_gm_new_address

diff --git a/app/api/__init__.py b/app/api/__init__.py
index 51d2748..8af0e53 100644 (file)
--- a/app/api/__init__.py
+++ b/app/api/__init__.py
@@ -34,6 +34,7 @@ from app.api.resources import Gm_Xprv_Sign
 from app.api.resources import Get_Gm_P2WPKH_Program
 from app.api.resources import Get_Gm_Address
 from app.api.resources import Get_Gm_New_Key
+from app.api.resources import Get_Gm_New_Address
 
 
 blueprint = Blueprint('api', __name__, url_prefix='/api/v1')
@@ -71,4 +72,5 @@ api.add_resource(Gm_Xpub_Verify, '/gm_xpub_verify')
 api.add_resource(Gm_Xprv_Sign, '/gm_xprv_sign')
 api.add_resource(Get_Gm_P2WPKH_Program, '/get_gm_P2WPKH_program')
 api.add_resource(Get_Gm_Address, '/get_gm_address')
-api.add_resource(Get_Gm_New_Key, '/get_gm_new_key')
\ No newline at end of file
+api.add_resource(Get_Gm_New_Key, '/get_gm_new_key')
+api.add_resource(Get_Gm_New_Address, '/get_gm_new_address')
\ No newline at end of file

diff --git a/app/api/resources.py b/app/api/resources.py
index 0e35bb1..a0e8d11 100644 (file)
--- a/app/api/resources.py
+++ b/app/api/resources.py
@@ -34,6 +34,7 @@ from app.model.key_gm import gm_xprv_sign
 from app.model.receiver import get_gm_P2WPKH_program
 from app.model.receiver import get_gm_address
 from app.model.key_gm import get_gm_new_key
+from app.model.receiver import get_gm_new_address
 
 
 parser = reqparse.RequestParser()
@@ -338,3 +339,15 @@ class Get_Gm_New_Key(Resource):
 
     def post(self):
         return get_gm_new_key()
+
+class Get_Gm_New_Address(Resource):
+
+    def post(self):
+        args = parser.parse_args()
+        xpub = args.get('xpub_str')
+        account_index = args.get('account_index_int')
+        address_index = args.get('address_index_int')
+        change = args.get('change_bool')
+        network = args.get('network_str')
+        response = get_gm_new_address(xpub, account_index, address_index, change, network)
+        return response

diff --git a/app/model/receiver.py b/app/model/receiver.py
index 21be70c..c3f5759 100644 (file)
--- a/app/model/receiver.py
+++ b/app/model/receiver.py
@@ -212,6 +212,7 @@ def get_gm_address(control_program_str, network_str):
         "address": address_str
     }
 
+
 # create_qrcode_base64 create qrcode, then encode it to base64
 # type(s) is str
 def create_qrcode_base64(s):
@@ -223,6 +224,7 @@ def create_qrcode_base64(s):
         "base64": base64_str
     }
 
+
 # create_new_address create address and address qrcode
 # test data 1:
 #   xpub_str: 8fde12d7c9d6b6cbfbf344edd42f2ed86ae6270b36bab714af5fd5bb3b54adcec4265f1de85ece50f17534e42016ee9404a11fec94ddfadd4a064d27ef3f3f4c
@@ -265,3 +267,44 @@ def create_new_address(xpub_str, account_index_int, address_index_int, change_bo
         "address": address_str,
         "address_base64": address_base64
     }
+
+
+# get_gm_new_address create address and address qrcode
+# test data 1:
+#   xpub_str: 0269ed53316c1ab5e3b3aa7c1ac3023e250e92a8b1495e1b88fe9564c1c6a49aaeabe1954985189c598214b56563a175fa843e091c9bf941f34a479c8121b196
+#   account_index_int: 1
+#   address_index_int: 1
+#   change_bool: False
+#   network_str: solonet
+#   path: m/44/153/1/0/1
+#   control_program: 00147a9db32f2059c9afc606525a826cd26715364841
+#   address: sm1q02wmxteqt8y6l3sx2fdgymxjvu2nvjzpxgal3p
+# test data 2:
+#   xpub_str: 0254d4f8377fa9cb7839e9525503ff2aa471a82042678082cf45e497362a1dd0e630dee82c0ce53458beafd257852739ab304ca38463ff23f89aa5ee19bc9312
+#   account_index_int: 12
+#   address_index_int: 3
+#   change_bool: True
+#   network_str: testnet
+#   path: m/44/153/12/1/3
+#   control_program: 001443419a20a0ca857c263a871136b64afea3a1cbf3
+#   address: gm1qgdqe5g9qe2zhcf36sugnddj2l636rjln0n98yq
+# test data 3:
+#   xpub_str: 03c8267b52c3918dd8714a30415460b5166f1b3e692b129121787d5bec86e6f57a23f928ec780dcadec36e17d19e46cfb20031c4bc5da26d6d9162f16c2e72da71
+#   account_index_int: 200
+#   address_index_int: 1
+#   change_bool: True
+#   network_str: testnet
+#   path: m/44/153/200/1/1
+#   control_program: 001438b8ad08da405b7565258f2ab94437384d4bdb3c
+#   address: gm1q8zu26zx6gpdh2ef93u4tj3ph8px5hkeur9l3x5
+def get_gm_new_address(xpub_str, account_index_int, address_index_int, change_bool, network_str):
+    path_str = get_path_from_index(account_index_int, address_index_int, change_bool)['path_str']
+    control_program_str = create_P2WPKH_program(account_index_int, address_index_int, change_bool, xpub_str)['control_program']
+    address_str = get_gm_address(control_program_str, network_str)['address']
+    address_base64 = create_qrcode_base64(address_str)['base64']
+    return {
+        "path": path_str,
+        "control_program": control_program_str,
+        "address": address_str,
+        "address_base64": address_base64
+    }

diff --git a/assets/main_gm.js b/assets/main_gm.js
index 6323fd8..1275c7d 100644 (file)
--- a/assets/main_gm.js
+++ b/assets/main_gm.js
@@ -43,7 +43,7 @@ $(function(){
     var network_str = $("input[name='inlineRadioOptionsNetwork']:checked").val()
     $.ajax({
       method: 'post',  //get or post
-      url: 'http://kit.blockmeta.com/api/v1/create_new_address',
+      url: 'http://127.0.0.1:5000/api/v1/get_gm_new_address',
       data: {
         "xpub_str": xpub_str,
         "account_index_int": account_index_int,

diff --git a/kit-gm.html b/kit-gm.html
index 89d1a99..4d126d1 100644 (file)
--- a/kit-gm.html
+++ b/kit-gm.html
@@ -142,13 +142,10 @@
               <label class="col-sm-2 control-label">Network</label>
               <div class="col-sm-10">
                 <label class="radio-inline">
-                  <input type="radio" name="inlineRadioOptionsNetwork" id="inlineRadioMainet" value="mainnet"> Mainnet
+                  <input type="radio" name="inlineRadioOptionsNetwork" id="inlineRadioTestnet" value="gm_testnet"> Testnet
                 </label>
                 <label class="radio-inline">
-                  <input type="radio" name="inlineRadioOptionsNetwork" id="inlineRadioTestnet" value="testnet"> Testnet
-                </label>
-                <label class="radio-inline">
-                  <input type="radio" name="inlineRadioOptionsNetwork" id="inlineRadioSolonet" value="solonet" checked="checked">
+                  <input type="radio" name="inlineRadioOptionsNetwork" id="inlineRadioSolonet" value="gm_solonet" checked="checked">
                   Solonet
                 </label>
               </div>