From 1d84c30de3225b2cb6884ca7ae8e5c93fde352f9 Mon Sep 17 00:00:00 2001 From: frank Date: Tue, 6 Aug 2024 22:19:36 +0800 Subject: [PATCH] chore:enable status proxy (#20931) * feat_: enable status proxy * chore: update jenkins lib * chore: add missing env reference --------- Co-authored-by: Siddarth Kumar --- ci/Jenkinsfile.android | 2 +- ci/Jenkinsfile.combined | 2 +- ci/Jenkinsfile.e2e-nightly | 2 +- ci/Jenkinsfile.ios | 2 +- ci/Jenkinsfile.tests | 2 +- ci/tests/Jenkinsfile.e2e-nightly | 2 +- ci/tests/Jenkinsfile.e2e-prs | 2 +- ci/tests/Jenkinsfile.e2e-upgrade | 2 +- ci/tools/Jenkinsfile.fastlane-clean | 2 +- ci/tools/Jenkinsfile.nix-cache | 2 +- ci/tools/Jenkinsfile.playstore-meta | 2 +- ci/tools/Jenkinsfile.xcode-clean | 2 +- shadow-cljs.edn | 4 +++ src/status_im/config.cljs | 3 ++ src/status_im/contexts/profile/config.cljs | 35 ++++++++++++---------- status-go-version.json | 6 ++-- 16 files changed, 42 insertions(+), 30 deletions(-) diff --git a/ci/Jenkinsfile.android b/ci/Jenkinsfile.android index b13a9e8d06..d81119dc4d 100644 --- a/ci/Jenkinsfile.android +++ b/ci/Jenkinsfile.android @@ -1,5 +1,5 @@ #!/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. */ def isPRBuild = utils.isPRBuild() diff --git a/ci/Jenkinsfile.combined b/ci/Jenkinsfile.combined index ce62492780..bb9e9a88b4 100644 --- a/ci/Jenkinsfile.combined +++ b/ci/Jenkinsfile.combined @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.9.3' +library 'status-jenkins-lib@v1.9.4' import groovy.json.JsonBuilder diff --git a/ci/Jenkinsfile.e2e-nightly b/ci/Jenkinsfile.e2e-nightly index 606e6f3c51..66d6ccd70e 100644 --- a/ci/Jenkinsfile.e2e-nightly +++ b/ci/Jenkinsfile.e2e-nightly @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.9.3' +library 'status-jenkins-lib@v1.9.4' pipeline { agent { label 'linux' } diff --git a/ci/Jenkinsfile.ios b/ci/Jenkinsfile.ios index 13b1ffb61e..42b4bd70eb 100644 --- a/ci/Jenkinsfile.ios +++ b/ci/Jenkinsfile.ios @@ -1,5 +1,5 @@ #!/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. */ def isPRBuild = utils.isPRBuild() diff --git a/ci/Jenkinsfile.tests b/ci/Jenkinsfile.tests index 09d8c4741c..4061532bd2 100644 --- a/ci/Jenkinsfile.tests +++ b/ci/Jenkinsfile.tests @@ -1,5 +1,5 @@ #!/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. */ def isPRBuild = utils.isPRBuild() diff --git a/ci/tests/Jenkinsfile.e2e-nightly b/ci/tests/Jenkinsfile.e2e-nightly index 3319e8272a..2b307d2236 100644 --- a/ci/tests/Jenkinsfile.e2e-nightly +++ b/ci/tests/Jenkinsfile.e2e-nightly @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.9.3' +library 'status-jenkins-lib@v1.9.4' pipeline { diff --git a/ci/tests/Jenkinsfile.e2e-prs b/ci/tests/Jenkinsfile.e2e-prs index 11901bdcc2..b7dac64c45 100644 --- a/ci/tests/Jenkinsfile.e2e-prs +++ b/ci/tests/Jenkinsfile.e2e-prs @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.9.3' +library 'status-jenkins-lib@v1.9.4' pipeline { diff --git a/ci/tests/Jenkinsfile.e2e-upgrade b/ci/tests/Jenkinsfile.e2e-upgrade index e8afe8b677..f57d4629be 100644 --- a/ci/tests/Jenkinsfile.e2e-upgrade +++ b/ci/tests/Jenkinsfile.e2e-upgrade @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.9.3' +library 'status-jenkins-lib@v1.9.4' pipeline { diff --git a/ci/tools/Jenkinsfile.fastlane-clean b/ci/tools/Jenkinsfile.fastlane-clean index 25d66f5a39..08e39f25ff 100644 --- a/ci/tools/Jenkinsfile.fastlane-clean +++ b/ci/tools/Jenkinsfile.fastlane-clean @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.9.3' +library 'status-jenkins-lib@v1.9.4' pipeline { agent { label 'macos' } diff --git a/ci/tools/Jenkinsfile.nix-cache b/ci/tools/Jenkinsfile.nix-cache index 01d216c8b9..fdeef0ff01 100644 --- a/ci/tools/Jenkinsfile.nix-cache +++ b/ci/tools/Jenkinsfile.nix-cache @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.9.3' +library 'status-jenkins-lib@v1.9.4' pipeline { agent { label params.AGENT_LABEL } diff --git a/ci/tools/Jenkinsfile.playstore-meta b/ci/tools/Jenkinsfile.playstore-meta index 945de76164..fba6632888 100644 --- a/ci/tools/Jenkinsfile.playstore-meta +++ b/ci/tools/Jenkinsfile.playstore-meta @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.9.3' +library 'status-jenkins-lib@v1.9.4' pipeline { agent { label 'linux' } diff --git a/ci/tools/Jenkinsfile.xcode-clean b/ci/tools/Jenkinsfile.xcode-clean index 610dfcfcd7..8cc19ec630 100644 --- a/ci/tools/Jenkinsfile.xcode-clean +++ b/ci/tools/Jenkinsfile.xcode-clean @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.9.3' +library 'status-jenkins-lib@v1.9.4' pipeline { agent { diff --git a/shadow-cljs.edn b/shadow-cljs.edn index c247fc68f5..540f4bde12 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -67,6 +67,8 @@ :closure-defines {status-im.config/POKT_TOKEN #shadow/env "POKT_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_TOKEN #shadow/env "MIXPANEL_TOKEN" status-im.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY" @@ -103,6 +105,8 @@ {:closure-defines {status-im.config/POKT_TOKEN #shadow/env "POKT_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/MIXPANEL_APP_ID #shadow/env "MIXPANEL_APP_ID" status-im.config/MIXPANEL_TOKEN #shadow/env "MIXPANEL_TOKEN" diff --git a/src/status_im/config.cljs b/src/status_im/config.cljs index 11bfe39510..65bce01254 100644 --- a/src/status_im/config.cljs +++ b/src/status_im/config.cljs @@ -12,6 +12,8 @@ (goog-define INFURA_TOKEN "") (goog-define POKT_TOKEN "3ef2018191814b7e1009b8d9") +(goog-define STATUS_BUILD_PROXY_USER "") +(goog-define STATUS_BUILD_PROXY_PASSWORD "") (goog-define OPENSEA_API_KEY "") (goog-define RARIBLE_MAINNET_API_KEY "") (goog-define RARIBLE_TESTNET_API_KEY "") @@ -45,6 +47,7 @@ (def mixpanel-token MIXPANEL_TOKEN) (def opensea-api-key OPENSEA_API_KEY) +(def status-proxy-enabled? true) (def bootnodes-settings-enabled? (enabled? (get-config :BOOTNODES_SETTINGS_ENABLED "1"))) (def mailserver-confirmations-enabled? (enabled? (get-config :MAILSERVER_CONFIRMATIONS_ENABLED))) (def pairing-popup-disabled? (enabled? (get-config :PAIRING_POPUP_DISABLED "0"))) diff --git a/src/status_im/contexts/profile/config.cljs b/src/status_im/contexts/profile/config.cljs index 57a0ce4009..0fe5164bd4 100644 --- a/src/status_im/contexts/profile/config.cljs +++ b/src/status_im/contexts/profile/config.cljs @@ -9,21 +9,26 @@ (defn login [] {;; Temporary fix until https://github.com/status-im/status-go/issues/3024 is resolved - :wakuV2Nameserver "8.8.8.8" - :openseaAPIKey config/opensea-api-key - :poktToken config/POKT_TOKEN - :infuraToken config/INFURA_TOKEN - :raribleMainnetAPIKey config/RARIBLE_MAINNET_API_KEY - :raribleTestnetAPIKey config/RARIBLE_TESTNET_API_KEY - :alchemyEthereumMainnetToken config/ALCHEMY_ETHEREUM_MAINNET_TOKEN - :alchemyEthereumGoerliToken config/ALCHEMY_ETHEREUM_GOERLI_TOKEN - :alchemyEthereumSepoliaToken config/ALCHEMY_ETHEREUM_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}) + :wakuV2Nameserver "8.8.8.8" + :statusProxyEnabled config/status-proxy-enabled? + :statusProxyMarketUser config/STATUS_BUILD_PROXY_USER + :statusProxyMarketPassword config/STATUS_BUILD_PROXY_PASSWORD + :statusProxyBlockchainUser config/STATUS_BUILD_PROXY_USER + :statusProxyBlockchainPassword config/STATUS_BUILD_PROXY_PASSWORD + :openseaAPIKey config/opensea-api-key + :poktToken config/POKT_TOKEN + :infuraToken config/INFURA_TOKEN + :raribleMainnetAPIKey config/RARIBLE_MAINNET_API_KEY + :raribleTestnetAPIKey config/RARIBLE_TESTNET_API_KEY + :alchemyEthereumMainnetToken config/ALCHEMY_ETHEREUM_MAINNET_TOKEN + :alchemyEthereumGoerliToken config/ALCHEMY_ETHEREUM_GOERLI_TOKEN + :alchemyEthereumSepoliaToken config/ALCHEMY_ETHEREUM_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 [] diff --git a/status-go-version.json b/status-go-version.json index d7107a1ac0..72d472f043 100644 --- a/status-go-version.json +++ b/status-go-version.json @@ -3,7 +3,7 @@ "_comment": "Instead use: scripts/update-status-go.sh ", "owner": "status-im", "repo": "status-go", - "version": "v0.182.40", - "commit-sha1": "9ef122b89551f2210946e0d3094ee0225aa39b75", - "src-sha256": "0pd2kjc3g7cfvg7j0w7lsaczk5za2c2259sbidjjhr0v54cfys0l" + "version": "b74d9e6b4e9177f1aa9ba57f9de8beebf5b352e1", + "commit-sha1": "b74d9e6b4e9177f1aa9ba57f9de8beebf5b352e1", + "src-sha256": "1fvx0jgqkd9zx559m59kh73lyyzf1ryshjhs6r99q8kas7kkmjhx" }