Bug: Fix inconsistent APY issues

README.md

@@ -4,7 +4,7 @@
   <img src="https://avatars.githubusercontent.com/u/165751591?s=200&v=4" height="150">
 </div>
 <!-- markdownlint-restore -->
-<!-- prettier-ignore-end -->
+<!-- prettier-ignore-end --> 
 
 # STRKFarm
 

next.config.mjs

@@ -3,7 +3,7 @@ const nextConfig = {
   // output: 'export',
   compiler: {
     removeConsole: {
-      exclude: ['error'],
+      exclude: ['error', 'debug'],
     },
   },
   async rewrites() {

src/app/api/strategies/route.ts

@@ -25,7 +25,7 @@
   const hasRequiredPools = minProtocolsRequired.every((p) => {
     if (!allPools) return false;
     return allPools.some(
       (pool) => pool.protocol.name === p && pool.type == PoolType.Lending,
     );
   });
   const MAX_RETRIES = 120;
@@ -71,10 +71,26 @@
     },
     riskFactor: strategy.riskFactor,
     logo: strategy.holdingTokens[0].logo,
+    actions: strategy.actions.map((action) => {
+      return {
+        name: action.name || '',
+        protocol: {
+          name: action.pool.protocol.name,
+          logo: action.pool.protocol.logo,
+        },
+        token: {
+          name: action.pool.pool.name,
+          logo: action.pool.pool.logos[0],
+        },
+        amount: action.amount,
+        isDeposit: action.isDeposit,
+        apy: action.isDeposit ? action.pool.apr : -action.pool.borrow.apr,
+      };
+    }),
   };
 }
 
 export async function GET(req: Request) {
   const allPools = await getPools(MY_STORE);
   const strategies = getStrategies();
 

src/components/Navbar.tsx

@@ -160,6 +160,7 @@ export default function Navbar(props: NavbarProps) {
 
   // set address atom
   useEffect(() => {
+    console.log('tncinfo address', address);
     setAddress(address);
   }, [address]);
 

src/components/TncModal.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { LATEST_TNC_DOC_VERSION, SIGNING_DATA } from '@/constants';
+import { LATEST_TNC_DOC_VERSION, SIGNING_DATA, TnC_DOC_URL } from '@/constants';
 import { addressAtom } from '@/store/claims.atoms';
 import {
   Button,
@@ -61,6 +61,7 @@ const TncModal: React.FC<TncModalProps> = (props) => {
     (async () => {
       if (userTncInfo.success && userTncInfo.user) {
         setReferralCode(userTncInfo.user.referralCode);
+        console.log(`tncinfo`, userTncInfo.user);
         if (
           (userTncInfo.user.isTncSigned &&
             userTncInfo.user.tncDocVersion !== LATEST_TNC_DOC_VERSION) ||
@@ -166,7 +167,7 @@ const TncModal: React.FC<TncModalProps> = (props) => {
             as={'a'}
             width={'100%'}
             fontWeight={'bold'}
-            href={SIGNING_DATA.message.document}
+            href={TnC_DOC_URL}
             color="white"
             target="_blank"
             _hover={{ textDecor: 'underline' }}

src/constants.ts

@@ -198,7 +198,7 @@ export const NFTS: NFTInfo[] = [
 // ? When updating this, ensure there is redirect available for this route
 // ? to respect version of doc in github
 export const LATEST_TNC_DOC_VERSION = 'tnc/v1';
-
+export const TnC_DOC_URL = `${getEndpoint()}/${LATEST_TNC_DOC_VERSION}`;
 export const SIGNING_DATA = {
   types: {
     StarkNetDomain: [
@@ -219,7 +219,7 @@ export const SIGNING_DATA = {
   },
   message: {
     message: 'Read and Agree T&C',
-    document: `${getEndpoint().replace('https://', '').replace('http://', '')}/${LATEST_TNC_DOC_VERSION}`,
+    document: `${TnC_DOC_URL.replace('https://', '').replace('http://', '')}`,
   },
 };
 

src/store/strkfarm.atoms.ts

@@ -27,6 +27,21 @@ export interface STRKFarmStrategyAPIResult {
   };
   riskFactor: number;
   logo: string;
+
+  actions: {
+    name: string;
+    protocol: {
+      name: string;
+      logo: string;
+    };
+    token: {
+      name: string;
+      logo: string;
+    };
+    amount: string;
+    isDeposit: boolean;
+    apy: number;
+  }[];
 }
 
 export class STRKFarm extends IDapp<STRKFarmStrategyAPIResult> {

src/strategies/IStrategy.ts

@@ -325,15 +325,15 @@ export class IStrategy extends IStrategyProps {
       return;
     }
 
-    console.debug('Completed solving actions');
+    console.debug('Completed solving actions', this.actions.length);
     this.actions.forEach((action) => {
       const sign = action.isDeposit ? 1 : -1;
       const apr = action.isDeposit ? action.pool.apr : action.pool.borrow.apr;
       netYield += sign * apr * Number(action.amount);
       console.debug('netYield1', sign, apr, action.amount, netYield);
     });
     this.netYield = netYield / Number(amount);
-    console.debug('netYield', netYield, this.netYield);
+    console.debug('netYield', netYield, this.netYield, Number(amount));
     this.leverage = this.netYield / this.actions[0].pool.apr;
 
     this.postSolve();

src/utils/customAtomWithFetch.ts

@@ -9,20 +9,25 @@ export const customAtomWithFetch = (args: {
   return customAtomWithQuery({
     queryKey,
     queryFn: async () => {
+      const urlPrefix =
+        typeof window === 'undefined' && !url.includes('http')
+          ? process.env.HOSTNAME || 'https://app.strkfarm.xyz'
+          : '';
+
       try {
-        const urlPrefix =
-          typeof window === 'undefined' && !url.includes('http')
-            ? 'http://localhost:3000'
-            : '';
         const options = args.fetchOptions || { method: 'GET' };
         const res = await fetch(`${urlPrefix}${url}`, options);
         if (!res.ok) {
-          console.error('Error fetching url', res.statusText);
+          console.error(
+            'Error fetching url',
+            `${urlPrefix}${url}`,
+            res.statusText,
+          );
           throw new Error('Error fetching url');
         }
         return res.json();
       } catch (err) {
-        console.error('Error fetching url', err);
+        console.error('Error fetching url', `${urlPrefix}${url}`, err);
         throw err;
       }
     },