Bug fixes

torusresearch · Sep 13, 2022 · 66eda72 · 66eda72
1 parent 3ea83ab
commit 66eda72
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 16 deletions.
diff --git a/src/config.js b/src/config.js
@@ -146,8 +146,8 @@ export default {
   appVersion,
   commonApiHost: 'https://common-api.tor.us',
   // commonApiHost: 'http://localhost:60000',
-  api: 'https://api.tor.us',
-  // api: 'http://localhost:2020',
+  // api: 'https://api.tor.us',
+  api: 'http://localhost:2020',
   infuraKey: VUE_APP_INFURA_KEY,
   openLoginClientId: 'BCY9aYsh8iGshQuzNjBbONYE-tKD0JM389l87IiMOVeOU1TBmRaZphKOyphkUpo41fuSMnO6QRlloxCV-3nt8dU',
   torusNetwork: VUE_APP_PROXY_NETWORK || 'mainnet',

diff --git a/src/containers/WalletTransfer/WalletTransfer.vue b/src/containers/WalletTransfer/WalletTransfer.vue
@@ -141,7 +141,7 @@
                       :items="getToAddressComboboxItems"
                       :placeholder="verifierPlaceholder"
                       required
-                      :rules="[contactRule, rules.contactRequired, ensRule, unstoppableDomainsRule, bitRule]"
+                      :rules="[contactRule, rules.contactRequired, ensRule, unstoppableDomainsRule, bitRule, torusRule]"
                       outlined
                       item-text="name"
                       item-value="value"
@@ -531,6 +531,7 @@ import {
   CONTRACT_TYPE_ERC721,
   CONTRACT_TYPE_ERC1155,
   CONTRACT_TYPE_ETH,
+  DISCORD,
   DOT_STRING,
   ENS,
   ETH,
@@ -542,6 +543,7 @@ import {
   MESSAGE_MODAL_TYPE_FAIL,
   MESSAGE_MODAL_TYPE_SUCCESS,
   OLD_ERC721_LIST,
+  REDDIT,
   TRANSACTION_SPEED,
   TWITTER,
   UNSTOPPABLE_DOMAINS,
@@ -593,6 +595,7 @@ export default {
       formValid: false,
       ensError: '',
       bitError: '',
+      torusError: '',
       unstoppableDomainsError: '',
       toggle_exclusive: 0,
       gas: new BigNumber('21000'),
@@ -971,14 +974,17 @@ export default {
     bitRule() {
       return this.selectedVerifier === BIT && this.bitError ? this.bitError : true
     },
-
+    torusRule() {
+      return [GOOGLE, TWITTER, REDDIT, DISCORD, GITHUB].includes(this.selectedVerifier) && this.torusError ? this.torusError : true
+    },
     unstoppableDomainsRule() {
       return this.selectedVerifier === UNSTOPPABLE_DOMAINS && this.unstoppableDomainsError ? this.unstoppableDomainsError : true
     },
     async verifierChangedManual() {
       this.setRandomId()
       this.autoSelectVerifier = false
       this.$refs.form.validate()
+      this.toEthAddress = ''
       if (this.selectedVerifier && this.toAddress) {
         this.toEthAddress = await this.calculateEthAddress()
       }
@@ -1053,6 +1059,7 @@ export default {
       this.toEthAddress = await this.calculateEthAddress()
     },
     async contactChanged(contact) {
+      this.toEthAddress = ''
       if (this.isBitMode) {
         // .bit address is different from wallet rule, so set a new branch
         if (contact.value) this.toAddress = contact.value
@@ -1079,6 +1086,7 @@ export default {
       }
       this.ensError = ''
       this.unstoppableDomainsError = ''
+      this.torusError = ''
 
       if (this.selectedVerifier && this.toAddress) {
         this.toEthAddress = await this.calculateEthAddress()
@@ -1205,10 +1213,10 @@ export default {
       }
     },
     getUnstoppableDomains(domain) {
-      return this.getEnsOrUnstoppableAddress({ address: domain, type: 'unstoppable', network: this.networkType.host })
+      return this.getEnsOrUnstoppableAddress({ address: domain, type: 'unstoppable' })
     },
     getEnsAddress(ens) {
-      return this.getEnsOrUnstoppableAddress({ address: ens, type: 'ens', network: this.networkType.host })
+      return this.getEnsOrUnstoppableAddress({ address: ens, type: 'ens' })
     },
     async calculateEthAddress() {
       let toAddress
@@ -1217,19 +1225,19 @@ export default {
         toAddress = toChecksumAddressByChainId(this.toAddress, this.$store.state.networkId)
       } else if (this.selectedVerifier === ENS) {
         try {
-          const ethAddr = await this.getEnsAddress(this.toAddress)
-          log.info(ethAddr)
-          toAddress = ethAddr
+          const res = await this.getEnsAddress(this.toAddress)
+          log.info(res)
+          toAddress = res.data
         } catch (error) {
           log.error(error)
           this.ensError = 'walletSettings.invalidEns'
           this.$refs.form.validate()
         }
       } else if (this.selectedVerifier === UNSTOPPABLE_DOMAINS) {
         try {
-          const ethAddr = await this.getUnstoppableDomains(this.toAddress)
-          log.info(ethAddr)
-          toAddress = toChecksumAddress(ethAddr)
+          const res = await this.getUnstoppableDomains(this.toAddress)
+          log.info(res)
+          toAddress = toChecksumAddress(res.data)
         } catch (error) {
           log.error(error)
           this.unstoppableDomainsError = 'walletTransfer.invalidUnstoppable'
@@ -1251,15 +1259,18 @@ export default {
           this.convertedVerifierId = validVerifierId
           const openloginVerifier = WALLET_OPENLOGIN_VERIFIER_MAP[walletVerifier]
           if (walletVerifier && openloginVerifier) {
-            toAddress = await this.getTorusLookupAddress({
+            const res = await this.getTorusLookupAddress({
               verifierId: validVerifierId,
               verifier: openloginVerifier,
               walletVerifier,
               network: config.torusNetwork,
             })
+            toAddress = res.data
           }
         } catch (error) {
-          log.error(error)
+          log.error(error, this.toAddress, 'invalid torus lookup error')
+          this.torusError = 'walletTransfer.someTorusError'
+          this.$refs.form.validate()
         }
       }
       if (

diff --git a/src/controllers/PreferencesController.js b/src/controllers/PreferencesController.js
@@ -820,11 +820,10 @@ class PreferencesController extends SafeEventEmitter {
     return this.api.get(`${config.api}/covalent?url=${encodeURIComponent(api)}`, this.headers(), { useAPIKey: true })
   }
 
-  async getEnsOrUnstoppableAddress({ address, type, network }) {
+  async getEnsOrUnstoppableAddress({ address, type }) {
     const url = new URL(`${config.api}/lookup`)
     url.searchParams.append('key', address)
     url.searchParams.append('type', type)
-    url.searchParams.append('network', network)
     return this.api.get(url.href, this.headers(), { useAPIKey: true })
   }