diff --git a/README.md b/README.md index a0c2eb5..1b0a0fb 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,11 @@ ## Building locally - Install [Node.js](https://nodejs.org) version 14 - - If you are using [nvm](https://github.com/creationix/nvm#installation) (recommended) running `nvm use` will automatically choose the right node version for you. + - If you are using [nvm](https://github.com/creationix/nvm#installation) (recommended) running `nvm use` will automatically choose the right node version for you. - Install [Yarn](https://yarnpkg.com/en/docs/install) - Install dependencies: `yarn` - Copy the `.env.example` file to `.env` - - Replace environment variables with your own personal. + - Replace environment variables with your own personal. - Build the project to the `./dist/` folder with `yarn generate`. ## Development builds @@ -24,3 +24,7 @@ To start a development build (e.g. with logging and file watching) run `yarn dev ## Architecture For detailed explanation on how things work, checkout [Nuxt.js docs](https://nuxtjs.org). + +## Audit + +[TornadoCash_Сlassic_dApp_audit_Decurity.pdf](https://tornado.cash/audits/TornadoCash_Сlassic_dApp_audit_Decurity.pdf) diff --git a/app.html b/app.html index f1c0947..89dfad8 100644 --- a/app.html +++ b/app.html @@ -1,39 +1,39 @@ - - - {{ HEAD }} - - - {{ APP }} - + console.log('Finished') + } + }) + + {{ HEAD }} + + +{{ APP }} + diff --git a/components/EncryptedTx.vue b/components/EncryptedTx.vue index 563765c..46e181d 100644 --- a/components/EncryptedTx.vue +++ b/components/EncryptedTx.vue @@ -35,6 +35,7 @@ class="detail-description" :href="txExplorerUrl(tx.txHash)" target="_blank" + rel="noopener noreferrer" > {{ tx.txHash }} diff --git a/components/Footer.vue b/components/Footer.vue index 1072fb7..e232c50 100644 --- a/components/Footer.vue +++ b/components/Footer.vue @@ -12,7 +12,7 @@ class="footer-address__value" target="_blank" :href="addressExplorerUrl(donationsAddress)" - rel="noreferrer" + rel="noopener noreferrer" >{{ donationsAddress }} @@ -31,7 +31,7 @@ type="is-icon" :href="duneLink" target="_blank" - rel="noreferrer" + rel="noopener noreferrer" icon-right="stats" >
diff --git a/components/Job.vue b/components/Job.vue index 520e518..052ed97 100644 --- a/components/Job.vue +++ b/components/Job.vue @@ -19,6 +19,7 @@ class="detail-description" :href="txExplorerUrl(job.txHash)" target="_blank" + rel="noopener noreferrer" > {{ job.txHash }} diff --git a/components/MetamaskNavbarIcon.vue b/components/MetamaskNavbarIcon.vue index 74dbb2f..64e66e6 100644 --- a/components/MetamaskNavbarIcon.vue +++ b/components/MetamaskNavbarIcon.vue @@ -3,7 +3,9 @@ @@ -82,21 +98,20 @@ export default { }, created() { this.$store.dispatch('application/setNativeCurrency', { netId: this.netId }) - }, - mounted() { - if (this.$route.query.note) { - this.activeTab = 1 - } + this.checkIsTrustedUrl() }, methods: { ...mapActions('settings', ['disableNotification']), + checkIsTrustedUrl() { + const isIpfs = this.$isLoadedFromIPFS() + if (!isIpfs) { + this.disableNotification({ key: 'third' }) + } + }, onGetKey(fn) { this.getKeys = fn }, async tabChanged(tabIndex) { - if (!this.$route.query.note) { - this.$root.$emit('resetWithdraw') - } if (tabIndex === 1) { this.$store.dispatch('relayer/pickRandomRelayer', { type: 'tornado' }) diff --git a/plugins/detectIPFS.js b/plugins/detectIPFS.js index ecee982..bbd765f 100644 --- a/plugins/detectIPFS.js +++ b/plugins/detectIPFS.js @@ -3,20 +3,13 @@ export default ({ store, isHMR, app }, inject) => { inject('isLoadedFromIPFS', main) } function main() { - const domainWhiteList = [ - 'tornado.cash', - 'localhost:3000', - 'stage.tornado.cash', - 'tornadocash.eth', - 'tornadocash.eth.link', - 'tornadocash.eth.limo', - 'app.tornado.cash', - 'donotshare.tornado.cash' - ] + const whiteListedDomains = ['localhost:3000', 'tornadocash.eth.link', 'tornadocash.eth.limo'] - if (window.location.host.includes('tornadocash.netlify.app')) { + const NETLIFY_REGEXP = /https:\/\/deploy-preview-(\d+)--tornadocash\.netlify\.app/ + + if (NETLIFY_REGEXP.test(window.location.host)) { return false - } else if (!domainWhiteList.includes(window.location.host)) { + } else if (!whiteListedDomains.includes(window.location.host)) { console.warn('The page has been loaded from ipfs.io. LocalStorage is disabled') return true } diff --git a/plugins/localStorage.js b/plugins/localStorage.js index 47aeb41..1a5b2ca 100644 --- a/plugins/localStorage.js +++ b/plugins/localStorage.js @@ -21,16 +21,23 @@ export default ({ store, isHMR }) => { return } - const paths = ['metamask.netId', 'application.selectedStatistic', 'application.selectedInstance'] - if (!store.$isLoadedFromIPFS()) { - paths.push('txHashKeeper', 'settings', 'account', 'relayer.jobs', 'encryptedNote.ui') + const paths = [ + 'metamask.netId', + 'application.selectedStatistic', + 'application.selectedInstance', + 'txHashKeeper', + 'settings', + 'account', + 'relayer.jobs', + 'encryptedNote.ui' + ] + + migrate() + + createPersistedState({ + key: STORE_NAME, + paths + })(store) } - - migrate() - - createPersistedState({ - key: STORE_NAME, - paths - })(store) } diff --git a/store/metamask.js b/store/metamask.js index 9d8abae..27334e5 100644 --- a/store/metamask.js +++ b/store/metamask.js @@ -82,6 +82,8 @@ const mutations = { }, SET_NET_ID(state, netId) { netId = parseInt(netId, 10) + window.localStorage.setItem('netId', netId) + state.netId = netId }, SET_RECONNECTING(state, bool) { diff --git a/store/relayer.js b/store/relayer.js index 7683834..7f1048f 100644 --- a/store/relayer.js +++ b/store/relayer.js @@ -337,13 +337,15 @@ export const actions = { async getCustomRelayerData({ rootState, state, getters, rootGetters, dispatch }, { url, name }) { const provider = getters.ethProvider.eth - if (!url.startsWith('https:') && !url.startsWith('http:')) { - if (url.includes('.onion')) { + const PROTOCOL_REGEXP = /^(http(s?))/ + if (!PROTOCOL_REGEXP.test(url)) { + if (url.endsWith('.onion')) { url = `http://${url}` } else { url = `https://${url}` } } + const urlParser = new URL(url) urlParser.href = url let ensName = name diff --git a/store/settings.js b/store/settings.js index 07bd48b..94ebe80 100644 --- a/store/settings.js +++ b/store/settings.js @@ -20,7 +20,8 @@ export const state = () => { ...rpcData, isActiveNotification: { first: true, - second: true + second: true, + third: true } } }