Commit Graph

797 Commits

Author SHA1 Message Date
kumavis 13e2003469 metamask - subscribe metamask store to keyringController substate 2017-01-28 22:12:15 -08:00
kumavis 4dd6ba9c1b migration 5 - move keyring controller state to substate 2017-01-28 19:19:03 -08:00
kumavis e9cdbf4f89 keyring - add and initialize obs-store 2017-01-28 13:12:12 -08:00
kumavis 1fd1746744 metamask - adopt shapeshift txs from keyringController 2017-01-27 23:05:29 -08:00
kumavis 3afd0ef27d tests - remove persistence and start with initial state 2017-01-27 23:04:34 -08:00
kumavis ad9531d521 metamask - organize methods 2017-01-27 19:35:03 -08:00
kumavis efcd22905a metamask - fix setupProviderConnection 2017-01-26 23:03:11 -08:00
kumavis 95b846ba07 keymanager - small clean 2017-01-26 22:31:06 -08:00
kumavis 9ab8362843 metamask controller - cleanup remote api 2017-01-26 22:30:12 -08:00
kumavis fc1b11e373 metamask - organize into sections 2017-01-26 21:19:09 -08:00
kumavis 832772414e metamask - use web3-stream-provider/handler instead of manual wiring 2017-01-26 21:18:17 -08:00
kumavis 2113979be7 metamask controller - adopt setup*Communication from background 2017-01-26 20:52:46 -08:00
kumavis fc3a53ec7b background - stream disconnection fix 2017-01-26 20:18:28 -08:00
kumavis 2f79781ab9 metamask controller - adopt clearSeedWords from keyring controller 2017-01-26 20:17:36 -08:00
kumavis dc86ddebb7 background - graceful publicConfigStore connection teardown 2017-01-26 16:07:35 -08:00
kumavis af115aa4c1 background - organize metamask instantiation 2017-01-26 15:09:31 -08:00
kumavis 76ce348a04 obs-store - use published module 2017-01-24 19:47:00 -08:00
kumavis a06ee45404 migrations - rename 005 to stubbed _multi-keyring 2017-01-24 16:30:42 -08:00
kumavis bb1ee8e649 Merge branch 'dev' of github.com:MetaMask/metamask-plugin into obs-store2 2017-01-24 16:09:57 -08:00
kumavis 70b8e640f0 Merge branch 'dev' into i#1048 2017-01-24 15:39:33 -08:00
kumavis 463a56ff54 background controller - extract KeyringC.placeSeedWords to MetamaskC 2017-01-24 15:33:33 -08:00
kumavis bef4b78196 merge master hotfix into dev 2017-01-24 14:23:54 -08:00
kumavis e2b2e6d5e1 3.1.2 2017-01-24 14:04:29 -08:00
Frankie 5811f2ab14 Merge pull request #1051 from MetaMask/hotfix1048
hotfix - addNewAccount  - dont assume hd keyring position
2017-01-24 13:38:24 -08:00
kumavis 745fff0c80 hotfix - dont assume hd keyring position 2017-01-24 13:29:48 -08:00
kumavis 01c88bb0bd keyring-controller - cleanup 2017-01-24 13:22:26 -08:00
kumavis 8049c1fc07 keyring-controller - cleanup 2017-01-24 13:21:55 -08:00
Frankie 48ffea0142 Move the assumption of their only being one hd keyring when requesting seed words to metamaskController 2017-01-24 12:28:05 -08:00
Frankie 8642ced310 Fix issue where generating a new account would put it in loose keys 2017-01-24 12:06:59 -08:00
kumavis 74dc20bdf1 Merge branch 'dev' into obs-store2 2017-01-21 10:06:50 -08:00
Frankie c587d0f7db Merge branch 'master' into upToDate 2017-01-20 14:40:22 -08:00
kumavis 389a104f0d 3.1.1 2017-01-20 14:29:07 -08:00
Frankie 56d400b0f8 Merge branch 'master' into upToDate 2017-01-20 14:01:58 -08:00
kumavis 9c6cf90538 keyring controller - placeSeedWords should use first hdKeyring 2017-01-20 13:52:21 -08:00
Dan Finlay 9f1884145a Merge branch 'dev' into i715-AddJsonImport 2017-01-18 17:24:12 -08:00
Dan Finlay 5d8a3dd99b Add ability to import v3 JSON wallets
There is now a menu item labeled "JSON File" for importing, and it can digest either:
- v1 MyEtherWallet JSON files
- v3 Account files (used by Geth, Mist, and MyEtherWallet).

Fixes #715
2017-01-18 16:45:39 -08:00
Dan Finlay b52346388b Added new modular private key import system
Now any strategy for importing a private key that can be described as a pure function can be very easily turned into a MetaMask import strategy.

I've created a generic and reusable UI action called `importNewAccount(strategy, args)`.

The `strategy` is a unique identifier defined in `app/scripts/account-import-strategies`, and the `args` will be passed to the member of the `strategies` array whose key matches the strategy string.

Strategies return private key hex strings, and are used by the metamask-controller to create a new keyring, and select that new account, before calling back.

This also implements @frankiebee's idea of showing the imported account when it's been imported (my oversight!).

This commit only moves us to this architecture, keeping feature parity for private key import, but has some untested code for importing geth-style JSON files as well!
2017-01-18 15:20:48 -08:00
Dan Finlay 0e01abdf71 Merge branch 'master' into Version-3.1.0 2017-01-18 12:25:35 -08:00
Dan Finlay 99ce68b4f6 Version 3.1.0 2017-01-18 12:23:48 -08:00
kumavis b2c52f6b83 Merge branch 'dev' into i715-AddImportMenu 2017-01-18 11:49:15 -08:00
kumavis 3b7301488f tx-manager - use rpc-specified txHash 2017-01-18 11:33:37 -08:00
Frankie e3650b336a Merge branch 'master' into fixSignedVsSubmitted 2017-01-18 11:30:41 -08:00
Frankie 460cbb985f Fix the dissplay for submitted transactions and the listner wating to hear when tx's were included in a block 2017-01-18 11:24:53 -08:00
Dan Finlay 1ff4894b67 Allow importing of private key strings
Fixes #1021

A top-right menu item now allows `Account Import`.  It has a menu (with one item for now) that allows importing a private key string.

Errors are displayed, and a success navigates the user to their account list, where the imported account is labeled `LOOSE`.
2017-01-17 16:24:45 -08:00
Dan Finlay c53932a19a Merge branch 'dev' into conversion-api-err 2017-01-17 12:08:47 -08:00
Dan Finlay a208ed1d83 Version 3.0.1 2017-01-17 00:14:25 -08:00
Dan Finlay 8fcade92d3 Fix bug where signed messages were not dismissed 2017-01-17 00:13:38 -08:00
Dan Finlay 7ae2e005ed Fix removeHexPrefix to stripHexPrefix 2017-01-17 00:03:56 -08:00
Dan Finlay d5ad84aa12 Wrote fix for eth.sign 2017-01-16 23:26:48 -08:00
Dan Finlay 5de6eaf35d Fix manifest version 2017-01-16 15:02:52 -08:00