shadowPaySDK 0.2.0.2__tar.gz → 0.2.0.3__tar.gz

{shadowpaysdk-0.2.0.2 → shadowpaysdk-0.2.0.3}/PKG-INFO

@@ -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 → shadowpaysdk-0.2.0.3}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='shadowPaySDK',
-    version='0.2.0.2',
+    version='0.2.0.3',
     description='ShadowPay SDK for ERC20/ERC721 and P2P smart contract interaction',
     long_description=open('README.md').read(),
     long_description_content_type='text/markdown',

{shadowpaysdk-0.2.0.2 → shadowpaysdk-0.2.0.3}/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-0.2.0.2 → shadowpaysdk-0.2.0.3}/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 → shadowpaysdk-0.2.0.3}/shadowPaySDK.egg-info/PKG-INFO

@@ -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