Set protected flag in tx via extra data

Author: abdrasulov

merkleiokit/src/main/java/io/horizontalsystems/merkleiokit/MerkleTransactionAdapter.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import io.horizontalsystems.ethereumkit.api.core.ApiRpcSyncer
 import io.horizontalsystems.ethereumkit.api.core.NodeApiProvider
 import io.horizontalsystems.ethereumkit.core.EthereumKit
-import io.horizontalsystems.ethereumkit.core.ITransactionSyncer
 import io.horizontalsystems.ethereumkit.core.TransactionBuilder
 import io.horizontalsystems.ethereumkit.core.TransactionManager
 import io.horizontalsystems.ethereumkit.models.Address
@@ -18,22 +17,33 @@ import java.net.URI
 
 class MerkleTransactionAdapter(
     val blockchain: MerkleRpcBlockchain,
-    val syncer: ITransactionSyncer,
+    val syncer: MerkleTransactionSyncer,
     private val transactionManager: TransactionManager,
 ) {
     fun send(rawTransaction: RawTransaction, signature: Signature): Single<FullTransaction> {
         return blockchain.send(rawTransaction, signature)
             .map { transactionManager.handle(listOf(it)).first() }
     }
 
+    fun registerInKit(ethereumKit: EthereumKit) {
+        ethereumKit.addNonceProvider(blockchain)
+        ethereumKit.addTransactionSyncer(syncer)
+        ethereumKit.addExtraDecorator(syncer)
+    }
+
     companion object {
+        val protectedKey = "protected"
 
         private val blockchainPathMap = mapOf(
             Chain.Ethereum to "eth",
             Chain.BinanceSmartChain to "bsc",
             Chain.Base to "base"
         )
 
+        fun isProtected(transaction: FullTransaction): Boolean {
+            return transaction.extra[protectedKey] == true
+        }
+
         fun getInstance(
             merkleIoPubKey: String,
             address: Address,

merkleiokit/src/main/java/io/horizontalsystems/merkleiokit/MerkleTransactionDao.kt

@@ -10,6 +10,9 @@ interface MerkleTransactionDao {
     @Query("SELECT * FROM MerkleTransactionHash")
     fun hashes() : List<MerkleTransactionHash>
 
+    @Query("SELECT * FROM MerkleTransactionHash WHERE hash = :hash")
+    fun hash(hash: ByteArray) : MerkleTransactionHash?
+
     @Insert
     fun save(hash: MerkleTransactionHash)
 

merkleiokit/src/main/java/io/horizontalsystems/merkleiokit/MerkleTransactionHashManager.kt

@@ -4,6 +4,8 @@ class MerkleTransactionHashManager(private val dao: MerkleTransactionDao) {
 
     fun hashes() = dao.hashes()
 
+    fun hash(hash: ByteArray) = dao.hash(hash)
+
     fun save(hash: MerkleTransactionHash) = dao.save(hash)
 
     fun handle(txHashes: List<ByteArray>) = dao.delete(txHashes)

merkleiokit/src/main/java/io/horizontalsystems/merkleiokit/MerkleTransactionSyncer.kt

@@ -1,5 +1,6 @@
 package io.horizontalsystems.merkleiokit
 
+import io.horizontalsystems.ethereumkit.core.IExtraDecorator
 import io.horizontalsystems.ethereumkit.core.ITransactionSyncer
 import io.horizontalsystems.ethereumkit.core.TransactionManager
 import io.horizontalsystems.ethereumkit.models.Transaction
@@ -10,7 +11,7 @@ class MerkleTransactionSyncer(
     private val manager: MerkleTransactionHashManager,
     private val blockchain: MerkleRpcBlockchain,
     private val transactionManager: TransactionManager,
-) : ITransactionSyncer {
+) : ITransactionSyncer, IExtraDecorator {
 
     @OptIn(ExperimentalStdlibApi::class)
     override fun getTransactionsSingle(): Single<Pair<List<Transaction>, Boolean>> {
@@ -51,4 +52,14 @@ class MerkleTransactionSyncer(
             Pair(failedTxs, false)
         }
     }
+
+    override fun extra(hash: ByteArray): Map<String, Any> {
+        val merkleTransactionHash = manager.hash(hash)
+
+        return if (merkleTransactionHash != null) {
+            mapOf(MerkleTransactionAdapter.protectedKey to true)
+        } else {
+            mapOf()
+        }
+    }
 }