feat: remove RPC and subgraph URLs from chains package

.github/workflows/cd.yaml

@@ -9,6 +9,11 @@ concurrency:
   group: ${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  VITE_ENV: "ci"
+  CODEGEN_UNRESTRICTED_NODE_REAL_API_KEY: ${{ secrets.CODEGEN_UNRESTRICTED_NODE_REAL_API_KEY }}
+  CODEGEN_UNRESTRICTED_THE_GRAPH_API_KEY: ${{ secrets.CODEGEN_UNRESTRICTED_THE_GRAPH_API_KEY }}
+
 jobs:
   release:
     runs-on: ubuntu-latest
@@ -28,6 +33,9 @@ jobs:
           cache: "yarn"
 
       - name: Install dependencies
+        env:
+          CODEGEN_UNRESTRICTED_NODE_REAL_API_KEY: ${{ secrets.CODEGEN_UNRESTRICTED_NODE_REAL_API_KEY }}
+          CODEGEN_UNRESTRICTED_THE_GRAPH_API_KEY: ${{ secrets.CODEGEN_UNRESTRICTED_THE_GRAPH_API_KEY }}
         run: yarn
 
       # Bump package versions based on changesets and commit changes to the main branch

.github/workflows/ci.yaml

@@ -2,14 +2,16 @@ name: Tests and Checks
 
 on: [pull_request]
 
-env:
-  VITE_ENV: "ci"
-  NODE_OPTIONS: "--max_old_space_size=4096"
-
 concurrency:
   group: ${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  NODE_OPTIONS: "--max_old_space_size=4096"
+  VITE_ENV: "ci"
+  CODEGEN_UNRESTRICTED_NODE_REAL_API_KEY: ${{ secrets.CODEGEN_UNRESTRICTED_NODE_REAL_API_KEY }}
+  CODEGEN_UNRESTRICTED_THE_GRAPH_API_KEY: ${{ secrets.CODEGEN_UNRESTRICTED_THE_GRAPH_API_KEY }}
+
 jobs:
   checks:
     runs-on: ubuntu-22.04

.gitignore

@@ -6,6 +6,7 @@ build
 out-tsc
 out
 generated
+.env.generated.ci
 
 # Local environment variables
 .env

apps/evm/.env.template

@@ -1,81 +1,19 @@
 # Environment
-
 VITE_NETWORK=testnet
 VITE_ENV=local
 
-# Network-specific
-
-## BSC mainnet
-
-# BSC mainnet
-VITE_RPC_HTTP_URL_BSC_MAINNET=
-VITE_SUBGRAPH_MARKETS_URL_BSC_MAINNET=
-VITE_SUBGRAPH_GOVERNANCE_URL_BSC_MAINNET=
-
-## BSC testnet
-VITE_RPC_HTTP_URL_BSC_TESTNET=
-VITE_SUBGRAPH_MARKETS_URL_BSC_TESTNET=
-VITE_SUBGRAPH_GOVERNANCE_URL_BSC_TESTNET=
-
-## Ethereum
-VITE_RPC_HTTP_URL_ETHEREUM=
-VITE_SUBGRAPH_MARKETS_URL_ETHEREUM=
-VITE_SUBGRAPH_GOVERNANCE_URL_ETHEREUM=
-
-## Sepolia
-VITE_RPC_HTTP_URL_SEPOLIA=
-VITE_SUBGRAPH_MARKETS_URL_SEPOLIA=
-VITE_SUBGRAPH_GOVERNANCE_URL_SEPOLIA=
-
-## opBNB mainnet
-VITE_RPC_HTTP_URL_OPBNB_MAINNET=
-VITE_SUBGRAPH_MARKETS_URL_OPBNB_MAINNET=
-VITE_SUBGRAPH_GOVERNANCE_URL_OPBNB_MAINNET=
-
-## opBNB testnet
-VITE_RPC_HTTP_URL_OPBNB_TESTNET=
-VITE_SUBGRAPH_MARKETS_URL_OPBNB_TESTNET=
-VITE_SUBGRAPH_GOVERNANCE_URL_OPBNB_TESTNET=
-
-## Arbitrum
-VITE_RPC_HTTP_URL_ARBITRUM_ONE=
-VITE_SUBGRAPH_MARKETS_URL_ARBITRUM_ONE=
-VITE_SUBGRAPH_GOVERNANCE_URL_ARBITRUM_ONE=
-
-## Arbitrum Sepolia
-VITE_RPC_HTTP_URL_ARBITRUM_SEPOLIA=
-VITE_SUBGRAPH_MARKETS_URL_ARBITRUM_SEPOLIA=
-VITE_SUBGRAPH_GOVERNANCE_URL_ARBITRUM_SEPOLIA=
-
-## zkSync
-VITE_RPC_HTTP_URL_ZKSYNC_MAINNET=
-VITE_SUBGRAPH_MARKETS_URL_ZKSYNC_MAINNET=
-VITE_SUBGRAPH_GOVERNANCE_URL_ZKSYNC_MAINNET=
-
-## zkSync Sepolia
-VITE_RPC_HTTP_URL_ZKSYNC_SEPOLIA=
-VITE_SUBGRAPH_MARKETS_URL_ZKSYNC_SEPOLIA=
-VITE_SUBGRAPH_GOVERNANCE_URL_ZKSYNC_SEPOLIA=
-
-# Optimism mainnet
-VITE_RPC_HTTP_URL_OPTIMISM_MAINNET=
-VITE_SUBGRAPH_MARKETS_URL_OPTIMISM_MAINNET=
-VITE_SUBGRAPH_GOVERNANCE_URL_OPTIMISM_MAINNET=
-
-# Optimism Sepolia
-VITE_RPC_HTTP_URL_OPTIMISM_SEPOLIA=
-VITE_SUBGRAPH_MARKETS_URL_OPTIMISM_SEPOLIA=
-VITE_SUBGRAPH_GOVERNANCE_URL_OPTIMISM_SEPOLIA=
-
 # Error reporting
-
 VITE_SENTRY_DSN=
 
 # Analytics
-
 VITE_POSTHOG_API_KEY=
 VITE_POSTHOG_HOST_URL=
 
-# ZyFi
-
+# Zyfi
 VITE_ZYFI_API_KEY=
+
+# NodeReal
+VITE_NODE_REAL_API_KEY=
+
+# The Graph
+VITE_THE_GRAPH_API_KEY=

apps/evm/codegen.config.ts

@@ -0,0 +1,46 @@
+/** @type {import('graphql-config').IGraphQLConfig } */
+
+import { ChainId } from '@venusprotocol/chains/types';
+
+import { getGovernanceSubgraphUrls, getIsolatedPoolsSubgraphUrls } from './src/config/subgraphUrls';
+
+const keys = {
+  nodeRealApiKey: process.env.CODEGEN_UNRESTRICTED_NODE_REAL_API_KEY!,
+  theGraphApiKey: process.env.CODEGEN_UNRESTRICTED_THE_GRAPH_API_KEY!,
+};
+
+console.log(process.env);
+
+const isolatedPoolsSubgraphUrls = getIsolatedPoolsSubgraphUrls(keys);
+const governanceSubgraphUrls = getGovernanceSubgraphUrls(keys);
+
+const plugins = ['typescript', 'typed-document-node', 'typescript-operations'];
+
+export const projects = {
+  isolatedPools: {
+    schema: isolatedPoolsSubgraphUrls[ChainId.BSC_MAINNET],
+    documents: ['./src/clients/subgraph/queries/isolatedPools/**/*.graphql'],
+    extensions: {
+      codegen: {
+        generates: {
+          './src/clients/subgraph/gql/generated/isolatedPools.ts': {
+            plugins,
+          },
+        },
+      },
+    },
+  },
+  governance: {
+    schema: governanceSubgraphUrls[ChainId.BSC_MAINNET],
+    documents: ['./src/clients/subgraph/queries/governance/**/*.graphql'],
+    extensions: {
+      codegen: {
+        generates: {
+          './src/clients/subgraph/gql/generated/governance.ts': {
+            plugins,
+          },
+        },
+      },
+    },
+  },
+};

apps/evm/package.json

@@ -16,16 +16,17 @@
     "lint:styles": "stylelint 'src/**/*.{css,scss,ts,tsx,js,jsx}'",
     "tsc": "tsc --noEmit",
     "extract-translations": "yarn i18next",
-    "generate-subgraph-types:isolated-pools": "yarn graphql-codegen --config src/config/codegen.ts --project isolatedPools",
-    "generate-subgraph-types:governance": "yarn graphql-codegen --config src/config/codegen.ts --project governance",
-    "generate-subgraph-types": "npm-run-all --parallel generate-subgraph-types:isolated-pools generate-subgraph-types:governance",
+    "generate-project-subgraph:project": "env > .env.generated.ci && dotenvx run --env-file=.env.generated.ci -f .env -- yarn graphql-codegen --config codegen.config.ts --project $PROJECT && rm .env.generated.ci",
+    "generate-subgraph-types:isolated-pools": "PROJECT=isolatedPools yarn generate-project-subgraph:project",
+    "generate-subgraph-types:governance": "PROJECT=governance yarn generate-project-subgraph:project",
+    "generate-subgraph-types": "yarn generate-subgraph-types:isolated-pools && yarn generate-subgraph-types:governance",
     "generate-contracts": "rimraf src/libs/contracts/generated/getters && rimraf src/libs/contracts/generated/infos && src/libs/contracts/scripts/generateContractRecords/index.ts && yarn biome format --vcs-use-ignore-file=false --write src/libs/contracts/generated",
     "generate-pancake-swap-tokens": "src/libs/tokens/scripts/generatePancakeSwapTokenRecords/index.ts && yarn biome format --vcs-use-ignore-file=false --write src/libs/tokens/generated/pancakeSwapTokens/bscMainnet.ts",
     "generate-version-files": "genversion --es6 --semi src/constants/version.ts && src/scripts/generatePublicVersionFile.ts && yarn biome format --vcs-use-ignore-file=false --write public/version.json",
     "generate": "npm-run-all --parallel generate-version-files generate-contracts generate-subgraph-types && yarn generate-pancake-swap-tokens",
     "storybook": "storybook dev -p 6006",
     "storybook:build": "storybook build",
-    "postinstall": "yarn run generate"
+    "postinstall": "env && yarn run generate"
   },
   "dependencies": {
     "@0xsequence/multicall": "^1.2.9",
@@ -84,6 +85,7 @@
   "devDependencies": {
     "@biomejs/biome": "1.6.4",
     "@changesets/cli": "^2.27.1",
+    "@dotenvx/dotenvx": "^1.26.2",
     "@ethersproject/abi": "^5.7.0",
     "@ethersproject/abstract-provider": "^5.7.0",
     "@graphql-codegen/add": "^5.0.0",
@@ -146,6 +148,7 @@
     "storybook": "^8.4.2",
     "stylelint": "^15.10.3",
     "tailwindcss": "^3.3.3",
+    "tsconfig-paths": "^4.2.0",
     "tsx": "^4.1.2",
     "typechain": "^8.3.1",
     "typescript": "^5.1.6",

apps/evm/src/__mocks__/models/pools.ts

@@ -1,13 +1,13 @@
+import { chainMetadata } from '@venusprotocol/chains';
 import BigNumber from 'bignumber.js';
 
 import apiPoolsResponse from '__mocks__/api/pools.json';
 import { assetData } from '__mocks__/models/asset';
 
 import formatToPool from 'clients/api/queries/getApiPools/formatToPool';
-import { CHAIN_METADATA } from 'constants/chainMetadata';
 import { ChainId, type Pool } from 'types';
 
-const { corePoolComptrollerContractAddress } = CHAIN_METADATA[ChainId.BSC_TESTNET];
+const { corePoolComptrollerContractAddress } = chainMetadata[ChainId.BSC_TESTNET];
 
 export const apiPoolsData = apiPoolsResponse.result.map(apiPoolData =>
   formatToPool({

apps/evm/src/clients/subgraph/queries/isolatedPools/getIsolatedPoolParticipantsCount/index.ts

@@ -11,6 +11,6 @@ export interface GetIsolatedPoolParticipantsCountInput {
 export const getIsolatedPoolParticipantsCount = ({
   chainId,
 }: GetIsolatedPoolParticipantsCountInput) =>
-  config.marketsSubgraphUrls[chainId]
-    ? request(config.marketsSubgraphUrls[chainId], IsolatedPoolParticipantsCountDocument)
+  config.isolatedPoolsSubgraphUrls[chainId]
+    ? request(config.isolatedPoolsSubgraphUrls[chainId], IsolatedPoolParticipantsCountDocument)
     : undefined;

apps/evm/src/constants/api.ts → apps/evm/src/config/apiUrls.ts

@@ -1,6 +1,8 @@
 import type { Network } from 'types';
 
-export const apiUrls: Record<Network, string> = {
+export const apiUrls: {
+  [key in Network]: string;
+} = {
   testnet: 'https://testnetapi.venus.io',
   mainnet: 'https://api.venus.io',
   'mainnet-preview': 'https://api-preview.venus.io',