shadowPaySDK 0.2.0.2__py3-none-any.whl → 0.2.0.3__py3-none-any.whl

shadowPaySDK/interface/erc20.py

@@ -30,10 +30,9 @@ class ERC20Token:
     def gen_wallet(self) -> str:
         account = self.web3.eth.account.create()
         return account
-    def get_decimals(self, token) -> int:
+    def get_decimals(self) -> int:
         self._ensure_contract()
-        if token:
-            self.set_params(token_address=token)
+
         return self.contract.functions.decimals().call()
 
     def get_symbol(self) -> str:
@@ -51,7 +50,7 @@ class ERC20Token:
             Web3.to_checksum_address(owner),
             Web3.to_checksum_address(spender)
         ).call()
-        return raw / (10 ** self.get_decimals(token))
+        return raw / (10 ** self.get_decimals())
 
     def ensure_allowance(self, private_key: str, spender: str, amount, token) -> Union[bool, str]:
         self._ensure_contract()

shadowPaySDK/types/EVMcheque.py

@@ -112,42 +112,42 @@ class Cheque:
         sender_address = account.address
 
 
-        # подготовка транзакции
-        nonce = self.eth.get_transaction_count(sender_address)
+        nonce = self.w3.eth.get_transaction_count(sender_address)
 
         txn = self.contract.functions.CashOutCheque(
             Web3.to_bytes(hexstr=cheque_id)).build_transaction({
             'from': sender_address,
             'nonce': nonce,
-            'gas': 300_000,  # пример
+            'gas': 300_000,
             'gasPrice': self.w3.to_wei('5', 'gwei'),
         })
 
-        # подписываем
         signed_txn = self.w3.eth.account.sign_transaction(txn, private_key=private_key)
 
-        # отправляем
+
         tx_hash = self.w3.eth.send_raw_transaction(signed_txn.raw_transaction)
 
-        print(f"⏳ Transaction sent: {tx_hash.hex()}")
         receipt = self.w3.eth.wait_for_transaction_receipt(tx_hash)
-        print(f"✅ Transaction confirmed in block {receipt.blockNumber}")
         if receipt.status != 1:
             return False
-        return receipt    
+        return {
+            "hash": tx_hash.hex()
+        }    
 
     async def InitTokenCheque(self, token_address:str, amount, reciver:str, private_key:Optional[str] = None):
         
         
         erc20 = shadowPaySDK.ERC20Token(w3=self.w3)
         erc20.set_params(token_address=token_address)
-        ensure_allowance = erc20.ensure_allowance(
+        decimals = erc20.get_decimals(
+            token_address
+        )
+        erc20.ensure_allowance(
             private_key=self.private_key, 
             spender=self.contract.address, 
-            amount=amount
+            amount=amount,
+            token=token_address
         )
-        print(f"Ensure allowance: {ensure_allowance}")
-        decimals = erc20.get_decimals()
         estimated_gas = self.contract.functions.InitTokenCheque(
             Web3.to_checksum_address(token_address),
             int(amount * (10 ** decimals)),
@@ -190,9 +190,8 @@ class Cheque:
         
 
         
-        # Строим транзакцию
         estimated_gas = self.contract.functions.CashOutTokenCheque(
-            Web3.to_bytes(hexstr=cheque_id)  # Преобразуем строку в bytes32
+            Web3.to_bytes(hexstr=cheque_id)  
         ).estimate_gas({
             'from': account.address,
             'gasPrice': self.w3.eth.gas_price
@@ -206,11 +205,9 @@ class Cheque:
             'gasPrice': self.w3.eth.gas_price,
         })
 
-        # Подписываем и отправляем транзакцию
         signed_txn = self.w3.eth.account.sign_transaction(txn, private_key=private_key)
         tx_hash = self.w3.eth.send_raw_transaction(signed_txn.raw_transaction)
 
-        # Получаем подтверждение
         receipt = self.w3.eth.wait_for_transaction_receipt(tx_hash)
 
         if receipt.status != 1:
@@ -223,13 +220,12 @@ class Cheque:
         
         erc20 = shadowPaySDK.ERC20Token(w3=self.w3)
         erc20.set_params(token_address=token_in)
-        ensure_allowance = erc20.approve(
+        approve = erc20.approve(
             private_key=self.private_key, 
             spender=self.contract.address, 
             amount=amount_in,
             token=token_in
         )
-        print(f"Ensure allowance: {ensure_allowance}")
         decimals = erc20.get_decimals(token_in)
         token_out_decinals = erc20.get_decimals(token_out)
         estimated_gas = self.contract.functions.InitSwapCheque(

{shadowpaysdk-0.2.0.2.dist-info → shadowpaysdk-0.2.0.3.dist-info}/METADATA

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

{shadowpaysdk-0.2.0.2.dist-info → shadowpaysdk-0.2.0.3.dist-info}/RECORD

@@ -2,16 +2,16 @@ shadowPaySDK/__init__.py,sha256=lV_L5SuQMPAt5XDkeZScJqLo43gtP-pNbsuErOSNOVw,727
 shadowPaySDK/api.py,sha256=cv5Z171cOh-Idi-lMA4AORzeGDPPrk8BCQ9e5V9MAaM,1461
 shadowPaySDK/const.py,sha256=T7TJPKFLqCtxwpUYO1AOryGMr65G-vVuotxfL8gWcME,9898
 shadowPaySDK/interface/__init__.py,sha256=QceU3dWteSgwvMnR3JDVdmS8OgdRPjvl9JzRs7IsA74,152
-shadowPaySDK/interface/erc20.py,sha256=UpmO8OVkXS5zUPB002KT2bbsuTO8GwGTlusw1aTYNtg,4444
+shadowPaySDK/interface/erc20.py,sha256=2U-1Kp13D4wcl4WucgI0X8ujBu7hWx9nuQsRzqqn2ZY,4366
 shadowPaySDK/interface/erc721.py,sha256=4AlWfDjrvl85wFocnN93j-oM54kTsLLwv9SdtcLj4eM,3094
 shadowPaySDK/interface/sol.py,sha256=xgJZsg4xE-_dRctGUW_mHuGj_o_0OlKNp4Gr7IXvTEc,5586
-shadowPaySDK/types/EVMcheque.py,sha256=7GXS0oPG6xIDLz-Uuzkub-Uv0oLbOeVFLiVtFflcUgc,12514
+shadowPaySDK/types/EVMcheque.py,sha256=S1ZioFeRisSvw42LYaA3_uWEqaTqz6jIxf45EFVrrnQ,11999
 shadowPaySDK/types/SOLcheque.py,sha256=gmivsCK4hm_6pzQ9whPGuQ_f7qfcUfiJfQgb5ZsJYDo,884
 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.2.dist-info/licenses/LICENSE,sha256=EG13vNmyBfkG3oKj40oOYfUGLKko8OouU6PfO6MlAk4,1066
-shadowpaysdk-0.2.0.2.dist-info/METADATA,sha256=GkNvFIwdkxvr9CWQNVyzYgd2Q-aNzU9OwiitCGY5MSE,839
-shadowpaysdk-0.2.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-shadowpaysdk-0.2.0.2.dist-info/top_level.txt,sha256=RSJc73GEf31NMdZp9KovEduzfhm10eQ2t5GTZ44aN1U,13
-shadowpaysdk-0.2.0.2.dist-info/RECORD,,
+shadowpaysdk-0.2.0.3.dist-info/licenses/LICENSE,sha256=EG13vNmyBfkG3oKj40oOYfUGLKko8OouU6PfO6MlAk4,1066
+shadowpaysdk-0.2.0.3.dist-info/METADATA,sha256=g1KOjBBVHg1QRtpPfAxj03UsNvGgdUnNVFnuExd6O58,839
+shadowpaysdk-0.2.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+shadowpaysdk-0.2.0.3.dist-info/top_level.txt,sha256=RSJc73GEf31NMdZp9KovEduzfhm10eQ2t5GTZ44aN1U,13
+shadowpaysdk-0.2.0.3.dist-info/RECORD,,