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

2054 Commits

Author SHA1 Message Date
kumavis
36c824889f changelog - add sync rpc eth_uninstallFilter note 2016-11-23 11:00:48 -08:00
kumavis
c0a2eb146a rpc - add sync uninstallFilter support 2016-11-23 10:48:20 -08:00
Dan Finlay
600f5c31db Mostly got async keyringController tests passing 2016-11-23 00:23:41 -08:00
Dan Finlay
c77d355e98 Complete first pass at asyncrhonizing keyring controller 2016-11-22 23:36:11 -08:00
Dan Finlay
2efab79f5b Asynced keyrings and started on controller 2016-11-22 23:16:36 -08:00
Kevin Serrano
ec8b0148f0 Merge pull request #879 from MetaMask/i843-MoveSaltIntoEncryptor
Fix new encryptor implementation
2016-11-22 17:55:22 -08:00
Dan Finlay
05c8658ff3 Fix new encryptor migration logic 2016-11-22 17:41:54 -08:00
Dan Finlay
1e46d858e9 Fix undefined provider menu item 2016-11-22 16:34:02 -08:00
Dan Finlay
822face7a3 Fix password reference 2016-11-22 16:29:46 -08:00
Dan Finlay
427a103083 Merge pull request #878 from MetaMask/i843-MoveSaltIntoEncryptor
Simplify Encryptor API Surface
2016-11-22 16:22:31 -08:00
Dan Finlay
6ebdebc0a5 Remove line of cruft 2016-11-22 16:18:18 -08:00
Dan Finlay
93bbe2c60d Merge pull request #876 from MetaMask/Version-2.13.10
Version 2.13.10
2016-11-22 16:10:50 -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
4b7b0a86d8 Refine isInitialized derivation method 2016-11-22 15:57:48 -08:00
Dan Finlay
7562d49db7 Linted 2016-11-22 15:56:54 -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
Dan Finlay
2966d46fa2 Merge branch 'dev' into i843-MoveSaltIntoEncryptor 2016-11-22 15:36:50 -08:00
Dan Finlay
d9f8a8f9b2 Version 2.13.10 2016-11-22 14:51:33 -08:00
Dan Finlay
c8176c9439 Merge pull request #875 from MetaMask/i868-estimateGasTooHigh-dev
I868 estimate gas too high dev
2016-11-22 14:42:46 -08:00
kumavis
bc39cd7b89 KeyringController - estimateGas->analyzeGasUsage fix gasLimit + detect OOG 2016-11-22 14:28:31 -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
c4056a861a Move state update outside of conditional callback block 2016-11-22 13:13:10 -08:00
kumavis
785fef3449 Merge pull request #872 from MetaMask/i868-estimateGasTooHigh
Improve gas estimation logic
2016-11-22 16:09:18 -05:00
Dan Finlay
869d731319 Restore ropsten link support 2016-11-22 13:00:13 -08:00
Dan Finlay
606c0b7618 Remove callback type check 2016-11-22 12:57:15 -08:00
kumavis
4669f262e2 Merge pull request #857 from MetaMask/i841-RenameMethod
Rename idStoreMigrator method for clarity
2016-11-22 15:55:48 -05:00
Dan Finlay
a67b4d7131 Fix etherscan link generation test 2016-11-22 12:54:27 -08:00
kumavis
e61d792832 Merge pull request #869 from MetaMask/dev-cleanup
Dev Cleanup Package
2016-11-22 15:23:55 -05: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
kumavis
1a8d95f562 Merge pull request #871 from MetaMask/i860-ethjsremove
Phase out ethereumjs-util from encryptor module.
2016-11-22 15:06:03 -05:00
Kevin Serrano
6dad4f1f20
Phase out ethereumjs-util from encryptor module. 2016-11-22 11:17:05 -08:00
Dan Finlay
0289444fcb Merge branch 'dev' into i842-WaitForSeedWord 2016-11-22 10:51:48 -08:00
Kevin Serrano
8261cf232d
Merge branch 'dev' into dev-cleanup 2016-11-22 10:50:15 -08:00
kumavis
b9d73a4b8f Merge pull request #864 from MetaMask/new-faucet
Point to ropsten faucet
2016-11-22 13:46:13 -05:00
Dan Finlay
cffe0c27f3 Merge branch 'master' into new-faucet 2016-11-22 10:31:29 -08:00
Dan Finlay
ca819781cb Merge pull request #866 from MetaMask/new-faucet-dev
Make ropsten faucet button point at the correct url.
2016-11-22 10:30:50 -08:00
Kevin Serrano
d92741c419 Merge pull request #856 from MetaMask/i835-OrganizeKeyrings
I835 organize keyrings
2016-11-22 10:26:16 -08:00
Kevin Serrano
2df6ebbd10 Merge pull request #855 from MetaMask/i834-RopstenLinks
Add ropsten link support
2016-11-22 10:23:01 -08:00
Kevin Serrano
17669e4af8
Make ropsten faucet button point at the correct url. 2016-11-22 10:20:59 -08:00
Kevin Serrano
8d2afccdc0
Ropsten has sole access to the faucet. 2016-11-22 10:13:57 -08:00
Dan Finlay
136296aad6 Began moving salt into encryptor 2016-11-22 09:52:43 -08:00
Kevin Serrano
88ed1f191f
Add to changelog. 2016-11-22 09:45:28 -08:00
Dan Finlay
ea56426b23 Use callback in placeSeedWord method.
When displaying seed words, we were not using a callback, which had some race condition potential.  This is simply a little cleaner and more correct.

Fixes #842
2016-11-21 20:08:36 -08:00
Dan Finlay
9fb96128e6 Rename idStoreMigrator method for clarity
Fixes #841
2016-11-21 19:52:56 -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