Compare commits

..

No commits in common. "e724211f9127d526b399219d807825bae92949f4" and "9462caeac62564d78b2c5d45ea3a486526a061d6" have entirely different histories.

11 changed files with 26 additions and 33 deletions

5
.gitignore vendored

@ -1,5 +0,0 @@
.env
dist
node_modules
.husky
.nuxt

@ -1,5 +1,4 @@
import { ChainId, NetworkConfig, MetamaskList } from '@/types' import { ChainId, NetworkConfig, MetamaskList } from '@/types'
import { RPC_LIST } from '@/constants'
const L1_CHAIN_ID = ChainId.MAINNET const L1_CHAIN_ID = ChainId.MAINNET
@ -17,7 +16,6 @@ const CHAINS: NetworkConfig = {
hexChainId: '0x64', hexChainId: '0x64',
isEipSupported: false, isEipSupported: false,
ensSubdomainKey: 'gnosis-nova', ensSubdomainKey: 'gnosis-nova',
blockExplorerUrl: 'https://gnosisscan.io'
}, },
[ChainId.MAINNET]: { [ChainId.MAINNET]: {
symbol: 'ETH', symbol: 'ETH',
@ -31,7 +29,6 @@ const CHAINS: NetworkConfig = {
hexChainId: '0x1', hexChainId: '0x1',
isEipSupported: true, isEipSupported: true,
ensSubdomainKey: 'mainnet-tornado', ensSubdomainKey: 'mainnet-tornado',
blockExplorerUrl: 'https://etherscan.io'
}, },
[ChainId.BSC]: { [ChainId.BSC]: {
symbol: 'BNB', symbol: 'BNB',
@ -45,7 +42,6 @@ const CHAINS: NetworkConfig = {
hexChainId: '0x38', hexChainId: '0x38',
isEipSupported: false, isEipSupported: false,
ensSubdomainKey: 'bsc-tornado', ensSubdomainKey: 'bsc-tornado',
blockExplorerUrl: 'https://bscscan.com'
}, },
} }
@ -53,24 +49,24 @@ const METAMASK_LIST: MetamaskList = {
[ChainId.BSC]: { [ChainId.BSC]: {
chainId: '0x38', chainId: '0x38',
chainName: 'Binance Smart Chain Mainnet', chainName: 'Binance Smart Chain Mainnet',
rpcUrls: [RPC_LIST[56]], rpcUrls: ['https://bsc-dataseed1.binance.org'],
nativeCurrency: { nativeCurrency: {
name: 'Binance Chain Native Token', name: 'Binance Chain Native Token',
symbol: 'BNB', symbol: 'BNB',
decimals: 18, decimals: 18,
}, },
blockExplorerUrls: [CHAINS[ChainId.BSC].blockExplorerUrl], blockExplorerUrls: ['https://bscscan.com'],
}, },
[ChainId.XDAI]: { [ChainId.XDAI]: {
chainId: '0x64', chainId: '0x64',
chainName: 'Gnosis', chainName: 'Gnosis',
rpcUrls: [RPC_LIST[100]], rpcUrls: ['https://rpc.gnosischain.com'],
nativeCurrency: { nativeCurrency: {
name: 'xDAI', name: 'xDAI',
symbol: 'xDAI', symbol: 'xDAI',
decimals: 18, decimals: 18,
}, },
blockExplorerUrls: [CHAINS[ChainId.XDAI].blockExplorerUrl], blockExplorerUrls: ['https://blockscout.com/xdai/mainnet'],
}, },
} }

@ -21,9 +21,9 @@ export const WRAPPED_TOKEN: { [chainId in ChainId]: string } = {
} }
export const RPC_LIST: { [chainId in ChainId]: string } = { export const RPC_LIST: { [chainId in ChainId]: string } = {
[ChainId.BSC]: 'https://bsc-mainnet.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607', [ChainId.BSC]: 'https://bsc-dataseed.binance.org/',
[ChainId.MAINNET]: 'https://mainnet.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607', [ChainId.MAINNET]: 'https://api.securerpc.com/v1',
[ChainId.XDAI]: 'https://gnosis-mainnet.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607', [ChainId.XDAI]: 'https://rpc.gnosischain.com/tornado',
} }
export const FALLBACK_RPC_LIST: { [chainId in ChainId]: string[] } = { export const FALLBACK_RPC_LIST: { [chainId in ChainId]: string[] } = {
@ -36,15 +36,16 @@ export const FALLBACK_RPC_LIST: { [chainId in ChainId]: string[] } = {
// 'https://rpc.ankr.com/eth/dbe08b852ba176a8aeac783cc1fa8becaf4f107235dfdae79241063fbf52ca4a', // 'https://rpc.ankr.com/eth/dbe08b852ba176a8aeac783cc1fa8becaf4f107235dfdae79241063fbf52ca4a',
], ],
[ChainId.XDAI]: [ [ChainId.XDAI]: [
'https://poa-xdai.gateway.pokt.network/v1/lb/61a6992dd6fbf3591b90c95b',
// 'https://rpc.ankr.com/gnosis/dbe08b852ba176a8aeac783cc1fa8becaf4f107235dfdae79241063fbf52ca4a', // 'https://rpc.ankr.com/gnosis/dbe08b852ba176a8aeac783cc1fa8becaf4f107235dfdae79241063fbf52ca4a',
'https://rpc.gnosis.gateway.fm', 'https://rpc.gnosischain.com',
], ],
} }
export const RPC_WS_LIST: { [chainId in ChainId]: string } = { export const RPC_WS_LIST: { [chainId in ChainId]: string } = {
[ChainId.MAINNET]: 'wss://mainnet.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607', [ChainId.MAINNET]: 'wss://mainnet.infura.io/ws/v3/9b8f0ddb3e684ece890f594bf1710c88',
[ChainId.BSC]: 'wss://bsc-mainnet.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607', [ChainId.BSC]: 'wss://bsc-ws-node.nariox.org',
[ChainId.XDAI]: 'wss://gnosis-mainnet.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607', [ChainId.XDAI]: 'wss://rpc.xdaichain.com/wss/',
} }
export const MULTICALL: { [chainId in ChainId]: string } = { export const MULTICALL: { [chainId in ChainId]: string } = {

@ -35,6 +35,6 @@ export const menuLinks = {
// SOCIALS // SOCIALS
export const DUNE = 'https://dune.xyz/k06a/TornadoCash-Nova' export const DUNE = 'https://dune.xyz/k06a/TornadoCash-Nova'
export const TWITTER = 'https://twitter.com/TornadoCash' export const TWITTER = 'https://twitter.com/TornadoCash'
export const TELEGRAM = 'https://t.me/TornadoOfficial' export const TELEGRAM = 'https://t.me/TornadoCashOfficial'
export const GITHUB = 'https://git.tornado.ws' export const GITHUB = 'https://github.com/tornadocash'
export const TORNADO_CASH_LANDING = 'https://tornado.ws' export const TORNADO_CASH_LANDING = 'https://tornado.cash'

@ -61,7 +61,7 @@ import { mapGetters, mapMutations, mapState } from 'vuex'
import { ApplicationMutation } from '@/types' import { ApplicationMutation } from '@/types'
import { SuccessModal } from '@/modals' import { SuccessModal } from '@/modals'
import { createModalArgs, getEtherscanLink } from '@/utilities' import { createModalArgs, getEtherscanLink } from '@/utilities'
import { numbers, confirmationStatus, confirmationStep, transactionMethods, CHAINS } from '@/constants' import { numbers, confirmationStatus, confirmationStep, transactionMethods } from '@/constants'
export default { export default {
name: 'ConfirmationModal', name: 'ConfirmationModal',
@ -136,7 +136,7 @@ export default {
} }
}, },
l2Link() { l2Link() {
return getEtherscanLink(this.modal.chainId, this.txHash, 'transaction') return `https://alm-xdai.herokuapp.com/${this.modal.chainId}/${this.txHash}`
}, },
explorerLink() { explorerLink() {
return getEtherscanLink(this.modal.chainId, this.txHash, 'transaction') return getEtherscanLink(this.modal.chainId, this.txHash, 'transaction')

@ -41,8 +41,8 @@ class Provider implements WorkerProvider {
const basePath = `${window.location.origin}${ipfsPathPrefix}` const basePath = `${window.location.origin}${ipfsPathPrefix}`
this.nullifierWorkers = new Array(CORES).fill('').map(() => new Worker(`${basePath}/_nuxt/workers/nullifier.worker.js`)) this.nullifierWorkers = new Array(CORES).fill('').map(() => new Worker(`${basePath}/nullifier.worker.js`))
this.eventsWorkers = new Array(CORES).fill('').map(() => new Worker(`${basePath}/_nuxt/workers/events.worker.js`)) this.eventsWorkers = new Array(CORES).fill('').map(() => new Worker(`${basePath}/events.worker.js`))
// // @ts-expect-error // // @ts-expect-error
// this.nullifierWorkers = new Array(CORES).fill('').map(() => new NWorker()) // this.nullifierWorkers = new Array(CORES).fill('').map(() => new NWorker())

1
static/events.worker.js Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -30,8 +30,7 @@ export type NetworkConfigItem = {
blockGasLimit: number blockGasLimit: number
hexChainId: string hexChainId: string
isEipSupported: boolean isEipSupported: boolean
ensSubdomainKey: string, ensSubdomainKey: string
blockExplorerUrl: string
} }
export type MetamaskConfigItem = { export type MetamaskConfigItem = {

@ -7,7 +7,7 @@ import { hexDataSlice } from '@ethersproject/bytes'
import { keccak256 } from '@ethersproject/keccak256' import { keccak256 } from '@ethersproject/keccak256'
import { entropyToMnemonic } from '@ethersproject/hdnode' import { entropyToMnemonic } from '@ethersproject/hdnode'
import { numbers, CHAINS } from '@/constants' import { numbers } from '@/constants'
import { ChainId, L1ChainId } from '@/types' import { ChainId, L1ChainId } from '@/types'
import { getBridgeHelper, getMulticall } from '@/contracts' import { getBridgeHelper, getMulticall } from '@/contracts'
import { ArgsProof, ExtData } from '@/services/core/@types' import { ArgsProof, ExtData } from '@/services/core/@types'
@ -74,9 +74,9 @@ export function getEtherscanLink(chainId: ChainId, data: string, type: 'transact
let prefix = `https://${ETHERSCAN_PREFIXES[chainId]}etherscan.io` let prefix = `https://${ETHERSCAN_PREFIXES[chainId]}etherscan.io`
if (chainId === ChainId.BSC) { if (chainId === ChainId.BSC) {
prefix = CHAINS[ChainId.BSC].blockExplorerUrl prefix = `https://bscscan.com`
} else if (chainId === ChainId.XDAI) { } else if (chainId === ChainId.XDAI) {
prefix = CHAINS[ChainId.XDAI].blockExplorerUrl prefix = `https://blockscout.com/poa/xdai`
} }
switch (type) { switch (type) {