Merge pull request #2123 from oasisprotocol/lw/fix-paratime-tx-status

Fix paratime transaction status in the first few seconds

.changelog/2123.bugfix.md

@@ -0,0 +1 @@
+Fix paratime transaction status in the first few seconds

src/app/state/account/saga.test.ts

@@ -14,6 +14,7 @@ import { DeepPartialRootState } from 'types/RootState'
 import * as matchers from 'redux-saga-test-plan/matchers'
 import { getExplorerAPIs } from '../network/saga'
 import { getAccountBalanceWithFallback } from '../../lib/getAccountBalanceWithFallback'
+import delayP from '@redux-saga/delay-p'
 
 const address = 'oasis1qz0k5q8vjqvu4s4nwxyj406ylnflkc4vrcjghuwk'
 const state: DeepPartialRootState = {
@@ -46,6 +47,9 @@ describe('Account Sagas', () => {
   it('Should refresh account on paraTime transaction', () => {
     return expectSaga(accountSaga)
       .withState(state)
+      .provide([
+        [matchers.call.fn(delayP), null], // https://github.com/jfairbank/redux-saga-test-plan/issues/257
+      ])
       .dispatch(transactionActions.paraTimeTransactionSent('dummyAddress'))
       .put.actionType(accountActions.fetchAccount.type)
       .put.actionType(stakingActions.fetchAccount.type)

src/app/state/account/saga.ts

@@ -90,6 +90,13 @@ export function* refreshAccountOnParaTimeTransaction() {
   while (true) {
     const { payload } = yield* take(transactionActions.paraTimeTransactionSent)
 
+    // Increase the chance to get updated transactions from API.
+    // Note: We can't rely on nonce to detect pending paratime transactions
+    yield* delay(3000)
+    yield* call(refreshAccount, payload)
+    yield* delay(6000)
+    yield* call(refreshAccount, payload)
+    yield* delay(6000)
     yield* call(refreshAccount, payload)
   }
 }

src/app/state/account/selectors.ts

@@ -4,6 +4,7 @@ import { RootState } from 'types'
 import { initialState } from '.'
 import { selectSelectedNetwork } from '../network/selectors'
 import { TRANSACTIONS_LIMIT } from '../../../config'
+import { TransactionStatus } from '../transaction/types'
 
 const selectSlice = (state: RootState) => state.account || initialState
 
@@ -31,6 +32,11 @@ export const hasAccountUnknownPendingTransactions = createSelector(
       // Account have nonce and 0 transactions due to last correctly indexed block 16817956 (2023-11-29)
       return false
     }
+    if (transactions.some(tx => tx.status === TransactionStatus.Pending)) {
+      // After paratime deposit transaction is submitted, Nexus API returns empty status until one block later.
+      // https://github.com/oasisprotocol/explorer/issues/528
+      return true
+    }
     const noncesFromTxs = transactions
       .filter(tx => !tx.runtimeId)
       .filter(tx => tx.from !== undefined)

src/app/state/transaction/saga.ts

@@ -5,7 +5,7 @@ import { hex2uint, isValidAddress, parseRoseStringToBaseUnitString, uint2bigintS
 import { LedgerSigner } from 'app/lib/ledger'
 import { OasisTransaction, signerFromEthPrivateKey, signerFromPrivateKey, TW } from 'app/lib/transaction'
 import { getEvmBech32Address, privateToEthAddress } from 'app/lib/eth-helpers'
-import { call, delay, put, race, select, take, takeEvery } from 'typed-redux-saga'
+import { call, put, race, select, take, takeEvery } from 'typed-redux-saga'
 import { ErrorPayload, ExhaustedTypeError, WalletError, WalletErrors } from 'types/errors'
 import { transactionActions } from '.'
 import { sign } from '../importaccounts/saga'
@@ -275,8 +275,6 @@ export function* setAllowance(
   }
 }
 
-const transactionSentDelay = 1000 // to increase a chance to get updated account data from BE
-
 export function* submitParaTimeTransaction(runtime: Runtime, transaction: ParaTimeTransaction) {
   const fromAddress = transaction.ethPrivateKey
     ? yield* call(getEvmBech32Address, privateToEthAddress(transaction.ethPrivateKey))
@@ -302,7 +300,6 @@ export function* submitParaTimeTransaction(runtime: Runtime, transaction: ParaTi
 
   yield* call(OasisTransaction.signParaTime, chainContext, paraTimeTransactionSigner as Signer, rtw)
   yield* call(OasisTransaction.submit, nic, rtw)
-  yield* delay(transactionSentDelay)
   yield* put(transactionActions.paraTimeTransactionSent(transaction.recipient))
 }
 

src/app/state/wallet/saga.test.ts

@@ -9,6 +9,7 @@ import { addWallet, rootWalletSaga } from './saga'
 import { AddWalletPayload, WalletType } from './types'
 import { importAccountsActions } from '../importaccounts'
 import { getAccountBalanceWithFallback } from '../../lib/getAccountBalanceWithFallback'
+import delayP from '@redux-saga/delay-p'
 
 describe('Wallet Sagas', () => {
   const validPrivateKeyHex =
@@ -18,6 +19,7 @@ describe('Wallet Sagas', () => {
 
   const providers: (EffectProviders | StaticProvider)[] = [
     [matchers.call.fn(getAccountBalanceWithFallback), {}],
+    [matchers.call.fn(delayP), null], // https://github.com/jfairbank/redux-saga-test-plan/issues/257
   ]
   const state: DeepPartialRootState = {
     importAccounts: {

src/app/state/wallet/saga.ts

@@ -152,6 +152,8 @@ function* refreshAccountOnParaTimeTransaction() {
   while (true) {
     const { payload } = yield* take(transactionActions.paraTimeTransactionSent)
 
+    // Increase the chance to get updated balance from API.
+    yield* delay(3000)
     yield* call(refreshAccount, payload)
   }
 }

src/vendors/nexus.ts

@@ -260,9 +260,14 @@ function parseTransactionsList(list: (NexusTransaction | ExtendedRuntimeTransact
         from: t.sender_0_eth || t.sender_0,
         hash: t.hash,
         level: undefined,
-        status: t.success ? TransactionStatus.Successful : TransactionStatus.Failed,
+        status:
+          t.success === undefined
+            ? TransactionStatus.Pending
+            : t.success
+            ? TransactionStatus.Successful
+            : TransactionStatus.Failed,
         timestamp: transactionDate.getTime(),
-        to: (t.body as { to?: string }).to ?? undefined,
+        to: t.to_eth ?? t.to ?? (t.body as { to?: string }).to ?? undefined,
         type: getTransactionType(t.method),
         runtimeName: t.runtimeName,
         runtimeId: t.runtimeId,