Submit transactions through proxy (#254)

* Submit delegation/baker transactions via wallet-proxy

* Add deprecation notice to the grpc client getter

Author: Radiokot

app/src/main/java/com/concordium/wallet/core/AppCore.kt

@@ -121,6 +121,7 @@ class AppCore(val app: App) {
         return proxyBackendConfig.backend
     }
 
+    @Deprecated("It's better to use ProxyBackend, as it is backed by a reliable node")
     fun getGrpcClient(): ClientV2 {
         return grpcBackendConfig.client
     }

app/src/main/java/com/concordium/wallet/data/backend/ProxyBackend.kt

@@ -4,7 +4,6 @@ import com.concordium.wallet.data.cryptolib.CreateTransferOutput
 import com.concordium.wallet.data.model.AccountBalance
 import com.concordium.wallet.data.model.AccountKeyData
 import com.concordium.wallet.data.model.AccountNonce
-import com.concordium.wallet.data.model.AccountSubmissionStatus
 import com.concordium.wallet.data.model.AccountTransactions
 import com.concordium.wallet.data.model.BakerPoolStatus
 import com.concordium.wallet.data.model.CIS2Tokens
@@ -17,8 +16,9 @@ import com.concordium.wallet.data.model.IdentityContainer
 import com.concordium.wallet.data.model.IdentityProvider
 import com.concordium.wallet.data.model.PassiveDelegation
 import com.concordium.wallet.data.model.SubmissionData
+import com.concordium.wallet.data.model.SubmissionStatusResponse
 import com.concordium.wallet.data.model.TransactionCost
-import com.concordium.wallet.data.model.TransferSubmissionStatus
+import okhttp3.RequestBody
 import retrofit2.Call
 import retrofit2.Response
 import retrofit2.http.Body
@@ -29,6 +29,12 @@ import retrofit2.http.Query
 
 interface ProxyBackend {
 
+    /**
+     * Submits a transaction serialized as Block item (version, signature, header, payload).
+     */
+    @PUT("v0/submitRawTransaction")
+    suspend fun submitRawTransaction(@Body transactionBytesBody: RequestBody): SubmissionData
+
     @PUT("v0/submitCredential")
     fun submitCredential(@Body credential: CredentialWrapper): Call<SubmissionData>
 
@@ -38,23 +44,17 @@ interface ProxyBackend {
     @GET("v0/bakerPool/{poolId}")
     suspend fun bakerPoolSuspended(@Path("poolId") poolId: String): Response<BakerPoolStatus>
 
-    @GET("v0/submissionStatus/{submissionId}")
-    fun accountSubmissionStatus(@Path("submissionId") submissionId: String): Call<AccountSubmissionStatus>
-
-    @GET("v0/submissionStatus/{submissionId}")
-    suspend fun accountSubmissionStatusSuspended(@Path("submissionId") submissionId: String): AccountSubmissionStatus
-
     @GET("v0/accNonce/{accountAddress}")
     fun accountNonce(@Path("accountAddress") accountAddress: String): Call<AccountNonce>
 
     @PUT("v0/submitTransfer")
     fun submitTransfer(@Body transfer: CreateTransferOutput): Call<SubmissionData>
 
     @GET("v0/submissionStatus/{submissionId}")
-    fun transferSubmissionStatus(@Path("submissionId") submissionId: String): Call<TransferSubmissionStatus>
+    fun submissionStatus(@Path("submissionId") submissionId: String): Call<SubmissionStatusResponse>
 
     @GET("v0/submissionStatus/{submissionId}")
-    suspend fun transferSubmissionStatusSuspended(@Path("submissionId") submissionId: String): TransferSubmissionStatus
+    suspend fun submissionStatusSuspended(@Path("submissionId") submissionId: String): SubmissionStatusResponse
 
     @GET("v0/transactionCost")
     fun transferCost(

app/src/main/java/com/concordium/wallet/data/backend/repository/ProxyRepository.kt

@@ -1,13 +1,13 @@
 package com.concordium.wallet.data.backend.repository
 
+import com.concordium.sdk.transactions.Transaction
 import com.concordium.wallet.App
 import com.concordium.wallet.core.backend.BackendCallback
 import com.concordium.wallet.core.backend.BackendRequest
 import com.concordium.wallet.data.cryptolib.CreateTransferOutput
 import com.concordium.wallet.data.model.AccountBalance
 import com.concordium.wallet.data.model.AccountKeyData
 import com.concordium.wallet.data.model.AccountNonce
-import com.concordium.wallet.data.model.AccountSubmissionStatus
 import com.concordium.wallet.data.model.AccountTransactions
 import com.concordium.wallet.data.model.BakerPoolStatus
 import com.concordium.wallet.data.model.CIS2Tokens
@@ -17,9 +17,13 @@ import com.concordium.wallet.data.model.ChainParameters
 import com.concordium.wallet.data.model.CredentialWrapper
 import com.concordium.wallet.data.model.GlobalParamsWrapper
 import com.concordium.wallet.data.model.SubmissionData
+import com.concordium.wallet.data.model.SubmissionStatusResponse
 import com.concordium.wallet.data.model.TransactionCost
-import com.concordium.wallet.data.model.TransferSubmissionStatus
 import com.concordium.wallet.util.Log
+import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
 import java.math.BigInteger
 
 class ProxyRepository {
@@ -46,6 +50,23 @@ class ProxyRepository {
         const val CIS_2_TOKEN_METADATA_MAX_TOKEN_IDS = 20
     }
 
+    /**
+     * Submits [transaction] crafted by the Java SDK
+     * through a reliable node behind the wallet-proxy.
+     *
+     * @see getSubmissionStatus
+     */
+    suspend fun submitSdkTransaction(
+        transaction: Transaction,
+    ): SubmissionData =
+        backend.submitRawTransaction(
+            transactionBytesBody = transaction
+                .bytes
+                .toRequestBody(
+                    contentType = "application/octet-stream".toMediaType(),
+                ),
+        )
+
     fun submitCredential(
         credentialWrapper: CredentialWrapper,
         success: (SubmissionData) -> Unit,
@@ -70,33 +91,6 @@ class ProxyRepository {
         )
     }
 
-    suspend fun getAccountSubmissionStatusSuspended(submissionId: String) =
-        backend.accountSubmissionStatusSuspended(submissionId)
-
-    fun getAccountSubmissionStatus(
-        submissionId: String,
-        success: (AccountSubmissionStatus) -> Unit,
-        failure: ((Throwable) -> Unit)?,
-    ): BackendRequest<AccountSubmissionStatus> {
-        val call = backend.accountSubmissionStatus(submissionId)
-        call.enqueue(object : BackendCallback<AccountSubmissionStatus>() {
-
-            override fun onResponseData(response: AccountSubmissionStatus) {
-                success(response)
-            }
-
-            override fun onFailure(t: Throwable) {
-                failure?.invoke(t)
-            }
-        })
-
-        return BackendRequest<AccountSubmissionStatus>(
-            call = call,
-            success = success,
-            failure = failure
-        )
-    }
-
     fun getAccountNonce(
         accountAddress: String,
         success: (AccountNonce) -> Unit,
@@ -147,18 +141,18 @@ class ProxyRepository {
         )
     }
 
-    suspend fun getTransferSubmissionStatusSuspended(submissionId: String) =
-        backend.transferSubmissionStatusSuspended(submissionId)
+    suspend fun getSubmissionStatus(submissionId: String) =
+        backend.submissionStatusSuspended(submissionId)
 
-    fun getTransferSubmissionStatus(
+    fun getSubmissionStatus(
         submissionId: String,
-        success: (TransferSubmissionStatus) -> Unit,
+        success: (SubmissionStatusResponse) -> Unit,
         failure: ((Throwable) -> Unit)?,
-    ): BackendRequest<TransferSubmissionStatus> {
-        val call = backend.transferSubmissionStatus(submissionId)
-        call.enqueue(object : BackendCallback<TransferSubmissionStatus>() {
+    ): BackendRequest<SubmissionStatusResponse> {
+        val call = backend.submissionStatus(submissionId)
+        call.enqueue(object : BackendCallback<SubmissionStatusResponse>() {
 
-            override fun onResponseData(response: TransferSubmissionStatus) {
+            override fun onResponseData(response: SubmissionStatusResponse) {
                 success(response)
             }
 
@@ -167,7 +161,7 @@ class ProxyRepository {
             }
         })
 
-        return BackendRequest<TransferSubmissionStatus>(
+        return BackendRequest(
             call = call,
             success = success,
             failure = failure

app/src/main/java/com/concordium/wallet/data/model/AccountSubmissionStatus.kt

@@ -2,7 +2,7 @@ package com.concordium.wallet.data.model
 
 import java.math.BigInteger
 
-data class TransferSubmissionStatus(
+data class SubmissionStatusResponse(
     val status: TransactionStatus,
     val outcome: TransactionOutcome?,
     val amount: BigInteger?,
@@ -14,4 +14,4 @@ data class TransferSubmissionStatus(
     val rejectReason: String?,
     val encryptedAmount: String?,
     val aggregatedIndex: Int?
-)
+)

…t/data/model/TransferSubmissionStatus.kt …t/data/model/SubmissionStatusResponse.ktapp/src/main/java/com/concordium/wallet/data/model/TransferSubmissionStatus.kt renamed to app/src/main/java/com/concordium/wallet/data/model/SubmissionStatusResponse.kt app/src/main/java/com/concordium/wallet/data/model/TransferSubmissionStatus.kt renamed to app/src/main/java/com/concordium/wallet/data/model/SubmissionStatusResponse.kt

@@ -5,9 +5,7 @@ import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
-import com.concordium.wallet.App
 import com.concordium.wallet.core.arch.Event
-import com.concordium.wallet.data.backend.repository.ProxyRepository
 import com.concordium.wallet.data.model.Schedule
 import com.concordium.wallet.data.room.Account
 import kotlinx.coroutines.Dispatchers
@@ -18,10 +16,6 @@ class AccountReleaseScheduleViewModel(application: Application) : AndroidViewMod
     lateinit var account: Account
     var isShielded: Boolean = false
 
-    private val proxyRepository = ProxyRepository()
-
-    private val gson = App.appCore.gson
-
     // Transaction state
     private val _waitingLiveData = MutableLiveData<Boolean>()
     val waitingLiveData: LiveData<Boolean>
@@ -39,9 +33,6 @@ class AccountReleaseScheduleViewModel(application: Application) : AndroidViewMod
     val scheduledReleasesLiveData: LiveData<List<Schedule>>
         get() = _scheduledReleasesLiveData
 
-    init {
-    }
-
     fun initialize(account: Account, isShielded: Boolean) {
         this.account = account
         this.isShielded = isShielded

app/src/main/java/com/concordium/wallet/ui/account/accountdetails/AccountReleaseScheduleViewModel.kt

@@ -19,12 +19,12 @@ import com.concordium.wallet.data.backend.repository.ProxyRepository
 import com.concordium.wallet.data.cryptolib.CreateCredentialInputV1
 import com.concordium.wallet.data.cryptolib.CreateCredentialOutput
 import com.concordium.wallet.data.cryptolib.StorageAccountData
-import com.concordium.wallet.data.model.AccountSubmissionStatus
 import com.concordium.wallet.data.model.CredentialWrapper
 import com.concordium.wallet.data.model.EncryptedData
 import com.concordium.wallet.data.model.GlobalParams
 import com.concordium.wallet.data.model.GlobalParamsWrapper
 import com.concordium.wallet.data.model.SubmissionData
+import com.concordium.wallet.data.model.SubmissionStatusResponse
 import com.concordium.wallet.data.model.TransactionStatus
 import com.concordium.wallet.data.room.Account
 import com.concordium.wallet.data.room.Identity
@@ -50,7 +50,7 @@ open class NewAccountViewModel(application: Application) :
 
     private var globalParamsRequest: BackendRequest<GlobalParamsWrapper>? = null
     private var submitCredentialRequest: BackendRequest<SubmissionData>? = null
-    private var accountSubmissionStatusRequest: BackendRequest<AccountSubmissionStatus>? = null
+    private var accountSubmissionStatusRequest: BackendRequest<SubmissionStatusResponse>? = null
     private var firstAccount: Boolean = false
 
     private var tempData = TempData()

app/src/main/java/com/concordium/wallet/ui/account/common/NewAccountViewModel.kt

@@ -15,12 +15,11 @@ import com.concordium.wallet.data.backend.repository.ProxyRepository
 import com.concordium.wallet.data.cryptolib.DecryptAmountInput
 import com.concordium.wallet.data.model.AccountBalance
 import com.concordium.wallet.data.model.AccountEncryptedAmount
-import com.concordium.wallet.data.model.AccountSubmissionStatus
 import com.concordium.wallet.data.model.ShieldedAccountEncryptionStatus
+import com.concordium.wallet.data.model.SubmissionStatusResponse
 import com.concordium.wallet.data.model.TransactionOutcome
 import com.concordium.wallet.data.model.TransactionStatus
 import com.concordium.wallet.data.model.TransactionType
-import com.concordium.wallet.data.model.TransferSubmissionStatus
 import com.concordium.wallet.data.room.Account
 import com.concordium.wallet.data.room.EncryptedAmount
 import com.concordium.wallet.data.room.Recipient
@@ -46,12 +45,12 @@ import java.math.BigInteger
 
 class AccountUpdater(val application: Application, private val viewModelScope: CoroutineScope) {
     data class AccountSubmissionStatusRequestData(
-        val deferred: Deferred<AccountSubmissionStatus>,
+        val deferred: Deferred<SubmissionStatusResponse>,
         val account: Account
     )
 
     data class TransferSubmissionStatusRequestData(
-        val deferred: Deferred<TransferSubmissionStatus>,
+        val deferred: Deferred<SubmissionStatusResponse>,
         val transfer: Transfer
     )
 
@@ -198,7 +197,7 @@ class AccountUpdater(val application: Application, private val viewModelScope: C
                         )
                     ) {
                         val deferred = async {
-                            proxyRepository.getAccountSubmissionStatusSuspended(account.submissionId)
+                            proxyRepository.getSubmissionStatus(account.submissionId)
                         }
                         val requestData = AccountSubmissionStatusRequestData(
                             deferred,
@@ -270,7 +269,7 @@ class AccountUpdater(val application: Application, private val viewModelScope: C
                         || transfer.transactionStatus == TransactionStatus.UNKNOWN
                     ) {
                         val deferred = async {
-                            proxyRepository.getTransferSubmissionStatusSuspended(transfer.submissionId)
+                            proxyRepository.getSubmissionStatus(transfer.submissionId)
                         }
                         val requestData = TransferSubmissionStatusRequestData(
                             deferred,

app/src/main/java/com/concordium/wallet/ui/account/common/accountupdater/AccountUpdater.kt

@@ -23,7 +23,6 @@ import com.concordium.sdk.transactions.ConfigureBakerTransaction
 import com.concordium.sdk.transactions.ConfigureDelegationPayload
 import com.concordium.sdk.transactions.ConfigureDelegationTransaction
 import com.concordium.sdk.transactions.Expiry
-import com.concordium.sdk.transactions.Hash
 import com.concordium.sdk.transactions.SignerEntry
 import com.concordium.sdk.transactions.TransactionFactory
 import com.concordium.sdk.transactions.TransactionSigner
@@ -707,9 +706,9 @@ class DelegationBakerViewModel(application: Application) : AndroidViewModel(appl
     ) = withContext(Dispatchers.IO) {
 
         val submissionId: String = try {
-            App.appCore.getGrpcClient()
-                .sendTransaction(transaction)
-                .asHex()
+            proxyRepository
+                .submitSdkTransaction(transaction)
+                .submissionId
         } catch (e: Exception) {
             Log.e("Error submitting transaction", e)
             withContext(Dispatchers.Main) {
@@ -723,11 +722,10 @@ class DelegationBakerViewModel(application: Application) : AndroidViewModel(appl
 
         bakerDelegationData.submissionId = submissionId
 
-        try {
-            // If the status is received,
-            // the transaction has been at least accepted as valid.
-            App.appCore.getGrpcClient()
-                .getBlockItemStatus(Hash.from(submissionId))
+        val submissionStatus =try {
+            proxyRepository
+                .getSubmissionStatus(submissionId)
+                .status
         } catch (e: Exception) {
             Log.e("Error checking submission status", e)
             withContext(Dispatchers.Main) {
@@ -740,12 +738,14 @@ class DelegationBakerViewModel(application: Application) : AndroidViewModel(appl
         // Do not disable waiting state yet
         finishTransferCreation(
             submissionId = submissionId,
+            submissionStatus = submissionStatus,
             localTransactionType = localTransactionType,
         )
     }
 
     private suspend fun finishTransferCreation(
         submissionId: String,
+        submissionStatus: TransactionStatus,
         localTransactionType: TransactionType,
     ) = withContext(Dispatchers.Main) {
         val createdAt = Date().time
@@ -772,7 +772,7 @@ class DelegationBakerViewModel(application: Application) : AndroidViewModel(appl
             "",
             createdAt,
             submissionId,
-            TransactionStatus.UNKNOWN,
+            submissionStatus,
             TransactionOutcome.UNKNOWN,
             localTransactionType,
             //but amount is negative so it is listed as incoming positive