kumavis
|
7d499df8e3
|
account-tracker - remove unused import
|
2017-09-27 14:12:45 -07:00 |
|
kumavis
|
4404dfc5d3
|
Merge branch 'master' into direct-block-tracker
|
2017-09-27 13:58:54 -07:00 |
|
kumavis
|
5bbea78306
|
Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3
Transaction controller refractor pt3
|
2017-09-27 13:57:04 -07:00 |
|
kumavis
|
496fd2a5ba
|
Merge pull request #2190 from MetaMask/Version-3.10.5
Version 3.10.5
|
2017-09-27 13:55:39 -07:00 |
|
kumavis
|
b41aad6d1a
|
style - small whitespace nitpick
|
2017-09-27 12:33:46 -07:00 |
|
kumavis
|
89e690fc79
|
account-tracker - use new block-tracker block format
|
2017-09-27 12:33:00 -07:00 |
|
Dan Finlay
|
1983e161c6
|
Fix accountTracker store references
|
2017-09-27 12:29:09 -07:00 |
|
Dan Finlay
|
a453eb132d
|
Version 3.10.5
|
2017-09-27 12:10:25 -07:00 |
|
Dan Finlay
|
8d3fec42d0
|
Fix bug where block gas limit was incorrectly parsed.
|
2017-09-27 12:09:32 -07:00 |
|
Dan Finlay
|
52976d6edc
|
Merge pull request #2189 from MetaMask/Version-3.10.4
Version 3.10.4
|
2017-09-27 11:54:14 -07:00 |
|
Dan Finlay
|
d77e0aff4d
|
Version 3.10.4
|
2017-09-27 11:15:22 -07:00 |
|
Dan Finlay
|
828dbd7e3f
|
Merge pull request #2155 from MetaMask/filter-fixes-moar
Various fixes you've been waiting for, how exciting!
|
2017-09-27 11:13:06 -07:00 |
|
Dan Finlay
|
e72083f6e8
|
Merge branch 'master' into filter-fixes-moar
|
2017-09-27 10:57:02 -07:00 |
|
kumavis
|
ca0dff06f5
|
Merge pull request #2153 from MetaMask/BreakOutKeyringController
Break out keyring controller into separate module
|
2017-09-27 10:44:52 -07:00 |
|
frankiebee
|
0a94ec41d3
|
pending-tx - move incrementing of the retryCount on the txMeta outside pending-tx-tracker
|
2017-09-26 22:42:59 -07:00 |
|
kumavis
|
1877c0766c
|
Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOutKeyringController
|
2017-09-26 21:42:30 -07:00 |
|
frankiebee
|
b05a6f89cb
|
fix tests
|
2017-09-26 18:19:44 -07:00 |
|
frankiebee
|
36ddaf220d
|
Merge branch 'transactionControllerRefractorPt3' of https://github.com/MetaMask/metamask-extension into transactionControllerRefractorPt3
|
2017-09-26 18:16:00 -07:00 |
|
frankiebee
|
508696f71d
|
transactions: reveal #getFilteredTxList from txStateManage and fix accountTracker.store reference
|
2017-09-26 18:12:53 -07:00 |
|
frankiebee
|
80c98b1653
|
transactions: make evnt names pretty and eaiser to read
|
2017-09-26 16:55:11 -07:00 |
|
frankiebee
|
9fd5458112
|
transactions: lint fixes and reveal status-update event for balance controller
|
2017-09-26 16:54:04 -07:00 |
|
frankiebee
|
8ab23c713d
|
Merge branch 'master' into transactionControllerRefractorPt3
|
2017-09-26 16:24:43 -07:00 |
|
Kevin Serrano
|
6ca519e97c
|
Merge pull request #2183 from MetaMask/Fix2094
Fix 2094 related issues
|
2017-09-26 15:17:24 -07:00 |
|
Dan Finlay
|
651098c70d
|
Remove duplicate instantiation of account-tracker
|
2017-09-26 14:30:29 -07:00 |
|
Dan Finlay
|
2eca5455c0
|
Move obs store into account-tracker instead of inheriting
|
2017-09-26 14:15:16 -07:00 |
|
kumavis
|
ff5e8746be
|
Merge pull request #2180 from MetaMask/proxy-blockTracker
Wrap block tracker in events proxy
|
2017-09-26 14:09:17 -07:00 |
|
frankiebee
|
9d1cb0f76d
|
network contoller - clean up unused code
|
2017-09-26 13:56:09 -07:00 |
|
frankiebee
|
4f887c6a62
|
fix test
|
2017-09-26 13:44:45 -07:00 |
|
frankiebee
|
2ed8d579da
|
listen for the blocke event on the block tracker instead of rawBlock on the provider
|
2017-09-26 13:38:27 -07:00 |
|
frankiebee
|
b654eb9b1f
|
wrap block tracker in events proxy
|
2017-09-26 13:38:27 -07:00 |
|
Dan Finlay
|
3bedcd3582
|
Restore blockGasLimit to account-tracker
|
2017-09-26 13:36:41 -07:00 |
|
Dan Finlay
|
b1daa5ae26
|
Merge pull request #2094 from MetaMask/AddBalanceController
Calculate balance based on pending txs
|
2017-09-26 11:46:28 -07:00 |
|
Dan Finlay
|
9e3648c668
|
Pass blocktracker to balances controller
|
2017-09-26 11:33:36 -07:00 |
|
Thomas Huang
|
d135c3c9ca
|
Merge pull request #2174 from MetaMask/i2162-TokenPrecision
Fix token precision bug
|
2017-09-26 11:32:32 -07:00 |
|
kumavis
|
50633fbba6
|
Merge pull request #2170 from MetaMask/greenkeeper/sinon-4.0.0
Update sinon to the latest version 🚀
|
2017-09-26 09:49:12 -07:00 |
|
Dan Finlay
|
5d300f146a
|
Add computed balance to mock state
|
2017-09-26 09:38:43 -07:00 |
|
Dan Finlay
|
b46cb3ecb5
|
Fix token precision bug
Had fixed this before in the dependency, but hadn't merged in that version bump yet :(
Fixes #2162
|
2017-09-26 09:25:04 -07:00 |
|
greenkeeper[bot]
|
e52d52b22e
|
chore(package): update sinon to version 4.0.0
|
2017-09-26 08:22:48 +00:00 |
|
tmashuang
|
ff6f7b52e4
|
Clean up transactionController tests
|
2017-09-25 19:47:03 -07:00 |
|
Dan Finlay
|
1968d61431
|
Make encryptor configurable for keyring-controller
|
2017-09-25 15:23:37 -07:00 |
|
Dan Finlay
|
feed9a5a17
|
Add mock random value generator
|
2017-09-25 14:45:28 -07:00 |
|
Dan Finlay
|
fd985e7ec1
|
Merge branch 'master' into AddBalanceController
|
2017-09-25 14:44:04 -07:00 |
|
Dan Finlay
|
674aac83ce
|
Make blockTracker an independent param
|
2017-09-25 14:39:54 -07:00 |
|
Dan Finlay
|
d9c92cdbd1
|
Merge branch 'AddBalanceController' of github.com:MetaMask/metamask-plugin into AddBalanceController
|
2017-09-25 14:37:11 -07:00 |
|
Dan Finlay
|
8cd7329c91
|
Implemented feedback
|
2017-09-25 14:36:49 -07:00 |
|
kumavis
|
9bbb0ca1ea
|
Merge pull request #2143 from MetaMask/Version-3.10.3
Version 3.10.3
|
2017-09-25 12:55:45 -07:00 |
|
Dan Finlay
|
dfbdb99858
|
Merge branch 'master' into AddBalanceController
|
2017-09-25 11:49:38 -07:00 |
|
kumavis
|
95afdfe368
|
Merge pull request #2145 from MetaMask/ConfigurableEncryption
Configurable encryption
|
2017-09-25 11:46:04 -07:00 |
|
Dan Finlay
|
40f1d08684
|
Made some requested changes
|
2017-09-25 11:42:08 -07:00 |
|
tmashuang
|
20fea3f1de
|
Remove pending updateAndApprovedTransaction test
|
2017-09-25 10:47:36 -07:00 |
|