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
5,421 Commits 2 Branches 0 Tags 265 MiB
81eb5c8796
Commit Graph

1729 Commits

Author SHA1 Message Date
frankiebee
da209a9cfd dont aggresively query account data 2017-12-13 11:19:18 -08:00
Dan
05c6789030 Adds button for opening app in main browser window in extension. 2017-12-12 12:14:40 -08:00
Dan Finlay
1ebd5140aa Version 3.13.2 2017-12-09 20:00:54 -05:00
Dan Finlay
542e0035dd Pass polling interval to zero client provider 2017-12-09 19:58:47 -05:00
kumavis
a91200fd08 tx-controller - failed state is a finished state 2017-12-07 18:04:14 -05:00
Dan Finlay
dc4e3ef241 Version 3.13.1 2017-12-07 16:17:33 -05:00
Dan Finlay
950ec9596c Do not allow nonces larger than the next valid nonce 
To avoid situations where a user signs a transaction that will become
surprisingly valid in the future.
 2017-12-07 16:13:40 -05:00
Dan Finlay
89e640afcb Merge branch 'master' into patch-2 2017-12-07 16:05:17 -05:00
Chi Kei Chan
845aec82b9
Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UI 2017-12-07 09:46:28 -08:00
vicnaum
553d713636
A more expressive way 
replaced ifs with ? :
 2017-12-07 15:30:05 +01:00
Dan Finlay
c391b25015 Version 3.13.0 2017-12-07 03:01:46 -05:00
Chi Kei Chan
373f8b72d0
Merge branch 'master' into NewUI-flat 2017-12-06 21:13:29 -08:00
Dan
ec6c3c33bd Merge branch 'master' into NewUI-flat-merge-with-master 2017-12-06 21:11:52 -08:00
Dan Finlay
0e25129028 Enforce retry tx at minimum gas of previous tx 2017-12-06 23:42:47 -05:00
Dan Finlay
31564e0a86 Fix retry action 2017-12-06 23:20:15 -05:00
Dan Finlay
6ff580584a Add retry background method and action 2017-12-06 22:20:58 -05:00
vicnaum
7854321fae
Fix for #2644 - Specified Nonce isn't used 
Added nonceSpecified.
And a check if nonce was specified - then we should use the specified nonce instead of generating a new one.
 2017-12-06 22:49:24 +01:00
Dan
f58aae3f2b firstRetryBlockNumber defaults to latestBlockNumber if undefined on txMeta in _resubmitTx 2017-12-06 13:21:09 -03:30
Dan
ea23da9e75 Correct note for updateTx after block-update event in transaction.js 2017-12-06 13:07:31 -03:30
Dan
871d9fd9fb Fix undefined latestBlockNumber in _resubmitTx 2017-12-06 13:02:38 -03:30
Dan
ae2a4d78e8 Exponentional backoff on transaction retry in pending-tx-tracker 2017-12-05 17:21:14 -03:30
William Chong
03f86acd60 fix #1398, prevent injecting xml without xml suffix 2017-12-05 19:53:01 +08:00
Dan
84321b2d9b Lint fix 2017-12-04 23:08:23 -03:30
Dan
db06e7e649 Css selected in background based on betaUI state. 2017-12-04 23:08:23 -03:30
Dan
7f79524070 Add UI selection 2017-12-04 23:08:23 -03:30
Thomas Huang
c30b543a80
Merge pull request #2630 from MetaMask/i2624-VersionedNotices 
Versioned notices
 2017-11-29 17:25:10 -06:00
Dan Finlay
9ca6f93eca Bump version to 3.12.1 2017-11-29 12:50:12 -08:00
Dan Finlay
8192c0b58c Fix migration comment 2017-11-29 11:51:27 -08:00
kumavis
327651e7fb Merge branch 'master' of github.com:MetaMask/metamask-plugin into reload-fix 2017-11-29 08:27:47 -10:00
Dan Finlay
ab35a76a24 Migrate old data to include firstVersion info 2017-11-28 16:56:45 -08:00
Dan Finlay
bd82b17310 Linted 2017-11-28 15:35:20 -08:00
Dan Finlay
049ec52a95 Add seed phrase bounty award notice 
Only shows to people who installed before or equal to MetaMask 3.12.1
 2017-11-28 15:31:49 -08:00
Dan Finlay
f0f6bb28e0 Get notice version filtering working nicely 2017-11-28 15:16:04 -08:00
kumavis
f64bc3c01a deps - obs-store@3 + migrate stream plumbing 2017-11-28 11:09:18 -10:00
Dan Finlay
ec4b7de962 Add firstVersion field to notices selector 2017-11-28 11:22:09 -08:00
Dan Finlay
e89f82399f Add optional version field to notices 
Allows notices to only show to users who are on a certain version.
 2017-11-28 11:14:57 -08:00
Dan Finlay
725277dbdb
Merge pull request #2441 from MetaMask/kumavis-patch-3 
NetworkController - add warning when aborting lookupNetwork
 2017-11-27 16:21:25 -08:00
kumavis
634102df63
network controller - warn via log.warn 2017-11-27 13:59:32 -10:00
Jason Clark
a34362b776 Fixes changes requested in pullrequestreview-79088534 2017-11-27 08:11:48 -07:00
Jason Clark
abefcc9612 more eslint fixes 2017-11-25 15:57:54 -07:00
Jason Clark
fc46a16a32 toggle wired up to preferences property store 2017-11-24 10:35:17 -07:00
Clark, Jason (Contractor)
90fc4812bc incremental commit 2017-11-23 18:33:44 -07:00
Dan Finlay
65cb970487 Prevent creation of multiple vaults 
Fixes #2577 by ensuring only one seed phrase can be set for a new vault.

Also cleans up logs and reproduction logic.
 2017-11-20 14:03:12 -08:00
Dan Finlay
c0aa7ce857 Add reproduction and mutex code 2017-11-20 13:27:29 -08:00
Thomas Huang
408bbe726f
Merge pull request #2516 from MetaMask/i2507-DoubleWeb3Error 
Add useful error when duplicate web3 is detected.
 2017-11-20 11:38:41 -06:00
Chi Kei Chan
03968ffafe Version Bump 2017-11-15 12:23:39 -08:00
Chi Kei Chan
e61ba93194 Merge branch 'master' into merge-master 2017-11-15 12:03:13 -08:00
Dora E. Mondrian
41fea44af3 newUnaprovedTx => newUnapprovedTx 
This typo tripped me up when I was reading through the code and trying to understand what's going on.
 2017-11-06 04:35:51 -08:00
Thomas Huang
86e88dc813
Merge pull request #2519 from danjm/NewUI-flat-lintfixes 
[NewUI-flat] New ui flat lintfixes
 2017-11-02 10:02:09 -07:00
Dan
5a94775b3f Lint fixes for NewUI-flat. 2017-11-02 00:00:33 -02:30
Dan Finlay
5ce94e69b3 Add useful error when duplicate web3 is detected. 
Fixes #2507
 2017-10-31 09:59:26 -07:00
Kevin Serrano
e0030a8bf8
Merge pull request #2291 from MetaMask/gasPriceSpecified 
Add boolean for specified gas price
 2017-10-27 14:01:08 -07:00
Kevin Serrano
1e9c0a9db2
Resolve merge conflicts 2017-10-26 16:22:08 -07:00
kumavis
c1d2a1226c 4.0.3 2017-10-25 20:13:05 -07:00
kumavis
a7424f0c0d 3.12.0 2017-10-25 20:06:26 -07:00
Chi Kei Chan
db5326dfc2 Merge branch 'NewUI-flat' into uat 2017-10-25 19:46:42 -07:00
Chi Kei Chan
5aecce908f Merge branch 'master' into NewUI-flat 2017-10-25 18:49:02 -07:00
Chi Kei Chan
fa95303e1e Sign Typed Request styling fixes 2017-10-25 18:05:52 -07:00
Dan
ddf11011c9 Signature request fixes. 2017-10-25 17:40:48 -07:00
Kevin Serrano
b9bbf8f329
Resolving that ugly merge. 2017-10-25 15:45:26 -07:00
Alexander Tseung
3d8182f5d5 Add Info section 2017-10-25 12:16:47 -07:00
Chi Kei Chan
311ca1f3ca Fix styling on notification view 2017-10-25 00:10:09 -07:00
Chi Kei Chan
301c737bbc Merge branch 'master' into NewUI-flat 2017-10-24 16:56:49 -07:00
Kevin Serrano
1767dceba4 Merge pull request #2422 from watilde/fixes-lint 
Fixes lint warnings
 2017-10-24 16:53:54 -07:00
Chi Kei Chan
7c20011023 Merge branch 'master' into NewUI-flat 2017-10-24 16:50:25 -07:00
tmashuang
91b23246cd Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin into firsttimeflow 2017-10-24 08:36:02 -07:00
Chi Kei Chan
4401800a42 Account menu white check mark 2017-10-24 00:13:49 -07:00
kumavis
b17a799de6 Update network.js 2017-10-23 12:10:49 -07:00
Dan Finlay
6d05238469 Try to fix intermittent test failure in NonceTracker tests 2017-10-22 22:24:50 -07:00
Dan Finlay
e564ed8d4c Version 3.11.2 2017-10-21 15:40:57 -07:00
Daijiro Wachi
43b1cb9100 Fix lint warnings 
Fixed warnings:
```md
app/scripts/controllers/computed-balances.js
+ 35:27  warning  Missing space before function parentheses            space-before-function-paren
+ 41:14  warning  'address' is never reassigned. Use 'const' instead   prefer-const
+ 61:9   warning  'updater' is never reassigned. Use 'const' instead   prefer-const
+ 68:11  warning  'newState' is never reassigned. Use 'const' instead  prefer-const

app/scripts/controllers/network.js
+ 104:29  warning  Missing space before function parentheses  space-before-function-paren

app/scripts/lib/createLoggerMiddleware.js
+ 4:32  warning  Missing space before function parentheses      space-before-function-paren
+ 15:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/createOriginMiddleware.js
+ 4:32  warning  Missing space before function parentheses      space-before-function-paren
+ 9:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/createProviderMiddleware.js
+ 5:34  warning  Missing space before function parentheses      space-before-function-paren
+ 13:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/events-proxy.js
+ 1:50  warning  Missing space before function parentheses      space-before-function-paren
+ 31:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/nodeify.js
+ 2:22  warning  Missing space before function parentheses  space-before-function-paren
+ 2:24  warning  Missing space before opening brace         space-before-blocks
+ 5:18  warning  Missing space before function parentheses  space-before-function-paren
+ 5:20  warning  Missing space before opening brace         space-before-blocks

app/scripts/lib/pending-balance-calculator.js
+ 16:19  warning  Missing space before function parentheses  space-before-function-paren

app/scripts/lib/pending-tx-tracker.js
+ 85:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 87:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 88:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 90:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 91:11  warning  '||' should be placed at the end of the line  operator-linebreak

app/scripts/lib/port-stream.js
+ 3:22  warning  Missing space before function parentheses  space-before-function-paren
+ 3:24  warning  Missing space before opening brace         space-before-blocks

app/scripts/lib/tx-gas-utils.js
+ 84:2  warning  Newline required at end of file but not found  eol-last

app/scripts/lib/tx-state-history-helper.js
+ 12:37  warning  Missing space before function parentheses      space-before-function-paren
+ 23:30  warning  Missing space before function parentheses      space-before-function-paren
+ 30:23  warning  Missing space before function parentheses      space-before-function-paren
+ 35:28  warning  Missing space before function parentheses      space-before-function-paren
+ 41:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/tx-state-manager.js
+ 94:13  warning  'value' is never reassigned. Use 'const' instead  prefer-const

ui/app/reducers.js
+ 45:7  warning  'state' is never reassigned. Use 'const' instead        prefer-const
+ 53:7  warning  'stateString' is never reassigned. Use 'const' instead  prefer-const

ui/lib/tx-helper.js
+ 27:2  warning  Newline required at end of file but not found  eol-last

ui/app/components/account-dropdowns.js
+ 163:1  warning  More than 2 blank lines not allowed  no-multiple-empty-lines

ui/app/components/menu-droppo.js
+ 22:7  warning  'style' is never reassigned. Use 'const' instead  prefer-const

ui/app/components/shapeshift-form.js
+ 135:11  warning  '&&' should be placed at the end of the line  operator-linebreak

ui/app/components/typed-message-renderer.js
+ 35:25  warning  Missing space before function parentheses      space-before-function-paren
+ 42:2   warning  Newline required at end of file but not found  eol-last

mascara/server/index.js
+ 11:42  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 12:36  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 13:33  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 14:40  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 20:29  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 21:29  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 26:40  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
```
 2017-10-21 21:06:39 +02:00
Chi Kei Chan
5aaa2d679b Add ShapeShift UI 2017-10-20 21:51:37 -07:00
kumavis
a9a841ba01 4.0.2 2017-10-20 19:33:15 -07:00
Dan Finlay
56dcf7c011 Version 3.11.1 2017-10-20 14:07:54 -07:00
kumavis
48f348e729 4.0.1 2017-10-20 11:30:56 -07:00
Chi Kei Chan
344b467d03 Merge branch 'master' into NewUI-flat 2017-10-20 11:05:10 -07:00
Dan Finlay
a10a600cce Linted 2017-10-19 12:33:43 -07:00
Dan Finlay
3b4c679ffc Fix bug where new account was not immediately selected 2017-10-19 12:15:26 -07:00
Dan Finlay
0ae406e489 Allow computed balances to enumerate its own view 2017-10-19 09:59:57 -07:00
Chi Kei Chan
c8c773d641 Merge branch 'NewUI-flat' into merge 2017-10-18 22:58:46 -07:00
Dan Finlay
21bde66e16 Remove account-tracker from keyringController 2017-10-18 17:14:26 -07:00
Dan Finlay
bbe2c9f48d Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVault 2017-10-18 17:07:25 -07:00
Dan Finlay
d89394a7c9 Make account tracking much more reactive 2017-10-18 17:07:22 -07:00
kumavis
8da0d0b28a Revert "NetworkController refactor for new EthClient interface" 2017-10-18 15:09:32 -07:00
Dan Finlay
75177ce34c Make account tracking more reactive 
We were doing a lot of conditional observation & updating.
Pulled out a bunch of that for generic observer/syncers.
 2017-10-18 15:08:34 -07:00
Dan Finlay
9cc1e8a6d8 Refresh computed balances controller when restoring vault 2017-10-18 14:22:04 -07:00
Dan Finlay
ea79eca8eb Add validation to balance constructor 2017-10-18 12:21:22 -07:00
Dan Finlay
7032edf32b Stop tracking old account balances after restore vault 
Per @kgserrano note
 2017-10-18 11:13:14 -07:00
Dan Finlay
50e8599988 Promisify metamask-controller vault creating methods 2017-10-17 13:25:27 -07:00
Dan Finlay
d7f384485d Select first account when restoring seed 
Fixes #2348
 2017-10-17 13:19:57 -07:00
Dan Finlay
ab31eb6a17 Select first account on new vault creation 2017-10-17 13:09:41 -07:00
Chi Kei Chan
81f62a7443 Adding Account Dropdown V2 2017-10-13 02:11:01 -04:00
kumavis
53a360b65d contentscript - fix inpage require and bundling 2017-10-12 12:51:48 -07:00
Dan Finlay
c9a984a237 Break up inpage file read into multiple lines 2017-10-12 14:16:40 -04:00
Dan Finlay
d0d082d70c Merge branch 'master' into i1340-SynchronousInjection 2017-10-12 13:25:19 -04:00
Thomas Huang
29ee33359e Merge pull request #2345 from MetaMask/Version-3.11.0 
Version 3.11.0
 2017-10-12 09:24:35 -07:00
kumavis
dcf10f3d75 nonce-tracker - use blockTracker directly 2017-10-11 18:33:36 -07:00
Dan Finlay
4ed00ea2d8 Version 3.11.0 2017-10-11 15:54:17 -04:00
kumavis
0f8d7dacb1 network-controller - use obj-proxy for providerProxy 2017-10-10 17:26:44 -07:00
kumavis
7d50a56198 util - add obj-proxy 2017-10-10 17:15:52 -07:00
kumavis
e32d75965f events-proxy - clean up 2017-10-10 17:15:14 -07:00
kumavis
4d273d3cea lint fixes 2017-10-10 14:14:43 -07:00
kumavis
efa92a7fc5 network controller - refactor to use eth-rpc-client 2017-10-10 14:13:12 -07:00
kumavis
ff4e9a0d11 metamask controller - define this.newTransaction to ease instantiation order 2017-10-10 10:50:45 -07:00
kumavis
f7c1bc804d metamask controller - simplify provider init 2017-10-10 10:39:31 -07:00
kumavis
e79037261e metamask controller - breakout getAccounts method 2017-10-10 10:26:59 -07:00
Kevin Serrano
1816eca914
Merge branch 'master' into version-debugging 2017-10-10 08:38:27 -07:00
Kevin Serrano
24a55cf777
Make the function callback friendly. 2017-10-10 08:36:15 -07:00
Dan Finlay
7f70c866c3 Merge pull request #2223 from ukstv/master 
Add eth_signTypedData handler
 2017-10-09 12:18:43 -07:00
Dan
bbe893a0d8 UI for send screen container without form rows. 2017-10-08 17:48:09 -07:00
Sergey Ukustov
a1696f89a8 Validate data format for eth_signTypedData 2017-10-07 00:38:13 +03:00
Frankie
4a4338c1f4 Merge pull request #2305 from MetaMask/nodeify 
nodeify - allow callback to be optional
 2017-10-06 14:08:58 -07:00
Dan Finlay
0c61695656 Merge branch 'master' into SignTypedData 2017-10-06 14:03:04 -07:00
kumavis
fa11bbf996 Merge pull request #2304 from MetaMask/i1531-UpdateTxStatesOnInit 
Update status of pending transactions on startup
 2017-10-06 13:40:43 -07:00
kumavis
bc396a7417 lint fix - nodeify 2017-10-06 13:02:34 -07:00
Dan Finlay
a417fab0eb When checking pending txs, check for successful txs with same nonce. 
If a successful tx with the same nonce exists, transition tx to the failed state.

Fixes #2294
 2017-10-06 12:51:13 -07:00
Dan Finlay
94513cae7b Provide method for tx tracker to refer to all txs 2017-10-06 12:50:33 -07:00
kumavis
be4f7b33f4 nodeify - allow callback to be optional 2017-10-06 12:36:08 -07:00
Dan Finlay
0146b55d6d Check status of pending transactions on startup 
Fixes #1531
 2017-10-06 11:41:28 -07:00
Kevin Serrano
f6821781d2
Simplify try catch 2017-10-05 17:17:34 -07:00
Kevin Serrano
106af9ec5b
Catch an error if this is not defined. 2017-10-05 17:13:58 -07:00
Kevin Serrano
b9012a62e5
Merge branch 'master' into version-debugging 2017-10-05 17:06:55 -07:00
Dan Finlay
9f18b898c5 Merge branch 'Version-3.10.9' into SignTypedData 2017-10-05 14:52:19 -07:00
Dan Finlay
cf178341c1 Merge branch 'master' into SignTypedData 2017-10-05 14:50:19 -07:00
Dan Finlay
9bc80d998e Add signTypedData input validations 2017-10-05 14:39:35 -07:00
Dan Finlay
8d45b96db6 Version 3.10.9 2017-10-05 12:44:48 -07:00
Dan Finlay
c5b7880f05 Merge branch 'master' into SignTypedData 2017-10-05 11:55:23 -07:00
frankiebee
3cb9da2ae5 "fix" hours for message 2017-10-05 11:42:01 -07:00
frankiebee
ec9c528313 pending-tx - check time stamp instead of block number for resubmit 2017-10-05 11:07:22 -07:00
Kevin Serrano
15809894ff
Add indicator for specified gas price 2017-10-05 09:58:04 -07:00
Dan Finlay
1cba6543a4 Begin implementing sync injection idea 2017-10-04 15:35:04 -07:00
Kevin Serrano
3d80565339
Configured for callback-required function.' 2017-10-04 10:55:10 -07:00
Kevin Serrano
147b81068a
Include OS version 2017-10-04 09:56:18 -07:00
Chi Kei Chan
bd99bc2e88 Merge branch 'master' into NewUI-flat 2017-10-03 16:02:58 -07:00
Dan
ac4868170f Enables remove token and ensures add/remove update the list without need for refresh. 2017-10-03 15:46:01 -07:00
Frankie
948a0b1078 Merge pull request #2250 from interfect/master 
Don't pass origin as an HTTP header
 2017-10-03 10:36:39 -07:00
Sergey Ukustov
e11ca12890 Merge remote-tracking branch 'upstream/master' 2017-10-03 02:10:47 +03:00
kumavis
062eaa6a82 pending tx tracker - on tx:warn append error message instead of error obj 2017-10-02 15:39:11 -07:00
kumavis
ed77304e73 pending tx tracker - tx:warning event includes err obj 2017-10-02 15:20:01 -07:00
kumavis
22eaf92ec2 pending tx tracker - resubmit - warn dont error on unknown error 2017-10-02 15:00:23 -07:00
kumavis
7af696bfbe pending tx tracker - dont throw on load failure 2017-10-02 14:56:59 -07:00
kumavis
167ad729fd Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into history-notes 2017-10-02 13:45:47 -07:00
frankiebee
e08a727d44 Merge branch 'master' into history-notes 2017-10-02 13:44:15 -07:00
kumavis
df59ef9942 tx state history - append note to first op of diff 2017-10-02 13:44:11 -07:00
frankiebee
833da191c3 transaction - provide notes for history 2017-10-02 13:41:29 -07:00
kumavis
d29b5f10ef tx state history - fix bug where initial snapshot was mutated on updateTx 2017-10-02 13:14:42 -07:00
Thomas Huang
1769f880db Merge pull request #2138 from sunify/fix-firefox-cors 
Fix CORS issues in FireFox
 2017-10-02 11:09:06 -07:00
Kevin Serrano
36bc8f3c60 Update manifest.json 2017-10-02 10:59:15 -07:00
Adam Novak
8cc8fecdac Don't pass origin as an HTTP header 
Requests with this nonstandard header are being blocked by CORS when
made against Parity.

Not sending it ought to fix #1779.
 2017-10-01 18:55:52 -07:00
Dan Finlay
d5b0d8af4f Version 3.10.8 - Fix Currency Conversion 
In our conversion to the new Infura API, somehow we were sending upper-cased conversions to their lower-case sensitive API.

Fixes the first part of #2240
 2017-09-29 20:57:15 -07:00