shadowPaySDK 0.2.0.3__tar.gz → 0.2.0.5__tar.gz

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

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

{shadowpaysdk-0.2.0.3 → shadowpaysdk-0.2.0.5}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='shadowPaySDK',
-    version='0.2.0.3',
+    version='0.2.0.5',
     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.3 → shadowpaysdk-0.2.0.5}/shadowPaySDK/interface/erc20.py

@@ -9,6 +9,7 @@ class ERC20Token:
     def __init__(self,  w3:Web3, explorer: Optional[str] = None):
         self.web3 = w3
         self.explorer = explorer
+
         self.address = None
         self.contract = None
 
@@ -21,7 +22,7 @@ class ERC20Token:
 
     def _ensure_contract(self):
         if not self.contract:
-            raise ValueError("Token address is not set. Use set_token(token_address) first.")
+            raise ValueError("Token address is not set. Use set_params first.")
 
     def _format_tx(self, tx_hash: str) -> str:
         if self.explorer:
@@ -44,7 +45,7 @@ class ERC20Token:
         raw = self.contract.functions.balanceOf(Web3.to_checksum_address(wallet_address)).call()
         return raw / (10 ** self.get_decimals())
 
-    def allowance(self, owner: str, spender: str, token) -> float:
+    def allowance(self, owner: str, spender: str) -> float:
         self._ensure_contract()
         raw = self.contract.functions.allowance(
             Web3.to_checksum_address(owner),
@@ -52,13 +53,13 @@ class ERC20Token:
         ).call()
         return raw / (10 ** self.get_decimals())
 
-    def ensure_allowance(self, private_key: str, spender: str, amount, token) -> Union[bool, str]:
+    def ensure_allowance(self, private_key: str, spender: str, amount) -> Union[bool, str]:
         self._ensure_contract()
         account = self.web3.eth.account.from_key(private_key)
-        current = self.allowance(account.address, spender, token)
+        current = self.allowance(account.address, spender)
         if current == amount:
             return True
-        return self.approve(private_key, spender, amount, token)
+        return self.approve(private_key, spender, amount)
 
     def transfer(self, private_key: str, to: str, amount: float) -> str:
         self._ensure_contract()
@@ -86,10 +87,10 @@ class ERC20Token:
         tx_hash = self.web3.eth.send_raw_transaction(signed.raw_transaction)
         return self._format_tx(self.web3.to_hex(tx_hash))
 
-    def approve(self, private_key: str, spender: str, amount: float, token) -> str:
+    def approve(self, private_key: str, spender: str, amount: float) -> str:
         self._ensure_contract()
         account = self.web3.eth.account.from_key(private_key)
-        decimals = self.get_decimals(token=token)
+        decimals = self.get_decimals()
         amount = int(amount * (10 ** decimals))
         
         txn = self.contract.functions.approve(
@@ -108,5 +109,5 @@ class ERC20Token:
         tx_receipt = self.web3.eth.wait_for_transaction_receipt(tx_hash)
         if tx_receipt.status != 1:
             raise ValueError(f"aaprove fail.\n {self._format_tx(self.web3.to_hex(tx_hash))}")
-        return f"approve: {self._format_tx(self.web3.to_hex(tx_hash))}"
+        return f"{self._format_tx(self.web3.to_hex(tx_hash))}"
 

{shadowpaysdk-0.2.0.3 → shadowpaysdk-0.2.0.5}/shadowPaySDK/types/EVMcheque.py

@@ -139,14 +139,11 @@ class Cheque:
         
         erc20 = shadowPaySDK.ERC20Token(w3=self.w3)
         erc20.set_params(token_address=token_address)
-        decimals = erc20.get_decimals(
-            token_address
-        )
+        decimals = erc20.get_decimals()
         erc20.ensure_allowance(
             private_key=self.private_key, 
             spender=self.contract.address, 
             amount=amount,
-            token=token_address
         )
         estimated_gas = self.contract.functions.InitTokenCheque(
             Web3.to_checksum_address(token_address),
@@ -224,10 +221,10 @@ class Cheque:
             private_key=self.private_key, 
             spender=self.contract.address, 
             amount=amount_in,
-            token=token_in
         )
-        decimals = erc20.get_decimals(token_in)
-        token_out_decinals = erc20.get_decimals(token_out)
+        decimals = erc20.get_decimals()
+        erc20.set_params(token_address=token_out)
+        token_out_decinals = erc20.get_decimals()
         estimated_gas = self.contract.functions.InitSwapCheque(
             Web3.to_checksum_address(reciver),
             Web3.to_checksum_address(token_in),

{shadowpaysdk-0.2.0.3 → shadowpaysdk-0.2.0.5}/shadowPaySDK.egg-info/PKG-INFO

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