solotto 1.1.5 → 1.2.1

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)

package/package.json

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

package/solotto.d.ts

@@ -402,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()});
@@ -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,13 +896,12 @@ 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: authority.publicKey, isSigner: true, isWritable: true },
                 { pubkey: lotteryPDA, isSigner: false, isWritable: true },
                 { pubkey: SYSVAR_SLOT_HASHES_PUBKEY, isSigner: false, isWritable: false },
                 { pubkey: prizePoolPDA, isSigner: false, isWritable: true },
-                { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
             ];
             const ix = new TransactionInstruction({programId: this.program, keys, data: await randomnessData()});
             const _tx_ = {};
@@ -1018,7 +1020,6 @@ class LotteryManager {
                 { pubkey: authority.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 expiredData()});
             const _tx_ = {};