wip

Emurgo · Nov 15, 2024 · 51ea966 · 51ea966
1 parent 1d7a651
commit 51ea966
Show file tree

Hide file tree

Showing 78 changed files with 85 additions and 12,467 deletions.
diff --git a/packages/swap/src/adapters/api/muesliswap/api-maker.ts b/packages/swap/src/adapters/api/muesliswap/api-maker.ts
@@ -15,8 +15,8 @@ import {transformersMaker} from './transformers'
 import {estimateCalculation} from './calculations'
 
 export type MuesliswapApiConfig = {
-  frontendFeeTiers: ReadonlyArray<App.FrontendFeeTier>
-  lpTokenHeld?: number
+  frontendFeeTiers?: ReadonlyArray<App.FrontendFeeTier>
+  getLpTokensHeld?: () => number
   addressHex: string
   address: string
   primaryTokenInfo: Portfolio.Token.Info
@@ -29,7 +29,7 @@ export const muesliswapApiMaker = (
 ): Readonly<Swap.Api> => {
   const {
     frontendFeeTiers,
-    lpTokenHeld,
+    getLpTokensHeld = () => 0,
     stakingKey,
     addressHex,
     primaryTokenInfo,
@@ -198,7 +198,7 @@ export const muesliswapApiMaker = (
                   body,
                   primaryTokenInfo,
                   frontendFeeTiers,
-                  lpTokenHeld,
+                  getLpTokensHeld(),
                 ),
               },
             },

diff --git a/packages/swap/src/adapters/api/muesliswap/calculations.ts b/packages/swap/src/adapters/api/muesliswap/calculations.ts
@@ -5,7 +5,7 @@ export const estimateCalculation = (
   pools: Pools,
   estimate: Swap.EstimateRequest,
   primaryTokenInfo: Portfolio.Token.Info,
-  frontendFeeTiers: ReadonlyArray<App.FrontendFeeTier>,
+  frontendFeeTiers?: ReadonlyArray<App.FrontendFeeTier>,
   lpTokenHeld?: number,
 ): Swap.EstimateResponse => {
   const totalInSupply = pools.reduce(
@@ -116,11 +116,13 @@ export const estimateCalculation = (
   )
 
   // TODO check units
-  const frontendFee = getFrontendFee({
-    ptAmount,
-    frontendFeeTiers,
-    lpTokenHeld,
-  })
+  const frontendFee = frontendFeeTiers
+    ? getFrontendFee({
+        ptAmount,
+        frontendFeeTiers,
+        lpTokenHeld,
+      })
+    : 0
 
   const aggregatorFee = 0
 

diff --git a/packages/swap/src/adapters/intl/number-locale.mocks.ts b/packages/swap/src/adapters/intl/number-locale.mocks.ts
diff --git a/...s/orders/costs/getLiquidityProviderFee.ts → ...ap/src/helpers/getLiquidityProviderFee.ts b/...s/orders/costs/getLiquidityProviderFee.ts → ...ap/src/helpers/getLiquidityProviderFee.ts
@@ -1,5 +1,4 @@
 import {Portfolio} from '@yoroi/types'
-import {ceilDivision} from '../../../utils/ceilDivision'
 
 export const getLiquidityProviderFee = (
   poolFee: string,

diff --git a/...src/helpers/pools/getPoolUrlByProvider.ts → .../swap/src/helpers/getPoolUrlByProvider.ts b/...src/helpers/pools/getPoolUrlByProvider.ts → .../swap/src/helpers/getPoolUrlByProvider.ts
@@ -1,10 +1,10 @@
-import {Swap} from '@yoroi/types'
+import {Provider} from '../adapters/api/muesliswap/types'
 
-export const getPoolUrlByProvider = (provider: Swap.PoolProvider): string => {
+export const getPoolUrlByProvider = (provider: Provider): string => {
   return (poolUrls[provider] ?? poolUrls.muesliswap_v1) as string
 }
 
-const poolUrls: Record<Swap.PoolProvider, string> = {
+const poolUrls: Record<Provider, string> = {
   minswap: 'https://minswap.org',
   sundaeswap: 'https://sundae.fi',
   wingriders: 'https://www.wingriders.com',