fix: integrate alchemy token env vars for Base

status-im · Jan 20, 2025 · c74a269 · c74a269
1 parent 06f47ae
commit c74a269
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 1 deletion.
diff --git a/src/app_service/service/accounts/dto/wallet_secretes_config.nim b/src/app_service/service/accounts/dto/wallet_secretes_config.nim
@@ -14,6 +14,8 @@ type
     alchemyArbitrumSepoliaToken*: string
     alchemyOptimismMainnetToken*: string
     alchemyOptimismSepoliaToken*: string
+    alchemyBaseMainnetToken*: string
+    alchemyBaseSepoliaToken*: string
     statusProxyStageName*: string
     statusProxyMarketUser*: string
     statusProxyMarketPassword*: string
@@ -34,6 +36,8 @@ proc toJson*(self: WalletSecretsConfig): JsonNode =
     "alchemyArbitrumSepoliaToken": self.alchemyArbitrumSepoliaToken,
     "alchemyOptimismMainnetToken": self.alchemyOptimismMainnetToken,
     "alchemyOptimismSepoliaToken": self.alchemyOptimismSepoliaToken,
+    "alchemyBaseMainnetToken": self.alchemyBaseMainnetToken,
+    "alchemyBaseSepoliaToken": self.alchemyBaseSepoliaToken,
     "statusProxyStageName": self.statusProxyStageName,
     "statusProxyMarketUser": self.statusProxyMarketUser,
     "statusProxyMarketPassword": self.statusProxyMarketPassword,

diff --git a/src/app_service/service/accounts/service.nim b/src/app_service/service/accounts/service.nim
@@ -165,6 +165,8 @@ QtObject:
       alchemyArbitrumSepoliaToken: ALCHEMY_ARBITRUM_SEPOLIA_TOKEN_RESOLVED,
       alchemyOptimismMainnetToken: ALCHEMY_OPTIMISM_MAINNET_TOKEN_RESOLVED,
       alchemyOptimismSepoliaToken: ALCHEMY_OPTIMISM_SEPOLIA_TOKEN_RESOLVED,
+      alchemyBaseMainnetToken: ALCHEMY_BASE_MAINNET_TOKEN_RESOLVED,
+      alchemyBaseSepoliaToken: ALCHEMY_BASE_SEPOLIA_TOKEN_RESOLVED,
       statusProxyStageName: STATUS_PROXY_STAGE_NAME_RESOLVED,
       statusProxyMarketUser: STATUS_PROXY_USER_RESOLVED,
       statusProxyMarketPassword: STATUS_PROXY_PASSWORD_RESOLVED,

diff --git a/src/constants.nim b/src/constants.nim
@@ -51,6 +51,8 @@ let
   ALCHEMY_ARBITRUM_SEPOLIA_TOKEN_RESOLVED* = desktopConfig.alchemyArbitrumSepoliaToken
   ALCHEMY_OPTIMISM_MAINNET_TOKEN_RESOLVED* = desktopConfig.alchemyOptimismMainnetToken
   ALCHEMY_OPTIMISM_SEPOLIA_TOKEN_RESOLVED* = desktopConfig.alchemyOptimismSepoliaToken
+  ALCHEMY_BASE_MAINNET_TOKEN_RESOLVED* = desktopConfig.alchemyBaseMainnetToken
+  ALCHEMY_BASE_SEPOLIA_TOKEN_RESOLVED* = desktopConfig.alchemyBaseSepoliaToken
   OPENSEA_API_KEY_RESOLVED* = desktopConfig.openseaApiKey
   RARIBLE_MAINNET_API_KEY_RESOLVED* = desktopConfig.raribleMainnetApiKey
   RARIBLE_TESTNET_API_KEY_RESOLVED* = desktopConfig.raribleTestnetApiKey

diff --git a/src/env_cli_vars.nim b/src/env_cli_vars.nim
@@ -24,6 +24,8 @@ const BASE_NAME_ALCHEMY_ARBITRUM_MAINNET_TOKEN = "ALCHEMY_ARBITRUM_MAINNET_TOKEN
 const BASE_NAME_ALCHEMY_ARBITRUM_SEPOLIA_TOKEN = "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
 const BASE_NAME_ALCHEMY_OPTIMISM_MAINNET_TOKEN = "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
 const BASE_NAME_ALCHEMY_OPTIMISM_SEPOLIA_TOKEN = "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"
+const BASE_NAME_ALCHEMY_BASE_MAINNET_TOKEN = "ALCHEMY_BASE_MAINNET_TOKEN"
+const BASE_NAME_ALCHEMY_BASE_SEPOLIA_TOKEN = "ALCHEMY_BASE_SEPOLIA_TOKEN"
 const BASE_NAME_TENOR_API_KEY = "TENOR_API_KEY"
 const BASE_NAME_STATUS_PROXY_STAGE_NAME = "PROXY_STAGE_NAME"
 const BASE_NAME_STATUS_PROXY_USER = "PROXY_USER"
@@ -63,6 +65,8 @@ const BUILD_ALCHEMY_ARBITRUM_MAINNET_TOKEN = getEnv(BUILD_TIME_PREFIX & BASE_NAM
 const BUILD_ALCHEMY_ARBITRUM_SEPOLIA_TOKEN = getEnv(BUILD_TIME_PREFIX & BASE_NAME_ALCHEMY_ARBITRUM_SEPOLIA_TOKEN)
 const BUILD_ALCHEMY_OPTIMISM_MAINNET_TOKEN = getEnv(BUILD_TIME_PREFIX & BASE_NAME_ALCHEMY_OPTIMISM_MAINNET_TOKEN)
 const BUILD_ALCHEMY_OPTIMISM_SEPOLIA_TOKEN = getEnv(BUILD_TIME_PREFIX & BASE_NAME_ALCHEMY_OPTIMISM_SEPOLIA_TOKEN)
+const BUILD_ALCHEMY_BASE_MAINNET_TOKEN = getEnv(BUILD_TIME_PREFIX & BASE_NAME_ALCHEMY_BASE_MAINNET_TOKEN)
+const BUILD_ALCHEMY_BASE_SEPOLIA_TOKEN = getEnv(BUILD_TIME_PREFIX & BASE_NAME_ALCHEMY_BASE_SEPOLIA_TOKEN)
 
 const
   DEFAULT_STATUS_PROXY_STAGE_NAME = "test"
@@ -179,6 +183,16 @@ type StatusDesktopConfig = object
     desc: "Sets alchemy optimism sepolia token"
     name: $BASE_NAME_ALCHEMY_OPTIMISM_SEPOLIA_TOKEN
     abbr: "alchemy-optimism-sepolia-token" .}: string
+  alchemyBaseMainnetToken* {.
+    defaultValue: BUILD_ALCHEMY_BASE_MAINNET_TOKEN
+    desc: "Sets alchemy base mainnet token"
+    name: $BASE_NAME_ALCHEMY_BASE_MAINNET_TOKEN
+    abbr: "alchemy-base-mainnet-token" .}: string
+  alchemyBaseSepoliaToken* {.
+    defaultValue: BUILD_ALCHEMY_BASE_SEPOLIA_TOKEN
+    desc: "Sets alchemy base sepolia token"
+    name: $BASE_NAME_ALCHEMY_BASE_SEPOLIA_TOKEN
+    abbr: "alchemy-base-sepolia-token" .}: string
   tenorApiKey* {.
     defaultValue: BUILD_TENOR_API_KEY
     desc: "Sets tenor api key"

diff --git a/ui/app/AppLayouts/Wallet/views/collectibles/CollectibleDetailView.qml b/ui/app/AppLayouts/Wallet/views/collectibles/CollectibleDetailView.qml
@@ -110,7 +110,7 @@ Item {
             }
         }
         onOpenCollectibleExternally: Global.openLinkWithConfirmation(d.collectibleLink, root.walletRootStore.getOpenseaDomainName())
-        onOpenCollectibleOnExplorer: Global.openLinkWithConfirmation(d.blockExplorerLink, root.walletRootStore.getExplorerDomain(networkShortName))
+        onOpenCollectibleOnExplorer: Global.openLinkWithConfirmation(d.blockExplorerLink, Utils.getExplorerDomain(networkShortName))
     }
 
     ColumnLayout {