diff --git a/.env.example b/.env.example index 434d682..e8fc480 100644 --- a/.env.example +++ b/.env.example @@ -1,14 +1,6 @@ PINATA_API_KEY= PINATA_SECRET_API_KEY= -INFURA_KEY= - -ALCHEMY_MAINNET_KEY= -ALCHEMY_POLYGON_KEY= -ALCHEMY_OPTIMISM_KEY= -ALCHEMY_ARBITRUM_KEY= -ALCHEMY_GOERLI_KEY= - WC_BRIDGE= STORE_NAME= diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index a04eba7..a404595 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -11,7 +11,7 @@ body: ## **Before Submitting:** * Save your note, clear your cache, use a different connection or VPN, and try again. - * If the error persists reach out to [customer support](https://discord.com/invite/TFDrM8K42j). + * If the error persists reach out to [customer support](https://tornadocash.community). * Please search to make sure this issue has not been opened already. - type: textarea id: what-happened diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 770941b..d86e6fc 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -4,5 +4,5 @@ contact_links: url: https://torn.community/ about: Request new features and vote on the ones that are important to you. - name: Get support or ask a question - url: https://discord.com/invite/TFDrM8K42j + url: https://tornadocash.community about: Join Discord community server to get help and ask questions diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 8b02d5d..a0afa37 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -32,12 +32,6 @@ jobs: - name: Build run: yarn generate env: - INFURA_KEY: ${{ secrets.INFURA_KEY }} - ALCHEMY_MAINNET_KEY: ${{ secrets.ALCHEMY_MAINNET_KEY }} - ALCHEMY_POLYGON_KEY: ${{ secrets.ALCHEMY_POLYGON_KEY }} - ALCHEMY_OPTIMISM_KEY: ${{ secrets.ALCHEMY_OPTIMISM_KEY }} - ALCHEMY_ARBITRUM_KEY: ${{ secrets.ALCHEMY_ARBITRUM_KEY }} - ALCHEMY_GOERLI_KEY: ${{ secrets.ALCHEMY_GOERLI_KEY }} WC_BRIDGE: ${{ secrets.WC_BRIDGE }} OLD_STORE_NAME: ${{ secrets.OLD_STORE_NAME }} STORE_NAME: ${{ secrets.STORE_NAME }} diff --git a/components/Footer.vue b/components/Footer.vue index e232c50..faa05e4 100644 --- a/components/Footer.vue +++ b/components/Footer.vue @@ -45,7 +45,7 @@ Get a snapshot from http://archivenode.net', + url: `http://localhost/` } }, multicall: '0xeefba1e63905ef1d7acba5a8513c70307c1ce441', @@ -148,17 +139,9 @@ export default { multicall: '0x41263cba59eb80dc200f3e2544eda4ed6a90e76c', echoContractAccount: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4', rpcUrls: { - publicRpc1: { - name: 'BSC Public RPC 1', - url: 'https://bsc-dataseed.binance.org/' - }, - publicRpc2: { - name: 'BSC Public RPC 2', - url: 'https://bsc-dataseed1.defibit.io/' - }, - publicRpc3: { - name: 'BSC Public RPC 3', - url: 'https://bsc-dataseed1.ninicoin.io/' + Home_Hosted: { + name: 'Your own non‑censoring rpc.
Get a snapshot from https://github.com/ledgerwatch/erigon-snapshot', + url: `http://localhost/` } }, tokens: { @@ -203,13 +186,9 @@ export default { multicall: '0x11ce4B23bD875D7F5C6a31084f55fDe1e9A87507', echoContractAccount: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4', rpcUrls: { - Infura: { - name: 'Infura', - url: `https://polygon-mainnet.infura.io/v3/${INFURA_KEY}` - }, - Alchemy: { - name: 'Alchemy', - url: `https://polygon-mainnet.g.alchemy.com/v2/${ALCHEMY_POLYGON_KEY}` + Home_Hosted: { + name: 'Your own non‑censoring rpc.
Get a snapshot from https://github.com/ledgerwatch/erigon-snapshot', + url: `http://localhost/` } }, tokens: { @@ -255,13 +234,9 @@ export default { echoContractAccount: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4', ovmGasPriceOracleContract: '0x420000000000000000000000000000000000000F', rpcUrls: { - Alchemy: { - name: 'Alchemy', - url: `https://opt-mainnet.g.alchemy.com/v2/${ALCHEMY_OPTIMISM_KEY}` - }, - Infura: { - name: 'Infura', - url: `https://optimism-mainnet.infura.io/v3/${INFURA_KEY}` + Home_Hosted: { + name: 'Your own non‑censoring rpc.', + url: `http://localhost/` } }, tokens: { @@ -306,17 +281,13 @@ export default { multicall: '0x842eC2c7D803033Edf55E478F461FC547Bc54EB2', echoContractAccount: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4', rpcUrls: { + Home_Hosted: { + name: 'Your own non‑censoring rpc.', + url: `http://localhost/` + }, Arbitrum: { name: 'Arbitrum Public RPC', url: 'https://arb1.arbitrum.io/rpc' - }, - Alchemy: { - name: 'Alchemy', - url: `https://arb-mainnet.g.alchemy.com/v2/${ALCHEMY_ARBITRUM_KEY}` - }, - Infura: { - name: 'Infura', - url: `https://arbitrum-mainnet.infura.io/v3/${INFURA_KEY}` } }, tokens: { @@ -361,9 +332,9 @@ export default { multicall: '0xb5b692a88bdfc81ca69dcb1d924f59f0413a602a', echoContractAccount: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4', rpcUrls: { - publicRpc: { - name: 'Gnosis Chain RPC', - url: 'https://rpc.gnosischain.com/tornado' + Home_Hosted: { + name: 'Your own non‑censoring rpc.
Get a full‑node snapshot from http://getblockchain.download', + url: `http://localhost/` } }, tokens: { @@ -411,6 +382,14 @@ export default { publicRpc: { name: 'Avalanche RPC', url: 'https://api.avax.network/ext/bc/C/rpc' + }, + Securerpc: { + name: 'Securerpc', + url: `https://api.securerpc.com/v1` + }, + Home_Hosted: { + name: 'Your own non‑censoring rpc.
Get a snapshot from https://youravaxsnapshot.senseinode.com/avalanche_mainnet_20220904.tar', + url: `http://localhost/` } }, tokens: { @@ -455,9 +434,9 @@ export default { echoContractAccount: '0x37e6859804b6499d1e4a86d70a5fdd5de6a0ac65', aggregatorContract: '0x8cb1436F64a3c33aD17bb42F94e255c4c0E871b2', rpcUrls: { - Alchemy: { - name: 'Alchemy', - url: `https://eth-goerli.alchemyapi.io/v2/${ALCHEMY_GOERLI_KEY}` + Home_Hosted: { + name: 'Your own non‑censoring rpc. Get a snapshot from https://github.com/ledgerwatch/erigon-snapshot', + url: `http://localhost/` } }, tokens: { diff --git a/nuxt.config.js b/nuxt.config.js index 387fd59..3e5ffb4 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -187,12 +187,6 @@ export default { new webpack.IgnorePlugin(/worker_threads/), new webpack.DefinePlugin({ 'process.env': JSON.stringify({ - INFURA_KEY: process.env.INFURA_KEY, - ALCHEMY_MAINNET_KEY: process.env.ALCHEMY_MAINNET_KEY, - ALCHEMY_POLYGON_KEY: process.env.ALCHEMY_POLYGON_KEY, - ALCHEMY_OPTIMISM_KEY: process.env.ALCHEMY_OPTIMISM_KEY, - ALCHEMY_ARBITRUM_KEY: process.env.ALCHEMY_ARBITRUM_KEY, - ALCHEMY_GOERLI_KEY: process.env.ALCHEMY_GOERLI_KEY, WC_BRIDGE: process.env.WC_BRIDGE, OLD_STORE_NAME: process.env.OLD_STORE_NAME, STORE_NAME: process.env.STORE_NAME, diff --git a/scripts/helpers/download.js b/scripts/helpers/download.js index 293cf69..9823c6a 100644 --- a/scripts/helpers/download.js +++ b/scripts/helpers/download.js @@ -54,10 +54,6 @@ export async function getPastEvents({ type, fromBlock, netId, events, contractAt let [{ url: rpcUrl }] = Object.values(networkConfig[`netId${netId}`].rpcUrls) - if (netId === '5') { - rpcUrl = `https://goerli.infura.io/v3/${process.env.INFURA_KEY}` - } - const provider = new Web3.providers.HttpProvider(rpcUrl) const web3 = new Web3(provider) const contract = new web3.eth.Contract(...contractAttrs) diff --git a/store/snark.js b/store/snark.js index 3aec732..a19d512 100644 --- a/store/snark.js +++ b/store/snark.js @@ -19,7 +19,7 @@ function buildGroth16() { } function getEns() { - const provider = new Web3.providers.HttpProvider(networkConfig.netId1.rpcUrls.Infura.url) + const provider = new Web3.providers.HttpProvider("https://cloudflare-eth.com/v1/mainnet") return new ENS({ provider, ensAddress: getEnsAddress('1') }) }