shadowPaySDK 0.2.0.26__tar.gz → 0.2.0.27__tar.gz

{shadowpaysdk-0.2.0.26 → shadowpaysdk-0.2.0.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shadowPaySDK
-Version: 0.2.0.26
+Version: 0.2.0.27
 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 → shadowpaysdk-0.2.0.27}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='shadowPaySDK',
-    version='0.2.0.26',
+    version='0.2.0.27',
     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.26 → shadowpaysdk-0.2.0.27}/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
@@ -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,6 +48,8 @@ import re
 import struct
 from shadowPaySDK.const import LAMPORTS_PER_SOL
 
+PROGRAM_ID = Pubkey.from_string("5nfYDCgBgm72XdpYFEtWX2X1JQSyZdeBH2uuBZ6ZvQfi")
+
 
 # PROGRAM_ID = "5nfYDCgBgm72XdpYFEtWX2X1JQSyZdeBH2uuBZ6ZvQfi"
 
@@ -64,33 +64,34 @@ 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()
+            print("Minimum balance for rent exemption:", CHEQUE_RENT.value / LAMPORTS_PER_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,16 +100,13 @@ 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)
 
 
@@ -133,12 +131,41 @@ 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)
+            data = {
+                "signature": response.value,
+                "amount": cheque_amount,
+                "create_pda": CHEQUE_PDA_SIGNATURE,
+                "cheque_pda": CHEQUE_PDA,
+                "rent_pda": CHEQUE_RENT.value / LAMPORTS_PER_SOL,
+
+            }
+            return data
+
+        def claim_cheque(self, pda_acc: str):
+            instruction_data = bytes([1])
+            payer = self.key
+            payer_pubkey = payer.pubkey()
+            
+
+            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),
+                ]
+            )
+
+            # Создаём и отправляем транзакцию
+            recent_blockhash = self.provider.get_latest_blockhash().value.blockhash
+            message = Message(instructions=[instruction_data], 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 response.value
 
 
 

{shadowpaysdk-0.2.0.26 → shadowpaysdk-0.2.0.27}/shadowPaySDK.egg-info/PKG-INFO

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