status-im/status-react
2
0
Fork 0
mirror of https://github.com/status-im/status-react.git synced 2025-02-16 21:07:21 +00:00
Code Issues Projects Releases Wiki Activity

ref: removed chain-id from tx state and added util

Browse Source
This commit is contained in:
Cristian Lungu 2024-10-18 11:41:29 +03:00
parent e39fb0b318
commit 3ace91fa86
No known key found for this signature in database
GPG Key ID: 00D675EDE1B264D9
3 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/status_im/contexts/wallet/wallet_connect/events/session_requests.cljs
View File

@ -84,7 +84,7 @@
(rf/reg-event-fx (rf/reg-event-fx
:wallet-connect/prepare-transaction-success :wallet-connect/prepare-transaction-success
(fn [{:keys [db]} [prepared-tx chain-id]] (fn [{:keys [db]} [prepared-tx]]
(let [{:keys [tx-args tx-details]} prepared-tx (let [{:keys [tx-args tx-details]} prepared-tx
tx (-> tx-args tx (-> tx-args
bean/->clj bean/->clj
@ -93,7 +93,6 @@
[:wallet-connect/current-request] [:wallet-connect/current-request]
assoc assoc
:raw-data prepared-tx :raw-data prepared-tx
:chain-id chain-id
:address (.sender tx) :address (.sender tx)
:transaction-summary (.summary tx) :transaction-summary (.summary tx)
:display-data (.beautify-params tx))}))) :display-data (.beautify-params tx))})))
@ -103,41 +102,25 @@
(fn [{:keys [db]} [{:keys [on-success]}]] (fn [{:keys [db]} [{:keys [on-success]}]]
(let [event (data-store/get-db-current-request-event db) (let [event (data-store/get-db-current-request-event db)
tx (-> event data-store/get-request-params first) tx (-> event data-store/get-request-params first)
chain-id (-> event chain-id (data-store/get-chain-id event)]
(get-in [:params :chainId])
networks/eip155->chain-id)]
(when tx (when tx
{:fx [[:effects.wallet-connect/prepare-transaction {:fx [[:effects.wallet-connect/prepare-transaction
{:tx tx {:tx tx
:chain-id chain-id :chain-id chain-id
:on-success (fn [data] :on-success (fn [data]
(rf/dispatch [:wallet-connect/prepare-transaction-success data chain-id]) (rf/dispatch [:wallet-connect/prepare-transaction-success data])
(when on-success (when on-success
(rf/call-continuation on-success))) (rf/call-continuation on-success)))
:on-error #(rf/dispatch [:wallet-connect/on-processing-error %])}]]})))) :on-error #(rf/dispatch [:wallet-connect/on-processing-error %])}]]}))))
(rf/reg-event-fx
:wallet-connect/process-eth-sign-transaction
(fn [{:keys [db]}]
(let [event (data-store/get-db-current-request-event db)
tx (-> event data-store/get-request-params first)
chain-id (-> event
(get-in [:params :chainId])
networks/eip155->chain-id)]
{:fx [[:effects.wallet-connect/prepare-transaction
{:tx tx
:chain-id chain-id
:on-success #(rf/dispatch [:wallet-connect/prepare-transaction-success % chain-id])
:on-error #(rf/dispatch [:wallet-connect/on-processing-error %])}]]})))
(rf/reg-event-fx (rf/reg-event-fx
:wallet-connect/process-sign-typed :wallet-connect/process-sign-typed
(fn [{:keys [db]}] (fn [{:keys [db]}]
(try (try
(let [[address raw-data] (data-store/get-db-current-request-params db) (let [[address raw-data] (data-store/get-db-current-request-params db)
session-chain-id (-> (data-store/get-db-current-request-event db) session-chain-id (-> db
(get-in [:params :chainId]) (data-store/get-db-current-request-event)
networks/eip155->chain-id) (data-store/get-chain-id))
typed-data (-> raw-data typed-data (-> raw-data
transforms/js-parse transforms/js-parse
transforms/js->clj) transforms/js->clj)

7
src/status_im/contexts/wallet/wallet_connect/utils/data_store.cljs
View File

@ -2,6 +2,7 @@
(:require (:require
[clojure.string :as string] [clojure.string :as string]
[status-im.constants :as constants] [status-im.constants :as constants]
[status-im.contexts.wallet.wallet-connect.utils.networks :as networks]
utils.string utils.string
[utils.transforms :as transforms])) [utils.transforms :as transforms]))
@ -80,3 +81,9 @@
:wallet-connect/sessions :wallet-connect/sessions
count count
inc)) inc))
(defn get-chain-id
[event]
(-> event
(get-in [:params :chainId])
networks/eip155->chain-id))

4
src/status_im/subs/wallet/dapps/requests.cljs
View File

@ -46,9 +46,7 @@
:wallet-connect/chain-id :wallet-connect/chain-id
:<- [:wallet-connect/current-request] :<- [:wallet-connect/current-request]
(fn [request] (fn [request]
(-> request (-> request :event data-store/get-chain-id)))
(get-in [:event :params :chainId])
(networks/eip155->chain-id))))
(rf/reg-sub (rf/reg-sub
:wallet-connect/current-request-network :wallet-connect/current-request-network