solotto 1.0.8 → 1.0.9

package/README.md

@@ -431,7 +431,7 @@ const ticket = await lottery.GetTicket(authority, lotteryId, ticketNumber);
 
 #### GetTickets
 
-Fetches all tickets for a lottery, optionally filtered by buyer.
+Fetches all tickets for a lottery, optionally filtered by buyer and/or grouped by owner.
 
 ```js
 // Get all tickets
@@ -439,6 +439,9 @@ const allTickets = await lottery.GetTickets(authority, lotteryId);
 
 // Get tickets for a specific buyer
 const myTickets = await lottery.GetTickets(authority, lotteryId, buyer);
+
+// Get all tickets grouped by owner
+const grouped = await lottery.GetTickets(authority, lotteryId, false, true);
 ```
 
 | Parameter | Type | Default | Description |
@@ -446,8 +449,9 @@ const myTickets = await lottery.GetTickets(authority, lotteryId, buyer);
 | `authority` | `{publicKey}` | — | The lottery authority. |
 | `lotteryId` | `Number` | — | The lottery ID. |
 | `buyer` | `{publicKey} \| false` | `false` | Optional buyer to filter by. |
+| `group` | `Boolean` | `false` | If `true`, groups tickets by owner. |
 
-**Returns:**
+**Returns (ungrouped):**
 
 ```js
 {
@@ -468,6 +472,28 @@ const myTickets = await lottery.GetTickets(authority, lotteryId, buyer);
 }
 ```
 
+**Returns (grouped, `group = true`):**
+
+```js
+{
+  lotteryId: 1,
+  lotteryAddress: "Pubkey...",
+  lotteryAuth: "Pubkey...",
+  buyer: "All",
+  tickets: [
+    {
+      owner: "Pubkey...",
+      ticketCount: 3,
+      tickets: [
+        { owner: "Pubkey...", lottery: "Pubkey...", ticketReceipt: "Pubkey...", ticketNumber: 42, ticketPda: "Pubkey..." },
+        // ...
+      ],
+    },
+    // ... one entry per unique owner
+  ],
+}
+```
+
 ---
 
 #### WatchDraw

package/package.json

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

package/solotto.d.ts

@@ -107,14 +107,23 @@ declare module "solotto" {
     ticketPda: string;
   }
 
+  interface GroupedTicketOwner {
+    /** Owner wallet public key. */
+    owner: string;
+    /** Number of tickets owned. */
+    ticketCount: number;
+    /** Array of ticket objects for this owner. */
+    tickets: TicketListItem[];
+  }
+
   interface TicketListResult {
     lotteryId: number;
     lotteryAddress: string;
     lotteryAuth: string;
     /** The buyer's public key, or `"All"` if unfiltered. */
     buyer: string;
-    /** Tickets sorted descending by ticket number. */
-    tickets: TicketListItem[];
+    /** Tickets sorted descending by ticket number, or grouped by owner when `group = true`. */
+    tickets: TicketListItem[] | GroupedTicketOwner[];
   }
 
   // ── WatchDraw Events ──────────────────────────────────────────────────
@@ -283,11 +292,12 @@ declare module "solotto" {
       ticket: number
     ): Promise<TicketInfo>;
 
-    /** Fetch all tickets for a lottery, optionally filtered by buyer. */
+    /** Fetch all tickets for a lottery, optionally filtered by buyer and/or grouped by owner. */
     GetTickets(
       authority: HasPublicKey,
       lotteryId: number,
-      buyer?: HasPublicKey | false
+      buyer?: HasPublicKey | false,
+      group?: boolean
     ): Promise<TicketListResult>;
 
     /**

package/solotto.js

@@ -429,12 +429,7 @@ class Lottery extends EventEmitter {
      * @param {Number} lotteryId - Lottery Id 
      * @param {PublicKey} buyer - Ticket Buyer Optional
     */
-    async GetTickets(authority, lotteryId, buyer = false) {
-        async function numberToBase58(num, byteLength = 8) {
-            const buffer = Buffer.alloc(byteLength);
-            buffer.writeBigUInt64LE(BigInt(num), 0);
-            return bs58.encode(buffer);
-        }
+    async GetTickets(authority, lotteryId, buyer = false, group = false) {
         const [lotteryPDA] = await this.DeriveLotteryPDA(authority.publicKey, lotteryId);
         const filters = [];
         filters.push({dataSize: 104});
@@ -446,8 +441,7 @@ class Lottery extends EventEmitter {
         while(i < data_.length){
             const data = data_[i];
             const newTicket = {};
-            const account = await this.connection.getAccountInfo(data.pubkey);
-            const decoded = this.TICKET_STATE.decode(account.data);
+            const decoded = this.TICKET_STATE.decode(data.account.data);
             newTicket.owner = new PublicKey(decoded.owner).toString();
             newTicket.lottery = new PublicKey(decoded.lottery).toString();
             newTicket.ticketReceipt = new PublicKey(decoded.ticketReceipt).toString();
@@ -457,6 +451,24 @@ class Lottery extends EventEmitter {
             i++;
         }
         tickets.sort((a, b) => b.ticketNumber - a.ticketNumber);
+        
+        let processedTickets = tickets;
+        if(group){
+            const grouped = {};
+            tickets.forEach(ticket => {
+                if(!grouped[ticket.owner]){
+                    grouped[ticket.owner] = {
+                        owner: ticket.owner,
+                        ticketCount: 0,
+                        tickets: []
+                    };
+                }
+                grouped[ticket.owner].tickets.push(ticket);
+                grouped[ticket.owner].ticketCount++;
+            });
+            processedTickets = Object.values(grouped);
+        }
+        
         let _buyer_ = "All";
         if(buyer){_buyer_ = buyer.publicKey.toString();}
         return {
@@ -464,7 +476,7 @@ class Lottery extends EventEmitter {
             lotteryAddress: lotteryPDA.toString(),
             lotteryAuth: authority.publicKey.toString(),
             buyer: _buyer_,
-            tickets: tickets,
+            tickets: processedTickets,
         };
     }