shadowPaySDK 16.7.2025.5__tar.gz → 16.7.2025.7__tar.gz

{shadowpaysdk-16.7.2025.5 → shadowpaysdk-16.7.2025.7}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: shadowPaySDK
-Version: 16.7.2025.5
+Version: 16.7.2025.7
 Summary: ShadowPay SDK for ERC20/ERC721 and P2P smart contract interaction
-Author: dazay(aka dazarius_)
-Author-email: your@email.com
+Author: dazay
+Author-email: shadowpay.protocol@gmail.com
 License: MIT
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License

{shadowpaysdk-16.7.2025.5 → shadowpaysdk-16.7.2025.7}/setup.py

@@ -2,12 +2,12 @@ from setuptools import setup, find_packages
 
 setup(
     name='shadowPaySDK',
-    version='16.07.2025.5',
+    version='16.07.2025.7',
     description='ShadowPay SDK for ERC20/ERC721 and P2P smart contract interaction',
     long_description=open('README.md').read(),
     long_description_content_type='text/markdown',
-    author='dazay(aka dazarius_)',
-    author_email='your@email.com',
+    author='dazay',
+    author_email='shadowpay.protocol@gmail.com',
     license='MIT',
     packages=find_packages(),
     classifiers=[

{shadowpaysdk-16.7.2025.5 → shadowpaysdk-16.7.2025.7}/shadowPaySDK/interface/erc20.py

@@ -43,7 +43,7 @@ class ERC20Token:
     def get_balance(self, wallet_address: str) -> float:
         self._ensure_contract()
         raw = self.contract.functions.balanceOf(Web3.to_checksum_address(wallet_address)).call()
-        return raw / (10 ** self.get_decimals())
+        return raw 
 
     def allowance(self, owner: str, spender: str) -> float:
         self._ensure_contract()
@@ -51,7 +51,7 @@ class ERC20Token:
             Web3.to_checksum_address(owner),
             Web3.to_checksum_address(spender)
         ).call()
-        return raw / (10 ** self.get_decimals())
+        return raw 
 
     def ensure_allowance(self, private_key: str, spender: str, amount, converted_amount: bool = False) -> Union[bool, str]:
         self._ensure_contract()
@@ -64,18 +64,17 @@ class ERC20Token:
     def transfer(self, private_key: str, to: str, amount: float) -> str:
         self._ensure_contract()
         account = self.web3.eth.account.from_key(private_key)
-        decimals = self.get_decimals()
-        value = int(amount * (10 ** decimals))
+        
         estimated_gas = self.contract.functions.transfer(
             Web3.to_checksum_address(to),
-            value
+            amount
         ).estimate_gas({
             'from': account.address,
             'gasPrice': self.web3.to_wei('5', 'gwei'),
         })
         txn = self.contract.functions.transfer(
             Web3.to_checksum_address(to),
-            value
+            amount
         ).build_transaction({
             'from': account.address,
             'nonce': self.web3.eth.get_transaction_count(account.address),
@@ -99,10 +98,6 @@ class ERC20Token:
             address = Web3.to_checksum_address(self.address)
         else:
             raise ValueError("No private key or address provided")
-        if conveted_amount:
-            decimals = self.get_decimals()
-            amount = int(amount * (10 ** decimals))
-            
         txn = self.contract.functions.approve(
             Web3.to_checksum_address(spender),
             amount

{shadowpaysdk-16.7.2025.5 → shadowpaysdk-16.7.2025.7}/shadowPaySDK/interface/sol.py

@@ -118,12 +118,7 @@ class SOL:
             
 
             return token_data
-    async def is_connected(self):
-        return await self.client.is_connected()
 
-    async def close(self):
-        await self.client.close()
-    
     async def fetch_metadata_raw(self,mint_address: str):
         METADATA_PROGRAM_ID = solders.pubkey.Pubkey.from_string("metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s")
         mint = solders.pubkey.Pubkey.from_string(mint_address)

{shadowpaysdk-16.7.2025.5 → shadowpaysdk-16.7.2025.7}/shadowPaySDK/types/EVMcheque.py

@@ -1,6 +1,5 @@
 import shadowPaySDK
 from shadowPaySDK.const import __SHADOWPAY_ABI__ERC20__, __ALLOW_CHAINS__, __SHADOWPAY_CONTRACT_ADDRESS__ERC20__
-from shadowPaySDK.api import  __CREATE__CHEQUE__
 from web3 import Web3
 from typing import Optional
 import httpx
@@ -36,6 +35,7 @@ class Cheque:
             print(f"Failed to get cheque ID from transaction receipt: {str(e)}")
             return False
     def __allow__(self):
+        print("Checking if chain is allowed", self.w3.eth.chain_id)
         for chain in self.allowed_chains:
 
             if chain == self.w3.eth.chain_id:
@@ -46,13 +46,16 @@ class Cheque:
         raise ValueError(f"Chain {str(self.w3.eth.chain_id)} is not allowed. Allowed chains are: {self.allowed_chains}")
     def get_contract_for_chain(self,chain_id: str):
         c = None
-        for chain in __SHADOWPAY_CONTRACT_ADDRESS__ERC20__  :
-            if str(chain) == str(chain_id):
-                c = __SHADOWPAY_CONTRACT_ADDRESS__ERC20__[chain_id]
-            contract_address = Web3.to_checksum_address(c)
-            contract = self.w3.eth.contract(address=contract_address, abi=__SHADOWPAY_ABI__ERC20__)
-            self.contract = contract
-            return contract
+        chain_id = int(chain_id)
+
+        for key,value in __SHADOWPAY_CONTRACT_ADDRESS__ERC20__.items():
+            print("Checking address", value, "for chain_id", chain_id)
+            if key == chain_id:
+                c = value
+                contract_address = Web3.to_checksum_address(c)
+                contract = self.w3.eth.contract(address=contract_address, abi=__SHADOWPAY_ABI__ERC20__)
+                self.contract = contract
+                return contract
         raise ValueError(f"Chain {chain_id} is not supported. Supported chains are: {list(__SHADOWPAY_CONTRACT_ADDRESS__ERC20__.keys())}")    
     async def get_address(self):
         if self.address:
@@ -141,41 +144,54 @@ class Cheque:
     async def CashOutCheque(
         self,
         private_key: str,
-        cheque_id: str  # hex-строка типа "0xabc..."
+        cheque_id: str  
     ):
         if not private_key:
             private_key = self.private_key
 
-            
         account = self.w3.eth.account.from_key(private_key)
         sender_address = account.address or self.address
-
-
         nonce = self.w3.eth.get_transaction_count(sender_address)
 
-        txn = self.contract.functions.CashOutCheque(
-            Web3.to_bytes(hexstr=cheque_id)).build_transaction({
+        latest_block = self.w3.eth.get_block('latest')
+        supports_eip1559 = 'baseFeePerGas' in latest_block
+
+        tx_common = {
             'from': sender_address,
             'nonce': nonce,
             'gas': 300_000,
-            'gasPrice': self.w3.to_wei('5', 'gwei'),
-        })
-        if self.return_build_tx:
-            return {
-                "build_tx": txn
-            }
+        }
 
-        signed_txn = self.w3.eth.account.sign_transaction(txn, private_key=private_key)
+        if supports_eip1559:
+            # EIP-1559 style
+            base_fee = latest_block['baseFeePerGas']
+            priority_fee = self.w3.to_wei(2, 'gwei')  # можно поднять до 5
+            max_fee = base_fee + priority_fee * 2
 
+            tx_common.update({
+                'maxFeePerGas': max_fee,
+                'maxPriorityFeePerGas': priority_fee
+            })
+        else:
+            # Legacy gas price style
+            tx_common.update({
+                'gasPrice': self.w3.to_wei('5', 'gwei')
+            })
 
-        tx_hash = self.w3.eth.send_raw_transaction(signed_txn.raw_transaction)
+        txn = self.contract.functions.CashOutCheque(
+            Web3.to_bytes(hexstr=cheque_id)
+        ).build_transaction(tx_common)
+
+        if self.return_build_tx:
+            return {"build_tx": txn}
 
+        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:
             return False
-        return {
-            "hash": tx_hash.hex()
-        }
+        return {"hash": tx_hash.hex()}
     
     async def InitTokenCheque(self, token_address:str, amount, reciver:str, private_key:Optional[str] = None):
         key = private_key or self.private_key
@@ -385,8 +401,7 @@ class Cheque:
     
     
     async def getComunityPool(self):
-        # fee = self.contract.functions.getCollectedFee().call()
-        fee = 50000000000000
+        fee = self.contract.functions.getCollectedFee().call()
         half_fee_eth = self.w3.from_wei(fee // 2, 'ether')
         return half_fee_eth
     async def getOwner(self):

{shadowpaysdk-16.7.2025.5 → shadowpaysdk-16.7.2025.7}/shadowPaySDK/types/SOLcheque.py

@@ -71,7 +71,6 @@ class SOLCheque:
                 print("❌ Config PDA not found.")
                 return None
 
-            # 🧠 У тебя data — это list[int], его нужно превратить в bytes
             raw = bytes(response.value.data)
 
             if len(raw) < 89:
@@ -263,7 +262,6 @@ class SOLCheque:
                 ]
             )
 
-            # === 6. Собираем и отправляем всё в одном tx ===
             print("Accounts (ix_program):")
             for i, acc in enumerate(ix_program.accounts):
                 print(f"[{i}] {acc.pubkey} | signer={acc.is_signer} | writable={acc.is_writable}")

{shadowpaysdk-16.7.2025.5 → shadowpaysdk-16.7.2025.7}/shadowPaySDK.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: shadowPaySDK
-Version: 16.7.2025.5
+Version: 16.7.2025.7
 Summary: ShadowPay SDK for ERC20/ERC721 and P2P smart contract interaction
-Author: dazay(aka dazarius_)
-Author-email: your@email.com
+Author: dazay
+Author-email: shadowpay.protocol@gmail.com
 License: MIT
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License

{shadowpaysdk-16.7.2025.5 → shadowpaysdk-16.7.2025.7}/shadowPaySDK.egg-info/SOURCES.txt

@@ -2,7 +2,6 @@ LICENSE
 README.md
 setup.py
 shadowPaySDK/__init__.py
-shadowPaySDK/api.py
 shadowPaySDK/const.py
 shadowPaySDK.egg-info/PKG-INFO
 shadowPaySDK.egg-info/SOURCES.txt

shadowpaysdk-16.7.2025.5/shadowPaySDK/api.py

@@ -1,48 +0,0 @@
-import httpx
-import json
-from typing import Optional
-from web3 import Web3
-
-__MAIN__URL__= "http://0.0.0.0:8000"
-__CREATE__CHEQUE__ = f"{__MAIN__URL__}/validate"
-__MY__CHEQUES__ = f"{__MAIN__URL__}/mycheque"
-
-
-
-async def __validate__cheque__(id, sender,action,  receiver:Optional[str] = None,  chain_id: Optional[int] = None, type:Optional[str] = None):
-    async with httpx.AsyncClient() as client:
-        response = await client.post(
-            __CREATE__CHEQUE__,
-            json={
-                "cheque_id": id,
-                "chain_id":chain_id, 
-                "receiver": receiver,
-                "type": type,
-                "sender":sender,
-                "action": action
-            }
-        )
-        if response.status_code == 200:
-            return response.json()
-        else:
-            print(f"Failed to create cheque: {response.text}")
-            return False
-
-
-async def get_my_cheques(private_key):
-    if not private_key:
-        raise ValueError("Private key is required to fetch cheques.")
-    sender = Web3.eth.account.from_key(private_key).address
-    
-    async with httpx.AsyncClient() as client:
-        response = await client.get(
-            __MY__CHEQUES__,
-            params={
-                "sender": sender
-            }
-        )
-        if response.status_code == 200:
-            return response.json()
-        else:
-            print(f"Failed to fetch cheques: {response.text}")
-            return False