Merge branch 'main' into release/v2.12.0

# Conflicts:
#	app/src/main/java/org/p2p/wallet/history/ui/model/HistoryItem.kt

.gitignore

@@ -64,8 +64,6 @@ captures/
 .idea/dictionaries
 .idea/libraries
 !.idea/codeStyles/Project.xml
-!.idea/file.template.settings.xml
-!.idea/fileTemplates
 
 # Keystore files
 #*.jks

app/src/main/java/org/p2p/wallet/alarmlogger/api/AlarmErrorsBridgeClaimRequest.kt

@@ -9,16 +9,10 @@ import org.p2p.wallet.BuildConfig
 import org.p2p.core.crypto.Base58String
 
 data class AlarmErrorsBridgeClaimRequest(
-    @SerializedName("user_pubkey")
-    val userPubkey: Base58String,
-    @SerializedName("simulation_error")
-    val simulationError: String,
-    @SerializedName("fee_relayer_error")
-    val feeRelayerError: String,
-    @SerializedName("blockchain_error")
-    val blockchainError: String,
     @SerializedName("token_to_claim")
     val tokenToClaim: TokenToClaim?,
+    @SerializedName("user_pubkey")
+    val userPubkey: Base58String,
     @SerializedName("user_eth_pubkey")
     val userEthPubkey: String,
     @SerializedName("platform")
@@ -27,6 +21,12 @@ data class AlarmErrorsBridgeClaimRequest(
     val appVersion: String = BuildConfig.VERSION_NAME,
     @SerializedName("timestamp")
     val timestamp: String = SimpleDateFormat("dd.MM HH:mm:ss", Locale.getDefault()).format(Date()),
+    @SerializedName("simulation_error")
+    val simulationError: String,
+    @SerializedName("fee_relayer_error")
+    val feeRelayerError: String,
+    @SerializedName("blockchain_error")
+    val blockchainError: String
 ) {
     data class TokenToClaim(
         @SerializedName("name")

app/src/main/java/org/p2p/wallet/alarmlogger/api/AlarmErrorsSendBridgeRequest.kt

@@ -9,18 +9,12 @@ import org.p2p.wallet.BuildConfig
 import org.p2p.core.crypto.Base58String
 
 data class AlarmErrorsSendBridgeRequest(
-    @SerializedName("user_pubkey")
-    val userPubkey: Base58String,
-    @SerializedName("simulation_error")
-    val simulationError: String,
-    @SerializedName("fee_relayer_error")
-    val feeRelayerError: String,
-    @SerializedName("blockchain_error")
-    val blockchainError: String,
     @SerializedName("token_to_send")
     val tokenToSend: TokenToSend?,
     @SerializedName("arbiter_fee_amount")
     val arbiterFeeAmount: String,
+    @SerializedName("user_pubkey")
+    val userPubkey: Base58String,
     @SerializedName("recipient_eth_pubkey")
     val recipientEthPubkey: String,
     @SerializedName("platform")
@@ -29,6 +23,12 @@ data class AlarmErrorsSendBridgeRequest(
     val appVersion: String = BuildConfig.VERSION_NAME,
     @SerializedName("timestamp")
     val timestamp: String = SimpleDateFormat("dd.MM HH:mm:ss", Locale.getDefault()).format(Date()),
+    @SerializedName("simulation_error")
+    val simulationError: String,
+    @SerializedName("fee_relayer_error")
+    val feeRelayerError: String,
+    @SerializedName("blockchain_error")
+    val blockchainError: String
 ) {
     data class TokenToSend(
         @SerializedName("name")

app/src/main/java/org/p2p/wallet/alarmlogger/api/AlarmErrorsSendRequest.kt

@@ -9,20 +9,14 @@ import org.p2p.wallet.BuildConfig
 import org.p2p.core.crypto.Base58String
 
 data class AlarmErrorsSendRequest(
-    @SerializedName("simulation_error")
-    val simulationError: String,
-    @SerializedName("fee_relayer_error")
-    val feeRelayerError: String,
-    @SerializedName("blockchain_error")
-    val blockchainError: String,
-    @SerializedName("user_pubkey")
-    val userPubkey: Base58String,
     @SerializedName("token_to_send")
     val tokenToSend: TokenToSend,
     @SerializedName("fees")
     val fees: Fees,
     @SerializedName("relay_account_state")
     val relayAccountState: RelayAccountStateRequest,
+    @SerializedName("user_pubkey")
+    val userPubkey: Base58String,
     @SerializedName("recipient_pubkey")
     val recipientPubkey: Base58String,
     @SerializedName("recipient_name")
@@ -33,6 +27,12 @@ data class AlarmErrorsSendRequest(
     val appVersion: String = BuildConfig.VERSION_NAME,
     @SerializedName("timestamp")
     val timestamp: String = SimpleDateFormat("dd.MM HH:mm:ss", Locale.getDefault()).format(Date()),
+    @SerializedName("simulation_error")
+    val simulationError: String,
+    @SerializedName("fee_relayer_error")
+    val feeRelayerError: String,
+    @SerializedName("blockchain_error")
+    val blockchainError: String
 ) {
     data class TokenToSend(
         @SerializedName("name")

app/src/main/java/org/p2p/wallet/alarmlogger/api/AlarmErrorsSvlRequest.kt

@@ -9,24 +9,24 @@ import org.p2p.wallet.BuildConfig
 import org.p2p.core.crypto.Base58String
 
 data class AlarmErrorsSvlRequest(
-    @SerializedName("user_pubkey")
-    val userPubkey: Base58String,
-    @SerializedName("simulation_error")
-    val simulationError: String,
-    @SerializedName("fee_relayer_error")
-    val feeRelayerError: String,
-    @SerializedName("blockchain_error")
-    val blockchainError: String,
     @SerializedName("token_to_claim")
     val tokenToClaim: TokenToSend?,
     @SerializedName("token_to_send")
     val tokenToSend: TokenToSend?,
+    @SerializedName("user_pubkey")
+    val userPubkey: Base58String,
     @SerializedName("platform")
     val platform: String = "Android ${Build.VERSION.SDK_INT}, ${Build.MANUFACTURER}, ${Build.MODEL}",
     @SerializedName("app_version")
     val appVersion: String = BuildConfig.VERSION_NAME,
     @SerializedName("timestamp")
     val timestamp: String = SimpleDateFormat("dd.MM HH:mm:ss", Locale.getDefault()).format(Date()),
+    @SerializedName("simulation_error")
+    val simulationError: String,
+    @SerializedName("fee_relayer_error")
+    val feeRelayerError: String,
+    @SerializedName("blockchain_error")
+    val blockchainError: String
 ) {
     data class TokenToSend(
         @SerializedName("name")

app/src/main/java/org/p2p/wallet/alarmlogger/api/AlarmErrorsSwapRequest.kt

@@ -9,16 +9,14 @@ import org.p2p.wallet.BuildConfig
 import org.p2p.core.crypto.Base58String
 
 data class AlarmErrorsSwapRequest(
-    @SerializedName("user_pubkey")
-    val userPublicKey: Base58String,
-    @SerializedName("blockchain_error")
-    val blockchainError: String,
     @SerializedName("token_a")
     val tokenA: TokenARequest,
     @SerializedName("token_b")
     val tokenB: TokenBRequest,
     @SerializedName("route")
     val swapRouteAsJson: String,
+    @SerializedName("user_pubkey")
+    val userPublicKey: Base58String,
     @SerializedName("slippage")
     val slippage: String,
     @SerializedName("fee_relayer_transaction")
@@ -29,20 +27,16 @@ data class AlarmErrorsSwapRequest(
     val appVersion: String = BuildConfig.VERSION_NAME,
     @SerializedName("timestamp")
     val timestamp: String = SimpleDateFormat("dd.MM HH:mm:ss", Locale.getDefault()).format(Date()),
-    @SerializedName("diff_routes_time")
-    val diffRoutesTime: String,
-    @SerializedName("diff_tx_time")
-    val diffTxTime: String,
+    @SerializedName("blockchain_error")
+    val blockchainError: String
 ) {
     data class TokenARequest(
         @SerializedName("name")
         val tokenName: String,
         @SerializedName("mint")
         val mint: Base58String,
         @SerializedName("send_amount")
-        val amount: String,
-        @SerializedName("balance")
-        val balance: String,
+        val amount: String
     )
 
     data class TokenBRequest(
@@ -51,8 +45,6 @@ data class AlarmErrorsSwapRequest(
         @SerializedName("mint")
         val mint: Base58String,
         @SerializedName("expected_amount")
-        val amount: String,
-        @SerializedName("balance")
-        val balance: String,
+        val amount: String
     )
 }

app/src/main/java/org/p2p/wallet/alarmlogger/api/AlarmErrorsUsernameRequest.kt

@@ -9,16 +9,16 @@ import org.p2p.wallet.BuildConfig
 import org.p2p.core.crypto.Base58String
 
 class AlarmErrorsUsernameRequest(
-    @SerializedName("user_pubkey")
-    val userPubkey: Base58String,
-    @SerializedName("name_service_error")
-    val nameServiceError: String,
     @SerializedName("name")
     val username: String,
+    @SerializedName("user_pubkey")
+    val userPubkey: Base58String,
     @SerializedName("platform")
     val platform: String = "Android ${Build.VERSION.SDK_INT}, ${Build.MANUFACTURER}, ${Build.MODEL}",
     @SerializedName("app_version")
     val appVersion: String = BuildConfig.VERSION_NAME,
     @SerializedName("timestamp")
     val timestamp: String = SimpleDateFormat("dd.MM HH:mm:ss", Locale.getDefault()).format(Date()),
+    @SerializedName("name_service_error")
+    val nameServiceError: String,
 )

app/src/main/java/org/p2p/wallet/auth/gateway/repository/GatewayServiceRepository.kt

@@ -5,8 +5,6 @@ import org.p2p.wallet.auth.gateway.api.request.OtpMethod
 import org.p2p.wallet.auth.gateway.api.response.ConfirmRestoreWalletResponse
 import org.p2p.wallet.auth.gateway.api.response.GatewayServiceStandardResponse
 import org.p2p.wallet.auth.gateway.api.response.RegisterWalletResponse
-import org.p2p.wallet.auth.gateway.api.response.UpdateMetadataResponse
-import org.p2p.wallet.auth.gateway.repository.model.GatewayOnboardingMetadata
 import org.p2p.wallet.auth.model.PhoneNumber
 import org.p2p.wallet.auth.web3authsdk.response.Web3AuthSignUpResponse
 import org.p2p.core.crypto.Base58String
@@ -45,18 +43,10 @@ interface GatewayServiceRepository {
         otpConfirmationCode: String
     ): ConfirmRestoreWalletResponse
 
-    suspend fun loadOnboardingMetadata(
+    suspend fun loadAndSaveOnboardingMetadata(
         solanaPublicKey: Base58String,
         solanaPrivateKey: Base58String,
         userSeedPhrase: List<String>,
         etheriumAddress: String
-    ): GatewayOnboardingMetadata
-
-    suspend fun updateMetadata(
-        ethereumAddress: String,
-        solanaPublicKey: Base58String,
-        solanaPrivateKey: Base58String,
-        userSeedPhrase: List<String>,
-        metadata: GatewayOnboardingMetadata
-    ): UpdateMetadataResponse
+    )
 }

app/src/main/java/org/p2p/wallet/auth/gateway/repository/mapper/BorshSerializable.kt

@@ -12,19 +12,6 @@ private const val DEFAULT_BORSH_CAPACITY = 4096
  * see implementations for examples
  *
  * https://github.com/near/borshj/issues/3
- *
- * u8 - byte
- * [u8] - ByteArray
- * u16 - short
- * u32 - int
- * u64 - long
- * u128 - BigInteger
- * f32 - float
- * f64     double
- * str - String
- * map - Map<*,*>
- * set - Set<*>
- * struct - Object / class
  */
 interface BorshSerializable {
     fun getBorshBuffer(): BorshBuffer = BorshBuffer.allocate(DEFAULT_BORSH_CAPACITY)