Adjust chain base rpc url

app/src/main/java/io/gnosis/safe/di/modules/ApplicationModule.kt

@@ -150,7 +150,8 @@ class ApplicationModule(private val application: Application) {
         @Named(InterceptorsModule.REST_CLIENT_INTERCEPTORS) interceptors: @JvmSuppressWildcards List<Interceptor>
     ): OkHttpClient =
         okHttpClient.newBuilder().apply {
-            interceptors.forEach {
+            // omit api key interceptor
+            interceptors.subList(1, interceptors.size).forEach {
                 addInterceptor(it)
             }
         }.build()

data/src/main/java/io/gnosis/data/backend/rpc/RpcClient.kt

@@ -8,6 +8,7 @@ import io.gnosis.contracts.GnosisSafe_v1_3_0
 import io.gnosis.data.backend.rpc.models.EstimationParams
 import io.gnosis.data.models.Chain
 import io.gnosis.data.models.Safe
+import io.gnosis.data.models.baseRpcUrl
 import io.gnosis.data.models.transaction.DetailedExecutionInfo
 import io.gnosis.data.models.transaction.TxData
 import io.gnosis.data.utils.SemVer
@@ -38,7 +39,7 @@ class RpcClient(
 ) {
 
     fun updateRpcUrl(chain: Chain) {
-        ethereumRepository.rpcUrl = chain.rpcUri
+        ethereumRepository.rpcUrl = chain.baseRpcUrl()
     }
 
     suspend fun gasPrice(): BigInteger? {

data/src/main/java/io/gnosis/data/models/Chain.kt

@@ -1,11 +1,16 @@
 package io.gnosis.data.models
 
-import androidx.room.*
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.Ignore
+import androidx.room.PrimaryKey
 import io.gnosis.data.BuildConfig
 import io.gnosis.data.models.Chain.Companion.TABLE_NAME
 import pm.gnosis.utils.nullOnThrow
 import java.io.Serializable
 import java.math.BigInteger
+import java.net.URI
 
 @Entity(tableName = TABLE_NAME)
 data class Chain(
@@ -140,3 +145,11 @@ data class Chain(
         }
     }
 }
+
+fun Chain.baseRpcUrl(): String {
+    return if (rpcAuthentication == RpcAuthentication.API_KEY_PATH) {
+        URI.create(rpcUri).resolve(BuildConfig.INFURA_API_KEY).toString()
+    } else {
+        rpcUri
+    }
+}

data/src/main/java/io/gnosis/data/repositories/EnsRepository.kt

@@ -2,6 +2,7 @@ package io.gnosis.data.repositories
 
 import io.gnosis.contracts.BuildConfig
 import io.gnosis.data.models.Chain
+import io.gnosis.data.models.baseRpcUrl
 import pm.gnosis.crypto.utils.Sha3Utils
 import pm.gnosis.ethereum.Block
 import pm.gnosis.ethereum.EthCall
@@ -24,7 +25,7 @@ class EnsRepository(
 
     suspend fun resolve(url: String, chain: Chain): Solidity.Address {
 
-        ethereumRepository.rpcUrl = chain.rpcUri
+        ethereumRepository.rpcUrl = chain.baseRpcUrl()
 
         val node = ensNormalizer.normalize(url).nameHash()
 

data/src/test/java/io/gnosis/data/repositories/EnsRepositoryTest.kt

@@ -1,7 +1,14 @@
 package io.gnosis.data.repositories
 
 import io.gnosis.data.models.Chain
-import io.mockk.*
+import io.mockk.Called
+import io.mockk.Runs
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.coVerifySequence
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertTrue
 import org.junit.Before