merge miner provider stuff

Author: macalinao

packages/quarry/src/ixs/merge-miner/claim-rewards.ts

@@ -164,13 +164,9 @@ export async function claimPrimaryRewards({
 }: {
   mergePool: MergePoolAccount;
   mmOwner: TransactionSigner;
-  rewarder: {
-    address: Address;
-    data: Pick<
-      Rewarder,
-      "mintWrapper" | "rewardsTokenMint" | "claimFeeTokenAccount"
-    >;
-  };
+  rewarder: AccountInfo<
+    Pick<Rewarder, "mintWrapper" | "rewardsTokenMint" | "claimFeeTokenAccount">
+  >;
 }): Promise<Instruction[]> {
   const stake = await getPrimaryStakeAccounts({
     rewarder: rewarder.address,

packages/react-quarry/src/contexts/merge-miner.ts

@@ -1,9 +1,8 @@
-import type { MergePool } from "@macalinao/quarry";
-import type { Address } from "@solana/kit";
+import type { MergeMiner, MergePool } from "@macalinao/quarry";
+import type { Account, Address } from "@solana/kit";
 import { createContext, useContext } from "react";
 
 export interface MergeMinerContextValue {
-  mergePool: MergePool;
   mergePoolAddress: Address;
   mergeMinerAddress: Address | null;
   userAddress: Address | null;
@@ -12,6 +11,17 @@ export interface MergeMinerContextValue {
    * Undefined = loading
    */
   balanceRaw: bigint | null | undefined;
+
+  /**
+   * The merge pool.
+   */
+  mergePool: Account<MergePool>;
+  /**
+   * The user's merge miner.
+   *
+   * Null if it doesn't exist, undefined if loading.
+   */
+  mergeMiner: Account<MergeMiner> | null | undefined;
 }
 
 export const MergeMinerContext: React.Context<MergeMinerContextValue | null> =

packages/react-quarry/src/hooks/use-quarry-claim-mm.ts

@@ -14,7 +14,7 @@ export interface UseQuarryClaimMMResult {
 }
 
 export const useQuarryClaimMM = (): UseQuarryClaimMMResult => {
-  const { mergePool, mergePoolAddress } = useMergeMinerContext();
+  const { mergePool } = useMergeMinerContext();
   const { poolInfo } = usePoolInfo();
   const { signer } = useKitWallet();
   const sendTX = useSendTX();
@@ -47,15 +47,9 @@ export const useQuarryClaimMM = (): UseQuarryClaimMMResult => {
     }
 
     const ixs = await claimPrimaryRewards({
-      mergePool: {
-        address: mergePoolAddress,
-        data: mergePool,
-      },
+      mergePool,
       mmOwner: signer,
-      rewarder: {
-        address: poolInfo.primaryRewards.rewarder,
-        data: primaryRewarder.data,
-      },
+      rewarder: primaryRewarder,
     });
 
     return sendTX(
@@ -65,9 +59,7 @@ export const useQuarryClaimMM = (): UseQuarryClaimMMResult => {
   }, [
     signer,
     primaryRewarder,
-    mergePoolAddress,
     mergePool,
-    poolInfo.primaryRewards.rewarder,
     poolInfo.primaryRewards.rewardsToken.symbol,
     sendTX,
   ]);
@@ -86,10 +78,7 @@ export const useQuarryClaimMM = (): UseQuarryClaimMMResult => {
 
     // Add primary rewards instructions
     const primaryIxs = await claimPrimaryRewards({
-      mergePool: {
-        address: mergePoolAddress,
-        data: mergePool,
-      },
+      mergePool,
       mmOwner: signer,
       rewarder: {
         address: poolInfo.primaryRewards.rewarder,
@@ -115,10 +104,7 @@ export const useQuarryClaimMM = (): UseQuarryClaimMMResult => {
 
         try {
           const replicaIxs = await claimReplicaRewards({
-            mergePool: {
-              address: mergePoolAddress,
-              data: mergePool,
-            },
+            mergePool,
             mmOwner: signer,
             rewarder: {
               address: address(secondaryReward.rewarder),
@@ -151,7 +137,6 @@ export const useQuarryClaimMM = (): UseQuarryClaimMMResult => {
     poolInfo.primaryRewards,
     poolInfo.secondaryRewards,
     secondaryRewardersResult.data,
-    mergePoolAddress,
     mergePool,
     sendTX,
   ]);

packages/react-quarry/src/hooks/use-quarry-deposit-mm.ts

@@ -15,7 +15,7 @@ export interface UseQuarryDepositMMResult {
 }
 
 export const useQuarryDepositMM = (): UseQuarryDepositMMResult => {
-  const { mergePool, mergePoolAddress } = useMergeMinerContext();
+  const { mergePool, mergeMiner } = useMergeMinerContext();
   const { poolInfo } = usePoolInfo();
   const { signer } = useKitWallet();
   const sendTX = useSendTX();
@@ -26,21 +26,15 @@ export const useQuarryDepositMM = (): UseQuarryDepositMMResult => {
         throw new Error("Wallet not connected");
       }
 
-      if (!poolInfo.primaryRewards.rewarder) {
-        throw new Error("No primary rewarder found");
-      }
-
       const { ixs } = await createDepositMergeMinerIxs({
         amount,
         rewarder: poolInfo.primaryRewards.rewarder,
-        mergePool: {
-          address: mergePoolAddress,
-          data: mergePool,
-        },
+        mergePool,
         payer: signer,
         replicaRewarders:
           poolInfo.secondaryRewards?.map((r) => r.rewarder) ?? [],
         mmOwner: signer,
+        initMergeMiner: !mergeMiner,
       });
 
       return sendTX("Deposit to Merge Miner", ixs);
@@ -49,8 +43,8 @@ export const useQuarryDepositMM = (): UseQuarryDepositMMResult => {
       signer,
       poolInfo.primaryRewards.rewarder,
       poolInfo.secondaryRewards,
-      mergePoolAddress,
       mergePool,
+      mergeMiner,
       sendTX,
     ],
   );

packages/react-quarry/src/hooks/use-quarry-withdraw-mm.ts

@@ -16,7 +16,7 @@ export interface UseQuarryWithdrawMMResult {
 }
 
 export const useQuarryWithdrawMM = (): UseQuarryWithdrawMMResult => {
-  const { mergePool, mergePoolAddress } = useMergeMinerContext();
+  const { mergePool } = useMergeMinerContext();
   const { poolInfo } = usePoolInfo();
   const { signer } = useKitWallet();
   const sendTX = useSendTX();
@@ -30,18 +30,11 @@ export const useQuarryWithdrawMM = (): UseQuarryWithdrawMMResult => {
         throw new Error("Wallet not connected");
       }
 
-      if (!poolInfo.primaryRewards.rewarder) {
-        throw new Error("No primary rewarder found");
-      }
-
       const ixs = await createWithdrawMergeMinerIxs({
         amount,
         tokenDestination,
         rewarder: poolInfo.primaryRewards.rewarder,
-        mergePool: {
-          address: mergePoolAddress,
-          data: mergePool,
-        },
+        mergePool,
         owner: signer,
         payer: signer,
         replicaRewarders:
@@ -54,7 +47,6 @@ export const useQuarryWithdrawMM = (): UseQuarryWithdrawMMResult => {
       signer,
       poolInfo.primaryRewards.rewarder,
       poolInfo.secondaryRewards,
-      mergePoolAddress,
       mergePool,
       sendTX,
     ],

packages/react-quarry/src/providers/merge-miner-provider.tsx

@@ -11,6 +11,12 @@ interface Props {
   children?: React.ReactNode;
 }
 
+/**
+ * Provides info about the merge pool and the user's merge miner.
+ *
+ * @param param0
+ * @returns
+ */
 export const MergeMinerProvider: React.FC<Props> = ({ children }: Props) => {
   const poolInfo = usePoolInfo();
   const { signer } = useKitWallet();
@@ -53,11 +59,13 @@ export const MergeMinerProvider: React.FC<Props> = ({ children }: Props) => {
   return (
     <MergeMinerContext.Provider
       value={{
-        mergePool: mergePoolAccount.data,
         mergePoolAddress,
         mergeMinerAddress,
         userAddress: signer?.address ?? null,
         balanceRaw,
+
+        mergePool: mergePoolAccount,
+        mergeMiner: mergeMinerAccount,
       }}
     >
       {children}