proof-of-take-sdk 3.0.7 → 3.0.9

package/dist/constants/season.d.ts

@@ -1,20 +1,23 @@
 /**
  * Season system constants
- * These values match the constants defined in the Rust program
+ *
+ * IMPORTANT:
+ * - These values are intended to mirror `programs/proof_of_take/src/constants.rs`.
+ * - Amounts are expressed in MIZD base units (7 decimals): 1 MIZD = 10_000_000.
  */
-export declare const SEASON_CONSTANTS: {
-    /** Cost to join a season (100 MIZD with decimals) */
-    readonly MEMBERSHIP_COST: any;
-    /** Penalty per missed window (1.375 MIZD with decimals) */
-    readonly PENALTY_PER_WINDOW: any;
-    /** Duration of entire season in seconds (7 days) */
-    readonly SEASON_DURATION: 604800;
-    /** Duration of each window in seconds (8 hours) */
-    readonly WINDOW_DURATION: 28800;
-    /** Claim buffer duration in seconds (5 minutes) */
-    readonly CLAIM_BUFFER_DURATION: 300;
-    /** Total number of windows per season */
-    readonly TOTAL_WINDOWS_PER_SEASON: 21;
-    /** Maximum members allowed per season (DOS protection) */
-    readonly MAX_MEMBERS_PER_SEASON: any;
-};
+export declare const MIZD_DECIMALS = 10000000;
+export declare const MIZD_DECIMALS_BN: any;
+export declare const JOIN_FEE_TOTAL: any;
+export declare const JOIN_FEE_REFERRER: any;
+export declare const JOIN_FEE_ADMIN_WITH_REFERRER: any;
+export declare const SEASON_DURATION_SECONDS = 604800;
+export declare const WINDOW_DURATION_SECONDS = 28800;
+/**
+ * Claim buffer duration in seconds (5 minutes).
+ *
+ * Note: user reward claims (`claim_window_rewards`) are gated by the window-duration buffer
+ * (see on-chain `claim_available_at`), while the missed-window referral-penalty claim uses
+ * this constant.
+ */
+export declare const CLAIM_BUFFER_DURATION_SECONDS = 300;
+export declare const TOTAL_WINDOWS_PER_SEASON = 21;

package/dist/constants/season.js

@@ -1,24 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SEASON_CONSTANTS = void 0;
+exports.TOTAL_WINDOWS_PER_SEASON = exports.CLAIM_BUFFER_DURATION_SECONDS = exports.WINDOW_DURATION_SECONDS = exports.SEASON_DURATION_SECONDS = exports.JOIN_FEE_ADMIN_WITH_REFERRER = exports.JOIN_FEE_REFERRER = exports.JOIN_FEE_TOTAL = exports.MIZD_DECIMALS_BN = exports.MIZD_DECIMALS = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
 /**
  * Season system constants
- * These values match the constants defined in the Rust program
+ *
+ * IMPORTANT:
+ * - These values are intended to mirror `programs/proof_of_take/src/constants.rs`.
+ * - Amounts are expressed in MIZD base units (7 decimals): 1 MIZD = 10_000_000.
  */
-exports.SEASON_CONSTANTS = {
-    /** Cost to join a season (100 MIZD with decimals) */
-    MEMBERSHIP_COST: new anchor_1.BN(100000000000),
-    /** Penalty per missed window (1.375 MIZD with decimals) */
-    PENALTY_PER_WINDOW: new anchor_1.BN(1375000000),
-    /** Duration of entire season in seconds (7 days) */
-    SEASON_DURATION: 604800,
-    /** Duration of each window in seconds (8 hours) */
-    WINDOW_DURATION: 28800,
-    /** Claim buffer duration in seconds (5 minutes) */
-    CLAIM_BUFFER_DURATION: 300,
-    /** Total number of windows per season */
-    TOTAL_WINDOWS_PER_SEASON: 21,
-    /** Maximum members allowed per season (DOS protection) */
-    MAX_MEMBERS_PER_SEASON: new anchor_1.BN(10000),
-};
+// ===== Token decimals =====
+exports.MIZD_DECIMALS = 10000000;
+exports.MIZD_DECIMALS_BN = new anchor_1.BN(exports.MIZD_DECIMALS);
+// ===== Join fees (MIZD base units) =====
+exports.JOIN_FEE_TOTAL = new anchor_1.BN(49000000); // 4.9 MIZD
+exports.JOIN_FEE_REFERRER = new anchor_1.BN(7000000); // 0.7 MIZD
+exports.JOIN_FEE_ADMIN_WITH_REFERRER = new anchor_1.BN(42000000); // 4.2 MIZD
+// ===== Timing (seconds) =====
+exports.SEASON_DURATION_SECONDS = 604800; // 7 days
+exports.WINDOW_DURATION_SECONDS = 28800; // 8 hours
+/**
+ * Claim buffer duration in seconds (5 minutes).
+ *
+ * Note: user reward claims (`claim_window_rewards`) are gated by the window-duration buffer
+ * (see on-chain `claim_available_at`), while the missed-window referral-penalty claim uses
+ * this constant.
+ */
+exports.CLAIM_BUFFER_DURATION_SECONDS = 300;
+exports.TOTAL_WINDOWS_PER_SEASON = 21;

package/dist/idl/proof_of_take.json

@@ -308,10 +308,6 @@
           "name": "user_token_account",
           "writable": true
         },
-        {
-          "name": "referrer_token_account",
-          "writable": true
-        },
         {
           "name": "user",
           "signer": true
@@ -1596,6 +1592,100 @@
           "name": "mizd_mint",
           "address": "mizdS9fDNUKWZcXBeRhJoJQHJJmsTeF4fFRyPdXWv99"
         },
+        {
+          "name": "root_admin",
+          "address": "Lude4DE3jDXVViJ3s7bUfPXdXy8Zq7G1stMwHNQrc2s"
+        },
+        {
+          "name": "root_admin_token_account",
+          "writable": true,
+          "pda": {
+            "seeds": [
+              {
+                "kind": "account",
+                "path": "root_admin"
+              },
+              {
+                "kind": "const",
+                "value": [
+                  6,
+                  221,
+                  246,
+                  225,
+                  215,
+                  101,
+                  161,
+                  147,
+                  217,
+                  203,
+                  225,
+                  70,
+                  206,
+                  235,
+                  121,
+                  172,
+                  28,
+                  180,
+                  133,
+                  237,
+                  95,
+                  91,
+                  55,
+                  145,
+                  58,
+                  140,
+                  245,
+                  133,
+                  126,
+                  255,
+                  0,
+                  169
+                ]
+              },
+              {
+                "kind": "account",
+                "path": "mizd_mint"
+              }
+            ],
+            "program": {
+              "kind": "const",
+              "value": [
+                140,
+                151,
+                37,
+                143,
+                78,
+                36,
+                137,
+                241,
+                187,
+                61,
+                16,
+                41,
+                20,
+                142,
+                13,
+                131,
+                11,
+                90,
+                19,
+                153,
+                218,
+                255,
+                16,
+                132,
+                4,
+                142,
+                123,
+                216,
+                219,
+                233,
+                248,
+                89
+              ]
+            }
+          }
+        },
         {
           "name": "user_token_account",
           "writable": true
@@ -1605,6 +1695,10 @@
           "writable": true,
           "signer": true
         },
+        {
+          "name": "associated_token_program",
+          "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
+        },
         {
           "name": "token_program",
           "address": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
@@ -2831,43 +2925,58 @@
     },
     {
       "code": 6035,
+      "name": "InvalidReferrerMembership",
+      "msg": "Invalid referrer season membership account"
+    },
+    {
+      "code": 6036,
       "name": "ReferralPenaltyAlreadyClaimed",
       "msg": "Referral penalty already claimed for this user/window"
     },
     {
-      "code": 6036,
+      "code": 6037,
       "name": "ReferralPenaltyClaimNotAvailableYet",
       "msg": "Referral penalty claim not available yet (must wait until window end + claim buffer)"
     },
     {
-      "code": 6037,
+      "code": 6038,
       "name": "ReferralPenaltyNotEligibleForWindow",
       "msg": "Referred user was not eligible for this window"
     },
     {
-      "code": 6038,
+      "code": 6039,
       "name": "ReferralPenaltyNoMissedPenalty",
       "msg": "Referred user posted successfully (no penalty to claim)"
     },
     {
-      "code": 6039,
+      "code": 6040,
       "name": "WindowAlreadyFinalized",
       "msg": "Window is already finalized"
     },
     {
-      "code": 6040,
+      "code": 6041,
       "name": "WindowNotEmpty",
       "msg": "Window is not empty (has successful posters)"
     },
     {
-      "code": 6041,
+      "code": 6042,
       "name": "CalculationError",
       "msg": "Calculation error"
     },
     {
-      "code": 6042,
+      "code": 6043,
       "name": "InsufficientFunds",
       "msg": "Insufficient funds"
+    },
+    {
+      "code": 6044,
+      "name": "NoWindowRewardsToClaim",
+      "msg": "Nothing to claim for this window (reward amount is 0)"
+    },
+    {
+      "code": 6045,
+      "name": "NoReferralPenaltyToClaim",
+      "msg": "Nothing to claim for this window (referral penalty amount is 0)"
     }
   ],
   "types": [
@@ -3044,7 +3153,7 @@
           {
             "name": "tier",
             "docs": [
-              "Tier number used for the membership PDA (1..=5)"
+              "Tier number used for the membership PDA (0..=4)"
             ],
             "type": "u8"
           },
@@ -3097,7 +3206,7 @@
           {
             "name": "tier",
             "docs": [
-              "Tier number used for the membership PDA (1..=5)"
+              "Tier number used for the membership PDA (0..=4)"
             ],
             "type": "u8"
           },
@@ -3204,7 +3313,7 @@
           {
             "name": "tier",
             "docs": [
-              "Tier number used for the membership PDA (1..=5)"
+              "Tier number used for the membership PDA (0..=4)"
             ],
             "type": "u8"
           },
@@ -3554,7 +3663,7 @@
           {
             "name": "tier",
             "docs": [
-              "Tier number used for the membership PDA (1..=5)"
+              "Tier number used for the membership PDA (0..=4)"
             ],
             "type": "u8"
           },
@@ -3645,7 +3754,7 @@
           {
             "name": "tier",
             "docs": [
-              "Tier number used for the membership PDA (1..=5)"
+              "Tier number used for the membership PDA (0..=4)"
             ],
             "type": "u8"
           },
@@ -3691,6 +3800,13 @@
             ],
             "type": "pubkey"
           },
+          {
+            "name": "referral_count",
+            "docs": [
+              "Total number of successful referrals for this membership (incremented when others join with this member as referrer)"
+            ],
+            "type": "u64"
+          },
           {
             "name": "season_number",
             "docs": [

package/dist/index.d.ts

@@ -44,6 +44,7 @@ export * from "./utils/conversions";
 export * from "./utils/transactionBuilder";
 export * from "./utils/simulationHelpers";
 export * from "./utils/enumHelpers";
+export * from "./utils/programErrors";
 export { PDAManager } from "./utils/pdaManager";
 export * from "./optimistic";
 export * from "./constants/season";

package/dist/index.js

@@ -83,6 +83,7 @@ __exportStar(require("./utils/conversions"), exports);
 __exportStar(require("./utils/transactionBuilder"), exports);
 __exportStar(require("./utils/simulationHelpers"), exports);
 __exportStar(require("./utils/enumHelpers"), exports);
+__exportStar(require("./utils/programErrors"), exports);
 var pdaManager_1 = require("./utils/pdaManager");
 Object.defineProperty(exports, "PDAManager", { enumerable: true, get: function () { return pdaManager_1.PDAManager; } });
 // Export optimistic updates

package/dist/instructions/claimReferralPenaltyForWindow.d.ts

@@ -11,7 +11,7 @@ export interface ClaimReferralPenaltyForWindowOptions {
     referredUser: PublicKey;
     seasonNumber: BN;
     windowNumber: WindowNumberLike;
-    /** Tier number: 1=copper, 2=silver, 3=gold, 4=platinum, 5=mithril */
+    /** Tier number: 0=copper, 1=silver, 2=gold, 3=platinum, 4=mithril */
     tier: TierNumber;
     feePayer?: PublicKey;
     /**

package/dist/instructions/claimReferralPenaltyForWindow.js

@@ -39,7 +39,8 @@ async function claimReferralPenaltyForWindow(options) {
     options.seasonNumber, windowNumber, options.referredUser, options.tier)
         .accounts(accounts)
         .instruction();
-    const signers = (0, signerHelpers_1.buildSigners)([{ publicKey: options.claimant, role: "claimant" }], options.feePayer);
+    const feePayer = (0, signerHelpers_1.getDefaultFeePayer)(options.feePayer);
+    const signers = (0, signerHelpers_1.buildSigners)([(0, signerHelpers_1.asClaimantSigner)(options.claimant)], feePayer);
     // OPTIMISTIC UPDATES
     let updatedAccounts = undefined;
     const curr = options.currentAccounts;

package/dist/instructions/claimWindowRewards.d.ts

@@ -24,11 +24,9 @@ export interface ClaimWindowRewardsOptions {
     connection: Connection;
     user: PublicKey;
     userTokenAccount: PublicKey;
-    /** Referrer token account to receive referral share (only used when membership.referrer != default) */
-    referrerTokenAccount?: PublicKey;
     seasonNumber: BN;
     windowNumber: WindowNumberLike;
-    /** Tier number: 1=copper, 2=silver, 3=gold, 4=platinum, 5=mithril */
+    /** Tier number: 0=copper, 1=silver, 2=gold, 3=platinum, 4=mithril */
     tier: TierNumber;
     feePayer?: PublicKey;
     currentAccounts?: {

package/dist/instructions/claimWindowRewards.js

@@ -2,11 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.claimWindowRewards = claimWindowRewards;
 const anchor_1 = require("@coral-xyz/anchor");
-const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 const pdaManager_1 = require("../utils/pdaManager");
 const constants_1 = require("../utils/constants");
-const tierPenalty_1 = require("../utils/tierPenalty");
 const programHelpers_1 = require("../utils/programHelpers");
 const signerHelpers_1 = require("../utils/signerHelpers");
 const optimistic_1 = require("../optimistic");
@@ -39,8 +37,6 @@ async function claimWindowRewards(options) {
         seasonDepositVault: pdas.seasonDepositVault,
         mizdMint: constants_1.MIZD_TOKEN_MINT,
         userTokenAccount: options.userTokenAccount,
-        // Always provide something; on-chain will only validate/use when referrer exists.
-        referrerTokenAccount: options.referrerTokenAccount ?? options.userTokenAccount,
         user: options.user,
         tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
     };
@@ -49,7 +45,8 @@ async function claimWindowRewards(options) {
         .claimWindowRewards(options.seasonNumber, windowNumber, options.tier)
         .accounts(accounts)
         .instruction();
-    const signers = (0, signerHelpers_1.buildSigners)([{ publicKey: options.user, role: "user" }], options.feePayer);
+    const feePayer = (0, signerHelpers_1.getDefaultFeePayer)(options.feePayer);
+    const signers = (0, signerHelpers_1.buildSigners)([(0, signerHelpers_1.asUserSigner)(options.user)], feePayer);
     // OPTIMISTIC UPDATES
     const curr = options.currentAccounts || {};
     let updatedAccounts = undefined;
@@ -60,16 +57,8 @@ async function claimWindowRewards(options) {
             ? (0, optimistic_1.updateWindowForFinalization)(curr.rewardWindow, eligibleStakeX)
             : curr.rewardWindow;
         const rewardAmount = updatedRewardWindow.rewardPerPoster;
-        const hasReferrer = !!curr.seasonMembership &&
-            !curr.seasonMembership.referrer.equals(web3_js_1.PublicKey.default);
-        const tierPenaltyPerWindow = curr.seasonMembership
-            ? (0, tierPenalty_1.getTierPenaltyPerWindow)(curr.seasonMembership.depositTier)
-            : new anchor_1.BN(0);
-        const bonus = rewardAmount.gt(tierPenaltyPerWindow)
-            ? rewardAmount.sub(tierPenaltyPerWindow)
-            : new anchor_1.BN(0);
-        const referralCut = hasReferrer ? bonus.divn(10) : new anchor_1.BN(0);
-        const userRewardAmount = rewardAmount.sub(referralCut);
+        // Referral reward split removed on-chain: user always receives full rewardAmount.
+        const userRewardAmount = rewardAmount;
         const updatedSeason = !curr.rewardWindow.isFinalized
             ? {
                 ...curr.season,

package/dist/instructions/closeAuxiliaryAccounts.js

@@ -8,6 +8,7 @@ exports.closeUserWindowParticipation = closeUserWindowParticipation;
 exports.closeReferralPenaltyClaim = closeReferralPenaltyClaim;
 const programHelpers_1 = require("../utils/programHelpers");
 const signerHelpers_1 = require("../utils/signerHelpers");
+const instructionResultHelpers_1 = require("../utils/instructionResultHelpers");
 /**
  * Close a Miztake account
  */
@@ -21,8 +22,9 @@ async function closeMiztake(options) {
         .closeMiztake()
         .accounts(accounts)
         .instruction();
-    const signers = (0, signerHelpers_1.buildSigners)([{ publicKey: options.admin, role: "admin" }], options.feePayer);
-    return { instructions: [instruction], signers };
+    const feePayer = (0, signerHelpers_1.resolveFeePayer)({ feePayer: options.feePayer, admin: options.admin });
+    const signers = (0, signerHelpers_1.buildSigners)([(0, signerHelpers_1.asAdminSigner)(options.admin)], feePayer);
+    return (0, instructionResultHelpers_1.singleInstruction)(instruction, { signers });
 }
 /**
  * Close a UserStats account
@@ -37,8 +39,9 @@ async function closeUserStats(options) {
         .closeUserStats()
         .accounts(accounts)
         .instruction();
-    const signers = (0, signerHelpers_1.buildSigners)([{ publicKey: options.admin, role: "admin" }], options.feePayer);
-    return { instructions: [instruction], signers };
+    const feePayer = (0, signerHelpers_1.resolveFeePayer)({ feePayer: options.feePayer, admin: options.admin });
+    const signers = (0, signerHelpers_1.buildSigners)([(0, signerHelpers_1.asAdminSigner)(options.admin)], feePayer);
+    return (0, instructionResultHelpers_1.singleInstruction)(instruction, { signers });
 }
 /**
  * Close a SeasonMembership account
@@ -53,8 +56,9 @@ async function closeSeasonMembership(options) {
         .closeSeasonMembership()
         .accounts(accounts)
         .instruction();
-    const signers = (0, signerHelpers_1.buildSigners)([{ publicKey: options.admin, role: "admin" }], options.feePayer);
-    return { instructions: [instruction], signers };
+    const feePayer = (0, signerHelpers_1.resolveFeePayer)({ feePayer: options.feePayer, admin: options.admin });
+    const signers = (0, signerHelpers_1.buildSigners)([(0, signerHelpers_1.asAdminSigner)(options.admin)], feePayer);
+    return (0, instructionResultHelpers_1.singleInstruction)(instruction, { signers });
 }
 /**
  * Close a RewardWindow account
@@ -69,8 +73,9 @@ async function closeRewardWindow(options) {
         .closeRewardWindow()
         .accounts(accounts)
         .instruction();
-    const signers = (0, signerHelpers_1.buildSigners)([{ publicKey: options.admin, role: "admin" }], options.feePayer);
-    return { instructions: [instruction], signers };
+    const feePayer = (0, signerHelpers_1.resolveFeePayer)({ feePayer: options.feePayer, admin: options.admin });
+    const signers = (0, signerHelpers_1.buildSigners)([(0, signerHelpers_1.asAdminSigner)(options.admin)], feePayer);
+    return (0, instructionResultHelpers_1.singleInstruction)(instruction, { signers });
 }
 /**
  * Close a UserWindowParticipation account
@@ -85,8 +90,9 @@ async function closeUserWindowParticipation(options) {
         .closeUserWindowParticipation()
         .accounts(accounts)
         .instruction();
-    const signers = (0, signerHelpers_1.buildSigners)([{ publicKey: options.admin, role: "admin" }], options.feePayer);
-    return { instructions: [instruction], signers };
+    const feePayer = (0, signerHelpers_1.resolveFeePayer)({ feePayer: options.feePayer, admin: options.admin });
+    const signers = (0, signerHelpers_1.buildSigners)([(0, signerHelpers_1.asAdminSigner)(options.admin)], feePayer);
+    return (0, instructionResultHelpers_1.singleInstruction)(instruction, { signers });
 }
 /**
  * Close a ReferralPenaltyClaim account
@@ -101,6 +107,7 @@ async function closeReferralPenaltyClaim(options) {
         .closeReferralPenaltyClaim()
         .accounts(accounts)
         .instruction();
-    const signers = (0, signerHelpers_1.buildSigners)([{ publicKey: options.admin, role: "admin" }], options.feePayer);
-    return { instructions: [instruction], signers };
+    const feePayer = (0, signerHelpers_1.resolveFeePayer)({ feePayer: options.feePayer, admin: options.admin });
+    const signers = (0, signerHelpers_1.buildSigners)([(0, signerHelpers_1.asAdminSigner)(options.admin)], feePayer);
+    return (0, instructionResultHelpers_1.singleInstruction)(instruction, { signers });
 }

package/dist/instructions/confirmedPostOnX.d.ts

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

package/dist/instructions/confirmedPostOnX.js

@@ -42,7 +42,11 @@ async function confirmedPostOnX(options) {
         .confirmedPostOnX(options.user, options.tier, 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);
+    const feePayer = (0, signerHelpers_1.resolveFeePayer)({
+        feePayer: options.feePayer,
+        admin: options.adminKey,
+    });
+    const signers = (0, signerHelpers_1.buildSigners)([(0, signerHelpers_1.asAdminSigner)(options.adminKey)], feePayer);
     // OPTIMISTIC UPDATES
     let updatedAccounts = undefined;
     if (options.isOnTime !== undefined &&

package/dist/instructions/createMiztake.d.ts

@@ -12,7 +12,7 @@ export interface CreateMiztakeOptions {
     admin: PublicKey;
     seasonNumber: BN;
     windowNumber: WindowNumberLike;
-    /** Tier number: 1=copper, 2=silver, 3=gold, 4=platinum, 5=mithril */
+    /** Tier number: 0=copper, 1=silver, 2=gold, 3=platinum, 4=mithril */
     tier: TierNumber;
     /** Optional injected timestamp (seconds) for optimistic state calculation */
     now?: BN;

package/dist/instructions/createMiztake.js

@@ -77,10 +77,14 @@ async function createMiztake(options) {
         .accounts(accounts)
         .instruction();
     // Build signers
+    const feePayer = (0, signerHelpers_1.resolveFeePayer)({
+        feePayer: options.feePayer,
+        admin: options.admin,
+    });
     const signers = (0, signerHelpers_1.buildSigners)([
-        { publicKey: options.user, role: "user" },
-        { publicKey: options.admin, role: "admin" },
-    ], options.feePayer);
+        (0, signerHelpers_1.asUserSigner)(options.user),
+        (0, signerHelpers_1.asAdminSigner)(options.admin),
+    ], feePayer);
     // OPTIMISTIC UPDATES
     const now = (0, optimistic_1.getCurrentTimestamp)(options.now);
     const curr = options.currentAccounts || {};

package/dist/instructions/initializeEscrowVault.js

@@ -7,6 +7,7 @@ const pdas_1 = require("../utils/pdas");
 const constants_1 = require("../utils/constants");
 const programHelpers_1 = require("../utils/programHelpers");
 const signerHelpers_1 = require("../utils/signerHelpers");
+const instructionResultHelpers_1 = require("../utils/instructionResultHelpers");
 /**
  * Initialize season escrow vault
  *
@@ -27,10 +28,10 @@ async function initializeEscrowVault(connection, admin, seasonNumber, feePayer)
         .initializeEscrowVault(seasonNumber)
         .accounts(accounts)
         .instruction();
-    const signers = (0, signerHelpers_1.buildSigners)([{ publicKey: admin, role: "admin" }], feePayer);
-    return {
-        instructions: [instruction],
+    const actualFeePayer = (0, signerHelpers_1.resolveFeePayer)({ feePayer, admin });
+    const signers = (0, signerHelpers_1.buildSigners)([(0, signerHelpers_1.asAdminSigner)(admin)], actualFeePayer);
+    return (0, instructionResultHelpers_1.singleInstruction)(instruction, {
         signers,
         pdas: { vault: vaultPda },
-    };
+    });
 }

package/dist/instructions/initializeRewardWindow.js

@@ -5,6 +5,7 @@ const web3_js_1 = require("@solana/web3.js");
 const pdas_1 = require("../utils/pdas");
 const programHelpers_1 = require("../utils/programHelpers");
 const signerHelpers_1 = require("../utils/signerHelpers");
+const instructionResultHelpers_1 = require("../utils/instructionResultHelpers");
 const conversions_1 = require("../utils/conversions");
 /**
  * Initialize (materialize) a missing RewardWindow PDA (root-admin only).
@@ -30,10 +31,10 @@ async function initializeRewardWindow(options) {
         .initializeRewardWindow(seasonNumberBn, windowNumberBn)
         .accounts(accounts)
         .instruction();
-    const signers = (0, signerHelpers_1.buildSigners)([{ publicKey: options.admin, role: "admin" }], options.feePayer);
-    return {
-        instructions: [instruction],
+    const feePayer = (0, signerHelpers_1.resolveFeePayer)({ feePayer: options.feePayer, admin: options.admin });
+    const signers = (0, signerHelpers_1.buildSigners)([(0, signerHelpers_1.asAdminSigner)(options.admin)], feePayer);
+    return (0, instructionResultHelpers_1.singleInstruction)(instruction, {
         signers,
         pdas: { seasonSettings, season, rewardWindow },
-    };
+    });
 }

package/dist/instructions/initializeSeasonSettings.js

@@ -5,6 +5,7 @@ const web3_js_1 = require("@solana/web3.js");
 const pdas_1 = require("../utils/pdas");
 const programHelpers_1 = require("../utils/programHelpers");
 const signerHelpers_1 = require("../utils/signerHelpers");
+const instructionResultHelpers_1 = require("../utils/instructionResultHelpers");
 /**
  * Initialize season settings
  *
@@ -28,12 +29,10 @@ async function initializeSeasonSettings(connection, admin, feePayer) {
         .initializeSeasonSettings()
         .accounts(accounts)
         .instruction();
-    const signers = (0, signerHelpers_1.buildSigners)([{ publicKey: admin, role: "admin" }], feePayer);
-    return {
-        instructions: [instruction],
+    const actualFeePayer = (0, signerHelpers_1.resolveFeePayer)({ feePayer, admin });
+    const signers = (0, signerHelpers_1.buildSigners)([(0, signerHelpers_1.asAdminSigner)(admin)], actualFeePayer);
+    return (0, instructionResultHelpers_1.singleInstruction)(instruction, {
         signers,
-        pdas: {
-            seasonSettings: seasonSettingsPda,
-        },
-    };
+        pdas: { seasonSettings: seasonSettingsPda },
+    });
 }