From cdd36fc9971edc361d172556352a53ad254fbf3a Mon Sep 17 00:00:00 2001 From: Dario Gabriel Lipicar Date: Wed, 14 Aug 2024 12:40:49 -0300 Subject: [PATCH] feat(wallet): cleanup proxy env vars, add proxy stage name --- src/app_service/common/network_constants.nim | 24 ++++----- .../accounts/dto/wallet_secretes_config.nim | 2 + src/app_service/service/accounts/service.nim | 9 ++-- src/constants.nim | 7 ++- src/env_cli_vars.nim | 50 ++++++++----------- 5 files changed, 44 insertions(+), 48 deletions(-) diff --git a/src/app_service/common/network_constants.nim b/src/app_service/common/network_constants.nim index c3038bd4ea..59e35b1a89 100644 --- a/src/app_service/common/network_constants.nim +++ b/src/app_service/common/network_constants.nim @@ -8,8 +8,8 @@ var NETWORKS* = %* [ { "chainId": 1, "chainName": "Mainnet", - "defaultRpcUrl": fmt"https://{BUILD_MODE}.{STATUS_PROXY_HOST}/grove/ethereum/mainnet/{POKT_TOKEN_RESOLVED}", - "defaultFallbackUrl": fmt"https://{BUILD_MODE}.{STATUS_PROXY_HOST}/infura/ethereum/mainnet/{INFURA_TOKEN_RESOLVED}", + "defaultRpcUrl": fmt"https://{STATUS_PROXY_STAGE_NAME_RESOLVED}.{STATUS_PROXY_HOST}/grove/ethereum/mainnet/{POKT_TOKEN_RESOLVED}", + "defaultFallbackUrl": fmt"https://{STATUS_PROXY_STAGE_NAME_RESOLVED}.{STATUS_PROXY_HOST}/infura/ethereum/mainnet/{INFURA_TOKEN_RESOLVED}", "rpcUrl": "https://eth-archival.rpc.grove.city/v1/" & POKT_TOKEN_RESOLVED, "fallbackUrl": "https://mainnet.infura.io/v3/" & INFURA_TOKEN_RESOLVED, "blockExplorerUrl": "https://etherscan.io/", @@ -44,8 +44,8 @@ var NETWORKS* = %* [ { "chainId": 10, "chainName": "Optimism", - "defaultRpcUrl": fmt"https://{BUILD_MODE}.{STATUS_PROXY_HOST}/grove/optimism/mainnet/{POKT_TOKEN_RESOLVED}", - "defaultFallbackUrl": fmt"https://{BUILD_MODE}.{STATUS_PROXY_HOST}/infura/optimism/mainnet/{INFURA_TOKEN_RESOLVED}", + "defaultRpcUrl": fmt"https://{STATUS_PROXY_STAGE_NAME_RESOLVED}.{STATUS_PROXY_HOST}/grove/optimism/mainnet/{POKT_TOKEN_RESOLVED}", + "defaultFallbackUrl": fmt"https://{STATUS_PROXY_STAGE_NAME_RESOLVED}.{STATUS_PROXY_HOST}/infura/optimism/mainnet/{INFURA_TOKEN_RESOLVED}", "rpcUrl": "https://optimism-archival.rpc.grove.city/v1/" & POKT_TOKEN_RESOLVED, "fallbackUrl": "https://optimism-mainnet.infura.io/v3/" & INFURA_TOKEN_RESOLVED, "blockExplorerUrl": "https://optimistic.etherscan.io", @@ -80,8 +80,8 @@ var NETWORKS* = %* [ { "chainId": 42161, "chainName": "Arbitrum", - "defaultRpcUrl": fmt"https://{BUILD_MODE}.{STATUS_PROXY_HOST}/grove/arbitrum/mainnet/{POKT_TOKEN_RESOLVED}", - "defaultFallbackUrl": fmt"https://{BUILD_MODE}.{STATUS_PROXY_HOST}/infura/arbitrum/mainnet/{INFURA_TOKEN_RESOLVED}", + "defaultRpcUrl": fmt"https://{STATUS_PROXY_STAGE_NAME_RESOLVED}.{STATUS_PROXY_HOST}/grove/arbitrum/mainnet/{POKT_TOKEN_RESOLVED}", + "defaultFallbackUrl": fmt"https://{STATUS_PROXY_STAGE_NAME_RESOLVED}.{STATUS_PROXY_HOST}/infura/arbitrum/mainnet/{INFURA_TOKEN_RESOLVED}", "rpcUrl": "https://arbitrum-one.rpc.grove.city/v1/" & POKT_TOKEN_RESOLVED, "fallbackUrl": "https://arbitrum-mainnet.infura.io/v3/" & INFURA_TOKEN_RESOLVED, "blockExplorerUrl": "https://arbiscan.io/", @@ -116,8 +116,8 @@ var NETWORKS* = %* [ { "chainId": 11155111, "chainName": "Mainnet", - "defaultRpcUrl": fmt"https://{BUILD_MODE}.{STATUS_PROXY_HOST}/grove/ethereum/sepolia/{POKT_TOKEN_RESOLVED}", - "defaultFallbackUrl": fmt"https://{BUILD_MODE}.{STATUS_PROXY_HOST}/infura/ethereum/sepolia/{INFURA_TOKEN_RESOLVED}", + "defaultRpcUrl": fmt"https://{STATUS_PROXY_STAGE_NAME_RESOLVED}.{STATUS_PROXY_HOST}/grove/ethereum/sepolia/{POKT_TOKEN_RESOLVED}", + "defaultFallbackUrl": fmt"https://{STATUS_PROXY_STAGE_NAME_RESOLVED}.{STATUS_PROXY_HOST}/infura/ethereum/sepolia/{INFURA_TOKEN_RESOLVED}", "rpcUrl": "https://sepolia-archival.rpc.grove.city/v1/" & POKT_TOKEN_RESOLVED, "fallbackUrl": "https://sepolia.infura.io/v3/" & INFURA_TOKEN_RESOLVED, "blockExplorerUrl": "https://sepolia.etherscan.io/", @@ -135,8 +135,8 @@ var NETWORKS* = %* [ { "chainId": 11155420, "chainName": "Optimism", - "defaultRpcUrl": fmt"https://{BUILD_MODE}.{STATUS_PROXY_HOST}/grove/optimism/sepolia/{POKT_TOKEN_RESOLVED}", - "defaultFallbackUrl": fmt"https://{BUILD_MODE}.{STATUS_PROXY_HOST}/infura/optimism/sepolia/{INFURA_TOKEN_RESOLVED}", + "defaultRpcUrl": fmt"https://{STATUS_PROXY_STAGE_NAME_RESOLVED}.{STATUS_PROXY_HOST}/grove/optimism/sepolia/{POKT_TOKEN_RESOLVED}", + "defaultFallbackUrl": fmt"https://{STATUS_PROXY_STAGE_NAME_RESOLVED}.{STATUS_PROXY_HOST}/infura/optimism/sepolia/{INFURA_TOKEN_RESOLVED}", "rpcUrl": "https://optimism-sepolia-archival.rpc.grove.city/v1/" & POKT_TOKEN_RESOLVED, "fallbackUrl": "https://optimism-sepolia.infura.io/v3/" & INFURA_TOKEN_RESOLVED, "blockExplorerUrl": "https://sepolia-optimism.etherscan.io/", @@ -154,8 +154,8 @@ var NETWORKS* = %* [ { "chainId": 421614, "chainName": "Arbitrum", - "defaultRpcUrl": fmt"https://{BUILD_MODE}.{STATUS_PROXY_HOST}/grove/arbitrum/sepolia/{POKT_TOKEN_RESOLVED}", - "defaultFallbackUrl": fmt"https://{BUILD_MODE}.{STATUS_PROXY_HOST}/infura/arbitrum/sepolia/{INFURA_TOKEN_RESOLVED}", + "defaultRpcUrl": fmt"https://{STATUS_PROXY_STAGE_NAME_RESOLVED}.{STATUS_PROXY_HOST}/grove/arbitrum/sepolia/{POKT_TOKEN_RESOLVED}", + "defaultFallbackUrl": fmt"https://{STATUS_PROXY_STAGE_NAME_RESOLVED}.{STATUS_PROXY_HOST}/infura/arbitrum/sepolia/{INFURA_TOKEN_RESOLVED}", "rpcUrl": "https://arbitrum-sepolia-archival.rpc.grove.city/v1/" & POKT_TOKEN_RESOLVED, "fallbackUrl": "https://arbitrum-sepolia.infura.io/v3/" & INFURA_TOKEN_RESOLVED, "blockExplorerUrl": "https://sepolia-explorer.arbitrum.io/", diff --git a/src/app_service/service/accounts/dto/wallet_secretes_config.nim b/src/app_service/service/accounts/dto/wallet_secretes_config.nim index 8bd156b6a4..b656b5d79b 100644 --- a/src/app_service/service/accounts/dto/wallet_secretes_config.nim +++ b/src/app_service/service/accounts/dto/wallet_secretes_config.nim @@ -17,6 +17,7 @@ type alchemyOptimismMainnetToken*: string alchemyOptimismGoerliToken*: string alchemyOptimismSepoliaToken*: string + statusProxyStageName*: string statusProxyMarketUser*: string statusProxyMarketPassword*: string statusProxyBlockchainUser*: string @@ -39,6 +40,7 @@ proc toJson*(self: WalletSecretsConfig): JsonNode = "alchemyOptimismMainnetToken": self.alchemyOptimismMainnetToken, "alchemyOptimismGoerliToken": self.alchemyOptimismGoerliToken, "alchemyOptimismSepoliaToken": self.alchemyOptimismSepoliaToken, + "statusProxyStageName": self.statusProxyStageName, "statusProxyMarketUser": self.statusProxyMarketUser, "statusProxyMarketPassword": self.statusProxyMarketPassword, "statusProxyBlockchainUser": self.statusProxyBlockchainUser, diff --git a/src/app_service/service/accounts/service.nim b/src/app_service/service/accounts/service.nim index ee89592acc..1707eab982 100644 --- a/src/app_service/service/accounts/service.nim +++ b/src/app_service/service/accounts/service.nim @@ -219,10 +219,11 @@ QtObject: alchemyOptimismMainnetToken: ALCHEMY_OPTIMISM_MAINNET_TOKEN_RESOLVED, alchemyOptimismGoerliToken: ALCHEMY_OPTIMISM_GOERLI_TOKEN_RESOLVED, alchemyOptimismSepoliaToken: ALCHEMY_OPTIMISM_SEPOLIA_TOKEN_RESOLVED, - statusProxyMarketUser: STATUS_PROXY_MARKET_USER_RESOLVED, - statusProxyMarketPassword: STATUS_PROXY_MARKET_PASSWORD_RESOLVED, - statusProxyBlockchainUser: STATUS_PROXY_BLOCKCHAIN_USER_RESOLVED, - statusProxyBlockchainPassword: STATUS_PROXY_BLOCKCHAIN_PASSWORD_RESOLVED, + statusProxyStageName: STATUS_PROXY_STAGE_NAME_RESOLVED, + statusProxyMarketUser: STATUS_PROXY_USER_RESOLVED, + statusProxyMarketPassword: STATUS_PROXY_PASSWORD_RESOLVED, + statusProxyBlockchainUser: STATUS_PROXY_USER_RESOLVED, + statusProxyBlockchainPassword: STATUS_PROXY_PASSWORD_RESOLVED, ) proc buildCreateAccountRequest(self: Service, password: string, displayName: string, imagePath: string, imageCropRectangle: ImageCropRectangle): CreateAccountRequest = diff --git a/src/constants.nim b/src/constants.nim index 8e767ebce7..4edc6eb635 100644 --- a/src/constants.nim +++ b/src/constants.nim @@ -62,10 +62,9 @@ let RARIBLE_MAINNET_API_KEY_RESOLVED* = desktopConfig.raribleMainnetApiKey RARIBLE_TESTNET_API_KEY_RESOLVED* = desktopConfig.raribleTestnetApiKey TENOR_API_KEY_RESOLVED* = desktopConfig.tenorApiKey - STATUS_PROXY_MARKET_USER_RESOLVED* = desktopConfig.statusProxyMarketUser - STATUS_PROXY_MARKET_PASSWORD_RESOLVED* = desktopConfig.statusProxyMarketPassword - STATUS_PROXY_BLOCKCHAIN_USER_RESOLVED* = desktopConfig.statusProxyBlockchainUser - STATUS_PROXY_BLOCKCHAIN_PASSWORD_RESOLVED* = desktopConfig.statusProxyBlockchainPassword + STATUS_PROXY_STAGE_NAME_RESOLVED* = desktopConfig.statusProxyStageName + STATUS_PROXY_USER_RESOLVED* = desktopConfig.statusProxyUser + STATUS_PROXY_PASSWORD_RESOLVED* = desktopConfig.statusProxyPassword WALLET_CONNECT_PROJECT_ID* = BUILD_WALLET_CONNECT_PROJECT_ID MIXPANEL_APP_ID* = desktopConfig.mixpanelAppId MIXPANEL_TOKEN* = desktopConfig.mixpanelToken diff --git a/src/env_cli_vars.nim b/src/env_cli_vars.nim index 177f602ce6..3a9ca4ed7d 100644 --- a/src/env_cli_vars.nim +++ b/src/env_cli_vars.nim @@ -26,12 +26,9 @@ const BASE_NAME_ALCHEMY_OPTIMISM_MAINNET_TOKEN = "ALCHEMY_OPTIMISM_MAINNET_TOKEN const BASE_NAME_ALCHEMY_OPTIMISM_GOERLI_TOKEN = "ALCHEMY_OPTIMISM_GOERLI_TOKEN" const BASE_NAME_ALCHEMY_OPTIMISM_SEPOLIA_TOKEN = "ALCHEMY_OPTIMISM_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" const BASE_NAME_STATUS_PROXY_PASSWORD = "PROXY_PASSWORD" -const BASE_NAME_STATUS_PROXY_MARKET_USER = "PROXY_MARKET_USER" -const BASE_NAME_STATUS_PROXY_MARKET_PASSWORD = "PROXY_MARKET_PASSWORD" -const BASE_NAME_STATUS_PROXY_BLOCKCHAIN_USER = "PROXY_BLOCKCHAIN_USER" -const BASE_NAME_STATUS_PROXY_BLOCKCHAIN_PASSWORD = "PROXY_BLOCKCHAIN_PASSWORD" const BASE_NAME_WALLET_CONNECT_PROJECT_ID = "WALLET_CONNECT_PROJECT_ID" const BASE_NAME_MIXPANEL_APP_ID = "MIXPANEL_APP_ID" const BASE_NAME_MIXPANEL_TOKEN = "MIXPANEL_TOKEN" @@ -65,10 +62,12 @@ const BUILD_ALCHEMY_ARBITRUM_SEPOLIA_TOKEN = getEnv(BUILD_TIME_PREFIX & BASE_NAM const BUILD_ALCHEMY_OPTIMISM_MAINNET_TOKEN = getEnv(BUILD_TIME_PREFIX & BASE_NAME_ALCHEMY_OPTIMISM_MAINNET_TOKEN) const BUILD_ALCHEMY_OPTIMISM_GOERLI_TOKEN = getEnv(BUILD_TIME_PREFIX & BASE_NAME_ALCHEMY_OPTIMISM_GOERLI_TOKEN) const BUILD_ALCHEMY_OPTIMISM_SEPOLIA_TOKEN = getEnv(BUILD_TIME_PREFIX & BASE_NAME_ALCHEMY_OPTIMISM_SEPOLIA_TOKEN) -const BUILD_STATUS_PROXY_MARKET_USER = getEnv(BUILD_TIME_PREFIX & BASE_NAME_STATUS_PROXY_USER) -const BUILD_STATUS_PROXY_MARKET_PASSWORD = getEnv(BUILD_TIME_PREFIX & BASE_NAME_STATUS_PROXY_PASSWORD) -const BUILD_STATUS_PROXY_BLOCKCHAIN_USER = BUILD_STATUS_PROXY_MARKET_USER -const BUILD_STATUS_PROXY_BLOCKCHAIN_PASSWORD = BUILD_STATUS_PROXY_MARKET_PASSWORD + +const + DEFAULT_STATUS_PROXY_STAGE_NAME = "test" + BUILD_STATUS_PROXY_STAGE_NAME = getEnv(BUILD_TIME_PREFIX & BASE_NAME_STATUS_PROXY_STAGE_NAME, DEFAULT_STATUS_PROXY_STAGE_NAME) +const BUILD_STATUS_PROXY_USER = getEnv(BUILD_TIME_PREFIX & BASE_NAME_STATUS_PROXY_USER) +const BUILD_STATUS_PROXY_PASSWORD = getEnv(BUILD_TIME_PREFIX & BASE_NAME_STATUS_PROXY_PASSWORD) const DEFAULT_TENOR_API_KEY = "DU7DWZ27STB2" @@ -199,26 +198,21 @@ type StatusDesktopConfig = object desc: "Sets tenor api key" name: $BASE_NAME_TENOR_API_KEY abbr: "tenor-api-key" .}: string - statusProxyMarketUser* {. - defaultValue: BUILD_STATUS_PROXY_MARKET_USER - desc: "Sets status market proxy username" - name: $BASE_NAME_STATUS_PROXY_MARKET_USER - abbr: "status-proxy-market-user" .}: string - statusProxyMarketPassword* {. - defaultValue: BUILD_STATUS_PROXY_MARKET_PASSWORD - desc: "Sets status market proxy password" - name: $BASE_NAME_STATUS_PROXY_MARKET_PASSWORD - abbr: "status-proxy-market-password" .}: string - statusProxyBlockchainUser* {. - defaultValue: BUILD_STATUS_PROXY_BLOCKCHAIN_USER - desc: "Sets status blockhain proxy username" - name: $BASE_NAME_STATUS_PROXY_BLOCKCHAIN_USER - abbr: "status-proxy-blockchain-user" .}: string - statusProxyBlockchainPassword* {. - defaultValue: BUILD_STATUS_PROXY_BLOCKCHAIN_PASSWORD - desc: "Sets status blockchain proxy password" - name: $BASE_NAME_STATUS_PROXY_BLOCKCHAIN_PASSWORD - abbr: "status-proxy-blockchain-password" .}: string + statusProxyStageName* {. + defaultValue: BUILD_STATUS_PROXY_STAGE_NAME + desc: "Sets status proxy stage name" + name: $BASE_NAME_STATUS_PROXY_STAGE_NAME + abbr: "status-proxy-stage-name" .}: string + statusProxyUser* {. + defaultValue: BUILD_STATUS_PROXY_USER + desc: "Sets status proxy username" + name: $BASE_NAME_STATUS_PROXY_USER + abbr: "status-proxy-user" .}: string + statusProxyPassword* {. + defaultValue: BUILD_STATUS_PROXY_PASSWORD + desc: "Sets status proxy password" + name: $BASE_NAME_STATUS_PROXY_PASSWORD + abbr: "status-proxy-password" .}: string # runtime vars dataDir* {.