Merge pull request #5933 from blockchain/release/v4.88

Release/v4.88

Author: jjBlockchain

config/mocks/wallet-options-v4.json

@@ -77,6 +77,7 @@
         "themeEnabled": true,
         "unifiedAccountLogin": true,
         "useAgentHotWalletAddress": true,
+        "useAgentHotWalletAddressForSell": false,
         "useLoqateService": true,
         "useNewPaymentProviders": true,
         "useVgsProvider": true,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blockchain-wallet-v4",
-  "version": "4.88.4",
+  "version": "4.88.8",
   "license": "AGPL-3.0-or-later",
   "private": true,
   "author": {

packages/blockchain-wallet-v4-frontend/src/data/components/buySell/sagas.ts

@@ -339,6 +339,10 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
       selectors.form.getFormValues(FORM_BS_CHECKOUT)
     )
     try {
+      const useAgentHotWalletAddressForSell = selectors.core.walletOptions
+        .getUseAgentHotWalletAddressForSell(yield select())
+        .getOrElse(true)
+
       const pair = S.getBSPair(yield select())
 
       if (!pair) throw new Error(BS_ERROR.NO_PAIR_SELECTED)
@@ -367,6 +371,7 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
         direction === 'FROM_USERKEY'
           ? yield call(selectReceiveAddress, from, networks, api, coreSagas)
           : undefined
+
       const sellOrder: SwapOrderType = yield call(
         api.createSwapOrder,
         direction,
@@ -376,13 +381,23 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
         undefined,
         refundAddr
       )
+      const paymentAccount: ReturnType<typeof api.getPaymentAccount> = yield call(
+        api.getPaymentAccount,
+        coin
+      )
+      // Should generally use sellOrder deposit address, have this just in case
+      // we need to fall back to paymentAccount address
+      const sellOrderDepositAddress: string = useAgentHotWalletAddressForSell
+        ? paymentAccount.agent.address || paymentAccount.address
+        : sellOrder.kind.depositAddress
+
       // on chain
       if (direction === 'FROM_USERKEY') {
         const paymentR = S.getPayment(yield select())
         // @ts-ignore
         const payment = paymentGetOrElse(from.coin, paymentR)
         try {
-          yield call(buildAndPublishPayment, payment.coin, payment, sellOrder.kind.depositAddress)
+          yield call(buildAndPublishPayment, payment.coin, payment, sellOrderDepositAddress)
           yield call(api.updateSwapOrder, sellOrder.id, 'DEPOSIT_SENT')
         } catch (e) {
           yield call(api.updateSwapOrder, sellOrder.id, 'CANCEL')

packages/blockchain-wallet-v4-frontend/src/data/components/dex/mocks/quote.json

@@ -26,8 +26,9 @@ const taskToPromise = (t) => new Promise((resolve, reject) => t.fork(reject, res
 const REFRESH_INTERVAL = 15000
 const TOKEN_ALLOWANCE_POLL_INTERVAL = 5000
 const provider = ethers.providers.getDefaultProvider(`https://api.blockchain.info/eth/nodes/rpc`)
+const ENTER_DETAILS = 'ENTER_DETAILS'
 const COMPLETE_SWAP = 'COMPLETE_SWAP'
-const NATIVE_CURRENCY = 'ETH'
+const NATIVE_TOKEN = 'ETH'
 
 export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; networks: any }) => {
   const { waitForUserData } = profileSagas({
@@ -43,19 +44,19 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
     const state = yield select()
     const nonCustodialCoinAccounts = yield* select(() =>
       selectors.coins.getCoinAccounts(state, {
-        coins: [NATIVE_CURRENCY],
+        coins: [NATIVE_TOKEN],
         nonCustodialAccounts: true
       })
     )
 
-    if (!nonCustodialCoinAccounts[NATIVE_CURRENCY]?.length) {
+    if (!nonCustodialCoinAccounts[NATIVE_TOKEN]?.length) {
       yield put(actions.core.data.eth.fetchData())
       yield put(actions.core.data.eth.fetchErc20Data())
     }
     const walletCurrency = yield select(selectors.core.settings.getCurrency)
     const coins = yield select(selectors.core.data.coins.getCoins)
     const erc20Coins: CoinType[] = yield select(selectors.core.data.coins.getErc20Coins)
-    const tokens = [NATIVE_CURRENCY, ...erc20Coins]
+    const tokens = [NATIVE_TOKEN, ...erc20Coins]
       .map((coin) => {
         const { name, precision, symbol, type } = coins[coin].coinfig
 
@@ -86,7 +87,7 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
           symbol
         }
 
-        if (coin === 'ETH') {
+        if (coin === NATIVE_TOKEN) {
           return {
             ...tokenObj,
             address: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee'
@@ -188,7 +189,7 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
           }
 
           const nonCustodialCoinAccounts = selectors.coins.getCoinAccounts(yield* select(), {
-            coins: [baseToken],
+            coins: [baseToken, NATIVE_TOKEN],
             nonCustodialAccounts: true
           })
 
@@ -199,8 +200,6 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
             throw Error('No user wallet address')
           }
 
-          // const quoteResponse = quoteMock
-
           const quoteResponse = yield* call(api.getDexSwapQuote, {
             fromCurrency: {
               address: baseTokenInfo.address,
@@ -239,9 +238,23 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
 
           // We have a list of quotes but it's valid only for cross chains transactions that we currently don't have
           // Also we consider to return to the FE only one quote in that case
-          const { quote, quoteTtl } = quoteResponse
+          const { quote, quoteTtl, transaction } = quoteResponse
 
           if (quote) {
+            const nonEthCustodialbalance = nonCustodialCoinAccounts[NATIVE_TOKEN][0].balance
+            const { gasLimit, gasPrice } = transaction
+            const gasLimitBn = ethers.BigNumber.from(gasLimit)
+            const gasPriceBn = ethers.BigNumber.from(gasPrice)
+            const gasFee = gasLimitBn.mul(gasPriceBn)
+
+            if (gasFee.gt(nonEthCustodialbalance)) {
+              // eslint-disable-next-line no-throw-literal
+              throw {
+                message: 'Not enough ETH to cover gas.',
+                title: 'Insufficient ETH'
+              }
+            }
+
             yield* put(
               actions.form.change(
                 DEX_SWAP_FORM,
@@ -287,24 +300,31 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
     // exit whenever the counterTokenAmount changes, to avoid infinitely calling fetchSwapQuote
     if (field === 'counterTokenAmount' || field === 'step') return
 
+    // reset error if user changes token
+    if (field === 'baseToken') {
+      const error = yield select(selectors.components.dex.getSwapQuote)
+      if (error) yield put(A.clearCurrentSwapQuote())
+    }
+
     // exit if incorrect form changed or the form values were modified by a saga (avoid infinite loop)
     if (form !== DEX_SWAP_FORM || action['@@redux-saga/SAGA_ACTION'] === true) return
     const formValues = selectors.form.getFormValues(DEX_SWAP_FORM)(yield* select()) as DexSwapForm
-    const { baseToken, baseTokenAmount, counterToken, counterTokenAmount } = formValues
+    const { baseToken, baseTokenAmount, counterToken } = formValues
 
     // if one of the values is 0 set another one to 0 and clear a quote
     if (field === 'baseTokenAmount' && getValidSwapAmount(baseTokenAmount) === 0) {
       yield* put(actions.form.change(DEX_SWAP_FORM, 'counterTokenAmount', ''))
       yield* put(A.clearCurrentSwapQuote())
-      return
+      return yield put(A.stopPollSwapQuote())
     }
 
     if (
-      (field === 'baseTokenAmount' && baseToken) ||
-      (field === 'baseToken' && getValidSwapAmount(baseTokenAmount) !== 0 && baseToken)
+      (field === 'baseTokenAmount' ||
+        (field === 'baseToken' && getValidSwapAmount(baseTokenAmount) !== 0) ||
+        field === 'counterToken') &&
+      baseToken
     ) {
       const token = selectors.components.dex.getTokenInfo(yield* select(), baseToken)
-
       if (!token) return
 
       const { balance } = token
@@ -321,7 +341,8 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
             title: 'Insufficient Balance'
           })
         )
-        return
+
+        return yield put(A.stopPollSwapQuote())
       }
     }
 
@@ -355,7 +376,7 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
       const response = yield call(api.getDexTokenAllowance, {
         addressOwner: nonCustodialAddress,
         currency: tokenAddress,
-        network: 'ETH',
+        network: NATIVE_TOKEN,
         spender: 'ZEROX_EXCHANGE'
       })
       const isTokenAllowed = response?.result.allowance !== '0'
@@ -394,7 +415,7 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
         const response = yield call(api.getDexTokenAllowance, {
           addressOwner: nonCustodialAddress,
           currency: tokenAddress,
-          network: 'ETH',
+          network: NATIVE_TOKEN,
           spender: 'ZEROX_EXCHANGE'
         })
         const isTokenAllowed = response?.result.allowance !== '0'
@@ -446,7 +467,7 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
           spender: 'ZEROX_EXCHANGE',
           type: 'TOKEN_APPROVAL'
         },
-        network: 'ETH'
+        network: NATIVE_TOKEN
       } as BuildDexTxParams
 
       while (true) {
@@ -464,7 +485,17 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
         yield delay(REFRESH_INTERVAL)
       }
     } catch (e) {
-      yield put(A.pollTokenAllowanceTxFailure(e))
+      if (e?.error === 'Unable to fetch gas estimate') {
+        yield put(
+          A.fetchSwapQuoteFailure({
+            message: 'Not enough ETH to cover gas.',
+            title: 'Insufficient ETH'
+          })
+        )
+        yield put(actions.modals.closeAllModals())
+      } else {
+        yield put(A.pollTokenAllowanceTxFailure(e))
+      }
       yield put(A.stopPollTokenAllowanceTx())
     }
   }
@@ -514,7 +545,7 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
           },
           type: 'SWAP'
         },
-        network: 'ETH'
+        network: NATIVE_TOKEN
       } as BuildDexTxParams
 
       // build dex tx by call api
@@ -526,10 +557,21 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
       // send tx
       const tx = yield call(() => taskToPromise(Task.of(provider.sendTransaction(signedTx))))
       yield put(A.sendSwapQuoteSuccess({ tx: tx.hash }))
+      yield put(actions.form.change(DEX_SWAP_FORM, 'step', COMPLETE_SWAP))
     } catch (e) {
-      yield put(A.sendSwapQuoteFailure(e))
+      if (e.error === 'Insufficient funds for transaction fees') {
+        yield put(
+          A.fetchSwapQuoteFailure({
+            message: 'Not enough ETH to cover gas.',
+            title: 'Insufficient ETH'
+          })
+        )
+        yield put(actions.form.change(DEX_SWAP_FORM, 'step', ENTER_DETAILS))
+      } else {
+        yield put(A.sendSwapQuoteFailure(e))
+        yield put(actions.form.change(DEX_SWAP_FORM, 'step', COMPLETE_SWAP))
+      }
     }
-    yield put(actions.form.change(DEX_SWAP_FORM, 'step', COMPLETE_SWAP))
   }
 
   return {

packages/blockchain-wallet-v4-frontend/src/data/components/dex/sagas.ts

@@ -87,15 +87,25 @@ export const EnterSwapDetails = ({ walletCurrency }: Props) => {
     selectors.components.dex.getDexCoinBalanceToDisplay(counterToken)
   )
 
+  const showAllowanceCheck =
+    baseToken &&
+    baseToken !== NATIVE_TOKEN &&
+    !isTokenAllowed &&
+    !isTokenAllowedLoading &&
+    !isTokenAllowanceNotAsked
+  const isInsufficientBalance = !!quoteError?.title.includes('Balance')
+  const isInsufficientGas = !!quoteError?.message.includes('gas')
+
   const baseTokenAccount = useSelector((state: RootState) => {
-    if (!baseToken) return undefined
+    const token = isInsufficientGas ? NATIVE_TOKEN : baseToken
+    if (!token) return undefined
 
     const accounts = selectors.coins.getCoinAccounts(state, {
-      coins: [baseToken],
+      coins: [token],
       nonCustodialAccounts: true
     })
 
-    return accounts[baseToken][0]
+    return accounts[token] && accounts[token][0]
   }) as SwapAccountType | undefined
 
   const onViewSettings = () => {
@@ -151,7 +161,7 @@ export const EnterSwapDetails = ({ walletCurrency }: Props) => {
         {
           origin: 'Dex'
         },
-        { account: baseTokenAccount, coin: baseToken }
+        { account: baseTokenAccount, coin: isInsufficientBalance ? NATIVE_TOKEN : baseToken }
       )
     )
   }
@@ -170,15 +180,6 @@ export const EnterSwapDetails = ({ walletCurrency }: Props) => {
     }, 400)
   }
 
-  const showAllowanceCheck =
-    baseToken &&
-    baseToken !== NATIVE_TOKEN &&
-    !isTokenAllowed &&
-    !isTokenAllowedLoading &&
-    !isTokenAllowanceNotAsked
-
-  const isInsufficientBalance = !!quoteError?.title.includes('Balance')
-
   return (
     <FormWrapper>
       <Header onClickSettings={onViewSettings} />
@@ -279,7 +280,7 @@ export const EnterSwapDetails = ({ walletCurrency }: Props) => {
           isInsufficientBalance={isInsufficientBalance}
         />
       )}
-      {showAllowanceCheck ? (
+      {showAllowanceCheck && !quoteError ? (
         <Padding bottom={1.5}>
           <AllowanceCheck baseToken={baseToken} onApprove={onViewTokenAllowance} />
         </Padding>
@@ -320,7 +321,7 @@ export const EnterSwapDetails = ({ walletCurrency }: Props) => {
               <FormattedMessage
                 id='dex.enter-swap-details.deposit-more'
                 defaultMessage='Deposit more {token}'
-                values={{ token: baseToken }}
+                values={{ token: isInsufficientGas ? NATIVE_TOKEN : baseToken }}
               />
             }
           />

packages/blockchain-wallet-v4-frontend/src/scenes/Dex/Swap/EnterSwapDetails/EnterSwapDetails.tsx

@@ -210,3 +210,7 @@ export const getShowProveFlow = (state: RootState) =>
 // which deposit address to use for swap
 export const getUseAgentHotWalletAddress = (state: RootState) =>
   getWebOptions(state).map(path(['featureFlags', 'useAgentHotWalletAddress']))
+
+// which deposit address to use for non custodial sell
+export const getUseAgentHotWalletAddressForSell = (state: RootState) =>
+  getWebOptions(state).map(path(['featureFlags', 'useAgentHotWalletAddressForSell']))