1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-24 11:01:41 +01:00
Commit Graph

2169 Commits

Author SHA1 Message Date
Dan Finlay
b52346388b Added new modular private key import system
Now any strategy for importing a private key that can be described as a pure function can be very easily turned into a MetaMask import strategy.

I've created a generic and reusable UI action called `importNewAccount(strategy, args)`.

The `strategy` is a unique identifier defined in `app/scripts/account-import-strategies`, and the `args` will be passed to the member of the `strategies` array whose key matches the strategy string.

Strategies return private key hex strings, and are used by the metamask-controller to create a new keyring, and select that new account, before calling back.

This also implements @frankiebee's idea of showing the imported account when it's been imported (my oversight!).

This commit only moves us to this architecture, keeping feature parity for private key import, but has some untested code for importing geth-style JSON files as well!
2017-01-18 15:20:48 -08:00
kumavis
28212d167c Merge pull request #1022 from MetaMask/i715-AddImportMenu
Add ability to import private keys
2017-01-18 12:15:58 -08:00
kumavis
3273f507f7 Merge branch 'dev' into i715-AddImportMenu 2017-01-18 12:15:43 -08:00
Dan Finlay
4a0f330a06 Merge pull request #1026 from MetaMask/i1023-badTxHash
Bump changelog
2017-01-18 12:06:34 -08:00
kumavis
b2c52f6b83 Merge branch 'dev' into i715-AddImportMenu 2017-01-18 11:49:15 -08:00
Dan Finlay
81a16fb107 Bump changelog 2017-01-18 11:48:34 -08:00
Dan Finlay
e29ed3b70b Merge pull request #1025 from MetaMask/i1023-badTxHash
tx-manager - use rpc-specified txHash
2017-01-18 11:42:21 -08:00
kumavis
3b7301488f tx-manager - use rpc-specified txHash 2017-01-18 11:33:37 -08:00
Dan Finlay
3572708fda Fix test to log out despite number of menu items 2017-01-17 16:49:08 -08:00
Dan Finlay
8055113e68 Bump changelog 2017-01-17 16:35:57 -08:00
Dan Finlay
693aa50e7f Remove outdated reference 2017-01-17 16:35:11 -08:00
Dan Finlay
9ed6381c5d Remove unused UI files 2017-01-17 16:31:12 -08:00
Dan Finlay
1ff4894b67 Allow importing of private key strings
Fixes #1021

A top-right menu item now allows `Account Import`.  It has a menu (with one item for now) that allows importing a private key string.

Errors are displayed, and a success navigates the user to their account list, where the imported account is labeled `LOOSE`.
2017-01-17 16:24:45 -08:00
Dan Finlay
958cbfbde4 Merge branch 'i328-MultiVault-v1' into i715-AddImportMenu 2017-01-17 13:58:54 -08:00
Dan Finlay
77bd010543 Add "import account" menu item + template view 2017-01-17 13:47:30 -08:00
Dan Finlay
1f2840a7be Merge pull request #1017 from MetaMask/conversion-api-err
Conversion api err
2017-01-17 12:14:27 -08:00
Dan Finlay
c53932a19a Merge branch 'dev' into conversion-api-err 2017-01-17 12:08:47 -08:00
Dan Finlay
a245fb7d22 Merge pull request #1019 from MetaMask/i1014-FixSigning
dev - fix signing
2017-01-17 12:08:03 -08:00
kumavis
56070cd138 Merge branch 'dev' into i1014-FixSigning 2017-01-17 00:21:32 -08:00
Dan Finlay
a208ed1d83 Version 3.0.1 2017-01-17 00:14:25 -08:00
Dan Finlay
8fcade92d3 Fix bug where signed messages were not dismissed 2017-01-17 00:13:38 -08:00
Dan Finlay
7ae2e005ed Fix removeHexPrefix to stripHexPrefix 2017-01-17 00:03:56 -08:00
Dan Finlay
54c536e72c Fix message signing UI rendering
[A recent PR](https://github.com/MetaMask/metamask-plugin/pull/1004) removed logic that rendered pending messages for approval.

This commit fixes that.
2017-01-16 23:59:25 -08:00
Dan Finlay
665d6c5406 Bump changelog 2017-01-16 23:58:25 -08:00
kumavis
4bc09be647 Merge pull request #1016 from MetaMask/i1014-FixSigning
dev: fix signing
2017-01-16 23:39:03 -08:00
kumavis
0bd38ae69a Merge branch 'dev' into i1014-FixSigning 2017-01-16 23:34:19 -08:00
Dan Finlay
d5ad84aa12 Wrote fix for eth.sign 2017-01-16 23:26:48 -08:00
Dan Finlay
7e886dff77 Wrote failing test for eth.sign 2017-01-16 23:26:37 -08:00
kumavis
3b61723064 Merge pull request #1012 from MetaMask/RemoveOldNotice
Remove old notice
2017-01-16 19:03:10 -08:00
Dan Finlay
fe6c84e40b Remove old notice
This notice is not relevant to new users, should be removed.
2017-01-16 15:41:28 -08:00
kumavis
528ceff07c Merge pull request #1011 from MetaMask/dev
Equalize Master and Dev
2017-01-16 15:26:16 -08:00
kumavis
575ef1afbd Merge pull request #1010 from MetaMask/master
Equalize Master and Dev
2017-01-16 15:22:20 -08:00
kumavis
7401e4f67f Merge pull request #1009 from MetaMask/FixManifest
Fix manifest version
2017-01-16 15:21:37 -08:00
kumavis
0af48b6dce Merge branch 'master' into FixManifest 2017-01-16 15:03:45 -08:00
Dan Finlay
5de6eaf35d Fix manifest version 2017-01-16 15:02:52 -08:00
kumavis
ee62a6a391 Merge pull request #1005 from MetaMask/dev
Merge dev into master!
2017-01-16 15:02:24 -08:00
Dan Finlay
88fabdd2de Merge pull request #1008 from MetaMask/Version-3.0.0
Version 3.0.0
2017-01-16 14:21:59 -08:00
Dan Finlay
9203b8c305 Version 3.0.0 2017-01-16 14:14:06 -08:00
Dan Finlay
c05b783466 Merge pull request #1007 from MetaMask/simple-keystore-fix
keyring - simple - fix address generation
2017-01-16 12:20:39 -08:00
kumavis
053066b57f Merge branch 'dev' into simple-keystore-fix 2017-01-16 12:10:04 -08:00
kumavis
4a09f856d1 test - keyring - simple - fix fixture data 2017-01-16 12:08:20 -08:00
kumavis
82012cbbce keyring - simple - throw error if wallet not found for address 2017-01-16 11:54:59 -08:00
kumavis
e7cf0f4bdd keyring - simple - fix address generation 2017-01-16 11:49:31 -08:00
Dan Finlay
ac6a2b4b61 Bump changelog to mention BIP44 fix 2017-01-16 10:59:01 -08:00
Dan Finlay
5dd5619e5d Merge branch 'master' into dev 2017-01-16 10:55:32 -08:00
Dan Finlay
15e91f823c Merge pull request #1004 from MetaMask/doubleRenderIssue
Dont render conf-tx if their are no txParams to show
2017-01-16 10:12:49 -08:00
Frankie
83468cbd03 add to CHANGELOG 2017-01-14 23:12:53 -08:00
Frankie
6481f9ced4 Dont render conf-tx if their are no txParams to show 2017-01-14 22:59:05 -08:00
Frankie
86c0eaa5a4 Merge pull request #1002 from MetaMask/bug-submitTx
handle tx finalization in controllers instead of provider-engine
2017-01-14 22:51:13 -08:00
kumavis
85634326e8 test - clear localStorage on test start 2017-01-14 22:35:26 -08:00