shadowPaySDK 0.2.0.26__py3-none-any.whl → 0.2.0.28__py3-none-any.whl

shadowPaySDK/types/SOLcheque.py

@@ -7,7 +7,6 @@ import solders
 import spl.token.constants as spl_constants
 from solana.rpc.api import Client
 
-from types import Optional, Union
 import asyncio
 import solana
 from solana.rpc.async_api import AsyncClient, GetTokenAccountsByOwnerResp
@@ -19,7 +18,7 @@ from solders.message import Message
 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, TransferParams
+from spl.token.instructions import get_associated_token_address, create_associated_token_account,TransferCheckedParams, transfer_checked, transfer, close_account, TransferParams
 from solders.system_program import transfer as ts
 from solders.system_program import TransferParams as tsf
 from solders.pubkey import Pubkey
@@ -42,7 +41,6 @@ from solana.rpc.commitment import Confirmed
 from solana.rpc.async_api import AsyncClient
 import anchorpy
 from anchorpy import Provider, Wallet, Idl
-from typing import Optional, Union
 import pprint
 import httpx
 import base64
@@ -50,8 +48,10 @@ import re
 import struct
 from shadowPaySDK.const import LAMPORTS_PER_SOL
 
+PROGRAM_ID = Pubkey.from_string("4PYNfaoDaJR8hrmUCngrwxJHAD9vkdnFySndPYC8HgNH")
 
-# PROGRAM_ID = "5nfYDCgBgm72XdpYFEtWX2X1JQSyZdeBH2uuBZ6ZvQfi"
+CONFIG_PDA=Pubkey.find_program_address([b"config"], PROGRAM_ID)
+PROGRAM_ID_STR = "5nfYDCgBgm72XdpYFEtWX2X1JQSyZdeBH2uuBZ6ZvQfi"
 
 class SOLCheque:
         def __init__(self, rpc_url: str = "https://api.mainnet-beta.solana.com", key: Wallet = None):
@@ -64,33 +64,33 @@ class SOLCheque:
               pubkey = SOL.get_pubkey(KEYPAIR=solders.keypair.Keypair.from_base58_string(self.keystore))
 
               return pubkey
-        def set_params(self, rpc_url: Optional[str] = None, key: Optional[Wallet] = None):
+        def set_params(self, rpc_url = None, key = None):
             if rpc_url:
                 self.rpc_url = rpc_url
                 self.provider = Client(rpc_url)
             if key:
                 self.key = key
 
-        def init_cheque(self, cheque_amount, recipient: str, memo: Optional[str] = None):
+        def init_cheque(self, cheque_amount, recipient: str, SPACE: int = 100):
             """
             Initialize a cheque withc the specified amount and recipient.
             """
             if not self.key:
                 raise ValueError("Keypair is not set. Please set the keypair before initializing a cheque.")
-            PROGRAM_ID = Pubkey.from_string("5nfYDCgBgm72XdpYFEtWX2X1JQSyZdeBH2uuBZ6ZvQfi")
-
-            CHEQUE_SPACE = 100  
+            CHEQUE_PDA_SIGNATURE = None
+            CHEQUE_SPACE = SPACE  
             CHEQUE_RENT = self.provider.get_minimum_balance_for_rent_exemption(CHEQUE_SPACE)
-            print("Minimum balance for rent exemption:", CHEQUE_RENT.value)
-            sol = SOL()
+            sol = SOL(
+                KEYPAIR=self.key  
+            )
             payer = self.key
-            pubkey = self.key.pubkey
-            newAccount = sol.gen_wallet()
-            newAccountPubkey = newAccount["pubkey"]
+            pubkey = self.key.pubkey()
+            newAcc = solders.keypair.Keypair()
+            newAccPubkey = newAcc.pubkey()
             ix_create = create_account(
                 params=CreateAccountParams(
                 from_pubkey=pubkey,
-                to_pubkey=newAccountPubkey,
+                to_pubkey=newAccPubkey,
                 lamports=CHEQUE_RENT.value,
                 space=CHEQUE_SPACE,
                 owner=PROGRAM_ID
@@ -99,27 +99,20 @@ class SOLCheque:
             recent_blockhash = self.provider.get_latest_blockhash().value.blockhash
             message = Message(instructions=[ix_create], payer=pubkey)
 
-            t = Transaction(message=message, from_keypairs=[payer, newAccount["keypair"]], recent_blockhash=recent_blockhash)
-            r = self.provider.send_transaction(t,opts=TxOpts(skip_preflight=True))
-            print("✅ CreateCheque Signature:", r.value)
-            CHEQUE_PDA = newAccountPubkey  # замените на актуальный адрес PDA
+            t = Transaction(message=message, from_keypairs=[payer, newAcc], recent_blockhash=recent_blockhash)
+            r = self.provider.send_transaction(t,opts=TxOpts())
+            CHEQUE_PDA_SIGNATURE = r.value
+            CHEQUE_PDA = newAccPubkey  
 
-            # === Автор ===
 
-            # === Получатели ===
 
-            # === Сумма ===
             total_lamports = int(cheque_amount * LAMPORTS_PER_SOL)
 
 
             r = Pubkey.from_string(recipient)  
 
-            # 1 byte - tag
-            # 32 bytes - recipient pubkey
-            # 8 bytes - lamports (u64 LE)
             data = bytes([0]) + bytes(r) + struct.pack("<Q", total_lamports)
 
-            # === Инструкция ===
             
 
             instruction = Instruction(
@@ -133,13 +126,121 @@ class SOLCheque:
                 ]
             )
 
-            # === Отправка транзакции ===
             recent_blockhash = self.provider.get_latest_blockhash().value.blockhash
             message = Message(instructions=[instruction], payer=pubkey)
             tx = Transaction(message=message, from_keypairs=[payer], recent_blockhash=recent_blockhash)
             response = self.provider.send_transaction(tx,opts=TxOpts(skip_preflight=True))
-            print("✅ InitCheque Signature:", response.value)
+            confirm = self.provider.confirm_transaction(response.value)
+            
+            data = {
+                "cheque_pda": str(CHEQUE_PDA),
+                "signature": str(response.value),
+                "create_signature": str(CHEQUE_PDA_SIGNATURE),
+                "cheque_amount": cheque_amount,
+                "pda_rent_sol": CHEQUE_RENT.value / LAMPORTS_PER_SOL,
+            }
+            return data
+
+        def claim_cheque(self, pda_acc: str, rent_resiver:str = None ):
+            instruction_data = bytes([1])
+            payer = self.key
+            payer_pubkey = payer.pubkey()
+            if not rent_resiver:
+                rent_resiver = payer_pubkey
+            rent_resiver = Pubkey.from_string(rent_resiver)
 
+            ix = Instruction(
+                program_id=PROGRAM_ID,
+                data=instruction_data,
+                accounts = [
+                    AccountMeta(pubkey=payer_pubkey, is_signer=True, is_writable=True),
+                    AccountMeta(pubkey=Pubkey.from_string(pda_acc), is_signer=False, is_writable=True),
+                    AccountMeta(pubkey=rent_resiver, is_signer=False, is_writable=True)  # rent receiver
+                ]
+            )
 
+            recent_blockhash = self.provider.get_latest_blockhash().value.blockhash
+            message = Message(instructions=[ix], payer=payer_pubkey)
+            tx = Transaction(message=message, from_keypairs=[payer], recent_blockhash=recent_blockhash)
+            response = self.provider.send_transaction(tx,opts=TxOpts(skip_preflight=True))
+            return {
+                "signature": str(response.value),
+                "pda_account": pda_acc,
+            }
+
+
+        def init_token_cheque(self, token_mint: str, token_amount,token_decimals, recipient: str, treasury: str, CHEQUE_SPACE: int = 105):
+            if not self.key:
+                raise ValueError("Keypair not set")
+
+            payer = self.key
+            payer_pubkey = payer.pubkey()
+            token_mint_pubkey = Pubkey.from_string(token_mint)
+            recipient_pubkey = Pubkey.from_string(recipient)
+            treasury_pubkey = Pubkey.from_string(treasury)
+
+            cheque_acc = solders.keypair.Keypair()
+            cheque_pda = cheque_acc.pubkey()
+
+            rent = self.provider.get_minimum_balance_for_rent_exemption(CHEQUE_SPACE).value
+
+            create_cheque_acc = create_account(
+                CreateAccountParams(
+                    from_pubkey=payer_pubkey,
+                    to_pubkey=cheque_pda,
+                    lamports=rent,
+                    space=CHEQUE_SPACE,
+                    owner=PROGRAM_ID
+                )
+            )
+
+            tx1 = Transaction(
+                message=Message(instructions=[create_cheque_acc], payer=payer_pubkey),
+                recent_blockhash=self.provider.get_latest_blockhash().value.blockhash,
+                from_keypairs=[payer, cheque_acc]
+            )
+            self.provider.send_transaction(tx1, opts=TxOpts(skip_preflight=True))
+
+            sender_ata = get_associated_token_address(payer_pubkey, token_mint_pubkey)
+            cheque_ata = get_associated_token_address(cheque_pda, token_mint_pubkey)
+            treasury_ata = get_associated_token_address(treasury_pubkey, token_mint_pubkey)
+
+            ix_create_ata = create_associated_token_account(payer_pubkey, cheque_pda, token_mint_pubkey)
+
+            amount = int(token_amount * (10 ** token_decimals))
+            
+
+
+            data = bytes([2]) + struct.pack("<Q", amount)
+
+            ix_program = Instruction(
+                program_id=PROGRAM_ID,
+                data=data,
+                accounts=[
+                    AccountMeta(payer_pubkey, is_signer=True, is_writable=True),
+                    AccountMeta(cheque_pda, is_signer=True, is_writable=True),
+                    AccountMeta(token_mint_pubkey, is_signer=False, is_writable=True),
+                    AccountMeta(sender_ata, is_signer=False, is_writable=True),
+                    AccountMeta(cheque_ata, is_signer=False, is_writable=True),
+                    AccountMeta(treasury_ata, is_signer=False, is_writable=True),
+                    AccountMeta(Pubkey.from_string("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"), is_signer=False, is_writable=False),
+                ]
+            )
+
+            # === 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}")
+
+            tx2 = Transaction(
+                message=Message(instructions=[ix_create_ata,  ix_program], payer=payer_pubkey),
+                recent_blockhash=self.provider.get_latest_blockhash().value.blockhash,
+                from_keypairs=[payer, cheque_acc]
+            )
 
-  
+            sig = self.provider.send_transaction(tx2, opts=TxOpts(skip_preflight=True)).value
+            return {
+                "cheque_pda": str(cheque_pda),
+                "signature": str(sig),
+                "amount": token_amount
+            }

{shadowpaysdk-0.2.0.26.dist-info → shadowpaysdk-0.2.0.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shadowPaySDK
-Version: 0.2.0.26
+Version: 0.2.0.28
 Summary: ShadowPay SDK for ERC20/ERC721 and P2P smart contract interaction
 Author: dazay(aka dazarius_)
 Author-email: your@email.com

{shadowpaysdk-0.2.0.26.dist-info → shadowpaysdk-0.2.0.28.dist-info}/RECORD

@@ -6,12 +6,12 @@ shadowPaySDK/interface/erc20.py,sha256=7p8eU5LzhI2MsH80PZhq6IRhbfMGlNYucGl3OtyS9
 shadowPaySDK/interface/erc721.py,sha256=4AlWfDjrvl85wFocnN93j-oM54kTsLLwv9SdtcLj4eM,3094
 shadowPaySDK/interface/sol.py,sha256=TDp62OtQkR8Wy9I4UBVmL_K_FQeMVS--Lojgbvq5T2E,8146
 shadowPaySDK/types/EVMcheque.py,sha256=8M1EzpZGqf4uidrd9yDKiR7BvIl85p93A_9AMZtshSs,14570
-shadowPaySDK/types/SOLcheque.py,sha256=C-a7FsVgF-as-JQ0PgR6YBBaacXjVZBfSM87Nxo1s1Q,5782
+shadowPaySDK/types/SOLcheque.py,sha256=QxRJVPQKOn3n0Y0FQf4REjt0-garpp-L2E9B9PddDTA,10414
 shadowPaySDK/types/__init__.py,sha256=sG6pNZfKGvENXqsnv6MrQtKrJ898fAXkMvAZY1k1-Qg,97
 shadowPaySDK/utils/__init__.py,sha256=aja3iYO4rT-ptMM-pzw0GRFTziBdXdcEi-4kE84zH64,61
 shadowPaySDK/utils/utils.py,sha256=g4bGvLDdjhNGsAj1eaZnNWFNaiN-cVhhM-5PrnG5aIQ,720
-shadowpaysdk-0.2.0.26.dist-info/licenses/LICENSE,sha256=EG13vNmyBfkG3oKj40oOYfUGLKko8OouU6PfO6MlAk4,1066
-shadowpaysdk-0.2.0.26.dist-info/METADATA,sha256=sHw5afWWsEXT_Y_C2PQ8G38pwQL3WOyrZQ_9clfl7i0,964
-shadowpaysdk-0.2.0.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-shadowpaysdk-0.2.0.26.dist-info/top_level.txt,sha256=RSJc73GEf31NMdZp9KovEduzfhm10eQ2t5GTZ44aN1U,13
-shadowpaysdk-0.2.0.26.dist-info/RECORD,,
+shadowpaysdk-0.2.0.28.dist-info/licenses/LICENSE,sha256=EG13vNmyBfkG3oKj40oOYfUGLKko8OouU6PfO6MlAk4,1066
+shadowpaysdk-0.2.0.28.dist-info/METADATA,sha256=jNmFSnt4Wv5zXzY0-BfpoQkBGRFEZFsGN3N-p52kaoM,964
+shadowpaysdk-0.2.0.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+shadowpaysdk-0.2.0.28.dist-info/top_level.txt,sha256=RSJc73GEf31NMdZp9KovEduzfhm10eQ2t5GTZ44aN1U,13
+shadowpaysdk-0.2.0.28.dist-info/RECORD,,