1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Commit Graph

480 Commits

Author SHA1 Message Date
Dan Finlay
e9b7fd9018 Patch security update 2017-09-22 10:41:14 -07:00
frankiebee
418f01411e mascara: turn off background 2017-09-19 16:48:42 -07:00
frankiebee
daeb7f6ad3 update metamascara 2017-09-19 12:58:51 -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
29dd81d029 require metamascara 2017-09-18 19:08:02 -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
kumavis
eaa85f283d tests - integration - re-add mascara to normal run 2017-09-18 13:17:08 -07:00
Frankie
bbae8d975e Merge pull request #2098 from MetaMask/mascara-tests
Integration test suite improvements
2017-09-18 12:54:39 -07:00
kumavis
784510f89f tests - integration - remove failing mascara integration tests from normal run until fixed 2017-09-18 12:31:44 -07:00
kumavis
d2d6f6a858 tests - integration - add mascara to integration test run 2017-09-15 12:20:43 -07:00
kumavis
610f09262d tests - refactor and rename npm scripts 2017-09-13 17:17:09 -07:00
kumavis
cbff5fd450 tests - mascara - move temp build files into dist/mascara 2017-09-13 16:52:38 -07:00
kumavis
56db3999ad tests - start migrating mascara tests to karma 2017-09-13 16:45:31 -07:00
kumavis
dd90e8e364 tests - break out coveralls npm script 2017-09-13 16:04:48 -07:00
kumavis
245c0f0c27 metamask controller - move middleware into seperate files 2017-09-13 15:17:26 -07:00
kumavis
114dae5f80 Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix3 2017-09-12 11:51:22 -07:00
kumavis
cafebb6417 Merge pull request #2073 from MetaMask/greenkeeper/babel-eslint-8.0.0
Update babel-eslint to the latest version 🚀
2017-09-12 11:50:47 -07:00
greenkeeper[bot]
985fb7b07c chore(package): update babel-eslint to version 8.0.0 2017-09-12 14:10:26 +00:00
kumavis
0e70366e9c test - integration - drop testem for karma 2017-09-11 22:29:40 -07:00
kumavis
e9daf0eb28 test - integration - remove redundant testem scripts 2017-09-11 22:26:47 -07:00
kumavis
ca035743c2 ci - dont attempt to submit coveralls if not configured 2017-09-11 22:25:46 -07:00
kumavis
671dafea9e Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix 2017-09-07 22:37:44 -07:00
kumavis
f5d0a0b07a deps - bump jsonrpc filters for log filter formate fix 2017-09-07 22:25:08 -07:00
kumavis
57e4805c62 streams - use pump and published obj-multiplex 2017-09-07 21:17:49 -07:00
kumavis
440a42bbc3 inpage - add idRemapMiddleware 2017-09-07 10:08:07 -07:00
Thomas Huang
33dfed15a6 Merge pull request #1897 from MetaMask/greenkeeper/sinon-3.2.0
Update sinon to the latest version 🚀
2017-09-01 12:05:08 -07:00
kumavis
cc56d0d2f6 inpage - use json-rpc-engine for inpage-provider 2017-08-24 15:44:40 -07:00
Dan Finlay
e0c35179c2 Merge pull request #1914 from MetaMask/history-diff
Move Tx State History to diff-based format
2017-08-18 13:14:17 -07:00
Dan Finlay
d7a34514b0 Fix token balance precision rendering
Fixes a bug where balances under 1 token could be mis-rendered by fixing it [here](https://github.com/MetaMask/eth-token-tracker/pull/9) then updating us to `eth-token-tracker@1.1.3`.

Fixes #1912
2017-08-17 14:53:08 -07:00
kumavis
fdffb6fedc introduce tx-state-history-helper and diff-based history 2017-08-14 18:46:04 -07:00
greenkeeper[bot]
a15599108e chore(package): update sinon to version 3.2.0 2017-08-10 14:35:53 +00:00
kumavis
fa6370c68a deps - bump ethjs-query 2017-08-09 16:18:38 -07:00
kumavis
6767430aa2 deps - bump watchify 2017-08-08 17:46:09 -07:00
kumavis
922ecb9149 Merge branch 'master' into greenkeeper/initial 2017-08-08 16:23:14 -07:00
frankiebee
88b84e3895 add json-rpc-engine && eth-json-rpc-middleware to devDependencies 2017-08-08 18:34:59 -04:00
frankiebee
f3b42f1e33 Merge branch 'master' into transactionControllerRefractor 2017-08-07 16:24:58 -04:00
kumavis
78aa957e5a Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial 2017-08-07 10:52:08 -07:00
kumavis
a456baea8b Merge branch 'master' into NewUI 2017-08-05 00:29:10 -07:00
kumavis
c62dad7248 blacklist - bump phishing detector 2017-08-04 14:11:40 -07:00
kumavis
1be8053cca blacklist - update phishing on boot and speed up polling to 4 min 2017-08-04 13:51:48 -07:00
sdtsui
4d967ebea9 Bring menu-droppo component into project, remove as a dependency 2017-08-04 11:47:36 -07:00
frankiebee
89a4fef1e4 Merge branch 'master' into transactionControllerRefractor 2017-08-04 14:45:22 -04:00
frankiebee
cddff73703 bring your own BN 2017-08-04 14:42:13 -04:00
kumavis
5a9257208c Merge branch 'master' into NewUI 2017-08-03 21:02:01 -07:00
kumavis
55f0187df7 deps - update 2017-08-03 16:38:44 -07:00
kumavis
026f8592d8 deps - bump eth-detect-phishing 2017-08-03 15:59:01 -07:00
kumavis
bb8a09375d Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial 2017-08-03 15:12:24 -07:00
kumavis
da16f39626 Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial 2017-08-03 15:05:32 -07:00
kumavis
d4877cb4e2 blacklist - use module eth-phishing-detect 2017-08-03 14:25:02 -07:00
Kevin Serrano
81982d01c0
Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUI 2017-08-03 13:10:46 -07:00
kumavis
8a9d0073b1 Merge pull request #1848 from MetaMask/transactionControllerRefractor
Transaction controller refractor part 1: promises for everyone and more tests!
2017-08-02 19:57:16 -07:00
kumavis
ecaa235b5e phishing detection - move phishing detection into contentscript and metamask controller 2017-08-02 14:26:10 -07:00
frankiebee
25cffd21f8 Merge branch 'master' into transactionControllerRefractor 2017-08-02 11:41:29 -04:00
frankiebee
432f516ab0 make addUnapprovedTransaction async function and use promise based ethQuery 2017-08-02 10:26:25 -04:00
Dan Finlay
f8cadbcb32 Merge branch 'master' into NewUI 2017-07-27 15:10:02 -07:00
Dan Finlay
33432afb0c Bump menu-droppo to 2.0.1 2017-07-27 09:14:52 -07:00
Kevin Serrano
66f6d5a4e0
Add levenshtein logic to blacklister. 2017-07-26 15:25:30 -07:00
sdtsui
4573753233 Bump version of menu-droppo, no longer needs css transitions 2017-07-26 12:29:56 -07:00
Dan Finlay
0ea6749dbc Lots of flex rearrangement on account detail view
Includes removal of ReactCssTransitionGroup for a simpler UI refactor.
2017-07-25 18:25:56 -07:00
kumavis
a8525d4b17 Merge pull request #1816 from MetaMask/test-coverage
Test coverage
2017-07-25 17:46:23 -07:00
Thomas Huang
eb15663497 One script runs for Ci build 2017-07-25 16:33:52 -07:00
kumavis
77d91ec36f prov-eng - bump to ignore json parse errors 2017-07-25 11:57:03 -07:00
Thomas Huang
a1fab06490 Simplify the test-coverage script 2017-07-24 13:46:02 -07:00
Thomas Huang
24ffb40ec7 Add coveralls to script 2017-07-24 09:06:40 -07:00
Thomas Huang
d571f5ee70 Add Test Coverage with nyc package and coveralls for github badge 2017-07-23 21:32:49 -07:00
Dan Finlay
a41e5788cf Merge branch 'master' into NewUI 2017-07-20 12:39:06 -07:00
Dan Finlay
dcf025782b Version 3.9.1 2017-07-19 12:24:32 -07:00
greenkeeper[bot]
82aa0d48d4 chore(package): update dependencies 2017-07-18 22:41:30 +00:00
kumavis
aa48ed34c4 nonce-tracker - fix lock mechanism to be a real mutex 2017-07-18 15:11:29 -07:00
sdtsui
ccf3e0e251 Bump version of menu-droppo to include bugfix 2017-07-18 05:31:52 -07:00
tmashuang
6cf2a956c1 Update Sinon 2017-07-14 13:05:56 -07:00
Frankie
9d3207fb73 Merge pull request #1617 from MetaMask/nonce-tracker
transaction controller - use nonce-tracker
2017-07-13 15:48:50 -04:00
frankiebee
d6001daab8 remove denodeify 2017-07-13 15:24:19 -04:00
sdtsui
1507da139d Add tests for new dropdown component 2017-07-13 00:40:22 -07:00
Dan Finlay
1375807499 Merge branch 'master' into UpdateMetadata 2017-07-12 15:42:23 -07:00
Dan Finlay
ebe7666426 Update eth-contract-metadata on build 2017-07-12 15:39:54 -07:00
Dan Finlay
76a2a59ec5 Refresh blacklist before dist 2017-07-12 15:24:59 -07:00
Dan Finlay
aec813eace Correct github link 2017-07-12 15:15:19 -07:00
frankiebee
751103d948 Merge branch 'master' into nonce-tracker 2017-07-12 15:10:58 -07:00
Dan Finlay
0079126b7d Point blacklist at main repository 2017-07-12 14:33:03 -07:00
Dan Finlay
52b92fbe40 Add first version of phishing site warning
Links to my own blacklist for now, since I added a package.json for easy importing.

We can point at the main 408H repository once this is merged:
https://github.com/409H/EtherAddressLookup/pull/24

Redirects detected phishing sites [here](https://metamask.io/phishing.html).
2017-07-12 13:09:20 -07:00
kumavis
1448090ec7 deps - bump prov-eng 2017-07-11 15:33:12 -07:00
kumavis
0cc60fda8f deps - bump prov-eng for fetch retry 2017-07-11 14:18:09 -07:00
kumavis
6587f6eabd deps - bump prov-eng for retry on gateway timeout 2017-07-11 12:43:15 -07:00
kumavis
d228f46254 Merge branch 'master' into nonce-tracker 2017-07-07 14:21:43 -07:00
kumavis
68fc3603df metamask - append dapp origin domain to rpc request 2017-07-04 12:48:00 -07:00
Dan Finlay
8179f5f84c Bump token-tracker to 1.1.2
To restore older firefox compatibility.
Fixes #1696
2017-06-30 10:11:24 -07:00
Dan Finlay
c7f2fd279d Bump token-tracker to 1.1.1
Includes a critical decimal-handling fix.
Also reduces number of symbol and precision queries after initial load.
2017-06-30 09:47:25 -07:00
kumavis
63acc0f4c8 deps - remove duplicated dev-dependencies
```
npm WARN The package clone is included as both a dev and production dependency.
npm WARN The package react-dom is included as both a dev and production dependency.
```
2017-06-29 18:50:21 -07:00
Dan Finlay
f285fd5eb1 Bump web3 version to 0.9.1 2017-06-29 14:56:24 -07:00
frankiebee
847a4282a2 Merge branch 'master' into nonce-tracker 2017-06-27 13:10:56 -07:00
Kevin Serrano
f21d425839
Simplify build variables. Remove maps from production. 2017-06-26 11:37:12 -07:00
frankiebee
fa8c74fe9b add a test for #getNonceLock 2017-06-21 17:28:19 -07:00
Dan Finlay
0799e5edf5 Fix token balance rendering 2017-06-19 19:02:38 -07:00
Dan Finlay
3ccc2b3d2a Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTokenList 2017-06-19 15:24:52 -07:00
Dan Finlay
1c05c82867 Add MetaMark support 2017-06-19 15:22:58 -07:00
Kevin Serrano
9da243f42d
Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTokenList 2017-06-19 13:51:38 -07:00
Frankie
ac728189e1 Merge branch 'master' into i1567-FixInaccurateError 2017-06-16 16:46:13 -07:00
frankiebee
3e4f2cf3d3 bump provider engine 2017-06-16 16:34:38 -07:00
frankiebee
f76a555c09 Merge branch 'master' into i1567-FixInaccurateError 2017-06-15 14:28:10 -07:00
frankiebee
da33efe775 bump eth-query for quiter logs 2017-06-14 21:44:32 -07:00
frankiebee
6ae97290f0 check for the tx in the block that provider engine gives us 2017-06-14 17:43:04 -07:00
frankiebee
56490c6468 Bump provider-engine 2017-06-14 16:14:15 -07:00
Dan Finlay
0b18a69679 Bump token-tracker version 2017-06-14 15:52:46 -07:00
Dan Finlay
6fda78cd2b Refresh token balance on network change 2017-06-14 15:21:51 -07:00
Dan Finlay
b7b9e0c1ac Persist selected account tab
Also improve error handling with token balances.
2017-06-14 14:21:50 -07:00
Dan Finlay
de500250c4 Fix build for eth-contract-metadata 2017-06-13 17:46:47 -07:00
Dan Finlay
a741cc4fc4 Merge branch 'master' into AddTokenList 2017-06-12 17:17:16 -07:00
kumavis
9fd9c34574 deps - prov-eng 12.2.4 2017-06-12 14:09:38 -07:00
kumavis
2d5a672971 Merge pull request #1572 from MetaMask/mascaraUpkeep
Mascara upkeep
2017-06-12 10:36:48 -07:00
frankiebee
4941b5ab11 bump cswready event 2017-06-08 17:33:27 -07:00
kumavis
57a7fc4425 deps - bump provider engine for warp feature 2017-06-08 16:07:05 -07:00
Dan Finlay
f06ad954b9 Move to eth-contract-metadata 2017-05-26 09:58:33 -07:00
Dan Finlay
d8c94fca75 Add address image map to icon factory
Deriving from the new address image map repository I've added here:
https://github.com/MetaMask/ethereum-contract-icons

With this PR, images for addresses added to that repository will be shown instead of jazzicons in MetaMask.
2017-05-26 00:43:14 -07:00
Dan Finlay
be5af7cb4b Throw if ENS Resolver isn't set up
Instead of resolving to name owners, which can encourage inconsistent usage of ENS.

Fixes #1427.
2017-05-22 17:45:29 -07:00
kumavis
99f28527a3 Merge branch 'master' into HelpDebugStalledTxs 2017-05-22 16:21:24 -07:00
kumavis
1c1400b584 deps - use stream-subprovider from provider-engine 2017-05-22 15:59:07 -07:00
Dan Finlay
058b732213 Tolerate nonces of any format 2017-05-22 15:43:20 -07:00
Dan Finlay
48d9a21071 Use filter subprovider in-page to avoid filter leaks 2017-05-22 15:23:29 -07:00
Dan Finlay
caeadc2407 Linted and removed unused deps 2017-05-16 16:19:10 -07:00
kumavis
9560de80a0 Merge pull request #1430 from MetaMask/i1407-FixNonEditingTxForm
Add test around conf-tx view's gas editing.
2017-05-15 23:25:20 -07:00
Dan Finlay
85ca8b4539 Merge pull request #1431 from MetaMask/pe-bump
Bump provider engine for event filters fix
2017-05-15 17:53:11 -07:00
kumavis
c1b0aaa443 deps - bump provider-engine 12.0.6 2017-05-15 17:11:07 -07:00
Dan Finlay
6abdec608e Merge branch 'master' into i1407-FixNonEditingTxForm 2017-05-15 15:36:03 -07:00
Dan Finlay
81122170b5 Add stage 0 support to build system 2017-05-15 15:31:19 -07:00
Dan Finlay
c4be4c7195 Skip jazzicons in unit tests 2017-05-15 14:35:24 -07:00
kumavis
5c9449dec1 background - drop async-q in favor of async/await 2017-05-12 13:09:23 -07:00
Dan Finlay
61f5c42a45 Add support for async/await 2017-05-12 12:04:42 -07:00
Dan Finlay
daec667c16 Add support for async/await 2017-05-12 11:31:40 -07:00
Dan Finlay
f0eeb1e162 Got a useful error message for next step 2017-05-11 17:43:40 -07:00
Dan Finlay
60746a9859 Use react test utils to start composing test 2017-05-11 17:09:23 -07:00
Kevin Serrano
53a88b319b
Merge branch 'i1381-GasPriceInGwei' of github.com:MetaMask/metamask-plugin into i1381-GasPriceInGwei 2017-05-08 13:58:46 -07:00
kumavis
21b6a1b478 deps - bump eth-query for smaller bundle size 2017-05-08 12:29:38 -07:00
Dan Finlay
0d39de6d66 Run install before dist 2017-05-08 09:53:30 -07:00
Thomas Huang
8f5334e4ac Add Mocha/Chai eslint plugins 2017-05-04 14:34:25 -07:00
Dan Finlay
527068b84e Bump provider engine 2017-04-30 12:38:22 -07:00
frankiebee
53537824f1 break out IndexDbController && Run the first time test on mascara 2017-04-28 14:11:46 +02:00
frankiebee
e7e0919d7c Setup test enviroment for mascara 2017-04-28 14:11:05 +02:00
frankiebee
e7c7c85791 Update README for mascara 2017-04-27 14:27:47 +02:00
frankiebee
e665dd7e1c bump client-sw-ready-event 2017-04-27 13:31:54 +02:00
Dan Finlay
04e489f4df Allow signature V values over 1 byte
By bumping ethereumjs-tx.
2017-04-25 10:20:49 -07:00
Dan Finlay
292e2dca83 Bump provider-engine 2017-04-24 20:59:59 -07:00
Dan Finlay
3ae2a82995 Bump provider engine
Should now pass test suite, and include several sweet recent fixes!
2017-04-24 18:49:23 -07:00
Dan Finlay
9bae32e78b Add functional but ugly and hard-coded token list 2017-04-20 19:10:22 -07:00
frankiebee
a1c39006de Fix wakeUps:
fix spelling
cut wakeup time in half
2017-04-06 21:48:51 +02:00
frankiebee
94df168113 Bump sw-client version 2017-04-06 19:32:45 +02:00
frankiebee
719d0f4ad5 Ping service worker to keep it from going idle 2017-04-06 18:56:13 +02:00