proof-of-take-sdk 3.0.1 → 3.0.2

package/dist/client.js

@@ -20,7 +20,7 @@ const anchorHelpers_1 = require("./utils/anchorHelpers");
  * ```
  */
 function createProgram(provider) {
-    return new anchor_1.Program(idl_1.IDL, provider);
+    return new anchor_1.Program(idl_1.ANCHOR_IDL, provider);
 }
 /**
  * Create a Proof of Take program instance with custom program ID
@@ -32,7 +32,7 @@ function createProgram(provider) {
 function createProgramWithId(provider, programId) {
     // Anchor v0.32 Program ctor does not accept a programId param; it uses `idl.address`.
     // So we clone the IDL and override its address to point at the provided programId.
-    const idlWithAddress = (0, anchorHelpers_1.withIdlAddress)(idl_1.IDL, programId);
+    const idlWithAddress = (0, anchorHelpers_1.withIdlAddress)(idl_1.ANCHOR_IDL, programId);
     return new anchor_1.Program(idlWithAddress, provider);
 }
 /**
@@ -43,5 +43,5 @@ function createProgramWithId(provider, programId) {
  */
 function getProgramReadOnly(connection) {
     const provider = (0, anchorHelpers_1.createReadOnlyProvider)(connection, "confirmed");
-    return new anchor_1.Program(idl_1.IDL, provider);
+    return new anchor_1.Program(idl_1.ANCHOR_IDL, provider);
 }

package/dist/getters/getMiztake.d.ts

@@ -1,11 +1,11 @@
 import { Connection, PublicKey } from "@solana/web3.js";
-import { Miztake } from "../types";
+import { Miztake, Sha256HexString } from "../types";
 /**
  * Get a miztake account by SHA hash
  * @param connection - Solana connection
  * @param shaHash - SHA hash of the miztake
  * @returns Miztake account data
  */
-export declare function getMiztake(connection: Connection, shaHash: string): Promise<Miztake & {
+export declare function getMiztake(connection: Connection, shaHash: Sha256HexString | string): Promise<Miztake & {
     publicKey: PublicKey;
 }>;

package/dist/getters/getMiztake.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMiztake = getMiztake;
 const pdas_1 = require("../utils/pdas");
 const programHelpers_1 = require("../utils/programHelpers");
+const accountConverters_1 = require("../utils/accountConverters");
 /**
  * Get a miztake account by SHA hash
  * @param connection - Solana connection
@@ -15,20 +16,6 @@ async function getMiztake(connection, shaHash) {
     const miztake = await program.account.miztake.fetch(miztakePda);
     return {
         publicKey: miztakePda,
-        id: miztake.id,
-        telegramId: miztake.telegramId,
-        telegramUsername: miztake.telegramUsername,
-        perceptualHash: miztake.perceptualHash,
-        averageHash: miztake.averageHash,
-        differenceHash: miztake.differenceHash,
-        waveletHash: miztake.waveletHash,
-        shaHash: miztake.shaHash,
-        computedAt: miztake.computedAt,
-        creator: miztake.creator,
-        userStats: miztake.userStats,
-        userKey: miztake.userKey,
-        onchainCreatedAt: miztake.onchainCreatedAt,
-        usedInSeason: miztake.usedInSeason,
-        usedInWindow: miztake.usedInWindow,
+        ...(0, accountConverters_1.toSdkMiztake)(miztake),
     };
 }

package/dist/getters/getMiztakeStatistics.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMiztakeStatistics = getMiztakeStatistics;
 const pdas_1 = require("../utils/pdas");
 const programHelpers_1 = require("../utils/programHelpers");
+const accountConverters_1 = require("../utils/accountConverters");
 /**
  * Get miztake statistics account
  * @param connection - Solana connection
@@ -14,7 +15,6 @@ async function getMiztakeStatistics(connection) {
     const statistics = await program.account.miztakeStatistics.fetch(statisticsPda);
     return {
         publicKey: statisticsPda,
-        totalMiztakes: statistics.totalMiztakes,
-        bump: statistics.bump,
+        ...(0, accountConverters_1.toSdkMiztakeStatistics)(statistics),
     };
 }

package/dist/getters/getReferralPenaltyClaim.d.ts

@@ -0,0 +1,9 @@
+import { BN } from "@coral-xyz/anchor";
+import { Connection, PublicKey } from "@solana/web3.js";
+import { ReferralPenaltyClaim, TierNumber, WindowNumberLike } from "../types";
+/**
+ * Get ReferralPenaltyClaim by seeds
+ */
+export declare function getReferralPenaltyClaim(connection: Connection, seasonNumber: BN, referredUser: PublicKey, tier: TierNumber, windowNumber: WindowNumberLike): Promise<ReferralPenaltyClaim & {
+    publicKey: PublicKey;
+}>;

package/dist/getters/getReferralPenaltyClaim.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getReferralPenaltyClaim = getReferralPenaltyClaim;
+const pdas_1 = require("../utils/pdas");
+const programHelpers_1 = require("../utils/programHelpers");
+const accountConverters_1 = require("../utils/accountConverters");
+const conversions_1 = require("../utils/conversions");
+/**
+ * Get ReferralPenaltyClaim by seeds
+ */
+async function getReferralPenaltyClaim(connection, seasonNumber, referredUser, tier, windowNumber) {
+    const program = (0, programHelpers_1.getProgram)(connection);
+    const windowBn = (0, conversions_1.toWindowNumberBn)(windowNumber);
+    const [pda] = (0, pdas_1.getReferralPenaltyClaimPda)(seasonNumber, referredUser, tier, windowBn);
+    const claim = await program.account.referralPenaltyClaim.fetch(pda);
+    return {
+        publicKey: pda,
+        ...(0, accountConverters_1.toSdkReferralPenaltyClaim)(claim),
+    };
+}

package/dist/getters/getRewardWindow.d.ts

@@ -0,0 +1,9 @@
+import { BN } from "@coral-xyz/anchor";
+import { Connection, PublicKey } from "@solana/web3.js";
+import { RewardWindow, WindowNumberLike } from "../types";
+/**
+ * Get RewardWindow by season + window number
+ */
+export declare function getRewardWindow(connection: Connection, seasonNumber: BN, windowNumber: WindowNumberLike): Promise<RewardWindow & {
+    publicKey: PublicKey;
+}>;

package/dist/getters/getRewardWindow.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRewardWindow = getRewardWindow;
+const pdas_1 = require("../utils/pdas");
+const programHelpers_1 = require("../utils/programHelpers");
+const accountConverters_1 = require("../utils/accountConverters");
+const conversions_1 = require("../utils/conversions");
+/**
+ * Get RewardWindow by season + window number
+ */
+async function getRewardWindow(connection, seasonNumber, windowNumber) {
+    const program = (0, programHelpers_1.getProgram)(connection);
+    const windowBn = (0, conversions_1.toWindowNumberBn)(windowNumber);
+    const [rewardWindowPda] = (0, pdas_1.getRewardWindowPda)(seasonNumber, windowBn);
+    const window = await program.account.rewardWindow.fetch(rewardWindowPda);
+    return {
+        publicKey: rewardWindowPda,
+        ...(0, accountConverters_1.toSdkRewardWindow)(window),
+    };
+}

package/dist/getters/getSeason.d.ts

@@ -0,0 +1,8 @@
+import { Connection, PublicKey } from "@solana/web3.js";
+import { Season, SeasonNumberLike } from "../types";
+/**
+ * Get Season by season number
+ */
+export declare function getSeason(connection: Connection, seasonNumber: SeasonNumberLike): Promise<Season & {
+    publicKey: PublicKey;
+}>;

package/dist/getters/getSeason.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSeason = getSeason;
+const pdas_1 = require("../utils/pdas");
+const programHelpers_1 = require("../utils/programHelpers");
+const accountConverters_1 = require("../utils/accountConverters");
+const conversions_1 = require("../utils/conversions");
+/**
+ * Get Season by season number
+ */
+async function getSeason(connection, seasonNumber) {
+    const program = (0, programHelpers_1.getProgram)(connection);
+    const seasonBn = (0, conversions_1.toSeasonNumberBn)(seasonNumber);
+    const [seasonPda] = (0, pdas_1.getSeasonPda)(seasonBn);
+    const season = await program.account.season.fetch(seasonPda);
+    return {
+        publicKey: seasonPda,
+        ...(0, accountConverters_1.toSdkSeason)(season),
+    };
+}

package/dist/getters/getSeasonMembership.d.ts

@@ -0,0 +1,9 @@
+import { BN } from "@coral-xyz/anchor";
+import { Connection, PublicKey } from "@solana/web3.js";
+import { SeasonMembership, TierNumber } from "../types";
+/**
+ * Get SeasonMembership by seeds
+ */
+export declare function getSeasonMembership(connection: Connection, seasonNumber: BN, user: PublicKey, tier: TierNumber): Promise<SeasonMembership & {
+    publicKey: PublicKey;
+}>;

package/dist/getters/getSeasonMembership.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSeasonMembership = getSeasonMembership;
+const pdas_1 = require("../utils/pdas");
+const programHelpers_1 = require("../utils/programHelpers");
+const accountConverters_1 = require("../utils/accountConverters");
+/**
+ * Get SeasonMembership by seeds
+ */
+async function getSeasonMembership(connection, seasonNumber, user, tier) {
+    const program = (0, programHelpers_1.getProgram)(connection);
+    const [membershipPda] = (0, pdas_1.getSeasonMembershipPda)(seasonNumber, user, tier);
+    const membership = await program.account.seasonMembership.fetch(membershipPda);
+    return {
+        publicKey: membershipPda,
+        ...(0, accountConverters_1.toSdkSeasonMembership)(membership),
+    };
+}

package/dist/getters/getSeasonSettings.d.ts

@@ -0,0 +1,8 @@
+import { Connection, PublicKey } from "@solana/web3.js";
+import { SeasonSettings } from "../types";
+/**
+ * Get SeasonSettings (singleton)
+ */
+export declare function getSeasonSettings(connection: Connection): Promise<SeasonSettings & {
+    publicKey: PublicKey;
+}>;

package/dist/getters/getSeasonSettings.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSeasonSettings = getSeasonSettings;
+const pdas_1 = require("../utils/pdas");
+const programHelpers_1 = require("../utils/programHelpers");
+const accountConverters_1 = require("../utils/accountConverters");
+/**
+ * Get SeasonSettings (singleton)
+ */
+async function getSeasonSettings(connection) {
+    const program = (0, programHelpers_1.getProgram)(connection);
+    const [seasonSettingsPda] = (0, pdas_1.getSeasonSettingsPda)();
+    const settings = await program.account.seasonSettings.fetch(seasonSettingsPda);
+    return {
+        publicKey: seasonSettingsPda,
+        ...(0, accountConverters_1.toSdkSeasonSettings)(settings),
+    };
+}

package/dist/getters/getUserStats.js

@@ -4,6 +4,7 @@ exports.getUserStats = getUserStats;
 exports.getUserStatsByPda = getUserStatsByPda;
 const pdas_1 = require("../utils/pdas");
 const programHelpers_1 = require("../utils/programHelpers");
+const accountConverters_1 = require("../utils/accountConverters");
 /**
  * Get user stats account by telegram ID
  * @param connection - Solana connection
@@ -16,11 +17,7 @@ async function getUserStats(connection, telegramId) {
     const stats = await program.account.userStats.fetch(userStatsPda);
     return {
         publicKey: userStatsPda,
-        telegramId: stats.telegramId,
-        totalNumberOfMiztakes: stats.totalNumberOfMiztakes,
-        onchainFirstMiztakeAt: stats.onchainFirstMiztakeAt,
-        onchainLastMiztakeAt: stats.onchainLastMiztakeAt,
-        bump: stats.bump,
+        ...(0, accountConverters_1.toSdkUserStats)(stats),
     };
 }
 /**
@@ -34,10 +31,6 @@ async function getUserStatsByPda(connection, userStatsPda) {
     const stats = await program.account.userStats.fetch(userStatsPda);
     return {
         publicKey: userStatsPda,
-        telegramId: stats.telegramId,
-        totalNumberOfMiztakes: stats.totalNumberOfMiztakes,
-        onchainFirstMiztakeAt: stats.onchainFirstMiztakeAt,
-        onchainLastMiztakeAt: stats.onchainLastMiztakeAt,
-        bump: stats.bump,
+        ...(0, accountConverters_1.toSdkUserStats)(stats),
     };
 }

package/dist/getters/getUserWindowParticipation.d.ts

@@ -0,0 +1,9 @@
+import { BN } from "@coral-xyz/anchor";
+import { Connection, PublicKey } from "@solana/web3.js";
+import { TierNumber, UserWindowParticipation, WindowNumberLike } from "../types";
+/**
+ * Get UserWindowParticipation by seeds
+ */
+export declare function getUserWindowParticipation(connection: Connection, seasonNumber: BN, user: PublicKey, tier: TierNumber, windowNumber: WindowNumberLike): Promise<UserWindowParticipation & {
+    publicKey: PublicKey;
+}>;

package/dist/getters/getUserWindowParticipation.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getUserWindowParticipation = getUserWindowParticipation;
+const pdas_1 = require("../utils/pdas");
+const programHelpers_1 = require("../utils/programHelpers");
+const accountConverters_1 = require("../utils/accountConverters");
+const conversions_1 = require("../utils/conversions");
+/**
+ * Get UserWindowParticipation by seeds
+ */
+async function getUserWindowParticipation(connection, seasonNumber, user, tier, windowNumber) {
+    const program = (0, programHelpers_1.getProgram)(connection);
+    const windowBn = (0, conversions_1.toWindowNumberBn)(windowNumber);
+    const [pda] = (0, pdas_1.getUserWindowParticipationPda)(seasonNumber, user, tier, windowBn);
+    const participation = await program.account.userWindowParticipation.fetch(pda);
+    return {
+        publicKey: pda,
+        ...(0, accountConverters_1.toSdkUserWindowParticipation)(participation),
+    };
+}

package/dist/getters/index.d.ts

@@ -4,3 +4,9 @@
 export * from "./getMiztake";
 export * from "./getUserStats";
 export * from "./getMiztakeStatistics";
+export * from "./getSeasonSettings";
+export * from "./getSeason";
+export * from "./getSeasonMembership";
+export * from "./getRewardWindow";
+export * from "./getUserWindowParticipation";
+export * from "./getReferralPenaltyClaim";

package/dist/getters/index.js

@@ -20,3 +20,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./getMiztake"), exports);
 __exportStar(require("./getUserStats"), exports);
 __exportStar(require("./getMiztakeStatistics"), exports);
+__exportStar(require("./getSeasonSettings"), exports);
+__exportStar(require("./getSeason"), exports);
+__exportStar(require("./getSeasonMembership"), exports);
+__exportStar(require("./getRewardWindow"), exports);
+__exportStar(require("./getUserWindowParticipation"), exports);
+__exportStar(require("./getReferralPenaltyClaim"), exports);

package/dist/idl/idl.d.ts

@@ -1,2 +1,7 @@
+import type { Idl } from "@coral-xyz/anchor";
 import { ProofOfTake } from "../types/proof_of_take";
 export declare const IDL: ProofOfTake;
+/**
+ * Anchor-compatible IDL object (cast once here instead of at every call site).
+ */
+export declare const ANCHOR_IDL: Idl;

package/dist/idl/idl.js

@@ -3,6 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IDL = void 0;
+exports.ANCHOR_IDL = exports.IDL = void 0;
 const proof_of_take_json_1 = __importDefault(require("./proof_of_take.json"));
 exports.IDL = proof_of_take_json_1.default;
+/**
+ * Anchor-compatible IDL object (cast once here instead of at every call site).
+ */
+exports.ANCHOR_IDL = proof_of_take_json_1.default;

package/dist/index.d.ts

@@ -30,6 +30,9 @@ export { viewCurrentSeason } from "./instructions/viewCurrentSeason";
 export * from "./utils/pdas";
 export * from "./utils/constants";
 export * from "./utils/accountUpdates";
+export * from "./utils/accountConverters";
+export * from "./utils/depositTier";
+export * from "./utils/fetchAccount";
 export declare const getProgram: typeof _getProgram;
 export * from "./utils/signerHelpers";
 export * from "./utils/conversions";
@@ -42,6 +45,8 @@ export * from "./constants/season";
 export * from "./types";
 export * from "./types/instructionResults";
 export * from "./types/accountTypes";
+export type { ProofOfTakeIdlAccounts, AnchorMiztake, AnchorMiztakeStatistics, AnchorUserStats, AnchorSeasonSettings, AnchorSeason, AnchorSeasonMembership, AnchorRewardWindow, AnchorUserWindowParticipation, AnchorReferralPenaltyClaim, ProofOfTakeIdlTypes, AnchorCurrentSeasonView, AnchorSeasonMembershipStatusView, AnchorWindowStatusView, TierNumber, Sha256HexString, Bytes32, WindowIndex, WindowNumberLike, DepositTierName, SeasonDepositTier, SeasonStateAnchor, WindowStateAnchor, SeasonStateLike, WindowStateLike, FixedLengthArray, EligibleStakePerWindow, } from "./types";
+export type { StandardInstructionResult, StandardInstructionResultWithPdas, StandardInstructionResultWithPdasAndAccounts, } from "./types/instructionResults";
 export type { ProofOfTake } from "./types/proof_of_take";
 export { IDL } from "./idl/idl";
 export { createProgram, createProgramWithId, getProgramReadOnly, } from "./client";

package/dist/index.js

@@ -68,6 +68,9 @@ Object.defineProperty(exports, "viewCurrentSeason", { enumerable: true, get: fun
 __exportStar(require("./utils/pdas"), exports);
 __exportStar(require("./utils/constants"), exports);
 __exportStar(require("./utils/accountUpdates"), exports);
+__exportStar(require("./utils/accountConverters"), exports);
+__exportStar(require("./utils/depositTier"), exports);
+__exportStar(require("./utils/fetchAccount"), exports);
 exports.getProgram = programHelpers_1.getProgram;
 __exportStar(require("./utils/signerHelpers"), exports);
 __exportStar(require("./utils/conversions"), exports);

package/dist/instructions/claimReferralPenaltyForWindow.d.ts

@@ -1,7 +1,7 @@
 import { BN } from "@coral-xyz/anchor";
-import { Connection, PublicKey, TransactionInstruction } from "@solana/web3.js";
-import { SignerInfo } from "../utils/signerHelpers";
-import { ReferralPenaltyClaim, SeasonMembership, UserWindowParticipation } from "../types";
+import { Connection, PublicKey } from "@solana/web3.js";
+import { ReferralPenaltyClaim, SeasonMembership, UserWindowParticipation, TierNumber, WindowNumberLike } from "../types";
+import { StandardInstructionResultWithPdas } from "../types/instructionResults";
 export interface ClaimReferralPenaltyForWindowOptions {
     connection: Connection;
     /** Referrer (or root admin if no referrer) */
@@ -10,9 +10,9 @@ export interface ClaimReferralPenaltyForWindowOptions {
     recipientTokenAccount: PublicKey;
     referredUser: PublicKey;
     seasonNumber: BN;
-    windowNumber: BN;
+    windowNumber: WindowNumberLike;
     /** Tier number: 1=copper, 2=silver, 3=gold, 4=platinum, 5=mithril */
-    tier: number;
+    tier: TierNumber;
     feePayer?: PublicKey;
     /**
      * Optional timestamp override (Unix seconds) for optimistic `claimedAt`.
@@ -28,12 +28,15 @@ export interface ClaimReferralPenaltyForWindowOptions {
         userWindowParticipation?: UserWindowParticipation;
     };
 }
-export declare function claimReferralPenaltyForWindow(options: ClaimReferralPenaltyForWindowOptions): Promise<{
-    instructions: TransactionInstruction[];
-    signers: SignerInfo[];
-    updatedAccounts?: {
-        userWindowParticipation?: UserWindowParticipation;
-        referralPenaltyClaim?: ReferralPenaltyClaim;
-        seasonMembership?: SeasonMembership;
-    };
-}>;
+export declare function claimReferralPenaltyForWindow(options: ClaimReferralPenaltyForWindowOptions): Promise<StandardInstructionResultWithPdas<{
+    seasonSettings: PublicKey;
+    season: PublicKey;
+    seasonMembership: PublicKey;
+    userWindowParticipation: PublicKey;
+    referralPenaltyClaim: PublicKey;
+    seasonDepositVault: PublicKey;
+}, {
+    userWindowParticipation?: UserWindowParticipation;
+    referralPenaltyClaim?: ReferralPenaltyClaim;
+    seasonMembership?: SeasonMembership;
+}>>;

package/dist/instructions/claimReferralPenaltyForWindow.js

@@ -10,12 +10,14 @@ const programHelpers_1 = require("../utils/programHelpers");
 const signerHelpers_1 = require("../utils/signerHelpers");
 const optimistic_1 = require("../optimistic");
 const tierPenalty_1 = require("../utils/tierPenalty");
+const conversions_1 = require("../utils/conversions");
 async function claimReferralPenaltyForWindow(options) {
+    const windowNumber = (0, conversions_1.toWindowNumberBn)(options.windowNumber);
     const program = (0, programHelpers_1.getProgram)(options.connection);
     const pdas = pdaManager_1.PDAManager.deriveClaimReferralPenaltyForWindowPdas({
         referredUser: options.referredUser,
         seasonNumber: options.seasonNumber,
-        windowNumber: options.windowNumber,
+        windowNumber,
         tier: options.tier,
     });
     const accounts = {
@@ -34,7 +36,7 @@ async function claimReferralPenaltyForWindow(options) {
     const instruction = await program.methods
         .claimReferralPenaltyForWindow(
     // Anchor expects BN for u64 args.
-    options.seasonNumber, options.windowNumber, options.referredUser, options.tier)
+    options.seasonNumber, windowNumber, options.referredUser, options.tier)
         .accounts(accounts)
         .instruction();
     const signers = (0, signerHelpers_1.buildSigners)([{ publicKey: options.claimant, role: "claimant" }], options.feePayer);
@@ -45,14 +47,14 @@ async function claimReferralPenaltyForWindow(options) {
         const claimedAt = (0, optimistic_1.getCurrentTimestamp)(options.now);
         // The program `init_if_needed` for participation; if caller doesn't provide it, assume it doesn't exist.
         const participation = curr.userWindowParticipation ??
-            (0, optimistic_1.initializeUserWindowParticipation)(options.referredUser, options.seasonNumber, options.windowNumber, options.tier, new anchor_1.BN(0) // miztake_id = 0 for total no-show windows
+            (0, optimistic_1.initializeUserWindowParticipation)(options.referredUser, options.seasonNumber, windowNumber, options.tier, new anchor_1.BN(0) // miztake_id = 0 for total no-show windows
             );
         // Keep this in sync with on-chain: membership.deposit_tier.penalty_per_window_amount()
         const perWindowPenalty = (0, tierPenalty_1.getTierPenaltyPerWindow)(curr.seasonMembership.depositTier);
         const claim = (0, optimistic_1.initializeReferralPenaltyClaim)({
             referredUser: options.referredUser,
             seasonNumber: options.seasonNumber,
-            windowNumber: options.windowNumber,
+            windowNumber,
             tier: options.tier,
             claimant: options.claimant,
             perWindowPenalty,
@@ -67,6 +69,7 @@ async function claimReferralPenaltyForWindow(options) {
     return {
         instructions: [instruction],
         signers,
+        pdas,
         ...(updatedAccounts && { updatedAccounts }),
     };
 }

package/dist/instructions/claimWindowRewards.d.ts

@@ -1,7 +1,7 @@
 import { BN } from "@coral-xyz/anchor";
-import { Connection, PublicKey, TransactionInstruction } from "@solana/web3.js";
-import { SeasonSettings, Season, RewardWindow, UserWindowParticipation, SeasonMembership } from "../types";
-import { SignerInfo } from "../utils/signerHelpers";
+import { Connection, PublicKey } from "@solana/web3.js";
+import { SeasonSettings, Season, RewardWindow, UserWindowParticipation, SeasonMembership, TierNumber, WindowNumberLike } from "../types";
+import { StandardInstructionResultWithPdas } from "../types/instructionResults";
 type ClaimWindowRewardsUpdatedAccounts = {
     seasonSettings?: SeasonSettings;
     season?: Season;
@@ -9,6 +9,14 @@ type ClaimWindowRewardsUpdatedAccounts = {
     userWindowParticipation?: UserWindowParticipation;
     seasonMembership?: SeasonMembership;
 };
+type ClaimWindowRewardsPdas = {
+    seasonSettings: PublicKey;
+    season: PublicKey;
+    rewardWindow: PublicKey;
+    userWindowParticipation: PublicKey;
+    seasonMembership: PublicKey;
+    seasonDepositVault: PublicKey;
+};
 /**
  * Options for claimWindowRewards instruction
  */
@@ -19,9 +27,9 @@ export interface ClaimWindowRewardsOptions {
     /** Referrer token account to receive referral share (only used when membership.referrer != default) */
     referrerTokenAccount?: PublicKey;
     seasonNumber: BN;
-    windowNumber: BN;
+    windowNumber: WindowNumberLike;
     /** Tier number: 1=copper, 2=silver, 3=gold, 4=platinum, 5=mithril */
-    tier: number;
+    tier: TierNumber;
     feePayer?: PublicKey;
     currentAccounts?: {
         seasonSettings?: SeasonSettings;
@@ -41,9 +49,5 @@ export interface ClaimWindowRewardsOptions {
  * @param options - Claim window rewards options
  * @returns Instructions, signers, and optimistically updated accounts
  */
-export declare function claimWindowRewards(options: ClaimWindowRewardsOptions): Promise<{
-    instructions: TransactionInstruction[];
-    signers: SignerInfo[];
-    updatedAccounts?: ClaimWindowRewardsUpdatedAccounts;
-}>;
+export declare function claimWindowRewards(options: ClaimWindowRewardsOptions): Promise<StandardInstructionResultWithPdas<ClaimWindowRewardsPdas, ClaimWindowRewardsUpdatedAccounts>>;
 export {};

package/dist/instructions/claimWindowRewards.js

@@ -10,6 +10,7 @@ const tierPenalty_1 = require("../utils/tierPenalty");
 const programHelpers_1 = require("../utils/programHelpers");
 const signerHelpers_1 = require("../utils/signerHelpers");
 const optimistic_1 = require("../optimistic");
+const conversions_1 = require("../utils/conversions");
 /**
  * Claim window rewards
  *
@@ -22,10 +23,11 @@ const optimistic_1 = require("../optimistic");
  */
 async function claimWindowRewards(options) {
     const program = (0, programHelpers_1.getProgram)(options.connection);
+    const windowNumber = (0, conversions_1.toWindowNumberBn)(options.windowNumber);
     const pdas = pdaManager_1.PDAManager.deriveClaimWindowRewardsPdas({
         user: options.user,
         seasonNumber: options.seasonNumber,
-        windowNumber: options.windowNumber,
+        windowNumber,
         tier: options.tier,
     });
     const accounts = {
@@ -44,7 +46,7 @@ async function claimWindowRewards(options) {
     };
     const instruction = await program.methods
         // Anchor expects BN for u64 args.
-        .claimWindowRewards(options.seasonNumber, options.windowNumber, options.tier)
+        .claimWindowRewards(options.seasonNumber, windowNumber, options.tier)
         .accounts(accounts)
         .instruction();
     const signers = (0, signerHelpers_1.buildSigners)([{ publicKey: options.user, role: "user" }], options.feePayer);
@@ -52,7 +54,7 @@ async function claimWindowRewards(options) {
     const curr = options.currentAccounts || {};
     let updatedAccounts = undefined;
     if (curr.rewardWindow && curr.seasonSettings && curr.season) {
-        const idx = options.windowNumber.toNumber();
+        const idx = (0, conversions_1.assertWindowIndex)(windowNumber);
         const eligibleStakeX = curr.season.eligibleStakePerWindow[idx] ?? new anchor_1.BN(0);
         const updatedRewardWindow = !curr.rewardWindow.isFinalized
             ? (0, optimistic_1.updateWindowForFinalization)(curr.rewardWindow, eligibleStakeX)
@@ -89,6 +91,7 @@ async function claimWindowRewards(options) {
     return {
         instructions: [instruction],
         signers,
+        pdas,
         ...(updatedAccounts && { updatedAccounts }),
     };
 }