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
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
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
Dan Finlay
f128240e7f
Fix test references
2017-09-22 14:19:14 -07:00
Dan Finlay
128cf40f91
Fix accont-tracker merge bug
2017-09-22 14:16:19 -07:00
Dan Finlay
f01b0a818b
Fix account-tracker references
2017-09-22 14:13:56 -07:00
Dan Finlay
f9d2f523c6
Merge branch 'master' into AddBalanceController
2017-09-22 14:12:41 -07:00
Dan Finlay
d2a747e57e
Fix computed-balances controller reference
2017-09-22 14:06:54 -07:00
Dan Finlay
11c8c07bfc
Refactor eth-store into account-tracker
...
EthStore was only being used for tracking account balances and nonces now, so I removed its block-tracking duties, renamed it account-tracker, and removed it as a dependency from `KeyringController`, so that KRC can go live on without a hard dep on it.
2017-09-22 13:59:25 -07:00
Dan Finlay
977405fc7d
Remove dead code from eth-store
2017-09-22 13:33:53 -07:00
Dan Finlay
4c971ebfd1
Define encryptor in constructor params instead of platform object
2017-09-22 13:25:08 -07:00
Dan Finlay
e9b7fd9018
Patch security update
2017-09-22 10:41:14 -07:00
Dan Finlay
b25d4d5cfb
Add platform docs including encryptor param
2017-09-21 15:56:47 -07:00
Dan Finlay
bd117d6b71
Merge branch 'master' into ConfigurableEncryption
2017-09-21 15:56:24 -07:00
Dan Finlay
e9043f22df
Allow custom encryptor to be passed to MetaMaskController and KeyringControllers.
2017-09-21 15:47:25 -07:00
kumavis
73d9434ad6
Merge pull request #2104 from MetaMask/AddPlatformGuide
...
Add guide to porting to new platforms
2017-09-21 15:43:53 -07:00
Dan Finlay
8a874824a8
Version 3.10.3
2017-09-21 11:45:33 -07:00
Frankie
9bd55f4897
Merge pull request #2129 from MetaMask/json-rpc-engine-bump
...
Json rpc engine bump
2017-09-19 14:37:43 -07:00
kumavis
3a3e1511e5
changelog - add note on filter fixes
2017-09-19 11:30:06 -07:00
kumavis
77e02d264a
Merge branch 'master' of github.com:MetaMask/metamask-plugin into json-rpc-engine-bump
2017-09-19 11:27:49 -07:00
kumavis
b979c6a2f3
deps - bump json-rpc-middleware-stream
2017-09-19 11:22:55 -07:00
kumavis
d2ded61cc9
deps - bump json-rpc-engine
2017-09-19 10:54:41 -07:00
Frankie
166bd55a43
Merge pull request #2126 from MetaMask/v3.10.2-1
...
v3.10.2
2017-09-19 09:58:09 -07:00
kumavis
0424ab3e48
v3.10.2 - changelog
...
add changelog
2017-09-18 22:44:40 -07:00
kumavis
51b40adecd
v3.10.2
...
published `v3.10.2` as an emergency rollback to `v3.10.0`
2017-09-18 22:42:04 -07:00
Frankie
7094d96529
Merge pull request #2121 from MetaMask/i2115-DoNotFailOnRetries
...
Do not mark a retry tx failed that has been broadcast successfully
2017-09-18 14:42:55 -07:00
Dan Finlay
92e738d17c
Bump changelog
2017-09-18 14:37:28 -07:00
Dan Finlay
2b7b1db851
Do not mark a retry tx failed that has been broadcast successfully
...
Fixes #2115
If a tx has been braodcast, the only failures we should accept are:
- Never mined
- On chain failure
We had a section of code that would mark a tx failed during any unknown error during a retry.
Now no retry > 1 will ever mark a tx failed, since it has been broadcast, and may be mined.
2017-09-18 14:34:25 -07:00
