linter fix

QuarryProtocol · Dec 4, 2023 · 01643e5 · 01643e5
1 parent f8c07b4
commit 01643e5
Show file tree

Hide file tree

Showing 31 changed files with 457 additions and 474 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1 @@
+{}
diff --git a/src/constants.ts b/src/constants.ts
@@ -71,12 +71,12 @@ export const QUARRY_CODERS = buildCoderMap<{
  * Recipient of protocol fees.
  */
 export const QUARRY_FEE_TO = new PublicKey(
-  "4MMZH3ih1aSty2nx4MC3kSR94Zb55XsXnqb5jfEcyHWQ"
+  "4MMZH3ih1aSty2nx4MC3kSR94Zb55XsXnqb5jfEcyHWQ",
 );
 
 /**
  * Sets the protocol fees.
  */
 export const QUARRY_FEE_SETTER = new PublicKey(
-  "4MMZH3ih1aSty2nx4MC3kSR94Zb55XsXnqb5jfEcyHWQ"
+  "4MMZH3ih1aSty2nx4MC3kSR94Zb55XsXnqb5jfEcyHWQ",
 );
diff --git a/src/sdk.ts b/src/sdk.ts
@@ -31,7 +31,7 @@ import { RedeemerWrapper } from "./wrappers/redeemer";
 export class QuarrySDK {
   constructor(
     readonly provider: AugmentedProvider,
-    readonly programs: Programs
+    readonly programs: Programs,
   ) {}
 
   /**
@@ -71,7 +71,7 @@ export class QuarrySDK {
    */
   newTx(
     instructions: TransactionInstruction[],
-    signers?: Signer[]
+    signers?: Signer[],
   ): TransactionEnvelope {
     return this.provider.newTX(instructions, signers);
   }
@@ -93,7 +93,7 @@ export class QuarrySDK {
     const programs = newProgramMap<Programs>(
       provider,
       QUARRY_IDLS,
-      allAddresses
+      allAddresses,
     );
     return new QuarrySDK(new SolanaAugmentedProvider(provider), programs);
   }

diff --git a/src/wrappers/mergeMine/mergeMiner.ts b/src/wrappers/mergeMine/mergeMiner.ts
@@ -31,7 +31,7 @@ export class MergeMiner {
     readonly mm: {
       key: PublicKey;
       data: MergeMinerData;
-    }
+    },
   ) {}
 
   get provider(): Provider {
@@ -83,7 +83,7 @@ export class MergeMiner {
         mmPrimaryTokenAccount,
         owner,
         [],
-        amount.toU64()
+        amount.toU64(),
       ),
     ]).combine(await this.stakePrimaryMiner(rewarder));
   }
@@ -160,7 +160,7 @@ export class MergeMiner {
             systemProgram: SystemProgram.programId,
             tokenProgram: TOKEN_PROGRAM_ID,
           },
-        })
+        }),
       );
       if (minerReplicaMintTokenAccount.instruction) {
         txEnv.instructions.unshift(minerReplicaMintTokenAccount.instruction);
@@ -186,11 +186,11 @@ export class MergeMiner {
   }): Promise<TransactionEnvelope> {
     const withdrawPrimary = await this.unstakePrimaryMiner(rewarder, amount);
     const withdrawPrimaryFromMM = await this.withdrawTokens(
-      amount.token.mintAccount
+      amount.token.mintAccount,
     );
     return TransactionEnvelope.combineAll(
       withdrawPrimary,
-      withdrawPrimaryFromMM
+      withdrawPrimaryFromMM,
     );
   }
 
@@ -224,7 +224,7 @@ export class MergeMiner {
    */
   async unstakePrimaryMiner(
     rewarder: PublicKey,
-    amount: TokenAmount
+    amount: TokenAmount,
   ): Promise<TransactionEnvelope> {
     const stake = await this.getPrimaryStakeAccounts(rewarder);
     const mmPrimaryTokenAccount = await getATAAddress({
@@ -312,7 +312,7 @@ export class MergeMiner {
   async claimPrimaryRewards(rewarder: PublicKey): Promise<TransactionEnvelope> {
     return await this.claimRewardsCommon(
       this.primaryMint,
-      await this.getPrimaryStakeAccounts(rewarder)
+      await this.getPrimaryStakeAccounts(rewarder),
     );
   }
 
@@ -323,7 +323,7 @@ export class MergeMiner {
   async claimReplicaRewards(rewarder: PublicKey): Promise<TransactionEnvelope> {
     return await this.claimRewardsCommon(
       this.replicaMint,
-      await this.getReplicaStakeAccounts(rewarder)
+      await this.getReplicaStakeAccounts(rewarder),
     );
   }
 
@@ -335,17 +335,17 @@ export class MergeMiner {
   async claimRewardsCommon(
     quarryMint: PublicKey,
     stake: QuarryStakeAccounts,
-    mmOwner: PublicKey = this.provider.wallet.publicKey
+    mmOwner: PublicKey = this.provider.wallet.publicKey,
   ): Promise<TransactionEnvelope> {
     const rewarderKey = stake.rewarder;
     const rewarder =
       await this.mergeMine.sdk.programs.Mine.account.rewarder.fetch(
-        rewarderKey
+        rewarderKey,
       );
     const [minter] = await findMinterAddress(
       rewarder.mintWrapper,
       rewarderKey,
-      this.mergeMine.sdk.programs.MintWrapper.programId
+      this.mergeMine.sdk.programs.MintWrapper.programId,
     );
 
     const mm = this.mm.key;
@@ -392,7 +392,7 @@ export class MergeMiner {
   }
 
   async getReplicaStakeAccounts(
-    rewarder: PublicKey
+    rewarder: PublicKey,
   ): Promise<QuarryStakeAccounts> {
     const [quarry] = await findQuarryAddress(rewarder, this.replicaMint);
     const [miner] = await findMinerAddress(quarry, this.mm.key);
@@ -410,7 +410,7 @@ export class MergeMiner {
   }
 
   async getPrimaryStakeAccounts(
-    rewarder: PublicKey
+    rewarder: PublicKey,
   ): Promise<QuarryStakeAccounts> {
     const [quarry] = await findQuarryAddress(rewarder, this.primaryMint);
     const [miner] = await findMinerAddress(quarry, this.mm.key);

diff --git a/src/wrappers/mergeMine/mergePool.ts b/src/wrappers/mergeMine/mergePool.ts
@@ -25,7 +25,10 @@ import type { MergeMine } from "./quarryMergeMine";
 export class MergePool {
   private _data: MergePoolData | null = null;
 
-  constructor(readonly mergeMine: MergeMine, readonly key: PublicKey) {}
+  constructor(
+    readonly mergeMine: MergeMine,
+    readonly key: PublicKey,
+  ) {}
 
   async reloadData(): Promise<MergePoolData> {
     this._data = await this.mergeMine.program.account.mergePool.fetch(this.key);
@@ -95,7 +98,7 @@ export class MergePool {
             payer: this.provider.wallet.publicKey,
             systemProgram: SystemProgram.programId,
           },
-        })
+        }),
       );
       if (mmATAIx) {
         allInstructions.push(mmATAIx);
@@ -117,12 +120,12 @@ export class MergePool {
         mmPrimaryTokenAccount,
         mmOwner,
         [],
-        amount.toU64()
-      )
+        amount.toU64(),
+      ),
     );
 
     return new TransactionEnvelope(this.provider, allInstructions).combine(
-      await this.stakePrimaryMiner(rewarder, mmKey)
+      await this.stakePrimaryMiner(rewarder, mmKey),
     );
   }
 
@@ -133,7 +136,7 @@ export class MergePool {
    */
   async stakePrimaryMiner(
     rewarder: PublicKey,
-    mergeMiner: PublicKey
+    mergeMiner: PublicKey,
   ): Promise<TransactionEnvelope> {
     const { provider } = this.mergeMine;
     const data = await this.data();
@@ -160,7 +163,7 @@ export class MergePool {
    */
   async stakeReplicaMiner(
     rewarder: PublicKey,
-    mergeMiner: PublicKey
+    mergeMiner: PublicKey,
   ): Promise<TransactionEnvelope> {
     const poolData = await this.data();
 
@@ -209,7 +212,7 @@ export class MergePool {
             systemProgram: SystemProgram.programId,
             tokenProgram: TOKEN_PROGRAM_ID,
           },
-        })
+        }),
       );
       if (minerReplicaMintTokenAccount.instruction) {
         txEnv.instructions.unshift(minerReplicaMintTokenAccount.instruction);
@@ -238,15 +241,15 @@ export class MergePool {
     const withdrawPrimary = await this.unstakePrimaryMiner(
       rewarder,
       mergeMiner,
-      amount
+      amount,
     );
     const withdrawPrimaryFromMM = await this.withdrawTokens(
       amount.token.mintAccount,
-      mergeMiner
+      mergeMiner,
     );
     return TransactionEnvelope.combineAll(
       withdrawPrimary,
-      withdrawPrimaryFromMM
+      withdrawPrimaryFromMM,
     );
   }
 
@@ -257,7 +260,7 @@ export class MergePool {
    */
   async unstakeAllReplica(
     rewarder: PublicKey,
-    mergeMiner: PublicKey
+    mergeMiner: PublicKey,
   ): Promise<TransactionEnvelope> {
     const poolData = await this.data();
 
@@ -286,7 +289,7 @@ export class MergePool {
   async unstakePrimaryMiner(
     rewarder: PublicKey,
     mergeMiner: PublicKey,
-    amount: TokenAmount
+    amount: TokenAmount,
   ): Promise<TransactionEnvelope> {
     const poolData = await this.data();
 
@@ -313,7 +316,7 @@ export class MergePool {
    */
   async withdrawTokens(
     withdrawMint: PublicKey,
-    mergeMiner: PublicKey
+    mergeMiner: PublicKey,
   ): Promise<TransactionEnvelope> {
     const owner = this.provider.wallet.publicKey;
     const mmPrimaryAccount = await getATAAddress({
@@ -345,12 +348,12 @@ export class MergePool {
    */
   async claimPrimaryRewards(
     rewarder: PublicKey,
-    mergeMiner: PublicKey
+    mergeMiner: PublicKey,
   ): Promise<TransactionEnvelope> {
     const poolData = await this.data();
     return await this.claimRewardsCommon(
       poolData.primaryMint,
-      await this.getPrimaryStakeAccounts(rewarder, mergeMiner)
+      await this.getPrimaryStakeAccounts(rewarder, mergeMiner),
     );
   }
 
@@ -360,13 +363,13 @@ export class MergePool {
    */
   async claimReplicaRewards(
     rewarder: PublicKey,
-    mergeMiner: PublicKey
+    mergeMiner: PublicKey,
   ): Promise<TransactionEnvelope> {
     const poolData = await this.data();
 
     return await this.claimRewardsCommon(
       poolData.replicaMint,
-      await this.getReplicaStakeAccounts(rewarder, mergeMiner)
+      await this.getReplicaStakeAccounts(rewarder, mergeMiner),
     );
   }
 
@@ -378,16 +381,16 @@ export class MergePool {
   async claimRewardsCommon(
     quarryMint: PublicKey,
     stake: QuarryStakeAccounts,
-    mmOwner: PublicKey = this.provider.wallet.publicKey
+    mmOwner: PublicKey = this.provider.wallet.publicKey,
   ): Promise<TransactionEnvelope> {
     const rewarder =
       await this.mergeMine.sdk.programs.Mine.account.rewarder.fetch(
-        stake.rewarder
+        stake.rewarder,
       );
     const [minter] = await findMinterAddress(
       rewarder.mintWrapper,
       stake.rewarder,
-      this.mergeMine.sdk.programs.MintWrapper.programId
+      this.mergeMine.sdk.programs.MintWrapper.programId,
     );
 
     const withdrawMint = rewarder.rewardsTokenMint;
@@ -434,7 +437,7 @@ export class MergePool {
 
   async getReplicaStakeAccounts(
     rewarder: PublicKey,
-    mergeMiner: PublicKey
+    mergeMiner: PublicKey,
   ): Promise<QuarryStakeAccounts> {
     const poolData = await this.data();
 
@@ -456,7 +459,7 @@ export class MergePool {
 
   async getPrimaryStakeAccounts(
     rewarder: PublicKey,
-    mergeMiner: PublicKey
+    mergeMiner: PublicKey,
   ): Promise<QuarryStakeAccounts> {
     const poolData = await this.data();
 

diff --git a/src/wrappers/mergeMine/pda.ts b/src/wrappers/mergeMine/pda.ts
@@ -16,7 +16,7 @@ export const findPoolAddress = async ({
 }): Promise<[PublicKey, number]> => {
   return await PublicKey.findProgramAddress(
     [utils.bytes.utf8.encode("MergePool"), primaryMint.toBuffer()],
-    programId
+    programId,
   );
 };
 
@@ -34,7 +34,7 @@ export const findReplicaMintAddress = async ({
   const [pool] = await findPoolAddress({ programId, primaryMint });
   return await PublicKey.findProgramAddress(
     [utils.bytes.utf8.encode("ReplicaMint"), pool.toBuffer()],
-    programId
+    programId,
   );
 };
 
@@ -53,6 +53,6 @@ export const findMergeMinerAddress = async ({
 }): Promise<[PublicKey, number]> => {
   return await PublicKey.findProgramAddress(
     [utils.bytes.utf8.encode("MergeMiner"), pool.toBuffer(), owner.toBuffer()],
-    programId
+    programId,
   );
 };