1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Commit Graph

1976 Commits

Author SHA1 Message Date
Dan Finlay
ff3f6cc36a Bind ethQuery to estimateGas to allow it to be moved around. 2016-11-29 14:13:12 -08:00
Dan Finlay
85d5b12f8d Fix tx adding code
Broken in this commit:
bc39cd7b89

Synchronous methods were added to an `async.waterfall` array.

This commit also removes the delegate call checking, since we concluded it was misinformed.
2016-11-29 12:46:08 -08:00
Dan Finlay
4b6b1db4f0 Ordered keyringController methods the same in metamask-controller 2016-11-29 12:05:23 -08:00
Dan Finlay
b81f00849d Annotated KeyringController 2016-11-29 11:40:49 -08:00
Dan Finlay
12906df601 Remove unused dep 2016-11-28 17:27:44 -08:00
Dan Finlay
9d401f9137 Fix nodeify usage 2016-11-28 17:27:28 -08:00
Dan Finlay
9e764b1935 Fix nodeify 2016-11-28 17:27:20 -08:00
Dan Finlay
80e76b45ee Denodeify most of KeyringController
Mostly Fixes #893

A couple methods cache callbacks, and will require a larger refactor to fully denodeify.

Specifically, our methods involving web3 requests to sign a tx, sign a message, and approve or cancel either of those.

I think we should postpone those until the TxManager refactor, since it will likely handle this response caching itself.
2016-11-28 16:13:03 -08:00
Kevin Serrano
da5be09a94 Merge pull request #890 from MetaMask/MergeMasterIntoDev
Merge master into dev
2016-11-28 13:22:27 -08:00
Dan Finlay
46bb9558d5 Merge pull request #891 from MetaMask/Version-2.13.11
Version 2.13.11
2016-11-28 11:41:07 -08:00
Dan Finlay
44a2f2ad9d Version 2.13.11 2016-11-23 16:59:48 -08:00
Dan Finlay
b899119582 Merge branch 'master' into dev 2016-11-23 16:54:27 -08:00
Kevin Serrano
b9b3ef8fed Merge pull request #887 from MetaMask/i865-erabe
Modify forgot password flow to go back to init screen.
2016-11-23 15:48:13 -08:00
Kevin Serrano
8dd298238d
Cosmetic changes, rename links. 2016-11-23 15:42:17 -08:00
Kevin Serrano
feae6235cb Merge pull request #888 from MetaMask/i844-AsyncKeyrings
Modify Keyring protocol to always return promises for public methods
2016-11-23 15:31:17 -08:00
Kevin Serrano
3a503d2ac2
Add link back to unlock. 2016-11-23 15:29:42 -08:00
Dan Finlay
9f67974133 Fix last async keyring test 2016-11-23 14:39:35 -08:00
Dan Finlay
d9dc2eac63 Fix more async usage of KeyringController 2016-11-23 14:35:29 -08:00
Kevin Serrano
5a02e58f62
Fix proper behavior for restoring accounts when password forgotten. 2016-11-23 13:49:54 -08:00
Kevin Serrano
5251fb373f
Modify forgot password flow to go back to init screen. 2016-11-23 13:05:02 -08:00
Dan Finlay
230a0ab876 Fix more keyring asyncifying tests 2016-11-23 11:58:34 -08:00
kumavis
323f3cb1a0 Merge pull request #884 from MetaMask/i883-sync-uninstallFilter
Add support for sync RPC uninstallFilter
2016-11-23 14:29:21 -05:00
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