1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-15 14:17:11 +01:00
Commit Graph

2567 Commits

Author SHA1 Message Date
Dan Finlay
6b8db04f0f Merge remote-tracking branch 'origin/i727-provider-is-metamask' into RevertTxManager 2017-01-02 17:34:35 -08:00
Dan Finlay
2dbbc0dce7 Merge remote-tracking branch 'origin/kumavis-readme-gource' into RevertTxManager 2017-01-02 17:32:51 -08:00
Dan Finlay
305cda4265 Use chainId parameter instead of second argument 2017-01-02 15:31:05 -08:00
Dan Finlay
af2c7004b0 Make single letter variables more verbose 2017-01-02 15:08:18 -08:00
Dan Finlay
7320095079 Linted 2017-01-02 14:54:31 -08:00
Dan Finlay
d2fb48f8ba Bump changelog 2017-01-02 14:41:04 -08:00
Dan Finlay
9c6c277b8b Add replay protection to Transaction Manager
Fixes #897

Needs tests.
2017-01-02 14:38:04 -08:00
Dan Finlay
25d0ac1476 Merge branch 'dev' into ShowDifferentAccounts 2017-01-02 14:04:27 -08:00
Dan Finlay
edc5f9e821 Add tolerance for hex prefixed private keys to simple keychain 2017-01-02 13:55:43 -08:00
Frankie
fb002dc44e Merge pull request #954 from MetaMask/kumavis-readme-gource
Readme - add gource instructions to readme
2017-01-02 12:49:37 -08:00
Frankie
d461fe6fdc Merge pull request #955 from MetaMask/i727-provider-is-metamask
inpage-provider - add isMetaMask
2017-01-02 12:39:30 -08:00
kumavis
616721f47d inpage-provider - add isMetaMask
adds `metamaskInpageProvider.isMetaMask === true`
Fixes #727
2017-01-02 12:20:09 -08:00
kumavis
fc9c03d4d1 meta - readme - add gource instructions 2017-01-02 12:09:56 -08:00
kumavis
fc723e7f7c Merge pull request #921 from MetaMask/TxManager
Feature: TxManager handles transaction state tracking
2017-01-02 14:30:00 -05:00
Dan Finlay
5e8a344f97 Correct getState test to be async 2016-12-23 18:40:36 -08:00
Dan Finlay
c05e04c611 Fix rendering of loose accounts 2016-12-23 17:23:33 -08:00
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](f5b0795ac5) by @Zanibas.  Sorry, Kevin!  Had you actually changed all instances, this bug would not have happened.

Fixes #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