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

fixes #6856 

Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
This commit is contained in:
tbenr 2018-11-30 10:36:55 +01:00 committed by Andrey Shovkoplyas
parent d4ca0851d7
commit 1152ad4afd
No known key found for this signature in database
GPG Key ID: EAAB7C8622D860A4
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/status_im/extensions/core.cljs
View File

@ -444,6 +444,12 @@
:value :extensions/ethereum-transaction-receipt :value :extensions/ethereum-transaction-receipt
:arguments {:value :string :arguments {:value :string
:on-result :event}} :on-result :event}}
'ethereum/sign
{:permissions [:read]
:value :extensions/ethereum-sign
:arguments {:message? :string
:data? :string
:on-result :event}}
'ethereum/send-transaction 'ethereum/send-transaction
{:permissions [:read] {:permissions [:read]
:value :extensions/ethereum-send-transaction :value :extensions/ethereum-send-transaction

28
src/status_im/extensions/ethereum.cljs
View File

@ -17,15 +17,17 @@
[status-im.native-module.core :as status])) [status-im.native-module.core :as status]))
(handlers/register-handler-fx (handlers/register-handler-fx
:extensions/transaction-on-result :extensions/wallet-ui-on-result
(fn [cofx [_ on-result id result method]] (fn [cofx [_ on-result id result method]]
(fx/merge cofx (fx/merge cofx
(when on-result (when on-result
{:dispatch (on-result {:error nil :result result})}) {:dispatch (on-result {:error nil :result result})})
(navigation/navigate-to-clean :wallet-transaction-sent nil)))) (cond
(= method constants/web3-send-transaction) (navigation/navigate-to-clean :wallet-transaction-sent nil)
(= method constants/web3-personal-sign) (navigation/navigate-back)))))
(handlers/register-handler-fx (handlers/register-handler-fx
:extensions/transaction-on-error :extensions/wallet-ui-on-error
(fn [{db :db} [_ on-result message]] (fn [{db :db} [_ on-result message]]
(when on-result {:dispatch (on-result {:error message :result nil})}))) (when on-result {:dispatch (on-result {:error message :result nil})})))
@ -64,8 +66,8 @@
:gas-price (when gasPrice :gas-price (when gasPrice
(money/bignumber gasPrice)) (money/bignumber gasPrice))
:data data :data data
:on-result [:extensions/transaction-on-result on-result] :on-result [:extensions/wallet-ui-on-result on-result]
:on-error [:extensions/transaction-on-error on-result]} :on-error [:extensions/wallet-ui-on-error on-result]}
nonce nonce
(assoc :nonce nonce)))) (assoc :nonce nonce))))
@ -204,3 +206,19 @@
registry (get ens/ens-registries chain)] registry (get ens/ens-registries chain)]
(ens/get-addr web3 registry name #(re-frame/dispatch (on-result {:result %})))) (ens/get-addr web3 registry name #(re-frame/dispatch (on-result {:result %}))))
(re-frame/dispatch (on-result {:error (str "'" name "' is not a valid name")}))))) (re-frame/dispatch (on-result {:error (str "'" name "' is not a valid name")})))))
;; EXTENSION SIGN -> SIGN MESSAGE
(handlers/register-handler-fx
:extensions/ethereum-sign
(fn [{db :db :as cofx} [_ _ {:keys [message data id on-result]}]]
(if (= (nil? message) (nil? data))
{:dispatch (on-result {:error "only one of :message and :data can be used"})}
(fx/merge cofx
{:db (assoc-in db [:wallet :send-transaction]
{:id id
:from (ethereum/normalized-address (get-in db [:account/account :address]))
:data (or data (str "0x" (abi-spec/from-utf8 message)))
:on-result [:extensions/wallet-ui-on-result on-result]
:on-error [:extensions/wallet-ui-on-error on-result]
:method constants/web3-personal-sign})}
(navigation/navigate-to-cofx :wallet-sign-message-modal nil)))))