Merge pull request #1330 from decent-dao/fix/use-publicnode-instead-o…

…f-infura-and-alchemy Sse publicnode instead of infura and alchemy
decentdao · Jan 23, 2024 · 6fcd73f · 6fcd73f
2 parents 97f0ae2 + f3edd99
commit 6fcd73f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/.env b/.env
@@ -1,5 +1,3 @@
-# wallet providers (* required for local dev)
-NEXT_PUBLIC_ALCHEMY_API_KEY=""
 # automated testing workflows
 NEXT_PUBLIC_ALCHEMY_TESTING_API_KEY=""
 # ABI selector (*)

diff --git a/.github/workflows/release-netlify-dev.yaml b/.github/workflows/release-netlify-dev.yaml
@@ -23,5 +23,4 @@ jobs:
         env:
           NEXT_PUBLIC_ALCHEMY_TESTING_API_KEY: ${{ secrets.NEXT_PUBLIC_ALCHEMY_TESTING_API_KEY }}
           NEXT_PUBLIC_INFURA_API_KEY: ${{ secrets.NEXT_PUBLIC_INFURA_API_KEY }}
-          NEXT_PUBLIC_ALCHEMY_API_KEY: ${{ secrets.NEXT_PUBLIC_ALCHEMY_API_KEY }}
           NEXT_PUBLIC_SITE_URL: ${{ secrets.NEXT_PUBLIC_SITE_URL }}
diff --git a/.github/workflows/release-netlify-prod.yaml b/.github/workflows/release-netlify-prod.yaml
@@ -22,5 +22,4 @@ jobs:
           NETLIFY_DEPLOY_TO_PROD: true
           NEXT_PUBLIC_ALCHEMY_TESTING_API_KEY: ${{ secrets.NEXT_PUBLIC_ALCHEMY_TESTING_API_KEY }}
           NEXT_PUBLIC_INFURA_API_KEY: ${{ secrets.NEXT_PUBLIC_INFURA_API_KEY }}
-          NEXT_PUBLIC_ALCHEMY_API_KEY: ${{ secrets.NEXT_PUBLIC_ALCHEMY_API_KEY }}
           NEXT_PUBLIC_SITE_URL: ${{ secrets.NEXT_PUBLIC_SITE_URL }}
diff --git a/.github/workflows/release-netlify-staging.yaml b/.github/workflows/release-netlify-staging.yaml
@@ -21,5 +21,4 @@ jobs:
           NETLIFY_DEPLOY_TO_PROD: true
           NEXT_PUBLIC_ALCHEMY_TESTING_API_KEY: ${{ secrets.NEXT_PUBLIC_ALCHEMY_TESTING_API_KEY }}
           NEXT_PUBLIC_INFURA_API_KEY: ${{ secrets.NEXT_PUBLIC_INFURA_API_KEY }}
-          NEXT_PUBLIC_ALCHEMY_API_KEY: ${{ secrets.NEXT_PUBLIC_ALCHEMY_API_KEY }}
           NEXT_PUBLIC_SITE_URL: ${{ secrets.NEXT_PUBLIC_SITE_URL }}
diff --git a/src/providers/NetworkConfig/rainbow-kit.config.ts b/src/providers/NetworkConfig/rainbow-kit.config.ts
@@ -7,10 +7,9 @@ import {
   metaMaskWallet,
   walletConnectWallet,
 } from '@rainbow-me/rainbowkit/wallets';
-import { configureChains, createClient, createStorage } from 'wagmi';
+import { Chain, configureChains, createClient, createStorage, mainnet } from 'wagmi';
 import { hardhat } from 'wagmi/chains';
-import { alchemyProvider } from 'wagmi/providers/alchemy';
-import { infuraProvider } from 'wagmi/providers/infura';
+import { jsonRpcProvider } from 'wagmi/providers/jsonRpc';
 import { publicProvider } from 'wagmi/providers/public';
 import { APP_NAME } from '../../constants/common';
 import { supportedChains } from './NetworkConfigProvider';
@@ -24,8 +23,14 @@ if (process.env.NEXT_PUBLIC_TESTING_ENVIRONMENT) {
 }
 
 export const { chains, provider } = configureChains(supportedWagmiChains, [
-  infuraProvider({ apiKey: process.env.NEXT_PUBLIC_INFURA_API_KEY! }),
-  alchemyProvider({ apiKey: process.env.NEXT_PUBLIC_ALCHEMY_API_KEY! }),
+  jsonRpcProvider({
+    rpc: (chain: Chain) => {
+      const networkUrl = `${
+        chain.id === mainnet.id ? 'ethereum' : 'ethereum-' + chain.name
+      }.publicnode.com`;
+      return { http: `https://${networkUrl}`, webSocket: `wss://${networkUrl}` };
+    },
+  }),
   publicProvider(),
 ]);