kumavis
bb1ee8e649
Merge branch 'dev' of github.com:MetaMask/metamask-plugin into obs-store2
2017-01-24 16:09:57 -08:00
Frankie
4f39e8192c
Merge pull request #1054 from MetaMask/i#1048
...
Background - Extracts primary account code from keyring controller
2017-01-24 15:44:02 -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
23c2b0b9a5
Merge pull request #1050 from MetaMask/fixConfTxBalanceLogic
...
Fix conf tx balance logic
2017-01-24 15:00:46 -08:00
Frankie
8ed657d5d5
fix base
2017-01-24 14:54:38 -08:00
kumavis
bef4b78196
merge master hotfix into dev
2017-01-24 14:23:54 -08:00
kumavis
ffe588365c
Merge pull request #1053 from MetaMask/3.1.2
...
Release 3.1.2
2017-01-24 14:09:42 -08:00
kumavis
e2b2e6d5e1
3.1.2
2017-01-24 14:04:29 -08:00
kumavis
44d0fcf0af
Merge pull request #1052 from MetaMask/hotfix1048
...
hotfix - dont assume hd keyring position
2017-01-24 14:02:26 -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
42bb90341d
add to CHANGELOG
2017-01-24 13:21:15 -08:00
Frankie
b2623510ae
Fix issue where ConfTx view lets you approve txs when the account has insufficient balance
2017-01-24 13:19:26 -08:00
Frankie
de88a49243
add to CHANGELOG
2017-01-24 12:29:20 -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
kumavis
247f7aad5e
Merge pull request #1042 from MetaMask/upToDate
...
keep dev Up to date
2017-01-20 14:46:40 -08:00
Frankie
c587d0f7db
Merge branch 'master' into upToDate
2017-01-20 14:40:22 -08:00
kumavis
85b34e3f2b
Merge pull request #1040 from MetaMask/3.1.1
...
3.1.1
2017-01-20 14:33:44 -08:00
kumavis
389a104f0d
3.1.1
2017-01-20 14:29:07 -08:00
kumavis
03c58343a3
Merge pull request #1039 from MetaMask/upToDate
...
Keep dev up to date with master
2017-01-20 14:09:06 -08:00
Frankie
56d400b0f8
Merge branch 'master' into upToDate
2017-01-20 14:01:58 -08:00
Frankie
03b3e2f880
Merge pull request #1037 from MetaMask/i1034-seed-export
...
keyring controller - placeSeedWords should use first hdKeyring
2017-01-20 13:56:50 -08:00
kumavis
9c6cf90538
keyring controller - placeSeedWords should use first hdKeyring
2017-01-20 13:52:21 -08:00
Kevin Serrano
a09332f937
Merge pull request #1029 from MetaMask/i715-AddJsonImport
...
Add JSON file account import
2017-01-19 10:58:33 -08:00
Dan Finlay
b478ce5b77
Bump changelog
2017-01-18 17:24:41 -08:00
Dan Finlay
9f1884145a
Merge branch 'dev' into i715-AddJsonImport
2017-01-18 17:24:12 -08:00
kumavis
29cbfd1ea2
Merge pull request #1030 from MetaMask/master
...
Merge master into dev
2017-01-18 17:23:41 -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
9126652f2e
Implement naieve JSON file importing
...
Doesn't work on any JSON file I have, it's a very naieve strategy provided by ethereumjs-wallet. Will need to raise its sophistication before deploying to production.
2017-01-18 16:15:25 -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
25e5793992
Merge pull request #1027 from MetaMask/Version-3.1.0
...
Version 3.1.0
2017-01-18 13:14:27 -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
Dan Finlay
9ab7ce370b
Merge pull request #1024 from MetaMask/fixSignedVsSubmitted
...
Fix the dissplay for submitted transactions...
2017-01-18 12:17:29 -08:00
kumavis
28212d167c
Merge pull request #1022 from MetaMask/i715-AddImportMenu
...
Add ability to import private keys
2017-01-18 12:15:58 -08:00
kumavis
3273f507f7
Merge branch 'dev' into i715-AddImportMenu
2017-01-18 12:15:43 -08:00
Frankie
9e58505942
Add to CHANGELOG
2017-01-18 12:10:49 -08:00
Dan Finlay
4a0f330a06
Merge pull request #1026 from MetaMask/i1023-badTxHash
...
Bump changelog
2017-01-18 12:06:34 -08:00
kumavis
b2c52f6b83
Merge branch 'dev' into i715-AddImportMenu
2017-01-18 11:49:15 -08:00
Dan Finlay
81a16fb107
Bump changelog
2017-01-18 11:48:34 -08:00
Dan Finlay
e29ed3b70b
Merge pull request #1025 from MetaMask/i1023-badTxHash
...
tx-manager - use rpc-specified txHash
2017-01-18 11:42:21 -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
3572708fda
Fix test to log out despite number of menu items
2017-01-17 16:49:08 -08:00
