safeheron-api-sdk-python 1.1.4__tar.gz → 1.1.6__tar.gz

{safeheron_api_sdk_python-1.1.4/safeheron_api_sdk_python.egg-info → safeheron_api_sdk_python-1.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: safeheron_api_sdk_python
-Version: 1.1.4
+Version: 1.1.6
 Summary: Python for Safeheron API
 Home-page: https://github.com/Safeheron/safeheron-api-sdk-python
 Author: safeheron

{safeheron_api_sdk_python-1.1.4 → safeheron_api_sdk_python-1.1.6}/README.md

@@ -27,7 +27,7 @@ from safeheron_api_sdk_python.api.account_api import *
             'privateKeyPemFile': './my_private.pem',
             'safeheronPublicKey': 'MIICIjANBgkqhkiG9w0***********+zSdC+8eBdZyI7nMdPIj6xOhUCAwEAAQ==',
             'baseUrl': 'https://api.safeheron.vip',
-            'RequestTimeout': 10000
+            'RequestTimeout': 20000
   }
     ```
 * Call `create_account` api with `config`
@@ -56,8 +56,8 @@ from safeheron_api_sdk_python.api.account_api import *
     safeheronPublicKey: MIICI****QuTOTECAwEAAQ==
     # Safeheron API url
     baseUrl: https://api.safeheron.vip
-    # RequestTimeout (Millisecond), Default: 10000
-    requestTimeout: 10000
+    # RequestTimeout (Millisecond), Default: 20000
+    requestTimeout: 20000
     ```
 * Copy config to `config.yaml` file.
     ```bash
@@ -81,8 +81,8 @@ from safeheron_api_sdk_python.api.account_api import *
     safeheronPublicKey: MIICI****QuTOTECAwEAAQ==
     # Safeheron API url
     baseUrl: https://api.safeheron.vip
-    # RequestTimeout (Millisecond), Default: 10000
-    requestTimeout: 10000
+    # RequestTimeout (Millisecond), Default: 20000
+    requestTimeout: 20000
     # Wallet Account key
     accountKey: account****5ecad40
     # To address
@@ -111,8 +111,8 @@ from safeheron_api_sdk_python.api.account_api import *
     safeheronPublicKey: MIICI****QuTOTECAwEAAQ==
     # Safeheron API url
     baseUrl: https://api.safeheron.vip
-    # RequestTimeout (Millisecond), Default: 10000
-    requestTimeout: 10000
+    # RequestTimeout (Millisecond), Default: 20000
+    requestTimeout: 20000
     # Wallet Account key
     accountKey: account****5ecad40
     # Goerli testnet token address in wallet account

{safeheron_api_sdk_python-1.1.4 → safeheron_api_sdk_python-1.1.6}/safeheron_api_sdk_python/api/account_api.py

@@ -71,7 +71,7 @@ class UpdateAccountShowStateRequest:
 class BatchUpdateAccountTagRequest:
     def __init__(self):
         # Wallet account key
-        self.accountKey = None
+        self.accountKeyList = None
         # Account tag
         self.accountTag = None
 

{safeheron_api_sdk_python-1.1.4 → safeheron_api_sdk_python-1.1.6}/safeheron_api_sdk_python/client.py

@@ -10,7 +10,7 @@ class Client:
         if config.get('requestTimeout'):
             self.requestTimeout = config['requestTimeout'] / 1000
         else:
-            self.requestTimeout = 10
+            self.requestTimeout = 20
         if config.get('privateKey'):
             self.use_private_key = PEM_PRIVATE_HEAD + config['privateKey'] + PEM_PRIVATE_END
         if config.get('privateKeyPemFile'):

{safeheron_api_sdk_python-1.1.4 → safeheron_api_sdk_python-1.1.6}/safeheron_api_sdk_python/cosigner/co_signer_converter.py

@@ -69,6 +69,7 @@ class CoSignerConverter:
 
         return json.loads(r.decode())
 
+    # It has been Deprecated,Please use convertCoSignerResponseWithNewCryptoType
     def response_converter(self, co_signer_response: CoSignerResponse):
         platform_rsa_pk = get_rsa_key(PEM_PUBLIC_HEAD + self.api_pub_key + PEM_PUBLIC_END)
         api_user_rsa_sk = get_rsa_key(PEM_PRIVATE_HEAD + self.biz_privKey + PEM_PRIVATE_END)
@@ -99,3 +100,35 @@ class CoSignerConverter:
         ret['sig'] = rsa_sign(api_user_rsa_sk, need_sign_message)
 
         return ret
+
+    def response_converter_with_new_crypto_type(self, co_signer_response: CoSignerResponse):
+        platform_rsa_pk = get_rsa_key(PEM_PUBLIC_HEAD + self.api_pub_key + PEM_PUBLIC_END)
+        api_user_rsa_sk = get_rsa_key(PEM_PRIVATE_HEAD + self.biz_privKey + PEM_PRIVATE_END)
+
+        ret = dict()
+
+        # prepare aes key and iv
+        aes_key = get_random_bytes(32)
+        aes_iv = get_random_bytes(16)
+        response_data = json.dumps(co_signer_response.__dict__).replace('\'', '\"').replace('\n', '').encode('utf-8')
+
+        # 1 rsa encrypt aes key + iv
+        aes_data = aes_key + aes_iv
+        ret['key'] = rsa_oaep_encrypt(platform_rsa_pk, aes_data)
+
+        # 2 aes encrypt request data
+        if response_data is not None:
+            aes_encrypted_bytes = aes_gcm_encrypt(aes_key, aes_iv, response_data)
+            ret['bizContent'] = b64encode(aes_encrypted_bytes).decode()
+
+        # 3 set timestamp
+        ret['timestamp'] = str(int(time.time() * 1000))
+        ret['code'] = str('200')
+        ret['message'] = str('SUCCESS')
+
+        # 4 sign request
+        need_sign_message = sort_request(ret)
+        ret['sig'] = rsa_sign(api_user_rsa_sk, need_sign_message)
+        ret['rsaType'] = ECB_OAEP_TYPE
+        ret['aesType'] = GCM_TYPE
+        return ret

{safeheron_api_sdk_python-1.1.4 → safeheron_api_sdk_python-1.1.6/safeheron_api_sdk_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: safeheron_api_sdk_python
-Version: 1.1.4
+Version: 1.1.6
 Summary: Python for Safeheron API
 Home-page: https://github.com/Safeheron/safeheron-api-sdk-python
 Author: safeheron

{safeheron_api_sdk_python-1.1.4 → safeheron_api_sdk_python-1.1.6}/setup.py

@@ -3,7 +3,7 @@ from setuptools import find_packages
 with open("README.rst", "r") as f:
     long_description = f.read()
 setup(name='safeheron_api_sdk_python',
-      version='1.1.4',
+      version='1.1.6',
       description='Python for Safeheron API',
       long_description=long_description,
       author='safeheron',