Add OneInchUnknownDecoration

horizontalsystems · Apr 14, 2022 · f95eef0 · f95eef0
1 parent ac4b615
commit f95eef0
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 73 deletions.
diff --git a/app/src/main/java/io/horizontalsystems/ethereumkit/sample/core/EthereumBaseAdapter.kt b/app/src/main/java/io/horizontalsystems/ethereumkit/sample/core/EthereumBaseAdapter.kt
@@ -1,6 +1,5 @@
 package io.horizontalsystems.ethereumkit.sample.core
 
-import android.util.Log
 import io.horizontalsystems.ethereumkit.core.EthereumKit
 import io.horizontalsystems.ethereumkit.core.toHexString
 import io.horizontalsystems.ethereumkit.models.Address
@@ -88,7 +87,6 @@ open class EthereumBaseAdapter(private val ethereumKit: EthereumKit) : IAdapter
     override fun transactions(fromHash: ByteArray?, limit: Int?): Single<List<TransactionRecord>> {
         return ethereumKit.getFullTransactionsAsync(listOf(), fromHash, limit)
             .map { transactions ->
-                Log.v("LALALA in app: transactions count: ", "${transactions.size}")
                 transactions.map { transactionRecord(it) }
             }
     }

diff --git a/app/src/main/java/io/horizontalsystems/ethereumkit/sample/modules/main/MainViewModel.kt b/app/src/main/java/io/horizontalsystems/ethereumkit/sample/modules/main/MainViewModel.kt
@@ -257,12 +257,10 @@ class MainViewModel : ViewModel() {
     }
 
     private fun updateLastBlockHeight() {
-        Log.v("LALALA BlockHeight", ethereumKit.lastBlockHeight.toString())
         lastBlockHeight.postValue(ethereumKit.lastBlockHeight)
     }
 
     private fun updateState() {
-        Log.v("LALALA State", ethereumAdapter.syncState.toString())
         syncState.postValue(ethereumAdapter.syncState)
     }
 
@@ -291,7 +289,6 @@ class MainViewModel : ViewModel() {
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe { list: List<TransactionRecord> ->
-                Log.v("LALALA ETH", list.size.toString())
                 ethTxs = list
                 updateTransactionList()
             }.let {
@@ -304,7 +301,6 @@ class MainViewModel : ViewModel() {
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe { list: List<TransactionRecord> ->
-                Log.v("LALALA ERC20", list.size.toString())
                 erc20Txs = list
                 updateTransactionList()
             }.let {

diff --git a/erc20kit/src/main/java/io/horizontalsystems/erc20kit/core/Eip20TransactionDecorator.kt b/erc20kit/src/main/java/io/horizontalsystems/erc20kit/core/Eip20TransactionDecorator.kt
@@ -39,68 +39,5 @@ class Eip20TransactionDecorator(
 
         return null
     }
-//
-//    override fun decorate(transactionData: TransactionData): ContractMethodDecoration? =
-//        when (val contractMethod = contractMethodFactories.createMethodFromInput(transactionData.input)) {
-//            is TransferMethod -> TransferMethodDecoration(contractMethod.to, contractMethod.value)
-//            is ApproveMethod -> ApproveMethodDecoration(contractMethod.spender, contractMethod.value)
-//            else -> null
-//        }
-//
-//    override fun decorate(fullTransaction: FullTransaction, fullRpcTransaction: FullRpcTransaction) {
-//        decorateMain(fullTransaction)
-//        decorateLogs(fullTransaction, fullRpcTransaction.rpcReceipt.logs)
-//    }
-//
-//    override fun decorateTransactions(fullTransactions: Map<String, FullTransaction>) {
-//        for (fullTransaction in fullTransactions.values) {
-//            decorateMain(fullTransaction)
-//        }
-//
-//        decorateEvents(fullTransactions)
-//    }
-//
-//    private fun decorateMain(fullTransaction: FullTransaction) {
-//        val transactionData = fullTransaction.transactionData ?: return
-//        val decoration = decorate(transactionData) ?: return
-//
-//        fullTransaction.mainDecoration = decoration
-//    }
-//
-//    private fun decorateLogs(fullTransaction: FullTransaction, logs: List<TransactionLog>) {
-//        val eventDecorations = logs.mapNotNull { log ->
-//            val event = log.getErc20EventInstance() ?: return@mapNotNull null
-//
-//            when (event) {
-//                is TransferEventInstance -> {
-//                    if (event.from == userAddress || event.to == userAddress) {
-//                        return@mapNotNull event
-//                    }
-//                }
-//                is ApproveEventInstance -> {
-//                    if (event.owner == userAddress || event.spender == userAddress) {
-//                        return@mapNotNull event
-//                    }
-//                }
-//            }
-//
-//            return@mapNotNull null
-//        }
-//
-//        fullTransaction.eventDecorations.addAll(eventDecorations)
-//    }
-//
-//    private fun decorateEvents(fullTransactions: Map<String, FullTransaction>) {
-//        val erc20Events = if (fullTransactions.size > 100) {
-//            storage.getEvents()
-//        } else {
-//            storage.getEventsByHashes(fullTransactions.values.map { it.transaction.hash })
-//        }
-//
-//        for (event in erc20Events) {
-//            val decoration = TransferEventInstance(event.contractAddress, event.from, event.to, event.value, event.tokenName, event.tokenSymbol, event.tokenDecimal)
-//            fullTransactions[event.hashString]?.eventDecorations?.add(decoration)
-//        }
-//    }
 
 }
diff --git a/...rc/main/java/io/horizontalsystems/ethereumkit/decorations/UnknownTransactionDecoration.kt b/...rc/main/java/io/horizontalsystems/ethereumkit/decorations/UnknownTransactionDecoration.kt
@@ -6,7 +6,12 @@ import io.horizontalsystems.ethereumkit.models.InternalTransaction
 import io.horizontalsystems.ethereumkit.models.TransactionTag
 import java.math.BigInteger
 
-class UnknownTransactionDecoration(private val userAddress: Address, private val value: BigInteger?, val internalTransactions: List<InternalTransaction>, val eventInstances: List<ContractEventInstance>) : TransactionDecoration() {
+open class UnknownTransactionDecoration(
+    private val userAddress: Address,
+    private val value: BigInteger?,
+    open val internalTransactions: List<InternalTransaction>,
+    open val eventInstances: List<ContractEventInstance>
+) : TransactionDecoration() {
 
     override fun tags(): List<String> =
         (tagsFromInternalTransactions + tagsFromEventInstances).toSet().toList()

diff --git a/...c/main/java/io/horizontalsystems/ethereumkit/transactionsyncers/TransactionSyncManager.kt b/...c/main/java/io/horizontalsystems/ethereumkit/transactionsyncers/TransactionSyncManager.kt
@@ -1,6 +1,5 @@
 package io.horizontalsystems.ethereumkit.transactionsyncers
 
-import android.util.Log
 import io.horizontalsystems.ethereumkit.core.EthereumKit
 import io.horizontalsystems.ethereumkit.core.ITransactionSyncer
 import io.horizontalsystems.ethereumkit.core.TransactionManager
@@ -79,7 +78,6 @@ class TransactionSyncManager(
         )
 
     private fun handle(transactions: List<Transaction>) {
-        Log.v("LALALA Transactions count", transactions.size.toString())
         val map: MutableMap<String, Transaction> = mutableMapOf()
 
         for (transaction in transactions) {

diff --git a/.../src/main/java/io/horizontalsystems/oneinchkit/decorations/OneInchTransactionDecorator.kt b/.../src/main/java/io/horizontalsystems/oneinchkit/decorations/OneInchTransactionDecorator.kt
@@ -98,7 +98,7 @@ class OneInchTransactionDecorator(
             }
 
             is OneInchV4Method -> {
-                return OneInchDecoration(to)
+                return OneInchUnknownDecoration(to, address, value, internalTransactions, eventInstances)
             }
 
             else -> return null

diff --git a/...kit/src/main/java/io/horizontalsystems/oneinchkit/decorations/OneInchUnknownDecoration.kt b/...kit/src/main/java/io/horizontalsystems/oneinchkit/decorations/OneInchUnknownDecoration.kt
@@ -0,0 +1,26 @@
+package io.horizontalsystems.oneinchkit.decorations
+
+import io.horizontalsystems.ethereumkit.contracts.ContractEventInstance
+import io.horizontalsystems.ethereumkit.decorations.UnknownTransactionDecoration
+import io.horizontalsystems.ethereumkit.models.Address
+import io.horizontalsystems.ethereumkit.models.InternalTransaction
+import java.math.BigInteger
+
+class OneInchUnknownDecoration(
+    val contractAddress: Address,
+    private val userAddress: Address,
+    val value: BigInteger,
+    override val internalTransactions: List<InternalTransaction>,
+    override val eventInstances: List<ContractEventInstance>
+) : UnknownTransactionDecoration(userAddress, value, internalTransactions, eventInstances) {
+
+    override fun tags(): List<String> {
+        val tags = super.tags().toMutableList()
+
+        tags.add(contractAddress.hex)
+        tags.add("swap")
+
+        return tags
+    }
+
+}