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
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
frankiebee
14b9d16ece
platforms: put context for extension in platform extension class
2017-09-21 11:12:04 -07:00
Alex Lunyov
7256894f51
Fix CORS issues in FireFox
2017-09-21 15:13:53 +08:00
Kevin Serrano
b22783a223
Merge branch 'master' into new-currency-test
2017-09-20 09:40:33 -07:00
frankiebee
418f01411e
mascara: turn off background
2017-09-19 16:48:42 -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
frankiebee
daeb7f6ad3
update metamascara
2017-09-19 12:58:51 -07:00
frankiebee
4e57cdf8b3
stub platform
2017-09-19 11:34:19 -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
frankiebee
90482934f1
Merge branch 'master' into breakout-mascara
2017-09-19 10:45:51 -07:00
frankiebee
bfd75107f1
add context to platform to not have X-Metamask-Origin in mascara
2017-09-19 10:45:32 -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
frankiebee
29dd81d029
require metamascara
2017-09-18 19:08:02 -07:00
Kevin Serrano
bd8428e9ed
Comply with current currency API and add additional styling.
2017-09-18 16:09:01 -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
Frankie
6204afb156
Merge pull request #2119 from MetaMask/mascara-tests2
...
tests - integration - re-add mascara to normal run
2017-09-18 14:33:40 -07:00
