AND-7210 Added transaction hash into Express

tangem · Jun 6, 2024 · 1b434f3 · 1b434f3
1 parent 2a2b72d
commit 1b434f3
Show file tree

Hide file tree

Showing 19 changed files with 146 additions and 90 deletions.
diff --git a/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectSdkHelper.kt b/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectSdkHelper.kt
@@ -192,17 +192,17 @@ class WalletConnectSdkHelper {
             ),
         )
         return when (result) {
-            SimpleResult.Success -> {
+            is Result.Success -> {
                 val sentFrom = CoreAnalyticsParam.TxSentFrom.WalletConnect
                 Analytics.send(Basic.TransactionSent(sentFrom = sentFrom, memoType = MemoType.Null))
-                val hash = data.walletManager.wallet.recentTransactions.last().hash
-                if (hash?.startsWith(HEX_PREFIX) == true) {
+                val hash = result.data.hash
+                if (hash.startsWith(HEX_PREFIX)) {
                     hash
                 } else {
                     HEX_PREFIX + hash
                 }
             }
-            is SimpleResult.Failure -> {
+            is Result.Failure -> {
                 Timber.e(result.error as BlockchainSdkError)
                 null
             }

diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt
@@ -11,7 +11,7 @@ import com.tangem.blockchain.blockchains.ton.TonTransactionExtras
 import com.tangem.blockchain.blockchains.xrp.XrpTransactionBuilder.XrpTransactionExtras
 import com.tangem.blockchain.common.*
 import com.tangem.blockchain.common.transaction.Fee
-import com.tangem.blockchain.extensions.SimpleResult
+import com.tangem.blockchain.extensions.Result
 import com.tangem.blockchainsdk.utils.minimalAmount
 import com.tangem.common.core.TangemSdkError
 import com.tangem.core.analytics.Analytics
@@ -246,7 +246,7 @@ private fun sendTransaction(
             tangemSdk.config.linkedTerminal = linkedTerminalState
 
             when (sendResult) {
-                is SimpleResult.Success -> {
+                is Result.Success -> {
                     dispatch(SendAction.SendSuccess)
 
                     if (externalTransactionData != null) {
@@ -273,7 +273,7 @@ private fun sendTransaction(
                         dispatch(NavigationAction.PopBackTo())
                     }
                 }
-                is SimpleResult.Failure -> {
+                is Result.Failure -> {
                     updateFeedbackManagerInfo(
                         sendResult = sendResult.error,
                         walletManager = walletManager,

diff --git a/app/src/main/java/com/tangem/tap/proxy/TransactionManagerImpl.kt b/app/src/main/java/com/tangem/tap/proxy/TransactionManagerImpl.kt
@@ -17,8 +17,8 @@ import com.tangem.blockchain.blockchains.xrp.XrpTransactionBuilder
 import com.tangem.blockchain.common.*
 import com.tangem.blockchain.common.transaction.Fee
 import com.tangem.blockchain.common.transaction.TransactionFee
+import com.tangem.blockchain.common.transaction.TransactionSendResult
 import com.tangem.blockchain.extensions.Result
-import com.tangem.blockchain.extensions.SimpleResult
 import com.tangem.blockchain.externallinkprovider.TxExploreState
 import com.tangem.blockchain.network.ResultChecker
 import com.tangem.blockchainsdk.utils.fromNetworkId
@@ -363,12 +363,12 @@ class TransactionManagerImpl(
         }
     }
 
-    private fun handleSendResult(result: SimpleResult): SendTxResult {
+    private fun handleSendResult(result: Result<TransactionSendResult>): SendTxResult {
         when (result) {
-            is SimpleResult.Success -> {
+            is Result.Success -> {
                 return SendTxResult.Success
             }
-            is SimpleResult.Failure -> {
+            is Result.Failure -> {
                 if (ResultChecker.isNetworkError(result)) return SendTxResult.NetworkError(result.error)
                 val error = result.error as? BlockchainSdkError ?: return SendTxResult.UnknownError()
                 when (error) {

diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/express/TangemExpressApi.kt b/core/datasource/src/main/java/com/tangem/datasource/api/express/TangemExpressApi.kt
@@ -2,6 +2,7 @@ package com.tangem.datasource.api.express
 
 import com.tangem.datasource.api.common.response.ApiResponse
 import com.tangem.datasource.api.express.models.request.AssetsRequestBody
+import com.tangem.datasource.api.express.models.request.ExchangeSentRequestBody
 import com.tangem.datasource.api.express.models.request.PairsRequestBody
 import com.tangem.datasource.api.express.models.response.*
 import retrofit2.http.Body
@@ -57,4 +58,7 @@ interface TangemExpressApi {
 
     @GET("exchange-status")
     suspend fun getExchangeStatus(@Query("txId") txId: String): ApiResponse<ExchangeStatusResponse>
+
+    @POST("exchange-sent")
+    suspend fun exchangeSent(@Body body: ExchangeSentRequestBody): ApiResponse<ExchangeSentResponseBody>
 }
diff --git a/...src/main/java/com/tangem/datasource/api/express/models/request/ExchangeSentRequestBody.kt b/...src/main/java/com/tangem/datasource/api/express/models/request/ExchangeSentRequestBody.kt
@@ -0,0 +1,18 @@
+package com.tangem.datasource.api.express.models.request
+
+import com.squareup.moshi.Json
+
+data class ExchangeSentRequestBody(
+    @Json(name = "txId")
+    val txId: String,
+    @Json(name = "fromNetwork")
+    val fromNetwork: String,
+    @Json(name = "fromAddress")
+    val fromAddress: String,
+    @Json(name = "payinAddress")
+    val payinAddress: String,
+    @Json(name = "payinExtraId")
+    val payinExtraId: String?,
+    @Json(name = "txHash")
+    val txHash: String,
+)
diff --git a/...c/main/java/com/tangem/datasource/api/express/models/response/ExchangeSentResponseBody.kt b/...c/main/java/com/tangem/datasource/api/express/models/response/ExchangeSentResponseBody.kt
@@ -0,0 +1,10 @@
+package com.tangem.datasource.api.express.models.response
+
+import com.squareup.moshi.Json
+
+data class ExchangeSentResponseBody(
+    @Json(name = "txId")
+    val txId: String,
+    @Json(name = "status")
+    val status: String,
+)
diff --git a/...src/main/java/com/tangem/datasource/api/express/models/response/ExchangeStatusResponse.kt b/...src/main/java/com/tangem/datasource/api/express/models/response/ExchangeStatusResponse.kt
@@ -10,8 +10,8 @@ data class ExchangeStatusResponse(
     @Json(name = "externalTxId")
     val externalTxId: String,
 
-    @Json(name = "externalTxStatus")
-    val externalStatus: ExchangeStatus,
+    @Json(name = "status")
+    val status: ExchangeStatus,
 
     @Json(name = "externalTxUrl")
     val externalTxUrl: String,

diff --git a/domain/demo/src/main/java/com/tangem/domain/demo/DemoTransactionSender.kt b/domain/demo/src/main/java/com/tangem/domain/demo/DemoTransactionSender.kt
@@ -3,8 +3,8 @@ package com.tangem.domain.demo
 import com.tangem.blockchain.common.*
 import com.tangem.blockchain.common.transaction.Fee
 import com.tangem.blockchain.common.transaction.TransactionFee
+import com.tangem.blockchain.common.transaction.TransactionSendResult
 import com.tangem.blockchain.extensions.Result
-import com.tangem.blockchain.extensions.SimpleResult
 import com.tangem.common.CompletionResult
 import kotlin.random.Random
 
@@ -25,14 +25,17 @@ class DemoTransactionSender(private val walletManager: WalletManager) : Transact
         return getFee(amount, walletManager.wallet.address)
     }
 
-    override suspend fun send(transactionData: TransactionData, signer: TransactionSigner): SimpleResult {
+    override suspend fun send(
+        transactionData: TransactionData,
+        signer: TransactionSigner,
+    ): Result<TransactionSendResult> {
         val signerResponse = signer.sign(
             hash = getDataToSign(),
             publicKey = walletManager.wallet.publicKey,
         )
         return when (signerResponse) {
-            is CompletionResult.Success -> SimpleResult.Failure(Exception(ID).toBlockchainSdkError())
-            is CompletionResult.Failure -> SimpleResult.fromTangemSdkError(signerResponse.error)
+            is CompletionResult.Success -> Result.Failure(Exception(ID).toBlockchainSdkError())
+            is CompletionResult.Failure -> Result.fromTangemSdkError(signerResponse.error)
         }
     }
 

diff --git a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/DefaultWalletManagersFacade.kt b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/DefaultWalletManagersFacade.kt
@@ -514,20 +514,6 @@ class DefaultWalletManagersFacade(
         return walletManager?.createTransaction(amount, fee, destination)
     }
 
-    @Deprecated("Will be removed in future")
-    override suspend fun sendTransaction(
-        txData: TransactionData,
-        signer: CommonSigner,
-        userWalletId: UserWalletId,
-        network: Network,
-    ): SimpleResult {
-        val walletManager = getOrCreateWalletManager(
-            userWalletId = userWalletId,
-            network = network,
-        )
-        return (walletManager as TransactionSender).send(txData, signer)
-    }
-
     override suspend fun getRecentTransactions(
         userWalletId: UserWalletId,
         currency: CryptoCurrency,

diff --git a/domain/legacy/src/main/java/com/tangem/domain/walletmanager/WalletManagersFacade.kt b/domain/legacy/src/main/java/com/tangem/domain/walletmanager/WalletManagersFacade.kt
@@ -212,22 +212,6 @@ interface WalletManagersFacade {
         network: Network,
     ): TransactionData?
 
-    /**
-     * Sends transaction
-     *
-     * @param txData transaction data
-     * @param signer card signer
-     * @param userWalletId selected wallet id
-     * @param network network of currency
-     */
-    @Deprecated("Will be removed in future")
-    suspend fun sendTransaction(
-        txData: TransactionData,
-        signer: CommonSigner,
-        userWalletId: UserWalletId,
-        network: Network,
-    ): SimpleResult
-
     /** Get recent transactions of [userWalletId] for [currency] */
     suspend fun getRecentTransactions(userWalletId: UserWalletId, currency: CryptoCurrency): List<TxHistoryItem>
 

diff --git a/domain/transaction/src/main/java/com/tangem/domain/transaction/TransactionRepository.kt b/domain/transaction/src/main/java/com/tangem/domain/transaction/TransactionRepository.kt
@@ -1,11 +1,8 @@
 package com.tangem.domain.transaction
 
-import com.tangem.blockchain.common.Amount
-import com.tangem.blockchain.common.CommonSigner
-import com.tangem.blockchain.common.TransactionData
-import com.tangem.blockchain.common.TransactionExtras
+import com.tangem.blockchain.common.*
 import com.tangem.blockchain.common.transaction.Fee
-import com.tangem.blockchain.extensions.SimpleResult
+import com.tangem.blockchain.common.transaction.TransactionSendResult
 import com.tangem.domain.tokens.model.Network
 import com.tangem.domain.wallets.models.UserWalletId
 
@@ -42,5 +39,5 @@ interface TransactionRepository {
         signer: CommonSigner,
         userWalletId: UserWalletId,
         network: Network,
-    ): SimpleResult
+    ): com.tangem.blockchain.extensions.Result<TransactionSendResult>
 }
diff --git a/...transaction/src/main/java/com/tangem/domain/transaction/usecase/SendTransactionUseCase.kt b/...transaction/src/main/java/com/tangem/domain/transaction/usecase/SendTransactionUseCase.kt
@@ -6,7 +6,8 @@ import arrow.core.right
 import com.tangem.blockchain.common.BlockchainSdkError
 import com.tangem.blockchain.common.TransactionData
 import com.tangem.blockchain.common.TransactionSigner
-import com.tangem.blockchain.extensions.SimpleResult
+import com.tangem.blockchain.common.transaction.TransactionSendResult
+import com.tangem.blockchain.extensions.Result
 import com.tangem.blockchain.network.ResultChecker
 import com.tangem.common.core.TangemSdkError
 import com.tangem.core.ui.extensions.resourceReference
@@ -35,7 +36,7 @@ class SendTransactionUseCase(
         txData: TransactionData,
         userWallet: UserWallet,
         network: Network,
-    ): Either<SendTransactionError?, Boolean> {
+    ): Either<SendTransactionError?, String> {
         val signer = cardSdkConfigRepository.getCommonSigner(cardId = null)
 
         val linkedTerminal = cardSdkConfigRepository.isLinkedTerminal()
@@ -51,12 +52,16 @@ class SendTransactionUseCase(
                     signer = signer,
                 )
             } else {
-                transactionRepository.sendTransaction(
+                val sendResult = transactionRepository.sendTransaction(
                     txData = txData,
                     signer = signer,
                     userWalletId = userWallet.walletId,
                     network = network,
-                ).right()
+                )
+                when (sendResult) {
+                    is Result.Failure -> handleError(sendResult).left()
+                    is Result.Success -> sendResult.data.right()
+                }
             }
         } catch (ex: Exception) {
             cardSdkConfigRepository.setLinkedTerminal(linkedTerminal)
@@ -65,12 +70,7 @@ class SendTransactionUseCase(
 
         cardSdkConfigRepository.setLinkedTerminal(linkedTerminal)
         return sendResult.fold(
-            ifRight = { result ->
-                when (result) {
-                    is SimpleResult.Success -> true.right()
-                    is SimpleResult.Failure -> handleError(result).left()
-                }
-            },
+            ifRight = { result -> result.hash.right() },
             ifLeft = { it.left() },
         )
     }
@@ -80,7 +80,7 @@ class SendTransactionUseCase(
         network: Network,
         transactionData: TransactionData,
         signer: TransactionSigner,
-    ): Either<SendTransactionError, SimpleResult> {
+    ): Either<SendTransactionError, TransactionSendResult> {
         val demoTransactionSender = DemoTransactionSender(
             walletManagersFacade
                 .getOrCreateWalletManager(userWallet.walletId, network)
@@ -89,14 +89,14 @@ class SendTransactionUseCase(
 
         val result = demoTransactionSender.send(transactionData = transactionData, signer = signer)
 
-        return if (result is SimpleResult.Failure && result.error.customMessage.contains(DemoTransactionSender.ID)) {
+        return if (result is Result.Failure && result.error.customMessage.contains(DemoTransactionSender.ID)) {
             SendTransactionError.DemoCardError.left()
         } else {
-            result.right()
+            TransactionSendResult("hash").right()
         }
     }
 
-    private fun handleError(result: SimpleResult.Failure): SendTransactionError {
+    private fun handleError(result: Result.Failure): SendTransactionError {
         if (ResultChecker.isNetworkError(result)) {
             return SendTransactionError.NetworkError(
                 code = result.error.message,

diff --git a/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt b/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt
@@ -14,6 +14,7 @@ import com.tangem.datasource.api.common.response.ApiResponse
 import com.tangem.datasource.api.common.response.ApiResponseError
 import com.tangem.datasource.api.common.response.getOrThrow
 import com.tangem.datasource.api.express.TangemExpressApi
+import com.tangem.datasource.api.express.models.request.ExchangeSentRequestBody
 import com.tangem.datasource.api.express.models.request.PairsRequestBody
 import com.tangem.datasource.api.express.models.response.ExchangeDataResponseWithTxDetails
 import com.tangem.datasource.api.express.models.response.SwapPair
@@ -303,6 +304,31 @@ internal class DefaultSwapRepository @Inject constructor(
         }
     }
 
+    override suspend fun exchangeSent(
+        txId: String,
+        fromNetwork: String,
+        fromAddress: String,
+        payInAddress: String,
+        txHash: String,
+        payInExtraId: String?,
+    ): Either<DataError, Unit> = withContext(coroutineDispatcher.io) {
+        try {
+            tangemExpressApi.exchangeSent(
+                ExchangeSentRequestBody(
+                    txId = txId,
+                    fromNetwork = fromNetwork,
+                    fromAddress = fromAddress,
+                    payinAddress = payInAddress,
+                    payinExtraId = payInExtraId,
+                    txHash = txHash,
+                ),
+            ).getOrThrow()
+            Unit.right()
+        } catch (ex: Exception) {
+            getDataError(ex).left()
+        }
+    }
+
     private fun parseTxDetails(txDetailsJson: String): TxDetails? {
         return try {
             txDetailsMoshiAdapter.fromJson(txDetailsJson)

diff --git a/...res/swap/data/src/main/java/com/tangem/feature/swap/converters/ExchangeStatusConverter.kt b/...res/swap/data/src/main/java/com/tangem/feature/swap/converters/ExchangeStatusConverter.kt
@@ -10,7 +10,7 @@ internal class ExchangeStatusConverter : Converter<ExchangeStatusResponse, Excha
         return ExchangeStatusModel(
             providerId = value.providerId,
             status = ExchangeStatus.values().firstOrNull {
-                it.name.lowercase() == value.externalStatus.name.lowercase()
+                it.name.lowercase() == value.status.name.lowercase()
             },
             txId = value.externalTxId,
             txExternalUrl = value.externalTxUrl,

diff --git a/features/swap/data/src/main/java/com/tangem/feature/swap/converters/ExpressDataConverter.kt b/features/swap/data/src/main/java/com/tangem/feature/swap/converters/ExpressDataConverter.kt
@@ -31,6 +31,7 @@ internal class ExpressDataConverter : Converter<ExchangeDataResponseWithTxDetail
                 txTo = transactionDto.txTo,
                 txFrom = requireNotNull(transactionDto.txFrom),
                 txData = requireNotNull(transactionDto.txData),
+                txExtraId = transactionDto.txExtraId,
             )
         } else {
             ExpressTransactionModel.CEX(

diff --git a/features/swap/domain/api/src/main/java/com/tangem/feature/swap/domain/api/SwapRepository.kt b/features/swap/domain/api/src/main/java/com/tangem/feature/swap/domain/api/SwapRepository.kt
@@ -70,5 +70,16 @@ interface SwapRepository {
         refundExtraId: String? = null, // for cex only
     ): Either<DataError, SwapDataModel>
 
+    // TODO: Add target error handling, remove either (https://tangem.atlassian.net/browse/AND-7323)
+    @Suppress("LongParameterList")
+    suspend fun exchangeSent(
+        txId: String,
+        fromNetwork: String,
+        fromAddress: String,
+        payInAddress: String,
+        txHash: String,
+        payInExtraId: String?,
+    ): Either<DataError, Unit>
+
     fun getNativeTokenForNetwork(networkId: String): CryptoCurrency
 }