Frankie
56d400b0f8
Merge branch 'master' into upToDate
2017-01-20 14:01:58 -08:00
Frankie
03b3e2f880
Merge pull request #1037 from MetaMask/i1034-seed-export
...
keyring controller - placeSeedWords should use first hdKeyring
2017-01-20 13:56:50 -08:00
kumavis
9c6cf90538
keyring controller - placeSeedWords should use first hdKeyring
2017-01-20 13:52:21 -08:00
Kevin Serrano
a09332f937
Merge pull request #1029 from MetaMask/i715-AddJsonImport
...
Add JSON file account import
2017-01-19 10:58:33 -08:00
Dan Finlay
b478ce5b77
Bump changelog
2017-01-18 17:24:41 -08:00
Dan Finlay
9f1884145a
Merge branch 'dev' into i715-AddJsonImport
2017-01-18 17:24:12 -08:00
kumavis
29cbfd1ea2
Merge pull request #1030 from MetaMask/master
...
Merge master into dev
2017-01-18 17:23:41 -08:00
Dan Finlay
5d8a3dd99b
Add ability to import v3 JSON wallets
...
There is now a menu item labeled "JSON File" for importing, and it can digest either:
- v1 MyEtherWallet JSON files
- v3 Account files (used by Geth, Mist, and MyEtherWallet).
Fixes #715
2017-01-18 16:45:39 -08:00
Dan Finlay
9126652f2e
Implement naieve JSON file importing
...
Doesn't work on any JSON file I have, it's a very naieve strategy provided by ethereumjs-wallet. Will need to raise its sophistication before deploying to production.
2017-01-18 16:15:25 -08:00
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
Dan Finlay
25e5793992
Merge pull request #1027 from MetaMask/Version-3.1.0
...
Version 3.1.0
2017-01-18 13:14:27 -08:00
Dan Finlay
0e01abdf71
Merge branch 'master' into Version-3.1.0
2017-01-18 12:25:35 -08:00
Dan Finlay
99ce68b4f6
Version 3.1.0
2017-01-18 12:23:48 -08:00
Dan Finlay
9ab7ce370b
Merge pull request #1024 from MetaMask/fixSignedVsSubmitted
...
Fix the dissplay for submitted transactions...
2017-01-18 12:17:29 -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
Frankie
9e58505942
Add to CHANGELOG
2017-01-18 12:10:49 -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
Frankie
e3650b336a
Merge branch 'master' into fixSignedVsSubmitted
2017-01-18 11:30:41 -08:00
Frankie
460cbb985f
Fix the dissplay for submitted transactions and the listner wating to hear when tx's were included in a block
2017-01-18 11:24:53 -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
