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
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
kumavis
4c1b7700ad
Merge branch 'dev' into TearDownOnDisconnect
2017-01-05 14:25:31 -05:00
kumavis
00ac5ca058
Merge branch 'dev' into TearDownOnDisconnect
2017-01-05 14:18:34 -05:00
Dan Finlay
73ee0ae766
Merge branch 'dev' into fixTxManager
2017-01-05 11:18:13 -08:00
Frankie
e62f70660d
MetaMask Controller - Convert to EventEmitter
2017-01-05 11:06:18 -08:00
Dan Finlay
7659f5894a
Combine two identical then blocks
2017-01-05 11:03:30 -08:00
Frankie
cf6817092b
remove unnecessary try statments
2017-01-04 15:03:45 -08:00
Dan Finlay
6c99d09404
Fixed bugs with sanity-checking
...
- Was incorrectly calling some eth-query methods (left over from old local eth-query)
- Was still passing block to getAccount in addAccount
- Now emitting update only after all account balances are loaded, reducing UI update traffic.
2017-01-04 14:54:40 -08:00
Dan Finlay
ead8a05034
Fix dependency reference
2017-01-04 14:21:36 -08:00
Dan Finlay
a107b66854
Caught typo
2017-01-04 14:15:53 -08:00
Dan Finlay
18e6d266c1
Add descriptive comment
2017-01-04 14:07:08 -08:00
Dan Finlay
381a60695d
Linted
2017-01-04 14:05:00 -08:00
Dan Finlay
3588aabdf2
Removed reliance on eth-store internal custom eth-query
2017-01-04 14:01:32 -08:00
Dan Finlay
08351f801a
Move eth-store@1.1.0 into local repo.
2017-01-04 13:56:21 -08:00
Frankie
32e8063a77
clean up
2017-01-04 13:13:34 -08:00
Frankie
354fa763d4
Merge branch 'dev' into fixtTxManager
2017-01-04 13:05:29 -08:00
Frankie
e6da8e2762
Fix signing of transactions
2017-01-04 13:04:33 -08:00
Dan Finlay
33b4d213f1
Fix sendUpdate for new promisified getState method
2017-01-03 11:15:38 -08:00
Dan Finlay
1b9906372b
Update UI state on ethStore updates
...
UI was remarkably not relying on ethStore for updates, so things like account balances were frozen until user activity.
Fixes #963
2017-01-03 11:10:20 -08:00
Dan Finlay
af2c7004b0
Make single letter variables more verbose
2017-01-02 15:08:18 -08:00
Dan Finlay
25d0ac1476
Merge branch 'dev' into ShowDifferentAccounts
2017-01-02 14:04:27 -08:00
Dan Finlay
edc5f9e821
Add tolerance for hex prefixed private keys to simple keychain
2017-01-02 13:55:43 -08:00
kumavis
616721f47d
inpage-provider - add isMetaMask
...
adds `metamaskInpageProvider.isMetaMask === true`
Fixes #727
2017-01-02 12:20:09 -08:00
Dan Finlay
21af3de43d
Merge branch 'FixMigrationPasswordBug' into ShowDifferentAccounts
2016-12-23 17:10:56 -08:00
Dan Finlay
e95c937569
Add additional migration test
2016-12-23 17:09:24 -08:00
Frankie
fa3e708f34
Merge branch 'dev' into TxManager
2016-12-23 12:48:36 -08:00
Frankie
fde69ea0ba
fix some minor spelling mistakes and clean up code
2016-12-23 12:43:42 -08:00
Dan Finlay
a10fe6b6f4
Return keyring metadata on metamask state object
...
Required making the getState methods for both keyringController and metamaskController async.
They both now return promises, and the main metamask-controller.getState method is now nodeified.
Will allow the UI to render loose keys differently than persisted keys.
2016-12-22 17:17:07 -08:00
Dan Finlay
1861bf8e2b
Remove log
2016-12-22 14:46:14 -08:00
Dan Finlay
898e96fd6a
Merge pull request #948 from MetaMask/RecoverLostAccounts
...
Auto-Recover accounts lost to BIP44 derivation fix
2016-12-22 14:43:43 -08:00
Dan Finlay
98527c1c25
Fix account injection bug
...
It seems `selectedAddress` was removed from the keyring-controller’s state, and is used to populate the injected current account.
I couldn't help myself, I dug around, I found a PR named [changed all instances of selectedAddress to selectedAccount](f5b0795ac5Fixes #908
2016-12-22 14:43:00 -08:00
Dan Finlay
9e54e3baa0
Break up migration function
2016-12-22 13:56:45 -08:00
