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

chore:enable status proxy (#20931) 

* feat_: enable status proxy

* chore: update jenkins lib

* chore: add missing env reference

---------

Co-authored-by: Siddarth Kumar <siddarthkay@gmail.com>
This commit is contained in:
frank 2024-08-06 22:19:36 +08:00 committed by GitHub
parent 8133c4c5f0
commit 1d84c30de3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/Jenkinsfile.android
View File

@ -1,5 +1,5 @@
#!/usr/bin/env groovy #!/usr/bin/env groovy
library 'status-jenkins-lib@v1.9.3' library 'status-jenkins-lib@v1.9.4'
/* Options section can't access functions in objects. */ /* Options section can't access functions in objects. */
def isPRBuild = utils.isPRBuild() def isPRBuild = utils.isPRBuild()

2
ci/Jenkinsfile.combined
View File

@ -1,5 +1,5 @@
#!/usr/bin/env groovy #!/usr/bin/env groovy
library 'status-jenkins-lib@v1.9.3' library 'status-jenkins-lib@v1.9.4'
import groovy.json.JsonBuilder import groovy.json.JsonBuilder

2
ci/Jenkinsfile.e2e-nightly
View File

@ -1,5 +1,5 @@
#!/usr/bin/env groovy #!/usr/bin/env groovy
library 'status-jenkins-lib@v1.9.3' library 'status-jenkins-lib@v1.9.4'
pipeline { pipeline {
agent { label 'linux' } agent { label 'linux' }

2
ci/Jenkinsfile.ios
View File

@ -1,5 +1,5 @@
#!/usr/bin/env groovy #!/usr/bin/env groovy
library 'status-jenkins-lib@v1.9.3' library 'status-jenkins-lib@v1.9.4'
/* Options section can't access functions in objects. */ /* Options section can't access functions in objects. */
def isPRBuild = utils.isPRBuild() def isPRBuild = utils.isPRBuild()

2
ci/Jenkinsfile.tests
View File

@ -1,5 +1,5 @@
#!/usr/bin/env groovy #!/usr/bin/env groovy
library 'status-jenkins-lib@v1.9.3' library 'status-jenkins-lib@v1.9.4'
/* Options section can't access functions in objects. */ /* Options section can't access functions in objects. */
def isPRBuild = utils.isPRBuild() def isPRBuild = utils.isPRBuild()

2
ci/tests/Jenkinsfile.e2e-nightly
View File

@ -1,5 +1,5 @@
#!/usr/bin/env groovy #!/usr/bin/env groovy
library 'status-jenkins-lib@v1.9.3' library 'status-jenkins-lib@v1.9.4'
pipeline { pipeline {

2
ci/tests/Jenkinsfile.e2e-prs
View File

@ -1,5 +1,5 @@
#!/usr/bin/env groovy #!/usr/bin/env groovy
library 'status-jenkins-lib@v1.9.3' library 'status-jenkins-lib@v1.9.4'
pipeline { pipeline {

2
ci/tests/Jenkinsfile.e2e-upgrade
View File

@ -1,5 +1,5 @@
#!/usr/bin/env groovy #!/usr/bin/env groovy
library 'status-jenkins-lib@v1.9.3' library 'status-jenkins-lib@v1.9.4'
pipeline { pipeline {

2
ci/tools/Jenkinsfile.fastlane-clean
View File

@ -1,5 +1,5 @@
#!/usr/bin/env groovy #!/usr/bin/env groovy
library 'status-jenkins-lib@v1.9.3' library 'status-jenkins-lib@v1.9.4'
pipeline { pipeline {
agent { label 'macos' } agent { label 'macos' }

2
ci/tools/Jenkinsfile.nix-cache
View File

@ -1,5 +1,5 @@
#!/usr/bin/env groovy #!/usr/bin/env groovy
library 'status-jenkins-lib@v1.9.3' library 'status-jenkins-lib@v1.9.4'
pipeline { pipeline {
agent { label params.AGENT_LABEL } agent { label params.AGENT_LABEL }

2
ci/tools/Jenkinsfile.playstore-meta
View File

@ -1,5 +1,5 @@
#!/usr/bin/env groovy #!/usr/bin/env groovy
library 'status-jenkins-lib@v1.9.3' library 'status-jenkins-lib@v1.9.4'
pipeline { pipeline {
agent { label 'linux' } agent { label 'linux' }

2
ci/tools/Jenkinsfile.xcode-clean
View File

@ -1,5 +1,5 @@
#!/usr/bin/env groovy #!/usr/bin/env groovy
library 'status-jenkins-lib@v1.9.3' library 'status-jenkins-lib@v1.9.4'
pipeline { pipeline {
agent { agent {

4
shadow-cljs.edn
View File

@ -67,6 +67,8 @@
:closure-defines :closure-defines
{status-im.config/POKT_TOKEN #shadow/env "POKT_TOKEN" {status-im.config/POKT_TOKEN #shadow/env "POKT_TOKEN"
status-im.config/INFURA_TOKEN #shadow/env "INFURA_TOKEN" status-im.config/INFURA_TOKEN #shadow/env "INFURA_TOKEN"
status-im.config/STATUS_BUILD_PROXY_USER #shadow/env "STATUS_BUILD_PROXY_USER"
status-im.config/STATUS_BUILD_PROXY_PASSWORD #shadow/env "STATUS_BUILD_PROXY_PASSWORD"
status-im.config/MIXPANEL_APP_ID #shadow/env "MIXPANEL_APP_ID" status-im.config/MIXPANEL_APP_ID #shadow/env "MIXPANEL_APP_ID"
status-im.config/MIXPANEL_TOKEN #shadow/env "MIXPANEL_TOKEN" status-im.config/MIXPANEL_TOKEN #shadow/env "MIXPANEL_TOKEN"
status-im.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY" status-im.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY"
@ -103,6 +105,8 @@
{:closure-defines {:closure-defines
{status-im.config/POKT_TOKEN #shadow/env "POKT_TOKEN" {status-im.config/POKT_TOKEN #shadow/env "POKT_TOKEN"
status-im.config/INFURA_TOKEN #shadow/env "INFURA_TOKEN" status-im.config/INFURA_TOKEN #shadow/env "INFURA_TOKEN"
status-im.config/STATUS_BUILD_PROXY_USER #shadow/env "STATUS_BUILD_PROXY_USER"
status-im.config/STATUS_BUILD_PROXY_PASSWORD #shadow/env "STATUS_BUILD_PROXY_PASSWORD"
status-im.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY" status-im.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY"
status-im.config/MIXPANEL_APP_ID #shadow/env "MIXPANEL_APP_ID" status-im.config/MIXPANEL_APP_ID #shadow/env "MIXPANEL_APP_ID"
status-im.config/MIXPANEL_TOKEN #shadow/env "MIXPANEL_TOKEN" status-im.config/MIXPANEL_TOKEN #shadow/env "MIXPANEL_TOKEN"

3
src/status_im/config.cljs
View File

@ -12,6 +12,8 @@
(goog-define INFURA_TOKEN "") (goog-define INFURA_TOKEN "")
(goog-define POKT_TOKEN "3ef2018191814b7e1009b8d9") (goog-define POKT_TOKEN "3ef2018191814b7e1009b8d9")
(goog-define STATUS_BUILD_PROXY_USER "")
(goog-define STATUS_BUILD_PROXY_PASSWORD "")
(goog-define OPENSEA_API_KEY "") (goog-define OPENSEA_API_KEY "")
(goog-define RARIBLE_MAINNET_API_KEY "") (goog-define RARIBLE_MAINNET_API_KEY "")
(goog-define RARIBLE_TESTNET_API_KEY "") (goog-define RARIBLE_TESTNET_API_KEY "")
@ -45,6 +47,7 @@
(def mixpanel-token MIXPANEL_TOKEN) (def mixpanel-token MIXPANEL_TOKEN)
(def opensea-api-key OPENSEA_API_KEY) (def opensea-api-key OPENSEA_API_KEY)
(def status-proxy-enabled? true)
(def bootnodes-settings-enabled? (enabled? (get-config :BOOTNODES_SETTINGS_ENABLED "1"))) (def bootnodes-settings-enabled? (enabled? (get-config :BOOTNODES_SETTINGS_ENABLED "1")))
(def mailserver-confirmations-enabled? (enabled? (get-config :MAILSERVER_CONFIRMATIONS_ENABLED))) (def mailserver-confirmations-enabled? (enabled? (get-config :MAILSERVER_CONFIRMATIONS_ENABLED)))
(def pairing-popup-disabled? (enabled? (get-config :PAIRING_POPUP_DISABLED "0"))) (def pairing-popup-disabled? (enabled? (get-config :PAIRING_POPUP_DISABLED "0")))

35
src/status_im/contexts/profile/config.cljs
View File

@ -9,21 +9,26 @@
(defn login (defn login
[] []
{;; Temporary fix until https://github.com/status-im/status-go/issues/3024 is resolved {;; Temporary fix until https://github.com/status-im/status-go/issues/3024 is resolved
:wakuV2Nameserver "8.8.8.8" :wakuV2Nameserver "8.8.8.8"
:openseaAPIKey config/opensea-api-key :statusProxyEnabled config/status-proxy-enabled?
:poktToken config/POKT_TOKEN :statusProxyMarketUser config/STATUS_BUILD_PROXY_USER
:infuraToken config/INFURA_TOKEN :statusProxyMarketPassword config/STATUS_BUILD_PROXY_PASSWORD
:raribleMainnetAPIKey config/RARIBLE_MAINNET_API_KEY :statusProxyBlockchainUser config/STATUS_BUILD_PROXY_USER
:raribleTestnetAPIKey config/RARIBLE_TESTNET_API_KEY :statusProxyBlockchainPassword config/STATUS_BUILD_PROXY_PASSWORD
:alchemyEthereumMainnetToken config/ALCHEMY_ETHEREUM_MAINNET_TOKEN :openseaAPIKey config/opensea-api-key
:alchemyEthereumGoerliToken config/ALCHEMY_ETHEREUM_GOERLI_TOKEN :poktToken config/POKT_TOKEN
:alchemyEthereumSepoliaToken config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN :infuraToken config/INFURA_TOKEN
:alchemyOptimismMainnetToken config/ALCHEMY_OPTIMISM_MAINNET_TOKEN :raribleMainnetAPIKey config/RARIBLE_MAINNET_API_KEY
:alchemyOptimismGoerliToken config/ALCHEMY_OPTIMISM_GOERLI_TOKEN :raribleTestnetAPIKey config/RARIBLE_TESTNET_API_KEY
:alchemyOptimismSepoliaToken config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN :alchemyEthereumMainnetToken config/ALCHEMY_ETHEREUM_MAINNET_TOKEN
:alchemyArbitrumMainnetToken config/ALCHEMY_ARBITRUM_MAINNET_TOKEN :alchemyEthereumGoerliToken config/ALCHEMY_ETHEREUM_GOERLI_TOKEN
:alchemyArbitrumGoerliToken config/ALCHEMY_ARBITRUM_GOERLI_TOKEN :alchemyEthereumSepoliaToken config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN
:alchemyArbitrumSepoliaToken config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN}) :alchemyOptimismMainnetToken config/ALCHEMY_OPTIMISM_MAINNET_TOKEN
:alchemyOptimismGoerliToken config/ALCHEMY_OPTIMISM_GOERLI_TOKEN
:alchemyOptimismSepoliaToken config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN
:alchemyArbitrumMainnetToken config/ALCHEMY_ARBITRUM_MAINNET_TOKEN
:alchemyArbitrumGoerliToken config/ALCHEMY_ARBITRUM_GOERLI_TOKEN
:alchemyArbitrumSepoliaToken config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN})
(defn create (defn create
[] []

6
status-go-version.json
View File

@ -3,7 +3,7 @@
"_comment": "Instead use: scripts/update-status-go.sh <rev>", "_comment": "Instead use: scripts/update-status-go.sh <rev>",
"owner": "status-im", "owner": "status-im",
"repo": "status-go", "repo": "status-go",
"version": "v0.182.40", "version": "b74d9e6b4e9177f1aa9ba57f9de8beebf5b352e1",
"commit-sha1": "9ef122b89551f2210946e0d3094ee0225aa39b75", "commit-sha1": "b74d9e6b4e9177f1aa9ba57f9de8beebf5b352e1",
"src-sha256": "0pd2kjc3g7cfvg7j0w7lsaczk5za2c2259sbidjjhr0v54cfys0l" "src-sha256": "1fvx0jgqkd9zx559m59kh73lyyzf1ryshjhs6r99q8kas7kkmjhx"
} }