Compare commits

..

No commits in common. "d0cee4aa9af3d4e686d58bfadf745bbb926ac283" and "14943157841a7f09005714a1d4f134097b386d4f" have entirely different histories.

4 changed files with 14 additions and 27 deletions

View File

@ -4,25 +4,20 @@
<div class="box-modal-title">{{ $t('withdrawalSettings') }}</div> <div class="box-modal-title">{{ $t('withdrawalSettings') }}</div>
<button type="button" class="delete" @click="$parent.cancel('escape')" /> <button type="button" class="delete" @click="$parent.cancel('escape')" />
</header> </header>
<b-tabs v-if="isRelayersAvailable" v-model="withdrawType" :animated="false" class="is-modal"> <b-tabs v-model="withdrawType" :animated="false" class="is-modal">
<RelayerTab /> <RelayerTab />
</b-tabs> </b-tabs>
<b-tabs v-else v-model="withdrawType" :animated="false" class="is-modal">
<RelayerTab />
<WalletTab />
</b-tabs>
</div> </div>
</template> </template>
<script> <script>
/* eslint-disable no-console */ /* eslint-disable no-console */
import { mapState, mapMutations } from 'vuex' import { mapState, mapMutations } from 'vuex'
import { RelayerTab, WalletTab } from '@/components/settings/tabs' import { RelayerTab } from '@/components/settings/tabs'
export default { export default {
components: { components: {
RelayerTab, RelayerTab
WalletTab
}, },
props: { props: {
currency: { currency: {
@ -49,11 +44,7 @@ export default {
computed: { computed: {
...mapState('application', { ...mapState('application', {
defaultWithdrawType: 'withdrawType' defaultWithdrawType: 'withdrawType'
}), })
...mapState('relayer', ['isLoadingRelayers', 'validRelayers']),
isRelayersAvailable() {
return !this.isLoadingRelayers && this.validRelayers.length > 0;
}
}, },
created() { created() {
this.withdrawType = this.defaultWithdrawType this.withdrawType = this.defaultWithdrawType

View File

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

View File

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

View File

@ -37,7 +37,7 @@ const state = () => {
EXECUTION_DELAY: 172800, EXECUTION_DELAY: 172800,
EXECUTION_EXPIRATION: 259200, EXECUTION_EXPIRATION: 259200,
PROPOSAL_THRESHOLD: '1000000000000000000000', PROPOSAL_THRESHOLD: '1000000000000000000000',
QUORUM_VOTES: '100000000000000000000000', QUORUM_VOTES: '25000000000000000000000',
VOTING_PERIOD: 432000 VOTING_PERIOD: 432000
} }
} }