1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 09:57:02 +01:00
Commit Graph

168 Commits

Author SHA1 Message Date
Dan Finlay
b899119582 Merge branch 'master' into dev 2016-11-23 16:54:27 -08:00
Dan Finlay
9f67974133 Fix last async keyring test 2016-11-23 14:39:35 -08:00
Dan Finlay
230a0ab876 Fix more keyring asyncifying tests 2016-11-23 11:58:34 -08:00
Dan Finlay
600f5c31db Mostly got async keyringController tests passing 2016-11-23 00:23:41 -08:00
Dan Finlay
05c8658ff3 Fix new encryptor migration logic 2016-11-22 17:41:54 -08:00
Dan Finlay
822face7a3 Fix password reference 2016-11-22 16:29:46 -08:00
Dan Finlay
358440384c Fix vault migration unit test 2016-11-22 16:07:35 -08:00
Dan Finlay
607a474c3f Improve vault migration unit test 2016-11-22 16:05:37 -08:00
Dan Finlay
de8da9ddf6 Simplify Encryptor API Surface
At least, the portion of it that we use.

Moved salting within the encryptor, so it does not need to be managed externally.

KeyringController now caches the password instead of a passwordDerivedKey, since it is ignorant of the salt.

Encryptor payload is now in a JSON format, so its portions are both base64 encoded *and* labeled appropriately.  The format is `{ "data": "0x0", "iv": "0x0", "salt": "string" }`.

Fixes #843
Fixes #859
2016-11-22 15:54:51 -08:00
kumavis
e14efa8f17 Merge pull request #858 from MetaMask/i842-WaitForSeedWord
I842 wait for seed word
2016-11-22 16:18:43 -05:00
Dan Finlay
a67b4d7131 Fix etherscan link generation test 2016-11-22 12:54:27 -08:00
kumavis
49a1f43736 Merge branch 'master' into i868-estimateGasTooHigh 2016-11-22 15:14:25 -05:00
kumavis
fa2f0dee28 idStore - fix estimateGas calculation 2016-11-22 12:10:49 -08:00
Kevin Serrano
8261cf232d
Merge branch 'dev' into dev-cleanup 2016-11-22 10:50:15 -08:00
Dan Finlay
60afc41bb6 Fix keyring test 2016-11-21 19:47:45 -08:00
Dan Finlay
e2a9e1cd4a Unify test wording 2016-11-21 19:45:05 -08:00
Dan Finlay
694f34ae9a Add temporary morden explorer link support 2016-11-21 19:43:59 -08:00
Dan Finlay
ced36eb201 Improve Keyring organization
Separated public & private methods. (Fixes #845)
Made class method `type()` into a simple property. (Fixes #846)
2016-11-21 19:40:58 -08:00
Dan Finlay
ecfda5bcc5 Revert premature link test fix 2016-11-21 19:39:19 -08:00
Dan Finlay
daec4d5c36 Fix ropsten link test 2016-11-21 19:19:34 -08:00
Dan Finlay
be6b7b496a Fixed account link test for ropsten network 2016-11-21 19:18:46 -08:00
Kevin Serrano
f5b0795ac5
change all instances of selectedAddress to selectedAccount. 2016-11-21 16:21:16 -08:00
Kevin Serrano
9123e70434
Remove entropy from encryption and project. 2016-11-21 15:49:03 -08:00
Kevin Serrano
3cd839d27f
Create failing test to check submitPassword in keyringController. 2016-11-18 15:40:12 -08:00
Kevin Serrano
a4666de0ce
Minimize repeated code. 2016-11-15 13:31:22 -08:00
Kevin Serrano
7de6b12aad
Re-enable disclaimer screen. Rename variables to reflect role more clearly. 2016-11-14 16:49:16 -08:00
Kevin Serrano
92edc63d6e
Add idStore tests again. 2016-11-14 16:23:52 -08:00
Kevin Serrano
eea3bfb0b3
Rename n variables to numberOfAccounts inside of test suite. Remove idStore tests. 2016-11-11 17:06:37 -08:00
Frankie
f665b779cb Merge branch 'master' into i328-MultiVault 2016-11-10 16:53:47 -08:00
Dan Finlay
7068d2e71c Adjust gas buffer to be 20% over estimate 2016-11-08 08:39:41 -08:00
Dan Finlay
6f39924e60 Increase gas buffer
Fixes #795
2016-11-08 08:32:34 -08:00
Dan Finlay
161ff62fdc Merge branch 'master' into i328-MultiVault 2016-11-07 15:38:25 -08:00
Dan Finlay
93c0a6826a Fix integration test suite 2016-11-07 14:11:01 -08:00
Dan Finlay
798e057854 Fix nickname test 2016-11-07 12:19:56 -08:00
Dan Finlay
7b420c6e15 Fix BN reference 2016-11-07 12:18:02 -08:00
Dan Finlay
553a6da011 Fix 787 gas buffer bug 2016-11-07 12:00:14 -08:00
Dan Finlay
1896928562 Fix gas price buffering
Our gas price buffering logic had a bug, because bn.js has inconsistent behavior when using hex-prefixed output.  The issue has been opened with them here:
https://github.com/indutny/bn.js/issues/151

We've corrected our usage in the mean time.
2016-11-07 11:56:20 -08:00
Dan Finlay
fff5a6765e Added failing test for #787 2016-11-07 11:25:23 -08:00
Dan Finlay
ba7d6b437f Fix password validation and persistence issue
Was wiping the vault on each successful password attempt... :P
2016-11-03 16:14:37 -07:00
Dan Finlay
e0246975a7 Finish fixing nicknaming bug 2016-11-03 13:44:29 -07:00
Dan Finlay
bd2a429a85 Fix account nicknaming bug
When nicknaming, we weren't normalizing the input, and so we were retrieving with differently formatted addresses than we were persisting.
2016-11-03 11:59:20 -07:00
Dan Finlay
9ca3c57339 Fix vault creation bug 2016-11-03 11:34:57 -07:00
Dan Finlay
185396ff08 Fix dual vault creation bug 2016-11-02 16:35:46 -07:00
Dan Finlay
4cf1b606e4 Fix handling of migrating old vault style
Now old vaults are recognized as an "Initialized" MetaMask instance.

Upon logging in, when fetching the initial password-derived key, if there is no new-style vault, but there is an old style vault, it is migrated to the new format before proceeding through the usual unlocking steps.
2016-11-02 15:04:50 -07:00
Dan Finlay
18e5173f06 Now migrating old vaults to new DEN format 2016-10-29 02:29:25 -07:00
Dan Finlay
331d9c91ee Add vault migration test 2016-10-28 13:26:14 -07:00
Dan Finlay
2690d1acfd Added hd wallet tests 2016-10-27 17:23:26 -07:00
Dan Finlay
6c469a1826 Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault 2016-10-25 17:00:19 -07:00
Dan Finlay
f9ff6cb55e Merge branch 'master' into i328-MultiVault 2016-10-25 16:59:58 -07:00
Kevin Serrano
b3cb3e9ec6
Remove debugger statement. 2016-10-25 13:24:57 -07:00