shadowPaySDK 0.2.0.7__tar.gz → 0.2.0.9__tar.gz

{shadowpaysdk-0.2.0.7 → shadowpaysdk-0.2.0.9}/PKG-INFO

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

{shadowpaysdk-0.2.0.7 → shadowpaysdk-0.2.0.9}/setup.py

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

@@ -1,18 +1,19 @@
 import asyncio
 from solana.rpc.async_api import AsyncClient, GetTokenAccountsByOwnerResp
+from solana.transaction import Transaction
+from solders.system_program import TransferParams as p
 import spl
 import spl.token
 import spl.token.constants
-from spl.token.instructions import get_associated_token_address, create_associated_token_account, transfer, close_account
+from spl.token.instructions import get_associated_token_address, create_associated_token_account, transfer, close_account, TransferParams
 from spl.token.constants import TOKEN_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID
-from solana.constants import *
 from solana.rpc.types import TxOpts, TokenAccountOpts
 from solana.rpc.types import TxOpts
 import solders
-from solders.pubkey import Pubkey
-from solders.keypair import Keypair
-from solders.signature import Signature
-from solders.transaction import Transaction
+# from solders.pubkey import Pubkey
+# from solders.keypair import Keypair
+# from solders.signature import Signature
+# from solders.transaction import Transaction
 from spl.token.async_client import AsyncToken
 
 
@@ -27,9 +28,11 @@ import base64
 import re
 
 
+LAMPORTS_PER_SOL = 1_000_000_000  # 1 SOL = 1,000,000,000 lamports
+
 class SOL:
     
-    def __init__(self, rpc_url = "https://api.mainnet-beta.solana.com", KEYPAIR: Optional[Union[str, Keypair]] = None,TOKEN_MINT: Optional[str] = None):
+    def __init__(self, rpc_url = "https://api.mainnet-beta.solana.com", KEYPAIR: Optional[Union[str, solders.keypair.Keypair]] = None,TOKEN_MINT: Optional[str] = None):
             self.rpc_url = rpc_url
             self.client = AsyncClient(rpc_url)
             self.KEYPAIR = None
@@ -39,18 +42,18 @@ class SOL:
             if KEYPAIR:
                 self.set_keypair(KEYPAIR)
 
-    def set_keypair(self, KEYPAIR: Union[str, Keypair]):
+    def set_keypair(self, KEYPAIR: Union[str, solders.keypair.Keypair]):
         if isinstance(KEYPAIR, str):
             try:
-                self.KEYPAIR = Keypair.from_base58_string(KEYPAIR)
+                self.KEYPAIR = solders.keypair.Keypair.from_base58_string(KEYPAIR)
             except Exception as e:
                 raise ValueError(f"Invalid Keypair string: {e}")
-        elif isinstance(KEYPAIR, Keypair):
+        elif isinstance(KEYPAIR, solders.keypair.Keypair):
             self.KEYPAIR = KEYPAIR
         else:
             raise ValueError("KEYPAIR must be a Keypair instance or a base58 encoded string.")
 
-    def set_params(self, rpc_url: Optional[str] = None, KEYPAIR: Optional[Union[str, Keypair]] = None,TOKEN_MINT: Optional[str] = None):
+    def set_params(self, rpc_url: Optional[str] = None, KEYPAIR: Optional[Union[str, solders.keypair.Keypair]] = None,TOKEN_MINT: Optional[str] = None):
         if rpc_url:
             self.rpc_url = rpc_url
             self.client = AsyncClient(rpc_url)
@@ -72,7 +75,7 @@ class SOL:
         raise ValueError("Keypair not set")
 
     def gen_wallet(self):
-        return Keypair()
+        return solders.keypair.Keypair()
     async def get_balance(self):
         resp = await self.client.get_balance(self.get_pubkey())
         lamports = resp.value
@@ -117,14 +120,14 @@ class SOL:
         await self.client.close()
     
     async def fetch_metadata_raw(self,mint_address: str):
-        METADATA_PROGRAM_ID = Pubkey.from_string("metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s")
-        mint = Pubkey.from_string(mint_address)
+        METADATA_PROGRAM_ID = solders.pubkey.Pubkey.from_string("metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s")
+        mint = solders.pubkey.Pubkey.from_string(mint_address)
         seeds = [
             b"metadata",
             bytes(METADATA_PROGRAM_ID),
             bytes(mint),
         ]
-        pda, _ = Pubkey.find_program_address(seeds, METADATA_PROGRAM_ID)
+        pda, _ = solders.pubkey.Pubkey.find_program_address(seeds, METADATA_PROGRAM_ID)
 
         payload = {
             "jsonrpc": "2.0",
@@ -162,8 +165,8 @@ class SOL:
             raise ValueError("not set KEYPAIR.")
 
         sender_pubkey = self.get_pubkey()
-        receiver_pubkey = Pubkey.from_string(to)
-        token_pubkey = Pubkey.from_string(self.TOKEN_MINT)
+        receiver_pubkey = solders.pubkey.Pubkey.from_string(to)
+        token_pubkey = solders.pubkey.Pubkey.from_string(self.TOKEN_MINT)
 
         token = AsyncToken(self.client, token_pubkey, TOKEN_PROGRAM_ID, self.KEYPAIR)
         sender_ata = get_associated_token_address(sender_pubkey, token_pubkey)
@@ -183,17 +186,16 @@ class SOL:
 
         decimals = (await token.get_mint_info()).decimals
         real_amount = int(amount * (10 ** decimals))
-
-        tx.add(
-            transfer(
-                source=sender_ata,
-                dest=receiver_ata,
-                owner=sender_pubkey,
-                amount=real_amount,
-                program_id=TOKEN_PROGRAM_ID,
-            )
+        params = TransferParams(
+            program_id=TOKEN_PROGRAM_ID,
+            source=sender_ata,
+            dest=receiver_ata,
+            owner=sender_pubkey,
+            amount=real_amount
         )
 
+        tx.add(transfer(params))
+
         resp = await self.client.send_transaction(tx, self.KEYPAIR, opts=TxOpts(skip_preflight=True, preflight_commitment=Confirmed))
         return resp.value
 
@@ -202,5 +204,5 @@ class SOL:
 
 
 if __name__ == "__main__":
-    newKeypair = Keypair()
+    newKeypair = solders.keypair.Keypair()
     print("New Keypair:", newKeypair)

{shadowpaysdk-0.2.0.7 → shadowpaysdk-0.2.0.9}/shadowPaySDK/types/SOLcheque.py

@@ -1,10 +1,9 @@
 
 import anchorpy
 from anchorpy import Idl, Provider, Wallet
+import solders
 from shadowPaySDK.interface.sol import SOL
-from solders.keypair import Keypair
-import solana.constants as constants
-import solana.constants as sol_constants
+import solders  
 import spl.token.constants as spl_constants
 
 
@@ -17,7 +16,7 @@ class SOLCheque:
             self.WRAPED_SOL = spl_constants.WRAPPED_SOL_MINT    # wrapped SOL token mint address
             # self.idl = Idl.from_json(sol_interface.Idl)  # Load the IDL for the program
         def get(self, keypair = None):
-              pubkey = SOL.get_pubkey(KEYPAIR=Keypair.from_base58_string(self.keystore))
+              pubkey = SOL.get_pubkey(KEYPAIR=solders.keypair.Keypair.from_base58_string(self.keystore))
 
               return pubkey
         

{shadowpaysdk-0.2.0.7 → shadowpaysdk-0.2.0.9}/shadowPaySDK.egg-info/PKG-INFO

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