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

[#11398] Error at attempt to sign typed message in simpledapp.eth 

Signed-off-by: andrey <motor4ik@gmail.com>
This commit is contained in:
andrey 2020-11-09 10:19:22 +01:00
parent 627e1d0e14
commit b1ea04900e
No known key found for this signature in database
GPG Key ID: 89B67245FD2F0272
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/status_im/browser/core.cljs
View File

@ -323,14 +323,14 @@
(defn normalize-sign-message-params (defn normalize-sign-message-params
"NOTE (andrey) we need this function, because params may be mixed up" "NOTE (andrey) we need this function, because params may be mixed up"
[params] [params typed?]
(let [[first-param second-param] params] (let [[first-param second-param] params]
(when (and (string? first-param) (string? second-param)) (when (and (string? first-param) (string? second-param))
(cond (cond
(ethereum/address? first-param) (ethereum/address? first-param)
[first-param (normalize-message second-param)] [first-param (if typed? second-param (normalize-message second-param))]
(ethereum/address? second-param) (ethereum/address? second-param)
[second-param (normalize-message first-param)])))) [second-param (if typed? second-param (normalize-message first-param))]))))
(fx/defn send-to-bridge (fx/defn send-to-bridge
[cofx message] [cofx message]
@ -339,20 +339,21 @@
(fx/defn web3-send-async (fx/defn web3-send-async
[cofx {:keys [method params id] :as payload} message-id] [cofx {:keys [method params id] :as payload} message-id]
(let [message? (constants/web3-sign-message? method) (let [message? (constants/web3-sign-message? method)
dapps-address (get-in cofx [:db :multiaccount :dapps-address])] dapps-address (get-in cofx [:db :multiaccount :dapps-address])
typed? (not= constants/web3-personal-sign method)]
(if (or message? (= constants/web3-send-transaction method)) (if (or message? (= constants/web3-send-transaction method))
(let [[address data] (cond (and (= method constants/web3-keycard-sign-typed-data) (let [[address data] (cond (and (= method constants/web3-keycard-sign-typed-data)
(not (vector? params))) (not (vector? params)))
;; We don't use signer argument for keycard sign-typed-data ;; We don't use signer argument for keycard sign-typed-data
["0x0" params] ["0x0" params]
message? (normalize-sign-message-params params) message? (normalize-sign-message-params params typed?)
:else [nil nil])] :else [nil nil])]
(when (or (not message?) (and address data)) (when (or (not message?) (and address data))
(signing/sign cofx (merge (signing/sign cofx (merge
(if message? (if message?
{:message {:address address {:message {:address address
:data data :data data
:typed? (not= constants/web3-personal-sign method) :typed? typed?
:pinless? (= method constants/web3-keycard-sign-typed-data) :pinless? (= method constants/web3-keycard-sign-typed-data)
:from dapps-address}} :from dapps-address}}
{:tx-obj (update (first params) :from #(or % dapps-address))}) {:tx-obj (update (first params) :from #(or % dapps-address))})