Add secrets key for Optimism and Arbitrum

horizontalsystems · Aug 1, 2022 · e058aca · e058aca
1 parent 68f75bb
commit e058aca
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 3 deletions.
diff --git a/.github/workflows/deploy_appstore.yml b/.github/workflows/deploy_appstore.yml
@@ -59,6 +59,8 @@ jobs:
           XCCONFIG_PROD_INFURA_PROJECT_ID: ${{ secrets.XCCONFIG_PROD_INFURA_PROJECT_ID }}
           XCCONFIG_PROD_INFURA_PROJECT_SECRET: ${{ secrets.XCCONFIG_PROD_INFURA_PROJECT_SECRET }}
           XCCONFIG_PROD_ETHERSCAN_API_KEY: ${{ secrets.XCCONFIG_PROD_ETHERSCAN_API_KEY }}
+          XCCONFIG_PROD_ARBISCAN_API_KEY: ${{ secrets.XCCONFIG_PROD_ARBISCAN_API_KEY }}
+          XCCONFIG_PROD_OPTIMISM_ETHERSCAN_API_KEY: ${{ secrets.XCCONFIG_PROD_OPTIMISM_ETHERSCAN_API_KEY }}
           XCCONFIG_PROD_BSCSCAN_API_KEY: ${{ secrets.XCCONFIG_PROD_BSCSCAN_API_KEY }}
           XCCONFIG_PROD_POLYGONSCAN_API_KEY: ${{ secrets.XCCONFIG_PROD_POLYGONSCAN_API_KEY }}
           XCCONFIG_PROD_SNOWTRACE_API_KEY: ${{ secrets.XCCONFIG_PROD_SNOWTRACE_API_KEY }}

diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml
@@ -60,6 +60,8 @@ jobs:
           XCCONFIG_DEV_INFURA_PROJECT_ID: ${{ secrets.XCCONFIG_DEV_INFURA_PROJECT_ID }}
           XCCONFIG_DEV_INFURA_PROJECT_SECRET: ${{ secrets.XCCONFIG_DEV_INFURA_PROJECT_SECRET }}
           XCCONFIG_DEV_ETHERSCAN_API_KEY: ${{ secrets.XCCONFIG_DEV_ETHERSCAN_API_KEY }}
+          XCCONFIG_DEV_ARBISCAN_API_KEY: ${{ secrets.XCCONFIG_DEV_ARBISCAN_API_KEY }}
+          XCCONFIG_DEV_OPTIMISM_ETHERSCAN_API_KEY: ${{ secrets.XCCONFIG_DEV_OPTIMISM_ETHERSCAN_API_KEY }}
           XCCONFIG_DEV_BSCSCAN_API_KEY: ${{ secrets.XCCONFIG_DEV_BSCSCAN_API_KEY }}
           XCCONFIG_DEV_POLYGONSCAN_API_KEY: ${{ secrets.XCCONFIG_DEV_POLYGONSCAN_API_KEY }}
           XCCONFIG_DEV_SNOWTRACE_API_KEY: ${{ secrets.XCCONFIG_DEV_SNOWTRACE_API_KEY }}

diff --git a/UnstoppableWallet/UnstoppableWallet/Configuration/Development.template.xcconfig b/UnstoppableWallet/UnstoppableWallet/Configuration/Development.template.xcconfig
@@ -1,6 +1,8 @@
 infura_project_id =
 infura_project_secret =
 etherscan_api_key =
+arbiscan_api_key =
+optimism_etherscan_api_key =
 bscscan_api_key =
 polygonscan_api_key =
 snowtrace_api_key =

diff --git a/UnstoppableWallet/UnstoppableWallet/Configuration/Production.template.xcconfig b/UnstoppableWallet/UnstoppableWallet/Configuration/Production.template.xcconfig
@@ -1,6 +1,8 @@
 infura_project_id =
 infura_project_secret =
 etherscan_api_key =
+arbiscan_api_key =
+optimism_etherscan_api_key =
 bscscan_api_key =
 polygonscan_api_key =
 snowtrace_api_key =

diff --git a/UnstoppableWallet/UnstoppableWallet/Core/Managers/EvmSyncSourceManager.swift b/UnstoppableWallet/UnstoppableWallet/Core/Managers/EvmSyncSourceManager.swift
@@ -71,15 +71,15 @@ class EvmSyncSourceManager {
                 EvmSyncSource(
                         name: "Optimism.io HTTP",
                         rpcSource: .optimismRpcHttp(),
-                        transactionSource: .optimisticEtherscan(apiKey: "")
+                        transactionSource: .optimisticEtherscan(apiKey: appConfigProvider.optimismEtherscanKey)
                 )
             ]
         case .arbitrumOne:
             return [
                 EvmSyncSource(
                         name: "Arbitrum.io HTTP",
                         rpcSource: .arbitrumOneRpcHttp(),
-                        transactionSource: .arbiscan(apiKey: "")
+                        transactionSource: .arbiscan(apiKey: appConfigProvider.arbiscanKey)
                 )
             ]
         default:

diff --git a/UnstoppableWallet/UnstoppableWallet/Core/Providers/AppConfigProvider.swift b/UnstoppableWallet/UnstoppableWallet/Core/Providers/AppConfigProvider.swift
@@ -31,6 +31,14 @@ class AppConfigProvider {
         (Bundle.main.object(forInfoDictionaryKey: "EtherscanApiKey") as? String) ?? ""
     }
 
+    var arbiscanKey: String {
+        (Bundle.main.object(forInfoDictionaryKey: "ArbiscanApiKey") as? String) ?? ""
+    }
+
+    var optimismEtherscanKey: String {
+        (Bundle.main.object(forInfoDictionaryKey: "OptimismEtherscanApiKey") as? String) ?? ""
+    }
+
     var bscscanKey: String {
         (Bundle.main.object(forInfoDictionaryKey: "BscscanApiKey") as? String) ?? ""
     }

diff --git a/UnstoppableWallet/UnstoppableWallet/Info.plist b/UnstoppableWallet/UnstoppableWallet/Info.plist
@@ -41,6 +41,10 @@
 	<string>$(defiyield_api_key)</string>
 	<key>EtherscanApiKey</key>
 	<string>${etherscan_api_key}</string>
+	<key>OptimismEtherscanApiKey</key>
+	<string>${optimism_etherscan_api_key}</string>
+	<key>ArbiscanApiKey</key>
+	<string>${arbiscan_api_key}</string>
 	<key>HsProviderApiKey</key>
 	<string>$(hs_provider_api_key)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>

diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/EvmFee/EvmFeeService.swift b/UnstoppableWallet/UnstoppableWallet/Modules/EvmFee/EvmFeeService.swift
@@ -87,7 +87,8 @@ class EvmFeeService {
     private func transactionSingle(gasPrice: GasPrice, transactionData: TransactionData) -> Single<EvmFeeModule.Transaction> {
         adjustedTransactionDataSingle(gasPrice: gasPrice, transactionData: transactionData).flatMap { [unowned self] transactionData in
             gasDataService.gasDataSingle(gasPrice: gasPrice, transactionData: transactionData).map { [unowned self] estimatedGasData in
-                EvmFeeModule.Transaction(
+                print(estimatedGasData.description)
+                return EvmFeeModule.Transaction(
                         transactionData: transactionData,
                         gasData: estimatedGasData
                 )

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -16,6 +16,8 @@ APP_CENTER_API_TOKEN = ENV["APP_CENTER_API_TOKEN"]
 XCCONFIG_DEV_INFURA_PROJECT_ID = ENV["XCCONFIG_DEV_INFURA_PROJECT_ID"]
 XCCONFIG_DEV_INFURA_PROJECT_SECRET = ENV["XCCONFIG_DEV_INFURA_PROJECT_SECRET"]
 XCCONFIG_DEV_ETHERSCAN_API_KEY = ENV["XCCONFIG_DEV_ETHERSCAN_API_KEY"]
+XCCONFIG_DEV_ARBISCAN_API_KEY = ENV["XCCONFIG_DEV_ARBISCAN_API_KEY"]
+XCCONFIG_DEV_OPTIMISM_ETHERSCAN_API_KEY = ENV["XCCONFIG_DEV_OPTIMISM_ETHERSCAN_API_KEY"]
 XCCONFIG_DEV_BSCSCAN_API_KEY = ENV["XCCONFIG_DEV_BSCSCAN_API_KEY"]
 XCCONFIG_DEV_POLYGONSCAN_API_KEY = ENV["XCCONFIG_DEV_POLYGONSCAN_API_KEY"]
 XCCONFIG_DEV_SNOWTRACE_API_KEY = ENV["XCCONFIG_DEV_SNOWTRACE_API_KEY"]
@@ -28,6 +30,8 @@ XCCONFIG_DEV_WALLET_CONNECT_V2_PROJECT_KEY = ENV["XCCONFIG_DEV_WALLET_CONNECT_V2
 XCCONFIG_PROD_INFURA_PROJECT_ID = ENV["XCCONFIG_PROD_INFURA_PROJECT_ID"]
 XCCONFIG_PROD_INFURA_PROJECT_SECRET = ENV["XCCONFIG_PROD_INFURA_PROJECT_SECRET"]
 XCCONFIG_PROD_ETHERSCAN_API_KEY = ENV["XCCONFIG_PROD_ETHERSCAN_API_KEY"]
+XCCONFIG_PROD_ARBISCAN_API_KEY = ENV["XCCONFIG_PROD_ARBISCAN_API_KEY"]
+XCCONFIG_PROD_OPTIMISM_ETHERSCAN_API_KEY = ENV["XCCONFIG_PROD_OPTIMISM_ETHERSCAN_API_KEY"]
 XCCONFIG_PROD_BSCSCAN_API_KEY = ENV["XCCONFIG_PROD_BSCSCAN_API_KEY"]
 XCCONFIG_PROD_POLYGONSCAN_API_KEY = ENV["XCCONFIG_PROD_POLYGONSCAN_API_KEY"]
 XCCONFIG_PROD_SNOWTRACE_API_KEY = ENV["XCCONFIG_PROD_SNOWTRACE_API_KEY"]
@@ -99,6 +103,8 @@ def apply_dev_xcconfig
   update_dev_xcconfig('infura_project_id', XCCONFIG_DEV_INFURA_PROJECT_ID)
   update_dev_xcconfig('infura_project_secret', XCCONFIG_DEV_INFURA_PROJECT_SECRET)
   update_dev_xcconfig('etherscan_api_key', XCCONFIG_DEV_ETHERSCAN_API_KEY)
+  update_dev_xcconfig('optimism_etherscan_api_key', XCCONFIG_DEV_OPTIMISM_ETHERSCAN_API_KEY)
+  update_dev_xcconfig('arbiscan_api_key', XCCONFIG_DEV_ARBISCAN_API_KEY)
   update_dev_xcconfig('bscscan_api_key', XCCONFIG_DEV_BSCSCAN_API_KEY)
   update_dev_xcconfig('polygonscan_api_key', XCCONFIG_DEV_POLYGONSCAN_API_KEY)
   update_dev_xcconfig('snowtrace_api_key', XCCONFIG_DEV_SNOWTRACE_API_KEY)
@@ -113,6 +119,8 @@ def apply_prod_xcconfig
   update_prod_xcconfig('infura_project_id', XCCONFIG_PROD_INFURA_PROJECT_ID)
   update_prod_xcconfig('infura_project_secret', XCCONFIG_PROD_INFURA_PROJECT_SECRET)
   update_prod_xcconfig('etherscan_api_key', XCCONFIG_PROD_ETHERSCAN_API_KEY)
+  update_dev_xcconfig('arbiscan_api_key', XCCONFIG_PROD_ARBISCAN_API_KEY)
+  update_dev_xcconfig('optimism_etherscan_api_key', XCCONFIG_PROD_OPTIMISM_ETHERSCAN_API_KEY)
   update_prod_xcconfig('bscscan_api_key', XCCONFIG_PROD_BSCSCAN_API_KEY)
   update_prod_xcconfig('polygonscan_api_key', XCCONFIG_PROD_POLYGONSCAN_API_KEY)
   update_prod_xcconfig('snowtrace_api_key', XCCONFIG_PROD_SNOWTRACE_API_KEY)