Update Widentity ECDSA Sign

Author: 99Kies

.gitignore

@@ -1 +1,2 @@
-__pycache__
+__pycache__
+.idea/

README.md

@@ -1,2 +1,39 @@
 # Weidentity-Python-SDK
 Weidentity-Python-SDK
+## 支持版本
+Python3.6+
+
+## How to use
+
+1. 下载weidentity python sdk
+```bash
+pip install pyweidentity
+```
+
+2. 托管模式示例
+```python
+from pyweidentity.weidentityService import weidentityService
+
+URL = "http://192.168.80.144:6001"
+# WeIdentity RestService URL
+
+weid = weidentityService(URL)
+create_weid = weid.create_weidentity_did()
+print(create_weid)
+```
+
+
+3. 轻客户端模式示例
+```python
+from pyweidentity.weidentityClient import weidentityClient
+import random
+
+URL = "http://192.168.80.144:6001"
+# WeIdentity RestService URL
+
+weid = weidentityClient(URL)
+privKey = "0xc4a116fb87ae9b8b87842b0f46e1bbf71c37fdae1104fd6d3fd2041e23c8c68e"
+nonce = str(random.randint(1, 999999999999999999999999999999))
+create_weid = weid.create_weidentity_did(privKey, nonce)
+print(create_weid)
+```

pyweidentity/Base.py

@@ -4,6 +4,9 @@
 import base64
 import sha3
 from ecdsa import SigningKey, SECP256k1
+from pyweidentity.localweid import generate_addr
+from Crypto.Hash import keccak
+from eth_account import Account
 
 LOG = logging.getLogger(__name__)
 class Base(object):
@@ -40,7 +43,50 @@ def post(self, url, data):
             return None
         return response.json()
 
+    # def priv_to_public_hex(self, privkey):
+    #     if privkey[:2] == "0x":
+    #         account = generate_addr(priv=privkey[2:])
+    #     else:
+    #         account = generate_addr(priv=hex(int(privkey))[2:])
+    #
+    #     publickey = account["payload"]["pubv"]
+    #     return publickey
+
+    def priv_to_public(self, privkey):
+        if privkey[:2] == "0x":
+            account = generate_addr(priv=privkey[2:])
+        else:
+            account = generate_addr(priv=hex(int(privkey))[2:])
+
+        publickey = str(int(account["payload"]["pubv"], 16))
+        return publickey
+
+
+    def weid_ecdsa_sign(self, privKey, encode_transaction):
+        # 轻客户端模式的二次签名 signType is 1.
+        account = Account.privateKeyToAccount(privKey)
+        raw_tx_bytes = base64.b64decode(encode_transaction)
+
+        msg = keccak.new(digest_bits=256)
+        msg.update(raw_tx_bytes)
+
+        sig = account.signHash(msg.digest())
+        if (len(hex(sig.r)[2:]) % 2) == 0:
+            hexed_r = hex(sig.r)[2:]
+        else:
+            hexed_r = "0" + hex(sig.r)[2:]
+        if (len(hex(sig.s)[2:]) % 2) == 0:
+            hexed_s = hex(sig.s)[2:]
+        else:
+            hexed_s = "0" + hex(sig.s)[2:]
+        b_sig = bytes(bytearray.fromhex(hex(sig.v)[2:] + hexed_r + hexed_s))
+        b_64_sig = base64.b64encode(b_sig).decode()
+        # print("sig: {sig}".format(sig=b_64_sig))
+        return b_64_sig
+
     def ecdsa_sign(self, encode_transaction, privkey, hashfunc=hashlib.sha256):
+        # 生成证书时需要用到的ecdsa签名
+
         signning_key = SigningKey.from_string(bytes.fromhex(privkey), curve=SECP256k1)
         # encode_transaction = respBody['respBody']['encodedTransaction']
         # base64解密

pyweidentity/localweid.py

@@ -29,21 +29,13 @@ def create_random_weid():
     }
     return data
 
-def create_watting_weid(privkey):
-    # 通过get的方式传送一个privkey data。
-    account = generate_addr(priv=privkey)
-    addr = account["payload"]["addr"]
-    # 拼接weid，这里CHAIN_ID是留给上链用的。
-    weid = "did:weid:{addr}".format(addr=addr)
-    data = {
-        "privateKeyHex": account["payload"]["priv"],
-        "publicKeyHex": account["payload"]["pubv"],
-        "privateKeyInt": str(int(account["payload"]["priv"], 16)),
-        "publicKeyInt": str(int(account["payload"]["pubv"], 16)),
-        "weId": weid,
-    }
-    return data
+def priv_to_public(privkey):
+    if privkey[:2] == "0x":
+        account = generate_addr(priv=privkey[2:])
+    else:
+        account = generate_addr(priv=hex(int(privkey))[2:])
 
+    return account["payload"]["pubv"]
 
 def create_weid_by_privkey(privkey, chain_id):
     if privkey[:2] == "0x":

pyweidentity/weidentityClient.py

@@ -1,4 +1,3 @@
-import requests
 import logging
 from .Base import Base
 import time
@@ -23,23 +22,35 @@ def create_weidentity_did_first(self, publicKey, nonce):
         }
         return self.post("/weid/api/encode", data=data_dict)
 
-    def create_weidentity_did_second(self, nonce, data, signedMessage):
+    def create_weidentity_did_second(self, nonce, data, signedMessage, blockLimit, signType="1"):
         # 创建WeIdentity DID
         data_dict = {
             "functionArg": {},
             "transactionArg": {
                 "nonce": nonce,
                 "data": data,
+                "blockLimit": blockLimit,
+                "signType": signType,
                 "signedMessage": signedMessage
             },
             "functionName": "createWeId",
             "v": self.version
         }
         return self.post("/weid/api/transact", data=data_dict)
 
-    def create_weidentity_did(self, publicKey, nonce, data, signedMessage):
-        self.create_weidentity_did_first(publicKey, nonce)
-        return self.create_weidentity_did_second(nonce, data, signedMessage)
+    def create_weidentity_did(self, privKey, nonce, signType="1"):
+        publicKey = self.priv_to_public(privKey)
+        respBody = self.create_weidentity_did_first(publicKey, nonce)
+        encode_transaction = respBody['respBody']['encodedTransaction']
+
+        blockLimit = respBody['respBody']['blockLimit']
+
+        raw_result = self.weid_ecdsa_sign(privKey, encode_transaction)
+
+        weid_second = self.create_weidentity_did_second(nonce, data=respBody['respBody']['data'], blockLimit=blockLimit,
+                                                        signType=signType, signedMessage=raw_result)
+
+        return weid_second
 
     def register_authority_issuer_first(self, name, weId, nonce):
         # 注册Authority Issuer
@@ -56,23 +67,37 @@ def register_authority_issuer_first(self, name, weId, nonce):
         }
         return self.post("/weid/api/encode", data=data_dict)
 
-    def register_authority_issuer_second(self, nonce, data, signedMessage):
+    def register_authority_issuer_second(self, nonce, data, signedMessage, blockLimit, signType="1"):
         # 注册Authority Issuer
         data_dict = {
             "functionArg": {},
             "transactionArg": {
                 "nonce": nonce,
                 "data": data,
+                "blockLimit": blockLimit,
+                "signType": signType,
                 "signedMessage": signedMessage
             },
             "functionName": "registerAuthorityIssuer",
             "v": self.version
         }
         return self.post("/weid/api/transact", data=data_dict)
 
-    def register_authority_issuer(self, name, weId, nonce, data, signedMessage):
-        self.register_authority_issuer_first(name, weId, nonce)
-        return self.register_authority_issuer_second(nonce, data, signedMessage)
+    def register_authority_issuer(self, privKey, name, weId, nonce, signType="1"):
+
+        respBody = self.register_authority_issuer_first(name, weId, nonce)
+
+        encode_transaction = respBody['respBody']['encodedTransaction']
+
+        blockLimit = respBody['respBody']['blockLimit']
+
+        raw_result = self.weid_ecdsa_sign(privKey, encode_transaction)
+
+        authority_issuer_second = self.register_authority_issuer_second(nonce, data=respBody['respBody']['data'], blockLimit=blockLimit,
+                                                        signType=signType, signedMessage=raw_result)
+
+        return authority_issuer_second
+
 
     def create_cpt_first(self, weId, cptJsonSchema, cptSignature, nonce):
         # 创建CPT
@@ -90,23 +115,37 @@ def create_cpt_first(self, weId, cptJsonSchema, cptSignature, nonce):
         }
         return self.post("/weid/api/encode", data=data_dict)
 
-    def create_cpt_second(self, nonce, data, signedMessage):
+    def create_cpt_second(self, nonce, data, signedMessage, blockLimit, signType="1"):
         # 创建CPT
         data_dict = {
             "functionArg": {},
             "transactionArg": {
                 "nonce": nonce,
                 "data": data,
+                "blockLimit": blockLimit,
+                "signType": signType,
                 "signedMessage": signedMessage
             },
             "functionName": "registerCpt",
             "v": self.version
         }
         return self.post("/weid/api/transact", data=data_dict)
 
-    def create_cpt(self, name, weId, nonce, data, signedMessage):
-        self.register_authority_issuer_first(name, weId, nonce)
-        return self.register_authority_issuer_second(nonce, data, signedMessage)
+    def create_cpt(self, privKey, weId, cptJsonSchema, cptSignature, nonce, signType="1"):
+
+        respBody = self.create_cpt_first(weId, cptJsonSchema, cptSignature, nonce)
+
+        encode_transaction = respBody['respBody']['encodedTransaction']
+
+        blockLimit = respBody['respBody']['blockLimit']
+
+        raw_result = self.weid_ecdsa_sign(privKey, encode_transaction)
+
+        cpt_second = self.create_cpt_second(nonce, data=respBody['respBody']['data'], blockLimit=blockLimit,
+                                                        signType=signType, signedMessage=raw_result)
+
+        return cpt_second
+
 
     def create_credential_pojo(self, cptId, issuer_weid, expirationDate, claim):
         # 创建CredentialPojo

setup.py

@@ -0,0 +1,20 @@
+from setuptools import find_packages, setup
+
+with open("README.md", "r", encoding="utf-8") as fh:
+    long_description = fh.read()
+
+setup(
+    name='pyweidentity',
+    version='1.0',
+    author="99Kies",
+    author_email='[email protected]',
+    url="https://github.com/SUIBE-Blockchain/Weidentity-Python-SDK",
+    packages=find_packages(),
+    long_description=long_description,
+    long_description_content_type="text/markdown",
+    classifiers=[
+        "Programming Language :: Python :: 3",
+        "License :: OSI Approved :: Apache Software License",
+        "Operating System :: OS Independent",
+    ],
+)

tests/test.py

@@ -0,0 +1,23 @@
+# from pyweidentity.weidentityClient import weidentityClient
+# import random
+#
+# URL = "http://192.168.80.144:6001"
+# # WeIdentity RestService URL
+#
+# weid = weidentityClient(URL)
+# privKey = "0xc4a116fb87ae9b8b87842b0f46e1bbf71c37fdae1104fd6d3fd2041e23c6c68e"
+# nonce = str(random.randint(1, 999999999999999999999999999999))
+# create_weid = weid.create_weidentity_did(privKey, nonce)
+# print(create_weid)
+
+
+# from pyweidentity.weidentityService import weidentityService
+#
+# URL = "http://192.168.80.144:6001"
+# # WeIdentity RestService URL
+#
+# weid = weidentityService(URL)
+# create_weid = weid.create_weidentity_did()
+# print(create_weid)
+
+# {'respBody': 'did:weid:1:0x3a08be5b858bbd765a7a914a7d50be31558dd00f', 'loopback': None, 'errorCode': 0, 'errorMessage': 'success'}