From 03b4bb0511347832185f18dd9fa2ade195599453 Mon Sep 17 00:00:00 2001 From: Anthony Laibe Date: Thu, 10 Feb 2022 14:22:41 +0100 Subject: [PATCH] feat(@wallet): Add opensea api key --- Makefile | 4 ++++ ci/Jenkinsfile.combined | 2 +- ci/Jenkinsfile.linux | 2 +- ci/Jenkinsfile.macos | 2 +- ci/Jenkinsfile.windows | 2 +- src/app_service/common/network_constants.nim | 15 ++++++++++++++- src/app_service/service/accounts/service.nim | 4 ++++ vendor/status-go | 2 +- 8 files changed, 27 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index a837c3908..f82ed51b7 100644 --- a/Makefile +++ b/Makefile @@ -282,6 +282,10 @@ DEFAULT_TOKEN := 220a1abb4b6943a093c35d0ce4fb0732 INFURA_TOKEN ?= $(DEFAULT_TOKEN) NIM_PARAMS += -d:INFURA_TOKEN:"$(INFURA_TOKEN)" +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)" diff --git a/ci/Jenkinsfile.combined b/ci/Jenkinsfile.combined index 634352b12..ba9c37861 100644 --- a/ci/Jenkinsfile.combined +++ b/ci/Jenkinsfile.combined @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.3.3' +library 'status-jenkins-lib@v1.3.4' pipeline { agent { label 'linux' } diff --git a/ci/Jenkinsfile.linux b/ci/Jenkinsfile.linux index 6cf5ec51d..9068a2f3e 100644 --- a/ci/Jenkinsfile.linux +++ b/ci/Jenkinsfile.linux @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.3.3' +library 'status-jenkins-lib@v1.3.4' pipeline { agent { diff --git a/ci/Jenkinsfile.macos b/ci/Jenkinsfile.macos index 33a82bc06..6a81ae077 100644 --- a/ci/Jenkinsfile.macos +++ b/ci/Jenkinsfile.macos @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.3.3' +library 'status-jenkins-lib@v1.3.4' pipeline { agent { diff --git a/ci/Jenkinsfile.windows b/ci/Jenkinsfile.windows index 4965e020d..d30b35e2a 100644 --- a/ci/Jenkinsfile.windows +++ b/ci/Jenkinsfile.windows @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.3.3' +library 'status-jenkins-lib@v1.3.4' pipeline { agent { label 'windows' } diff --git a/src/app_service/common/network_constants.nim b/src/app_service/common/network_constants.nim index 810d23ede..c273dabd7 100644 --- a/src/app_service/common/network_constants.nim +++ b/src/app_service/common/network_constants.nim @@ -11,6 +11,18 @@ let INFURA_TOKEN_RESOLVED = else: INFURA_TOKEN +const OPENSEA_API_KEY {.strdefine.} = "" +# allow runtime override via environment variable; core contributors can set a +# an opensea API key in this way for local development +let OPENSEA_API_KEY_ENV = $getEnv("OPENSEA_API_KEY") +let OPENSEA_API_KEY_RESOLVED* = + if OPENSEA_API_KEY_ENV != "": + OPENSEA_API_KEY_ENV + else: + OPENSEA_API_KEY + + + const DEFAULT_NETWORK_NAME* = "mainnet_rpc" const DEFAULT_NETWORKS_IDS* = @["mainnet_rpc", "testnet_rpc", "rinkeby_rpc", "goerli_rpc", "xdai_rpc", "poa_rpc" ] @@ -164,7 +176,8 @@ var NODE_CONFIG* = %* { "LightClient": false }, "WalletConfig": { - "Enabled": true + "Enabled": true, + "OpenseaAPIKey": OPENSEA_API_KEY_RESOLVED }, "EnsConfig": { "Enabled": true diff --git a/src/app_service/service/accounts/service.nim b/src/app_service/service/accounts/service.nim index 5829cc298..d4973940c 100644 --- a/src/app_service/service/accounts/service.nim +++ b/src/app_service/service/accounts/service.nim @@ -314,6 +314,10 @@ method login*(self: Service, account: AccountDto, password: string): string = "EnsConfig": %* { "Enabled": true }, + "WalletConfig": { + "Enabled": true, + "OpenseaAPIKey": OPENSEA_API_KEY_RESOLVED + }, } let response = status_account.login(account.name, account.keyUid, hashedPassword, account.identicon, thumbnailImage, diff --git a/vendor/status-go b/vendor/status-go index 6cfe0f136..66d511e33 160000 --- a/vendor/status-go +++ b/vendor/status-go @@ -1 +1 @@ -Subproject commit 6cfe0f136960b792feec8ceb9cde1066e9568b71 +Subproject commit 66d511e33f8cb3a543dc569ba63ed324d97bdd29