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
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
Dan Finlay
9203b8c305
Version 3.0.0
2017-01-16 14:14:06 -08:00
kumavis
82012cbbce
keyring - simple - throw error if wallet not found for address
2017-01-16 11:54:59 -08:00
kumavis
e7cf0f4bdd
keyring - simple - fix address generation
2017-01-16 11:49:31 -08:00
kumavis
ef81bde98b
eth-store - emit update on new account add
2017-01-14 21:46:40 -08:00
kumavis
f49fb149cc
background - txManager - filter txs by network
2017-01-14 21:29:46 -08:00
kumavis
c3d491a37c
background - return txHash to provider-engine on done
2017-01-14 20:51:29 -08:00
Frankie
fdcf03f57d
Fix the inclusion of the txFee in the meta tx object
2017-01-14 13:32:35 -08:00
Frankie
87505e1742
fix for linting
2017-01-13 18:01:50 -08:00
Frankie
580d93188c
Satisfy review needs:
...
removed unnecessary this.query = opts.query from constructor
Created a tx error state for errors in approveTransaction
validateTxParams has been moved to tx-utils
removed "value" arg from _setTxStatus
2017-01-13 17:47:20 -08:00
Frankie
212ef0b850
fix the maxcost not being included in txMeta
2017-01-13 16:53:10 -08:00
kumavis
d06c54e0b7
Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin into bug-submitTx
2017-01-13 15:51:36 -08:00
kumavis
d755b66e20
background - metamask controller - fix 'this' ref
2017-01-13 15:51:08 -08:00
kumavis
9f162e72b4
Merge branch 'dev' into bug-submitTx
2017-01-13 13:26:57 -08:00
Frankie
1ffaab1d9b
Merge branch 'dev' into integrateTxManagerUI
2017-01-13 11:31:51 -08:00
Frankie
5ed52eed68
Clean up code
2017-01-13 10:44:22 -08:00
kumavis
29e83d71a8
background - handle tx finalization in controllers instead of provider-engine
2017-01-13 02:00:11 -08:00
kumavis
65ba9fc39e
bugfix - portstream - dont wrap cb in try catch
2017-01-11 19:09:49 -08:00
Frankie
f9efb0817d
Merge branch 'dev' into integrateTxManagerUI
2017-01-11 16:07:03 -08:00
Frankie
576e2ad64d
Fix wording and icon of failed txs
2017-01-11 15:44:21 -08:00
Dan Finlay
d87a7b2a76
Send update to UI when changing selected account
...
Fixes #981
2017-01-11 15:15:37 -08:00
kumavis
89a5eff270
currency conversion - less noisy error
2017-01-11 14:40:35 -08:00
Frankie
bbd2f2738b
Add to CHANGELOG
2017-01-11 12:23:00 -08:00
Frankie
0b59dafc34
Merge branch 'dev' into integrateTxManagerUI
2017-01-11 12:17:17 -08:00
Frankie
0fae263a9a
Take some of the tx Logic out of the UI and create a visble state for pending and unaproved transactions
2017-01-11 12:16:37 -08:00
kumavis
26e4ff40e1
rpc - fix sync account cache setting
2017-01-11 02:33:57 -08:00
kumavis
61637c738b
web3 provider - override eth_syncing and web3_clientVersion
2017-01-11 00:46:44 -08:00
Dan Finlay
21e2e4efd8
Remove erroneous OOG estimation logic.
2017-01-10 14:20:46 -08:00
kumavis
b301c0fb48
deps - replace promise-request with fetch
2017-01-10 12:04:26 -08:00
