Commit Graph

4398 Commits

Author SHA1 Message Date
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
Kevin Serrano accee14282
Remove old conversion list. 2017-09-26 10:35:13 -07:00
Kevin Serrano 7b199e215d
Polish names on currency list. 2017-09-26 10:11:18 -07:00
Kevin Serrano 88ddedfb5a
Account for undefined currencies. 2017-09-26 10:09:50 -07:00
Kevin Serrano 31e9dcf470
Modify tests for new API. 2017-09-26 10:02:49 -07:00
Dan Finlay 57b5f15265 Remove slack link 2017-09-26 10:01:16 -07:00
Kevin Serrano 16ba2e6a30
Merge branch 'master' into new-currency-test 2017-09-26 09:51:20 -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
frankiebee 4979f5902f bump metamascara version 2017-09-22 20:04:58 -07:00
tmashuang d4578836c9 Most of transaction controller tests 2017-09-22 16:15:18 -07:00
kumavis 87fc44c45a Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-fixes-moar 2017-09-22 15:24:26 -07:00
kumavis 8ad74cf93a deps - bump filter deps and add random missing deps 2017-09-22 15:16:42 -07:00
Dan Finlay 443b1a8eb7 Remove keyring controller from project 2017-09-22 14:38:40 -07:00
Dan Finlay aa2abc00eb Merge branch 'AddBalanceController' into BreakOutKeyringController 2017-09-22 14:30:31 -07:00
kumavis dd45592641 metamask - use provider-engines block tracker 2017-09-22 14:22:07 -07:00
kumavis 15195bca75 deps - bump provider engine for block tracker 2017-09-22 14:20:44 -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
kumavis 2ca2df1832 deps - bump eth-block-tracker 2017-09-22 13:58:46 -07:00
Dan Finlay 977405fc7d Remove dead code from eth-store 2017-09-22 13:33:53 -07:00
Dan Finlay 08b36b9b58 Allow metamaskController to define keyring types 2017-09-22 13:29:13 -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
Alex Lunyov bfaacd3118 Wildcard for infura.io permissions, added permission for cryptonator api 2017-09-22 12:14:04 +08:00
kumavis 0a5ae39509 bug - fix event emitter mem leak warning 2017-09-21 17:37:30 -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