147b81068a
Include OS version
2017-10-04 09:56:18 -07:00
bd99bc2e88
Merge branch 'master' into NewUI-flat
2017-10-03 16:02:58 -07:00
ac4868170f
Enables remove token and ensures add/remove update the list without need for refresh.
2017-10-03 15:46:01 -07:00
948a0b1078
Merge pull request #2250 from interfect/master
...
Don't pass origin as an HTTP header
2017-10-03 10:36:39 -07:00
e11ca12890
Merge remote-tracking branch 'upstream/master'
2017-10-03 02:10:47 +03:00
062eaa6a82
pending tx tracker - on tx:warn append error message instead of error obj
2017-10-02 15:39:11 -07:00
ed77304e73
pending tx tracker - tx:warning event includes err obj
2017-10-02 15:20:01 -07:00
22eaf92ec2
pending tx tracker - resubmit - warn dont error on unknown error
2017-10-02 15:00:23 -07:00
7af696bfbe
pending tx tracker - dont throw on load failure
2017-10-02 14:56:59 -07:00
167ad729fd
Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into history-notes
2017-10-02 13:45:47 -07:00
e08a727d44
Merge branch 'master' into history-notes
2017-10-02 13:44:15 -07:00
df59ef9942
tx state history - append note to first op of diff
2017-10-02 13:44:11 -07:00
833da191c3
transaction - provide notes for history
2017-10-02 13:41:29 -07:00
d29b5f10ef
tx state history - fix bug where initial snapshot was mutated on updateTx
2017-10-02 13:14:42 -07:00
1769f880db
Merge pull request #2138 from sunify/fix-firefox-cors
...
Fix CORS issues in FireFox
2017-10-02 11:09:06 -07:00
36bc8f3c60
Update manifest.json
2017-10-02 10:59:15 -07:00
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
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
7bdf73b1dd
Merge pull request #2233 from MetaMask/remove-accountTracker-from-transactions
...
pending-tx - dont check the balance to rebrodcast
2017-09-29 17:36:49 -07:00
8425fb04d3
Merge pull request #2239 from MetaMask/network-controller-contd
...
network - make network controller internal network switching explicit
2017-09-29 17:22:16 -07:00
1ad8a9a0ff
network - make network controller internal network switching explicit
2017-09-29 17:10:34 -07:00
f57fd717fe
Merge pull request #2237 from MetaMask/network-controller-contd
...
Networking refactor
2017-09-29 16:50:31 -07:00
d6ea2fa425
network - convert localhost from custom rpc to network type
2017-09-29 16:35:58 -07:00
b88d11f86e
network controller - small refactor
2017-09-29 16:09:38 -07:00
14d58e630d
Version 3.10.7
2017-09-29 13:17:21 -07:00
ac80eaca1f
pending-tx - dont check the balance to rebrodcast
2017-09-29 12:54:05 -07:00
861bd877f3
Ensure selected account is always set if possible
...
Fixes #2218
Subscribes to keyringController, and if only one account exists, sets it as selected.
2017-09-29 11:19:54 -07:00
c2b8dada91
Add eth_signTypedData handler
2017-09-29 19:40:46 +03:00
5a1d50cd43
Merge branch 'master' into mmn
2017-09-27 22:32:07 -07:00
cdf41c2857
Merge pull request #2124 from MetaMask/breakout-mascara
...
require metamascara
2017-09-27 16:27:01 -07:00
b24e16d346
re-enabled x-metamask-origin for mascara
2017-09-27 16:14:58 -07:00
15b2823e54
Merge branch 'master' into new-currency-test
2017-09-27 16:04:51 -07:00
ecf909e140
Merge pull request #2194 from MetaMask/network-controller-refactor
...
Network controller refactor
2017-09-27 15:56:23 -07:00
b473d440a3
Version 3.10.6
2017-09-27 15:14:40 -07:00
a246770866
Commit to the eth-keyring-controller module
2017-09-27 14:55:34 -07:00
aefd17ef94
Remove dead reference
2017-09-27 14:45:24 -07:00
06b5dd2096
network controller - move _setProvider to bottom
2017-09-27 14:44:54 -07:00
f2d9b75e94
network controller - refactor to use _setProvider
2017-09-27 14:44:13 -07:00
96ebbde634
Fix Account Selection
...
Do not select accounts on restore, only on creation and deliberate selection.
Fixes #2164
2017-09-27 14:43:34 -07:00
7d499df8e3
account-tracker - remove unused import
2017-09-27 14:12:45 -07:00
c781e11c7a
network - remove getter/setter
2017-09-27 14:10:58 -07:00
7e9c6e96a1
metamask - improve comment
2017-09-27 14:10:17 -07:00
4404dfc5d3
Merge branch 'master' into direct-block-tracker
2017-09-27 13:58:54 -07:00
5bbea78306
Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3
...
Transaction controller refractor pt3
2017-09-27 13:57:04 -07:00
b41aad6d1a
style - small whitespace nitpick
2017-09-27 12:33:46 -07:00
89e690fc79
account-tracker - use new block-tracker block format
2017-09-27 12:33:00 -07:00
1983e161c6
Fix accountTracker store references
2017-09-27 12:29:09 -07:00
a453eb132d
Version 3.10.5
2017-09-27 12:10:25 -07:00
8d3fec42d0
Fix bug where block gas limit was incorrectly parsed.
2017-09-27 12:09:32 -07:00
d77e0aff4d
Version 3.10.4
2017-09-27 11:15:22 -07:00
e72083f6e8
Merge branch 'master' into filter-fixes-moar
2017-09-27 10:57:02 -07:00
0a94ec41d3
pending-tx - move incrementing of the retryCount on the txMeta outside pending-tx-tracker
2017-09-26 22:42:59 -07:00
1877c0766c
Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOutKeyringController
2017-09-26 21:42:30 -07:00
508696f71d
transactions: reveal #getFilteredTxList from txStateManage and fix accountTracker.store reference
2017-09-26 18:12:53 -07:00
80c98b1653
transactions: make evnt names pretty and eaiser to read
2017-09-26 16:55:11 -07:00
9fd5458112
transactions: lint fixes and reveal status-update event for balance controller
2017-09-26 16:54:04 -07:00
8ab23c713d
Merge branch 'master' into transactionControllerRefractorPt3
2017-09-26 16:24:43 -07:00
651098c70d
Remove duplicate instantiation of account-tracker
2017-09-26 14:30:29 -07:00
2eca5455c0
Move obs store into account-tracker instead of inheriting
2017-09-26 14:15:16 -07:00
9d1cb0f76d
network contoller - clean up unused code
2017-09-26 13:56:09 -07:00
2ed8d579da
listen for the blocke event on the block tracker instead of rawBlock on the provider
2017-09-26 13:38:27 -07:00
b654eb9b1f
wrap block tracker in events proxy
2017-09-26 13:38:27 -07:00
3bedcd3582
Restore blockGasLimit to account-tracker
2017-09-26 13:36:41 -07:00
9e3648c668
Pass blocktracker to balances controller
2017-09-26 11:33:36 -07:00
16ba2e6a30
Merge branch 'master' into new-currency-test
2017-09-26 09:51:20 -07:00
1968d61431
Make encryptor configurable for keyring-controller
2017-09-25 15:23:37 -07:00
fd985e7ec1
Merge branch 'master' into AddBalanceController
2017-09-25 14:44:04 -07:00
674aac83ce
Make blockTracker an independent param
2017-09-25 14:39:54 -07:00
d9c92cdbd1
Merge branch 'AddBalanceController' of github.com:MetaMask/metamask-plugin into AddBalanceController
2017-09-25 14:37:11 -07:00
8cd7329c91
Implemented feedback
2017-09-25 14:36:49 -07:00
9bbb0ca1ea
Merge pull request #2143 from MetaMask/Version-3.10.3
...
Version 3.10.3
2017-09-25 12:55:45 -07:00
dfbdb99858
Merge branch 'master' into AddBalanceController
2017-09-25 11:49:38 -07:00
40f1d08684
Made some requested changes
2017-09-25 11:42:08 -07:00
443b1a8eb7
Remove keyring controller from project
2017-09-22 14:38:40 -07:00
aa2abc00eb
Merge branch 'AddBalanceController' into BreakOutKeyringController
2017-09-22 14:30:31 -07:00
dd45592641
metamask - use provider-engines block tracker
2017-09-22 14:22:07 -07:00
128cf40f91
Fix accont-tracker merge bug
2017-09-22 14:16:19 -07:00
f01b0a818b
Fix account-tracker references
2017-09-22 14:13:56 -07:00
f9d2f523c6
Merge branch 'master' into AddBalanceController
2017-09-22 14:12:41 -07:00
d2a747e57e
Fix computed-balances controller reference
2017-09-22 14:06:54 -07:00
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
977405fc7d
Remove dead code from eth-store
2017-09-22 13:33:53 -07:00
08b36b9b58
Allow metamaskController to define keyring types
2017-09-22 13:29:13 -07:00
4c971ebfd1
Define encryptor in constructor params instead of platform object
2017-09-22 13:25:08 -07:00
bfaacd3118
Wildcard for infura.io permissions, added permission for cryptonator api
2017-09-22 12:14:04 +08:00
0a5ae39509
bug - fix event emitter mem leak warning
2017-09-21 17:37:30 -07:00
bd117d6b71
Merge branch 'master' into ConfigurableEncryption
2017-09-21 15:56:24 -07:00
e9043f22df
Allow custom encryptor to be passed to MetaMaskController and KeyringControllers.
2017-09-21 15:47:25 -07:00
8a874824a8
Version 3.10.3
2017-09-21 11:45:33 -07:00
14b9d16ece
platforms: put context for extension in platform extension class
2017-09-21 11:12:04 -07:00
7256894f51
Fix CORS issues in FireFox
2017-09-21 15:13:53 +08:00
b22783a223
Merge branch 'master' into new-currency-test
2017-09-20 09:40:33 -07:00
90482934f1
Merge branch 'master' into breakout-mascara
2017-09-19 10:45:51 -07:00
bfd75107f1
add context to platform to not have X-Metamask-Origin in mascara
2017-09-19 10:45:32 -07:00
51b40adecd
v3.10.2
...
published `v3.10.2` as an emergency rollback to `v3.10.0`
2017-09-18 22:42:04 -07:00
a67d3ecd46
Merge branch 'master' into NewUI-flat
2017-09-18 18:13:15 -07:00
bd8428e9ed
Comply with current currency API and add additional styling.
2017-09-18 16:09:01 -07:00
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
c90c904f95
Version 3.10.1
2017-09-18 11:47:59 -07:00
51f0911f87
Merge branch 'master' into new-currency-test
2017-09-18 11:46:10 -07:00
6c5865d564
Merge branch 'master' into nm
2017-09-18 11:28:10 -07:00
cb8856597c
Merge branch 'master' into new-currency-test
2017-09-14 08:35:48 -07:00
d7097db022
createOriginMiddleware - fix var name
2017-09-13 15:29:44 -07:00
765ef64061
metamask controller - destroy filter polyfill on disconnect
2017-09-13 15:19:44 -07:00
245c0f0c27
metamask controller - move middleware into seperate files
2017-09-13 15:17:26 -07:00
a01921758b
Add computed balance to account detail view
2017-09-13 15:06:04 -07:00
86cd4e4fed
Got pending balance updating correctly
2017-09-13 14:28:51 -07:00
77a48fb0b1
ensure that values written to txParams are hex strings
2017-09-13 14:27:27 -07:00
e4d7fb2447
Add state-labeled events to allow subscribing to any transaction's state change
2017-09-13 11:39:39 -07:00
96d1175834
debug - prefer logger over console
2017-09-13 10:28:29 -07:00
a265144176
metamask cont - standardize multiplex stream naming
2017-09-13 10:21:00 -07:00
8b5f2a95df
Improve styling in Confirmation Screen; Show decoded send token data
2017-09-12 23:04:01 -07:00
53a467cd1e
Some progress
2017-09-12 15:06:19 -07:00
9e0c0745ab
linting && format fixing
2017-09-12 12:19:26 -07:00
114dae5f80
Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix3
2017-09-12 11:51:22 -07:00
3ad67d1b14
match other controller patterns
2017-09-12 09:59:59 -07:00
7eb6dae418
Added signTokenTx; Adding token confirmation screen
2017-09-12 02:22:23 -07:00
4738746968
Merge branch 'i1746-BalanceBasedOnPending' into AddBalanceController
2017-09-11 15:19:17 -07:00
6c318f238d
Version 3.10.0
2017-09-11 14:37:53 -07:00
8545453a9d
contentscript - fix obj-multiplex instantiation and use pump for streams
2017-09-11 14:30:30 -07:00
41164f61db
Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix
2017-09-11 14:21:09 -07:00
68b22d409a
Merge pull request #2049 from MetaMask/i1938-removecryptopermissions
...
Remove cryptonator from chrome manifest file
2017-09-10 11:05:52 -07:00
62f26c5ba8
fix miss type
2017-09-08 15:02:36 -07:00
9b9df41724
more tests and craete a getPendingTransactions function
2017-09-08 14:24:40 -07:00
5fa0b992a7
Merge pull request #2057 from MetaMask/Version-3.9.13
...
Version 3.9.13
2017-09-08 13:06:59 -07:00
585a32534d
Version 3.9.13
2017-09-08 12:17:58 -07:00
d03b0547bb
inpage provider - define sendAsync on the prototype
2017-09-08 11:52:00 -07:00
ef3bf810bf
inpage - use obj-multiplex module
2017-09-07 22:47:08 -07:00
671dafea9e
Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix
2017-09-07 22:37:44 -07:00
70401626e2
lint - remove dead code
2017-09-07 22:35:38 -07:00
9d4c02e57f
metamask - add jsonrpc filter middleware on per-connection engine
2017-09-07 21:26:25 -07:00
0e8e655fdb
inpage - distinguish pump vs pipe
2017-09-07 21:19:24 -07:00
57e4805c62
streams - use pump and published obj-multiplex
2017-09-07 21:17:49 -07:00
b7e24dcda7
Remove cryptonator from chrome permissions.
2017-09-07 18:17:43 -07:00
d4d7c6d89e
Linted
2017-09-07 12:54:28 -07:00
fadc0617df
Make tx calculations account for gas prices
2017-09-07 12:52:49 -07:00
c616581001
Remove logs
2017-09-07 12:47:52 -07:00
a95a3c7e4f
Fix balance calc test
2017-09-07 12:47:27 -07:00
74c6de7d23
Add constructor comment
2017-09-07 12:45:00 -07:00
7b92268428
Fix valueFor test
2017-09-07 12:43:10 -07:00
4058574436
Add basic test for valueFor
2017-09-07 12:30:25 -07:00
b6e8791bc2
test not passing
2017-09-07 11:59:15 -07:00
440a42bbc3
inpage - add idRemapMiddleware
2017-09-07 10:08:07 -07:00
50075c6df5
fix messy merge
2017-09-07 00:55:21 -07:00
00fca4f1f2
remove unused variable
2017-09-06 14:38:39 -07:00
74f7fc4613
Check balances in parallel
2017-09-06 14:37:46 -07:00
f9a052deed
Add first passing balance calc test
2017-09-06 14:36:15 -07:00
a73aecc796
fix merge and errors disaperaing on update
2017-09-06 14:01:07 -07:00
0217984a40
Merge branch 'master' into readd-loose
2017-09-06 13:59:52 -07:00
b5f48730cd
Properly update keyring state on new account addition.
2017-09-06 13:59:41 -07:00
6c83ba762e
Merge branch 'master' into transactionControllerRefractorPt3
2017-09-06 13:45:03 -07:00
5e934994d1
Version 3.9.12
2017-09-06 13:33:30 -07:00
bffdde2082
Fix html height
2017-09-06 00:36:44 -07:00
15c12ca4bb
add better comments
2017-09-05 21:50:36 -07:00
00bd5b143f
rename tx-utils.js -> tx-gas-utils.js
2017-09-05 20:33:50 -07:00
4c554f32ec
remove #buildEthTxFromParams
2017-09-05 20:13:43 -07:00
ea7e46ed38
inpage - bug fix
...
prevents mutation of original message object which causes problems with web3 1.0
2017-09-05 16:46:21 -07:00
70a61f8712
Make web3 deprecation notice more useful
...
Linking to a descriptive & precriptive article on a path forward.
2017-09-05 11:35:33 -07:00
ae8486d5cf
Merge branch 'master' into new-currency-test
2017-08-29 16:36:19 -07:00
056276af02
integrate infura currency
2017-08-29 16:36:05 -07:00
5facba89ca
Replace Avenir Next with alternative.
2017-08-29 14:16:32 -02:30
76de053b0b
Merge branch 'master' into inpage-provider-fixes
2017-08-28 11:29:47 -07:00
e294aa7e0d
inpage - lint fix
2017-08-28 10:41:01 -07:00
cc56d0d2f6
inpage - use json-rpc-engine for inpage-provider
2017-08-24 15:44:40 -07:00
72bccec440
Version 3.9.11
2017-08-24 00:16:19 -07:00
9ce82640f2
Merge pull request #1973 from MetaMask/hotfix-migration019
...
hotfix - fail submitted txs whos nonce is out of bound
2017-08-24 00:15:24 -07:00
c2624dd1a0
fall back to `latest` if blockNumber is null
2017-08-24 00:02:06 -07:00
803e696cdc
Make method return a number
2017-08-23 23:24:01 -07:00
17a71a9b4c
Only cancel pending txs with non continuously high nonces
2017-08-23 23:13:42 -07:00
f42687d25f
fix description
2017-08-23 22:53:29 -07:00
dadee1ed79
hotfix - fail submitted txs whos nonce is out of bound
2017-08-23 22:50:40 -07:00
0ad310e096
Fail transactions after a day of retries
2017-08-23 22:29:08 -07:00
c620123fab
Enforce nonces as type string
2017-08-23 21:50:28 -07:00
a122ec1f8b
Use toNumber method
2017-08-23 21:37:07 -07:00
55c1a259b1
Fix network nonce parsing
2017-08-23 21:14:46 -07:00
855f4eeacb
Pass nonce tests
2017-08-23 20:43:47 -07:00
04d40b114d
Got all tests but one passing
2017-08-23 20:11:37 -07:00
221575a191
Fix new test, break an older maybe wrong one
2017-08-23 20:04:03 -07:00
c4ab7a5779
Linted
2017-08-23 19:35:49 -07:00
1f0223d0a0
Simplify nonce calculation
2017-08-23 19:34:20 -07:00
4019f318fe
inpage provider - autoreload - improve readability
2017-08-23 16:44:57 -07:00
44dc2ba712
inpage provider - only warn web3 usage once per session
2017-08-23 16:26:55 -07:00
53e410167b
inpage provider - sync rpc - default to null values
2017-08-23 16:13:33 -07:00
df78020c18
Version 3.9.10
2017-08-23 11:51:10 -07:00
b3b62d97a3
Merge branch 'master' into useLocalNonce
2017-08-23 11:12:46 -07:00
247965ebbe
nonce-tracker - more debugging numbers for nonceDetails
2017-08-22 15:34:30 -07:00
0a93b65a3d
remove unused code
2017-08-22 15:06:54 -07:00
fb2c6cc8ac
nonce-tracker - use ethjs-query
2017-08-22 14:33:54 -07:00
dc3e8d60ef
nonce-tracker - fix var name
2017-08-22 14:24:09 -07:00
6d596bd9e6
nonce-tracker - getlocalNextNonce - add entry to nonceDetails
2017-08-22 14:17:00 -07:00
a7e3dc8327
nonce-tracker - simplify _getlocalNextNonce
2017-08-22 14:15:56 -07:00
e43da3e4aa
nonce-tracker - simplify getHighestNonce
2017-08-22 14:04:31 -07:00
b191649ef5
nonce-tracker - getHighestNonce doesnt need uniqued input
2017-08-22 13:58:26 -07:00
98bc9b6656
nonce-tracker - make nonce strategy api and naming more symmetical
2017-08-22 13:52:15 -07:00
65d2762346
Add bolt and info icon vector images
2017-08-22 12:47:33 -07:00
604c91f7b2
nonce-tracker - pass tests
2017-08-21 18:04:05 -07:00
7d34b22d78
clean up code
2017-08-21 17:04:47 -07:00
5c74f316a8
nonce-tracker - pass tests
2017-08-21 16:45:10 -07:00
fbba3a1ac8
Merge branch 'master' into transactionControllerRefractorPt3
2017-08-21 11:35:22 -07:00
7ea83b6bae
Create TxStateManager
2017-08-21 10:29:10 -07:00
Kevin Serrano
Chi Kei Chan
Dan
Frankie
Sergey Ukustov
kumavis
Thomas Huang
Kevin Serrano
Adam Novak
Dan Finlay
kumavis
Dan Finlay
Dan Finlay
Alex Lunyov
sdtsui