Merge pull request #69 from horizontalsystems/gas-limit

Enhancements

Author: rafaelekol

erc20kit/src/main/java/io/horizontalsystems/erc20kit/core/Erc20DatabaseManager.kt

@@ -9,7 +9,7 @@ import java.io.File
 internal object Erc20DatabaseManager {
 
     fun getErc20Database(context: Context, contractAddress: String): Erc20KitDatabase {
-        val databaseName = "erc20-$contractAddress"
+        val databaseName = "Erc20-$contractAddress"
         return Erc20KitDatabase.getInstance(context, databaseName).also { addDatabasePath(context, it) }
     }
 

erc20kit/src/main/java/io/horizontalsystems/erc20kit/core/Erc20Kit.kt

@@ -18,7 +18,9 @@ class Erc20Kit(private val ethereumKit: EthereumKit,
                private val balanceManager: IBalanceManager,
                private val state: KitState = KitState()) : ITransactionManagerListener, IBalanceManagerListener {
 
-    private val gasLimit: Long = 100_000
+    private val gasLimit: Long = 150_000
+    private val estimateGasLimit: Long = 100_000
+
     private val disposables = CompositeDisposable()
 
     sealed class SyncState {
@@ -57,7 +59,7 @@ class Erc20Kit(private val ethereumKit: EthereumKit,
         get() = state.balance
 
     fun fee(gasPrice: Long): BigDecimal {
-        return BigDecimal(gasPrice).multiply(gasLimit.toBigDecimal())
+        return BigDecimal(gasPrice).multiply(estimateGasLimit.toBigDecimal())
     }
 
     fun send(to: String, value: String, gasPrice: Long): Single<TransactionInfo> {

ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/core/EthereumDatabaseManager.kt

@@ -10,12 +10,12 @@ import java.io.File
 internal object EthereumDatabaseManager {
 
     fun getEthereumApiDatabase(context: Context, walletId: String, networkType: EthereumKit.NetworkType): ApiDatabase {
-        val databaseName = "api-$walletId-${networkType.name}"
+        val databaseName = "Ethereum-$walletId-${networkType.name}-api"
         return ApiDatabase.getInstance(context, databaseName).also { addDatabasePath(context, it) }
     }
 
     fun getEthereumSpvDatabase(context: Context, walletId: String, networkType: EthereumKit.NetworkType): SPVDatabase {
-        val databaseName = "spv-$walletId-${networkType.name}"
+        val databaseName = "Ethereum-$walletId-${networkType.name}-spv"
         return SPVDatabase.getInstance(context, databaseName).also { addDatabasePath(context, it) }
     }