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

Convert address to checksum address before testing for eip55 

Signed-off-by: Igor Mandrigin <i@mandrigin.ru>
This commit is contained in:
Andrea Maria Piana 2019-02-25 13:47:16 +01:00 committed by Igor Mandrigin
parent 1c972a4ad5
commit 25118052df
No known key found for this signature in database
GPG Key ID: 4A0EDDE26E66BC8B
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/status_im/ui/screens/wallet/choose_recipient/events.cljs
View File

@ -82,7 +82,9 @@
:ens-name recipient :ens-name recipient
:cb #(re-frame/dispatch [:wallet.send/set-recipient %])}} :cb #(re-frame/dispatch [:wallet.send/set-recipient %])}}
(if (ethereum/address? recipient) (if (ethereum/address? recipient)
(if (eip55/valid-address-checksum? recipient) (if (-> recipient
ethereum/address->checksum
eip55/valid-address-checksum?)
{:db (assoc-in db [:wallet :send-transaction :to] recipient) {:db (assoc-in db [:wallet :send-transaction :to] recipient)
:dispatch [:navigate-back]} :dispatch [:navigate-back]}
{:ui/show-error (i18n/label :t/wallet-invalid-address-checksum {:data recipient})}) {:ui/show-error (i18n/label :t/wallet-invalid-address-checksum {:data recipient})})

4
src/status_im/utils/ethereum/core.cljs
View File

@ -48,6 +48,10 @@
(when s (when s
(.isAddress dependencies/Web3.prototype s))) (.isAddress dependencies/Web3.prototype s)))
(defn address->checksum [s]
(when s
(.toChecksumAddress dependencies/Web3.prototype s)))
(defn network->chain-id [network] (defn network->chain-id [network]
(get-in network [:config :NetworkId])) (get-in network [:config :NetworkId]))