From 7384c004ccae4fc9d5c01e5c178c7e21b69bbef8 Mon Sep 17 00:00:00 2001 From: Dario Gabriel Lipicar Date: Thu, 16 Nov 2023 17:49:29 -0300 Subject: [PATCH] feat(@desktop/wallet): support alchemy sepolia api keys Closes #12771 --- Makefile | 12 +++++++++++ src/app_service/common/network_constants.nim | 5 ++++- src/app_service/service/accounts/service.nim | 5 ++++- src/constants.nim | 3 +++ src/env_cli_vars.nim | 21 ++++++++++++++++++++ vendor/status-go | 2 +- 6 files changed, 45 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e9252bdd42..e1a8850a2a 100644 --- a/Makefile +++ b/Makefile @@ -534,6 +534,10 @@ ifdef ALCHEMY_ETHEREUM_GOERLI_TOKEN NIM_PARAMS += -d:ALCHEMY_ETHEREUM_GOERLI_TOKEN:"$(ALCHEMY_ETHEREUM_GOERLI_TOKEN)" endif +ifdef ALCHEMY_ETHEREUM_SEPOLIA_TOKEN + NIM_PARAMS += -d:ALCHEMY_ETHEREUM_SEPOLIA_TOKEN:"$(ALCHEMY_ETHEREUM_SEPOLIA_TOKEN)" +endif + ifdef ALCHEMY_ARBITRUM_MAINNET_TOKEN NIM_PARAMS += -d:ALCHEMY_ARBITRUM_MAINNET_TOKEN:"$(ALCHEMY_ARBITRUM_MAINNET_TOKEN)" endif @@ -542,6 +546,10 @@ ifdef ALCHEMY_ARBITRUM_GOERLI_TOKEN NIM_PARAMS += -d:ALCHEMY_ARBITRUM_GOERLI_TOKEN:"$(ALCHEMY_ARBITRUM_GOERLI_TOKEN)" endif +ifdef ALCHEMY_ARBITRUM_SEPOLIA_TOKEN + NIM_PARAMS += -d:ALCHEMY_ARBITRUM_SEPOLIA_TOKEN:"$(ALCHEMY_ARBITRUM_SEPOLIA_TOKEN)" +endif + ifdef ALCHEMY_OPTIMISM_MAINNET_TOKEN NIM_PARAMS += -d:ALCHEMY_OPTIMISM_MAINNET_TOKEN:"$(ALCHEMY_OPTIMISM_MAINNET_TOKEN)" endif @@ -550,6 +558,10 @@ ifdef ALCHEMY_OPTIMISM_GOERLI_TOKEN NIM_PARAMS += -d:ALCHEMY_OPTIMISM_GOERLI_TOKEN:"$(ALCHEMY_OPTIMISM_GOERLI_TOKEN)" endif +ifdef ALCHEMY_OPTIMISM_SEPOLIA_TOKEN + NIM_PARAMS += -d:ALCHEMY_OPTIMISM_SEPOLIA_TOKEN:"$(ALCHEMY_OPTIMISM_SEPOLIA_TOKEN)" +endif + DEFAULT_OPENSEA_API_KEY := "" OPENSEA_API_KEY ?= $(DEFAULT_OPENSEA_API_KEY) NIM_PARAMS += -d:OPENSEA_API_KEY:"$(OPENSEA_API_KEY)" diff --git a/src/app_service/common/network_constants.nim b/src/app_service/common/network_constants.nim index f8fbc8cf32..6f0be881b7 100644 --- a/src/app_service/common/network_constants.nim +++ b/src/app_service/common/network_constants.nim @@ -228,10 +228,13 @@ var NODE_CONFIG* = %* { "AlchemyAPIKeys": %* { "1": ALCHEMY_ETHEREUM_MAINNET_TOKEN_RESOLVED, "5": ALCHEMY_ETHEREUM_GOERLI_TOKEN_RESOLVED, + "11155111": ALCHEMY_ETHEREUM_SEPOLIA_TOKEN_RESOLVED, "42161": ALCHEMY_ARBITRUM_MAINNET_TOKEN_RESOLVED, "421613": ALCHEMY_ARBITRUM_GOERLI_TOKEN_RESOLVED, + "421614": ALCHEMY_ARBITRUM_SEPOLIA_TOKEN_RESOLVED, "10": ALCHEMY_OPTIMISM_MAINNET_TOKEN_RESOLVED, - "420": ALCHEMY_OPTIMISM_GOERLI_TOKEN_RESOLVED + "420": ALCHEMY_OPTIMISM_GOERLI_TOKEN_RESOLVED, + "11155420": ALCHEMY_OPTIMISM_SEPOLIA_TOKEN_RESOLVED }, "InfuraAPIKey": INFURA_TOKEN_RESOLVED, "InfuraAPIKeySecret": INFURA_TOKEN_SECRET_RESOLVED, diff --git a/src/app_service/service/accounts/service.nim b/src/app_service/service/accounts/service.nim index 747b643ab3..941632ca4a 100644 --- a/src/app_service/service/accounts/service.nim +++ b/src/app_service/service/accounts/service.nim @@ -389,10 +389,13 @@ QtObject: "AlchemyAPIKeys": %* { "1": ALCHEMY_ETHEREUM_MAINNET_TOKEN_RESOLVED, "5": ALCHEMY_ETHEREUM_GOERLI_TOKEN_RESOLVED, + "11155111": ALCHEMY_ETHEREUM_SEPOLIA_TOKEN_RESOLVED, "42161": ALCHEMY_ARBITRUM_MAINNET_TOKEN_RESOLVED, "421613": ALCHEMY_ARBITRUM_GOERLI_TOKEN_RESOLVED, + "421614": ALCHEMY_ARBITRUM_SEPOLIA_TOKEN_RESOLVED, "10": ALCHEMY_OPTIMISM_MAINNET_TOKEN_RESOLVED, - "420": ALCHEMY_OPTIMISM_GOERLI_TOKEN_RESOLVED + "420": ALCHEMY_OPTIMISM_GOERLI_TOKEN_RESOLVED, + "11155420": ALCHEMY_OPTIMISM_SEPOLIA_TOKEN_RESOLVED } } diff --git a/src/constants.nim b/src/constants.nim index 98db89fa2e..c1bb6ce0fc 100644 --- a/src/constants.nim +++ b/src/constants.nim @@ -48,9 +48,12 @@ let INFURA_TOKEN_SECRET_RESOLVED* = desktopConfig.infuraTokenSecret ALCHEMY_ETHEREUM_MAINNET_TOKEN_RESOLVED* = desktopConfig.alchemyEthereumMainnetToken ALCHEMY_ETHEREUM_GOERLI_TOKEN_RESOLVED* = desktopConfig.alchemyEthereumGoerliToken + ALCHEMY_ETHEREUM_SEPOLIA_TOKEN_RESOLVED* = desktopConfig.alchemyEthereumSepoliaToken ALCHEMY_ARBITRUM_MAINNET_TOKEN_RESOLVED* = desktopConfig.alchemyArbitrumMainnetToken ALCHEMY_ARBITRUM_GOERLI_TOKEN_RESOLVED* = desktopConfig.alchemyArbitrumGoerliToken + ALCHEMY_ARBITRUM_SEPOLIA_TOKEN_RESOLVED* = desktopConfig.alchemyArbitrumSepoliaToken ALCHEMY_OPTIMISM_MAINNET_TOKEN_RESOLVED* = desktopConfig.alchemyOptimismMainnetToken ALCHEMY_OPTIMISM_GOERLI_TOKEN_RESOLVED* = desktopConfig.alchemyOptimismGoerliToken + ALCHEMY_OPTIMISM_SEPOLIA_TOKEN_RESOLVED* = desktopConfig.alchemyOptimismSepoliaToken OPENSEA_API_KEY_RESOLVED* = desktopConfig.openseaApiKey WALLET_CONNECT_PROJECT_ID* = BUILD_WALLET_CONNECT_PROJECT_ID diff --git a/src/env_cli_vars.nim b/src/env_cli_vars.nim index 42c769b56f..a88489050b 100644 --- a/src/env_cli_vars.nim +++ b/src/env_cli_vars.nim @@ -16,10 +16,13 @@ const BASE_NAME_POKT_TOKEN = "POKT_TOKEN" const BASE_NAME_OPENSEA_API_KEY = "OPENSEA_API_KEY" const BASE_NAME_ALCHEMY_ETHEREUM_MAINNET_TOKEN = "ALCHEMY_ETHEREUM_MAINNET_TOKEN" const BASE_NAME_ALCHEMY_ETHEREUM_GOERLI_TOKEN = "ALCHEMY_ETHEREUM_GOERLI_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_GOERLI_TOKEN = "ALCHEMY_ARBITRUM_GOERLI_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_GOERLI_TOKEN = "ALCHEMY_OPTIMISM_GOERLI_TOKEN" +const BASE_NAME_ALCHEMY_OPTIMISM_SEPOLIA_TOKEN = "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN" const BASE_NAME_WALLET_CONNECT_PROJECT_ID = "WALLET_CONNECT_PROJECT_ID" @@ -33,10 +36,13 @@ const BUILD_POKT_TOKEN = getEnv(BUILD_TIME_PREFIX & BASE_NAME_POKT_TOKEN) const BUILD_OPENSEA_API_KEY = getEnv(BUILD_TIME_PREFIX & BASE_NAME_OPENSEA_API_KEY) const BUILD_ALCHEMY_ETHEREUM_MAINNET_TOKEN = getEnv(BUILD_TIME_PREFIX & BASE_NAME_ALCHEMY_ETHEREUM_MAINNET_TOKEN) const BUILD_ALCHEMY_ETHEREUM_GOERLI_TOKEN = getEnv(BUILD_TIME_PREFIX & BASE_NAME_ALCHEMY_ETHEREUM_GOERLI_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_GOERLI_TOKEN = getEnv(BUILD_TIME_PREFIX & BASE_NAME_ALCHEMY_ARBITRUM_GOERLI_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_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 WALLET_CONNECT_STATUS_PROJECT_ID = "87815d72a81d739d2a7ce15c2cfdefb3" BUILD_WALLET_CONNECT_PROJECT_ID = getEnv(BUILD_TIME_PREFIX & BASE_NAME_WALLET_CONNECT_PROJECT_ID, WALLET_CONNECT_STATUS_PROJECT_ID) @@ -103,6 +109,11 @@ type StatusDesktopConfig = object desc: "Sets alchemy ethereum goerli token" name: $BASE_NAME_ALCHEMY_ETHEREUM_GOERLI_TOKEN abbr: "alchemy-ethereum-goerli-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" @@ -113,6 +124,11 @@ type StatusDesktopConfig = object desc: "Sets alchemy arbitrum goerli token" name: $BASE_NAME_ALCHEMY_ARBITRUM_GOERLI_TOKEN abbr: "alchemy-arbitrum-goerli-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" @@ -123,6 +139,11 @@ type StatusDesktopConfig = object desc: "Sets alchemy optimism goerli token" name: $BASE_NAME_ALCHEMY_OPTIMISM_GOERLI_TOKEN abbr: "alchemy-optimism-goerli-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 # runtime vars dataDir* {. diff --git a/vendor/status-go b/vendor/status-go index 40c9ba82a5..d198ac63fc 160000 --- a/vendor/status-go +++ b/vendor/status-go @@ -1 +1 @@ -Subproject commit 40c9ba82a5d63b8b8762237e4edfe3f1fa6f1c21 +Subproject commit d198ac63fc6b88c9ee8a109b15547e13238d0ad1