m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-30 08:09:15 +01:00
Code
10,117 Commits 2 Branches 0 Tags 265 MiB
4efa6caec7
Commit Graph

1070 Commits

Author SHA1 Message Date
Whymarrh Whitby
84a949b298 npm audit: Use eth-json-rpc-infura@3 2019-06-06 13:33:04 -02:30
Whymarrh Whitby
c36662f3b0 Move eth-json-rpc-middleware into prod dependencies 2019-06-06 13:32:47 -02:30
Whymarrh Whitby
13feeb25d5 Break Storybook-related pkgs to reduce listed vulnerabilities 2019-06-06 13:32:08 -02:30
Whymarrh Whitby
6239d189cb npm audit fix 2019-06-06 13:32:08 -02:30
Whymarrh Whitby
acfd438329 npm audit: Works with eth-trezor-keyring 2019-06-06 13:32:43 -02:30
Whymarrh Whitby
41ebc2e127 npm audit: Works with eth-ledger-bridge-keyring 2019-06-06 13:32:38 -02:30
Whymarrh Whitby
d52f319a32 npm audit: Works with eth-json-rpc-middleware 2019-06-06 13:32:34 -02:30
Whymarrh Whitby
3dd19bd834 npm audit: Works with eth-json-rpc-filters 2019-06-06 13:32:30 -02:30
Whymarrh Whitby
048ac8af10 npm audit: Works with eth-json-rpc-infura 2019-06-06 13:32:22 -02:30
Whymarrh Whitby
d961454949 Add ethereumjs-tx dependency back 2019-06-06 13:32:08 -02:30
Whymarrh Whitby
95be7d5def Successful `npm audit' run w/o some packages 
The following packages have been removed as I work to figure out what is causing
npm audit to produce errors:

eth-json-rpc-filters
eth-json-rpc-infura
eth-json-rpc-middleware
eth-ledger-bridge-keyring
eth-trezor-keyring
ethereumjs-tx
gaba

These packages will slowly be added back in forthcoming commits.
 2019-06-06 13:30:14 -02:30
Paul Bouchon
47024fd9a5
feature: integrate gaba/CurrencyRateController (#6570) 2019-05-31 18:14:22 -04:00
pldespaigne
9a658ee53d merge 2019-05-30 18:22:55 +02:00
pldespaigne
9b87aaae19 update package 2019-05-30 12:21:45 +02:00
Frankie
2b5c7b82a9
transactions/deps - use broken out nonce-tracker module (#6555) 2019-05-21 17:17:09 +02:00
bitpshr
77d3bc252d feature: integrate gaba/PhishingController 2019-05-08 17:56:52 -04:00
Chi Kei Chan
56ed189aeb
Auto logout after specific time (#6558) 
* Add i18n strings

* Finish Auto timeout

* Fix linter

* Fix copies

* Add unit test to Advanced Tab component

* Add back actions and container

* Add basic test to ensure container completeness

* No zero, fix linters

* restrict negative in input
 2019-05-08 11:57:21 -07:00
Thomas
d8a96e6898 Bump eth-json-rpc-filters and eth-contract-metadata 2019-05-08 09:20:53 -07:00
Chi Kei Chan
581128503c Allow dragging seed phrase during Confirm Seed Phrase (#6557) 
* Add basic drag and drop functionality

* Refactor seed phrase data structure

* Insert to list when drop

* Save before refactor

* Finish DND

* Fix linter

* update package-lock.json

* Address styling feedbacks

* Add box shadow on hover

* Finish adding unit tests

* Remove describe.only
 2019-05-07 12:33:26 -02:30
Dan J Miller
64ae8131de
Adds NPM scripts for running a dapp, and dapp + chain, locally. (#6565) 2019-05-06 12:01:34 -02:30
pldespaigne
8cb6bd34e0 update content-hash 2019-05-04 18:56:26 +02:00
kumavis
2845398c3d Refactor ProviderApprovalController to use rpc and publicConfigStore (#6410) 
* Ensure home screen does not render if there are unapproved txs (#6501)

* Ensure that the confirm screen renders before the home screen if there are unapproved txs.

* Only render confirm screen before home screen on mount.

* inpage - revert _metamask api to isEnabled isApproved isUnlocked
 2019-05-03 13:32:05 -04:00
Dan J Miller
7d59e892e3 Update to eth-method-registry@1.2.0 (#6403) 2019-04-17 15:51:21 -02:30
Sneh Koul
fb22fb12ca Adds e2e test for most web3 methods that dapps use (#6160) 
* schema added

* ui for the dapp added and schema.js changed according to the comments in PR

* added tests for all web3 methods

* Update run-all.sh

* Update web3.spec.js to work with new onboarding flow

* changes made according to the comments

* Create stand alone script for web3 e2e tests.

* Lint fixes for web3 e2e tests.
 2019-04-16 15:29:11 -02:30
Esteban Mino
7c38ad9356 bump contract metadata 2019-04-12 12:26:39 -04:00
Esteban Miño
55cb4bf907
pin eth-contract-metadata to last commit hash (#6396) 2019-04-04 15:49:10 -03:00
pldespaigne
dc4c40414e issue#5742 2019-04-04 17:15:57 +02:00
Bruno Barbieri
fee0da1ca3
bump ledger and trezor keyring (#6395) 2019-04-03 16:05:52 -04:00
Whymarrh Whitby
7fc84f3cc0 ci: Add build:test Gulp task for e2e build 2019-03-29 11:13:39 -02:30
Dan Miller
a44f2bb6eb Use webRequest to cancel all requests to infura in e2e tests. 2019-03-28 16:20:11 -02:30
Whymarrh Whitby
a702ade3fe Bump gaba version to avoid broken eth-contract-metadata 2019-03-20 17:01:15 -02:30
Dan Finlay
823007121d Add rollback script, move auto-changelog script (#6252) 2019-03-20 09:48:50 -02:30
kumavis
e072a3d993 build - babel - move config to babelrc (#6284) 2019-03-12 13:25:28 -02:30
kumavis
48047f8194 mascara - remove from project (#6283) 2019-03-12 11:17:21 -02:30
Whymarrh Whitby
0c52199007 npm i -D ganache-core@2.5.3 2019-03-12 09:59:27 -02:30
Paul Bouchon
daae155ce2 GABA: Integrate AddressBookController (#5847) 
* gaba: integrate AddressBookController

* pin gaba version and update lockfile
 2019-03-11 18:40:41 -10:00
Bruno Barbieri
82713983e3 bump trezor-connect to v7 (#6224) 2019-03-04 10:17:44 -08:00
kumavis
fc1655eecb
Merge pull request #6190 from whymarrh/tmp.RvdXXs4i 
Remove public property from package.json file
 2019-02-26 21:41:15 +08:00
Dan Finlay
f507f2a927 Feature Flag + Mobile Sync (#5955) 2019-02-25 15:40:13 -03:30
Whymarrh Whitby
dc007178e3 Remove public property from package.json file 
As per the package.json documentation [1] setting `"private": true` in the
package.json file is enough for npm to refuse to publish it. The docs don't
specify that a `public` key is respected.

  [1]:https://docs.npmjs.com/files/package.json#private
 2019-02-20 14:30:08 -03:30
Whymarrh Whitby
38bb1d3979 Remove unused CI jobs, rename e2e beta jobs 2019-02-20 14:20:39 -03:30
Jonathan Smirnoff
8dddf48904 Fixed issue #5838 (#6001) 
Update changelog file
 2019-02-13 10:30:46 -10:00
Bruno Barbieri
2cfea0b788 fix asset detection (#6049) 2019-01-22 10:23:11 -08:00
Alexander Tseung
435fdae84a
Fix displayed time and date in the activity log. Remove vreme library, add luxon library. (#5932) 2018-12-13 12:48:15 -08:00
Dan Finlay
0d8fa9290c Bump json-rpc-engine to v4.0.0 2018-12-10 10:47:36 -08:00
Whymarrh Whitby
d7c8a3048f Deduplicate package.json file 
From `npm install`:

> npm WARN The package css-loader is included as both a dev and production dependency.
> npm WARN The package eslint-plugin-react is included as both a dev and production dependency.
> npm WARN The package file-loader is included as both a dev and production dependency.
> npm WARN The package gulp is included as both a dev and production dependency.

It's also worth noting that the Gulp version we were using was inconsistent and there is
a published v4 release on GitHub.
 2018-12-06 12:40:57 -03:30
Whymarrh Whitby
ac6b0bd31c Update ganache-core to mitigate vuln 
=== npm audit security report ===

> # Run  npm install --save-dev ganache-core@2.3.1  to resolve 1 vulnerability
┌───────────────┬──────────────────────────────────────────────────────────────┐
│ Moderate      │ Memory Exposure                                              │
├───────────────┼──────────────────────────────────────────────────────────────┤
│ Package       │ bl                                                           │
├───────────────┼──────────────────────────────────────────────────────────────┤
│ Dependency of │ ganache-core [dev]                                           │
├───────────────┼──────────────────────────────────────────────────────────────┤
│ Path          │ ganache-core > level-sublevel > levelup > bl                 │
├───────────────┼──────────────────────────────────────────────────────────────┤
│ More info     │ https://nodesecurity.io/advisories/596                       │
└───────────────┴──────────────────────────────────────────────────────────────┘
 2018-12-06 12:40:57 -03:30
Whymarrh Whitby
855c8b209c npm uninstall open 2018-12-06 12:40:57 -03:30
Whymarrh Whitby
b6789a6e2f Remove beefy dependency and its usages 
Refs #4768
Refs #5389

This changeset removes the beefy package that:

1. Was last published 2 yrs ago
2. Brought with it 1 moderate and 1 critical vulnerability
3. Was only used in scripts that no longer work
 2018-12-06 12:40:57 -03:30
Whymarrh Whitby
c804185081 circleci: Replace nsp with npm audit 
Refs #4751
 2018-12-06 12:40:57 -03:30
Whymarrh Whitby
c7f46f77ca npm audit fix 2018-12-06 11:46:05 -03:30
Dan Miller
0ba6f7d9bb Adds not yet functional gas price chart. 2018-12-04 00:06:05 -03:30
Dan Finlay
486f9931c4 Pin two module versions to avoid flatmap-stream hack (#5839) 
The flatmap-stream module was compromised. MetaMask was NOT affected,
but two of our dependencies could include it if they updated, so I am
temporarily pinning those versions until they can be updated
consciously.

Related to
https://github.com/dominictarr/event-stream/issues/116
 2018-11-26 12:35:18 -10:00
Bruno Barbieri
ae8626eceb
Merge pull request #5797 from MetaMask/trezor-v6 
Add Firefox and Brave support for Trezor
 2018-11-21 14:45:55 -05:00
brunobar79
b4d48ea3fc bump eth-trezor-keyring 2018-11-21 13:11:24 -05:00
brunobar79
738ed90640 update package-lock.json 2018-11-20 21:16:03 -05:00
brunobar79
7fb9f91d27 trezor v6 2018-11-20 19:12:11 -05:00
brunobar79
9b1df386de fix merge conflicts 2018-11-20 17:44:28 -05:00
Dan Finlay
5956f8d260 Version 5.0.3 (#5785) 
* Version 5.0.3

Includes a fix to the `version:bump` script that now correctly updates
the changelog header.

* Include inpage provider events
 2018-11-20 08:34:14 -10:00
Frankie
ce147bf6d8 Tx controller now uses safe event emitter (#5769) 
* transactions - use safe-event-emitter over events

* tests - pass a platform object on init with a noop showTransactionNotification

* test - fix for tx-state-history-helper trying to reduce an empty array

* deps - safe-event-emitter

* lint
 2018-11-16 10:34:08 -08:00
Esteban MIno
6dce32fc1e provide automatic changelog since last tag for linux 2018-11-15 10:12:11 -08:00
Bruno Barbieri
592e6bddfb Update npm dependencies to reduce vulnerabilities (#5556) 2018-11-15 13:32:28 -03:30
brunobar79
c651212025 fix merge conflicts 2018-11-06 20:21:19 -05:00
kumavis
ccbc233282 Merge branch 'develop' of github.com:MetaMask/metamask-extension into sentry-enhancements2 2018-10-29 20:25:05 -04:00
kumavis
1bb4a8428c
Merge pull request #5596 from MetaMask/validateSignTypedData 
Validate signTypedData signer/address in eth-json-rpc-middleware
 2018-10-29 20:11:04 -04:00
kumavis
715c309d68 deps - bump eth-json-rpc-middleware for signTypedData version bump 2018-10-29 19:20:35 -04:00
kumavis
231dabb94a deps - bump eth-block-tracker for fix (#5614) 2018-10-26 08:18:26 +02:00
brunobar79
9c1b2108f6 fix merge conflicts 2018-10-21 01:59:53 -04:00
kumavis
f0602ca354 Merge branch 'develop' of github.com:MetaMask/metamask-extension into sentry-enhancements2 2018-10-20 23:51:00 -04:00
kumavis
539597cb13 deps - fix gulp ref to gulp#v4.0.0 2018-10-20 04:01:50 -04:00
kumavis
73ec4e66cb sentry - include app state in ui errors 2018-10-20 03:14:59 -04:00
kumavis
e3fda83ab2 sentry - replace raven-js with sentry/browser 2018-10-20 02:22:50 -04:00
kumavis
0b12c4efb1 deps - bump eth-json-rpc-middleware for bugfix 2018-10-19 05:18:47 -04:00
kumavis
fb1b8d42ac sentry - update raven-js 2018-10-19 04:40:23 -04:00
brunobar79
13820b6cc1 fix conflicts 2018-10-16 14:01:54 -04:00
kumavis
febf214ee8 deps - bump eth-token-tracker for ethjs-rpc bug in deps 2018-10-14 23:00:13 -04:00
kumavis
5504c8b965 deps - bump eth-json-rpc-middleware for pending blockRef bugfix 2018-10-11 20:10:36 -07:00
Thomas Huang
b45479934d test - add actions unit tests (#5369) 
* Actions.spec.js

* Error handling tests

* Lint
 2018-10-10 10:32:26 -04:00
Bruno Barbieri
ccab4ee1a4 tests - integration - Add Drizzle tests (#5467) 
* added drizzle app for testing

* working

* clean up

* clean up script

* make build step required

* add drizzle-tests to .eslintignore

* clean up drizzle run script

* lint

* use truffle unbox

* undo eslintignore changes

* revert change

* dont use global

* dont need this steps

* use the new account flow

* restore package-lock.json
 2018-10-10 01:12:43 -04:00
brunobar79
3293911351 bump eth-json-rpc-middleware 2018-10-09 15:29:51 -07:00
kumavis
9bce0ae84d deps - bump inpage-provider for drizzle workaround 2018-10-08 14:37:52 -04:00
kumavis
a0700de62c deps - bump metamask-inpage-provider for bug fix 2018-10-08 13:23:58 -04:00
kumavis
fe82c4a9fb provider - network - restore block-ref-rewrite middleware references 2018-10-08 12:39:18 -04:00
kumavis
354f8c0d7d provider - enable subscription support (newHeads, logs) 2018-10-08 11:55:07 -04:00
kumavis
c500ef4a58 deps - bump eth-block-tracker for safe-event-emitter 2018-10-04 00:21:45 -04:00
kumavis
1b8326fd95 bugfix - bump provider for url auth support 2018-10-02 05:06:41 -04:00
Whymarrh Whitby
9b1dbb64a9 npm uninstall dot-only-hunter 2018-10-01 12:53:19 -02:30
Whymarrh Whitby
910f674535 Remove dot-only-hunter from test:unit script 2018-10-01 12:53:19 -02:30
Dan Finlay
bdc7116885
Merge pull request #5325 from sam-aldis/patch-1 
Debounce was breaking in update
 2018-09-30 13:32:51 -07:00
bitpshr
c068f55ee0 bugfix: bump version of inpage provider 2018-09-26 10:26:15 -07:00
kumavis
54de60ff84 deps - eth-block-tracker@4.0.2 for safe-eventemitter (#5363) 2018-09-25 21:59:45 -07:00
Paul Bouchon
88b5f82e13 Bugfix: Upgrade json-rpc-engine (#5348) 
* Bugfix: bump version of json-rpc-engine

* Increase delay

* Update lockfile

* deps - json-rpc-engine@3.7.4
 2018-09-25 21:16:01 -07:00
brunobar79
678d174e1e add mozilla lint job 2018-09-25 20:44:57 -04:00
Dan Finlay
4f135132d7 Add build step to mozilla-lint 2018-09-25 14:30:53 -07:00
Dan Finlay
32a40641eb Add mozilla linter to dist script instead of main test 2018-09-25 14:28:57 -07:00
Dan Finlay
4d9ca132a3 Add mozilla addon linter to test suite 2018-09-25 14:26:37 -07:00
UKJP Design
981b48c754
Debounce was breaking in update 
As found in issue here: https://github.com/MetaMask/metamask-extension/issues/5064
Pinned the version at 1.1.0 until the new version with breaking changes can be intergrated.
 2018-09-23 10:42:13 +01:00
bitpshr
36dd0354e7 Implement latest EIP-712 protocol 2018-09-13 15:40:57 -04:00
Dan Finlay
5a709306e4 Add jsdoc gh-pages script 2018-09-12 14:10:38 -07:00
Whymarrh Whitby
f157d5371a Add html reporter to test coverage output 2018-09-11 09:39:16 -07:00
Connor Christie
ee568d5f5a Upgrade obs-store and fix memory leaks 2018-09-09 19:33:51 -05:00
brunobar79
8ee01f4e99 Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 2018-09-05 16:26:09 -04:00
Dan J Miller
5b2864d070
Merge pull request #5138 from MetaMask/greenkeeper/monorepo.enzyme-1.6.0 
Update enzyme to the latest version 🚀
 2018-09-04 11:25:40 -02:30
Dan Finlay
45cbe6b5b3 Bump human-standard-token-abi version for DAI support 2018-08-30 12:31:24 -07:00
greenkeeper[bot]
012fb0e3e6 chore(package): update enzyme-adapter-react-15 to version 1.0.6 2018-08-25 00:55:45 +00:00
greenkeeper[bot]
41a13bb341 chore(package): update enzyme to version 3.4.4 2018-08-25 00:51:40 +00:00
Alexander Tseung
d1de5ae94f Add react-media package to prevent rendering wallet-view twice in the popup view 2018-08-23 16:44:43 -07:00
Antoine Nauleau
3854650546 Minimum Browsers Supported (#4873) 
* Minimum supported browsers and version standard: add browsers and targets to .babelrc and package.json

* Regenerate package.json, fix issue with comma in merge

* Resolve merge conflicts

* Regenerate package-lock.json

* Revert to previous package-lock.json
 2018-08-22 20:20:24 -02:30
brunobar79
055e0f8dac fix merge conflicts 2018-08-22 13:37:47 -04:00
Dan Finlay
babd59a2dc
Merge pull request #5109 from MetaMask/MoveOutInpageProvider 
Move inpage-provider and port-stream outside
 2018-08-21 14:38:47 -07:00
kumavis
13dfea7f2d bugfix - prevents old blocktracker from getting internal hooks migrated 2018-08-21 14:13:23 -07:00
brunobar79
ab7eb73ecc fix merge conflicts 2018-08-20 21:51:35 -04:00
Dan Finlay
6ce119d1fb Move inpage-provider and port-stream outside 
With the creation of the [metamask-extension-provider](https://github.com/MetaMask/metamask-extension-provider) we have our first non-core module that is dependent on the inpage-provider and port-stream.

To reduce the size of its dependencies, I have moved the
[metamask-inpage-provider](https://github.com/MetaMask/metamask-inpage-provider) into its own module, as well as [extension-port-stream](https://github.com/MetaMask/extension-port-stream).

This allows them to be more easily depended & iterated on by external
projects.
 2018-08-20 15:45:50 -07:00
brunobar79
992e7f1b5a fix merge conflicts 2018-08-17 12:56:07 -04:00
brunobar79
e54b8507d2 use eth-ledger-bridge-keyring from npm 2018-08-14 23:02:01 -04:00
brunobar79
4e1d8ba19d good progress adding paths 2018-08-13 19:29:43 -04:00
brunobar79
77ad856730 remove ledger lib 2018-08-12 01:46:09 -04:00
brunobar79
0b9b892c6b this should be ready to go 2018-08-12 01:34:01 -04:00
brunobar79
5ef80495cf refactor to support multiple hw wallets 2018-08-10 21:54:34 -04:00
brunobar79
656afeefad fix merge conflicts 2018-08-08 15:40:04 -04:00
brunobar79
286bde606f fix merge conflicts 2018-08-08 14:30:49 -04:00
Paul Bouchon
8ac4b586eb
Update eth-keyring-controller and eth-hd-keyring versions (#4989) 2018-08-08 13:17:48 -04:00
bitpshr
365e349ec4 Reestablish old versions of eth-keyring-controller and eth-hd-keyring 2018-08-08 08:17:16 -04:00
brunobar79
2e0916d8ff fix merge conflicts 2018-08-08 02:32:35 -04:00
Whymarrh Whitby
46046c6915 Update chromedriver pkg 2018-08-06 15:47:57 -02:30
Whymarrh Whitby
29488b2c53 Add static-server devDependency 2018-08-06 15:47:57 -02:30
Whymarrh Whitby
6132238302 Remove superstatic package 
Install and uninstalling superstatic doesn't work on Node 8 at the time of
writing:

    $ npm install -D superstatic@6
    npm ERR! code ENOTSUP
    npm ERR! notsup Unsupported engine for got@5.7.1: wanted: {"node":">=0.10.0 <7"} (current: {"node":"8.11.3","npm":"6.3.0"})
    npm ERR! notsup Not compatible with your version of node/npm: got@5.7.1
    npm ERR! notsup Not compatible with your version of node/npm: got@5.7.1
    npm ERR! notsup Required: {"node":">=0.10.0 <7"}
    npm ERR! notsup Actual:   {"npm":"6.3.0","node":"8.11.3"}

This commit removes the package (using Node 6!) and it will have to be replaced.
 2018-08-06 15:47:57 -02:30
brunobar79
710b4e294f added crossbrowser support and error handling 2018-07-31 18:30:56 -04:00
brunobar79
4de8f5b0d4 fix dependencies 2018-07-26 21:37:43 -04:00
brunobar79
69f4c8c336 fix merge conflicts 2018-07-26 21:04:03 -04:00
brunobar79
d4a15f22c2 added webrtc-adapter for browser compat 2018-07-26 21:00:48 -04:00
brunobar79
ea028e7506 fully working without tweaking ext. permission 2018-07-26 20:56:58 -04:00
brunobar79
6cd4bc9f4e working without permission issues 2018-07-26 20:24:39 -04:00
Antoine Nauleau
653e42cf79 Update Babel to Current Standard "babel-preset-env" (#4812) 
* Update .babelrc and package.json to babel-preset-env standard

* Install babel-preset-env babel-stage-0

* Regenerate package-lock.json by running npm install --package-lock-only && npm audit fix

* Resolve PR #4812 merge conflicts

* Merge #4847 Solves previous cache issues with cirlce-ci
 2018-07-24 15:21:32 -02:30
brunobar79
2e50348241 added instascan pkg 2018-07-23 17:11:51 -04:00
brunobar79
cde91fac16 added node version requirements 2018-07-21 12:43:35 -04:00
brunobar79
de21a49265 use latest keyring packages 2018-07-16 15:31:05 -04:00
brunobar79
5710e648bd remove account modal updated 2018-07-12 18:19:33 -04:00
brunobar79
4b528405ea catching up with develop 2018-07-12 13:19:51 -04:00
brunobar79
07d8bfaec5 Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support 2018-07-12 12:54:08 -04:00
brunobar79
89cc48789a update to temp dependencies 2018-07-11 20:01:44 -04:00
Alexander Tseung
7d691c7398 Fix existing unit tests 2018-07-07 18:53:00 -07:00
brunobar79
64e397a6f1 update package-lock.json 2018-07-06 20:04:31 -04:00
Alexander Tseung
9cde5ab11b Use eth-method-registry to get method data 2018-07-06 16:27:08 -07:00
Alexander Tseung
ea9d51e427 Refactor and redesign confirm transaction views 2018-07-06 16:27:08 -07:00
brunobar79
7c9d942ba1 Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support 2018-07-06 19:21:18 -04:00
brunobar79
986bb74501 package.json updated and tests passing 2018-07-03 20:24:21 -04:00
brunobar79
d382f89989 tests are passing 2018-07-03 20:21:01 -04:00
brunobar79
595447ccac Merge remote-tracking branch 'upstream/develop' into HEAD 2018-07-03 14:21:17 -04:00
brunobar79
3290421e2f fix merge conflicts 2018-07-03 13:31:30 -04:00
kumavis
1f0cf11af1
Merge pull request #4712 from MetaMask/lint-fix 
Lint - Lint all the things (without conflicts!)
 2018-07-03 09:40:25 -07:00
brunobar79
cc11a62397 remove gulp eslint and cleanup gulpfile 2018-07-02 18:35:53 -04:00
Esteban MIno
4b45dd4ed0 point eth-contract-metadata to repo master 2018-07-02 18:29:22 -04:00
brunobar79
85fd75c21f update package-lock.json 2018-07-02 17:03:20 -04:00
brunobar79
9b0bc67066 fix merge conflicts 2018-07-02 15:29:26 -04:00
Bruno Barbieri
4c86f25f5b npm 6 fresh lock + node 8 (#4675) 
* run npm install with npm 6 and node 8
* npm audit fix --force
* bump node version on circleci docker img
* bump lodash
 2018-07-02 10:30:56 -07:00
brunobar79
66b3b72c98 use latest eth-keyring-controller 2018-07-01 12:00:04 -10:00
brunobar79
1494cc5e6c fix merge conflicts 2018-07-01 11:41:34 -10:00
Dan
f824a2982a Use supersonic instead of httpserver to serve local dapp (e2e beta tests) 2018-06-28 10:16:36 -02:30
Dan
c343a12543 Use locally served dapp to test contract calls in e2e beta tests 2018-06-27 11:08:15 -02:30
brunobar79
6e563acd93 use latest eth-trezor-keyring 2018-06-25 12:24:58 -10:00
brunobar79
87dfca0767 fixes 2018-06-23 02:52:11 -04:00
brunobar79
4381d3e71d point to new version of eth-trezor-keyring 2018-06-22 23:25:19 -04:00
kumavis
ac8b56a00d notices - notices collection is now manually edited 2018-06-13 22:56:46 -07:00
Bruno
bb4cc72646 fix merge conflicts 2018-06-13 02:01:47 -04:00
Bruno
fe3d81cfd8 upgrade eth-trezor-keyring 2018-06-13 01:44:53 -04:00
Bruno
8763ea898e move TrezorKeyring to its own package 2018-06-13 01:32:13 -04:00
Dan Finlay
9c77af1ce6
Add script for auto-re-running tests on change 
`npm run watch:test:unit` will re-run the unit test suite whenever a
file in `app`, `ui`, or `test` changes.
 2018-06-12 11:13:44 -07:00
Bruno
8c4d58aa45 initial trezor support 2018-06-10 03:52:32 -04:00
PhyrexTsai
f90d070190
Merge branch 'develop' into portal-metamask 2018-06-01 15:41:18 +08:00
Dan
5091b03e4b Merge branch 'develop' into i3725-refactor-send-component- 2018-05-31 15:28:03 -02:30
kumavis
b69da50095 deps - bump eth-keyring-controller for bugfix 2018-05-30 14:29:14 -07:00
kumavis
77c55ecd83
Merge pull request #4403 from MetaMask/bugfix-keyring-controller 
deps - bump eth-keyring-controller + update package-lock
 2018-05-29 22:31:58 -07:00
kumavis
4789e981c2
Merge pull request #4374 from MetaMask/test-unit-fail-on-only 
test - unit - fail if tests contain a .only call
 2018-05-29 21:40:28 -07:00
kumavis
d6965c7cdb deps - bump eth-keyring-controller + update package-lock 2018-05-29 17:38:00 -07:00
MikeCheng1208
695b157e7b Intergrate ENS with IPFS 2018-05-29 12:38:25 +08:00
kumavis
1cd4b03b37 test - unit - fail if tests contain a .only call 2018-05-25 12:58:16 -07:00
Whymarrh Whitby
715624227a Add basic e2e tests for the new UI 2018-05-24 23:23:42 -02:30
kumavis
8e672a82e2
Merge pull request #4241 from MetaMask/greenkeeper/ethjs-0.4.0 
Update ethjs to the latest version 🚀
 2018-05-23 16:41:26 -07:00
Dan
440905125d Merge branch 'develop' into i3725-refactor-send-component- 2018-05-23 16:03:15 -02:30
kumavis
cee55b47d0
Merge pull request #4321 from MetaMask/testing 
MM controller tests and reorganizing test files
 2018-05-22 13:02:41 -07:00
kumavis
b5bbfd3264
Merge pull request #4308 from MetaMask/i4232-addtoken 
Update designs for Add Token screen
 2018-05-22 12:53:59 -07:00
kumavis
1fbf59cdd3 ci - screens - continue screenshots through account creation + export account 2018-05-22 01:56:52 -07:00
tmashuang
238f2eb179 Merge branch 'develop' into testing 2018-05-21 16:36:48 -07:00
tmashuang
848f8f805b Merge branch 'develop' into testing 2018-05-21 15:14:47 -07:00
kumavis
7a65c22a02
Merge branch 'develop' into ci-publish-release 2018-05-21 14:58:37 -07:00
tmashuang
58b9afff4f Merge branch 'develop' into testing 2018-05-21 14:57:57 -07:00
kumavis
d45fe6fc72 Merge branch 'develop' of https://github.com/Jabher/metamask-extension into Jabher-develop 2018-05-21 13:59:23 -07:00
kumavis
08d95bbafa
Merge pull request #4034 from whymarrh/account-nicknames 
Move account names out of KeyringController
 2018-05-21 13:44:07 -07:00
tmashuang
554a10f17e Merge branch 'develop' into testing 2018-05-21 13:05:24 -07:00
Alexander Tseung
4f6b53c1aa Update designs for Add Token screen 2018-05-19 23:04:19 -07:00
kumavis
59c9852999 ci - add docs publish to job-publish-release 2018-05-18 14:03:02 -07:00
Whymarrh Whitby
805c6158a4 Update eth-keyring-controller dependency 2018-05-17 12:57:39 -02:30
Thomas
5e80bc4cb9 Merge branch 'develop' into testing 2018-05-16 22:47:07 -07:00
Dan
759bc17388 Merge branch 'develop' into i3725-refactor-send-component- 2018-05-15 11:21:15 -02:30
Thomas
517be35ab6 Merge branch 'develop' into e2e-tests 2018-05-14 17:19:44 -07:00
Thomas
cd42d18203 Merge e2e tests into one 2018-05-14 17:17:36 -07:00
Whymarrh Whitby
b5a445139d Bail after the first e2e test failure 
Where the tests are sequential, every test after the first failure is bound
for failure as well so we can bail after the first.
 2018-05-14 13:55:33 -02:30
Dan
6bc8cc819a Merge branch 'develop' into i3725-refactor-send-component- 2018-05-14 11:44:50 -02:30
Alexander Tseung
2381c0e0f4 Add new unlock screen design 2018-05-11 12:49:17 -07:00
greenkeeper[bot]
f7205e5cc7 fix(package): update ethjs to version 0.4.0 2018-05-11 18:15:10 +00:00
Thomas
3632ea29cc Merge branch 'develop' into e2e-tests 2018-05-11 10:13:44 -07:00
Alexander Tseung
f98aec5f50 Update deep-extend and sshpk 2018-05-09 18:52:35 -07:00
Thomas
26c6bddebf Merge branch 'develop' into e2e-tests 2018-05-08 13:10:26 -07:00
jabher
28126f60f3 bump extensionizer version to 1.0.1 (see https://github.com/MetaMask/extensionizer/pull/4) 2018-05-08 16:47:18 +03:00
Thomas
8250fd9d6d Merge branch 'develop' into testing 2018-05-07 14:30:43 -07:00
Dan
7c49009854 Unit tests for containers, utils and selectors in send_/ 2018-05-05 11:58:14 -04:00
Thomas
f900821a42 Merge branch 'develop' into e2e-tests 2018-05-03 14:10:26 -07:00
Alexander Tseung
d5759cf4a8 Add storybook integration 2018-05-03 10:51:15 -07:00
Alexander Tseung
3b229775a8 Remove eth-block-tracker package 2018-05-02 14:06:34 -07:00
Alexander Tseung
3e4f158b34 Pin chromedriver version to 2.36.0 2018-05-02 13:10:21 -07:00
Alexander Tseung
65253e114f Adds nsp check to CircleCI tests 2018-05-02 12:01:03 -07:00
Alexander Tseung
2c95390229 Adds sass-loader and style-loader packages for storybook integration 2018-05-01 20:05:14 -07:00
Alexander Tseung
a70da53340 Adds path and resolve-url-loader packages for storybook integration 2018-05-01 19:32:20 -07:00
Alexander Tseung
4a54deadf9 Adds css-loader and file-loader needed for storybook integration 2018-05-01 14:28:33 -07:00
Thomas
9dfe4f410d Firefox 2018-05-01 12:18:22 -07:00
Frankie
9b1c07c750
Merge pull request #4111 from MetaMask/build-fix-sourcemaps 
Build - fix sourcemaps
 2018-04-30 10:44:38 -07:00
kumavis
f4fe3e81c1 development - add sourcemap debug tool 2018-04-27 18:17:21 -07:00
kumavis
5c9cb0b787 build - minify via gulp-uglify-es instead of uglifyify 2018-04-27 18:15:50 -07:00
kumavis
b487dab2e7 test - unit - use ganache instead of deprecated block-tracker test util 2018-04-27 17:11:44 -07:00
kumavis
1c63b11e3f rpc - bump provider-engine + eth-json-rpc-filters 2018-04-25 14:02:41 -07:00
Dan Finlay
91161739a5 Move uglifyify to MetaMask org 2018-04-25 10:46:01 -07:00
Dan Finlay
0c5add59f7 Make minified builds more determinstic 
May fix #3999, but will need to see if Mozilla can reproduce the build
with this updated repo.

Switches our `uglifyify` dependency from the production one
(under-maintained) to one that I've merged a critical patch into.

I'm open to discussion of how else we might approach this problem here.
Maybe we should use a different minification module entirely, remove
minification, or maybe refactor our build system!
 2018-04-24 15:01:02 -07:00
Thomas
629457ea54 setupUntrustedCommunication and setupTrustedCommunication 2018-04-24 13:33:31 -07:00
Dan Finlay
f5f5100da7
Merge pull request #4023 from MetaMask/greenkeeper/ethjs-contract-0.2.0 
Update ethjs-contract to the latest version 🚀
 2018-04-23 17:06:46 -07:00
Dan Finlay
9ae2558d20
Merge pull request #3934 from MetaMask/node-engines 
package.json - update engines field to require node v8.x.x
 2018-04-23 16:42:39 -07:00
kumavis
c120fbdfb9 deps - bump sentry for more detailed fetch failure 2018-04-23 10:20:40 -07:00
greenkeeper[bot]
49e02baea0 fix(package): update ethjs-contract to version 0.2.0 2018-04-18 22:09:40 +00:00
frankiebee
e77dbaa0dc deps - update keyring controller and other eth-dependinces 2018-04-17 14:39:02 -07:00
Dan Finlay
6ee57dcad7
Merge branch 'master' into i3580-InternationalizeCurrency 2018-04-17 13:36:21 -07:00
Thomas Huang
7b70804aa0
Merge pull request #3969 from MetaMask/i3966-AddJsDocsPage 
Add JSDocs Page and Script
 2018-04-17 10:01:09 -07:00
bitpshr
4780f825b1 Add ComposableObservableStore for subscription management 2018-04-13 10:20:44 -04:00
Dan Finlay
136caa2034 Add JSDocs Page and Script 
Includes new script `npm run doc` for generating docs page.
 2018-04-12 14:46:05 -07:00
kumavis
f15b81089e
Merge branch 'master' into i3580-InternationalizeCurrency 2018-04-10 02:13:05 -07:00
kumavis
df1f891585
Merge branch 'master' into i3621-LogoPerformance 2018-04-09 13:56:59 -07:00
kumavis
e201ebaf58
Merge pull request #3895 from MetaMask/greenkeeper/gulp-sass-4.0.0 
Update gulp-sass to the latest version 🚀
 2018-04-09 13:40:35 -07:00
kumavis
2a3e634ab9 package.json - update engines field to require node v8.x.x 2018-04-09 13:40:15 -07:00
kumavis
5d7f300af7
Merge pull request #3925 from MetaMask/greenkeeper/ethjs-0.3.4 
Update ethjs to the latest version 🚀
 2018-04-09 13:14:50 -07:00
Dan
2c4426e4de Merge branch 'master' into i3580-InternationalizeCurrency 2018-04-09 16:52:26 -02:30
greenkeeper[bot]
743fb13472 fix(package): update ethjs to version 0.3.4 2018-04-06 23:04:44 +00:00
greenkeeper[bot]
2bfd3de52b fix(package): update gulp-sass to version 4.0.0 2018-04-05 15:51:26 +00:00
Alexander Tseung
34e608e9dc Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-04-03 17:06:00 -07:00
Dan Finlay
74049c19fc Internationalize currency 
Fixes #3580
 2018-04-03 13:58:26 -07:00
Dan Finlay
931ce12073 Improve fox logo performance 
By including metamask-logo@2.1.4

Fixes #3621
 2018-04-03 13:53:02 -07:00
kumavis
92dd2b3218 ci - job-publish - publish source+sourcemaps to sentry if new release 2018-04-03 12:36:46 -07:00
kumavis
00657e14a8 build - correctly set METAMASK_ENV via envify 2018-04-03 09:51:33 -07:00
Alexander Tseung
2e9273d2ac Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-04-03 01:03:51 -07:00
Alexander Tseung
35875863d2 Fix merge conflicts. Modify send workflow 2018-04-03 01:03:31 -07:00
kumavis
655593ea62 Merge branch 'master' of github.com:MetaMask/metamask-extension into build-perf 2018-04-02 16:28:33 -07:00
kumavis
eb7bafc914 deps - update shell-parallel 2018-04-02 15:50:26 -07:00