Dan Finlay
f6748f043d
Add loose account development state
2016-12-23 17:22:36 -08:00
Dan Finlay
21af3de43d
Merge branch 'FixMigrationPasswordBug' into ShowDifferentAccounts
2016-12-23 17:10:56 -08:00
Dan Finlay
e95c937569
Add additional migration test
2016-12-23 17:09:24 -08:00
Frankie
fa3e708f34
Merge branch 'dev' into TxManager
2016-12-23 12:48:36 -08:00
Frankie
fde69ea0ba
fix some minor spelling mistakes and clean up code
2016-12-23 12:43:42 -08:00
Dan Finlay
1f15499046
Show a "LOOSE" warning on accounts not belonging to HD Seed phrase
2016-12-22 17:17:20 -08:00
Dan Finlay
a10fe6b6f4
Return keyring metadata on metamask state object
...
Required making the getState methods for both keyringController and metamaskController async.
They both now return promises, and the main metamask-controller.getState method is now nodeified.
Will allow the UI to render loose keys differently than persisted keys.
2016-12-22 17:17:07 -08:00
Kevin Serrano
2ab34760b0
Merge pull request #949 from MetaMask/RemoveLog
...
Remove log
2016-12-22 14:50:52 -08:00
Dan Finlay
1861bf8e2b
Remove log
2016-12-22 14:46:14 -08:00
Dan Finlay
898e96fd6a
Merge pull request #948 from MetaMask/RecoverLostAccounts
...
Auto-Recover accounts lost to BIP44 derivation fix
2016-12-22 14:43:43 -08:00
Dan Finlay
98527c1c25
Fix account injection bug
...
It seems `selectedAddress` was removed from the keyring-controller’s state, and is used to populate the injected current account.
I couldn't help myself, I dug around, I found a PR named [changed all instances of selectedAddress to selectedAccount](f5b0795ac5Fixes #908
2016-12-22 14:43:00 -08:00
Dan Finlay
d3b2698f34
Rename function to be an action
2016-12-22 14:09:10 -08:00
Dan Finlay
9e54e3baa0
Break up migration function
2016-12-22 13:56:45 -08:00
Dan Finlay
291403c13f
Don't bother changing selected accounts since accounts are recovered
2016-12-22 13:45:45 -08:00
Dan Finlay
cf3951c9df
Remove logs
2016-12-22 13:40:12 -08:00
Dan Finlay
0df656850d
Linted
2016-12-21 17:30:10 -08:00
Dan Finlay
ebeaf3b3d6
Restructured migration
...
Migrator now returns a lostAccount array that includes objects
these objects include keys of address and privateKey,
this allows the MetamaskController to restore the lost accounts
even without customizing the idStore or the KeyringController.
Also includes a patch that allows idStore to synchronously export private keys.
2016-12-21 17:21:10 -08:00
Dan Finlay
a3a64afdd5
Return undefined when vault is uninitialized
2016-12-21 17:20:14 -08:00
Dan Finlay
05ce7086f7
Added error when trying to unlock uninitialized vault
2016-12-21 17:19:53 -08:00
Frances Pangilinan
9e1c90eafc
fix merge
2016-12-21 14:46:10 -08:00
Frankie
6f7c23fd28
Merge branch 'dev' into TxManager
2016-12-21 14:31:07 -08:00
Frances Pangilinan
a85c691b71
Remove txManager in keyring controller
2016-12-21 14:06:15 -08:00
Frances Pangilinan
1ebcbe296b
Migrate all tx mutation code out of keyring controller and
...
Fix up txManager to reflect code review requests
2016-12-21 13:41:49 -08:00
Frances Pangilinan
6e78494846
First pass at revision requests
2016-12-21 13:41:32 -08:00
Dan Finlay
73cdf0bfd4
Merge pull request #944 from MetaMask/i938-uri-validation
...
I938 uri validation
2016-12-21 12:04:05 -08:00
Dan Finlay
48f2ae2154
Move old keystore migration code to metamask controller
...
Allows keyring controller to be more generic, less opinionated, and who knows, maybe sooner publishable as its own thing.
2016-12-21 11:02:04 -08:00
Dan Finlay
b3533f9bf7
Fixed another lostAccount test
2016-12-21 10:49:56 -08:00
Kevin Serrano
9110547465
Add to changelog.
2016-12-20 16:45:30 -08:00
Kevin Serrano
aea263a80d
Lint.
2016-12-20 16:45:22 -08:00
Kevin Serrano
572980402d
Validate URIs before entering them in.
2016-12-20 16:41:04 -08:00
Dan Finlay
afcad53ef9
Refine a lostAccount test
2016-12-20 16:11:49 -08:00
Dan Finlay
11c1004a41
Linted
2016-12-20 16:07:24 -08:00
Dan Finlay
553f1769a0
Add lost accounts ui development state
2016-12-20 15:53:38 -08:00
Dan Finlay
931ae5f64a
Make notices confirmation configurable
...
- Confirm button will now dismiss the lost accounts array.
2016-12-20 15:24:08 -08:00
Dan Finlay
de22ab2090
Merge pull request #943 from MetaMask/fixExplorerLink
...
Fix explorer link
2016-12-20 14:14:03 -08:00
Frankie
05e62cbc17
make CHANGELOG more human readable
2016-12-20 14:11:00 -08:00
Frances Pangilinan
10d9cf0912
Add to CHANGELOG.md
2016-12-20 13:52:51 -08:00
Frances Pangilinan
4910e2f9bd
remove network Id 2 from explorer link and Add network Id 3
2016-12-20 13:49:22 -08:00
Dan Finlay
674b268982
Merge pull request #916 from MetaMask/i894-DetectBadAccounts
...
I894 detect bad accounts
2016-12-20 11:50:26 -08:00
Dan Finlay
4fbea1c7b4
Merge pull request #939 from MetaMask/BrowserPassworder
...
Remove encryptor in favor of external browser-passworder
2016-12-20 11:49:40 -08:00
Dan Finlay
35d8f69e80
Merge pull request #942 from MetaMask/Version-2.14.1
...
Version 2.14.1
2016-12-20 11:48:15 -08:00
Dan Finlay
dea658a898
Bump passworder version
2016-12-20 10:24:58 -08:00
Dan Finlay
2988bc0723
Use security patched version of browser-passworder
2016-12-20 09:28:15 -08:00
Dan Finlay
3f2945dce0
Version 2.14.1
2016-12-20 08:58:18 -08:00
Dan Finlay
26f1e6cbd2
Remove encryptor in favor of external browser-passworder
...
I broke out the encryptor lib into its own module on npm called browser-passworder.
2016-12-19 21:55:02 -08:00
Dan Finlay
20d2204ce6
Made changes according to feedback.
2016-12-19 19:32:59 -08:00
Dan Finlay
ead8329877
Merge pull request #937 from MetaMask/i900-forgot-password-flow
...
I900 forgot password flow
2016-12-19 16:01:01 -08:00
Kevin Serrano
9c8345467c
Modify actions to support better transition.
2016-12-19 15:46:09 -08:00
kumavis
f7eec0b282
Merge pull request #936 from MetaMask/MergeMaster
...
Merge master
2016-12-19 18:28:43 -05:00
Kevin Serrano
92ddcba76b
Add to changelog.
2016-12-19 14:56:27 -08:00
