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

chore: remove leftover token code from makefile

This commit is contained in:
Dario Gabriel Lipicar 2023-11-17 09:41:53 -03:00 committed by dlipicar
parent 7384c004cc
commit 90570b53da
4 changed files with 18 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
Makefile
View File

@ -506,70 +506,6 @@ log-compile-translations:
compile-translations: | log-compile-translations $(QM_BINARIES)
# default token is a free-tier token with limited capabilities and usage
# limits; our docs should include directions for community contributor to setup
# their own Pokt account and token instead of relying on this default token
# during development
DEFAULT_POKT_TOKEN := 849214fd2f85acead08f5184
POKT_TOKEN ?= $(DEFAULT_POKT_TOKEN)
NIM_PARAMS += -d:POKT_TOKEN:"$(POKT_TOKEN)"
# default token is a free-tier token with limited capabilities and usage
# limits; our docs should include directions for community contributor to setup
# their own Infura account and token instead of relying on this default token
# during development
DEFAULT_INFURA_TOKEN := 220a1abb4b6943a093c35d0ce4fb0732
INFURA_TOKEN ?= $(DEFAULT_INFURA_TOKEN)
NIM_PARAMS += -d:INFURA_TOKEN:"$(INFURA_TOKEN)"
ifdef INFURA_TOKEN_SECRET
NIM_PARAMS += -d:INFURA_TOKEN_SECRET:"$(INFURA_TOKEN_SECRET)"
endif
ifdef ALCHEMY_ETHEREUM_MAINNET_TOKEN
NIM_PARAMS += -d:ALCHEMY_ETHEREUM_MAINNET_TOKEN:"$(ALCHEMY_ETHEREUM_MAINNET_TOKEN)"
endif
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
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
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)"
DEFAULT_TENOR_API_KEY := DU7DWZ27STB2
TENOR_API_KEY ?= $(DEFAULT_TENOR_API_KEY)
NIM_PARAMS += -d:TENOR_API_KEY:"$(TENOR_API_KEY)"
# used to override the default number of kdf iterations for sqlcipher
KDF_ITERATIONS ?= 0
ifeq ($(shell test $(KDF_ITERATIONS) -gt 0; echo $$?),0)

10
src/app_service/service/gif/service.nim
View File

@ -11,6 +11,7 @@ import ../../../app/core/eventemitter
import ../../../backend/backend as status_go
import ../../../app/core/tasks/[qt, threadpool]
import ../../../app/core/[main]
import ../../../constants as main_constants
import ./dto
include ./async_tasks
@ -19,15 +20,6 @@ logScope:
topics = "gif-service"
const MAX_RECENT = 50
# set via `nim c` param `-d:TENOR_API_KEY:[api_key]`; should be set in CI/release builds
const TENOR_API_KEY {.strdefine.} = ""
let TENOR_API_KEY_ENV = $getEnv("TENOR_API_KEY")
let TENOR_API_KEY_RESOLVED =
if TENOR_API_KEY_ENV != "":
TENOR_API_KEY_ENV
else:
TENOR_API_KEY
const SIGNAL_LOAD_RECENT_GIFS_STARTED* = "loadRecentGifsStarted"
const SIGNAL_LOAD_RECENT_GIFS_DONE* = "loadRecentGifsDone"

1
src/constants.nim
View File

@ -56,4 +56,5 @@ let
ALCHEMY_OPTIMISM_GOERLI_TOKEN_RESOLVED* = desktopConfig.alchemyOptimismGoerliToken
ALCHEMY_OPTIMISM_SEPOLIA_TOKEN_RESOLVED* = desktopConfig.alchemyOptimismSepoliaToken
OPENSEA_API_KEY_RESOLVED* = desktopConfig.openseaApiKey
TENOR_API_KEY_RESOLVED* = desktopConfig.tenorApiKey
WALLET_CONNECT_PROJECT_ID* = BUILD_WALLET_CONNECT_PROJECT_ID

19
src/env_cli_vars.nim
View File

@ -23,6 +23,7 @@ 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_TENOR_API_KEY = "TENOR_API_KEY"
const BASE_NAME_WALLET_CONNECT_PROJECT_ID = "WALLET_CONNECT_PROJECT_ID"
@ -30,9 +31,13 @@ const BASE_NAME_WALLET_CONNECT_PROJECT_ID = "WALLET_CONNECT_PROJECT_ID"
# Build time evaluated variables
################################################################################
const BUILD_INFURA_TOKEN = getEnv(BUILD_TIME_PREFIX & BASE_NAME_INFURA_TOKEN)
const
DEFAULT_INFURA_TOKEN = "220a1abb4b6943a093c35d0ce4fb0732"
BUILD_INFURA_TOKEN = getEnv(BUILD_TIME_PREFIX & BASE_NAME_INFURA_TOKEN, DEFAULT_INFURA_TOKEN)
const BUILD_INFURA_TOKEN_SECRET = getEnv(BUILD_TIME_PREFIX & BASE_NAME_INFURA_TOKEN_SECRET)
const BUILD_POKT_TOKEN = getEnv(BUILD_TIME_PREFIX & BASE_NAME_POKT_TOKEN)
const
DEFAULT_POKT_TOKEN = "849214fd2f85acead08f5184"
BUILD_POKT_TOKEN = getEnv(BUILD_TIME_PREFIX & BASE_NAME_POKT_TOKEN, DEFAULT_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)
@ -43,6 +48,9 @@ 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
DEFAULT_TENOR_API_KEY = "DU7DWZ27STB2"
BUILD_TENOR_API_KEY = getEnv(BUILD_TIME_PREFIX & BASE_NAME_TENOR_API_KEY, DEFAULT_TENOR_API_KEY)
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)
@ -94,7 +102,7 @@ type StatusDesktopConfig = object
desc: "Sets pokt token"
name: $BASE_NAME_POKT_TOKEN
abbr: "pokt-token" .}: string
openSeaApiKey* {.
openseaApiKey* {.
defaultValue: BUILD_OPENSEA_API_KEY
desc: "Sets open sea api key"
name: $BASE_NAME_OPENSEA_API_KEY
@ -144,6 +152,11 @@ type StatusDesktopConfig = object
desc: "Sets alchemy optimism sepolia token"
name: $BASE_NAME_ALCHEMY_OPTIMISM_SEPOLIA_TOKEN
abbr: "alchemy-optimism-sepolia-token" .}: string
tenorApiKey* {.
defaultValue: BUILD_TENOR_API_KEY
desc: "Sets tenor api key"
name: $BASE_NAME_TENOR_API_KEY
abbr: "tenor-api-key" .}: string
# runtime vars
dataDir* {.