Merge branch 'master' into fiat

polymorpher · polymorpher · commit 41d8bf22ea01 · 2021-11-04T00:31:48.000-07:00
diff --git a/code/client/src/components/Layout.jsx b/code/client/src/components/Layout.jsx
@@ -17,24 +17,30 @@ const CardStyle = {
   WebkitBackdropFilter: 'blur(10px)'
 }
 
+export const SpaceCapped = ({ isMobile, children }) => {
+  return (
+    <Space
+      direction='vertical'
+      size='large'
+      style={{
+        height: '100%',
+        width: '100%',
+        maxWidth: 400,
+        justifyContent: 'start',
+        paddingTop: isMobile ? 32 : 192,
+        display: 'flex'
+      }}
+    >
+      {children}
+    </Space>
+  )
+}
+
 export const FloatContainer = ({ isMobile, children }) => {
   return (
     <Card style={CardStyle} bodyStyle={{ height: '100%' }}>
       <Row justify='center'>
-        <Space
-          direction='vertical'
-          size='large'
-          style={{
-            height: '100%',
-            width: '100%',
-            maxWidth: 400,
-            justifyContent: 'start',
-            paddingTop: isMobile ? 32 : 192,
-            display: 'flex'
-          }}
-        >
-          {children}
-        </Space>
+        <SpaceCapped isMobile={isMobile}>{children}</SpaceCapped>
       </Row>
     </Card>
   )
diff --git a/code/client/src/pages/Show/SetRecovery.jsx b/code/client/src/pages/Show/SetRecovery.jsx
@@ -30,7 +30,7 @@ const SetRecovery = ({ address, onClose, show }) => {
   const { otpInput, otp2Input } = otpState
   const resetOtp = otpState.resetOtp
 
-  const helpers = ShowUtils.buildHelpers({
+  const { prepareValidation, ...helpers } = ShowUtils.buildHelpers({
     setStage,
     resetOtp,
     network,
diff --git a/code/client/src/pages/Show/Upgrade.jsx b/code/client/src/pages/Show/Upgrade.jsx
@@ -5,7 +5,7 @@ import ONEUtil from '../../../../lib/util'
 import util, { useWindowDimensions } from '../../util'
 import config from '../../config'
 import BN from 'bn.js'
-import { Button, Card, Typography, Space, Row, Steps } from 'antd'
+import { Button, Card, Typography, Space, Row, Steps, Timeline } from 'antd'
 import message from '../../message'
 import { OtpStack, useOtpState } from '../../components/OtpStack'
 import { useRandomWorker } from './randomWorker'
@@ -16,6 +16,7 @@ import { api } from '../../../../lib/api'
 import { walletActions } from '../../state/modules/wallet'
 import { useHistory } from 'react-router'
 import Paths from '../../constants/paths'
+import WalletAddress from '../../components/WalletAddress'
 const { Title, Text, Link } = Typography
 const { Step } = Steps
 const CardStyle = {
@@ -43,15 +44,13 @@ const Upgrade = ({ address, onClose }) => {
   const canUpgrade = majorVersion >= config.minUpgradableVersion
   const latestVersion = { majorVersion: ONEConstants.MajorVersion, minorVersion: ONEConstants.MinorVersion }
   const maxSpend = util.getMaxSpending(wallet)
-  const { formatted: maxSpendFormatted } = util.computeBalance(maxSpend)
+  const { formatted: maxSpendFormatted } = util.computeBalance(maxSpend.toString())
   const balances = useSelector(state => state.wallet.balances)
-  const { balance, formatted } = util.computeBalance(balances[address])
-  const oneLastResort = util.safeOneAddress(lastResortAddress)
-  const oneAddress = util.safeOneAddress(address)
+  const { balance } = util.computeBalance(balances[address])
   const balanceGreaterThanLimit = new BN(balance).gt(new BN(maxSpend))
-
-  const excessBalance = balanceGreaterThanLimit ? new BN(balance).sub(new BN(maxSpend)) : new BN(0)
-  const { formatted: excessBalanceFormatted } = util.computeBalance(excessBalance.toString())
+  const needSetRecoveryAddressFirst = balanceGreaterThanLimit && util.isDefaultRecoveryAddress(lastResortAddress)
+  const needSpecialSteps = balanceGreaterThanLimit && !util.isDefaultRecoveryAddress(lastResortAddress)
+  const [minTransferGas] = useState(100000)
   const { isMobile } = useWindowDimensions()
 
   const { state: otpState } = useOtpState()
@@ -60,7 +59,7 @@ const Upgrade = ({ address, onClose }) => {
   const [stage, setStage] = useState(-1)
   const { resetWorker, recoverRandomness } = useRandomWorker()
 
-  const { onCommitError, onCommitFailure, onRevealFailure, onRevealError, onRevealAttemptFailed, onRevealSuccess, prepareValidation, prepareProofFailed } = ShowUtils.buildHelpers({ setStage, resetOtp, network, resetWorker })
+  const { prepareValidation, onRevealSuccess, ...helpers } = ShowUtils.buildHelpers({ setStage, resetOtp, network, resetWorker })
 
   const doUpgrade = async () => {
     if (stage >= 0) {
@@ -79,7 +78,10 @@ const Upgrade = ({ address, onClose }) => {
       spendingInterval
     } = await api.blockchain.getWallet({ address, raw: true })
     const backlinks = await api.blockchain.getBacklinks({ address })
-    const oldCores = await api.blockchain.getOldInfos({ address, raw: true })
+    let oldCores = []
+    if (majorVersion >= 14) {
+      oldCores = await api.blockchain.getOldInfos({ address, raw: true })
+    }
     const transformedLastResortAddress = util.isDefaultRecoveryAddress(lastResortAddress) ? ONEConstants.TreasuryAddress : lastResortAddress
     const { address: newAddress } = await api.relayer.create({
       root,
@@ -101,18 +103,13 @@ const Upgrade = ({ address, onClose }) => {
       otp,
       otp2,
       recoverRandomness,
-      prepareProofFailed,
       commitHashGenerator: ONE.computeForwardHash,
       commitHashArgs: { address: newAddress },
       beforeCommit: () => setStage(1),
       afterCommit: () => setStage(2),
-      onCommitError,
-      onCommitFailure,
       revealAPI: api.relayer.revealForward,
       revealArgs: { dest: newAddress },
-      onRevealFailure,
-      onRevealError,
-      onRevealAttemptFailed,
+      ...helpers,
       onRevealSuccess: async (txId) => {
         onRevealSuccess(txId)
         setStage(-1)
@@ -143,6 +140,10 @@ const Upgrade = ({ address, onClose }) => {
     setSkipUpdate(true)
     onClose && onClose()
   }
+  const skipVersion = () => {
+    dispatch(walletActions.userSkipVersion({ address, version: ONEUtil.getVersion(latestVersion) }))
+    skip()
+  }
   if (!requireUpdate || skipUpdate || !canUpgrade || temp || !util.isEmptyAddress(forwardAddress)) {
     return <></>
   }
@@ -157,6 +158,8 @@ const Upgrade = ({ address, onClose }) => {
           height: '100%',
           justifyContent: 'start',
           paddingTop: isMobile ? 32 : 192,
+          paddingLeft: isMobile ? 16 : 64,
+          paddingRight: isMobile ? 16 : 64,
           display: 'flex'
         }}
       >
@@ -166,37 +169,61 @@ const Upgrade = ({ address, onClose }) => {
             <Text>Your wallet: v{ONEUtil.getVersion(wallet)}</Text>
             <Text>Latest version: v{ONEUtil.getVersion(latestVersion)}</Text>
             <Button type='primary' shape='round' size='large' onClick={() => setConfirmUpgradeVisible(true)}>Upgrade Now</Button>
-            <Button type='text' danger onClick={skip}>Do it later</Button>
+            <Button size='large' shape='round' onClick={skip}>Do it later</Button>
+            <Button type='text' danger onClick={skipVersion}>Skip this version</Button>
             <Text>For more details about this upgrade, see <Link target='_blank' href={util.releaseNotesUrl(latestVersion)} rel='noreferrer'> release notes for v{ONEUtil.getVersion(latestVersion)}</Link></Text>
           </>}
         {confirmUpgradeVisible &&
           <>
-            <OtpStack shouldAutoFocus walletName={wallet.name} doubleOtp={doubleOtp} otpState={otpState} onComplete={doUpgrade} action='confirm upgrade' />
+            {needSetRecoveryAddressFirst &&
+              <>
+                <Title level={4}>
+                  You have a high value wallet.
+                </Title>
+                <Title level={4}>
+                  Please set a recovery address first.
+                </Title>
+                <Button size='large' type='primary' shape='round' onClick={() => { skip(); history.push(Paths.showAddress(address, 'help')) }}>Set Now</Button>
+              </>}
+            {needSpecialSteps &&
+              <>
+                <Title type='danger' level={4}>
+                  You have a high value wallet. Follow these steps:
+                </Title>
+                <Steps current={0} direction='vertical'>
+                  <Step title='Confirm the upgrade' description={`You will get a new address. Only ${maxSpendFormatted} ONE will there. Don't panic.`} />
+                  <Step
+                    title='Approve asset transfer'
+                    description={(
+                      <Space direction='vertical'>
+                        <Text>Send 0.1 ONE from your recovery address</Text>
+                        <WalletAddress address={lastResortAddress} showLabel alwaysShowOptions />
+                        <Text>to the current address <b>(use at least {minTransferGas} gas limit)</b></Text>
+                        <WalletAddress address={address} showLabel alwaysShowOptions />
+                        <Text>(To abort upgrade, recover assets, and deprecate the wallet, send 1.0 ONE instead)</Text>
+                      </Space>)}
+                  />
+                </Steps>
+
+              </>}
+            {!needSetRecoveryAddressFirst &&
+              <>
+                <OtpStack shouldAutoFocus walletName={wallet.name} doubleOtp={doubleOtp} otpState={otpState} onComplete={doUpgrade} action='confirm upgrade' />
+
+                <Title level={3}>
+                  How upgrade works:
+                </Title>
+                <Timeline>
+                  <Timeline.Item>Each upgrade gives you a new address</Timeline.Item>
+                  <Timeline.Item>Your old address auto-forward assets to new address</Timeline.Item>
+                  <Timeline.Item>In rare cases, some assets may be left over (e.g. ERC20 tokens)</Timeline.Item>
+                  <Timeline.Item>You can take control of old addresses (under "About" tab)</Timeline.Item>
+                  <Timeline.Item>You can inspect and reclaim what's left there at any time</Timeline.Item>
+                </Timeline>
+              </>}
+            {stage < 0 && <Button size='large' shape='round' onClick={skip}>Do it later</Button>}
+            {stage < 0 && <Button type='text' danger onClick={skipVersion}>Skip this version</Button>}
 
-            <Text type='secondary'>
-              How it works:
-              <ul>
-                <li>Your will get a new wallet address. Everything else remains the same (e.g. authenticator)</li>
-                <li>From now on, everything sent to your old address will be forwarded to the new address</li>
-                <li>All your collectibles will be immediately transferred to your new address</li>
-                <li>All tokens you sent (not swapped) at least once will be transferred to the new address </li>
-                <li>Your new address can fully control your old address, and claim anything not transferred</li>
-                {!balanceGreaterThanLimit && <li> All your funds ({formatted} ONE) will be immediately transferred to your new address</li>}
-                <li>If there is anything not automatically transferred, you will be able to reclaim them after upgrade</li>
-              </ul>
-            </Text>
-            {balanceGreaterThanLimit &&
-              <Text type='danger'>
-                You have a high value wallet. There are some extra steps for you:
-                <ul>
-                  <li> {maxSpendFormatted} ONE will be immediately transferred to your new address</li>
-                  <li> You need to approve transferring the rest ({excessBalanceFormatted} ONE) by sending some ONE to the old address</li>
-                  <li> Your recovery address is {oneLastResort}</li>
-                  <li> Send any amount (except 1.0 ONE) to {oneAddress}</li>
-                  <li> If you change your mind, you can still send 1.0 ONE from your recovery address to stop the upgrade and reclaim all funds</li>
-                </ul>
-              </Text>}
-            {stage < 0 && <Button type='text' danger onClick={skip}>Do it later</Button>}
           </>}
         {stage >= 0 && (
           <Row>
diff --git a/code/client/src/state/modules/wallet/actions.js b/code/client/src/state/modules/wallet/actions.js
@@ -37,6 +37,7 @@ const bindDomain = createAction('BIND_DOMAIN')
 // User has acknowledged that they has been notified to save the wallet address for a created wallet.
 const userAcknowledgedToSaveAddress = createAction('USER_ACKNOWLEDGED_TO_SAVE_ADDRESS')
 const userAcknowledgedNewRoot = createAction('USER_ACKNOWLEDGED_NEW_ROOT')
+const userSkipVersion = createAction('USER_SKIP_VERSION')
 
 const setDev = createAction('SET_DEV')
 
@@ -65,6 +66,7 @@ export default {
 
   userAcknowledgedToSaveAddress,
   userAcknowledgedNewRoot,
+  userSkipVersion,
 
   trackTokens,
   untrackTokens,
diff --git a/code/client/src/state/modules/wallet/reducers.js b/code/client/src/state/modules/wallet/reducers.js
@@ -213,6 +213,17 @@ const reducer = handleActions(
       }
     }),
 
+    [walletActions.userSkipVersion]: (state, action) => ({
+      ...state,
+      wallets: {
+        ...state.wallets,
+        [action.payload.address]: {
+          ...state.wallets[action.payload.address],
+          skipVersion: action.payload.version
+        }
+      }
+    }),
+
     [walletActions.setDev]: (state, action) => ({
       ...state,
       dev: action.payload
