Refactor and bugfixing - a way to view it

clients/js/src/generated/errors/mplxRewards.ts

@@ -176,6 +176,19 @@ nameToErrorMap.set(
   InvalidPrimitiveTypesConversionError
 );
 
+/** RewardsMustBeClaimed: Rewards: unclaimed rewards must be claimed */
+export class RewardsMustBeClaimedError extends ProgramError {
+  override readonly name: string = 'RewardsMustBeClaimed';
+
+  readonly code: number = 0xb; // 11
+
+  constructor(program: Program, cause?: Error) {
+    super('Rewards: unclaimed rewards must be claimed', program, cause);
+  }
+}
+codeToErrorMap.set(0xb, RewardsMustBeClaimedError);
+nameToErrorMap.set('RewardsMustBeClaimed', RewardsMustBeClaimedError);
+
 /**
  * Attempts to resolve a custom program error from the provided error code.
  * @category Errors

clients/js/src/generated/instructions/closeMining.ts

@@ -0,0 +1,124 @@
+/**
+ * This code was AUTOGENERATED using the kinobi library.
+ * Please DO NOT EDIT THIS FILE, instead use visitors
+ * to add features, then rerun kinobi to update it.
+ *
+ * @see https://github.com/metaplex-foundation/kinobi
+ */
+
+import {
+  Context,
+  Pda,
+  PublicKey,
+  Signer,
+  TransactionBuilder,
+  transactionBuilder,
+} from '@metaplex-foundation/umi';
+import {
+  Serializer,
+  mapSerializer,
+  struct,
+  u8,
+} from '@metaplex-foundation/umi/serializers';
+import {
+  ResolvedAccount,
+  ResolvedAccountsWithIndices,
+  getAccountMetasAndSigners,
+} from '../shared';
+
+// Accounts.
+export type CloseMiningInstructionAccounts = {
+  /** The address of the user's mining account */
+  mining: PublicKey | Pda;
+  /** The end user the mining accounts belongs to */
+  miningOwner: Signer;
+  /** The address where lamports from account closing will be transferred */
+  targetAccount: PublicKey | Pda;
+  depositAuthority: Signer;
+  /** The address of the reward pool */
+  rewardPool: PublicKey | Pda;
+};
+
+// Data.
+export type CloseMiningInstructionData = { discriminator: number };
+
+export type CloseMiningInstructionDataArgs = {};
+
+export function getCloseMiningInstructionDataSerializer(): Serializer<
+  CloseMiningInstructionDataArgs,
+  CloseMiningInstructionData
+> {
+  return mapSerializer<
+    CloseMiningInstructionDataArgs,
+    any,
+    CloseMiningInstructionData
+  >(
+    struct<CloseMiningInstructionData>([['discriminator', u8()]], {
+      description: 'CloseMiningInstructionData',
+    }),
+    (value) => ({ ...value, discriminator: 8 })
+  ) as Serializer<CloseMiningInstructionDataArgs, CloseMiningInstructionData>;
+}
+
+// Instruction.
+export function closeMining(
+  context: Pick<Context, 'programs'>,
+  input: CloseMiningInstructionAccounts
+): TransactionBuilder {
+  // Program ID.
+  const programId = context.programs.getPublicKey(
+    'mplxRewards',
+    'BF5PatmRTQDgEKoXR7iHRbkibEEi83nVM38cUKWzQcTR'
+  );
+
+  // Accounts.
+  const resolvedAccounts = {
+    mining: {
+      index: 0,
+      isWritable: false as boolean,
+      value: input.mining ?? null,
+    },
+    miningOwner: {
+      index: 1,
+      isWritable: false as boolean,
+      value: input.miningOwner ?? null,
+    },
+    targetAccount: {
+      index: 2,
+      isWritable: true as boolean,
+      value: input.targetAccount ?? null,
+    },
+    depositAuthority: {
+      index: 3,
+      isWritable: false as boolean,
+      value: input.depositAuthority ?? null,
+    },
+    rewardPool: {
+      index: 4,
+      isWritable: true as boolean,
+      value: input.rewardPool ?? null,
+    },
+  } satisfies ResolvedAccountsWithIndices;
+
+  // Accounts in order.
+  const orderedAccounts: ResolvedAccount[] = Object.values(
+    resolvedAccounts
+  ).sort((a, b) => a.index - b.index);
+
+  // Keys and Signers.
+  const [keys, signers] = getAccountMetasAndSigners(
+    orderedAccounts,
+    'programId',
+    programId
+  );
+
+  // Data.
+  const data = getCloseMiningInstructionDataSerializer().serialize({});
+
+  // Bytes Created On Chain.
+  const bytesCreatedOnChain = 0;
+
+  return transactionBuilder([
+    { instruction: { keys, programId, data }, signers, bytesCreatedOnChain },
+  ]);
+}

clients/js/src/generated/instructions/restakeDeposit.ts → clients/js/src/generated/instructions/extendStake.ts

@@ -34,7 +34,7 @@ import {
 } from '../types';
 
 // Accounts.
-export type RestakeDepositInstructionAccounts = {
+export type ExtendStakeInstructionAccounts = {
   /** The address of the reward pool */
   rewardPool: PublicKey | Pda;
   /** The address of the mining account which belongs to the user and stores info about user's rewards */
@@ -46,7 +46,7 @@ export type RestakeDepositInstructionAccounts = {
 };
 
 // Data.
-export type RestakeDepositInstructionData = {
+export type ExtendStakeInstructionData = {
   discriminator: number;
   oldLockupPeriod: LockupPeriod;
   newLockupPeriod: LockupPeriod;
@@ -56,7 +56,7 @@ export type RestakeDepositInstructionData = {
   miningOwner: PublicKey;
 };
 
-export type RestakeDepositInstructionDataArgs = {
+export type ExtendStakeInstructionDataArgs = {
   oldLockupPeriod: LockupPeriodArgs;
   newLockupPeriod: LockupPeriodArgs;
   depositStartTs: number | bigint;
@@ -65,16 +65,16 @@ export type RestakeDepositInstructionDataArgs = {
   miningOwner: PublicKey;
 };
 
-export function getRestakeDepositInstructionDataSerializer(): Serializer<
-  RestakeDepositInstructionDataArgs,
-  RestakeDepositInstructionData
+export function getExtendStakeInstructionDataSerializer(): Serializer<
+  ExtendStakeInstructionDataArgs,
+  ExtendStakeInstructionData
 > {
   return mapSerializer<
-    RestakeDepositInstructionDataArgs,
+    ExtendStakeInstructionDataArgs,
     any,
-    RestakeDepositInstructionData
+    ExtendStakeInstructionData
   >(
-    struct<RestakeDepositInstructionData>(
+    struct<ExtendStakeInstructionData>(
       [
         ['discriminator', u8()],
         ['oldLockupPeriod', getLockupPeriodSerializer()],
@@ -84,22 +84,19 @@ export function getRestakeDepositInstructionDataSerializer(): Serializer<
         ['additionalAmount', u64()],
         ['miningOwner', publicKeySerializer()],
       ],
-      { description: 'RestakeDepositInstructionData' }
+      { description: 'ExtendStakeInstructionData' }
     ),
     (value) => ({ ...value, discriminator: 6 })
-  ) as Serializer<
-    RestakeDepositInstructionDataArgs,
-    RestakeDepositInstructionData
-  >;
+  ) as Serializer<ExtendStakeInstructionDataArgs, ExtendStakeInstructionData>;
 }
 
 // Args.
-export type RestakeDepositInstructionArgs = RestakeDepositInstructionDataArgs;
+export type ExtendStakeInstructionArgs = ExtendStakeInstructionDataArgs;
 
 // Instruction.
-export function restakeDeposit(
+export function extendStake(
   context: Pick<Context, 'programs'>,
-  input: RestakeDepositInstructionAccounts & RestakeDepositInstructionArgs
+  input: ExtendStakeInstructionAccounts & ExtendStakeInstructionArgs
 ): TransactionBuilder {
   // Program ID.
   const programId = context.programs.getPublicKey(
@@ -132,7 +129,7 @@ export function restakeDeposit(
   } satisfies ResolvedAccountsWithIndices;
 
   // Arguments.
-  const resolvedArgs: RestakeDepositInstructionArgs = { ...input };
+  const resolvedArgs: ExtendStakeInstructionArgs = { ...input };
 
   // Accounts in order.
   const orderedAccounts: ResolvedAccount[] = Object.values(
@@ -147,8 +144,8 @@ export function restakeDeposit(
   );
 
   // Data.
-  const data = getRestakeDepositInstructionDataSerializer().serialize(
-    resolvedArgs as RestakeDepositInstructionDataArgs
+  const data = getExtendStakeInstructionDataSerializer().serialize(
+    resolvedArgs as ExtendStakeInstructionDataArgs
   );
 
   // Bytes Created On Chain.

clients/js/src/generated/instructions/index.ts

@@ -7,10 +7,11 @@
  */
 
 export * from './claim';
+export * from './closeMining';
 export * from './depositMining';
 export * from './distributeRewards';
+export * from './extendStake';
 export * from './fillVault';
 export * from './initializeMining';
 export * from './initializePool';
-export * from './restakeDeposit';
 export * from './withdrawMining';

clients/rust/src/generated/errors/mplx_rewards.rs

@@ -43,6 +43,9 @@ pub enum MplxRewardsError {
     /// 10 (0xA) - Rewards: distribution_ends_at date is lower than current date
     #[error("Rewards: distribution_ends_at date is lower than current date ")]
     InvalidPrimitiveTypesConversion,
+    /// 11 (0xB) - Rewards: unclaimed rewards must be claimed
+    #[error("Rewards: unclaimed rewards must be claimed")]
+    RewardsMustBeClaimed,
 }
 
 impl solana_program::program_error::PrintProgramError for MplxRewardsError {