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

Check admin.peers() before markTrustedPeer() call 

addPeer() doesn't add peer right away so markTrustedPeer() could fail.
This commit is contained in:
Dmitry Novotochinov 2018-01-19 14:15:01 +03:00
parent 8f1bc58b4b
commit 008f877cd6
No known key found for this signature in database
GPG Key ID: 267674DCC86628D9
5 changed files with 118 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/status_im/protocol/handlers.cljs
View File

@ -225,11 +225,24 @@
#(re-frame/dispatch [::add-peer-success web3 %])
#(re-frame/dispatch [::add-peer-error %]))))
(re-frame/reg-fx
::fetch-peers
(fn [{:keys [wnode web3 retries]}]
;; Run immediately on first run, add delay before retry
(let [delay (if (zero? retries) 0 300)]
(if (> retries 3)
(log/error "Number of retries for fetching peers exceed" wnode)
(js/setTimeout
(fn [] (inbox/fetch-peers #(re-frame/dispatch [::fetch-peers-success web3 % retries])
#(re-frame/dispatch [::fetch-peers-error %])))
delay)))))
(re-frame/reg-fx
::mark-trusted-peer
(fn [{:keys [wnode web3]}]
(fn [{:keys [wnode web3 peers]}]
(inbox/mark-trusted-peer web3
wnode
peers
#(re-frame/dispatch [::mark-trusted-peer-success web3 %])
#(re-frame/dispatch [::mark-trusted-peer-error %]))))
@ -258,7 +271,7 @@
;;;; Handlers
;; NOTE(dmitryn): events chain
;; add-peeer -> mark-trusted-peer -> get-sym-key -> request-messages
;; add-peer -> fetch-peers -> mark-trusted-peer -> get-sym-key -> request-messages
(handlers/register-handler-fx
:initialize-offline-inbox
(fn [{:keys [db]} [_ web3]]
@ -272,8 +285,24 @@
(fn [{:keys [db]} [_ web3 response]]
(let [wnode (get-in db [:inbox/wnode :address])]
(log/info "offline inbox: add-peer response" wnode response)
{::mark-trusted-peer {:wnode wnode
:web3 web3}})))
{::fetch-peers {:wnode wnode
:web3 web3
:retries 0}})))
(handlers/register-handler-fx
::fetch-peers-success
(fn [{:keys [db]} [_ web3 peers retries]]
(let [wnode (get-in db [:inbox/wnode :address])]
(log/info "offline inbox: fetch-peers response" peers)
(if (inbox/registered-peer? peers wnode)
{::mark-trusted-peer {:wnode wnode
:web3 web3
:peers peers}}
(do
(log/info "Peer" wnode "is not registered. Retrying fetch peers.")
{::fetch-peers {:wnode wnode
:web3 web3
:retries (inc retries)}})))))
(handlers/register-handler-fx
::mark-trusted-peer-success
@ -307,6 +336,11 @@
(fn [_ [_ error]]
(log/error "offline inbox: add-peer error" error)))
(handlers/register-handler-fx
::fetch-peers-error
(fn [_ [_ error]]
(log/error "offline inbox: fetch-peers error" error)))
(handlers/register-handler-fx
::mark-trusted-peer-error
(fn [_ [_ error]]

39
src/status_im/protocol/web3/inbox.cljs
View File

@ -1,10 +1,8 @@
(ns status-im.protocol.web3.inbox
(:require [status-im.native-module.core :as status]
[taoensso.timbre :as log]
[re-frame.core :as re-frame]
[clojure.string :as string]
[status-im.protocol.web3.keys :as keys]
[status-im.protocol.web3.utils :as utils]))
(:require [re-frame.core :as re-frame]
[status-im.native-module.core :as status]
[status-im.protocol.web3.utils :as web3.utils]
[taoensso.timbre :as log]))
(def peers (atom #{}))
(def trusted-peers (atom #{}))
@ -44,14 +42,29 @@
(swap! peers conj enode)
(success-fn result))))))
(defn mark-trusted-peer [web3 enode success-fn error-fn]
(defn registered-peer? [peers enode]
(let [peer-ids (set (map :id peers))
enode-id (web3.utils/extract-enode-id enode)]
(contains? peer-ids enode-id)))
(defn mark-trusted-peer [web3 enode peers success-fn error-fn]
(if (@trusted-peers enode)
(success-fn true)
(.markTrustedPeer (utils/shh web3)
enode
(response-handler error-fn (fn [result]
(swap! trusted-peers conj enode)
(success-fn result))))))
(.markTrustedPeer (web3.utils/shh web3)
enode
(response-handler error-fn (fn [result]
(swap! trusted-peers conj enode)
(success-fn result))))))
;; TODO(dmitryn): use web3 instead of rpc call
(defn fetch-peers [success-fn error-fn]
(let [args {:jsonrpc "2.0"
:id 2
:method "admin_peers"
:params []}
payload (.stringify js/JSON (clj->js args))]
(status/call-web3 payload
(response-handler error-fn success-fn))))
(defn request-messages [web3 wnode topic sym-key-id success-fn error-fn]
(log/info "offline inbox: sym-key-id" sym-key-id)
@ -60,7 +73,7 @@
:symKeyID sym-key-id}]
(log/info "offline inbox: request-messages request")
(log/info "offline inbox: request-messages args" (pr-str opts))
(.requestMessages (utils/shh web3)
(.requestMessages (web3.utils/shh web3)
(clj->js opts)
(response-handler error-fn success-fn))))

15
src/status_im/protocol/web3/utils.cljs
View File

@ -1,7 +1,7 @@
(ns status-im.protocol.web3.utils
(:require [cljs-time.core :refer [now]]
[cljs-time.coerce :refer [to-long]]
[status-im.utils.web3-provider :as w3]
(:require [cljs-time.coerce :refer [to-long]]
[cljs-time.core :refer [now]]
[clojure.string :as string]
[status-im.js-dependencies :as dependencies]))
(defn from-utf8 [s]
@ -18,3 +18,12 @@
(defn timestamp []
(to-long (now)))
(defn extract-enode-id [enode]
(-> enode
(string/split #"/")
(get 2 "")
(string/split #":")
(get 0 "")
(string/split "@")
(get 0)))

40
test/cljs/status_im/test/protocol/web3/inbox.cljs Normal file
View File

@ -0,0 +1,40 @@
(ns status-im.test.protocol.web3.inbox
(:require [status-im.protocol.web3.inbox :as inbox]
[status-im.protocol.web3.utils :as utils]
[cljs.test :refer-macros [deftest is testing]]))
(def enode "enode://08d8eb6177b187049f6c97ed3f6c74fbbefb94c7ad10bafcaf4b65ce89c314dcfee0a8bc4e7a5b824dfa08b45b360cc78f34f0aff981f8386caa07652d2e601b@163.172.177.138:40404")
(def enode2 "enode://12d8eb6177b187049f6c97ed3f6c74fbbefb94c7ad10bafcaf4b65ce89c314dcfee0a8bc4e7a5b824dfa08b45b360cc78f34f0aff981f8386caa07652d2e601b@163.172.177.138:40404")
(deftest test-extract-enode-id
(testing "Get enode id from enode uri"
(is (= "08d8eb6177b187049f6c97ed3f6c74fbbefb94c7ad10bafcaf4b65ce89c314dcfee0a8bc4e7a5b824dfa08b45b360cc78f34f0aff981f8386caa07652d2e601b"
(utils/extract-enode-id enode))))
(testing "Get enode id from mailformed enode uri"
(is (= ""
(utils/extract-enode-id "08d8eb6177b187049f6c97ed3f6c74fbbefb94c7ad10bafcaf4b65ce89c314dcfee0a8bc4e7a5b824dfa08b45b360cc78f34f0aff981f8386caa07652d2e601b@163.172.177.138:40404"))))
(testing "Test empty string"
(is (= ""
(utils/extract-enode-id ""))))
(testing "Test nil"
(is (= ""
(utils/extract-enode-id nil)))))
(def peers
[{:id "08d8eb6177b187049f6c97ed3f6c74fbbefb94c7ad10bafcaf4b65ce89c314dcfee0a8bc4e7a5b824dfa08b45b360cc78f34f0aff981f8386caa07652d2e601b"
:name "StatusIM/v0.9.9-unstable/linux-amd64/go1.9.2"}
{:id "0f7c65277f916ff4379fe520b875082a56e587eb3ce1c1567d9ff94206bdb05ba167c52272f20f634cd1ebdec5d9dfeb393018bfde1595d8e64a717c8b46692f"
:name "Geth/v1.7.2-stable/linux-amd64/go1.9.1"}])
(deftest test-registered-peer?
(testing "Peer is registered"
(is (inbox/registered-peer? peers enode)))
(testing "Peer is not peers list"
(is (not (inbox/registered-peer? peers enode2))))
(testing "Empty peers"
(is (not (inbox/registered-peer? [] enode))))
(testing "Empty peer"
(is (not (inbox/registered-peer? peers ""))))
(testing "Nil peer"
(is (not (inbox/registered-peer? peers nil)))))

2
test/cljs/status_im/test/runner.cljs
View File

@ -11,6 +11,7 @@
[status-im.test.bots.events]
[status-im.test.chat.models.input]
[status-im.test.i18n]
[status-im.test.protocol.web3.inbox]
[status-im.test.utils.utils]
[status-im.test.utils.money]
[status-im.test.utils.clocks]
@ -45,6 +46,7 @@
'status-im.test.wallet.transactions.views
'status-im.test.chat.models.input
'status-im.test.i18n
'status-im.test.protocol.web3.inbox
'status-im.test.utils.utils
'status-im.test.utils.money
'status-im.test.utils.clocks