feat(evm_phase_1): Update EVM Node URLs for Staging (#4129)

blockchain · Nov 21, 2022 · b518e93 · b518e93 · Ameralameri · May 12, 2023
1 parent 225cc4f
commit b518e93
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 1 deletion.
diff --git a/app/build.gradle b/app/build.gradle
@@ -113,6 +113,7 @@ android {
             ]
             buildConfigField "String", "EXPLORER_URL", "\"${buildProperties.secrets['prodExplorer']}\""
             buildConfigField "String", "API_URL", "\"${buildProperties.secrets['prodApiServer']}\""
+            buildConfigField "String", "EVM_NODE_API_URL", "\"${buildProperties.secrets['evmApiServer']}\""
             buildConfigField "String", "EVERYPAY_HOST_URL", "\"${buildProperties.secrets['prodEverypayHost']}\""
             buildConfigField "String", "STATUS_API_URL", "\"${buildProperties.secrets['prodApiStatus']}\""
             buildConfigField "String", "NABU_WEBSOCKET_URL", "\"${buildProperties.secrets['prodNabuWebsocket']}\""
@@ -170,6 +171,7 @@ android {
             ]
             buildConfigField "String", "EXPLORER_URL", "\"${buildProperties.secrets['prodExplorer']}\""
             buildConfigField "String", "API_URL", "\"${buildProperties.secrets['prodApiServer']}\""
+            buildConfigField "String", "EVM_NODE_API_URL", "\"${buildProperties.secrets['evmApiServer']}\""
             buildConfigField "String", "EVERYPAY_HOST_URL", "\"${buildProperties.secrets['prodEverypayHost']}\""
             buildConfigField "String", "STATUS_API_URL", "\"${buildProperties.secrets['prodApiStatus']}\""
             buildConfigField "String", "NABU_WEBSOCKET_URL", "\"${buildProperties.secrets['prodNabuWebsocket']}\""
@@ -228,6 +230,7 @@ android {
             ]
             buildConfigField "String", "EXPLORER_URL", "\"${buildProperties.secrets['stagingExplorer']}\""
             buildConfigField "String", "API_URL", "\"${buildProperties.secrets['stagingApiServer']}\""
+            buildConfigField "String", "EVM_NODE_API_URL", "\"${buildProperties.secrets['evmApiServer']}\""
             buildConfigField "String", "EVERYPAY_HOST_URL", "\"${buildProperties.secrets['stagingEverypayHost']}\""
             buildConfigField "String", "STATUS_API_URL", "\"${buildProperties.secrets['stagingApiStatus']}\""
             buildConfigField "String", "NABU_WEBSOCKET_URL", "\"${buildProperties.secrets['stagingNabuWebsocket']}\""

diff --git a/app/secretsDefaults.properties b/app/secretsDefaults.properties
@@ -5,6 +5,8 @@ stagingExplorer=https://blockchain.info/
 # API URL
 prodApiServer=https://api.blockchain.info/
 stagingApiServer=https://api.blockchain.info/
+# EVM NODE URL
+evmApiServer=https://api.blockchain.info/
 # Bitcoin Websocket URL
 prodBtcWebsocket=wss://ws.blockchain.info/inv
 stagingBtcWebsocket=wss://ws.blockchain.info/inv

diff --git a/app/src/main/java/com/blockchain/koin/modules/properties.kt b/app/src/main/java/com/blockchain/koin/modules/properties.kt
@@ -18,6 +18,7 @@ val urls = mapOf(
     "explorer-api" to BuildConfig.EXPLORER_URL,
     "blockchain-api" to BuildConfig.API_URL,
     "wallet-pubkey-api" to "${BuildConfig.API_URL}wallet-pubkey/",
+    "evm-nodes-api" to BuildConfig.EVM_NODE_API_URL,
     "unified-activity-ws" to "${BuildConfig.UNIFIED_ACTIVITY_WS_URL}",
     "nabu-api" to "${BuildConfig.API_URL}nabu-gateway/",
     "wallet-helper-url" to BuildConfig.WALLET_HELPER_URL,

diff --git a/common/interface/src/main/kotlin/com/blockchain/koin/Qualifiers.kt b/common/interface/src/main/kotlin/com/blockchain/koin/Qualifiers.kt
@@ -42,6 +42,7 @@ val explorerRetrofit = StringQualifier("explorer")
 val everypayRetrofit = StringQualifier("everypay")
 val apiRetrofit = StringQualifier("api")
 val kotlinXApiRetrofit = StringQualifier("kotlinx-api")
+val evmNodesApiRetrofit = StringQualifier("evm-nodes-api")
 val kotlinXCoinApiRetrofit = StringQualifier("kotlinx-coin-api")
 val serializerExplorerRetrofit = StringQualifier("serializer_explorer")
 val gbp = StringQualifier("GBP")

diff --git a/wallet/src/main/java/com/blockchain/koin/walletModule.kt b/wallet/src/main/java/com/blockchain/koin/walletModule.kt
@@ -91,10 +91,25 @@ val walletModule = module {
             .build()
     }
 
+    single(evmNodesApiRetrofit) {
+        val json = Json {
+            explicitNulls = false
+            ignoreUnknownKeys = true
+            isLenient = true
+            encodeDefaults = true
+        }
+        Retrofit.Builder()
+            .baseUrl(getBaseUrl("evm-nodes-api"))
+            .client(get())
+            .addCallAdapterFactory(get<OutcomeCallAdapterFactory>())
+            .addConverterFactory(json.asConverterFactory("application/json".toMediaType()))
+            .build()
+    }
+
     factory {
         EthAccountApi(
             ethEndpoints = get<Retrofit>(apiRetrofit).create(EthEndpoints::class.java),
-            ethNodeEndpoints = get<Retrofit>(kotlinXApiRetrofit).create(EthNodeEndpoints::class.java),
+            ethNodeEndpoints = get<Retrofit>(evmNodesApiRetrofit).create(EthNodeEndpoints::class.java),
             apiCode = getProperty("api-code")
         )
     }