From 33e3026cd19b0156d76db88d06ef79a7a91df26c Mon Sep 17 00:00:00 2001
From: tornadocontrib <tornadocontrib@proton.me>
Date: Sat, 29 Jun 2024 16:45:02 -0700
Subject: [PATCH] Remove chainnodes rpc

---
 .env.example                 |  2 --
 .github/workflows/nodejs.yml |  1 -
 networkConfig.js             | 32 --------------------------------
 nuxt.config.js               |  3 +--
 services/graph.js            |  2 +-
 5 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/.env.example b/.env.example
index 2929fb9..e8fc480 100644
--- a/.env.example
+++ b/.env.example
@@ -1,8 +1,6 @@
 PINATA_API_KEY=
 PINATA_SECRET_API_KEY=
 
-CHAINNODES_KEY=
-
 WC_BRIDGE=
 
 STORE_NAME=
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index 1f4422a..a0afa37 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -32,7 +32,6 @@ jobs:
       - name: Build
         run: yarn generate
         env:
-          CHAINNODES_KEY: ${{ secrets.CHAINNODES_KEY }}
           WC_BRIDGE: ${{ secrets.WC_BRIDGE }}
           OLD_STORE_NAME: ${{ secrets.OLD_STORE_NAME }}
           STORE_NAME: ${{ secrets.STORE_NAME }}
diff --git a/networkConfig.js b/networkConfig.js
index 68070ba..e2778de 100644
--- a/networkConfig.js
+++ b/networkConfig.js
@@ -25,10 +25,6 @@ export default {
         name: 'Tornado RPC',
         url: 'https://tornadocash-rpc.com/mainnet'
       },
-      chainnodes: {
-        name: 'Chainnodes RPC',
-        url: 'https://mainnet.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607'
-      },
       mevblockerRPC: {
         name: 'MevblockerRPC',
         url: 'https://rpc.mevblocker.io'
@@ -152,10 +148,6 @@ export default {
         name: 'Tornado RPC',
         url: 'https://tornadocash-rpc.com/bsc'
       },
-      chainnodes: {
-        name: 'Chainnodes RPC',
-        url: 'https://bsc-mainnet.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607'
-      },
       oneRPC: {
         name: '1RPC',
         url: 'https://1rpc.io/bnb'
@@ -203,10 +195,6 @@ export default {
     multicall: '0x11ce4B23bD875D7F5C6a31084f55fDe1e9A87507',
     echoContractAccount: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4',
     rpcUrls: {
-      chainnodes: {
-        name: 'Chainnodes RPC',
-        url: 'https://polygon-mainnet.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607'
-      },
       oneRpc: {
         name: '1RPC',
         url: 'https://1rpc.io/matic'
@@ -259,10 +247,6 @@ export default {
         name: 'Tornado RPC',
         url: 'https://tornadocash-rpc.com/op'
       },
-      chainnodes: {
-        name: 'Chainnodes RPC',
-        url: 'https://optimism-mainnet.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607'
-      },
       oneRpc: {
         name: '1RPC',
         url: 'https://1rpc.io/op'
@@ -310,14 +294,6 @@ export default {
     multicall: '0x842eC2c7D803033Edf55E478F461FC547Bc54EB2',
     echoContractAccount: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4',
     rpcUrls: {
-      tornadoRPC: {
-        name: 'Tornado RPC',
-        url: 'https://tornadocash-rpc.com/arbitrum'
-      },
-      chainnodes: {
-        name: 'Chainnodes RPC',
-        url: 'https://arbitrum-one.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607'
-      },
       oneRpc: {
         name: '1rpc',
         url: 'https://1rpc.io/arb'
@@ -373,10 +349,6 @@ export default {
         name: 'Tornado RPC',
         url: 'https://tornadocash-rpc.com/gnosis'
       },
-      chainnodes: {
-        name: 'Chainnodes RPC',
-        url: 'https://gnosis-mainnet.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607'
-      },
       blockPi: {
         name: 'BlockPi',
         url: 'https://gnosis.blockpi.network/v1/rpc/public'
@@ -486,10 +458,6 @@ export default {
       sepolia: {
         name: 'Sepolia RPC',
         url: 'https://rpc.sepolia.org'
-      },
-      chainnodes: {
-        name: 'Chainnodes RPC',
-        url: 'https://sepolia.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607'
       }
     },
     tokens: {
diff --git a/nuxt.config.js b/nuxt.config.js
index 54c2a9b..d1462e0 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -187,7 +187,6 @@ export default {
       new webpack.IgnorePlugin(/worker_threads/),
       new webpack.DefinePlugin({
         'process.env': JSON.stringify({
-          CHAINNODES_KEY: process.env.CHAINNODES_KEY,
           WC_BRIDGE: process.env.WC_BRIDGE,
           OLD_STORE_NAME: process.env.OLD_STORE_NAME,
           STORE_NAME: process.env.STORE_NAME,
@@ -225,7 +224,7 @@ export default {
   },
 
   provider: {
-    rpcUrl: `https://mainnet.chainnodes.org/${process.env.CHAINNODES_KEY}`
+    rpcUrl: 'https://tornadocash-rpc.com'
   },
 
   // todo make custom loading page
diff --git a/services/graph.js b/services/graph.js
index 4531039..9d4500f 100644
--- a/services/graph.js
+++ b/services/graph.js
@@ -26,7 +26,7 @@ const CHAIN_GRAPH_URLS = {
   100: 'https://tornadocash-rpc.com/subgraphs/name/tornadocash/xdai-tornado-subgraph',
   137: 'https://tornadocash-rpc.com/subgraphs/name/tornadocash/matic-tornado-subgraph',
   42161: 'https://tornadocash-rpc.com/subgraphs/name/tornadocash/arbitrum-tornado-subgraph',
-  43114: 'https://api.thegraph.com/subgraphs/name/tornadocash/avalanche-tornado-subgraph',
+  43114: 'https://tornadocash-rpc.com/subgraphs/name/tornadocash/avalanche-tornado-subgraph',
   11155111: 'https://tornadocash-rpc.com/subgraphs/name/tornadocash/sepolia-tornado-subgraph'
 }