Tweak

.husky/pre-commit

@@ -1,4 +1,14 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
+# Get all staged files
+FILES=$(git diff --cached --name-only --diff-filter=ACMR | sed 's| |\\ |g')
+[ -z "$FILES" ] && exit 0
+
+# Run formatters
 yarn format
+
+# Add back the modified/prettified files to staging
+echo "$FILES" | xargs git add
+
+exit 0

docs/whirlpool/docusaurus.config.js

@@ -1,6 +1,6 @@
 import { themes } from "prism-react-renderer";
-import remarkMath from 'remark-math';
-import rehypeKatex from 'rehype-katex';
+import remarkMath from "remark-math";
+import rehypeKatex from "rehype-katex";
 
 export default {
   title: "Whirlpools",
@@ -30,9 +30,10 @@ export default {
         docs: {
           routeBasePath: "/",
           sidebarPath: "./sidebars.js",
-          editUrl: "https://github.com/orca-so/whirlpools/tree/main/docs/whirlpool",
+          editUrl:
+            "https://github.com/orca-so/whirlpools/tree/main/docs/whirlpool",
           remarkPlugins: [remarkMath],
-          rehypePlugins: [rehypeKatex]
+          rehypePlugins: [rehypeKatex],
         },
         theme: {
           customCss: "./static/index.css",
@@ -43,11 +44,11 @@ export default {
 
   stylesheets: [
     {
-      href: 'https://cdn.jsdelivr.net/npm/[email protected]/dist/katex.min.css',
-      type: 'text/css',
+      href: "https://cdn.jsdelivr.net/npm/[email protected]/dist/katex.min.css",
+      type: "text/css",
       integrity:
-        'sha384-odtC+0UGzzFL/6PNoE8rX/SPcQDXBJ+uRepguP4QkPCm2LBxH3FA3y+fKSiJ+AmM',
-      crossorigin: 'anonymous',
+        "sha384-odtC+0UGzzFL/6PNoE8rX/SPcQDXBJ+uRepguP4QkPCm2LBxH3FA3y+fKSiJ+AmM",
+      crossorigin: "anonymous",
     },
   ],
 

docs/whirlpool/src/theme/DocCard/index.js

@@ -1,61 +1,64 @@
-import React from 'react';
-import clsx from 'clsx';
-import Link from '@docusaurus/Link';
+import React from "react";
+import clsx from "clsx";
+import Link from "@docusaurus/Link";
 import {
   useDocById,
   findFirstSidebarItemLink,
-} from '@docusaurus/plugin-content-docs/client';
-import {usePluralForm} from '@docusaurus/theme-common';
-import isInternalUrl from '@docusaurus/isInternalUrl';
-import {translate} from '@docusaurus/Translate';
-import Heading from '@theme/Heading';
-import styles from './styles.module.css';
+} from "@docusaurus/plugin-content-docs/client";
+import { usePluralForm } from "@docusaurus/theme-common";
+import isInternalUrl from "@docusaurus/isInternalUrl";
+import { translate } from "@docusaurus/Translate";
+import Heading from "@theme/Heading";
+import styles from "./styles.module.css";
 
 function useCategoryItemsPlural() {
-  const {selectMessage} = usePluralForm();
+  const { selectMessage } = usePluralForm();
   return (count) =>
     selectMessage(
       count,
       translate(
         {
-          message: '1 item|{count} items',
-          id: 'theme.docs.DocCard.categoryDescription.plurals',
+          message: "1 item|{count} items",
+          id: "theme.docs.DocCard.categoryDescription.plurals",
           description:
-            'The default description for a category card in the generated index about how many items this category includes',
+            "The default description for a category card in the generated index about how many items this category includes",
         },
-        {count},
+        { count },
       ),
     );
 }
-function CardContainer({href, children}) {
+function CardContainer({ href, children }) {
   return (
     <Link
       href={href}
-      className={clsx('card padding--lg', styles.cardContainer)}>
+      className={clsx("card padding--lg", styles.cardContainer)}
+    >
       {children}
     </Link>
   );
 }
-function CardLayout({href, icon, title, description}) {
+function CardLayout({ href, icon, title, description }) {
   return (
     <CardContainer href={href}>
       <Heading
         as="h2"
-        className={clsx('text--truncate', styles.cardTitle)}
-        title={title}>
+        className={clsx("text--truncate", styles.cardTitle)}
+        title={title}
+      >
         {icon} {title}
       </Heading>
       {description && (
         <p
-          className={clsx('text--truncate', styles.cardDescription)}
-          title={description}>
+          className={clsx("text--truncate", styles.cardDescription)}
+          title={description}
+        >
           {description}
         </p>
       )}
     </CardContainer>
   );
 }
-function CardCategory({item}) {
+function CardCategory({ item }) {
   const href = findFirstSidebarItemLink(item);
   const categoryItemsPlural = useCategoryItemsPlural();
   // Unexpected: categories that don't have a link have been filtered upfront
@@ -71,8 +74,8 @@ function CardCategory({item}) {
     />
   );
 }
-function CardLink({item}) {
-  const icon = isInternalUrl(item.href) ? '📄️' : '🔗';
+function CardLink({ item }) {
+  const icon = isInternalUrl(item.href) ? "📄️" : "🔗";
   const doc = useDocById(item.docId ?? undefined);
   return (
     <CardLayout
@@ -83,11 +86,11 @@ function CardLink({item}) {
     />
   );
 }
-export default function DocCard({item}) {
+export default function DocCard({ item }) {
   switch (item.type) {
-    case 'link':
+    case "link":
       return <CardLink item={item} />;
-    case 'category':
+    case "category":
       return <CardCategory item={item} />;
     default:
       throw new Error(`unknown item type ${JSON.stringify(item)}`);

legacy-sdk/cli/src/commands/set_reward_authority.ts

@@ -1,7 +1,5 @@
 import { PublicKey } from "@solana/web3.js";
-import {
-  WhirlpoolIx,
-} from "@orca-so/whirlpools-sdk";
+import { WhirlpoolIx } from "@orca-so/whirlpools-sdk";
 import { TransactionBuilder } from "@orca-so/common-sdk";
 import { sendTransaction } from "../utils/transaction_sender";
 import { ctx } from "../utils/provider";
@@ -22,25 +20,31 @@ const updatableRewardIndexes: number[] = [];
 whirlpool.rewardInfos.forEach((ri, i) => {
   const updatable = ri.authority.equals(ctx.wallet.publicKey);
   if (updatable) updatableRewardIndexes.push(i);
-  console.info(`reward[${i}] authority: ${ri.authority.toBase58()} ${updatable ? " (Updatable)" : " (wallet is not authority)"}`);
-})
+  console.info(
+    `reward[${i}] authority: ${ri.authority.toBase58()} ${updatable ? " (Updatable)" : " (wallet is not authority)"}`,
+  );
+});
 
 if (updatableRewardIndexes.length === 0) {
   throw new Error("This wallet is NOT reward authority for all reward indexes");
 }
 
-console.info("\nEnter new reward authority\n* If you don't want to update it, just type SKIP\n");
+console.info(
+  "\nEnter new reward authority\n* If you don't want to update it, just type SKIP\n",
+);
 
-const newRewardAuthorities: (PublicKey|undefined)[] = [];
-for (let i=0; i<updatableRewardIndexes.length; i++) {
-  const newRewardAuthority = await promptText(`newRewardAuthority for reward[${updatableRewardIndexes[i]}]`);
+const newRewardAuthorities: (PublicKey | undefined)[] = [];
+for (let i = 0; i < updatableRewardIndexes.length; i++) {
+  const newRewardAuthority = await promptText(
+    `newRewardAuthority for reward[${updatableRewardIndexes[i]}]`,
+  );
   try {
     const newAuthority = new PublicKey(newRewardAuthority);
     if (newAuthority.equals(ctx.wallet.publicKey)) {
       throw new Error("newAuthority is same to the current authority");
     }
     newRewardAuthorities.push(newAuthority);
-  } catch(_e) {
+  } catch (_e) {
     newRewardAuthorities.push(undefined);
   }
 }
@@ -50,11 +54,15 @@ if (newRewardAuthorities.every((a) => a === undefined)) {
 }
 
 console.info("setting...");
-for (let i=0; i<updatableRewardIndexes.length; i++) {
+for (let i = 0; i < updatableRewardIndexes.length; i++) {
   if (newRewardAuthorities[i]) {
-    console.info(`\treward[${updatableRewardIndexes[i]}] ${whirlpool.rewardInfos[updatableRewardIndexes[i]].authority.toBase58()} -> ${newRewardAuthorities[i]!.toBase58()}`);
+    console.info(
+      `\treward[${updatableRewardIndexes[i]}] ${whirlpool.rewardInfos[updatableRewardIndexes[i]].authority.toBase58()} -> ${newRewardAuthorities[i]!.toBase58()}`,
+    );
   } else {
-    console.info(`\treward[${updatableRewardIndexes[i]}] ${whirlpool.rewardInfos[updatableRewardIndexes[i]].authority.toBase58()} (unchanged)`);
+    console.info(
+      `\treward[${updatableRewardIndexes[i]}] ${whirlpool.rewardInfos[updatableRewardIndexes[i]].authority.toBase58()} (unchanged)`,
+    );
   }
 }
 console.info("\nif the above is OK, enter YES");
@@ -64,19 +72,19 @@ if (!yesno) {
 }
 
 const builder = new TransactionBuilder(ctx.connection, ctx.wallet);
-for (let i=0; i<updatableRewardIndexes.length; i++) {
-    const rewardIndex = updatableRewardIndexes[i];
-    const newRewardAuthority = newRewardAuthorities[i];
-    if (newRewardAuthority) {
-      builder.addInstruction(
-        WhirlpoolIx.setRewardAuthorityIx(ctx.program, {
-          whirlpool: whirlpoolPubkey,
-          rewardIndex,
-          rewardAuthority: ctx.wallet.publicKey,
-          newRewardAuthority,
-        }),
-      );
-    }
+for (let i = 0; i < updatableRewardIndexes.length; i++) {
+  const rewardIndex = updatableRewardIndexes[i];
+  const newRewardAuthority = newRewardAuthorities[i];
+  if (newRewardAuthority) {
+    builder.addInstruction(
+      WhirlpoolIx.setRewardAuthorityIx(ctx.program, {
+        whirlpool: whirlpoolPubkey,
+        rewardIndex,
+        rewardAuthority: ctx.wallet.publicKey,
+        newRewardAuthority,
+      }),
+    );
+  }
 }
 
 await sendTransaction(builder);

legacy-sdk/cli/src/commands/set_reward_emissions_super_authority.ts

@@ -67,7 +67,8 @@ const builder = new TransactionBuilder(ctx.connection, ctx.wallet);
 builder.addInstruction(
   WhirlpoolIx.setRewardEmissionsSuperAuthorityIx(ctx.program, {
     whirlpoolsConfig: whirlpoolsConfigPubkey,
-    rewardEmissionsSuperAuthority: whirlpoolsConfig.rewardEmissionsSuperAuthority,
+    rewardEmissionsSuperAuthority:
+      whirlpoolsConfig.rewardEmissionsSuperAuthority,
     newRewardEmissionsSuperAuthority: newRewardEmissionsSuperAuthorityPubkey,
   }),
 );

legacy-sdk/whirlpool/src/types/public/constants.ts

@@ -22,7 +22,7 @@ export const ORCA_WHIRLPOOLS_CONFIG = new PublicKey(
  * @category Constants
  */
 export const ORCA_WHIRLPOOLS_CONFIG_ECLIPSE = new PublicKey(
-    "FVG4oDbGv16hqTUbovjyGmtYikn6UBEnazz6RVDMEFwv",
+  "FVG4oDbGv16hqTUbovjyGmtYikn6UBEnazz6RVDMEFwv",
 );
 
 /**

programs/whirlpool/src/instructions/open_position_with_token_extensions.rs

@@ -84,7 +84,7 @@ pub fn handler(
 
     if with_token_metadata {
         let (name, symbol, uri) = build_position_token_metadata(position_mint, position, whirlpool);
-    
+
         initialize_token_metadata_extension(
             name,
             symbol,

programs/whirlpool/src/math/token_math.rs

@@ -1,9 +1,9 @@
 use crate::errors::ErrorCode;
-use crate::math::{Q64_RESOLUTION, Q64_MASK};
+use crate::math::{Q64_MASK, Q64_RESOLUTION};
 
 use super::{
-    div_round_up_if, div_round_up_if_u256, mul_u256,
-    U256Muldiv, MAX_SQRT_PRICE_X64, MIN_SQRT_PRICE_X64,
+    div_round_up_if, div_round_up_if_u256, mul_u256, U256Muldiv, MAX_SQRT_PRICE_X64,
+    MIN_SQRT_PRICE_X64,
 };
 
 // Fee rate is represented as hundredths of a basis point.
@@ -110,14 +110,13 @@ pub fn try_get_amount_delta_a(
             if result > u64::MAX as u128 {
                 return Ok(AmountDeltaU64::ExceedsMax(ErrorCode::TokenMaxExceeded));
             }
-    
-            Ok(AmountDeltaU64::Valid(result as u64))    
-        },
+
+            Ok(AmountDeltaU64::Valid(result as u64))
+        }
         Err(err) => Ok(AmountDeltaU64::ExceedsMax(err)),
     }
 }
 
-
 //
 // Get change in token_b corresponding to a change in price
 //
@@ -162,12 +161,20 @@ pub fn try_get_amount_delta_b(
 
         let should_round = round_up && (p & Q64_MASK > 0);
         if should_round && result == u64::MAX {
-            return Ok(AmountDeltaU64::ExceedsMax(ErrorCode::MultiplicationOverflow));
+            return Ok(AmountDeltaU64::ExceedsMax(
+                ErrorCode::MultiplicationOverflow,
+            ));
         }
-
-        Ok(AmountDeltaU64::Valid(if should_round { result + 1 } else { result }))
+
+        Ok(AmountDeltaU64::Valid(if should_round {
+            result + 1
+        } else {
+            result
+        }))
     } else {
-        Ok(AmountDeltaU64::ExceedsMax(ErrorCode::MultiplicationShiftRightOverflow))
+        Ok(AmountDeltaU64::ExceedsMax(
+            ErrorCode::MultiplicationShiftRightOverflow,
+        ))
     }
 }