shadowPaySDK 16.7.2025.512__py3-none-any.whl → 16.7.2025.514__py3-none-any.whl

shadowPaySDK/types/SOLcheque.py

@@ -18,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,TransferCheckedParams, transfer_checked, 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
@@ -94,6 +94,29 @@ class SOLCheque:
                 "token_out_bps": token_out_bps,
                 "initialized": initialized,
             }
+        def parse_token_cheque_data(self,pda):
+            if isinstance(pda, str):
+                pda_pubkey = Pubkey.from_string(pda)
+            pda_pubkey = pda
+            response = self.provider.get_account_info(pda_pubkey)
+            if response.value is None:
+                return None
+            
+            raw_data = bytes(response.value.data)
+            id = int.from_bytes(raw_data[0:8], "little")
+            amount = int.from_bytes(raw_data[8:16], "little")
+            mint = Pubkey.from_bytes(raw_data[16:48])
+            recipient = Pubkey.from_bytes(raw_data[48:80])
+            claimed = raw_data[80] != 0
+
+            return {
+                "id": id,
+                "amount": amount,
+                "mint": str(mint),
+                "recipient": str(recipient),
+                "claimed": claimed,
+            }
+      
         def set_params(self, rpc_url = None, key = None):
             if rpc_url:
                 self.rpc_url = rpc_url
@@ -202,81 +225,146 @@ class SOLCheque:
                 "pda_account": pda_acc,
             }
 
-        # init_token_cheque need fix...
+        # init_token_cheque work succesfuly
 
-        def init_token_cheque(self, token_mint: str, token_amount,token_decimals, recipient: str, treasury: str, CHEQUE_SPACE: int = 105):
+        def init_token_cheque(
+            self,
+            token_mint: str,
+            token_amount,
+            token_decimals,
+            recipient: str,
+            CHEQUE_SPACE: int = 155
+        ):
             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()
+            cheque_pubkey = cheque_acc.pubkey()
 
             rent = self.provider.get_minimum_balance_for_rent_exemption(CHEQUE_SPACE).value
 
-            create_cheque_acc = create_account(
+            # 1. Create raw cheque account
+            create_cheque_ix = create_account(
                 CreateAccountParams(
                     from_pubkey=payer_pubkey,
-                    to_pubkey=cheque_pda,
+                    to_pubkey=cheque_pubkey,
                     lamports=rent,
                     space=CHEQUE_SPACE,
                     owner=PROGRAM_ID
                 )
             )
 
+            blockhash = self.provider.get_latest_blockhash().value.blockhash
+
             tx1 = Transaction(
-                message=Message(instructions=[create_cheque_acc], payer=payer_pubkey),
-                recent_blockhash=self.provider.get_latest_blockhash().value.blockhash,
+                message=Message(instructions=[create_cheque_ix], payer=payer_pubkey),
+                recent_blockhash=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))
             
 
+            ata_ix = create_associated_token_account(
+                payer=payer_pubkey,
+                owner=cheque_pubkey,
+                mint=token_mint_pubkey
+            )
+            cfg = self.get_config()   
+            tressary = cfg["treasury"]
+            sender_ata = get_associated_token_address(payer_pubkey, token_mint_pubkey)
+            cheque_ata = get_associated_token_address(cheque_pubkey, token_mint_pubkey)
 
-            data = bytes([2]) + struct.pack("<Q", amount)
+            # 4. Prepare your program instruction
+            amount = int(token_amount * (10 ** token_decimals))
+            data = bytes([2]) + struct.pack("<Q", amount) + bytes(recipient_pubkey)
 
             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),
+                    AccountMeta(pubkey=payer_pubkey, is_signer=True, is_writable=True),         # 0 initializer
+                    AccountMeta(pubkey=cheque_pubkey, is_signer=True, is_writable=True),        # 1 cheque_pda
+                    AccountMeta(pubkey=token_mint_pubkey, is_signer=False, is_writable=True),   # 2 mint
+                    AccountMeta(pubkey=sender_ata, is_signer=False, is_writable=True),          # 3 sender ATA
+                    AccountMeta(pubkey=cheque_ata, is_signer=False, is_writable=True),          # 4 cheque ATA
+                    AccountMeta(pubkey=TOKEN_PROGRAM_ID, is_signer=False, is_writable=False),   # 5 token program
+                    AccountMeta(pubkey=CONFIG_PDA[0], is_signer=False, is_writable=False),      # 6 config PDA
+                    AccountMeta(pubkey=Pubkey.from_string(tressary), is_signer=False, is_writable=True),        # 7 treasury ATA
                 ]
             )
 
+
             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}")
 
+            # 5. Send final transaction with ATA crea   tion + program call
+            blockhash = self.provider.get_latest_blockhash().value.blockhash
             tx2 = Transaction(
-                message=Message(instructions=[ix_create_ata,  ix_program], payer=payer_pubkey),
-                recent_blockhash=self.provider.get_latest_blockhash().value.blockhash,
+                message=Message(instructions=[ata_ix, ix_program], payer=payer_pubkey),
+                recent_blockhash=blockhash,
                 from_keypairs=[payer, cheque_acc]
             )
 
             sig = self.provider.send_transaction(tx2, opts=TxOpts(skip_preflight=True)).value
+
             return {
-                "cheque_pda": str(cheque_pda),
+                "cheque_pubkey": str(cheque_pubkey),
                 "signature": str(sig),
                 "amount": token_amount
             }
-        def claim_token_cheque(self, pda_acc: str):
-            pass
+
+
+        def claim_token_cheque(self,  pda_acc: str):
+            payer = self.key
+            payer_pubkey = payer.pubkey()
+            pada_acc = solders.keypair.Keypair.from_base58_string(pda_acc)
+            pda_pubkey = pada_acc.pubkey()
+            cheque_data = self.parse_token_cheque_data(pda=solders.keypair.Keypair.from_base58_string(pda_acc).pubkey())
+
+            cheque_token_account = get_associated_token_address(pda_pubkey, Pubkey.from_string(cheque_data["mint"]))
+            recipient_token_account = get_associated_token_address(
+                Pubkey.from_string(cheque_data["recipient"]), Pubkey.from_string(cheque_data["mint"])
+            )
+            cfg = self.get_config()   
+            tressary = cfg["treasury"]
+            data = bytes([3])
+            ix_program = Instruction(
+                program_id=PROGRAM_ID,
+                data=bytes([3]),
+                accounts=[
+                    AccountMeta(pubkey=payer_pubkey, is_signer=True, is_writable=True),                # 0 claimer
+                    AccountMeta(pubkey=pda_pubkey, is_signer=False, is_writable=True),                 # 1 cheque_pda
+                    AccountMeta(pubkey=cheque_token_account, is_signer=False, is_writable=True),       # 2 cheque_token_account
+                    AccountMeta(pubkey=recipient_token_account, is_signer=False, is_writable=True),    # 3 recipient_token_account
+                    AccountMeta(pubkey=TOKEN_PROGRAM_ID, is_signer=False, is_writable=False),          # 4 token_program
+                    AccountMeta(pubkey=CONFIG_PDA[0], is_signer=False, is_writable=False),             # 5 config_account
+                    AccountMeta(pubkey=Pubkey.from_string(tressary), is_signer=False, is_writable=True), # 6 treasury_account
+                ]
+            )
+
+
+
+
+
+            blockhash = self.provider.get_latest_blockhash().value.blockhash
+
+            tx = Transaction(
+                message=Message(instructions=[ix_program], payer=payer_pubkey),
+                recent_blockhash=blockhash,
+                from_keypairs=[payer]
+            )
+
+            sig = self.provider.send_transaction(tx, opts=TxOpts(skip_preflight=True)).value
+
+            return {
+                "pda_pubkey": str(pda_pubkey),
+                "signature": str(sig)
+            }

{shadowpaysdk-16.7.2025.512.dist-info → shadowpaysdk-16.7.2025.514.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shadowPaySDK
-Version: 16.7.2025.512
+Version: 16.7.2025.514
 Summary: ShadowPay SDK for ERC20/ERC721 and P2P smart contract interaction
 Author: dazay
 Author-email: shadowpay.protocol@gmail.com

{shadowpaysdk-16.7.2025.512.dist-info → shadowpaysdk-16.7.2025.514.dist-info}/RECORD

@@ -5,12 +5,12 @@ shadowPaySDK/interface/erc20.py,sha256=zUTdwhf1hznSGxeEw0HsEFVf1nafHPcxj1X3djPcz
 shadowPaySDK/interface/erc721.py,sha256=4AlWfDjrvl85wFocnN93j-oM54kTsLLwv9SdtcLj4eM,3094
 shadowPaySDK/interface/sol.py,sha256=LsgwE8BzCstsVAxgcbKcYiXAORYMBHcQmNZdzsNkaLQ,7998
 shadowPaySDK/types/EVMcheque.py,sha256=RFhvTb-etNz2vF5x9WvDNNbjM84JHHJkd3V1wyURWv0,17912
-shadowPaySDK/types/SOLcheque.py,sha256=ZzQgQXBerwa9lelbV8O6JBr1nevCAmJDxrdo8FtKT-4,11795
+shadowPaySDK/types/SOLcheque.py,sha256=uPFXw-rCRw6DftpgHj9F262fAq7ZL_WAvY3RkCN3p0w,15512
 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-16.7.2025.512.dist-info/licenses/LICENSE,sha256=EG13vNmyBfkG3oKj40oOYfUGLKko8OouU6PfO6MlAk4,1066
-shadowpaysdk-16.7.2025.512.dist-info/METADATA,sha256=cU5yetkRZJie2wtE3xCvI5wQ4vJqEyPpb6Mck23Uhzo,1047
-shadowpaysdk-16.7.2025.512.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-shadowpaysdk-16.7.2025.512.dist-info/top_level.txt,sha256=RSJc73GEf31NMdZp9KovEduzfhm10eQ2t5GTZ44aN1U,13
-shadowpaysdk-16.7.2025.512.dist-info/RECORD,,
+shadowpaysdk-16.7.2025.514.dist-info/licenses/LICENSE,sha256=EG13vNmyBfkG3oKj40oOYfUGLKko8OouU6PfO6MlAk4,1066
+shadowpaysdk-16.7.2025.514.dist-info/METADATA,sha256=piIWUez5L_kak2sK2vQUR_fu6tkmywCwuM6FXfewyyE,1047
+shadowpaysdk-16.7.2025.514.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+shadowpaysdk-16.7.2025.514.dist-info/top_level.txt,sha256=RSJc73GEf31NMdZp9KovEduzfhm10eQ2t5GTZ44aN1U,13
+shadowpaysdk-16.7.2025.514.dist-info/RECORD,,