solotto 1.0.7 → 1.0.8

package/README.md

@@ -19,11 +19,11 @@ A JavaScript SDK for interacting with the Solotto on-chain lottery program on So
     - [RandomDraw](#randomdraw)
     - [LockLottery](#locklottery)
     - [ClaimExpired](#claimexpired)
-    - [Boost](#boost)
-    - [GetBoosters](#getboosters)
   - [Lottery](#lottery-api)
     - [BuyTickets](#buytickets)
     - [ClaimTicket](#claimticket)
+    - [Boost](#boost)
+    - [GetBoosters](#getboosters)
     - [GetLottery](#getlottery)
     - [GetTicket](#getticket)
     - [GetTickets](#gettickets)
@@ -72,8 +72,8 @@ Solotto is organized into three exported classes, each handling a different laye
 
 | Class | Role |
 |---|---|
-| **`LotteryManager`** | Admin operations — initialize lotteries, trigger draws, lock/unlock ticket sales. |
-| **`Lottery`** | Player & read operations — buy tickets, claim prizes, query lottery/ticket state, watch draws via WebSocket. |
+| **`LotteryManager`** | Admin operations — initialize lotteries, trigger draws, lock/unlock ticket sales, reclaim expired prizes. |
+| **`Lottery`** | Player & read operations — buy tickets, claim prizes, boost prize pools, query lottery/ticket/booster state, watch draws via WebSocket. |
 | **`LotteryNetwork`** | Low-level transaction utilities — build, simulate, send, and confirm transactions with automatic compute budget and priority fee estimation. |
 
 ---
@@ -219,16 +219,77 @@ const result = await manager.ClaimExpired(authority, lotteryId, encoded);
 
 ---
 
+### Lottery API
+
+#### BuyTickets
+
+Purchases one or more tickets for a lottery. Supports buying up to 4 tickets in a single transaction.
+
+```js
+const lottery = new Lottery(connection, false, programId);
+
+const result = await lottery.BuyTickets(buyer, authority, lotteryId, amount, encoded);
+```
+
+| Parameter | Type | Default | Description |
+|---|---|---|---|
+| `buyer` | `Keypair` | — | The keypair of the ticket buyer. |
+| `authority` | `Keypair \| {publicKey}` | — | The lottery authority (only `publicKey` is needed). |
+| `lotteryId` | `Number` | — | The lottery ID to buy tickets for. |
+| `amount` | `Number` | `1` | Number of tickets to purchase (1–4). |
+| `encoded` | `Boolean` | `false` | If `true`, returns encoded transaction. |
+
+**Returns:** `"finalized"` on success, `"Lottery is not active, no tickets can be sold"` if the lottery is inactive, or the transaction object when encoded.
+
+**Example:**
+
+```js
+import { Connection, PublicKey, Keypair } from "@solana/web3.js";
+import { Lottery } from "solotto";
+
+const connection = new Connection("https://api.mainnet-beta.solana.com");
+const programId = new PublicKey("YOUR_PROGRAM_ID");
+const lottery = new Lottery(connection, false, programId);
+
+const buyer = Keypair.generate();
+const authority = { publicKey: new PublicKey("LOTTERY_AUTHORITY_PUBKEY") };
+
+// Buy 2 tickets for lottery #1
+const result = await lottery.BuyTickets(buyer, authority, 1, 2);
+console.log(result); // "finalized"
+```
+
+---
+
+#### ClaimTicket
+
+Claims the prize for the winning ticket. Must be called by the ticket owner.
+
+```js
+const result = await lottery.ClaimTicket(authority, lotteryId, winner, encoded);
+```
+
+| Parameter | Type | Default | Description |
+|---|---|---|---|
+| `authority` | `{publicKey}` | — | The lottery authority (only `publicKey` is needed). |
+| `lotteryId` | `Number` | — | The lottery ID. |
+| `winner` | `Keypair` | — | The keypair of the winning ticket's owner. |
+| `encoded` | `Boolean` | `false` | If `true`, returns encoded transaction. |
+
+**Returns:** `"finalized"` on success, the simulation log array (`string[]`) if the transaction fails simulation, or the transaction object when encoded.
+
+---
+
 #### Boost
 
 Boosts a lottery's prize pool by transferring SOL from any wallet. Can be called by anyone, not just the authority. Optionally attaches a memo message to the transaction.
 
 ```js
 // Boost lottery #1 with 0.5 SOL
-const result = await manager.Boost(authority, lotteryId, booster, 0.5);
+const result = await lottery.Boost(authority, lotteryId, booster, 0.5);
 
 // Boost with a memo message
-const result = await manager.Boost(authority, lotteryId, booster, 1.0, "Good luck everyone!");
+const result = await lottery.Boost(authority, lotteryId, booster, 1.0, "Good luck everyone!");
 ```
 
 | Parameter | Type | Default | Description |
@@ -252,13 +313,13 @@ Retrieves boost history by scanning on-chain program logs for boost transactions
 
 ```js
 // Get all boosters for a specific lottery
-const boosters = await manager.GetBoosters(authority, lotteryId);
+const boosters = await lottery.GetBoosters(authority, lotteryId);
 
 // Get all boosters across all lotteries (up to 500 transactions)
-const allBoosters = await manager.GetBoosters(false, false, false, 500);
+const allBoosters = await lottery.GetBoosters(false, false, false, 500);
 
 // Get boosters grouped by wallet address
-const grouped = await manager.GetBoosters(authority, lotteryId, true);
+const grouped = await lottery.GetBoosters(authority, lotteryId, true);
 ```
 
 | Parameter | Type | Default | Description |
@@ -302,67 +363,6 @@ const grouped = await manager.GetBoosters(authority, lotteryId, true);
 
 ---
 
-### Lottery API
-
-#### BuyTickets
-
-Purchases one or more tickets for a lottery. Supports buying up to 4 tickets in a single transaction.
-
-```js
-const lottery = new Lottery(connection, false, programId);
-
-const result = await lottery.BuyTickets(buyer, authority, lotteryId, amount, encoded);
-```
-
-| Parameter | Type | Default | Description |
-|---|---|---|---|
-| `buyer` | `Keypair` | — | The keypair of the ticket buyer. |
-| `authority` | `Keypair \| {publicKey}` | — | The lottery authority (only `publicKey` is needed). |
-| `lotteryId` | `Number` | — | The lottery ID to buy tickets for. |
-| `amount` | `Number` | `1` | Number of tickets to purchase (1–4). |
-| `encoded` | `Boolean` | `false` | If `true`, returns encoded transaction. |
-
-**Returns:** `"finalized"` on success, `"Lottery is not active, no tickets can be sold"` if the lottery is inactive, or the transaction object when encoded.
-
-**Example:**
-
-```js
-import { Connection, PublicKey, Keypair } from "@solana/web3.js";
-import { Lottery } from "solotto";
-
-const connection = new Connection("https://api.mainnet-beta.solana.com");
-const programId = new PublicKey("YOUR_PROGRAM_ID");
-const lottery = new Lottery(connection, false, programId);
-
-const buyer = Keypair.generate();
-const authority = { publicKey: new PublicKey("LOTTERY_AUTHORITY_PUBKEY") };
-
-// Buy 2 tickets for lottery #1
-const result = await lottery.BuyTickets(buyer, authority, 1, 2);
-console.log(result); // "finalized"
-```
-
----
-
-#### ClaimTicket
-
-Claims the prize for the winning ticket. Must be called by the ticket owner.
-
-```js
-const result = await lottery.ClaimTicket(authority, lotteryId, winner, encoded);
-```
-
-| Parameter | Type | Default | Description |
-|---|---|---|---|
-| `authority` | `{publicKey}` | — | The lottery authority (only `publicKey` is needed). |
-| `lotteryId` | `Number` | — | The lottery ID. |
-| `winner` | `Keypair` | — | The keypair of the winning ticket's owner. |
-| `encoded` | `Boolean` | `false` | If `true`, returns encoded transaction. |
-
-**Returns:** `"finalized"` on success, the simulation log array (`string[]`) if the transaction fails simulation, or the transaction object when encoded.
-
----
-
 #### GetLottery
 
 Fetches the full on-chain state of a lottery.

package/package.json

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

package/solotto.d.ts

@@ -290,6 +290,50 @@ declare module "solotto" {
       buyer?: HasPublicKey | false
     ): Promise<TicketListResult>;
 
+    /**
+     * Boost a lottery's prize pool by transferring SOL from any wallet.
+     * @param authority - The lottery authority (only `publicKey` needed).
+     * @param lotteryId - Lottery numeric identifier.
+     * @param booster   - The keypair of the wallet sending the boost.
+     * @param amount    - Amount of SOL to boost (e.g. `0.5` for 0.5 SOL).
+     * @param message   - Optional memo string attached to the transaction.
+     * @param encoded   - If `true`, return a base64-encoded transaction.
+     */
+    Boost(
+      authority: HasPublicKey,
+      lotteryId: number,
+      booster: Keypair,
+      amount: number,
+      message?: string | false,
+      encoded?: boolean
+    ): Promise<string | TxResult | undefined>;
+
+    /**
+     * Retrieve boost history from on-chain program logs.
+     * @param authority - Filter by lottery authority, or `false` for all.
+     * @param lotteryId - Filter by lottery ID, or `false` for all.
+     * @param group     - If `true`, group results by booster wallet address.
+     * @param limit     - Maximum number of recent transactions to scan (max 1000).
+     */
+    GetBoosters(
+      authority?: HasPublicKey | false,
+      lotteryId?: number | false,
+      group?: false,
+      limit?: number
+    ): Promise<BoosterRecord[]>;
+    GetBoosters(
+      authority: HasPublicKey | false,
+      lotteryId: number | false,
+      group: true,
+      limit?: number
+    ): Promise<GroupedBoostersResult>;
+    GetBoosters(
+      authority?: HasPublicKey | false,
+      lotteryId?: number | false,
+      group?: boolean,
+      limit?: number
+    ): Promise<BoosterRecord[] | GroupedBoostersResult>;
+
     /** Derive the lottery PDA. */
     DeriveLotteryPDA(
       authority: PublicKey,
@@ -367,49 +411,5 @@ declare module "solotto" {
       lotteryId: number,
       encoded?: boolean
     ): Promise<LotteryState | string | TxResult | undefined>;
-
-    /**
-     * Boost a lottery's prize pool by transferring SOL from any wallet.
-     * @param authority - The lottery authority (only `publicKey` needed).
-     * @param lotteryId - Lottery numeric identifier.
-     * @param booster   - The keypair of the wallet sending the boost.
-     * @param amount    - Amount of SOL to boost (e.g. `0.5` for 0.5 SOL).
-     * @param message   - Optional memo string attached to the transaction.
-     * @param encoded   - If `true`, return a base64-encoded transaction.
-     */
-    Boost(
-      authority: HasPublicKey,
-      lotteryId: number,
-      booster: Keypair,
-      amount: number,
-      message?: string | false,
-      encoded?: boolean
-    ): Promise<string | TxResult | undefined>;
-
-    /**
-     * Retrieve boost history from on-chain transaction memos.
-     * @param authority - Filter by lottery authority, or `false` for all.
-     * @param lotteryId - Filter by lottery ID, or `false` for all.
-     * @param group     - If `true`, group results by booster wallet address.
-     * @param limit     - Maximum number of recent transactions to scan (max 1000).
-     */
-    GetBoosters(
-      authority?: HasPublicKey | false,
-      lotteryId?: number | false,
-      group?: false,
-      limit?: number
-    ): Promise<BoosterRecord[]>;
-    GetBoosters(
-      authority: HasPublicKey | false,
-      lotteryId: number | false,
-      group: true,
-      limit?: number
-    ): Promise<GroupedBoostersResult>;
-    GetBoosters(
-      authority?: HasPublicKey | false,
-      lotteryId?: number | false,
-      group?: boolean,
-      limit?: number
-    ): Promise<BoosterRecord[] | GroupedBoostersResult>;
   }
 }

package/solotto.js

@@ -574,6 +574,149 @@ class Lottery extends EventEmitter {
       return PublicKey.findProgramAddressSync([Buffer.from("prize-pool")], this.program);
     }
 
+    /**
+     * @param {Keypair} authority - Keypair
+     * @param {String} lotteryId - The lottery id
+     * @param {Keypair} booster - The booster's keypair
+     * @param {Number} amount - The amount of sol to boost
+     * @param {Boolean} encoded - true returns encoded transaction
+    */
+    async Boost(authority, lotteryId, booster, amount, message = false, encoded = false) {
+        try{
+            async function boostData(lotId, amount) {
+                const lamports = parseInt(amount * LAMPORTS_PER_SOL);
+                const buffer = Buffer.alloc(17); // 1 byte discriminator + 1 bytes price + 8 bytes id
+                buffer.writeUInt8(INSTRUCTIONS.BOOST_LOTTERY, 0); // boostLottery discriminator
+                buffer.writeBigUInt64LE(BigInt(lotId), 1);
+                buffer.writeBigUInt64LE(BigInt(lamports), 9);
+                return buffer;
+            }
+            if(message){message = ":booster:"+message;}
+            const network = new LotteryNetwork(this.connection);
+            const [lotteryPDA] = await this.DeriveLotteryPDA(authority.publicKey, lotteryId);
+            const LOTTO = await this.GetLottery(authority, lotteryId);
+            const keys = [
+                { pubkey: booster.publicKey, isSigner: true, isWritable: true },
+                { pubkey: lotteryPDA, isSigner: false, isWritable: true },
+                { pubkey: new PublicKey(LOTTO.prizePoolAddress), isSigner: false, isWritable: true },
+                { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
+            ];
+            const ix = new TransactionInstruction(
+                {programId: this.program, keys, data: await boostData(lotteryId, amount)}
+            );
+            const _tx_ = {};
+            _tx_.account = booster.publicKey.toString();   // string : required
+            _tx_.instructions = [ix];                      // array  : required
+            _tx_.signers = false;                          // array  : default false
+            _tx_.table = false;                            // array  : default false
+            _tx_.tolerance = 1.2;                          // int    : default 1.1    
+            _tx_.compute = true;                           // bool   : default true
+            _tx_.fees = true;                              // bool   : default true
+            _tx_.priority = "Low";                         // string : default Low
+            _tx_.memo = message;
+            if(encoded){
+                _tx_.serialize = true;                        
+                _tx_.encode = true;  
+            }
+            else{
+                _tx_.serialize = false;                        
+                _tx_.encode = false;  
+            }
+            const tx = await network.Tx(_tx_); 
+            if(tx.logs && tx.logs.includes("Program log: Lottery draw has been initiated, cannot boost prize pool")){
+                return "Draw initiated, cannot boost this prize pool";
+            }
+            if(tx.status !== "ok"){return tx;}
+            if(booster.secretKey && !encoded){
+                tx.transaction.sign([booster]);
+                const sig = await network.Send(tx.transaction);
+                console.log("Signature:", sig);
+                const status = await network.Status(sig);
+                if(status == "finalized"){
+                    return "boosted";
+                }
+                else{return status;}
+            }
+            else{return tx;}           
+        }
+        catch (error) {
+            console.log(error);
+        }
+    }
+
+    /**
+     * @param {Keypair} authority - Keypair
+     * @param {Number} lotteryId - The lottery id
+     * @param {Boolean} group - if true, groups results by booster wallet address
+     * @param {Number} limit - the results to request (max 1000)
+     * @returns {Array|Object} - Array of booster objects or grouped booster objects if group=true
+    */
+    async GetBoosters(authority=false, lotteryId=false, group=false, limit=1000) {
+        try{
+            const initial = [];
+            const result = [];
+            const signatures = await this.connection.getSignaturesForAddress(this.program, {limit: limit,});
+            for await (const row of signatures) {
+                if(!row.err && row.confirmationStatus=="finalized" && row.memo && row.memo.includes(":booster:")){
+                    initial.push(row);
+                }
+            }
+            for await (const init of initial) {
+                const tx = await this.connection.getTransaction(init.signature,{maxSupportedTransactionVersion:0});
+                const logs = tx.meta.logMessages;
+                const item = {};
+                let isBooster = false;
+                for await (const log of logs){if(log.includes("Program log: Boosted by")){isBooster=true;}}
+                if(!isBooster){continue;}
+                for await (const log of logs) {
+                    if(log.includes("Program log: Boosted by ")){
+                        item.booster = log.replace("Program log: Boosted by ","").trim();
+                    }
+                    else if(log.includes("Program log: Lottery ID ")){
+                        item.lotteryId = Number(log.replace("Program log: Lottery ID ","").trim());
+                    }
+                    else if(log.includes("Program log: Boost amount: ")){
+                        const data = log.replace("Program log: Boost amount: ","").trim();
+                        item.amount = parseFloat(data.split(" SOL ")[0]);
+                    }
+                    else if(log.includes("Program log: Memo ")){
+                        const parts = log.split(":booster:");
+                        item.message = parts[1].slice(0, -1).trim();
+                    }
+                    else if(log.includes("Program log: Authority ")){
+                        item.authority = log.replace("Program log: Authority ","").trim();
+                    }
+                }
+                // Apply filters with safety checks
+                const matchesAuthority = authority ? (item.authority && authority.publicKey.toString() === item.authority) : true;
+                const matchesLotteryId = lotteryId ? (item.lotteryId !== undefined && lotteryId.toString() === item.lotteryId.toString()) : true;
+                if(matchesAuthority && matchesLotteryId && item.amount >= 0.0001){
+                    item.signature = init.signature;
+                    result.push(item);
+                }
+            }
+            // Group by booster if requested
+            if (group) {
+                const grouped = {};
+                result.forEach(item => {
+                    if (!grouped[item.booster]) {
+                        grouped[item.booster] = {
+                            boost: [],
+                            total: 0,
+                            count: 0
+                        };
+                    }
+                    grouped[item.booster].boost.push(item);
+                    grouped[item.booster].total += item.amount;
+                    grouped[item.booster].count = grouped[item.booster].boost.length;
+                });
+                return grouped;
+            }
+            return result;
+        }
+        catch (error) {return error;}
+    }
+
 }
 
 class LotteryManager {
@@ -823,150 +966,6 @@ class LotteryManager {
         }
     }
 
-    /**
-     * @param {Keypair} authority - Keypair
-     * @param {String} lotteryId - The lottery id
-     * @param {Keypair} booster - The booster's keypair
-     * @param {Number} amount - The amount of sol to boost
-     * @param {Boolean} encoded - true returns encoded transaction
-    */
-    async Boost(authority, lotteryId, booster, amount, message = false, encoded = false) {
-        try{
-            async function boostData(lotId, amount) {
-                const lamports = parseInt(amount * LAMPORTS_PER_SOL);
-                const buffer = Buffer.alloc(17); // 1 byte discriminator + 1 bytes price + 8 bytes id
-                buffer.writeUInt8(INSTRUCTIONS.BOOST_LOTTERY, 0); // boostLottery discriminator
-                buffer.writeBigUInt64LE(BigInt(lotId), 1);
-                buffer.writeBigUInt64LE(BigInt(lamports), 9);
-                return buffer;
-            }
-            if(message){message = ":booster:"+message;}
-            const lottery = new Lottery(this.connection, false, this.program);
-            const network = new LotteryNetwork(this.connection);
-            const [lotteryPDA] = await lottery.DeriveLotteryPDA(authority.publicKey, lotteryId);
-            const LOTTO = await lottery.GetLottery(authority, lotteryId);
-            const keys = [
-                { pubkey: booster.publicKey, isSigner: true, isWritable: true },
-                { pubkey: lotteryPDA, isSigner: false, isWritable: true },
-                { pubkey: new PublicKey(LOTTO.prizePoolAddress), isSigner: false, isWritable: true },
-                { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
-            ];
-            const ix = new TransactionInstruction(
-                {programId: this.program, keys, data: await boostData(lotteryId, amount)}
-            );
-            const _tx_ = {};
-            _tx_.account = booster.publicKey.toString();   // string : required
-            _tx_.instructions = [ix];                      // array  : required
-            _tx_.signers = false;                          // array  : default false
-            _tx_.table = false;                            // array  : default false
-            _tx_.tolerance = 1.2;                          // int    : default 1.1    
-            _tx_.compute = true;                           // bool   : default true
-            _tx_.fees = true;                              // bool   : default true
-            _tx_.priority = "Low";                         // string : default Low
-            _tx_.memo = message;
-            if(encoded){
-                _tx_.serialize = true;                        
-                _tx_.encode = true;  
-            }
-            else{
-                _tx_.serialize = false;                        
-                _tx_.encode = false;  
-            }
-            const tx = await network.Tx(_tx_); 
-            if(tx.logs && tx.logs.includes("Program log: Lottery draw has been initiated, cannot boost prize pool")){
-                return "Draw initiated, cannot boost this prize pool";
-            }
-            if(tx.status !== "ok"){return tx;}
-            if(booster.secretKey && !encoded){
-                tx.transaction.sign([booster]);
-                const sig = await network.Send(tx.transaction);
-                console.log("Signature:", sig);
-                const status = await network.Status(sig);
-                if(status == "finalized"){
-                    return "boosted";
-                }
-                else{return status;}
-            }
-            else{return tx;}           
-        }
-        catch (error) {
-            console.log(error);
-        }
-    }
-
-    /**
-     * @param {Keypair} authority - Keypair
-     * @param {Number} lotteryId - The lottery id
-     * @param {Boolean} group - if true, groups results by booster wallet address
-     * @param {Number} limit - the results to request (max 1000)
-     * @returns {Array|Object} - Array of booster objects or grouped booster objects if group=true
-    */
-    async GetBoosters(authority=false, lotteryId=false, group=false, limit=1000) {
-        try{
-            const initial = [];
-            const result = [];
-            const signatures = await this.connection.getSignaturesForAddress(this.program, {limit: limit,});
-            for await (const row of signatures) {
-                if(!row.err && row.confirmationStatus=="finalized" && row.memo && row.memo.includes(":booster:")){
-                    initial.push(row);
-                }
-            }
-            for await (const init of initial) {
-                const tx = await this.connection.getTransaction(init.signature,{maxSupportedTransactionVersion:0});
-                const logs = tx.meta.logMessages;
-                const item = {};
-                let isBooster = false;
-                for await (const log of logs){if(log.includes("Program log: Boosted by")){isBooster=true;}}
-                if(!isBooster){continue;}
-                for await (const log of logs) {
-                    if(log.includes("Program log: Boosted by ")){
-                        item.booster = log.replace("Program log: Boosted by ","").trim();
-                    }
-                    else if(log.includes("Program log: Lottery ID ")){
-                        item.lotteryId = Number(log.replace("Program log: Lottery ID ","").trim());
-                    }
-                    else if(log.includes("Program log: Boost amount: ")){
-                        const data = log.replace("Program log: Boost amount: ","").trim();
-                        item.amount = parseFloat(data.split(" SOL ")[0]);
-                    }
-                    else if(log.includes("Program log: Memo ")){
-                        const parts = log.split(":booster:");
-                        item.message = parts[1].slice(0, -1).trim();
-                    }
-                    else if(log.includes("Program log: Authority ")){
-                        item.authority = log.replace("Program log: Authority ","").trim();
-                    }
-                }
-                // Apply filters with safety checks
-                const matchesAuthority = authority ? (item.authority && authority.publicKey.toString() === item.authority) : true;
-                const matchesLotteryId = lotteryId ? (item.lotteryId !== undefined && lotteryId.toString() === item.lotteryId.toString()) : true;
-                if(matchesAuthority && matchesLotteryId && item.amount >= 0.0001){
-                    item.signature = init.signature;
-                    result.push(item);
-                }
-            }
-            // Group by booster if requested
-            if (group) {
-                const grouped = {};
-                result.forEach(item => {
-                    if (!grouped[item.booster]) {
-                        grouped[item.booster] = {
-                            boost: [],
-                            total: 0,
-                            count: 0
-                        };
-                    }
-                    grouped[item.booster].boost.push(item);
-                    grouped[item.booster].total += item.amount;
-                    grouped[item.booster].count = grouped[item.booster].boost.length;
-                });
-                return grouped;
-            }
-            return result;
-        }
-        catch (error) {return error;}
-    }
-
 }
 
 export {