Merge pull request #449 from inevitable-dao/develop

[web] Bump version to 1.6.0

.yarnrc.yml

@@ -1,4 +1,5 @@
 nodeLinker: pnp
+pnpMode: loose
 
 packageExtensions:
   '@walletconnect/browser-utils@*':
@@ -36,7 +37,23 @@ packageExtensions:
   '@walletconnect/web3-provider@*':
     peerDependencies:
       '@walletconnect/encoding': '*'
+      '@babel/core': '*'
       tslib: '*'
+  web3modal@*:
+    peerDependencies:
+      react-is: '*'
+  multiaddr@*:
+    peerDependencies:
+      node-fetch: '*'
+  dns-over-http-resolver@*:
+    peerDependencies:
+      node-fetch: '*'
+  eth-block-tracker@*:
+    peerDependencies:
+      '@babel/core': '*'
+  web3-provider-engine@*:
+    peerDependencies:
+      '@babel/core': '*'
   env-cmd@*:
     peerDependencies:
       cross-spawn: '*'
@@ -46,5 +63,19 @@ packageExtensions:
   recharts@*:
     peerDependencies:
       prop-types: '*'
-
+  ipfs-core-types@*:
+    peerDependencies:
+      node-fetch: '*'
+  ipfs-core-utils@*:
+    peerDependencies:
+      node-fetch: '*'
+  ipfs-http-client@*:
+    peerDependencies:
+      node-fetch: '*'
+  multiaddr-to-uri@*:
+    peerDependencies:
+      node-fetch: '*'
+  caver-js@*:
+    peerDependencies:
+      node-fetch: '*'
 yarnPath: .yarn/releases/yarn-3.2.4.cjs

README.md

@@ -1,6 +1,6 @@
 <p align="center">
   <a href="https://bento.finance">
-    <img alt="Bento" src="https://raw.githubusercontent.com/inevitable-changes/bento/develop/apps/web/public/android-chrome-512x512.png" height="128" />
+    <img alt="Bento" src="https://raw.githubusercontent.com/inevitable-dao/bento/develop/apps/web/public/android-chrome-512x512.png" height="128" />
   </a>
   <h1 align="center">
     Bento, the Open-Source Web3 Dashboard
@@ -9,7 +9,7 @@
 
 <p align="center">
   <a href="https://bento.finance">
-    <img alt="GitHub deployments" src="https://img.shields.io/github/deployments/inevitable-changes/bento/production?color=%23000000&label=deploy&logo=Vercel&logoColor=white&style=for-the-badge&labelColor=000" />
+    <img alt="GitHub deployments" src="https://img.shields.io/github/deployments/inevitable-dao/bento/production?color=%23000000&label=deploy&logo=Vercel&logoColor=white&style=for-the-badge&labelColor=000" />
   </a>
   <a href="https://opensource.org/licenses/MPL-2.0">
     <img alt="License: MPL 2.0" src="https://img.shields.io/badge/License-MPL_2.0-brightgreen.svg?style=for-the-badge&labelColor=000" />
@@ -28,12 +28,12 @@
 > **Warning**<br/>
 > This product is still under rapid development 🛠
 
-[![Group wallets across all chains. Bento — the Web3 Dashboard Built as Open Source.](https://github.com/inevitable-changes/bento/blob/develop/apps/web/public/assets/og-image.jpg?raw=true)](https://bento.finance)
+[![Group wallets across all chains. Bento — the Web3 Dashboard Built as Open Source.](https://github.com/inevitable-dao/bento/blob/develop/apps/web/public/assets/og-image.jpg?raw=true)](https://bento.finance)
 
 ## 🚀 Preparing Local Dev Environment
 
 ```bash
-git clone https://github.com/inevitable-changes/bento
+git clone https://github.com/inevitable-dao/bento
 cd bento
 yarn
 ```
@@ -42,13 +42,15 @@ First, clone this repo.
 
 ```env
 ENVIRONMENT=debug
-MAIN_API_BASE_URL=https://www.bento.finance
+NEXT_PUBLIC_API_BASE_URL=
+SERVERLESS_API_BASE_URL=https://www.bento.finance
 NEXT_PUBLIC_SUPABASE_ANON_KEY=
 SUPABASE_URL=
 NEXT_PUBLIC_OPENSEA_API_KEYS=
 NEXT_PUBLIC_CMC_PRO_API_KEYS=
 
 COVALENT_API_KEYS=
+UNMARSHAL_API_KEYS=
 SLACK_NEW_PROFILE_WEBHOOK=
 SUPABASE_SERVICE_KEY=
 REDIS_URL=
@@ -76,4 +78,4 @@ Finally, we start the development server. By default, the port is set to `3000`.
 
 - The project is licensed under the [Mozilla Public License Version 2.0](https://opensource.org/licenses/MPL-2.0). You must include this license and copyright notice if you use this work. This also means that you'll have to notify changes and open-source your work(the modified software) in the same license(or, in certain cases, one of the GNU licenses).
 
-**Copyright (c) 2022 Inevitable**
+**Copyright (c) 2023 Inevitable**

adapters/klaytn/_lib/chain.ts

@@ -8,7 +8,7 @@ import {
   priceFromCoinGecko,
   withCache,
 } from '@bento/core';
-import { getTokenBalancesFromCovalent } from '@bento/core/indexers';
+import { getTokenBalancesFromUnmarshal } from '@bento/core/indexers';
 import Caver from 'caver-js';
 import { Multicall } from 'klaytn-multicall';
 
@@ -24,6 +24,7 @@ export class KlaytnChain implements Chain {
     ind: ZERO_ADDRESS,
   };
   chainId = 8217;
+  unmarshalChainId = 'klaytn';
   _provider = new Caver(Config.RPC_URL.KLAYTN_MAINNET);
   getCurrencyPrice = (currency: Currency = 'usd') =>
     priceFromCoinGecko(this.currency.coinGeckoId, currency);
@@ -62,8 +63,9 @@ export class KlaytnChain implements Chain {
 
   getTokenBalances = async (account: string) => {
     try {
-      const items = await getTokenBalancesFromCovalent({
-        chainId: this.chainId,
+      const items = await getTokenBalancesFromUnmarshal({
+        // FIXME: Update type
+        chainId: this.unmarshalChainId as any,
         account,
       });
 
@@ -76,9 +78,10 @@ export class KlaytnChain implements Chain {
         ) {
           return [];
         }
+        const decimals = token.contract_decimals || 18;
         const balance =
           typeof token.balance === 'string'
-            ? Number(token.balance) / 10 ** token.contract_decimals
+            ? Number(token.balance) / 10 ** decimals
             : 0;
         const symbol = token.contract_ticker_symbol;
 
@@ -90,12 +93,6 @@ export class KlaytnChain implements Chain {
         );
         const getPrice = async () => {
           if (tokenInfo?.coinGeckoId || tokenInfo?.coinMarketCapId) {
-            // return priceFromCoinMarketCap(tokenInfo.coinMarketCapId).catch(
-            //   (error) => {
-            //     console.error(error);
-            //     return 0;
-            //   },
-            // );
             return undefined;
           }
 
@@ -108,10 +105,10 @@ export class KlaytnChain implements Chain {
 
         const price = await getPrice();
         return {
-          name: tokenInfo?.name ?? token.contract_name,
-          symbol: tokenInfo?.symbol ?? symbol,
-          decimals: token.contract_decimals,
-          ind: token.contract_address,
+          name: tokenInfo?.name ?? token.contract_name ?? '',
+          symbol: tokenInfo?.symbol ?? symbol ?? '',
+          decimals: decimals,
+          ind: token.contract_address ?? '',
           logo: tokenInfo?.logo,
           coinGeckoId: tokenInfo?.coinGeckoId,
           coinMarketCapId: tokenInfo?.coinMarketCapId,

adapters/package.json

@@ -2,7 +2,7 @@
   "name": "@bento/adapters",
   "version": "1.0.0",
   "private": true,
-  "repository": "https://github.com/inevitable-changes/dashboard",
+  "repository": "https://github.com/inevitable-dao/dashboard",
   "author": "Junho Yeo <i@junho.io>",
   "license": "MPL-2.0",
   "main": "./index.ts",
@@ -39,6 +39,7 @@
     "@types/prettier": "^2.7.1",
     "env-cmd": "^10.1.0",
     "find-yarn-workspace-root": "^2.0.0",
+    "node-fetch": "^3.3.0",
     "ts-node": "^10.9.1",
     "ttypescript": "^1.5.13",
     "typescript": "^4.8.3",

adapters/solana/index.ts

@@ -16,7 +16,7 @@ export class SolanaChain implements Chain {
     coinGeckoId: 'solana',
     ind: SOLANA_ZERO_ADDRESS,
   };
-  chainId = 1399811149;
+  chainName = 'solana-mainnet';
   _provider = new Connection(clusterApiUrl('mainnet-beta'));
   getCurrencyPrice = (currency: Currency = 'usd') =>
     priceFromCoinGecko(this.currency.coinGeckoId, currency);
@@ -29,7 +29,7 @@ export class SolanaChain implements Chain {
   getTokenBalances = async (account: string) => {
     try {
       const items = await getTokenBalancesFromCovalent({
-        chainId: this.chainId,
+        chainId: this.chainName,
         account,
       });
 
@@ -101,3 +101,5 @@ export const getAccount: ChainGetAccount = async (account) => {
   ]);
   return items.flat();
 };
+
+export const TEST_ADDRESS = 'HJLQd7CxQK5epNLE3R4u8b2MdGzmcvXjpntGWfht4FZH';

apps/api/.env.debug

@@ -1,2 +1,2 @@
 ENVIRONMENT=debug
-MAIN_API_BASE_URL=
+SERVERLESS_API_BASE_URL=

apps/api/.env.development

@@ -1,2 +1,2 @@
 ENVIRONMENT=development
-MAIN_API_BASE_URL=
+SERVERLESS_API_BASE_URL=

apps/api/package.json

@@ -35,7 +35,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-is": "^18.2.0",
-    "redis": "^4.3.1",
+    "redis": "^4.5.1",
     "satori": "^0.0.43",
     "tslib": "^2.4.0",
     "tweetnacl": "^1.0.3",
@@ -52,6 +52,7 @@
     "@types/uuid": "^8.3.4",
     "env-cmd": "^10.1.0",
     "next-transpile-modules": "^9.1.0",
+    "node-fetch": "^3.3.0",
     "typescript": "^4.8.3"
   }
 }

apps/api/pages/api/balances/[network]/[walletAddress].ts

@@ -19,19 +19,22 @@ interface APIRequest extends NextApiRequest {
   };
 }
 
-const parseWallets = (mixedQuery: string) => {
-  const query = mixedQuery.toLowerCase();
+const parseWallets = (network: BentoSupportedNetwork, mixedQuery: string) => {
+  let query = mixedQuery;
+  if (network !== 'solana') {
+    query = query.toLowerCase();
+  }
   if (query.indexOf(',') === -1) {
     return [query];
   }
   return query.split(',');
 };
 
 const handler = async (req: APIRequest, res: NextApiResponse) => {
-  const wallets = parseWallets(req.query.walletAddress ?? '');
   const network = (
     req.query.network ?? ''
   ).toLowerCase() as BentoSupportedNetwork;
+  const wallets = parseWallets(network, req.query.walletAddress ?? '');
 
   const adapter = await adapters[network]?.chain;
   if (!adapter) {

apps/api/pages/api/protocols/[network]/[walletAddress].ts

@@ -30,19 +30,22 @@ type APIResponse = (ServiceInfo & {
   }[];
 })[];
 
-const parseWallets = (mixedQuery: string) => {
-  const query = mixedQuery.toLowerCase();
+const parseWallets = (network: BentoSupportedNetwork, mixedQuery: string) => {
+  let query = mixedQuery;
+  if (network !== 'solana') {
+    query = query.toLowerCase();
+  }
   if (query.indexOf(',') === -1) {
     return [query];
   }
   return query.split(',');
 };
 
 const handler = async (req: APIRequest, res: NextApiResponse) => {
-  const wallets = parseWallets(req.query.walletAddress ?? '');
   const network = (
     req.query.network ?? ''
   ).toLowerCase() as BentoSupportedNetwork;
+  const wallets = parseWallets(network, req.query.walletAddress ?? '');
 
   const adapter = adapters[network];
   if (!adapter) {

apps/web/.env.debug

@@ -1,2 +1 @@
 ENVIRONMENT=debug
-MAIN_API_BASE_URL=https://server.bento.finance

apps/web/.env.development

@@ -1,2 +1 @@
 ENVIRONMENT=development
-MAIN_API_BASE_URL=https://server.bento.finance

apps/web/.env.example

@@ -1,4 +1,7 @@
 ENVIRONMENT=debug
+NEXT_PUBLIC_API_BASE_URL=
+SERVERLESS_API_BASE_URL=
+
 NEXT_PUBLIC_SUPABASE_ANON_KEY=
 NEXT_PUBLIC_SUPABASE_URL=https://*.supabase.co
 NEXT_PUBLIC_OPENSEA_API_KEYS=

apps/web/next.config.js

@@ -3,7 +3,6 @@ const withTM = require('next-transpile-modules')([
   '@bento/core',
 ]);
 
-const withSvgr = require('next-plugin-svgr');
 const withInterceptStdout = require('next-intercept-stdout');
 const { withPlugins } = require('next-composed-plugins');
 const { i18n } = require('./next-i18next.config');
@@ -34,14 +33,18 @@ module.exports = withPlugins(
     i18n,
     publicRuntimeConfig: pick(process.env, [
       'ENVIRONMENT',
-      'MAIN_API_BASE_URL',
+      'SERVERLESS_API_BASE_URL',
     ]),
     webpack: (config) => {
       config.resolve.fallback = {
         ...config.resolve.fallback,
         fs: false,
         electron: false,
       };
+      config.module = {
+        ...config.module,
+        exprContextCritical: false,
+      };
       return config;
     },
     async redirects() {
@@ -66,7 +69,6 @@ module.exports = withPlugins(
   },
   [
     withTM,
-    withSvgr,
     [
       withInterceptStdout,
       (text) => (text.includes('Duplicate atom key') ? '' : text),

apps/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bento/web",
-  "version": "1.5.5",
+  "version": "1.6.0",
   "private": true,
   "scripts": {
     "dev": "env-cmd -f .env.debug.local next dev",
@@ -62,6 +62,7 @@
     "web3modal": "^1.9.9"
   },
   "devDependencies": {
+    "@babel/core": "^7.20.12",
     "@next/bundle-analyzer": "^13.0.0",
     "@types/amplitude-js": "^8.16.2",
     "@types/bn.js": "^5.1.1",
@@ -77,8 +78,9 @@
     "env-cmd": "^10.1.0",
     "next-composed-plugins": "^1.0.1",
     "next-intercept-stdout": "^1.0.1",
-    "next-plugin-svgr": "^1.1.2",
     "next-transpile-modules": "^9.1.0",
+    "node-fetch": "^3.3.0",
+    "postcss": "^8.4.21",
     "typescript": "^4.8.3"
   }
 }

apps/web/pages/api/proxy/card.ts

@@ -1,4 +1,4 @@
-// proxy query params to card api(`${Config.MAIN_API_BASE_URL}/api/images/card)
+// proxy query params to card api(`${Config.SERVERLESS_API_BASE_URL}/api/images/card)
 import axios from 'axios';
 import { NextApiRequest, NextApiResponse } from 'next';
 import queryString from 'query-string';
@@ -12,7 +12,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   const { query } = req;
   const { data } = await axios.get(
     queryString.stringifyUrl({
-      url: `${Config.MAIN_API_BASE_URL}/api/images/card`,
+      url: `${Config.SERVERLESS_API_BASE_URL}/api/images/card`,
       query,
     }),
     { responseType: 'arraybuffer' },