Merge pull request #25 from Safeheron/dev

Added Query Wallet Account by Address and Retrieve a Single Web3 Wallet Account interfaces

Author: xigaoku

safeheron_api_sdk_python/api/account_api.py

@@ -36,7 +36,10 @@ def __init__(self):
         # Merchant unique business ID (100 characters max)
         self.customerRefId = None
 
-
+class OneAccountByAddressRequest:
+    def __init__(self):
+        # The wallet address. Note: Wallet addresses for the TRON, Solana, and TON networks are case-sensitive, while other networks are case-insensitive
+        self.address = None
 
 class CreateAccountRequest:
     def __init__(self):
@@ -206,6 +209,10 @@ def list_accounts(self, request: ListAccountRequest):
     def one_accounts(self, request: OneAccountRequest):
         return self.api_client.send_request(request, '/v1/account/one')
 
+    # Query Wallet Account by Address
+    def get_account_by_address(self, request: OneAccountByAddressRequest):
+        return self.api_client.send_request(request, '/v1/account/getByAddress')
+
     # Create a new wallet account.
     def create_account(self, request: CreateAccountRequest):
         return self.api_client.send_request(request, '/v1/account/create')

safeheron_api_sdk_python/api/web3_api.py

@@ -41,6 +41,12 @@ def __init__(self):
         # Merchant unique business ID (100 characters max)
         self.customerRefId = None
 
+class OneWeb3AccountRequest:
+    def __init__(self):
+        # Account Key, the only account identifier。The Account Key, which is the unique identifier for the account. Cannot be empty at the same time as the customerRefId parameter. If both are provided, the accountKey parameter will take precedence.
+        self.accountKey = None
+        # Merchant unique business ID (100 characters max)
+        self.customerRefId = None
 
 class CreateWeb3EthSignRequest:
     def __init__(self):
@@ -239,6 +245,11 @@ def batchCreateWeb3Account(self, request: BatchCreateWeb3AccountRequest):
     def listWeb3Accounts(self, request: ListWeb3AccountRequest):
         return self.api_client.send_request(request, '/v1/web3/account/list')
 
+    # List Web3 Wallet Accounts
+    # Filter Web3 wallet account lists by various conditions.
+    def oneWeb3Account(self, request: OneWeb3AccountRequest):
+        return self.api_client.send_request(request, '/v1/web3/account/one')
+
     # Create ethSign
     # Merchants can initiate an ethSign signature through this interface. The merchant is required to serialize the transaction data, generating a corresponding hash (supporting both 0x and non-0x formatted data). The hash is then submitted through this interface to create a signature, which can be obtained by Retrieve a Single Web3 Signature interface or webhook. From there, merchants can complete the subsequent steps according to their own needs once they have obtained the signature.
     def createWeb3EthSign(self, request: CreateWeb3EthSignRequest):

safeheron_api_sdk_python/tools.py

@@ -62,11 +62,8 @@ def aes_encrypt(key: bytes, iv: bytes, message: bytes):
 
 def aes_gcm_encrypt(key: bytes, iv: bytes, message: bytes):
     check_key_and_iv(key, iv)
-    try:
-        cipher = AES.new(key, AES.MODE_GCM, iv)
-        cipher_text, tag = cipher.encrypt_and_digest(message)
-    except Exception as e:
-        raise Exception("aes encrypt error: %s" % e)
+    cipher = AES.new(key, AES.MODE_GCM, iv)
+    cipher_text, tag = cipher.encrypt_and_digest(message)
     return cipher_text + tag
 
 
@@ -82,12 +79,14 @@ def aes_decrypt(key: bytes, iv: bytes, encrypt_text: bytes):
 
 def aes_gcm_decrypt(key: bytes, iv: bytes, encrypt_text: bytes):
     check_key_and_iv(key, iv)
+    if len(encrypt_text) < 16:
+        raise Exception("aes decrypt error: invalid ciphertext")
+    ciphertext, tag = encrypt_text[:-16], encrypt_text[-16:]
+    cipher = AES.new(key, AES.MODE_GCM, iv)
     try:
-        cipher = AES.new(key, AES.MODE_GCM, iv)
-        pad_text = cipher.decrypt(encrypt_text)
-    except Exception as e:
-        raise Exception("aes decrypt error: %s" % e)
-    return pad_text[0:len(pad_text)-len(iv)]
+        return cipher.decrypt_and_verify(ciphertext, tag)
+    except ValueError as exc:
+        raise Exception("aes decrypt error: tag verification failed") from exc
 
 
 def get_rsa_key(key_pem, passphrase=None):

setup.py

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