status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(wallet): cleanup proxy env vars, add proxy stage name

This commit is contained in:
Dario Gabriel Lipicar 2024-08-14 12:40:49 -03:00 committed by dlipicar
parent 9a17498149
commit 8dade32a39
4 changed files with 32 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app_service/service/accounts/dto/wallet_secretes_config.nim
View File

@ -17,6 +17,7 @@ type
alchemyOptimismMainnetToken*: string alchemyOptimismMainnetToken*: string
alchemyOptimismGoerliToken*: string alchemyOptimismGoerliToken*: string
alchemyOptimismSepoliaToken*: string alchemyOptimismSepoliaToken*: string
statusProxyStageName*: string
statusProxyMarketUser*: string statusProxyMarketUser*: string
statusProxyMarketPassword*: string statusProxyMarketPassword*: string
statusProxyBlockchainUser*: string statusProxyBlockchainUser*: string
@ -39,6 +40,7 @@ proc toJson*(self: WalletSecretsConfig): JsonNode =
"alchemyOptimismMainnetToken": self.alchemyOptimismMainnetToken, "alchemyOptimismMainnetToken": self.alchemyOptimismMainnetToken,
"alchemyOptimismGoerliToken": self.alchemyOptimismGoerliToken, "alchemyOptimismGoerliToken": self.alchemyOptimismGoerliToken,
"alchemyOptimismSepoliaToken": self.alchemyOptimismSepoliaToken, "alchemyOptimismSepoliaToken": self.alchemyOptimismSepoliaToken,
"statusProxyStageName": self.statusProxyStageName,
"statusProxyMarketUser": self.statusProxyMarketUser, "statusProxyMarketUser": self.statusProxyMarketUser,
"statusProxyMarketPassword": self.statusProxyMarketPassword, "statusProxyMarketPassword": self.statusProxyMarketPassword,
"statusProxyBlockchainUser": self.statusProxyBlockchainUser, "statusProxyBlockchainUser": self.statusProxyBlockchainUser,

9
src/app_service/service/accounts/service.nim
View File

@ -173,10 +173,11 @@ QtObject:
alchemyOptimismMainnetToken: ALCHEMY_OPTIMISM_MAINNET_TOKEN_RESOLVED, alchemyOptimismMainnetToken: ALCHEMY_OPTIMISM_MAINNET_TOKEN_RESOLVED,
alchemyOptimismGoerliToken: ALCHEMY_OPTIMISM_GOERLI_TOKEN_RESOLVED, alchemyOptimismGoerliToken: ALCHEMY_OPTIMISM_GOERLI_TOKEN_RESOLVED,
alchemyOptimismSepoliaToken: ALCHEMY_OPTIMISM_SEPOLIA_TOKEN_RESOLVED, alchemyOptimismSepoliaToken: ALCHEMY_OPTIMISM_SEPOLIA_TOKEN_RESOLVED,
statusProxyMarketUser: STATUS_PROXY_MARKET_USER_RESOLVED, statusProxyStageName: STATUS_PROXY_STAGE_NAME_RESOLVED,
statusProxyMarketPassword: STATUS_PROXY_MARKET_PASSWORD_RESOLVED, statusProxyMarketUser: STATUS_PROXY_USER_RESOLVED,
statusProxyBlockchainUser: STATUS_PROXY_BLOCKCHAIN_USER_RESOLVED, statusProxyMarketPassword: STATUS_PROXY_PASSWORD_RESOLVED,
statusProxyBlockchainPassword: STATUS_PROXY_BLOCKCHAIN_PASSWORD_RESOLVED, statusProxyBlockchainUser: STATUS_PROXY_USER_RESOLVED,
statusProxyBlockchainPassword: STATUS_PROXY_PASSWORD_RESOLVED,
) )
proc defaultCreateAccountRequest*(): CreateAccountRequest = proc defaultCreateAccountRequest*(): CreateAccountRequest =

7
src/constants.nim
View File

@ -58,10 +58,9 @@ let
RARIBLE_MAINNET_API_KEY_RESOLVED* = desktopConfig.raribleMainnetApiKey RARIBLE_MAINNET_API_KEY_RESOLVED* = desktopConfig.raribleMainnetApiKey
RARIBLE_TESTNET_API_KEY_RESOLVED* = desktopConfig.raribleTestnetApiKey RARIBLE_TESTNET_API_KEY_RESOLVED* = desktopConfig.raribleTestnetApiKey
TENOR_API_KEY_RESOLVED* = desktopConfig.tenorApiKey TENOR_API_KEY_RESOLVED* = desktopConfig.tenorApiKey
STATUS_PROXY_MARKET_USER_RESOLVED* = desktopConfig.statusProxyMarketUser STATUS_PROXY_STAGE_NAME_RESOLVED* = desktopConfig.statusProxyStageName
STATUS_PROXY_MARKET_PASSWORD_RESOLVED* = desktopConfig.statusProxyMarketPassword STATUS_PROXY_USER_RESOLVED* = desktopConfig.statusProxyUser
STATUS_PROXY_BLOCKCHAIN_USER_RESOLVED* = desktopConfig.statusProxyBlockchainUser STATUS_PROXY_PASSWORD_RESOLVED* = desktopConfig.statusProxyPassword
STATUS_PROXY_BLOCKCHAIN_PASSWORD_RESOLVED* = desktopConfig.statusProxyBlockchainPassword
WALLET_CONNECT_PROJECT_ID* = BUILD_WALLET_CONNECT_PROJECT_ID WALLET_CONNECT_PROJECT_ID* = BUILD_WALLET_CONNECT_PROJECT_ID
MIXPANEL_APP_ID* = desktopConfig.mixpanelAppId MIXPANEL_APP_ID* = desktopConfig.mixpanelAppId
MIXPANEL_TOKEN* = desktopConfig.mixpanelToken MIXPANEL_TOKEN* = desktopConfig.mixpanelToken

50
src/env_cli_vars.nim
View File

@ -28,12 +28,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_GOERLI_TOKEN = "ALCHEMY_OPTIMISM_GOERLI_TOKEN"
const BASE_NAME_ALCHEMY_OPTIMISM_SEPOLIA_TOKEN = "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN" const BASE_NAME_ALCHEMY_OPTIMISM_SEPOLIA_TOKEN = "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"
const BASE_NAME_TENOR_API_KEY = "TENOR_API_KEY" 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_USER = "PROXY_USER"
const BASE_NAME_STATUS_PROXY_PASSWORD = "PROXY_PASSWORD" 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_WALLET_CONNECT_PROJECT_ID = "WALLET_CONNECT_PROJECT_ID"
const BASE_NAME_MIXPANEL_APP_ID = "MIXPANEL_APP_ID" const BASE_NAME_MIXPANEL_APP_ID = "MIXPANEL_APP_ID"
const BASE_NAME_MIXPANEL_TOKEN = "MIXPANEL_TOKEN" const BASE_NAME_MIXPANEL_TOKEN = "MIXPANEL_TOKEN"
@ -67,10 +64,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_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_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_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
const BUILD_STATUS_PROXY_BLOCKCHAIN_USER = BUILD_STATUS_PROXY_MARKET_USER DEFAULT_STATUS_PROXY_STAGE_NAME = "test"
const BUILD_STATUS_PROXY_BLOCKCHAIN_PASSWORD = BUILD_STATUS_PROXY_MARKET_PASSWORD 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 const
DEFAULT_TENOR_API_KEY = "DU7DWZ27STB2" DEFAULT_TENOR_API_KEY = "DU7DWZ27STB2"
@ -201,26 +200,21 @@ type StatusDesktopConfig = object
desc: "Sets tenor api key" desc: "Sets tenor api key"
name: $BASE_NAME_TENOR_API_KEY name: $BASE_NAME_TENOR_API_KEY
abbr: "tenor-api-key" .}: string abbr: "tenor-api-key" .}: string
statusProxyMarketUser* {. statusProxyStageName* {.
defaultValue: BUILD_STATUS_PROXY_MARKET_USER defaultValue: BUILD_STATUS_PROXY_STAGE_NAME
desc: "Sets status market proxy username" desc: "Sets status proxy stage name"
name: $BASE_NAME_STATUS_PROXY_MARKET_USER name: $BASE_NAME_STATUS_PROXY_STAGE_NAME
abbr: "status-proxy-market-user" .}: string abbr: "status-proxy-stage-name" .}: string
statusProxyMarketPassword* {. statusProxyUser* {.
defaultValue: BUILD_STATUS_PROXY_MARKET_PASSWORD defaultValue: BUILD_STATUS_PROXY_USER
desc: "Sets status market proxy password" desc: "Sets status proxy username"
name: $BASE_NAME_STATUS_PROXY_MARKET_PASSWORD name: $BASE_NAME_STATUS_PROXY_USER
abbr: "status-proxy-market-password" .}: string abbr: "status-proxy-user" .}: string
statusProxyBlockchainUser* {. statusProxyPassword* {.
defaultValue: BUILD_STATUS_PROXY_BLOCKCHAIN_USER defaultValue: BUILD_STATUS_PROXY_PASSWORD
desc: "Sets status blockhain proxy username" desc: "Sets status proxy password"
name: $BASE_NAME_STATUS_PROXY_BLOCKCHAIN_USER name: $BASE_NAME_STATUS_PROXY_PASSWORD
abbr: "status-proxy-blockchain-user" .}: string abbr: "status-proxy-password" .}: 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
# runtime vars # runtime vars
dataDir* {. dataDir* {.