Add method to get transactions after some hash

horizontalsystems · Jan 21, 2025 · 027165f · 027165f
1 parent 0c770e3
commit 027165f
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 2 deletions.
diff --git a/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/core/EthereumKit.kt b/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/core/EthereumKit.kt
@@ -176,6 +176,10 @@ class EthereumKit(
         return transactionManager.getFullTransactionSingle(hash)
     }
 
+    fun getFullTransactionsAfterSingle(hash: ByteArray?): Single<List<FullTransaction>> {
+        return transactionManager.getFullTransactionsAfterSingle(hash)
+    }
+
     fun estimateGas(to: Address?, value: BigInteger, gasPrice: GasPrice): Single<Long> {
         // without address - provide default gas limit
         if (to == null) {

diff --git a/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/core/Interfaces.kt b/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/core/Interfaces.kt
@@ -82,6 +82,8 @@ interface ITransactionStorage {
 
     fun saveTags(tags: List<TransactionTag>)
     fun getDistinctTokenContractAddresses(): List<String>
+
+    fun getTransactionsAfterSingle(hash: ByteArray?): Single<List<Transaction>>
 }
 
 interface IEip20Storage {

diff --git a/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/core/TransactionManager.kt b/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/core/TransactionManager.kt
@@ -146,6 +146,12 @@ class TransactionManager(
         return fullRpcTransactionSingle.map { decorationManager.decorateFullRpcTransaction(it) }
     }
 
+    fun getFullTransactionsAfterSingle(fromHash: ByteArray? = null): Single<List<FullTransaction>> =
+        storage.getTransactionsAfterSingle(fromHash)
+            .map { transactions ->
+                decorationManager.decorateTransactions(transactions)
+            }
+
     private fun failPendingTransactions(): List<Transaction> {
         val pendingTransactions = storage.getPendingTransactions()
 

diff --git a/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/core/storage/TransactionDao.kt b/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/core/storage/TransactionDao.kt
@@ -19,7 +19,7 @@ interface TransactionDao {
     fun getTransactions(hashes: List<ByteArray>): List<Transaction>
 
     @RawQuery
-    fun getTransactionsBeforeAsync(query: SupportSQLiteQuery): Single<List<Transaction>>
+    fun getTransactionsByRawQuery(query: SupportSQLiteQuery): Single<List<Transaction>>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insert(transactions: List<Transaction>)

diff --git a/...reumkit/src/main/java/io/horizontalsystems/ethereumkit/core/storage/TransactionStorage.kt b/...reumkit/src/main/java/io/horizontalsystems/ethereumkit/core/storage/TransactionStorage.kt
@@ -72,7 +72,7 @@ class TransactionStorage(database: TransactionDatabase) : ITransactionStorage {
                       $limitClause
                       """
 
-        return transactionDao.getTransactionsBeforeAsync(SimpleSQLiteQuery(sqlQuery))
+        return transactionDao.getTransactionsByRawQuery(SimpleSQLiteQuery(sqlQuery))
     }
 
     override fun save(transactions: List<Transaction>) {
@@ -143,4 +143,39 @@ class TransactionStorage(database: TransactionDatabase) : ITransactionStorage {
     override fun getDistinctTokenContractAddresses(): List<String> {
         return tagsDao.getDistinctTokenContractAddresses()
     }
+
+    override fun getTransactionsAfterSingle(hash: ByteArray?): Single<List<Transaction>> {
+        val whereConditions = mutableListOf<String>()
+        hash?.let { transactionDao.getTransaction(hash) }?.let { fromTransaction ->
+            val transactionIndex = fromTransaction.transactionIndex ?: 0
+            val fromCondition = """
+                           (
+                                tx.timestamp > ${fromTransaction.timestamp} OR 
+                                (
+                                    tx.timestamp = ${fromTransaction.timestamp} AND 
+                                    tx.transactionIndex > $transactionIndex
+                                ) OR
+                                (
+                                    tx.timestamp = ${fromTransaction.timestamp} AND
+                                    tx.transactionIndex = $transactionIndex AND
+                                    HEX(tx.hash) > "${fromTransaction.hash.toRawHexString().uppercase()}"
+                                )
+                           )
+                           """
+
+            whereConditions.add(fromCondition)
+        }
+
+        val whereClause = if (whereConditions.isNotEmpty()) "WHERE ${whereConditions.joinToString(" AND ")}" else ""
+        val orderClause = "ORDER BY tx.timestamp, tx.transactionIndex, HEX(tx.hash)"
+
+        val sqlQuery = """
+                      SELECT tx.*
+                      FROM `Transaction` as tx
+                      $whereClause
+                      $orderClause
+                      """
+
+        return transactionDao.getTransactionsByRawQuery(SimpleSQLiteQuery(sqlQuery))
+    }
 }