shadowPaySDK 0.2.0.10__tar.gz → 0.2.0.11__tar.gz

{shadowpaysdk-0.2.0.10 → shadowpaysdk-0.2.0.11}/PKG-INFO

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

{shadowpaysdk-0.2.0.10 → shadowpaysdk-0.2.0.11}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='shadowPaySDK',
-    version='0.2.0.10',
+    version='0.2.0.11',
     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.10 → shadowpaysdk-0.2.0.11}/shadowPaySDK/types/EVMcheque.py

@@ -7,13 +7,14 @@ import httpx
 
 
 class Cheque:
-    def __init__(self, w3:Optional[Web3] = None,private_key:Optional[str] = None, ABI = __SHADOWPAY_ABI__ERC20__, allowed_chains = __ALLOW_CHAINS__, retunrn_build_tx:bool = False):
+    def __init__(self, w3:Optional[Web3] = None,private_key:Optional[str] = None, ABI = __SHADOWPAY_ABI__ERC20__, allowed_chains = __ALLOW_CHAINS__, retunrn_build_tx:bool = False,address:Optional[str] = None):
         self.w3 = w3
 
         self.amount = None
         self.token = None
         self.private_key = private_key
         self.ABI = ABI
+        self.address = address
         self.return_build_tx = retunrn_build_tx
         self.allowed_chains = allowed_chains
         if self.w3 != None:
@@ -47,7 +48,7 @@ class Cheque:
             return contract
         raise ValueError(f"Chain {chain_id} is not supported. Supported chains are: {list(__SHADOWPAY_CONTRACT_ADDRESS__ERC20__.keys())}")    
         
-    def set_parameters(self,chain_id: Optional[str] = None, w3:Optional[Web3] = None, amount:Optional[int]  = None, private_key:Optional[str] = None, token:Optional[str] = None):
+    def set_parameters(self,chain_id: Optional[str] = None, w3:Optional[Web3] = None, amount:Optional[int]  = None, private_key:Optional[str] = None, token:Optional[str] = None,address:Optional[str] = None):
         if  w3:
             self.w3 = w3
             self.get_contract_for_chain(chain_id=chain_id or self.w3.eth.chain_id)
@@ -57,6 +58,9 @@ class Cheque:
             self.private_key = private_key
         if token:
             self.token = token
+        if address:
+            self.address = address
+
     def __convert__(self):
         return self.w3.to_wei(self.amount, 'ether')
 
@@ -71,10 +75,10 @@ class Cheque:
             'gasPrice': self.w3.eth.gas_price
         })
         txn = self.contract.functions.InitCheque(receiver).build_transaction({
-            'from': self.w3.eth.account.from_key(private_key or self.private_key).address,
+            'from': self.w3.eth.account.from_key(private_key or self.private_key).address or self.address,
             'value': self.w3.to_wei(amount, 'ether'),
             'nonce': self.w3.eth.get_transaction_count(
-                self.w3.eth.account.from_key(private_key or self.private_key).address
+                self.w3.eth.account.from_key(private_key or self.private_key).address or self.address
             ),
             'gas': estimated_gas,
             'gasPrice': self.w3.eth.gas_price,
@@ -114,7 +118,7 @@ class Cheque:
 
             
         account = self.w3.eth.account.from_key(private_key)
-        sender_address = account.address
+        sender_address = account.address or self.address
 
 
         nonce = self.w3.eth.get_transaction_count(sender_address)
@@ -203,14 +207,14 @@ class Cheque:
         estimated_gas = self.contract.functions.CashOutTokenCheque(
             Web3.to_bytes(hexstr=cheque_id)  
         ).estimate_gas({
-            'from': account.address,
+            'from': account.address or self.address,
             'gasPrice': self.w3.eth.gas_price
         })
         txn = self.contract.functions.CashOutTokenCheque(
             Web3.to_bytes(hexstr=cheque_id)  
         ).build_transaction({
-            'from': account.address,
-            'nonce': self.w3.eth.get_transaction_count(account.address),
+            'from': account.address or self.address,
+            'nonce': self.w3.eth.get_transaction_count(account.address or self.address),
             'gas': estimated_gas,
             'gasPrice': self.w3.eth.gas_price,
         })

{shadowpaysdk-0.2.0.10 → shadowpaysdk-0.2.0.11}/shadowPaySDK.egg-info/PKG-INFO

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