shadowPaySDK 0.2.0.16__py3-none-any.whl → 0.2.0.18__py3-none-any.whl

shadowPaySDK/const.py

@@ -30,7 +30,7 @@ __ERC20_ABI__ = json.loads("""[
 ]""")
 
 __SHADOWPAY_CONTRACT_ADDRESS__ERC20__ = {
-    97: "0x17a82E53a3b3f2acA7ceae8CA6B6b3B8F14e4441"
+    97: "0x5487C0DdCbD5465F26B446c6CAB88D8d6F7DF23b"
   }
 
 __SHADOWPAY_ABI__ERC20__= json.loads("""[

shadowPaySDK/types/EVMcheque.py

@@ -20,7 +20,7 @@ class Cheque:
         if self.w3 != None:
             self.__allow__()
     
-    def __get__id(self, tx):
+    def get_id(self, tx):
         if isinstance(tx, str):
             try:
                 tx = self.w3.eth.get_transaction_receipt(tx)
@@ -111,11 +111,11 @@ class Cheque:
                 "build_tx": txn
             }
         
-        signed_txn = self.w3.eth.account.sign_transaction(txn, private_key or self.private_key)
+        signed_txn = self.w3.eth.account.sign_transaction(txn, key)
         txn_hash = self.w3.eth.send_raw_transaction(signed_txn.raw_transaction)
         txn_receipt = self.w3.eth.wait_for_transaction_receipt(txn_hash)
         insert_to_dn = None
-        logs = self.__get__id(txn_receipt)
+        logs = self.get_id(txn_receipt)
         if logs:
             cheque_id = logs
         else:
@@ -170,22 +170,33 @@ class Cheque:
         }    
 
     async def InitTokenCheque(self, token_address:str, amount, reciver:str, private_key:Optional[str] = None):
+        key = private_key or self.private_key
+
+        if key:
+            address = Web3.to_checksum_address(self.w3.eth.account.from_key(key).address)
         
+        elif self.address:
+            address = Web3.to_checksum_address(self.address)
+        else:
+            raise ValueError("No private key or address provided")
+
+
+
+
         
         erc20 = shadowPaySDK.ERC20Token(w3=self.w3)
         erc20.set_params(token_address=token_address)
         decimals = erc20.get_decimals()
-        erc20.ensure_allowance(
-            private_key=self.private_key, 
+        erc20.allowance( 
             spender=self.contract.address, 
-            amount=amount,
+            owner=address,
         )
         estimated_gas = self.contract.functions.InitTokenCheque(
             Web3.to_checksum_address(token_address),
             int(amount * (10 ** decimals)),
             Web3.to_checksum_address(reciver)
         ).estimate_gas({
-            'from': self.w3.eth.account.from_key(self.private_key).address,
+            'from': address,
             'gasPrice': self.w3.eth.gas_price
         })
         txn = self.contract.functions.InitTokenCheque(
@@ -193,8 +204,8 @@ class Cheque:
             int(amount * (10 ** decimals)),
             Web3.to_checksum_address(reciver)
         ).build_transaction({
-            'from': self.w3.eth.account.from_key(self.private_key).address,
-            'nonce': self.w3.eth.get_transaction_count(self.w3.eth.account.from_key(self.private_key).address),
+            'from': address,
+            'nonce': self.w3.eth.get_transaction_count(address),
             'gas': estimated_gas,
             'gasPrice': self.w3.eth.gas_price
         })
@@ -202,11 +213,11 @@ class Cheque:
             return {
                 "build_tx": txn
             }
-        signed_txn = self.w3.eth.account.sign_transaction(txn, self.private_key)
+        signed_txn = self.w3.eth.account.sign_transaction(txn, key)
         txn_hash = self.w3.eth.send_raw_transaction(signed_txn.raw_transaction)
         txn_receipt = self.w3.eth.wait_for_transaction_receipt(txn_hash)
         
-        logs = self.__get__id(txn_receipt)
+        logs = self.get_id(txn_receipt)
         if logs:
             cheque_id = logs
         else:
@@ -257,10 +268,14 @@ class Cheque:
             "status": receipt.status  # 1 = success, 0 = fail
         }
     async def InitTokenChequeSwap(self, token_in:str, amount_in,token_out:str, amount_out, reciver:str, private_key:Optional[str] = None):
-        
+        key = private_key or self.private_key
+        if key:
+            address = Web3.to_checksum_address(self.w3.eth.account.from_key(key).address)
+        elif self.address:
+            address = Web3.to_checksum_address(self.address)
         erc20 = shadowPaySDK.ERC20Token(w3=self.w3)
         erc20.set_params(token_address=token_in)
-        approve = erc20.approve(
+        approve = erc20.allowance(
             private_key=self.private_key, 
             spender=self.contract.address, 
             amount=amount_in,
@@ -298,7 +313,7 @@ class Cheque:
         txn_hash = self.w3.eth.send_raw_transaction(signed_txn.raw_transaction)
         txn_receipt = self.w3.eth.wait_for_transaction_receipt(txn_hash)
         
-        logs = self.__get__id(txn_receipt)
+        logs = self.get_id(txn_receipt)
         if logs:
             cheque_id = logs
         else:

{shadowpaysdk-0.2.0.16.dist-info → shadowpaysdk-0.2.0.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shadowPaySDK
-Version: 0.2.0.16
+Version: 0.2.0.18
 Summary: ShadowPay SDK for ERC20/ERC721 and P2P smart contract interaction
 Author: dazarius_
 Author-email: your@email.com

{shadowpaysdk-0.2.0.16.dist-info → shadowpaysdk-0.2.0.18.dist-info}/RECORD

@@ -1,17 +1,17 @@
 shadowPaySDK/__init__.py,sha256=CMwAuP_6hJN-WueU-XlTNta9Oyd28sFo8OojdgD_pxA,681
 shadowPaySDK/api.py,sha256=cv5Z171cOh-Idi-lMA4AORzeGDPPrk8BCQ9e5V9MAaM,1461
-shadowPaySDK/const.py,sha256=T7TJPKFLqCtxwpUYO1AOryGMr65G-vVuotxfL8gWcME,9898
+shadowPaySDK/const.py,sha256=uUkzYTm-12iK3IsnQICnoT9tpmZ9aYh3pqXbSd-GNh8,9898
 shadowPaySDK/interface/__init__.py,sha256=ggSZCV22udnzXm_Wv_3x6VN3hNIAEiwgwHZc2Jwc688,146
 shadowPaySDK/interface/erc20.py,sha256=7p8eU5LzhI2MsH80PZhq6IRhbfMGlNYucGl3OtyS9SI,4669
 shadowPaySDK/interface/erc721.py,sha256=4AlWfDjrvl85wFocnN93j-oM54kTsLLwv9SdtcLj4eM,3094
 shadowPaySDK/interface/sol.py,sha256=flMfmW14J4ybfVshUUTw6iklKa5x-zJzjxRi011XKXA,7230
-shadowPaySDK/types/EVMcheque.py,sha256=aomYsyQdvLMGEc3VHppVaBABQR55lQYUc0OoHgW81OE,14449
+shadowPaySDK/types/EVMcheque.py,sha256=3Nzj-61dWKWG_6lcqR1n24gVqhDb3qt-e_jZ_UceWrg,14765
 shadowPaySDK/types/SOLcheque.py,sha256=S6LnKxiWDj1KGRgFFAaHy03c7mxv4msaR-2cfVIhD2Y,818
 shadowPaySDK/types/__init__.py,sha256=sG6pNZfKGvENXqsnv6MrQtKrJ898fAXkMvAZY1k1-Qg,97
 shadowPaySDK/utils/__init__.py,sha256=aja3iYO4rT-ptMM-pzw0GRFTziBdXdcEi-4kE84zH64,61
 shadowPaySDK/utils/utils.py,sha256=g4bGvLDdjhNGsAj1eaZnNWFNaiN-cVhhM-5PrnG5aIQ,720
-shadowpaysdk-0.2.0.16.dist-info/licenses/LICENSE,sha256=EG13vNmyBfkG3oKj40oOYfUGLKko8OouU6PfO6MlAk4,1066
-shadowpaysdk-0.2.0.16.dist-info/METADATA,sha256=_ejaWKCyHhZz8tQ7X99KuAMjjbo8CbY0f8z_GREBoGo,840
-shadowpaysdk-0.2.0.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-shadowpaysdk-0.2.0.16.dist-info/top_level.txt,sha256=RSJc73GEf31NMdZp9KovEduzfhm10eQ2t5GTZ44aN1U,13
-shadowpaysdk-0.2.0.16.dist-info/RECORD,,
+shadowpaysdk-0.2.0.18.dist-info/licenses/LICENSE,sha256=EG13vNmyBfkG3oKj40oOYfUGLKko8OouU6PfO6MlAk4,1066
+shadowpaysdk-0.2.0.18.dist-info/METADATA,sha256=7n5ROtuI7gEUvNAHnlkQKxtux-owZebiyzFWjTKV6x8,840
+shadowpaysdk-0.2.0.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+shadowpaysdk-0.2.0.18.dist-info/top_level.txt,sha256=RSJc73GEf31NMdZp9KovEduzfhm10eQ2t5GTZ44aN1U,13
+shadowpaysdk-0.2.0.18.dist-info/RECORD,,