5251fb373f
Modify forgot password flow to go back to init screen.
2016-11-23 13:05:02 -08:00
ec8b0148f0
Merge pull request #879 from MetaMask/i843-MoveSaltIntoEncryptor
...
Fix new encryptor implementation
2016-11-22 17:55:22 -08:00
05c8658ff3
Fix new encryptor migration logic
2016-11-22 17:41:54 -08:00
1e46d858e9
Fix undefined provider menu item
2016-11-22 16:34:02 -08:00
822face7a3
Fix password reference
2016-11-22 16:29:46 -08:00
427a103083
Merge pull request #878 from MetaMask/i843-MoveSaltIntoEncryptor
...
Simplify Encryptor API Surface
2016-11-22 16:22:31 -08:00
6ebdebc0a5
Remove line of cruft
2016-11-22 16:18:18 -08:00
358440384c
Fix vault migration unit test
2016-11-22 16:07:35 -08:00
607a474c3f
Improve vault migration unit test
2016-11-22 16:05:37 -08:00
4b7b0a86d8
Refine isInitialized derivation method
2016-11-22 15:57:48 -08:00
7562d49db7
Linted
2016-11-22 15:56:54 -08:00
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
2966d46fa2
Merge branch 'dev' into i843-MoveSaltIntoEncryptor
2016-11-22 15:36:50 -08:00
c8176c9439
Merge pull request #875 from MetaMask/i868-estimateGasTooHigh-dev
...
I868 estimate gas too high dev
2016-11-22 14:42:46 -08:00
bc39cd7b89
KeyringController - estimateGas->analyzeGasUsage fix gasLimit + detect OOG
2016-11-22 14:28:31 -08:00
e14efa8f17
Merge pull request #858 from MetaMask/i842-WaitForSeedWord
...
I842 wait for seed word
2016-11-22 16:18:43 -05:00
c4056a861a
Move state update outside of conditional callback block
2016-11-22 13:13:10 -08:00
869d731319
Restore ropsten link support
2016-11-22 13:00:13 -08:00
606c0b7618
Remove callback type check
2016-11-22 12:57:15 -08:00
4669f262e2
Merge pull request #857 from MetaMask/i841-RenameMethod
...
Rename idStoreMigrator method for clarity
2016-11-22 15:55:48 -05:00
a67b4d7131
Fix etherscan link generation test
2016-11-22 12:54:27 -08:00
e61d792832
Merge pull request #869 from MetaMask/dev-cleanup
...
Dev Cleanup Package
2016-11-22 15:23:55 -05:00
1a8d95f562
Merge pull request #871 from MetaMask/i860-ethjsremove
...
Phase out ethereumjs-util from encryptor module.
2016-11-22 15:06:03 -05:00
6dad4f1f20
Phase out ethereumjs-util from encryptor module.
2016-11-22 11:17:05 -08:00
0289444fcb
Merge branch 'dev' into i842-WaitForSeedWord
2016-11-22 10:51:48 -08:00
8261cf232d
Merge branch 'dev' into dev-cleanup
2016-11-22 10:50:15 -08:00
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
d92741c419
Merge pull request #856 from MetaMask/i835-OrganizeKeyrings
...
I835 organize keyrings
2016-11-22 10:26:16 -08:00
17669e4af8
Make ropsten faucet button point at the correct url.
2016-11-22 10:20:59 -08:00
136296aad6
Began moving salt into encryptor
2016-11-22 09:52:43 -08:00
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
9fb96128e6
Rename idStoreMigrator method for clarity
...
Fixes #841
2016-11-21 19:52:56 -08:00
60afc41bb6
Fix keyring test
2016-11-21 19:47:45 -08:00
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
ecfda5bcc5
Revert premature link test fix
2016-11-21 19:39:19 -08:00
be6b7b496a
Fixed account link test for ropsten network
2016-11-21 19:18:46 -08:00
17d63acaed
Fix camel casing on setSelectedAccount action.
2016-11-21 18:16:59 -08:00
3577aa4649
Added instructions for installing local build
2016-11-21 18:16:45 -08:00
1cbab788ec
Change fauceting to become a response of an emit.
2016-11-21 16:46:26 -08:00
f5b0795ac5
change all instances of selectedAddress to selectedAccount.
2016-11-21 16:21:16 -08:00
9123e70434
Remove entropy from encryption and project.
2016-11-21 15:49:03 -08:00
7cf6e372eb
Merge pull request #837 from MetaMask/FixMenuItem
...
Fix custom provider menu item
2016-11-21 12:19:54 -08:00
db5a4eab71
Merge pull request #833 from MetaMask/i831-AddRopsten-Dev
...
Begin adding Ropsten support to dev
2016-11-21 12:18:31 -08:00
bb06f5803d
Add development states.js back into repo
2016-11-21 11:54:16 -08:00
6ae2400ef2
Fix custom provider menu item
...
The Custom RPC menu item in the provider menu would not appear when Localhost:8545 was selected.
2016-11-21 11:45:31 -08:00
7ab9d40820
Merge branch 'dev' into i831-AddRopsten-Dev
2016-11-21 11:03:32 -08:00
e8a8302624
Begin adding Ropsten support
...
Ropsten links will still not work until Etherscan publishes their ropsten link format.
At that time we will need to update ui/lib/account-link.js
Otherwise, fixes #831
2016-11-21 10:58:49 -08:00
268f6e10f3
Merge pull request #830 from MetaMask/kumavis-patch-1
...
meta - README - add npm start to instructions
2016-11-21 10:12:16 -08:00
277bffc9b0
meta - README - add npm start to instructions
...
thanks @karlfloersch
2016-11-21 09:34:31 -08:00
7021c7708c
Merge pull request #827 from MetaMask/currency-cleanup
...
Convert conversion-util to pure json.
2016-11-18 17:52:32 -08:00
Kevin Serrano
Dan Finlay
Dan Finlay
kumavis
kumavis