Set Prettier line width to 100 (#4)

odcheung · web-flow · commit 4399c67dbcb6 · 2021-07-08T16:01:27.000+08:00
diff --git a/.prettierrc b/.prettierrc
@@ -1 +1,3 @@
-{}
+{
+  "printWidth": 100
+}
diff --git a/src/constants/pools.ts b/src/constants/pools.ts
@@ -24,9 +24,7 @@ export const ethUsdcPool: OrcaPoolParams = Object.freeze({
   address: new PublicKey("DY8qBwVGLeLJSrWib7L16mL7oB4HNAQ2f9yiYWKof54v"),
   nonce: 255,
   authority: new PublicKey("82oSibpDKnPZ2Yk1vn6McjCsQQbKfBkGeEh5FsqeVrtU"),
-  poolTokenAddress: new PublicKey(
-    "7TYb32qkwYosUQfUspU45cou7Bb3nefJocVMFX2mEGTT"
-  ),
+  poolTokenAddress: new PublicKey("7TYb32qkwYosUQfUspU45cou7Bb3nefJocVMFX2mEGTT"),
   poolTokenMint: new PublicKey("7TYb32qkwYosUQfUspU45cou7Bb3nefJocVMFX2mEGTT"),
   poolTokenDecimals: 9,
   feeAccount: new PublicKey("AcMaBVt6S43JQXKnEDqdicxYofb5Cj1UgFWF9AsurTp6"),
diff --git a/src/model/orca-pool.ts b/src/model/orca-pool.ts
@@ -6,11 +6,7 @@ import { defaultSlippagePercentage } from "../constants/orca-defaults";
 import { orcaPoolConfigs } from "../constants/pools";
 import { deserializeAccount } from "../utils/web3/deserialize-account";
 import { findAssociatedTokenAddress } from "../utils/web3/find-associated-token-address";
-import {
-  getTokens,
-  PoolTokenCount,
-  getTokenCount,
-} from "../utils/web3/get-token-count";
+import { getTokens, PoolTokenCount, getTokenCount } from "../utils/web3/get-token-count";
 import { OrcaPoolParams } from "./orca/orca-types";
 import { QuotePoolParams, QuoteBuilderFactory } from "./quote/quote-builder";
 import { DecimalUtil } from "../utils/decimal-utils";
@@ -40,10 +36,7 @@ class OrcaPoolImpl implements OrcaPool {
   }
 
   public async getLPBalance(user: PublicKey): Promise<number> {
-    const address = await findAssociatedTokenAddress(
-      user,
-      this.poolParams.poolTokenMint
-    );
+    const address = await findAssociatedTokenAddress(user, this.poolParams.poolTokenMint);
 
     // TODO: SOL account handling
     const accountInfo = await this.connection.getAccountInfo(address);
@@ -57,23 +50,15 @@ class OrcaPoolImpl implements OrcaPool {
       throw new Error("Failed to parse user account for LP token.");
     }
 
-    return DecimalUtil.fromU64(
-      result.amount,
-      this.poolParams.poolTokenDecimals
-    ).toNumber();
+    return DecimalUtil.fromU64(result.amount, this.poolParams.poolTokenDecimals).toNumber();
   }
 
   public async getLPSupply(): Promise<number> {
-    const context = await this.connection.getTokenSupply(
-      this.poolParams.poolTokenMint
-    );
+    const context = await this.connection.getTokenSupply(this.poolParams.poolTokenMint);
 
     const amt = new u64(context.value.amount);
 
-    return DecimalUtil.fromU64(
-      amt,
-      this.poolParams.poolTokenDecimals
-    ).toNumber();
+    return DecimalUtil.fromU64(amt, this.poolParams.poolTokenDecimals).toNumber();
   }
 
   public async getQuote(
@@ -82,16 +67,11 @@ class OrcaPoolImpl implements OrcaPool {
     slippage?: number
   ): Promise<Quote> {
     const slippageTolerance =
-      slippage === undefined
-        ? defaultSlippagePercentage
-        : PercentageUtils.fromNumber(slippage);
+      slippage === undefined ? defaultSlippagePercentage : PercentageUtils.fromNumber(slippage);
 
     const feeStructure = this.poolParams.feeStructure;
 
-    const [inputPoolToken, outputPoolToken] = getTokens(
-      this.poolParams,
-      inputTokenId
-    );
+    const [inputPoolToken, outputPoolToken] = getTokens(this.poolParams, inputTokenId);
 
     const poolTokenCount: PoolTokenCount = await getTokenCount(
       this.connection,
@@ -108,9 +88,7 @@ class OrcaPoolImpl implements OrcaPool {
       slippageTolerance: slippageTolerance,
     };
 
-    const quoteBuilder = QuoteBuilderFactory.getBuilder(
-      this.poolParams.curveType
-    );
+    const quoteBuilder = QuoteBuilderFactory.getBuilder(this.poolParams.curveType);
 
     const quote = quoteBuilder?.buildQuote(
       quoteParams,
diff --git a/src/model/pools.ts b/src/model/pools.ts
@@ -24,9 +24,7 @@ export const ethUsdcPool: OrcaPoolParams = Object.freeze({
   address: new PublicKey("DY8qBwVGLeLJSrWib7L16mL7oB4HNAQ2f9yiYWKof54v"),
   nonce: 255,
   authority: new PublicKey("82oSibpDKnPZ2Yk1vn6McjCsQQbKfBkGeEh5FsqeVrtU"),
-  poolTokenAddress: new PublicKey(
-    "7TYb32qkwYosUQfUspU45cou7Bb3nefJocVMFX2mEGTT"
-  ),
+  poolTokenAddress: new PublicKey("7TYb32qkwYosUQfUspU45cou7Bb3nefJocVMFX2mEGTT"),
   poolTokenMint: new PublicKey("7TYb32qkwYosUQfUspU45cou7Bb3nefJocVMFX2mEGTT"),
   poolTokenDecimals: 9,
   feeAccount: new PublicKey("AcMaBVt6S43JQXKnEDqdicxYofb5Cj1UgFWF9AsurTp6"),
diff --git a/src/model/quote/constant-product-quote.ts b/src/model/quote/constant-product-quote.ts
@@ -15,43 +15,26 @@ import { QuotePoolParams } from "./quote-builder";
  */
 
 function getRate(inputTradeAmountU64: u64, params: QuotePoolParams): Decimal {
-  const expectedOutputAmountU64 = getExpectedOutputAmount(
-    inputTradeAmountU64,
-    params
-  );
-  const inputTradeAmount = DecimalUtil.fromU64(
-    inputTradeAmountU64,
-    params.inputToken.decimals
-  );
+  const expectedOutputAmountU64 = getExpectedOutputAmount(inputTradeAmountU64, params);
+  const inputTradeAmount = DecimalUtil.fromU64(inputTradeAmountU64, params.inputToken.decimals);
   const outputTradeAmount = DecimalUtil.fromU64(
     expectedOutputAmountU64,
     params.outputToken.decimals
   );
   return outputTradeAmount.div(inputTradeAmount);
 }
 
-function getPriceImpact(
-  inputTradeAmount: u64,
-  params: QuotePoolParams
-): Decimal {
-  const noSlippageOutputCountU64 = getExpectedOutputAmountWithNoSlippage(
-    inputTradeAmount,
-    params
-  );
+function getPriceImpact(inputTradeAmount: u64, params: QuotePoolParams): Decimal {
+  const noSlippageOutputCountU64 = getExpectedOutputAmountWithNoSlippage(inputTradeAmount, params);
   const outputCountU64 = getExpectedOutputAmount(inputTradeAmount, params);
 
   const noSlippageOutputCount = DecimalUtil.fromU64(
     noSlippageOutputCountU64,
     params.outputToken.decimals
   );
-  const outputCount = DecimalUtil.fromU64(
-    outputCountU64,
-    params.outputToken.decimals
-  );
+  const outputCount = DecimalUtil.fromU64(outputCountU64, params.outputToken.decimals);
 
-  const impact = noSlippageOutputCount
-    .sub(outputCount)
-    .div(noSlippageOutputCount);
+  const impact = noSlippageOutputCount.sub(outputCount).div(noSlippageOutputCount);
   return impact.mul(100);
 }
 
@@ -68,37 +51,22 @@ function getFees(inputTradeAmount: u64, params: QuotePoolParams): u64 {
   return new u64(tradingFee.add(ownerFee).toString());
 }
 
-function getExpectedOutputAmount(
-  inputTradeAmount: u64,
-  params: QuotePoolParams
-): u64 {
-  const inputTradeLessFees = inputTradeAmount.sub(
-    getFees(inputTradeAmount, params)
-  );
+function getExpectedOutputAmount(inputTradeAmount: u64, params: QuotePoolParams): u64 {
+  const inputTradeLessFees = inputTradeAmount.sub(getFees(inputTradeAmount, params));
   return getOutputAmount(inputTradeLessFees, params);
 }
 
 function getExpectedOutputAmountWithNoSlippage(
   inputTradeAmount: u64,
   params: QuotePoolParams
 ): u64 {
-  const inputTradeLessFees = inputTradeAmount.sub(
-    getFees(inputTradeAmount, params)
-  );
-  return inputTradeLessFees
-    .mul(params.outputTokenCount)
-    .div(params.inputTokenCount);
+  const inputTradeLessFees = inputTradeAmount.sub(getFees(inputTradeAmount, params));
+  return inputTradeLessFees.mul(params.outputTokenCount).div(params.inputTokenCount);
 }
 
-function getMinimumAmountOut(
-  inputTradeAmount: u64,
-  params: QuotePoolParams
-): u64 {
+function getMinimumAmountOut(inputTradeAmount: u64, params: QuotePoolParams): u64 {
   const slippageTolerance = params.slippageTolerance;
-  const expectedOutputAmountFees = getExpectedOutputAmount(
-    inputTradeAmount,
-    params
-  );
+  const expectedOutputAmountFees = getExpectedOutputAmount(inputTradeAmount, params);
   const result = expectedOutputAmountFees
     .mul(slippageTolerance.denominator.sub(slippageTolerance.numerator))
     .div(slippageTolerance.denominator);
@@ -109,10 +77,7 @@ function getMinimumAmountOut(
 // Given k = currInputTokenCount * currOutputTokenCount and k = newInputTokenCount * newOutputTokenCount,
 // solve for newOutputTokenCount
 function getOutputAmount(inputTradeAmount: u64, params: QuotePoolParams): u64 {
-  const [poolInputAmount, poolOutputAmount] = [
-    params.inputTokenCount,
-    params.outputTokenCount,
-  ];
+  const [poolInputAmount, poolOutputAmount] = [params.inputTokenCount, params.outputTokenCount];
 
   const invariant = poolInputAmount.mul(poolOutputAmount);
 
@@ -127,18 +92,12 @@ function getOutputAmount(inputTradeAmount: u64, params: QuotePoolParams): u64 {
 }
 
 export class ConstantProductPoolQuoteBuilder {
-  async buildQuote(
-    params: QuotePoolParams,
-    inputTradeAmount: u64
-  ): Promise<Quote> {
+  async buildQuote(params: QuotePoolParams, inputTradeAmount: u64): Promise<Quote> {
     return {
       getRate: () => getRate(inputTradeAmount, params),
       getPriceImpact: () => getPriceImpact(inputTradeAmount, params),
       getFees: () =>
-        U64Utils.toOrcaU64(
-          getFees(inputTradeAmount, params),
-          params.inputToken.decimals
-        ),
+        U64Utils.toOrcaU64(getFees(inputTradeAmount, params), params.inputToken.decimals),
       getExpectedOutputAmount: () =>
         U64Utils.toOrcaU64(
           getExpectedOutputAmount(inputTradeAmount, params),
diff --git a/src/model/utils/percentage.ts b/src/model/utils/percentage.ts
@@ -9,13 +9,9 @@ export class PercentageUtils {
     return PercentageUtils.fromFraction(number * 10, 1000);
   }
 
-  public static fromFraction(
-    numerator: u64 | number,
-    denominator: u64 | number
-  ): Percentage {
+  public static fromFraction(numerator: u64 | number, denominator: u64 | number): Percentage {
     const num = typeof numerator === "number" ? new u64(numerator) : numerator;
-    const denom =
-      typeof denominator === "number" ? new u64(denominator) : denominator;
+    const denom = typeof denominator === "number" ? new u64(denominator) : denominator;
     return { numerator: num, denominator: denom };
   }
 }
diff --git a/src/public/types.ts b/src/public/types.ts
@@ -47,11 +47,7 @@ export type OrcaPool = {
    * @param slippage The slippage in percentage you are willing to take in this trade
    * @return Returns a quote on the exchanged token based on the input token amount
    */
-  getQuote: (
-    inputTokenId: string,
-    inputAmount: Decimal,
-    slippage: number
-  ) => Promise<Quote>;
+  getQuote: (inputTokenId: string, inputAmount: Decimal, slippage: number) => Promise<Quote>;
 };
 
 export type Quote = {
diff --git a/src/utils/web3/deserialize-account.ts b/src/utils/web3/deserialize-account.ts
@@ -1,9 +1,7 @@
 import { AccountInfo, AccountLayout, u64 } from "@solana/spl-token";
 import { PublicKey } from "@solana/web3.js";
 
-export const deserializeAccount = (
-  data: Buffer | undefined
-): AccountInfo | undefined => {
+export const deserializeAccount = (data: Buffer | undefined): AccountInfo | undefined => {
   if (data == undefined || data.length == 0) {
     return undefined;
   }
diff --git a/src/utils/web3/find-associated-token-address.ts b/src/utils/web3/find-associated-token-address.ts
@@ -8,11 +8,7 @@ export async function findAssociatedTokenAddress(
 ): Promise<PublicKey> {
   return (
     await PublicKey.findProgramAddress(
-      [
-        walletAddress.toBuffer(),
-        TOKEN_PROGRAM_ID.toBuffer(),
-        tokenMint.toBuffer(),
-      ],
+      [walletAddress.toBuffer(), TOKEN_PROGRAM_ID.toBuffer(), tokenMint.toBuffer()],
       SPL_ASSOCIATED_TOKEN_ACCOUNT_PROGRAM_ID
     )
   )[0];
diff --git a/src/utils/web3/get-token-count.ts b/src/utils/web3/get-token-count.ts
@@ -21,12 +21,8 @@ export function getTokens(
 
   const forward = tokenAId == inputTokenId;
 
-  const inputOrcaToken = forward
-    ? poolParams.tokens[tokenAId]
-    : poolParams.tokens[tokenBId];
-  const outputOrcaToken = forward
-    ? poolParams.tokens[tokenBId]
-    : poolParams.tokens[tokenAId];
+  const inputOrcaToken = forward ? poolParams.tokens[tokenAId] : poolParams.tokens[tokenBId];
+  const outputOrcaToken = forward ? poolParams.tokens[tokenBId] : poolParams.tokens[tokenAId];
   return [inputOrcaToken, outputOrcaToken];
 }
 

-Original file line number
+Diff line change
 -{}
 +{
 +  "printWidth": 100
 +}
Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,9 @@ export class PercentageUtils {`
`9`	`9`	`return PercentageUtils.fromFraction(number * 10, 1000);`
`10`	`10`	`}`
`11`	`11`
`12`		`- public static fromFraction(`
`13`		`- numerator: u64 \| number,`
`14`		`- denominator: u64 \| number`
`15`		`- ): Percentage {`
	`12`	`+ public static fromFraction(numerator: u64 \| number, denominator: u64 \| number): Percentage {`
`16`	`13`	`const num = typeof numerator === "number" ? new u64(numerator) : numerator;`
`17`		`- const denom =`
`18`		`- typeof denominator === "number" ? new u64(denominator) : denominator;`
	`14`	`+ const denom = typeof denominator === "number" ? new u64(denominator) : denominator;`
`19`	`15`	`return { numerator: num, denominator: denom };`
`20`	`16`	`}`
`21`	`17`	`}`