solotto 1.1.4 → 1.2.0

package/README.md

@@ -429,7 +429,7 @@ const state = await lottery.GetLottery(authority, lotteryId, fees);
   isActive: true,                // Whether the lottery is active
   prizePoolBalance: 3780000000,  // Prize pool in lamports (after fees if fees=true)
   drawInitiated: false,          // Whether a draw has been initiated
-  prizePoolAddress: "Pubkey...", // Prize pool PDA
+  prizePoolAddress: "Pubkey...", // Per-lottery prize pool PDA (seeds: ["prize-pool", lotteryPDA])
   lotteryAddress: "Pubkey...",   // Lottery PDA
   release: "Pubkey...",          // Release address (lottery PDA)
   releaseTime: null,             // Unix timestamp when unclaimed prizes can be released (null if not set)
@@ -494,7 +494,7 @@ const ticket = await lottery.GetTicket(authority, lotteryId, ticketNumber);
 
 #### GetTickets
 
-Fetches all tickets for a lottery, optionally filtered by buyer, grouped by owner, and/or enriched with purchase timestamps.
+Fetches all tickets for a lottery, optionally filtered by buyer, grouped by owner, and/or enriched with purchase timestamps and transaction signatures.
 
 ```js
 // Get all tickets
@@ -508,6 +508,9 @@ const grouped = await lottery.GetTickets(authority, lotteryId, false, true);
 
 // Get all tickets with purchase timestamps
 const withTime = await lottery.GetTickets(authority, lotteryId, false, false, true);
+
+// Get all tickets with timestamps and signatures
+const full = await lottery.GetTickets(authority, lotteryId, false, false, true, true);
 ```
 
 | Parameter | Type | Default | Description |
@@ -516,7 +519,10 @@ const withTime = await lottery.GetTickets(authority, lotteryId, false, false, tr
 | `lotteryId` | `Number` | — | The lottery ID. |
 | `buyer` | `{publicKey} \| false` | `false` | Optional buyer to filter by. |
 | `group` | `Boolean` | `false` | If `true`, groups tickets by owner. |
-| `time` | `Boolean` | `false` | If `true`, fetches the block timestamp for each ticket (slower — requires extra RPC calls). |
+| `time` | `Boolean` | `false` | If `true`, includes the block timestamp for each ticket. |
+| `signature` | `Boolean` | `false` | If `true`, includes the transaction signature for each ticket. |
+
+> **Note:** The `time` and `signature` options share a single RPC call per ticket, so enabling both does not double the number of requests.
 
 **Returns (ungrouped):**
 
@@ -534,6 +540,7 @@ const withTime = await lottery.GetTickets(authority, lotteryId, false, false, tr
       ticketNumber: 42,
       ticketPda: "Pubkey...",
       time: null,              // Unix timestamp when time=true, null otherwise
+      signature: "TxSig...",   // Present only when signature=true
     },
     // ... sorted descending by ticket number
   ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "solotto",
-  "version": "1.1.4",
+  "version": "1.2.0",
   "description": "Solana lottery client",
   "type": "module",
   "types": "./solotto.d.ts",

package/solotto.d.ts

@@ -107,6 +107,8 @@ declare module "solotto" {
     ticketPda: string;
     /** Unix block timestamp of ticket purchase, or `null` when `time=false`. */
     time: number | null;
+    /** Transaction signature. Present only when `signature=true`. */
+    signature?: string;
   }
 
   interface GroupedTicketOwner {
@@ -323,13 +325,14 @@ declare module "solotto" {
       ticket: number
     ): Promise<TicketInfo>;
 
-    /** Fetch all tickets for a lottery, optionally filtered by buyer, grouped by owner, and/or with timestamps. */
+    /** Fetch all tickets for a lottery, optionally filtered by buyer, grouped by owner, and/or with timestamps and signatures. */
     GetTickets(
       authority: HasPublicKey,
       lotteryId: number,
       buyer?: HasPublicKey | false,
       group?: boolean,
-      time?: boolean
+      time?: boolean,
+      signature?: boolean
     ): Promise<TicketListResult>;
 
     /**
@@ -399,8 +402,8 @@ declare module "solotto" {
       ticketReceipt: PublicKey
     ): Promise<[PublicKey, number]>;
 
-    /** Derive the prize pool PDA. */
-    DerivePrizePoolPDA(): Promise<[PublicKey, number]>;
+    /** Derive the per-lottery prize pool PDA. Seeds: ["prize-pool", lotteryPDA]. */
+    DerivePrizePoolPDA(lotteryPDA: PublicKey): Promise<[PublicKey, number]>;
   }
 
   /**

package/solotto.js

@@ -276,6 +276,7 @@ class Lottery extends EventEmitter {
             { pubkey: new PublicKey(LOTTO.ticket.ticketReceipt), isSigner: false, isWritable: false },
             { pubkey: new PublicKey(LOTTO.ticket.ticketPda), isSigner: false, isWritable: false },
             { pubkey: new PublicKey(LOTTO.prizePoolAddress), isSigner: false, isWritable: true },
+            { pubkey: new PublicKey(LOTTO.authority), isSigner: false, isWritable: true },
             { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
         ];
         const ix = new TransactionInstruction({programId: this.program, keys, data: await claimData()});
@@ -441,7 +442,7 @@ class Lottery extends EventEmitter {
      * @param {Number} lotteryId - Lottery Id 
      * @param {PublicKey} buyer - Ticket Buyer Optional
     */
-    async GetTickets(authority, lotteryId, buyer = false, group = false, time = false) {
+    async GetTickets(authority, lotteryId, buyer = false, group = false, time = false, signature = false) {
         const [lotteryPDA] = await this.DeriveLotteryPDA(authority.publicKey, lotteryId);
         const filters = [];
         filters.push({dataSize: 104});
@@ -460,10 +461,10 @@ class Lottery extends EventEmitter {
             newTicket.ticketNumber = parseInt(new BN(decoded.ticketNumber, 10, "le"));
             newTicket.ticketPda = data.pubkey.toString();
             newTicket.time = null;
-            if(time){
-                const dat = await this.connection.getSignaturesForAddress(data.pubkey, "finalized");
-                newTicket.time = dat[0].blockTime;
-            }
+            let dat = null;
+            if(time || signature){dat = await this.connection.getSignaturesForAddress(data.pubkey, "finalized");}
+            if(time){newTicket.time = dat[0].blockTime;}
+            if(signature){newTicket.signature = dat[0].signature;}
             tickets.push(newTicket);
             i++;
         }
@@ -586,8 +587,8 @@ class Lottery extends EventEmitter {
                 return Number(val);
             });
         }catch{}
-        const prizePoolAddress = await this.DerivePrizePoolPDA();
         const lotteryAddress = await this.DeriveLotteryPDA(new PublicKey(auth), lotteryId);
+        const prizePoolAddress = await this.DerivePrizePoolPDA(lotteryAddress[0]);
         let prizePoolBalance = prizePool;
         if(fees){prizePoolBalance = prizePool - (prizePool * 0.1);}
         return {
@@ -625,8 +626,8 @@ class Lottery extends EventEmitter {
             programId
         );
     }
-    async DerivePrizePoolPDA() {
-      return PublicKey.findProgramAddressSync([Buffer.from("prize-pool")], this.program);
+    async DerivePrizePoolPDA(lotteryPDA) {
+      return PublicKey.findProgramAddressSync([Buffer.from("prize-pool"), lotteryPDA.toBuffer()], this.program);
     }
 
     /**
@@ -840,11 +841,13 @@ class LotteryManager {
             return buffer;
         }
         const [lotteryPDA, bump] = await lottery.DeriveLotteryPDA(authority.publicKey, lotteryId);
+        const [prizePoolPDA] = await lottery.DerivePrizePoolPDA(lotteryPDA);
         console.log("Lottery PDA:", lotteryPDA.toString());
         const ix = new TransactionInstruction({
             keys: [
                 { pubkey: authority.publicKey, isSigner: true, isWritable: true },
                 { pubkey: lotteryPDA, isSigner: false, isWritable: true },
+                { pubkey: prizePoolPDA, isSigner: false, isWritable: true },
                 { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
             ],
             programId: this.program,
@@ -893,7 +896,7 @@ class LotteryManager {
             const lottery = new Lottery(this.connection, false, this.program);
             const network = new LotteryNetwork(this.connection);
             const [lotteryPDA] = await lottery.DeriveLotteryPDA(authority.publicKey, lotteryId);
-            const [prizePoolPDA] = await lottery.DerivePrizePoolPDA();
+            const [prizePoolPDA] = await lottery.DerivePrizePoolPDA(lotteryPDA);
             const keys = [
                 { pubkey: authority.publicKey, isSigner: true, isWritable: false },
                 { pubkey: lotteryPDA, isSigner: false, isWritable: true },