Switch Etherscan to V2

Author: rafaelekol

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

@@ -468,7 +468,7 @@ class EthereumKit(
             }
 
             val transactionBuilder = TransactionBuilder(address, chain.id)
-            val transactionProvider = transactionProvider(transactionSource, address)
+            val transactionProvider = transactionProvider(transactionSource, address, chain.id)
 
             val apiDatabase = EthereumDatabaseManager.getEthereumApiDatabase(application, walletId, chain)
             val storage = ApiStorage(apiDatabase)
@@ -516,10 +516,10 @@ class EthereumKit(
             EthereumDatabaseManager.clear(context, chain, walletId)
         }
 
-        private fun transactionProvider(transactionSource: TransactionSource, address: Address): ITransactionProvider {
+        private fun transactionProvider(transactionSource: TransactionSource, address: Address, chainId: Int): ITransactionProvider {
             when (transactionSource.type) {
                 is TransactionSource.SourceType.Etherscan -> {
-                    val service = EtherscanService(transactionSource.type.apiBaseUrl, transactionSource.type.apiKeys)
+                    val service = EtherscanService(transactionSource.type.apiBaseUrl, transactionSource.type.apiKeys, chainId)
                     return EtherscanTransactionProvider(service, address)
                 }
             }

ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/models/TransactionSource.kt

@@ -15,7 +15,7 @@ class TransactionSource(val name: String, val type: SourceType) {
         private fun etherscan(apiSubdomain: String, txSubdomain: String?, apiKeys: List<String>): TransactionSource {
             return TransactionSource(
                 "etherscan.io",
-                SourceType.Etherscan("https://$apiSubdomain.etherscan.io", "https://${txSubdomain?.let { "$it." } ?: ""}etherscan.io", apiKeys)
+                SourceType.Etherscan("https://$apiSubdomain.etherscan.io/v2/", "https://${txSubdomain?.let { "$it." } ?: ""}etherscan.io", apiKeys)
             )
         }
 

ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/network/EtherscanService.kt

@@ -20,7 +20,8 @@ import java.util.logging.Logger
 
 class EtherscanService(
     baseUrl: String,
-    private val apiKeys: List<String>
+    private val apiKeys: List<String>,
+    private val chainId: Int,
 ) {
     private val apiKeysSize = apiKeys.size
     private var apiKeyIndex = 0
@@ -43,6 +44,7 @@ class EtherscanService(
 
                 val url = originalUrl.newBuilder()
                     .addQueryParameter("apikey", getNextApiKey())
+                    .addQueryParameter("chainid", chainId.toString())
                     .build()
 
                 val request = originalRequest.newBuilder()
@@ -161,7 +163,7 @@ class EtherscanService(
     }
 
     private interface EtherscanServiceAPI {
-        @GET("/api")
+        @GET("api")
         fun accountApi(
             @Query("module") module: String = "account",
             @Query("action") action: String,