From 4bcbee25e13cdda2f5e23ea53a05be1aca3005c5 Mon Sep 17 00:00:00 2001 From: Dario Gabriel Lipicar Date: Fri, 11 Jul 2025 15:34:08 -0300 Subject: [PATCH] chore: use single alchemy api key for all chains --- resources/node-config.json | 2 +- .../accounts/dto/wallet_secretes_config.nim | 18 +----- src/app_service/service/accounts/service.nim | 9 +-- src/constants.nim | 9 +-- src/env_cli_vars.nim | 63 +++---------------- vendor/status-go | 2 +- 6 files changed, 13 insertions(+), 90 deletions(-) diff --git a/resources/node-config.json b/resources/node-config.json index c6fec1a057..66f05ebe1d 100644 --- a/resources/node-config.json +++ b/resources/node-config.json @@ -77,7 +77,7 @@ "OpenseaAPIKey": "", "RaribleMainnetAPIKey": "", "RaribleTestnetAPIKey": "", - "AlchemyAPIKeys": {}, + "AlchemyAPIKey": "", "InfuraAPIKey": "", "InfuraAPIKeySecret": "" }, 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 8676b51ee6..27cd27926d 100644 --- a/src/app_service/service/accounts/dto/wallet_secretes_config.nim +++ b/src/app_service/service/accounts/dto/wallet_secretes_config.nim @@ -8,14 +8,7 @@ type openseaApiKey*: string raribleMainnetApiKey*: string raribleTestnetApiKey*: string - alchemyEthereumMainnetToken*: string - alchemyEthereumSepoliaToken*: string - alchemyArbitrumMainnetToken*: string - alchemyArbitrumSepoliaToken*: string - alchemyOptimismMainnetToken*: string - alchemyOptimismSepoliaToken*: string - alchemyBaseMainnetToken*: string - alchemyBaseSepoliaToken*: string + alchemyApiKey*: string statusProxyStageName*: string statusProxyMarketUser*: string statusProxyMarketPassword*: string @@ -36,14 +29,7 @@ proc toJson*(self: WalletSecretsConfig): JsonNode = "openseaApiKey": self.openseaApiKey, "raribleMainnetApiKey": self.raribleMainnetApiKey, "raribleTestnetApiKey": self.raribleTestnetApiKey, - "alchemyEthereumMainnetToken": self.alchemyEthereumMainnetToken, - "alchemyEthereumSepoliaToken": self.alchemyEthereumSepoliaToken, - "alchemyArbitrumMainnetToken": self.alchemyArbitrumMainnetToken, - "alchemyArbitrumSepoliaToken": self.alchemyArbitrumSepoliaToken, - "alchemyOptimismMainnetToken": self.alchemyOptimismMainnetToken, - "alchemyOptimismSepoliaToken": self.alchemyOptimismSepoliaToken, - "alchemyBaseMainnetToken": self.alchemyBaseMainnetToken, - "alchemyBaseSepoliaToken": self.alchemyBaseSepoliaToken, + "alchemyApiKey": self.alchemyApiKey, "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 index 171e1f4f85..8de589556f 100644 --- a/src/app_service/service/accounts/service.nim +++ b/src/app_service/service/accounts/service.nim @@ -154,14 +154,7 @@ QtObject: openseaApiKey: OPENSEA_API_KEY_RESOLVED, raribleMainnetApiKey: RARIBLE_MAINNET_API_KEY_RESOLVED, raribleTestnetApiKey: RARIBLE_TESTNET_API_KEY_RESOLVED, - alchemyEthereumMainnetToken: ALCHEMY_ETHEREUM_MAINNET_TOKEN_RESOLVED, - alchemyEthereumSepoliaToken: ALCHEMY_ETHEREUM_SEPOLIA_TOKEN_RESOLVED, - alchemyArbitrumMainnetToken: ALCHEMY_ARBITRUM_MAINNET_TOKEN_RESOLVED, - 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, + alchemyApiKey: ALCHEMY_API_KEY_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 index 09687f5b1c..bf36416e3d 100644 --- a/src/constants.nim +++ b/src/constants.nim @@ -48,14 +48,7 @@ let POKT_TOKEN_RESOLVED* = desktopConfig.poktToken INFURA_TOKEN_RESOLVED* = desktopConfig.infuraToken INFURA_TOKEN_SECRET_RESOLVED* = desktopConfig.infuraTokenSecret - ALCHEMY_ETHEREUM_MAINNET_TOKEN_RESOLVED* = desktopConfig.alchemyEthereumMainnetToken - ALCHEMY_ETHEREUM_SEPOLIA_TOKEN_RESOLVED* = desktopConfig.alchemyEthereumSepoliaToken - ALCHEMY_ARBITRUM_MAINNET_TOKEN_RESOLVED* = desktopConfig.alchemyArbitrumMainnetToken - 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 + ALCHEMY_API_KEY_RESOLVED* = desktopConfig.alchemyApiKey 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 index b0c7579f93..08d64ea1b1 100644 --- a/src/env_cli_vars.nim +++ b/src/env_cli_vars.nim @@ -18,14 +18,7 @@ const BASE_NAME_POKT_TOKEN = "POKT_TOKEN" const BASE_NAME_OPENSEA_API_KEY = "OPENSEA_API_KEY" const BASE_NAME_RARIBLE_MAINNET_API_KEY = "RARIBLE_MAINNET_API_KEY" const BASE_NAME_RARIBLE_TESTNET_API_KEY = "RARIBLE_TESTNET_API_KEY" -const BASE_NAME_ALCHEMY_ETHEREUM_MAINNET_TOKEN = "ALCHEMY_ETHEREUM_MAINNET_TOKEN" -const BASE_NAME_ALCHEMY_ETHEREUM_SEPOLIA_TOKEN = "ALCHEMY_ETHEREUM_SEPOLIA_TOKEN" -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_ALCHEMY_API_KEY = "ALCHEMY_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" @@ -67,14 +60,7 @@ const const BUILD_OPENSEA_API_KEY = getEnv(BUILD_TIME_PREFIX & BASE_NAME_OPENSEA_API_KEY) const BUILD_RARIBLE_MAINNET_API_KEY = getEnv(BUILD_TIME_PREFIX & BASE_NAME_RARIBLE_MAINNET_API_KEY) const BUILD_RARIBLE_TESTNET_API_KEY = getEnv(BUILD_TIME_PREFIX & BASE_NAME_RARIBLE_TESTNET_API_KEY) -const BUILD_ALCHEMY_ETHEREUM_MAINNET_TOKEN = getEnv(BUILD_TIME_PREFIX & BASE_NAME_ALCHEMY_ETHEREUM_MAINNET_TOKEN) -const BUILD_ALCHEMY_ETHEREUM_SEPOLIA_TOKEN = getEnv(BUILD_TIME_PREFIX & BASE_NAME_ALCHEMY_ETHEREUM_SEPOLIA_TOKEN) -const BUILD_ALCHEMY_ARBITRUM_MAINNET_TOKEN = getEnv(BUILD_TIME_PREFIX & BASE_NAME_ALCHEMY_ARBITRUM_MAINNET_TOKEN) -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 BUILD_ALCHEMY_API_KEY = getEnv(BUILD_TIME_PREFIX & BASE_NAME_ALCHEMY_API_KEY) const DEFAULT_STATUS_PROXY_STAGE_NAME = "test" @@ -169,46 +155,11 @@ type StatusDesktopConfig = object desc: "Sets rarible testnet api key" name: $BASE_NAME_RARIBLE_TESTNET_API_KEY abbr: "rarible-testnet-api-key" .}: string - alchemyEthereumMainnetToken* {. - defaultValue: BUILD_ALCHEMY_ETHEREUM_MAINNET_TOKEN - desc: "Sets alchemy ethereum mainnet token" - name: $BASE_NAME_ALCHEMY_ETHEREUM_MAINNET_TOKEN - abbr: "alchemy-ethereum-mainnet-token" .}: string - alchemyEthereumSepoliaToken* {. - defaultValue: BUILD_ALCHEMY_ETHEREUM_SEPOLIA_TOKEN - desc: "Sets alchemy ethereum sepolia token" - name: $BASE_NAME_ALCHEMY_ETHEREUM_SEPOLIA_TOKEN - abbr: "alchemy-ethereum-sepolia-token" .}: string - alchemyArbitrumMainnetToken* {. - defaultValue: BUILD_ALCHEMY_ARBITRUM_MAINNET_TOKEN - desc: "Sets alchemy arbitrum mainnet token" - name: $BASE_NAME_ALCHEMY_ARBITRUM_MAINNET_TOKEN - abbr: "alchemy-arbitrum-mainnet-token" .}: string - alchemyArbitrumSepoliaToken* {. - defaultValue: BUILD_ALCHEMY_ARBITRUM_SEPOLIA_TOKEN - desc: "Sets alchemy arbitrum sepolia token" - name: $BASE_NAME_ALCHEMY_ARBITRUM_SEPOLIA_TOKEN - abbr: "alchemy-arbitrum-sepolia-token" .}: string - alchemyOptimismMainnetToken* {. - defaultValue: BUILD_ALCHEMY_OPTIMISM_MAINNET_TOKEN - desc: "Sets alchemy optimism mainnet token" - name: $BASE_NAME_ALCHEMY_OPTIMISM_MAINNET_TOKEN - abbr: "alchemy-optimism-mainnet-token" .}: string - alchemyOptimismSepoliaToken* {. - defaultValue: BUILD_ALCHEMY_OPTIMISM_SEPOLIA_TOKEN - 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 + alchemyApiKey* {. + defaultValue: BUILD_ALCHEMY_API_KEY + desc: "Sets alchemy api key" + name: $BASE_NAME_ALCHEMY_API_KEY + abbr: "alchemy-api-key" .}: string tenorApiKey* {. defaultValue: BUILD_TENOR_API_KEY desc: "Sets tenor api key" diff --git a/vendor/status-go b/vendor/status-go index 2c69b915ca..fb198f3cc0 160000 --- a/vendor/status-go +++ b/vendor/status-go @@ -1 +1 @@ -Subproject commit 2c69b915ca3ee411c204f1cf6b12619c7b11475e +Subproject commit fb198f3cc004f2705172cce360477866950148f4