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

[19759] Import private key - backend integration 

Fix
This commit is contained in:
Rende11 2024-06-11 00:05:33 +03:00
parent 3634edab42
commit b957fce841
No known key found for this signature in database
GPG Key ID: 399DEC86128408A9
7 changed files with 112 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/status_im/contexts/wallet/add_account/create_account/events.cljs
View File

@ -85,9 +85,10 @@
(rf/reg-event-fx :wallet/store-account-generated store-account-generated)
(defn generate-account-for-keypair
[{:keys [db]} [{:keys [keypair-name]}]]
[{:keys [db]} [{:keys [keypair-name workflow]}]]
(let [seed-phrase (-> db :wallet :ui :create-account :new-keypair :seed-phrase)]
{:fx [[:effects.wallet/create-account-from-mnemonic
{:db (assoc-in db [:wallet :ui :create-account :new-keypair :workflow] workflow)
:fx [[:effects.wallet/create-account-from-mnemonic
{:mnemonic-phrase (security/safe-unmask-data seed-phrase)
:paths [constants/path-default-wallet]
:on-success (fn [new-account-data]
@ -99,7 +100,7 @@
(defn clear-create-account-data
[{:keys [db]}]
{:db (update-in db [:wallet :ui :create-account] dissoc :new-keypair)})
{:db (update-in db [:wallet :ui :create-account] dissoc :new-keypair :workflow)})
(rf/reg-event-fx :wallet/clear-create-account clear-create-account-data)
@ -202,3 +203,38 @@
derived-from-address
%)}]]]}))
(rf/reg-event-fx
:wallet/set-seed-phrase
(fn [{:keys [db]} [{:keys [seed-phrase on-success]}]]
{:db (assoc-in db [:wallet :ui :create-account :new-keypair :seed-phrase] seed-phrase)
:fx [on-success]}))
(defn import-private-key-and-create-keypair-with-account
[{:keys [db]} [{:keys [password account-preferences]}]]
(let [private-key (get-in db [:wallet :ui :create-account :private-key])
unmasked-private-key (security/safe-unmask-data private-key)
unmasked-password (security/safe-unmask-data password)]
{:json-rpc/call
[{:method "accounts_importPrivateKey"
:params [unmasked-private-key unmasked-password]
:on-success [:wallet/import-and-create-keypair-with-account
{:passord password
:account-preferences account-preferences}]
:on-error #(log/error "Failed to import private key" %)}]}))
(rf/reg-event-fx
:wallet/import-private-key-and-create-keypair-with-account
import-private-key-and-create-keypair-with-account)
(rf/reg-event-fx
:wallet/import-private-key-and-generate-account-for-keypair
(fn [_ [{:keys [keypair-name]}]]
{:effects.wallet/get-random-mnemonic
{:on-success
#(rf/dispatch
[:wallet/set-seed-phrase
{:seed-phrase %
:on-success [:dispatch
[:wallet/generate-account-for-keypair
{:keypair-name keypair-name
:workflow :workflow-new-keypair/import-private-key}]]}])}}))

4
src/status_im/contexts/wallet/add_account/create_account/import_private_key/view.cljs
View File

@ -90,7 +90,7 @@
:style style/indicator)
(i18n/label message)])))
(defn on-unmount
(defn on-mount
[]
(rf/dispatch [:wallet/clear-private-key-data]))
@ -112,7 +112,7 @@
public-address (rf/sub [:wallet/public-address])
[flow-state set-flow-state] (rn/use-state nil)
error? (= :invalid-private-key flow-state)]
(rn/use-unmount on-unmount)
(rn/use-mount on-mount)
[rn/view {:flex 1}
[floating-button-page/view
{:customization-color customization-color

5
src/status_im/contexts/wallet/add_account/create_account/key_pair_name/view.cljs
View File

@ -4,7 +4,6 @@
[quo.core :as quo]
[react-native.core :as rn]
[status-im.common.floating-button-page.view :as floating-button-page]
[status-im.common.not-implemented :as not-implemented]
[status-im.common.validation.general :as validators]
[status-im.constants :as constants]
[status-im.contexts.wallet.add-account.create-account.key-pair-name.style :as style]
@ -25,9 +24,9 @@
(defn- next-workflow-step
[workflow key-pair-name]
(case workflow
;; TODO issue #19759. Implement creation account from private key
:import-private-key
(not-implemented/alert)
(rf/dispatch [:wallet/import-private-key-and-generate-account-for-keypair
{:keypair-name key-pair-name}])
(:new-keypair :recovery-phrase)
(rf/dispatch [:wallet/generate-account-for-keypair

0
src/status_im/contexts/wallet/add_account/create_account/new_keypair/keypair_name/view.cljs
View File

3
src/status_im/contexts/wallet/add_account/create_account/select_keypair/view.cljs
View File

@ -23,7 +23,8 @@
:add-divider? true
:on-press #(rf/dispatch [:navigate-to :screen/wallet.enter-seed-phrase
{:recovering-keypair? true}])}
(when (ff/enabled? ::wallet.import-private-key)
;; TODO FIX before merge
(when (or true (ff/enabled? ::wallet.import-private-key))
{:icon :i/key
:accessibility-label :import-private-key
:label (i18n/label :t/import-private-key)

44
src/status_im/contexts/wallet/add_account/create_account/view.cljs
View File

@ -21,12 +21,6 @@
(defn- get-keypair-data
[{:keys [title primary-keypair? new-keypair? derivation-path customization-color]}]
(let [formatted-path (string/replace derivation-path #"/" " / ")
on-auth-success (fn [password]
(rf/dispatch [:navigate-to
:screen/wallet.edit-derivation-path
{:password password
:current-derivation-path formatted-path}]))]
[{:title title
:image (if primary-keypair? :avatar :icon)
:image-props (if primary-keypair?
@ -40,6 +34,14 @@
:alignment :flex-start}
:description :text
:description-props {:text (i18n/label :t/on-device)}}
(when-not (string/blank? derivation-path)
(let [formatted-path (string/replace derivation-path #"/" " / ")
on-auth-success (fn [password]
(rf/dispatch [:navigate-to
:screen/wallet.edit-derivation-path
{:password password
:current-derivation-path formatted-path}]))]
{:title (i18n/label :t/derivation-path)
:image :icon
:image-props :i/derivated-path
@ -52,7 +54,7 @@
:icon-left :i/face-id
:alignment :flex-start}
:description :text
:description-props {:text formatted-path}}]))
:description-props {:text formatted-path}}))])
(defn- avatar
[{:keys [account-color emoji on-select-emoji]}]
@ -157,15 +159,29 @@
[{:keys [on-change-text set-account-color set-emoji]
{:keys [account-name account-color emoji]}
:state}]
(let [on-auth-success (fn [password]
(let [on-auth-success-mnemonic
(fn [password]
(rf/dispatch
[:wallet/import-and-create-keypair-with-account
{:password password
:account-preferences {:account-name @account-name
:color @account-color
:emoji @emoji}}]))
on-auth-success-import-private-key
(fn [password]
(rf/dispatch
[:wallet/import-private-key-and-create-keypair-with-account
{:password password
:account-preferences {:account-name @account-name
:color @account-color
:emoji @emoji}}]))]
(fn [{:keys [customization-color keypair-name]}]
(let [{:keys [new-account-data]} (rf/sub [:wallet/create-account-new-keypair])]
(fn [{:keys [customization-color keypair-name workflow]}]
(let [{:keys [new-account-data]} (rf/sub [:wallet/create-account-new-keypair])
derivation-path (when (not= workflow :workflow-new-keypair/import-private-key)
constants/path-default-wallet)
on-auth-success (if (= workflow :workflow-new-keypair/import-private-key)
on-auth-success-import-private-key
on-auth-success-mnemonic)]
[floating-button
{:account-color @account-color
:slide-button-props {:on-auth-success on-auth-success
@ -183,7 +199,7 @@
{:account-color @account-color
:set-account-color set-account-color}]
[new-account-origin
{:derivation-path constants/path-default-wallet
{:derivation-path derivation-path
:customization-color customization-color
:keypair-title keypair-name}]]))))
@ -249,7 +265,7 @@
(fn []
(let [customization-color (rf/sub [:profile/customization-color])
;; Having a keypair means the user is importing it or creating it.
{:keys [keypair-name]} (rf/sub [:wallet/create-account-new-keypair])]
{:keys [keypair-name workflow]} (rf/sub [:wallet/create-account-new-keypair])]
(rn/use-unmount #(rf/dispatch [:wallet/clear-create-account]))
@ -260,7 +276,9 @@
:set-account-color set-account-color
:set-emoji set-emoji
:state state
:keypair-name keypair-name}]
:keypair-name keypair-name
:workflow workflow}]
[derive-account-variant
{:customization-color customization-color
:on-change-text on-change-text

5
src/status_im/contexts/wallet/effects.cljs
View File

@ -13,6 +13,11 @@
[kw]
(-> kw symbol str))
(rf/reg-fx
:effects.wallet/get-random-mnemonic
(fn [{:keys [on-success]}]
(native-module/get-random-mnemonic on-success)))
(rf/reg-fx
:effects.wallet/create-account-from-mnemonic
(fn [{:keys [mnemonic-phrase paths on-success]