shadowPaySDK 0.2.0.14__tar.gz → 0.2.0.16__tar.gz

{shadowpaysdk-0.2.0.14 → shadowpaysdk-0.2.0.16}/PKG-INFO

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

{shadowpaysdk-0.2.0.14 → shadowpaysdk-0.2.0.16}/setup.py

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

@@ -6,7 +6,7 @@ from shadowPaySDK.const import __ERC20_ABI__
 
 
 class ERC20Token:
-    def __init__(self,  w3:Web3, explorer: Optional[str] = None):
+    def __init__(self,  w3: Optional[Web3] = None, explorer: Optional[str] = None):
         self.web3 = w3
         self.explorer = explorer
 
@@ -87,9 +87,19 @@ 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) -> str:
+    def approve(self,  spender: str, amount: float,address:Optional[str] = None,  private_key: Optional[str] = None, build_tx: bool = False) -> str:
+        
         self._ensure_contract()
-        account = self.web3.eth.account.from_key(private_key)
+        key = private_key
+
+        if key:
+            address = Web3.to_checksum_address(self.web3.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")
+
         decimals = self.get_decimals()
         amount = int(amount * (10 ** decimals))
         
@@ -97,14 +107,16 @@ class ERC20Token:
             Web3.to_checksum_address(spender),
             amount
         ).build_transaction({
-            'from': account.address,
-            'nonce': self.web3.eth.get_transaction_count(account.address),
+            'from': address,
+            'nonce': self.web3.eth.get_transaction_count(address),
             'gas': 60000,
             
             'gasPrice': self.web3.eth.gas_price,
         })
+        if build_tx:
+            return txn
 
-        signed = self.web3.eth.account.sign_transaction(txn, private_key)
+        signed = self.web3.eth.account.sign_transaction(txn, key)
         tx_hash = self.web3.eth.send_raw_transaction(signed.raw_transaction)
         tx_receipt = self.web3.eth.wait_for_transaction_receipt(tx_hash)
         if tx_receipt.status != 1:

{shadowpaysdk-0.2.0.14 → shadowpaysdk-0.2.0.16}/shadowPaySDK/types/EVMcheque.py

@@ -21,6 +21,13 @@ class Cheque:
             self.__allow__()
     
     def __get__id(self, tx):
+        if isinstance(tx, str):
+            try:
+                tx = self.w3.eth.get_transaction_receipt(tx)
+            except Exception as e:
+                print(f"Failed to get transaction receipt: {str(e)}")
+                return False
+
         try:
             logs = self.contract.events.ChequeCreated().process_receipt(tx)
             cheque_id = logs[0]["args"]["id"]

{shadowpaysdk-0.2.0.14 → shadowpaysdk-0.2.0.16}/shadowPaySDK.egg-info/PKG-INFO

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