Pull, connect to injected provider if preivously connected provider was injected one

2025-01-12 02:54:09 +00:00 · 2019-10-25 13:25:09 +04:00 · 2019-10-25 13:25:09 +04:00 · 77f5da5da6
commit 77f5da5da6
parent 980de6c8d1 065b91f899
10 changed files with 167 additions and 39 deletions
--- a/src/components/ConnectButton/index.jsx
+++ b/src/components/ConnectButton/index.jsx
@ -13,7 +13,7 @@ import Button from '~/components/layout/Button'
 import { fetchProvider } from '~/logic/wallets/store/actions'
 import { getNetwork } from '~/config'

-const web3Connect = new Web3Connect.Core({
+export const web3Connect = new Web3Connect.Core({
  network: getNetwork().toLowerCase(),
  providerOptions: {
    walletconnect: {
--- a/src/components/Header/index.jsx
+++ b/src/components/Header/index.jsx
@ -3,9 +3,10 @@ import * as React from 'react'
 import { connect } from 'react-redux'
 import { withSnackbar } from 'notistack'
 import { logComponentStack, type Info } from '~/utils/logBoundaries'
-import { getProviderInfo } from '~/logic/wallets/getWeb3'
-import type { ProviderProps } from '~/logic/wallets/store/model/provider'
 import { NOTIFICATIONS, showSnackbar } from '~/logic/notifications'
+import { web3Connect } from '~/components/ConnectButton'
+import { INJECTED_PROVIDERS } from '~/logic/wallets/getWeb3'
+import { loadLastUsedProvider } from '~/logic/wallets/store/middlewares/providerWatcher'
 import ProviderAccessible from './components/ProviderInfo/ProviderAccessible'
 import UserDetails from './components/ProviderDetails/UserDetails'
 import ProviderDisconnected from './components/ProviderInfo/ProviderDisconnected'
@ -25,8 +26,6 @@ type State = {
 }

 class HeaderComponent extends React.PureComponent<Props, State> {
-  providerListener: ?IntervalID
-
  constructor(props) {
    super(props)

@ -35,8 +34,12 @@ class HeaderComponent extends React.PureComponent<Props, State> {
    }
  }

-  componentDidMount() {
-    // this.onConnect()
+  async componentDidMount() {
+    const lastUsedProvider = await loadLastUsedProvider()
+
+    if (INJECTED_PROVIDERS.includes(lastUsedProvider)) {
+      web3Connect.connectToInjected()
+    }
  }

  componentDidCatch(error: Error, info: Info) {
@ -51,27 +54,9 @@ class HeaderComponent extends React.PureComponent<Props, State> {
  onDisconnect = () => {
    const { removeProvider, enqueueSnackbar, closeSnackbar } = this.props

-    clearInterval(this.providerListener)
-
    removeProvider(enqueueSnackbar, closeSnackbar)
  }

-  onConnect = async () => {
-    const { fetchProvider, enqueueSnackbar, closeSnackbar } = this.props
-
-    clearInterval(this.providerListener)
-    let currentProvider: ProviderProps = await getProviderInfo()
-    fetchProvider(currentProvider, enqueueSnackbar, closeSnackbar)
-
-    this.providerListener = setInterval(async () => {
-      const newProvider: ProviderProps = await getProviderInfo()
-      if (currentProvider && JSON.stringify(currentProvider) !== JSON.stringify(newProvider)) {
-        fetchProvider(newProvider, enqueueSnackbar, closeSnackbar)
-      }
-      currentProvider = newProvider
-    }, 2000)
-  }
-
  getProviderInfoBased = () => {
    const { hasError } = this.state
    const {
@ -92,7 +77,7 @@ class HeaderComponent extends React.PureComponent<Props, State> {
    } = this.props

    if (hasError || !loaded) {
-      return <ConnectDetails onConnect={this.onConnect} />
+      return <ConnectDetails />
    }

    return (
--- a/src/logic/tokens/utils/alternativeAbi.js
+++ b/src/logic/tokens/utils/alternativeAbi.js
@ -0,0 +1,47 @@
+// @flow
+// https://github.com/ethers-io/ethers.js/issues/527
+
+export const ALTERNATIVE_TOKEN_ABI = [
+  {
+    constant: true,
+    inputs: [],
+    name: 'name',
+    outputs: [
+      {
+        name: '',
+        type: 'bytes32',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [],
+    name: 'symbol',
+    outputs: [
+      {
+        name: '',
+        type: 'bytes32',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    constant: true,
+    inputs: [],
+    name: 'decimals',
+    outputs: [
+      {
+        name: '',
+        type: 'uint8',
+      },
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function',
+  },
+]
--- a/src/logic/wallets/getWeb3.js
+++ b/src/logic/wallets/getWeb3.js
@ -50,8 +50,8 @@ export const getEtherScanLink = (type: 'address' | 'tx', value: string) => {
 let web3
 export const getWeb3 = () => web3 || (window.web3 && new Web3(window.web3.currentProvider)) || (window.ethereum && new Web3(window.ethereum))

-export const getInfuraUrl = () => {
-  const isMainnet = getNetwork() === ETHEREUM_NETWORK.MAINNET
+const getInfuraUrl = () => {
+  const isMainnet = process.env.REACT_APP_NETWORK === 'mainnet'

  return `https://${isMainnet ? '' : 'rinkeby.'}infura.io:443/v3/${process.env.REACT_APP_INFURA_TOKEN}`
 }
@ -97,6 +97,8 @@ const getProviderName: Function = (web3Provider): string => {
  return name
 }

+export const INJECTED_PROVIDERS = [WALLET_PROVIDER.SAFE, WALLET_PROVIDER.METAMASK]
+
 export const getAccountFrom: Function = async (web3Provider): Promise<string | null> => {
  const accounts = await web3Provider.eth.getAccounts()

--- a/src/logic/wallets/store/actions/removeProvider.js
+++ b/src/logic/wallets/store/actions/removeProvider.js
@ -10,5 +10,9 @@ const removeProvider = createAction<string, *, *>(REMOVE_PROVIDER)
 export default (enqueueSnackbar: Function, closeSnackbar: Function) => (dispatch: ReduxDispatch<*>) => {
  showSnackbar(NOTIFICATIONS.WALLET_DISCONNECTED_MSG, enqueueSnackbar, closeSnackbar)

+  // remove info about current wallet connect session on disconnect so it's not used later
+  // TODO: use a method for killing the session from web3connect when they provide one
+  localStorage.removeItem('walletconnect')
+
  dispatch(removeProvider())
 }
--- a/src/logic/wallets/store/middlewares/providerWatcher.js
+++ b/src/logic/wallets/store/middlewares/providerWatcher.js
@ -4,9 +4,18 @@ import { type GlobalState } from '~/store/'
 import { ADD_PROVIDER, REMOVE_PROVIDER } from '../actions'
 import { getWeb3, getProviderInfo } from '~/logic/wallets/getWeb3'
 import { fetchProvider } from '~/logic/wallets/store/actions'
+import { loadFromStorage, saveToStorage, removeFromStorage } from '~/utils/storage'

 const watchedActions = [ADD_PROVIDER, REMOVE_PROVIDER]

+const LAST_USED_PROVIDER_KEY = 'LAST_USED_PROVIDER'
+
+export const loadLastUsedProvider = async () => {
+  const lastUsedProvider = await loadFromStorage(LAST_USED_PROVIDER_KEY)
+
+  return lastUsedProvider || ''
+}
+
 let watcherInterval = null

 const providerWatcherMware = (store: Store<GlobalState>) => (next: Function) => async (action: AnyAction) => {
@ -21,6 +30,8 @@ const providerWatcherMware = (store: Store<GlobalState>) => (next: Function) =>
          clearInterval(watcherInterval)
        }

+        saveToStorage(LAST_USED_PROVIDER_KEY, currentProviderProps.name)
+
        watcherInterval = setInterval(async () => {
          const web3 = getWeb3()
          const providerInfo = await getProviderInfo(web3)
@ -37,6 +48,7 @@ const providerWatcherMware = (store: Store<GlobalState>) => (next: Function) =>
      }
      case REMOVE_PROVIDER:
        clearInterval(watcherInterval)
+        removeFromStorage(LAST_USED_PROVIDER_KEY)
        break
      default:
        break
--- a/src/routes/safe/components/Transactions/TxsTable/columns.js
+++ b/src/routes/safe/components/Transactions/TxsTable/columns.js
@ -33,7 +33,8 @@ export const getTxAmount = (tx: Transaction) => {
  let txAmount = 'n/a'

  if (tx.isTokenTransfer && tx.decodedParams) {
-    txAmount = `${new BigNumber(tx.decodedParams.value).div(10 ** tx.decimals.toNumber()).toString()} ${tx.symbol}`
+    const tokenDecimals = tx.decimals.toNumber ? tx.decimals.toNumber() : tx.decimals
+    txAmount = `${new BigNumber(tx.decodedParams.value).div(10 ** tokenDecimals).toString()} ${tx.symbol}`
  } else if (Number(tx.value) > 0) {
    txAmount = `${fromWei(toBN(tx.value), 'ether')} ${tx.symbol}`
  }
--- a/src/routes/safe/store/actions/fetchTransactions.js
+++ b/src/routes/safe/store/actions/fetchTransactions.js
@ -16,6 +16,7 @@ import { getHumanFriendlyToken } from '~/logic/tokens/store/actions/fetchTokens'
 import { isTokenTransfer } from '~/logic/tokens/utils/tokenHelpers'
 import { TX_TYPE_EXECUTION } from '~/logic/safe/transactions'
 import { decodeParamsFromSafeMethod } from '~/logic/contracts/methodIds'
+import { ALTERNATIVE_TOKEN_ABI } from '~/logic/tokens/utils/alternativeAbi'

 let web3

@ -59,8 +60,8 @@ export const buildTransactionFrom = async (
  )
  const modifySettingsTx = tx.to === safeAddress && Number(tx.value) === 0 && !!tx.data
  const cancellationTx = tx.to === safeAddress && Number(tx.value) === 0 && !tx.data
-  const customTx = tx.to !== safeAddress && !!tx.data
  const isSendTokenTx = await isTokenTransfer(tx.data, tx.value)
+  const customTx = tx.to !== safeAddress && !!tx.data && !isSendTokenTx

  let executionTxHash
  const executionTx = confirmations.find((conf) => conf.type === TX_TYPE_EXECUTION)
@ -74,8 +75,19 @@ export const buildTransactionFrom = async (
  let decodedParams
  if (isSendTokenTx) {
    const tokenContract = await getHumanFriendlyToken()
-    const tokenInstance = await tokenContract.at(tx.to);
-    [symbol, decimals] = await Promise.all([tokenInstance.symbol(), tokenInstance.decimals()])
+    const tokenInstance = await tokenContract.at(tx.to)
+    try {
+      [symbol, decimals] = await Promise.all([tokenInstance.symbol(), tokenInstance.decimals()])
+    } catch (err) {
+      const alternativeTokenInstance = new web3.eth.Contract(ALTERNATIVE_TOKEN_ABI, tx.to)
+      const [tokenSymbol, tokenDecimals] = await Promise.all([
+        alternativeTokenInstance.methods.symbol().call(),
+        alternativeTokenInstance.methods.decimals().call(),
+      ])
+
+      symbol = web3.utils.toAscii(tokenSymbol)
+      decimals = tokenDecimals
+    }

    const params = web3.eth.abi.decodeParameters(['address', 'uint256'], tx.data.slice(10))
    decodedParams = {
--- a/yarn.lock
+++ b/yarn.lock
@ -2763,15 +2763,25 @@
  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==

-"@types/node@*", "@types/node@^12.6.1", "@types/node@^12.7.1":
+"@types/node@*":
  version "12.11.7"
  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"
  integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==

 "@types/node@^10.12.18", "@types/node@^10.3.2":
-  version "10.17.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.0.tgz#537c61a1df699a8331c79dab2ccc2c8799873c66"
-  integrity sha512-wuJwN2KV4tIRz1bu9vq5kSPasJ8IsEjZaP1ZR7KlmdUZvGF/rXy8DmXOVwUD0kAtvtJ7aqMKPqUXC0NUTDbrDg==
+  version "10.14.13"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.13.tgz#ac786d623860adf39a3f51d629480aacd6a6eec7"
+  integrity sha512-yN/FNNW1UYsRR1wwAoyOwqvDuLDtVXnaJTZ898XIw/Q5cCaeVAlVwvsmXLX5PuiScBYwZsZU4JYSHB3TvfdwvQ==
+
+"@types/node@^12.6.1":
+  version "12.11.6"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.6.tgz#2f8d551aef252de78f42acdccd53f5a8ce0cac4d"
+  integrity sha512-4uPUyY1Aofo1YzoypalYHNd2SnKYxH2b6LzXwpryZCJKA2XlagZSynXx5C8sfPH0r1cSltUpaVHV2q5sYXschQ==
+
+"@types/node@^12.7.1":
+  version "12.11.5"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.5.tgz#6c3c8dc84988aff11fd2a63d7b5fbf39eaaab7b1"
+  integrity sha512-LC8ALj/24PhByn39nr5jnTvpE7MujK8y7LQmV74kHYF5iQ0odCPkMH4IZNZw+cobKfSXqaC8GgegcbIsQpffdA==

 "@types/prop-types@*":
  version "15.7.3"
@ -15197,7 +15207,7 @@ react-docgen@^4.1.1:
    node-dir "^0.1.10"
    recast "^0.17.3"

-react-dom@16.11.0, react-dom@^16.8.3, react-dom@^16.8.6:
+react-dom@16.11.0:
  version "16.11.0"
  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.11.0.tgz#7e7c4a5a85a569d565c2462f5d345da2dd849af5"
  integrity sha512-nrRyIUE1e7j8PaXSPtyRKtz+2y9ubW/ghNgqKFHHAHaeP0fpF5uXR+sq8IMRHC+ZUxw7W9NyCDTBtwWxvkb0iA==
@ -15207,6 +15217,26 @@ react-dom@16.11.0, react-dom@^16.8.3, react-dom@^16.8.6:
    prop-types "^15.6.2"
    scheduler "^0.17.0"

+react-dom@^16.8.3:
+  version "16.8.6"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.6.tgz#71d6303f631e8b0097f56165ef608f051ff6e10f"
+  integrity sha512-1nL7PIq9LTL3fthPqwkvr2zY7phIPjYrT0jp4HjyEQrEROnw4dG41VVwi/wfoCneoleqrNX7iAD+pXebJZwrwA==
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.2"
+    scheduler "^0.13.6"
+
+react-dom@^16.8.6:
+  version "16.10.2"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.10.2.tgz#4840bce5409176bc3a1f2bd8cb10b92db452fda6"
+  integrity sha512-kWGDcH3ItJK4+6Pl9DZB16BXYAZyrYQItU4OMy0jAkv5aNqc+mAKb4TpFtAteI6TJZu+9ZlNhaeNQSVQDHJzkw==
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.2"
+    scheduler "^0.16.2"
+
 react-draggable@^4.0.3:
  version "4.0.3"
  resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.0.3.tgz#6b9f76f66431c47b9070e9b805bbc520df8ca481"
@ -15483,7 +15513,7 @@ react-window@^1.8.5:
    "@babel/runtime" "^7.0.0"
    memoize-one ">=3.1.1 <6"

-react@16.11.0, react@^16.8.3, react@^16.8.6:
+react@16.11.0:
  version "16.11.0"
  resolved "https://registry.yarnpkg.com/react/-/react-16.11.0.tgz#d294545fe62299ccee83363599bf904e4a07fdbb"
  integrity sha512-M5Y8yITaLmU0ynd0r1Yvfq98Rmll6q8AxaEe88c8e7LxO8fZ2cNgmFt0aGAS9wzf1Ao32NKXtCl+/tVVtkxq6g==
@ -15503,6 +15533,25 @@ react@16.11.0, react@^16.8.3, react@^16.8.6:
    object-assign "^4.1.0"
    prop-types "^15.5.10"

+react@^16.8.3:
+  version "16.8.6"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe"
+  integrity sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.2"
+    scheduler "^0.13.6"
+
+react@^16.8.6:
+  version "16.10.2"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.10.2.tgz#a5ede5cdd5c536f745173c8da47bda64797a4cf0"
+  integrity sha512-MFVIq0DpIhrHFyqLU0S3+4dIcBhhOvBE8bJ/5kHPVOVaGdo0KuiQzpcjCPsf585WvhypqtrMILyoE2th6dT+Lw==
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.2"
+
 reactcss@^1.2.0:
  version "1.2.3"
  resolved "https://registry.yarnpkg.com/reactcss/-/reactcss-1.2.3.tgz#c00013875e557b1cf0dfd9a368a1c3dab3b548dd"
@ -16380,6 +16429,22 @@ sc-formatter@^3.0.1:
  resolved "https://registry.yarnpkg.com/sc-formatter/-/sc-formatter-3.0.2.tgz#9abdb14e71873ce7157714d3002477bbdb33c4e6"
  integrity sha512-9PbqYBpCq+OoEeRQ3QfFIGE6qwjjBcd2j7UjgDlhnZbtSnuGgHdcRklPKYGuYFH82V/dwd+AIpu8XvA1zqTd+A==

+scheduler@^0.13.6:
+  version "0.13.6"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.6.tgz#466a4ec332467b31a91b9bf74e5347072e4cd889"
+  integrity sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+
+scheduler@^0.16.2:
+  version "0.16.2"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.16.2.tgz#f74cd9d33eff6fc554edfb79864868e4819132c1"
+  integrity sha512-BqYVWqwz6s1wZMhjFvLfVR5WXP7ZY32M/wYPo04CcuPM7XZEbV2TBNW7Z0UkguPTl0dWMA59VbNXxK6q+pHItg==
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+
 scheduler@^0.17.0:
  version "0.17.0"
  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.17.0.tgz#7c9c673e4ec781fac853927916d1c426b6f3ddfe"