proof-of-take-sdk 1.0.0 → 2.0.0

package/dist/instructions/claimReferralPenaltyForWindow.js

@@ -16,7 +16,7 @@ async function claimReferralPenaltyForWindow(options) {
         referredUser: options.referredUser,
         seasonNumber: options.seasonNumber,
         windowNumber: options.windowNumber,
-        referredSeasonMembershipId: options.seasonMembershipId,
+        tier: options.tier,
     });
     const accounts = {
         seasonSettings: pdas.seasonSettings,
@@ -34,7 +34,7 @@ async function claimReferralPenaltyForWindow(options) {
     const instruction = await program.methods
         .claimReferralPenaltyForWindow(
     // Anchor expects BN for u64 args.
-    options.seasonNumber, options.windowNumber, options.referredUser, options.seasonMembershipId)
+    options.seasonNumber, options.windowNumber, options.referredUser, options.tier)
         .accounts(accounts)
         .instruction();
     const signers = (0, signerHelpers_1.buildSigners)([{ publicKey: options.claimant, role: "claimant" }], options.feePayer);
@@ -45,7 +45,7 @@ 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.seasonMembershipId, new anchor_1.BN(0) // miztake_id = 0 for total no-show windows
+            (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
             );
         // Keep this in sync with on-chain: membership.deposit_tier.penalty_per_window_amount()
         const perWindowPenalty = (0, tierPenalty_1.getTierPenaltyPerWindow)(curr.seasonMembership.depositTier);
@@ -53,7 +53,7 @@ async function claimReferralPenaltyForWindow(options) {
             referredUser: options.referredUser,
             seasonNumber: options.seasonNumber,
             windowNumber: options.windowNumber,
-            seasonMembershipId: options.seasonMembershipId,
+            tier: options.tier,
             claimant: options.claimant,
             perWindowPenalty,
             claimedAt,

package/dist/instructions/claimWindowRewards.d.ts

@@ -20,7 +20,8 @@ export interface ClaimWindowRewardsOptions {
     referrerTokenAccount?: PublicKey;
     seasonNumber: BN;
     windowNumber: BN;
-    seasonMembershipId: BN;
+    /** Tier number: 1=copper, 2=silver, 3=gold, 4=platinum, 5=mithril */
+    tier: number;
     feePayer?: PublicKey;
     currentAccounts?: {
         seasonSettings?: SeasonSettings;

package/dist/instructions/claimWindowRewards.js

@@ -26,7 +26,7 @@ async function claimWindowRewards(options) {
         user: options.user,
         seasonNumber: options.seasonNumber,
         windowNumber: options.windowNumber,
-        seasonMembershipId: options.seasonMembershipId,
+        tier: options.tier,
     });
     const accounts = {
         seasonSettings: pdas.seasonSettings,
@@ -44,7 +44,7 @@ async function claimWindowRewards(options) {
     };
     const instruction = await program.methods
         // Anchor expects BN for u64 args.
-        .claimWindowRewards(options.seasonNumber, options.windowNumber)
+        .claimWindowRewards(options.seasonNumber, options.windowNumber, options.tier)
         .accounts(accounts)
         .instruction();
     const signers = (0, signerHelpers_1.buildSigners)([{ publicKey: options.user, role: "user" }], options.feePayer);

package/dist/instructions/confirmedPostOnX.d.ts

@@ -17,7 +17,9 @@ export interface ConfirmedPostOnXOptions {
     connection: Connection;
     adminKey: PublicKey;
     user: PublicKey;
-    seasonMembershipId: BN;
+    seasonNumber: BN;
+    /** Tier number: 1=copper, 2=silver, 3=gold, 4=platinum, 5=mithril */
+    tier: number;
     windowNumber: BN;
     /** SHA-256 hex string (64 chars). On-chain expects the raw 32-byte digest. */
     miztakeShaHash: string;

package/dist/instructions/confirmedPostOnX.js

@@ -20,15 +20,11 @@ const optimistic_1 = require("../optimistic");
 async function confirmedPostOnX(options) {
     const program = (0, programHelpers_1.getProgram)(options.connection);
     const curr = options.currentAccounts || {};
-    if (!curr.seasonMembership) {
-        throw new Error("seasonMembership required for confirmedPostOnX");
-    }
-    const seasonNumber = curr.seasonMembership.seasonNumber;
     const pdas = pdaManager_1.PDAManager.deriveConfirmedPostPdas({
         user: options.user,
-        seasonNumber,
+        seasonNumber: options.seasonNumber,
         windowNumber: options.windowNumber,
-        seasonMembershipId: options.seasonMembershipId,
+        tier: options.tier,
         miztakeShaHash: options.miztakeShaHash,
     });
     const accounts = {
@@ -41,9 +37,7 @@ async function confirmedPostOnX(options) {
         admin: options.adminKey,
     };
     const instruction = await program.methods
-        .confirmedPostOnX(options.user, 
-    // Anchor expects BN for u64 args.
-    options.seasonMembershipId, options.windowNumber, Array.from((0, conversions_1.sha256HexToBytes32)(options.miztakeShaHash)))
+        .confirmedPostOnX(options.user, options.tier, options.windowNumber, Array.from((0, conversions_1.sha256HexToBytes32)(options.miztakeShaHash)))
         .accounts(accounts)
         .instruction();
     const signers = (0, signerHelpers_1.buildSigners)([{ publicKey: options.adminKey, role: "admin" }], options.feePayer);
@@ -66,7 +60,7 @@ async function confirmedPostOnX(options) {
                 season: (0, optimistic_1.updateSeasonForConfirmation)(curr.season, options.isOnTime, stakeAmount),
             }),
             ...(curr.miztake && {
-                miztake: (0, optimistic_1.updateMiztakeForSeasonUse)(curr.miztake, seasonNumber, options.windowNumber),
+                miztake: (0, optimistic_1.updateMiztakeForSeasonUse)(curr.miztake, options.seasonNumber, options.windowNumber),
             }),
         };
     }

package/dist/instructions/createMiztake.d.ts

@@ -12,7 +12,8 @@ export interface CreateMiztakeOptions {
     admin: PublicKey;
     seasonNumber: BN;
     windowNumber: BN;
-    seasonMembershipId: BN;
+    /** Tier number: 1=copper, 2=silver, 3=gold, 4=platinum, 5=mithril */
+    tier: number;
     /** Optional injected timestamp (seconds) for optimistic state calculation */
     now?: BN;
     feePayer?: PublicKey;
@@ -72,7 +73,7 @@ export interface CreateMiztakeResult {
  *   admin: adminWallet.publicKey,
  *   seasonNumber: new BN(1),
  *   windowNumber: new BN(5),
- *   seasonMembershipId: new BN(123),
+ *   tier: 2, // silver
  *   currentAccounts: {
  *     userStats: currentUserStats,
  *     miztakeStatistics: currentStats,

package/dist/instructions/createMiztake.js

@@ -30,7 +30,7 @@ const enumHelpers_1 = require("../utils/enumHelpers");
  *   admin: adminWallet.publicKey,
  *   seasonNumber: new BN(1),
  *   windowNumber: new BN(5),
- *   seasonMembershipId: new BN(123),
+ *   tier: 2, // silver
  *   currentAccounts: {
  *     userStats: currentUserStats,
  *     miztakeStatistics: currentStats,
@@ -48,8 +48,8 @@ async function createMiztake(options) {
         telegramId: options.params.telegramId,
         seasonNumber: options.seasonNumber,
         windowNumber: options.windowNumber,
-        seasonMembershipId: options.seasonMembershipId,
         user: options.user,
+        tier: options.tier,
     });
     // Build typed accounts object
     const accounts = {
@@ -70,7 +70,7 @@ async function createMiztake(options) {
     const instruction = await program.methods
         .createMiztake(
     // Anchor expects BN for u64 args.
-    options.params.telegramId, options.params.telegramUsername, options.params.perceptualHash, options.params.averageHash, options.params.differenceHash, options.params.waveletHash, options.params.shaHash, Array.from(shaHashBytes), options.params.computedAt, options.seasonNumber, options.windowNumber, options.seasonMembershipId)
+    options.params.telegramId, options.params.telegramUsername, options.params.perceptualHash, options.params.averageHash, options.params.differenceHash, options.params.waveletHash, options.params.shaHash, Array.from(shaHashBytes), options.params.computedAt, options.seasonNumber, options.windowNumber, options.tier)
         .accounts(accounts)
         .instruction();
     // Build signers
@@ -97,7 +97,7 @@ async function createMiztake(options) {
         newMiztakeId = new anchor_1.BN(1); // Placeholder
     }
     // 3. Initialize UserWindowParticipation
-    const updatedUserWindowParticipation = (0, optimistic_1.initializeUserWindowParticipation)(options.user, options.seasonNumber, options.windowNumber, options.seasonMembershipId, newMiztakeId);
+    const updatedUserWindowParticipation = (0, optimistic_1.initializeUserWindowParticipation)(options.user, options.seasonNumber, options.windowNumber, options.tier, newMiztakeId);
     // 4. Initialize RewardWindow if needed
     let updatedRewardWindow;
     if (curr.rewardWindow) {
@@ -160,7 +160,7 @@ function getMiztakePdaForParams(params) {
         telegramId: params.telegramId,
         seasonNumber: new anchor_1.BN(0),
         windowNumber: new anchor_1.BN(0),
-        seasonMembershipId: new anchor_1.BN(0),
         user: web3_js_1.PublicKey.default,
+        tier: 1,
     }).miztake;
 }

package/dist/instructions/joinSeason.d.ts

@@ -1,6 +1,6 @@
 import { BN } from "@coral-xyz/anchor";
 import { Connection, PublicKey, TransactionInstruction } from "@solana/web3.js";
-import { Season, SeasonMembership, SeasonSettings, SeasonDepositTier } from "../types";
+import { Season, SeasonMembership, SeasonSettings } from "../types";
 import { SignerInfo } from "../utils/signerHelpers";
 /**
  * Options for joinSeason instruction
@@ -9,9 +9,9 @@ export interface JoinSeasonOptions {
     connection: Connection;
     user: PublicKey;
     userTokenAccount: PublicKey;
-    seasonMembershipId: BN;
     seasonNumber: BN;
-    depositTier: SeasonDepositTier;
+    /** Tier number: 1=copper, 2=silver, 3=gold, 4=platinum, 5=mithril */
+    tier: number;
     /** Optional referrer (PublicKey.default means no referrer) */
     referrer?: PublicKey;
     /** Optional injected timestamp (seconds) for optimistic state calculation */

package/dist/instructions/joinSeason.js

@@ -11,6 +11,7 @@ const programHelpers_1 = require("../utils/programHelpers");
 const signerHelpers_1 = require("../utils/signerHelpers");
 const optimistic_1 = require("../optimistic");
 const pdas_1 = require("../utils/pdas");
+const tierPenalty_1 = require("../utils/tierPenalty");
 /**
  * Join a season
  *
@@ -26,7 +27,7 @@ async function joinSeason(options) {
     const pdas = pdaManager_1.PDAManager.deriveJoinSeasonPdas({
         user: options.user,
         seasonNumber: options.seasonNumber,
-        seasonMembershipId: options.seasonMembershipId,
+        tier: options.tier,
     });
     const accounts = {
         seasonSettings: pdas.seasonSettings,
@@ -42,7 +43,7 @@ async function joinSeason(options) {
     };
     const instruction = await program.methods
         // Anchor expects BN for u64 args.
-        .joinSeason(options.seasonMembershipId, options.seasonNumber, options.depositTier, options.referrer ?? web3_js_1.PublicKey.default)
+        .joinSeason(options.seasonNumber, options.tier, options.referrer ?? web3_js_1.PublicKey.default)
         .accounts(accounts)
         .instruction();
     const signers = (0, signerHelpers_1.buildSigners)([{ publicKey: options.user, role: "user" }], options.feePayer);
@@ -52,12 +53,13 @@ async function joinSeason(options) {
     let newSeasonMembership;
     let updatedSeason;
     if (curr.seasonSettings) {
-        const [, bump] = (0, pdas_1.getSeasonMembershipPda)(options.user, options.seasonMembershipId);
+        const [, bump] = (0, pdas_1.getSeasonMembershipPda)(options.seasonNumber, options.user, options.tier);
         // Mirror on-chain join_season.rs:
         // current_window = (now - season.started_at) / window_duration (integer division)
         // joined_window_number = current_window (after bounds checks)
         const totalWindows = curr.seasonSettings.totalWindowsPerSeason;
-        const perWindowPenalty = getTierPenaltyPerWindow(options.depositTier);
+        const depositTier = (0, tierPenalty_1.tierNumberToDepositTier)(options.tier);
+        const perWindowPenalty = (0, tierPenalty_1.getTierPenaltyPerWindow)(depositTier);
         const depositFull = perWindowPenalty.muln(totalWindows);
         let joinedWindowNumber = new anchor_1.BN(0);
         if (curr.season) {
@@ -82,9 +84,9 @@ async function joinSeason(options) {
         }
         const depositEscrowed = perWindowPenalty.mul(joinedWindowNumber);
         const depositActive = depositFull.sub(depositEscrowed);
-        newSeasonMembership = (0, optimistic_1.initializeSeasonMembership)(options.user, options.seasonMembershipId, options.seasonNumber, options.depositTier, options.referrer ?? web3_js_1.PublicKey.default, depositActive, depositEscrowed, now, joinedWindowNumber, bump);
+        newSeasonMembership = (0, optimistic_1.initializeSeasonMembership)(options.user, options.seasonNumber, depositTier, options.referrer ?? web3_js_1.PublicKey.default, depositActive, depositEscrowed, now, joinedWindowNumber, bump);
         if (curr.season) {
-            updatedSeason = (0, optimistic_1.updateSeasonForJoin)(curr.season, depositActive, options.depositTier, joinedWindowNumber, totalWindows);
+            updatedSeason = (0, optimistic_1.updateSeasonForJoin)(curr.season, depositActive, depositTier, joinedWindowNumber, totalWindows);
         }
     }
     return {
@@ -104,17 +106,4 @@ async function joinSeason(options) {
             : {}),
     };
 }
-function getTierPenaltyPerWindow(tier) {
-    // Base units (7 decimals): 1 MIZD = 10_000_000
-    if ("copper" in tier)
-        return new anchor_1.BN(1000000); // 0.1 MIZD
-    if ("silver" in tier)
-        return new anchor_1.BN(10000000); // 1 MIZD
-    if ("gold" in tier)
-        return new anchor_1.BN(100000000); // 10 MIZD
-    if ("platinum" in tier)
-        return new anchor_1.BN(1000000000); // 100 MIZD
-    if ("mithril" in tier)
-        return new anchor_1.BN(10000000000); // 1,000 MIZD
-    throw new Error("Unknown depositTier");
-}
+// getTierPenaltyPerWindow imported from ../utils/tierPenalty

package/dist/instructions/viewSeasonMembershipStatus.d.ts

@@ -9,8 +9,8 @@ import { SeasonMembershipStatusView } from "../types";
  *
  * @param connection - Solana connection
  * @param user - User's public key
- * @param seasonMembershipId - Membership ID
  * @param seasonNumber - Season number
+ * @param tier - Tier number: 1=copper, 2=silver, 3=gold, 4=platinum, 5=mithril
  * @returns View data with membership status
  */
-export declare function viewSeasonMembershipStatus(connection: Connection, user: PublicKey, seasonMembershipId: BN, seasonNumber: BN): Promise<SeasonMembershipStatusView>;
+export declare function viewSeasonMembershipStatus(connection: Connection, user: PublicKey, seasonNumber: BN, tier: number): Promise<SeasonMembershipStatusView>;

package/dist/instructions/viewSeasonMembershipStatus.js

@@ -11,14 +11,14 @@ const programHelpers_1 = require("../utils/programHelpers");
  *
  * @param connection - Solana connection
  * @param user - User's public key
- * @param seasonMembershipId - Membership ID
  * @param seasonNumber - Season number
+ * @param tier - Tier number: 1=copper, 2=silver, 3=gold, 4=platinum, 5=mithril
  * @returns View data with membership status
  */
-async function viewSeasonMembershipStatus(connection, user, seasonMembershipId, seasonNumber) {
+async function viewSeasonMembershipStatus(connection, user, seasonNumber, tier) {
     const program = (0, programHelpers_1.getProgram)(connection);
     const [seasonSettingsPda] = (0, pdas_1.getSeasonSettingsPda)();
-    const [seasonMembershipPda] = (0, pdas_1.getSeasonMembershipPda)(user, seasonMembershipId);
+    const [seasonMembershipPda] = (0, pdas_1.getSeasonMembershipPda)(seasonNumber, user, tier);
     const [seasonPda] = (0, pdas_1.getSeasonPda)(seasonNumber);
     const accounts = {
         seasonSettings: seasonSettingsPda,

package/dist/instructions/withdrawSeasonDeposit.d.ts

@@ -14,7 +14,9 @@ export interface WithdrawSeasonDepositOptions {
     connection: Connection;
     user: PublicKey;
     userTokenAccount: PublicKey;
-    seasonMembershipId: BN;
+    seasonNumber: BN;
+    /** Tier number: 1=copper, 2=silver, 3=gold, 4=platinum, 5=mithril */
+    tier: number;
     feePayer?: PublicKey;
     currentAccounts?: {
         seasonSettings?: SeasonSettings;

package/dist/instructions/withdrawSeasonDeposit.js

@@ -20,14 +20,10 @@ const optimistic_1 = require("../optimistic");
 async function withdrawSeasonDeposit(options) {
     const program = (0, programHelpers_1.getProgram)(options.connection);
     const curr = options.currentAccounts || {};
-    if (!curr.seasonMembership) {
-        throw new Error("seasonMembership required for withdrawSeasonDeposit");
-    }
-    const seasonNumber = curr.seasonMembership.seasonNumber;
     const pdas = pdaManager_1.PDAManager.deriveWithdrawDepositPdas({
         user: options.user,
-        seasonNumber,
-        seasonMembershipId: options.seasonMembershipId,
+        seasonNumber: options.seasonNumber,
+        tier: options.tier,
     });
     const accounts = {
         seasonSettings: pdas.seasonSettings,
@@ -41,7 +37,7 @@ async function withdrawSeasonDeposit(options) {
         tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
     };
     const instruction = await program.methods
-        .withdrawSeasonDeposit()
+        .withdrawSeasonDeposit(options.tier)
         .accounts(accounts)
         .instruction();
     const signers = (0, signerHelpers_1.buildSigners)([{ publicKey: options.user, role: "user" }], options.feePayer);