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

Wallet Connect session establish networks (#20576) 

* feat: showing supported networks in wc connection

* feat: added :large size for quo/data-item

* feat: added required networks check
This commit is contained in:
Lungu Cristian 2024-07-02 16:39:33 +02:00 committed by GitHub
parent b021b1e20a
commit ac4ffd83db
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 207 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/quo/components/settings/data_item/style.cljs
View File

@ -6,8 +6,14 @@
[{:keys [size card? blur? actionable? theme]}] [{:keys [size card? blur? actionable? theme]}]
{:flex-direction :row {:flex-direction :row
:justify-content :space-between :justify-content :space-between
:padding-vertical (when (= size :default) 8) :padding-vertical (case size
:padding-horizontal (when (= size :default) 12) :default 8
:large 12
nil)
:padding-horizontal (case size
:default 12
:large 16
nil)
:border-radius 16 :border-radius 16
:border-width (when (and card? (not= size :small)) 1) :border-width (when (and card? (not= size :small)) 1)
:background-color (if blur? :background-color (if blur?
@ -24,15 +30,27 @@
(defn loading-container (defn loading-container
[size blur? theme] [size blur? theme]
{:width (if (= size :default) 132 72) {:width (case size
:height (if (= size :default) 16 10) :large 132
:small 72
132)
:height (case size
:large 16
:small 10
16)
:background-color (if blur? :background-color (if blur?
colors/white-opa-5 colors/white-opa-5
(colors/theme-colors colors/neutral-5 (colors/theme-colors colors/neutral-5
colors/neutral-90 colors/neutral-90
theme)) theme))
:border-radius (if (= size :default) 6 3) :border-radius (case size
:margin-vertical (if (= size :default) 4 3)}) :large 6
:small 3
6)
:margin-vertical (case size
:large 4
:small 3
4)})
(def subtitle-container (def subtitle-container
{:flex-direction :row {:flex-direction :row

3
src/status_im/contexts/preview/quo/settings/data_item.cljs
View File

@ -55,7 +55,8 @@
{:type :select {:type :select
:key :size :key :size
:options [{:key :default} :options [{:key :default}
{:key :small}]}]) {:key :small}
{:key :large}]}])
(defn view (defn view
[] []

33
src/status_im/contexts/wallet/wallet_connect/core.cljs
View File

@ -45,6 +45,10 @@
[db] [db]
(get-in db [:wallet-connect/current-request :event])) (get-in db [:wallet-connect/current-request :event]))
(defn get-session-dapp-metadata
[proposal]
(get-in proposal [:params :proposer :metadata]))
(defn get-db-current-request-params (defn get-db-current-request-params
[db] [db]
(-> db (-> db
@ -61,3 +65,32 @@
(->> password (->> password
security/safe-unmask-data security/safe-unmask-data
(f data address)))) (f data address))))
(defn get-proposal-networks
[proposal]
(let [required-namespaces (get-in proposal [:params :requiredNamespaces])
optional-namespaces (get-in proposal [:params :optionalNamespaces])]
(->> [required-namespaces optional-namespaces]
(map #(get-in % [:eip155 :chains]))
(apply concat)
(into #{}))))
(defn proposal-networks-intersection
[proposal supported-networks]
(let [proposed-networks (get-proposal-networks proposal)]
(->> supported-networks
(filter #(->> %
chain-id->eip155
(contains? proposed-networks))))))
(defn required-networks-supported?
[proposal supported-networks]
(let [required-networks (get-in proposal [:params :requiredNamespaces :eip155 :chains])
supported-eip155 (set (map chain-id->eip155 supported-networks))]
(every? #(contains? supported-eip155 %) required-networks)))
(defn get-networks-by-mode
[db]
(let [test-mode? (get-in db [:profile/profile :test-networks-enabled?])
networks (get-in db [:wallet :networks (if test-mode? :test :prod)])]
(mapv #(-> % :chain-id) networks)))

85
src/status_im/contexts/wallet/wallet_connect/events.cljs
View File

@ -8,7 +8,6 @@
status-im.contexts.wallet.wallet-connect.responding-events status-im.contexts.wallet.wallet-connect.responding-events
[status-im.contexts.wallet.wallet-connect.utils :as wc-utils] [status-im.contexts.wallet.wallet-connect.utils :as wc-utils]
[taoensso.timbre :as log] [taoensso.timbre :as log]
[utils.ethereum.chain :as chain]
[utils.i18n :as i18n])) [utils.i18n :as i18n]))
(rf/reg-event-fx (rf/reg-event-fx
@ -53,22 +52,37 @@
(rf/reg-event-fx (rf/reg-event-fx
:wallet-connect/on-session-proposal :wallet-connect/on-session-proposal
(fn [{:keys [db]} [proposal]] (fn [{:keys [db]} [proposal]]
(let [accounts (get-in db [:wallet :accounts]) (log/info "Received Wallet Connect session proposal: " {:id (:id proposal)})
without-watched (remove :watch-only? (vals accounts))] (let [accounts (get-in db [:wallet :accounts])
(log/info "Received Wallet Connect session proposal: " {:id (:id proposal)}) without-watched (remove :watch-only? (vals accounts))
{:db (assoc db networks (wallet-connect-core/get-networks-by-mode db)
;; NOTE: for now using the first account, but should be using the account selected session-networks (wallet-connect-core/proposal-networks-intersection proposal
;; by the user on the connection screen. The default would depend on where the networks)
;; connection started from: required-networks-supported? (wallet-connect-core/required-networks-supported? proposal
;; - global scanner -> first account in list networks)]
;; - wallet account dapps -> account that is selected (if required-networks-supported?
:wallet-connect/current-proposal {:db (update db
{:request proposal :wallet-connect/current-proposal assoc
:address (-> without-watched :request proposal
first :session-networks session-networks
:address)}) :address (-> without-watched
:fx [[:dispatch first
[:open-modal :screen/wallet.wallet-connect-session-proposal]]]}))) :address)
)
:fx [[:dispatch
[:open-modal :screen/wallet.wallet-connect-session-proposal]]]}
{:fx [[:dispatch
[:wallet-connect/session-networks-unsupported proposal]]]}))))
(rf/reg-event-fx
:wallet-connect/session-networks-unsupported
(fn [_ [proposal]]
(let [{:keys [name]} (wallet-connect-core/get-session-dapp-metadata proposal)]
{:fx [[:dispatch
[:toasts/upsert
{:type :negative
:theme :dark
:text (i18n/label :t/wallet-connect-networks-not-supported {:dapp name})}]]]})))
(rf/reg-event-fx (rf/reg-event-fx
:wallet-connect/on-session-request :wallet-connect/on-session-request
@ -136,34 +150,33 @@
(rf/reg-event-fx (rf/reg-event-fx
:wallet-connect/approve-session :wallet-connect/approve-session
(fn [{:keys [db]}] (fn [{:keys [db]}]
(let [web3-wallet (get db :wallet-connect/web3-wallet) (let [web3-wallet (get db :wallet-connect/web3-wallet)
current-proposal-request (get-in db [:wallet-connect/current-proposal :request]) current-proposal (get-in db [:wallet-connect/current-proposal :request])
supported-chain-ids (->> db session-networks (->> (get-in db [:wallet-connect/current-proposal :session-networks])
chain/chain-ids (map wallet-connect-core/chain-id->eip155)
(map wallet-connect-core/chain-id->eip155) vec)
vec) current-address (get-in db [:wallet-connect/current-proposal :address])
current-address (get-in db [:wallet-connect/current-proposal :address]) accounts (-> (partial wallet-connect-core/format-eip155-address current-address)
accounts (-> (partial wallet-connect-core/format-eip155-address current-address) (map session-networks))
(map supported-chain-ids)) supported-namespaces (clj->js {:eip155
supported-namespaces (clj->js {:eip155 {:chains session-networks
{:chains supported-chain-ids :methods constants/wallet-connect-supported-methods
:methods constants/wallet-connect-supported-methods :events constants/wallet-connect-supported-events
:events constants/wallet-connect-supported-events :accounts accounts}})]
:accounts accounts}})]
{:fx [[:effects.wallet-connect/approve-session {:fx [[:effects.wallet-connect/approve-session
{:web3-wallet web3-wallet {:web3-wallet web3-wallet
:proposal current-proposal-request :proposal current-proposal
:supported-namespaces supported-namespaces :supported-namespaces supported-namespaces
:on-success (fn [] :on-success (fn []
(log/info "Wallet Connect session approved") (log/info "Wallet Connect session approved")
(let [metadata (let [metadata (wallet-connect-core/get-session-dapp-metadata
(-> current-proposal-request :params :proposer :metadata)] current-proposal)]
(rf/dispatch [:wallet-connect/reset-current-session-proposal]) (rf/dispatch [:wallet-connect/reset-current-session-proposal])
(rf/dispatch [:wallet-connect/persist-session (rf/dispatch [:wallet-connect/persist-session
{:id (:id current-proposal-request) {:id (:id current-proposal)
:dapp-name (:name metadata) :dapp-name (:name metadata)
:dapp-url (:url metadata) :dapp-url (:url metadata)
:session-info current-proposal-request}]))) :session-info current-proposal}])))
:on-fail (fn [error] :on-fail (fn [error]
(log/error "Wallet Connect session approval failed" (log/error "Wallet Connect session approval failed"
{:error error {:error error

76
src/status_im/contexts/wallet/wallet_connect/session_proposal/view.cljs
View File

@ -1,8 +1,8 @@
(ns status-im.contexts.wallet.wallet-connect.session-proposal.view (ns status-im.contexts.wallet.wallet-connect.session-proposal.view
(:require (:require
[clojure.string :as string]
[quo.core :as quo] [quo.core :as quo]
[quo.foundations.colors :as colors] [quo.foundations.colors :as colors]
[quo.foundations.resources :as quo.resources]
[quo.theme] [quo.theme]
[react-native.core :as rn] [react-native.core :as rn]
[status-im.common.floating-button-page.view :as floating-button-page] [status-im.common.floating-button-page.view :as floating-button-page]
@ -45,11 +45,9 @@
[quo/text label]]) [quo/text label]])
labels)])) labels)]))
(defn- get-placeholder-networks (defn- format-network-name
[] [network]
[{:source (quo.resources/get-network :ethereum)} (-> network :network-name name string/capitalize))
{:source (quo.resources/get-network :optimism)}
{:source (quo.resources/get-network :arbitrum)}])
(defn- set-current-proposal-address (defn- set-current-proposal-address
[acc] [acc]
@ -93,37 +91,41 @@
(defn- connection-category (defn- connection-category
[] []
(let [address (rf/sub [:wallet-connect/current-proposal-address]) (let [{:keys [session-networks
{:keys all-networks-in-session?]} (rf/sub
[name [:wallet-connect/session-proposal-network-details])
customization-color address (rf/sub [:wallet-connect/current-proposal-address])
emoji]} (rf/sub [:wallet-connect/account-details-by-address address]) {:keys [name customization-color emoji]} (rf/sub [:wallet-connect/account-details-by-address
data-item-common-props {:blur? false address])
:description :default network-names (->> session-networks
:card? false (map format-network-name)
:label :preview (string/join ", "))
:status :default network-images (mapv :source session-networks)
:size :default} data-item-common-props {:blur? false
account-data-item-props (assoc data-item-common-props :description :default
:right-content {:type :accounts :card? false
:size :size-32 :label :preview
:data [{:emoji emoji :status :default
:customization-color :size :large}
customization-color}]} account-data-item-props (assoc data-item-common-props
:on-press show-account-switcher-bottom-sheet :right-content {:type :accounts
:title (i18n/label :t/account-title) :size :size-32
:subtitle name :data [{:emoji emoji
:icon-right? true :customization-color
:right-icon :i/chevron-right customization-color}]}
:icon-color colors/neutral-10) :on-press show-account-switcher-bottom-sheet
networks-data-item-props (assoc data-item-common-props :title (i18n/label :t/account-title)
:right-content {:type :network :subtitle name
:data :icon-right? true
(get-placeholder-networks)} :right-icon :i/chevron-right
:title (i18n/label :t/networks) :icon-color colors/neutral-10)
;; TODO. The quo component for data-item networks-data-item-props (assoc data-item-common-props
;; does not support showing networks yet :right-content {:type :network
:subtitle "Networks placeholder")] :data network-images}
:title (i18n/label :t/networks)
:subtitle (if all-networks-in-session?
(i18n/label :t/all-networks)
network-names))]
[quo/category [quo/category
{:blur? false {:blur? false
:list-type :data-item :list-type :data-item

26
src/status_im/subs/wallet/wallet_connect.cljs
View File

@ -108,10 +108,20 @@
:else nil)}))))) :else nil)})))))
(rf/reg-sub (rf/reg-sub
:wallet-connect/session-proposer :wallet-connect/current-proposal-request
:<- [:wallet-connect/current-proposal] :<- [:wallet-connect/current-proposal]
:-> :request)
(rf/reg-sub
:wallet-connect/session-proposal-networks
:<- [:wallet-connect/current-proposal]
:-> :session-networks)
(rf/reg-sub
:wallet-connect/session-proposer
:<- [:wallet-connect/current-proposal-request]
(fn [proposal] (fn [proposal]
(-> proposal :request :params :proposer))) (-> proposal :params :proposer)))
(rf/reg-sub (rf/reg-sub
:wallet-connect/session-proposer-name :wallet-connect/session-proposer-name
@ -119,6 +129,18 @@
(fn [proposer] (fn [proposer]
(-> proposer :metadata :name))) (-> proposer :metadata :name)))
(rf/reg-sub
:wallet-connect/session-proposal-network-details
:<- [:wallet-connect/session-proposal-networks]
:<- [:wallet/network-details]
(fn [[session-networks network-details]]
(let [supported-networks (map :chain-id network-details)
session-networks (filterv #(contains? (set session-networks) (:chain-id %))
network-details)
all-networks-in-session? (= (count supported-networks) (count session-networks))]
{:session-networks session-networks
:all-networks-in-session? all-networks-in-session?})))
(rf/reg-sub (rf/reg-sub
:wallet-connect/current-proposal-address :wallet-connect/current-proposal-address
(fn [db] (fn [db]

66
src/status_im/subs/wallet/wallet_connect_test.cljs
View File

@ -8,38 +8,39 @@
[utils.re-frame :as rf])) [utils.re-frame :as rf]))
(def sample-session (def sample-session
{:id 1716798889093634 {:session-proposal
:params {:id 1716798889093634
{:id 1716798889093634 :params
:pairingTopic "9b18e1348817a548bbc97f9b4a09278f4fdf7c984e4a61ddf461bd1f57710d33" {:id 1716798889093634
:expiryTimestamp 1716799189 :pairingTopic "9b18e1348817a548bbc97f9b4a09278f4fdf7c984e4a61ddf461bd1f57710d33"
:requiredNamespaces {} :expiryTimestamp 1716799189
:optionalNamespaces {:eip155 :requiredNamespaces {}
{:chains ["eip155:1" "eip155:42161" "eip155:137" "eip155:43114" "eip155:56" :optionalNamespaces {:eip155
"eip155:10" "eip155:100" {:chains ["eip155:1" "eip155:42161" "eip155:137" "eip155:43114" "eip155:56"
"eip155:324" "eip155:7777777" "eip155:8453" "eip155:42220" "eip155:10" "eip155:100"
"eip155:1313161554" "eip155:11155111" "eip155:11155420"] "eip155:324" "eip155:7777777" "eip155:8453" "eip155:42220"
:methods ["personal_sign" "eth_accounts" "eth_requestAccounts" "eip155:1313161554" "eip155:11155111" "eip155:11155420"]
"eth_sendRawTransaction" "eth_sendTransaction" :methods ["personal_sign" "eth_accounts" "eth_requestAccounts"
"eth_sign" "eth_signTransaction" "eth_signTypedData" "eth_sendRawTransaction" "eth_sendTransaction"
"eth_signTypedData_v3" "eth_signTypedData_v4" "eth_sign" "eth_signTransaction" "eth_signTypedData"
"wallet_addEthereumChain" "wallet_getCallsStatus" "eth_signTypedData_v3" "eth_signTypedData_v4"
"wallet_getCapabilities" "wallet_getPermissions" "wallet_addEthereumChain" "wallet_getCallsStatus"
"wallet_registerOnboarding" "wallet_requestPermissions" "wallet_getCapabilities" "wallet_getPermissions"
"wallet_scanQRCode" "wallet_sendCalls" "wallet_registerOnboarding" "wallet_requestPermissions"
"wallet_showCallsStatus" "wallet_switchEthereumChain" "wallet_scanQRCode" "wallet_sendCalls"
"wallet_watchAsset"] "wallet_showCallsStatus" "wallet_switchEthereumChain"
:events ["chainChanged" "accountsChanged"]}} "wallet_watchAsset"]
:relays [{:protocol "irn"}] :events ["chainChanged" "accountsChanged"]}}
:proposer {:publicKey "cddea055b8974d93380e6c7e72110145506c06524047866f8034f3db0990137a" :relays [{:protocol "irn"}]
:metadata {:name "Web3Modal" :proposer {:publicKey "cddea055b8974d93380e6c7e72110145506c06524047866f8034f3db0990137a"
:description "Web3Modal Laboratory" :metadata {:name "Web3Modal"
:url "https://lab.web3modal.com" :description "Web3Modal Laboratory"
:icons ["https://avatars.githubusercontent.com/u/37784886"]}}} :url "https://lab.web3modal.com"
:verifyContext {:verified {:verifyUrl "https://verify.walletconnect.com" :icons ["https://avatars.githubusercontent.com/u/37784886"]}}}
:validation "VALID" :verifyContext {:verified {:verifyUrl "https://verify.walletconnect.com"
:origin "https://lab.web3modal.com" :validation "VALID"
:isScam false}}}) :origin "https://lab.web3modal.com"
:isScam false}}}})
(h/deftest-sub :wallet-connect/session-proposer (h/deftest-sub :wallet-connect/session-proposer
[sub-name] [sub-name]
@ -54,6 +55,7 @@
(-> sample-session :params :proposer :publicKey))) (-> sample-session :params :proposer :publicKey)))
(is (= (-> proposer :metadata :url) (is (= (-> proposer :metadata :url)
(-> sample-session :params :proposer :metadata :url)))))) (-> sample-session :params :proposer :metadata :url))))))
(h/deftest-sub :wallet-connect/session-proposer-name (h/deftest-sub :wallet-connect/session-proposer-name

2
translations/en.json
View File

@ -214,6 +214,7 @@
"airdrop-addresses": "Address for airdrops", "airdrop-addresses": "Address for airdrops",
"join-as": "Join as {{role}}", "join-as": "Join as {{role}}",
"all-addresses": "All addresses", "all-addresses": "All addresses",
"all-networks": "All networks",
"for-airdrops": "For airdrops", "for-airdrops": "For airdrops",
"members-label": "Members", "members-label": "Members",
"open-membership": "Open membership", "open-membership": "Open membership",
@ -2043,6 +2044,7 @@
"wallet-connect-sign-message-warning": "Sign messages only if you trust the dApp", "wallet-connect-sign-message-warning": "Sign messages only if you trust the dApp",
"wallet-connect-send-transaction-warning": "Send transactions only if you trust the dApp", "wallet-connect-send-transaction-warning": "Send transactions only if you trust the dApp",
"wallet-connect-sign-transaction-warning": "Sign transactions only if you trust the dApp", "wallet-connect-sign-transaction-warning": "Sign transactions only if you trust the dApp",
"wallet-connect-networks-not-supported": "{{dapp}} requires an unsupported network.",
"reject": "Reject", "reject": "Reject",
"manage-connections": "Manage connections from within Application Connections", "manage-connections": "Manage connections from within Application Connections",
"contact-request-was-ignored": "Contact request ignored", "contact-request-was-ignored": "Contact request ignored",