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

Use staging fleet and upgrade status-go 

Signed-off-by: Andrea Maria Piana <andrea.maria.piana@gmail.com>
This commit is contained in:
Andrea Maria Piana 2019-11-02 18:54:20 +01:00
parent c69863cda2
commit 5eb314db58
No known key found for this signature in database
GPG Key ID: AA6CCA6DE0E06424
10 changed files with 81 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@ -5,7 +5,7 @@ DEV_BUILD=1
ERC20_CONTRACT_WARNINGS=1 ERC20_CONTRACT_WARNINGS=1
ETHEREUM_DEV_CLUSTER=1 ETHEREUM_DEV_CLUSTER=1
EXTENSIONS=0 EXTENSIONS=0
FLEET=eth.beta FLEET=eth.staging
GROUP_CHATS_ENABLED=1 GROUP_CHATS_ENABLED=1
HARDWALLET_ENABLED=1 HARDWALLET_ENABLED=1
LOG_LEVEL_STATUS_GO=info LOG_LEVEL_STATUS_GO=info

2
.env.e2e
View File

@ -3,7 +3,7 @@ DEFAULT_NETWORK=testnet_rpc
ERC20_CONTRACT_WARNINGS=1 ERC20_CONTRACT_WARNINGS=1
ETHEREUM_DEV_CLUSTER=1 ETHEREUM_DEV_CLUSTER=1
EXTENSIONS=0 EXTENSIONS=0
FLEET=eth.beta FLEET=eth.staging
GROUP_CHATS_ENABLED=1 GROUP_CHATS_ENABLED=1
LOG_LEVEL_STATUS_GO=info LOG_LEVEL_STATUS_GO=info
LOG_LEVEL=debug LOG_LEVEL=debug

2
.env.jenkins
View File

@ -4,7 +4,7 @@ DEFAULT_NETWORK=mainnet_rpc
ERC20_CONTRACT_WARNINGS=1 ERC20_CONTRACT_WARNINGS=1
ETHEREUM_DEV_CLUSTER=1 ETHEREUM_DEV_CLUSTER=1
EXTENSIONS=0 EXTENSIONS=0
FLEET=eth.beta FLEET=eth.staging
GROUP_CHATS_ENABLED=1 GROUP_CHATS_ENABLED=1
HARDWALLET_ENABLED=1 HARDWALLET_ENABLED=1
LOG_LEVEL_STATUS_GO=info LOG_LEVEL_STATUS_GO=info

2
.env.nightly
View File

@ -3,7 +3,7 @@ DEFAULT_NETWORK=mainnet_rpc
ERC20_CONTRACT_WARNINGS=1 ERC20_CONTRACT_WARNINGS=1
ETHEREUM_DEV_CLUSTER=1 ETHEREUM_DEV_CLUSTER=1
EXTENSIONS=0 EXTENSIONS=0
FLEET=eth.beta FLEET=eth.staging
GROUP_CHATS_ENABLED=1 GROUP_CHATS_ENABLED=1
LOG_LEVEL_STATUS_GO=info LOG_LEVEL_STATUS_GO=info
LOG_LEVEL=debug LOG_LEVEL=debug

2
.env.release
View File

@ -3,7 +3,7 @@ DEFAULT_NETWORK=mainnet_rpc
ERC20_CONTRACT_WARNINGS=0 ERC20_CONTRACT_WARNINGS=0
ETHEREUM_DEV_CLUSTER=0 ETHEREUM_DEV_CLUSTER=0
EXTENSIONS=0 EXTENSIONS=0
FLEET=eth.beta FLEET=eth.staging
GROUP_CHATS_ENABLED=1 GROUP_CHATS_ENABLED=1
LOG_LEVEL_STATUS_GO= LOG_LEVEL_STATUS_GO=
LOG_LEVEL=info LOG_LEVEL=info

4
src/status_im/multiaccounts/login/core.cljs
View File

@ -37,7 +37,7 @@
(defn fetch-nodes [current-fleet resolve reject] (defn fetch-nodes [current-fleet resolve reject]
(let [default-nodes (-> (node/fleets {}) (let [default-nodes (-> (node/fleets {})
(get-in [:eth.beta :mail]) (get-in [:eth.staging :mail])
vals)] vals)]
(if config/contract-nodes-enabled? (if config/contract-nodes-enabled?
(do (do
@ -47,7 +47,7 @@
contract-address contract-address
(handlers/response-handler resolve (handlers/response-handler resolve
(fn [error] (fn [error]
(log/warn "could not fetch nodes from contract defaulting to eth.beta") (log/warn "could not fetch nodes from contract defaulting to eth.staging")
(resolve default-nodes))))) (resolve default-nodes)))))
(resolve default-nodes)))) (resolve default-nodes))))

2
src/status_im/utils/config.cljs
View File

@ -40,7 +40,7 @@
(def log-level-status-go (def log-level-status-go
(-> (get-config :LOG_LEVEL_STATUS_GO "") (-> (get-config :LOG_LEVEL_STATUS_GO "")
string/upper-case)) string/upper-case))
(def fleet (get-config :FLEET "eth.beta")) (def fleet (get-config :FLEET "eth.staging"))
(def default-network (get-config :DEFAULT_NETWORK)) (def default-network (get-config :DEFAULT_NETWORK))
(def pow-target (js/parseFloat (get-config :POW_TARGET "0.002"))) (def pow-target (js/parseFloat (get-config :POW_TARGET "0.002")))
(def pow-time (js/parseInt (get-config :POW_TIME "1"))) (def pow-time (js/parseInt (get-config :POW_TIME "1")))

6
status-go-version.json
View File

@ -2,7 +2,7 @@
"_comment": "DO NOT EDIT THIS FILE BY HAND. USE 'scripts/update-status-go.sh <tag>' instead", "_comment": "DO NOT EDIT THIS FILE BY HAND. USE 'scripts/update-status-go.sh <tag>' instead",
"owner": "status-im", "owner": "status-im",
"repo": "status-go", "repo": "status-go",
"version": "5f2544f1e8f2ee832bbab95c8d74e26ba0ab2481", "version": "v0.34.0-beta.4",
"commit-sha1": "5f2544f1e8f2ee832bbab95c8d74e26ba0ab2481", "commit-sha1": "e311307061ebf67fece33ff02e811d94972ae5b1",
"src-sha256": "0dlkr6056mhyny9k895zs5012ywiz75qm6y7a6hypb3pfxr35931" "src-sha256": "063yfb9r1vdgskhfqg0r400wrpwk2ibryc785pffwash70yyf5y0"
} }

58
test/cljs/status_im/test/mailserver/core.cljs
View File

@ -40,17 +40,17 @@
(testing "it shows the popup" (testing "it shows the popup"
(is (:ui/show-confirmation (mailserver/change-mailserver (is (:ui/show-confirmation (mailserver/change-mailserver
{:db {:multiaccount {:settings {:db {:multiaccount {:settings
{:fleet :beta {:fleet :staging
:mailserver {:beta "id"}}} :mailserver {:staging "id"}}}
:peers-count 1}}))))) :peers-count 1}})))))
(testing "there's not a preferred mailserver" (testing "there's not a preferred mailserver"
(testing "it changes the mailserver" (testing "it changes the mailserver"
(is (= :a (is (= :a
(get-in (get-in
(mailserver/change-mailserver (mailserver/change-mailserver
{:db {:mailserver/mailservers {:beta {:a "b"}} {:db {:mailserver/mailservers {:staging {:a "b"}}
:multiaccount {:settings :multiaccount {:settings
{:fleet :beta}} {:fleet :staging}}
:peers-count 1}}) :peers-count 1}})
[:db :mailserver/current-id])))) [:db :mailserver/current-id]))))
(testing "it does not show the popup" (testing "it does not show the popup"
@ -131,7 +131,7 @@
(deftest edit-mailserver (deftest edit-mailserver
(let [db {:mailserver/mailservers (let [db {:mailserver/mailservers
{:eth.beta {"a" {:id "a" {:eth.staging {"a" {:id "a"
:address valid-enode-address :address valid-enode-address
:password password :password password
:name "name"}}}} :name "name"}}}}
@ -186,7 +186,7 @@
(deftest fetch-mailserver (deftest fetch-mailserver
(testing "it fetches the mailserver from the db" (testing "it fetches the mailserver from the db"
(let [cofx {:db {:mailserver/mailservers {:eth.beta {"a" {:id "a" (let [cofx {:db {:mailserver/mailservers {:eth.staging {"a" {:id "a"
:name "old-name" :name "old-name"
:address "enode://old-id:old-password@url:port"}}}}}] :address "enode://old-id:old-password@url:port"}}}}}]
(is (mailserver/fetch cofx "a"))))) (is (mailserver/fetch cofx "a")))))
@ -194,28 +194,28 @@
(deftest fetch-current-mailserver (deftest fetch-current-mailserver
(testing "it fetches the mailserver from the db with corresponding id" (testing "it fetches the mailserver from the db with corresponding id"
(let [cofx {:db {:mailserver/current-id "a" (let [cofx {:db {:mailserver/current-id "a"
:mailserver/mailservers {:eth.beta {"a" {:id "a" :mailserver/mailservers {:eth.staging {"a" {:id "a"
:name "old-name" :name "old-name"
:address "enode://old-id:old-password@url:port"}}}}}] :address "enode://old-id:old-password@url:port"}}}}}]
(is (mailserver/fetch-current cofx))))) (is (mailserver/fetch-current cofx)))))
(deftest set-current-mailserver (deftest set-current-mailserver
(with-redefs [rand-nth (comp last sort)] (with-redefs [rand-nth (comp last sort)]
(let [cofx {:db {:mailserver/mailservers {:eth.beta {"a" {} (let [cofx {:db {:mailserver/mailservers {:eth.staging {"a" {}
"b" {} "b" {}
"c" {} "c" {}
"d" {}}}}}] "d" {}}}}}]
(testing "the user has already a preference" (testing "the user has already a preference"
(let [cofx (assoc-in cofx (let [cofx (assoc-in cofx
[:db :multiaccount :settings] [:db :multiaccount :settings]
{:mailserver {:eth.beta "a"}})] {:mailserver {:eth.staging "a"}})]
(testing "the mailserver exists" (testing "the mailserver exists"
(testing "it sets the preferred mailserver" (testing "it sets the preferred mailserver"
(is (= "a" (-> (mailserver/set-current-mailserver cofx) (is (= "a" (-> (mailserver/set-current-mailserver cofx)
:db :db
:mailserver/current-id))))) :mailserver/current-id)))))
(testing "the mailserver does not exists" (testing "the mailserver does not exists"
(let [cofx (update-in cofx [:db :mailserver/mailservers :eth.beta] dissoc "a")] (let [cofx (update-in cofx [:db :mailserver/mailservers :eth.staging] dissoc "a")]
(testing "sets a random mailserver" (testing "sets a random mailserver"
(is (= "d" (-> (mailserver/set-current-mailserver cofx) (is (= "d" (-> (mailserver/set-current-mailserver cofx)
:db :db
@ -250,7 +250,7 @@
(deftest delete-mailserver (deftest delete-mailserver
(testing "the user is not connected to the mailserver" (testing "the user is not connected to the mailserver"
(let [cofx {:random-id-generator (constantly "random-id") (let [cofx {:random-id-generator (constantly "random-id")
:db {:mailserver/mailservers {:eth.beta {"a" {:id "a" :db {:mailserver/mailservers {:eth.staging {"a" {:id "a"
:name "old-name" :name "old-name"
:user-defined true :user-defined true
:address "enode://old-id:old-password@url:port"}}}}} :address "enode://old-id:old-password@url:port"}}}}}
@ -261,7 +261,7 @@
(is (= 1 (count (::json-rpc/call actual))))))) (is (= 1 (count (::json-rpc/call actual)))))))
(testing "the mailserver is not user-defined" (testing "the mailserver is not user-defined"
(let [cofx {:random-id-generator (constantly "random-id") (let [cofx {:random-id-generator (constantly "random-id")
:db {:mailserver/mailservers {:eth.beta {"a" {:id "a" :db {:mailserver/mailservers {:eth.staging {"a" {:id "a"
:name "old-name" :name "old-name"
:address "enode://old-id:old-password@url:port"}}}}} :address "enode://old-id:old-password@url:port"}}}}}
actual (mailserver/delete cofx "a")] actual (mailserver/delete cofx "a")]
@ -269,7 +269,7 @@
(is (= {:dispatch [:navigate-back]} actual))))) (is (= {:dispatch [:navigate-back]} actual)))))
(testing "the user is connected to the mailserver" (testing "the user is connected to the mailserver"
(let [cofx {:random-id-generator (constantly "random-id") (let [cofx {:random-id-generator (constantly "random-id")
:db {:mailserver/mailservers {:eth.beta {"a" {:id "a" :db {:mailserver/mailservers {:eth.staging {"a" {:id "a"
:name "old-name" :name "old-name"
:address "enode://old-id:old-password@url:port"}}}}} :address "enode://old-id:old-password@url:port"}}}}}
actual (mailserver/delete cofx "a")] actual (mailserver/delete cofx "a")]
@ -286,7 +286,7 @@
actual (mailserver/upsert cofx)] actual (mailserver/upsert cofx)]
(testing "it adds the enode to mailserver/mailservers" (testing "it adds the enode to mailserver/mailservers"
(is (= {:eth.beta {:randomid {:password "test-password" (is (= {:eth.staging {:randomid {:password "test-password"
:address "enode://test-id@url:port" :address "enode://test-id@url:port"
:name "test-name" :name "test-name"
:id :randomid :id :randomid
@ -303,7 +303,7 @@
:name {:value "new-name"} :name {:value "new-name"}
:url {:value "enode://new-id:new-password@url:port"}} :url {:value "enode://new-id:new-password@url:port"}}
:mailserver/mailservers {:eth.beta {:a {:id :a :mailserver/mailservers {:eth.staging {:a {:id :a
:name "old-name" :name "old-name"
:address "enode://old-id:old-password@url:port"}}}}} :address "enode://old-id:old-password@url:port"}}}}}
actual (mailserver/upsert cofx)] actual (mailserver/upsert cofx)]
@ -311,7 +311,7 @@
(is (= [:navigate-back] (is (= [:navigate-back]
(:dispatch actual)))) (:dispatch actual))))
(testing "it updates the enode to mailserver/mailservers" (testing "it updates the enode to mailserver/mailservers"
(is (= {:eth.beta {:a {:password "new-password" (is (= {:eth.staging {:a {:password "new-password"
:address "enode://new-id@url:port" :address "enode://new-id@url:port"
:name "new-name" :name "new-name"
:id :a :id :a
@ -325,9 +325,9 @@
:peers-summary (if registered-peer? :peers-summary (if registered-peer?
[{:id "mailserver-id" :enode "enode://mailserver-id@ip"}] [{:id "mailserver-id" :enode "enode://mailserver-id@ip"}]
[]) [])
:multiaccount {:settings {:fleet :eth.beta}} :multiaccount {:settings {:fleet :eth.staging}}
:mailserver/current-id "mailserver-a" :mailserver/current-id "mailserver-a"
:mailserver/mailservers {:eth.beta {"mailserver-a" {:sym-key-id sym-key :mailserver/mailservers {:eth.staging {"mailserver-a" {:sym-key-id sym-key
:address "enode://mailserver-id@ip"}}}}}) :address "enode://mailserver-id@ip"}}}}})
(defn peers-summary-change-result [sym-key registered-peer? registered-peer-before?] (defn peers-summary-change-result [sym-key registered-peer? registered-peer-before?]
@ -581,34 +581,34 @@
(testing "it removes the preference" (testing "it removes the preference"
(let [db {:mailserver/current-id "mailserverid" (let [db {:mailserver/current-id "mailserverid"
:mailserver/mailservers :mailserver/mailservers
{:eth.beta {"mailserverid" {:address "mailserver-address" {:eth.staging {"mailserverid" {:address "mailserver-address"
:password "mailserver-password"}}} :password "mailserver-password"}}}
:multiaccount :multiaccount
{:settings {:fleet :eth.beta {:settings {:fleet :eth.staging
:mailserver {:eth.beta "mailserverid"}}}}] :mailserver {:eth.staging "mailserverid"}}}}]
(is (not (get-in (mailserver/unpin {:db db}) (is (not (get-in (mailserver/unpin {:db db})
[:db :multiaccount :settings :mailserver :eth.beta])))))) [:db :multiaccount :settings :mailserver :eth.staging]))))))
(deftest pin-test (deftest pin-test
(testing "it removes the preference" (testing "it removes the preference"
(let [db {:mailserver/current-id "mailserverid" (let [db {:mailserver/current-id "mailserverid"
:mailserver/mailservers :mailserver/mailservers
{:eth.beta {"mailserverid" {:address "mailserver-address" {:eth.staging {"mailserverid" {:address "mailserver-address"
:password "mailserver-password"}}} :password "mailserver-password"}}}
:multiaccount :multiaccount
{:settings {:fleet :eth.beta {:settings {:fleet :eth.staging
:mailserver {}}}}] :mailserver {}}}}]
(is (= "mailserverid" (get-in (mailserver/pin {:db db}) (is (= "mailserverid" (get-in (mailserver/pin {:db db})
[:db :multiaccount :settings :mailserver :eth.beta])))))) [:db :multiaccount :settings :mailserver :eth.staging]))))))
(deftest connect-to-mailserver (deftest connect-to-mailserver
(let [db {:mailserver/current-id "mailserverid" (let [db {:mailserver/current-id "mailserverid"
:mailserver/mailservers :mailserver/mailservers
{:eth.beta {"mailserverid" {:address "mailserver-address" {:eth.staging {"mailserverid" {:address "mailserver-address"
:password "mailserver-password"}}} :password "mailserver-password"}}}
:multiaccount :multiaccount
{:settings {:fleet :eth.beta {:settings {:fleet :eth.staging
:mailserver {:eth.beta "mailserverid"}}}}] :mailserver {:eth.staging "mailserverid"}}}}]
(testing "it adds the peer" (testing "it adds the peer"
(is (= "mailserver-address" (is (= "mailserver-address"
(:mailserver/add-peer (mailserver/connect-to-mailserver {:db db}))))) (:mailserver/add-peer (mailserver/connect-to-mailserver {:db db})))))
@ -619,7 +619,7 @@
first first
:password)))) :password))))
(let [mailserver-with-sym-key-db (assoc-in db (let [mailserver-with-sym-key-db (assoc-in db
[:mailserver/mailservers :eth.beta "mailserverid" :sym-key-id] [:mailserver/mailservers :eth.staging "mailserverid" :sym-key-id]
"somesymkeyid")] "somesymkeyid")]
(testing "it does not generate a sym key if already present" (testing "it does not generate a sym key if already present"
(is (not (-> (mailserver/connect-to-mailserver {:db mailserver-with-sym-key-db}) (is (not (-> (mailserver/connect-to-mailserver {:db mailserver-with-sym-key-db})

10
test/cljs/status_im/test/transport/core.cljs
View File

@ -10,12 +10,12 @@
(let [cofx {:db {:multiaccount {:public-key "1"}}}] (let [cofx {:db {:multiaccount {:public-key "1"}}}]
(testing "custom mailservers" (testing "custom mailservers"
(let [ms-1 {:id :a (let [ms-1 {:id :a
:fleet :eth.beta :fleet :eth.staging
:name "name-1" :name "name-1"
:address "address-1" :address "address-1"
:password "password-1"} :password "password-1"}
ms-2 {:id :b ms-2 {:id :b
:fleet :eth.beta :fleet :eth.staging
:name "name-2" :name "name-2"
:address "address-2" :address "address-2"
:password "password-2"} :password "password-2"}
@ -24,7 +24,7 @@
:name "name-3" :name "name-3"
:address "address-3" :address "address-3"
:password "password-3"} :password "password-3"}
expected-mailservers {:eth.beta {:a (-> ms-1 expected-mailservers {:eth.staging {:a (-> ms-1
(dissoc :fleet) (dissoc :fleet)
(assoc :user-defined true)) (assoc :user-defined true))
:b (-> ms-2 :b (-> ms-2
@ -40,8 +40,8 @@
:mailserver-topics {} :mailserver-topics {}
:default-mailserver true}) :default-mailserver true})
[:db :mailserver/mailservers]) [:db :mailserver/mailservers])
(update-in [:eth.beta :a] dissoc :generating-sym-key?) (update-in [:eth.staging :a] dissoc :generating-sym-key?)
(update-in [:eth.beta :b] dissoc :generating-sym-key?) (update-in [:eth.staging :b] dissoc :generating-sym-key?)
(update-in [:eth.test :c] dissoc :generating-sym-key?)))))))) (update-in [:eth.test :c] dissoc :generating-sym-key?))))))))
(def sig "0x04325367620ae20dd878dbb39f69f02c567d789dd21af8a88623dc5b529827c2812571c380a2cd8236a2851b8843d6486481166c39debf60a5d30b9099c66213e4") (def sig "0x04325367620ae20dd878dbb39f69f02c567d789dd21af8a88623dc5b529827c2812571c380a2cd8236a2851b8843d6486481166c39debf60a5d30b9099c66213e4")