Merge pull request #292 from invariant-labs/update-fee-tiers

Update fee tiers

Author: wojciech-cichocki

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@invariant-labs/sdk",
-  "version": "0.9.57",
+  "version": "0.9.58",
   "description": "",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

sdk/package-lock.json

@@ -251,7 +251,7 @@ export const arithmeticalAvg = <T extends BN>(...args: T[]): T => {
   return sum.divn(args.length) as T
 }
 
-export const weightedArithmeticAvg = <T extends BN>(...args: { val: T, weight: BN }[]): T => {
+export const weightedArithmeticAvg = <T extends BN>(...args: { val: T; weight: BN }[]): T => {
   if (args.length === 0) {
     throw new Error('requires at least one argument')
   }
@@ -283,8 +283,10 @@ export const feeToTickSpacing = (fee: BN): number => {
 }
 
 export const FEE_TIERS: FeeTier[] = [
-  { fee: fromFee(new BN(1)) },
-  { fee: fromFee(new BN(10)) },
+  { fee: fromFee(new BN(1)), tickSpacing: 1 },
+  { fee: fromFee(new BN(3)), tickSpacing: 1 },
+  { fee: fromFee(new BN(5)), tickSpacing: 1 },
+  { fee: fromFee(new BN(10)), tickSpacing: 1 },
   { fee: fromFee(new BN(50)) },
   { fee: fromFee(new BN(100)) },
   { fee: fromFee(new BN(300)) },
@@ -1126,16 +1128,19 @@ export const poolAPY = (params: ApyPoolParams): WeeklyData => {
   let dailyTokens: BN = new BN(0)
   let dailyVolumeX: number = 0
   try {
-    const { tickLower, tickUpper, tokens: avgTokensFromRange } = calculateTokensRange(
-      ticksPreviousSnapshot,
-      ticksCurrentSnapshot,
-      currentTickIndex
-    )
+    const {
+      tickLower,
+      tickUpper,
+      tokens: avgTokensFromRange
+    } = calculateTokensRange(ticksPreviousSnapshot, ticksCurrentSnapshot, currentTickIndex)
 
     const previousSqrtPrice = calculatePriceSqrt(tickLower)
     const currentSqrtPrice = calculatePriceSqrt(tickUpper)
     const volume = getVolume(volumeX, volumeY, previousSqrtPrice, currentSqrtPrice)
-    const tokenAvgFactor = weightedArithmeticAvg({ val: activeTokens, weight: new BN(9) }, { val: avgTokensFromRange, weight: new BN(1) })
+    const tokenAvgFactor = weightedArithmeticAvg(
+      { val: activeTokens, weight: new BN(9) },
+      { val: avgTokensFromRange, weight: new BN(1) }
+    )
     dailyFactor = dailyFactorPool(tokenAvgFactor, volume, feeTier)
     dailyRange = { tickLower, tickUpper }
     dailyTokens = tokenAvgFactor

sdk/package.json

@@ -2052,7 +2052,7 @@ describe('Math', () => {
     it('case 1', async () => {
       const volume = 125000
       const tokenXamount = new BN(1000000)
-      const feeTier = FEE_TIERS[4] // 0.3%
+      const feeTier = FEE_TIERS[6] // 0.3%
 
       const result = dailyFactorPool(tokenXamount, volume, feeTier)
       assert.equal(result, 0.00037125)