fix: fix TnC signing issue on mobile wallets

.husky/pre-commit

@@ -1 +1,2 @@
-yarn run lint:fix && yarn run format:fix && git add .
+STAGED_FILES=$(git diff --cached --name-only)
+yarn run lint:fix && yarn run format:fix && git add $STAGED_FILES

next.config.mjs

@@ -88,6 +88,11 @@ const nextConfig = {
   },
   webpack(config, options) {
     if (options.isServer) config.devtool = 'source-map';
+    config.module.rules.push({
+      test: /\.svg$/,
+      issuer: /\.[jt]sx?$/,
+      use: ['@svgr/webpack'],
+    });
     return config;
   },
   async headers() {

package.json

@@ -31,10 +31,11 @@
     "@emotion/styled": "11.11.0",
     "@next/third-parties": "14.1.3",
     "@nikolovlazar/chakra-ui-prose": "1.2.1",
+    "@noble/curves": "^2.0.0",
     "@prisma/client": "5.18.0",
-    "@starknet-react/chains": "3.0.0",
-    "@starknet-react/core": "3.0.1",
-    "@strkfarm/sdk": "^1.0.51",
+    "@starknet-react/chains": "^5.0.1",
+    "@starknet-react/core": "^5.0.1",
+    "@strkfarm/sdk": "1.1.3",
     "@tanstack/query-core": "5.28.0",
     "@types/mixpanel-browser": "2.49.0",
     "@types/mustache": "4.2.5",
@@ -51,8 +52,8 @@
     "combined-stream": "^1.0.8",
     "ethers": "6.11.1",
     "framer-motion": "11.0.5",
-    "get-starknet": "3.3.3",
-    "get-starknet-core": "3.3.3",
+    "get-starknet": "^3.3.3",
+    "get-starknet-core": "^3.3.5",
     "graphql": "16.9.0",
     "jotai": "2.6.4",
     "jotai-tanstack-query": "0.8.5",
@@ -72,13 +73,15 @@
     "react-responsive-carousel": "3.2.23",
     "react-select": "5.8.0",
     "react-share": "5.1.0",
+    "recharts": "^3.1.0",
     "sharp": "0.33.4",
-    "starknet": "6.11.0",
-    "starknetkit": "2.4.0",
+    "starknet": "8.5.2",
+    "starknetkit": "^3.0.3",
     "swr": "2.2.5",
     "wonka": "6.3.4"
   },
   "devDependencies": {
+    "@svgr/webpack": "^8.1.0",
     "@types/lodash.debounce": "^4.0.9",
     "@types/node": "20",
     "@types/react": "18",

src/app/api/lib.ts

@@ -1,6 +1,7 @@
 import { TrovesStrategyAPIResult } from '@/store/troves.atoms';
+import { UniversalStrategies } from '@strkfarm/sdk';
 import { Redis } from '@upstash/redis';
-import { Contract, RpcProvider, uint256 } from 'starknet';
+import { Contract, RpcProvider } from 'starknet';
 
 const kvRedis = new Redis({
   url: process.env.VK_REDIS_KV_REST_API_URL,
@@ -47,19 +48,53 @@ export const getRewardsInfo = async (
   strategies: Pick<TrovesStrategyAPIResult, 'id' | 'tvlUsd' | 'contract'>[],
 ) => {
   const funder =
-    '0x02D6cf6182259ee62A001EfC67e62C1fbc0dF109D2AA4163EB70D6d1074F0173';
-  const allowedStrats = [
+    '0x0291816c46b4fb9db4d544bac7feb651ab1ae2de3b52e133c0ad23a87dd7c17d';
+
+  const tokenWiseConfig = [
     {
-      id: 'vesu_fusion_eth',
-      // ! consider exchange rate of vToken
-      maxRewardsPerDay: 0.047, // in token units
-      maxAPY: 200, // in percent
-      underlyingTokenName: 'ETH',
-      decimals: 18,
-      rewardToken:
-        '0x021fe2ca1b7e731e4a5ef7df2881356070c5d72db4b2d19f9195f6b641f75df0',
+      token: 'ETH',
+      maxAPY: 100, // in %
+      maxRewardsPerDay: 0.538755 / 15, // tokem amount / days
+    },
+    {
+      token: 'WBTC',
+      maxAPY: 100, // in %
+      maxRewardsPerDay: 0.02191182 / 15, // tokem amount / days
+    },
+    {
+      token: 'USDC',
+      maxAPY: 100, // in %
+      maxRewardsPerDay: 2306 / 15, // tokem amount / days
+    },
+    {
+      token: 'USDT',
+      maxAPY: 75, // in %
+      maxRewardsPerDay: 1349 / 15, // tokem amount / days
+    },
+    {
+      token: 'STRK',
+      maxAPY: 75, // in %
+      maxRewardsPerDay: 10500 / 15, // tokem amount / days
     },
   ];
+  const allowedStrats = UniversalStrategies.map((u) => {
+    const tokenWiseInfo = tokenWiseConfig.find(
+      (t) => t.token === u.depositTokens[0].symbol,
+    );
+    if (!tokenWiseInfo) {
+      throw new Error(`No token config found for ${u.depositTokens[0].symbol}`);
+    }
+    return {
+      id: `evergreen_${u.depositTokens[0].symbol.toLowerCase()}`,
+      // ! consider exchange rate of vToken
+      maxRewardsPerDay: tokenWiseInfo.maxRewardsPerDay || 0,
+      maxAPY: tokenWiseInfo.maxAPY || 0,
+      underlyingTokenName: u.depositTokens[0].symbol,
+      decimals: u.depositTokens[0].decimals,
+      rewardToken: u.depositTokens[0].address.address,
+      rewardReceiver: u.additionalInfo.vaultAllocator.address,
+    };
+  });
 
   const provider = new RpcProvider({
     nodeUrl: process.env.RPC_URL!,
@@ -88,23 +123,25 @@ export const getRewardsInfo = async (
       );
       const priceData = await priceResponse.json();
       // consider token price of vToken
-      const clsVToken = await provider.getClassAt(stratAllowed.rewardToken);
-      const tokenContractVToken = new Contract(
-        clsVToken.abi,
-        stratAllowed.rewardToken,
-        provider,
-      );
-      const shareValue = await tokenContractVToken.call('convert_to_assets', [
-        uint256.bnToUint256((1e18).toString()),
-      ]);
-      console.log(`shareValue::${stratId}::${shareValue}`);
-      const tokenPrice =
-        (priceData.price *
-          Number(
-            (BigInt(shareValue.toString()) * BigInt(10000)) /
-              BigInt((1e18).toString()),
-          )) /
-        10000;
+      // const clsVToken = await provider.getClassAt(stratAllowed.rewardToken);
+
+      // useful math when reward token is a ERC4626 token
+      // const tokenContractVToken = new Contract(
+      //   clsVToken.abi,
+      //   stratAllowed.rewardToken,
+      //   provider,
+      // );
+      // const shareValue = await tokenContractVToken.call('convert_to_assets', [
+      //   uint256.bnToUint256((1e18).toString()),
+      // ]);
+      // console.log(`shareValue::${stratId}::${shareValue}`);
+      const tokenPrice = priceData.price;
+      // (priceData.price *
+      //   Number(
+      //     (BigInt(shareValue.toString()) * BigInt(10000)) /
+      //       BigInt((1e18).toString()),
+      //   )) /
+      // 10000;
       console.log(
         `RewardCalc::${stratId}::tokenPrice::${tokenPrice}, underlyingTokenPrice::${priceData.price}`,
       );
@@ -130,7 +167,11 @@ export const getRewardsInfo = async (
       // if less bal available, use the available balance
       const rewardToken = stratAllowed.rewardToken;
       const cls = await provider.getClassAt(rewardToken);
-      const tokenContract = new Contract(cls.abi, rewardToken, provider);
+      const tokenContract = new Contract({
+        abi: cls.abi,
+        address: rewardToken,
+        providerOrAccount: provider,
+      });
       const available = await tokenContract.balanceOf(funder);
       const availableBal =
         Number(
@@ -154,7 +195,7 @@ export const getRewardsInfo = async (
         maxRewardsPerDay: stratAllowed.maxRewardsPerDay,
         rewardToken: stratAllowed.rewardToken,
         funder,
-        receiver: strat.contract[0].address,
+        receiver: stratAllowed.rewardReceiver,
       });
     }
   }

src/app/api/price/[name]/route.ts

@@ -9,7 +9,7 @@ async function initRedis() {
   try {
     console.log('initRedis server');
     // eslint-disable-next-line
-    const config = getMainnetConfig();
+    const config = getMainnetConfig(process.env.RPC_URL!, 'latest');
     const pricer = new PricerRedis(config, []);
     if (!process.env.REDIS_URL) {
       console.warn('REDIS_URL not set');

src/app/api/strategies/apyHistory/[strategyId]/route.ts

@@ -0,0 +1,39 @@
+import { NextRequest } from 'next/server';
+import { getStrategies } from '@/store/strategies.atoms';
+
+export async function GET(req: NextRequest, context: any) {
+  const { params } = context;
+  const { searchParams } = new URL(req.url);
+  const strategyId = params.strategyId;
+
+  const duration = parseInt(searchParams.get('duration') || '7', 10);
+
+  const strategies = getStrategies();
+  const strategy = strategies.find((s) => s.id === strategyId);
+
+  if (!strategy) {
+    return new Response(JSON.stringify({ error: 'Strategy not found' }), {
+      status: 404,
+      headers: { 'Content-Type': 'application/json' },
+    });
+  }
+
+  const result = await fetch(`https://app.endur.fi/api/blocks/${duration}`);
+  const response = await result.json();
+
+  const blockInfo = response.blocks.map(
+    (block: { block: number; timestamp: number }) => {
+      return { block: block.block, timestamp: block.timestamp };
+    },
+  );
+
+  const apyHistory = {
+    strategy: strategy.name,
+    history: await strategy.getAPYHistory(blockInfo),
+  };
+
+  return new Response(JSON.stringify({ apyHistory }), {
+    status: 200,
+    headers: { 'Content-Type': 'application/json' },
+  });
+}

src/app/api/strategies/route.ts

@@ -10,6 +10,7 @@ import { MY_STORE } from '@/store';
 import VesuAtoms, { vesu } from '@/store/vesu.store';
 import EndurAtoms, { endur } from '@/store/endur.store';
 import { setDataToRedis, getDataFromRedis, getRewardsInfo } from '../lib';
+import { DEFAULT_APY_METHODLOGY } from '@/constants';
 
 export const revalidate = 1800; // 30 minutes
 export const dynamic = 'force-dynamic';
@@ -59,14 +60,16 @@ async function getStrategyInfo(
 ): Promise<TrovesStrategyAPIResult> {
   const tvl = await strategy.getTVL();
 
-  const data = {
+  const defaultAPYMethodology = DEFAULT_APY_METHODLOGY;
+  const data: TrovesStrategyAPIResult = {
     name: strategy.name,
     id: strategy.id,
     apy: strategy.netYield,
     apySplit: {
       baseApy: strategy.netYield,
       rewardsApy: 0,
     },
+    apyMethodology: strategy.metadata.apyMethodology || defaultAPYMethodology,
     depositToken: (
       await strategy.depositMethods({
         amount: MyNumber.fromZero(),

src/app/api/tnc/signUser/route.ts

@@ -11,6 +11,15 @@ const mixpanel = Mixpanel.init('118f29da6a372f0ccb6f541079cad56b');
 export async function POST(req: Request) {
   const { address, signature } = await req.json();
 
+  if (process.env.NEXT_PUBLIC_IGNORE_SIGNING === 'true') {
+    console.warn('Signing is ignored in this environment');
+    return NextResponse.json({
+      success: true,
+      message: 'Signing is ignored in this environment',
+      user: null,
+    });
+  }
+
   console.debug('address', address, 'signature', signature);
   if (!address || !signature) {
     return NextResponse.json({
@@ -43,7 +52,7 @@ export async function POST(req: Request) {
     nodeUrl: process.env.NEXT_PUBLIC_RPC_URL!,
   });
 
-  const myAccount = new Account(provider, address, '');
+  const myAccount = new Account({ provider, address, signer: '' });
 
   let isValid = false;
 
@@ -94,7 +103,7 @@ export async function POST(req: Request) {
 
   if (!isValid) {
     try {
-      const cls = await provider.getClassAt(address, 'pending');
+      const cls = await provider.getClassAt(address, 'latest');
       // means account is deployed
       return NextResponse.json({
         success: false,

src/app/community/page.tsx

@@ -81,11 +81,11 @@ const CommunityPage = () => {
     isOGNFTEligible.isError,
   ]);
 
-  const ogNFTContract = new Contract(
-    NFTAbi,
-    process.env.NEXT_PUBLIC_OG_NFT_CONTRACT || '',
-    provider,
-  );
+  const ogNFTContract = new Contract({
+    abi: NFTAbi,
+    address: process.env.NEXT_PUBLIC_OG_NFT_CONTRACT || '',
+    providerOrAccount: provider,
+  });
 
   const {
     sendAsync: claimOGNFT,
@@ -106,7 +106,7 @@ const CommunityPage = () => {
   const ogNFTAddr: `0x${string}` = (process.env.NEXT_PUBLIC_OG_NFT_CONTRACT ||
     '0x0') as `0x${string}`;
   const { data: ogNFTBalance, status: balanceQueryStatus } = useReadContract({
-    abi: NFTAbi,
+    abi: NFTAbi as any,
     address: ogNFTAddr,
     functionName: 'balanceOf',
     args: [address || '0x0', 1],

src/app/globals.css

@@ -160,6 +160,57 @@ body {
   );
 }
 
+.strategy-page-gradient {
+  background: linear-gradient(
+      0deg,
+      rgba(33, 33, 33, 0.35),
+      rgba(33, 33, 33, 0.35)
+    ),
+    linear-gradient(
+      288.17deg,
+      rgba(144, 105, 240, 0.2) -123.96%,
+      rgba(33, 33, 33, 0.2) 101.38%
+    );
+}
+
+.apy-gradient {
+  background: linear-gradient(
+      0deg,
+      rgba(33, 33, 33, 0.35),
+      rgba(33, 33, 33, 0.35)
+    ),
+    linear-gradient(
+      326.73deg,
+      rgba(144, 105, 240, 0.5) -541.23%,
+      rgba(33, 33, 33, 0.4) 92.85%
+    );
+}
+
+.holdings-gradient {
+  background: linear-gradient(
+      0deg,
+      rgba(33, 33, 33, 0.35),
+      rgba(33, 33, 33, 0.35)
+    ),
+    linear-gradient(
+      326.73deg,
+      rgba(144, 105, 240, 0.5) -541.23%,
+      rgba(33, 33, 33, 0.4) 92.85%
+    );
+}
+
+.faded-purple-gradient {
+  background: linear-gradient(
+      0deg,
+      rgba(33, 33, 33, 0.35),
+      rgba(33, 33, 33, 0.35)
+    ),
+    linear-gradient(
+      326.73deg,
+      rgba(144, 105, 240, 0.5) -541.23%,
+      rgba(33, 33, 33, 0.4) 92.85%
+    );
+}
 .connect-button-gradient {
   background: linear-gradient(93.94deg, #9069f0 3.22%, #4a14cd 101.67%);
 }