Merge pull request 'master' (#30) from master into development

Reviewed-on: tornadocash/classic-ui#30
This commit is contained in:
ButterflyEffect 2024-01-11 12:51:35 +01:00
commit b288ce9356
118 changed files with 36 additions and 24 deletions

@ -4,7 +4,10 @@
<div class="box-modal-title">{{ $t('withdrawalSettings') }}</div>
<button type="button" class="delete" @click="$parent.cancel('escape')" />
</header>
<b-tabs v-model="withdrawType" :animated="false" class="is-modal">
<b-tabs v-if="isRelayersAvailable" v-model="withdrawType" :animated="false" class="is-modal">
<RelayerTab />
</b-tabs>
<b-tabs v-else v-model="withdrawType" :animated="false" class="is-modal">
<RelayerTab />
<WalletTab />
</b-tabs>
@ -46,7 +49,11 @@ export default {
computed: {
...mapState('application', {
defaultWithdrawType: 'withdrawType'
})
}),
...mapState('relayer', ['isLoadingRelayers', 'validRelayers']),
isRelayersAvailable() {
return !this.isLoadingRelayers && this.validRelayers.length > 0;
}
},
created() {
this.withdrawType = this.defaultWithdrawType

@ -200,7 +200,7 @@ export default {
return false
},
shouldSettingsShow() {
return !this.hasErrorNote && !this.error.message
return !this.isLoading && !this.error.type && !this.hasErrorNote
},
hasErrorNote() {
const note = this.withdrawNote.split('-')[4]

@ -29,9 +29,9 @@ export default {
name: 'MevblockerRPC',
url: 'https://rpc.mevblocker.io'
},
llamaRPC: {
name: 'llamarpc',
url: 'https://eth.llamarpc.com'
oneRPC: {
name: '1RPC',
url: 'https://1rpc.io/eth'
}
},
multicall: '0xeefba1e63905ef1d7acba5a8513c70307c1ce441',
@ -401,17 +401,17 @@ export default {
multicall: '0xe86e3989c74293Acc962156cd3F525c07b6a1B6e',
echoContractAccount: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4',
rpcUrls: {
publicRpc1: {
publicRpc: {
name: 'Avalanche RPC',
url: 'https://endpoints.omniatech.io/v1/avax/mainnet/public'
url: 'https://api.avax.network/ext/bc/C/rpc'
},
meowRPC: {
name: 'Meow RPC',
url: 'https://avax.meowrpc.com'
},
communityRPC: {
name: 'Tornado RPC',
url: 'https://avalanche-rpc.tornado.ws/ext/bc/C/rpc'
oneRPC: {
name: 'OneRPC',
url: 'https://1rpc.io/avax/c'
}
},
tokens: {
@ -459,6 +459,10 @@ export default {
chainnodes: {
name: 'Tornado RPC',
url: 'https://goerli.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607'
},
gatewayRPC: {
name: 'Gateway RPC',
url: 'https://rpc.goerli.eth.gateway.fm'
}
},
tokens: {

@ -17,21 +17,22 @@ function updateEncrypted(netId) {
async function updateCommon(netId) {
const { nativeCurrency, tokens } = networkConfig[`netId${netId}`]
console.log(Object.keys(tokens[nativeCurrency].instanceAddress))
for (const type of EVENTS) {
for (const [tokenName, tokenInfo] of Object.entries(tokens)) {
console.log(`${tokenInfo.symbol}: ${Object.keys(tokenInfo.instanceAddress)}`)
for (const instance of Object.keys(tokenInfo.instanceAddress)) {
console.warn('instance', instance)
for await (const type of EVENTS) {
for await (const instance of Object.keys(tokens[nativeCurrency].instanceAddress)) {
console.warn('instance', instance)
const filename = `${type.toLowerCase()}s_${netId}_${tokenName}_${instance}.json`
const filename = `${type.toLowerCase()}s_${netId}_${nativeCurrency}_${instance}.json`
const isSaved = save(`${EVENTS_PATH}${filename}`)
const isSaved = save(`${EVENTS_PATH}${filename}`)
if (isSaved) {
try {
testCommon(netId, type, filename)
} catch (err) {
console.error(err.message)
if (isSaved) {
try {
testCommon(netId, type, filename)
} catch (err) {
console.error(err.message)
}
}
}
}

Some files were not shown because too many files have changed in this diff Show More