1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-30 08:09:15 +01:00
Commit Graph

4655 Commits

Author SHA1 Message Date
frankiebee
0daeaeb4a8 Merge branch 'master' into i#2720 2017-12-15 12:59:43 -08:00
Frankie
6861a218e7
Merge pull request #2755 from MetaMask/tests
Change `console.log` to `log.info` for configureInfuraProvider
2017-12-15 12:58:10 -08:00
Thomas Huang
fb8744771a Change console.log for opts in _configureInfuraProvider 2017-12-15 14:43:55 -06:00
Thomas Huang
c6e7bc0a5d Add exit flag to mocha to exit after tests run 2017-12-15 14:41:58 -06:00
frankiebee
828734b977 transactions:gas-utils - handle new type of estimateGas error 2017-12-15 01:31:48 -08:00
Thomas Huang
115c5e3a43
Merge pull request #2747 from MetaMask/Version-3.13.3
Version 3.13.3
2017-12-14 15:33:55 -05:00
Thomas Huang
453bfd34e3
Merge pull request #2706 from danjm/MM-fix-buy-cancel-button
Fixes the cancel button in the buy screen to take the user home.
2017-12-14 15:06:53 -05:00
Dan Finlay
622a1f7f4a Version 3.13.3 2017-12-14 11:45:51 -08:00
Thomas Huang
fb5edfe69e
Merge pull request #2662 from williamchong007/master
fix #1398, prevent injecting xml without xml suffix
2017-12-14 14:34:21 -05:00
Thomas Huang
6843a79fe9
Merge pull request #2733 from MetaMask/i2380-ShowNoBalance
Show watched tokens with no balance
2017-12-14 13:12:18 -05:00
Frankie
4301e6b2bd
Merge pull request #2744 from MetaMask/infura-block-tracker
re-add Infura block tracker provider
2017-12-13 19:30:28 -08:00
kumavis
161aa66cb4 Revert "Revert "network - for infura networks use the infura block tracker provider""
This reverts commit 5df7dcd758.
2017-12-13 18:57:27 -08:00
kumavis
adb3de5283 Merge branch 'master' of github.com:MetaMask/metamask-plugin into infura-block-tracker 2017-12-13 18:56:27 -08:00
kumavis
222e80dbbe deps - bump eth-json-rpc-infura 2017-12-13 18:43:12 -08:00
Thomas Huang
b33f516fb7
Merge pull request #2743 from MetaMask/revert-2741-infura-block-tracker
Revert "network - for infura networks use the infura block tracker provider"
2017-12-13 21:07:57 -05:00
Frankie
5df7dcd758
Revert "network - for infura networks use the infura block tracker provider" 2017-12-13 17:46:56 -08:00
Frankie
0935e22d30
Merge pull request #2741 from MetaMask/infura-block-tracker
network - for infura networks use the infura block tracker provider
2017-12-13 17:15:26 -08:00
kumavis
3ebeec1818
Merge pull request #2740 from MetaMask/i#2729infura-chill-out
dont aggressively query account data
2017-12-13 13:57:39 -08:00
kumavis
33e6befdaa network - for infura networks use the infura block tracker provider 2017-12-13 13:51:36 -08:00
frankiebee
da209a9cfd dont aggresively query account data 2017-12-13 11:19:18 -08:00
Dan Finlay
3456efa3f6 Bump changelog 2017-12-12 09:48:09 -08:00
Dan Finlay
d110c916a4 Show watched tokens with no balance 2017-12-12 09:47:51 -08:00
kumavis
c12886a3d5
Merge pull request #2718 from MetaMask/ReducePollingInterval
Reduce polling interval
2017-12-09 20:24:33 -05:00
Dan Finlay
1ebd5140aa Version 3.13.2 2017-12-09 20:00:54 -05:00
Dan Finlay
408fc0f2fc Bump changelog 2017-12-09 19:58:55 -05:00
Dan Finlay
542e0035dd Pass polling interval to zero client provider 2017-12-09 19:58:47 -05:00
Dan
bfec077d79 Fixes the cancel button in the buy screen to take the user home. 2017-12-08 16:18:50 -03:30
kumavis
d39eb37042
Merge pull request #2699 from MetaMask/patch-2
Allow Dapps to Specify Nonce
2017-12-07 15:34:56 -08: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
9bb4df46ec Bump changelog 2017-12-07 16:16:47 -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
Kevin Serrano
6553ba132d
Merge pull request #2654 from abitrolly/patch-2
Download State Logs with .json extension
2017-12-07 07:41:12 -08:00
Kevin Serrano
35be563fbd
Merge pull request #2688 from MetaMask/AddPriceBump
Add 10% price bump minimum to retry attempts.
2017-12-07 06:57:02 -08:00
vicnaum
553d713636
A more expressive way
replaced ifs with ? :
2017-12-07 15:30:05 +01:00
Dan Finlay
c82fd990aa Add 10% price bump to retry attempts.
Turns out geth requires at least a 10% price bump to replace txs:
9619a61024/core/tx_pool.go (L133)
2017-12-07 04:02:11 -05:00
Dan Finlay
a2057a8d29
Merge pull request #2684 from MetaMask/RetryTransaction
Retry transaction
2017-12-07 03:44:56 -05:00
Dan Finlay
706a07d0e9 Merge branch 'RetryTransaction' of github.com:MetaMask/metamask-plugin into RetryTransaction 2017-12-07 03:02:20 -05:00
Dan Finlay
c391b25015 Version 3.13.0 2017-12-07 03:01:46 -05:00
Alexander Tseung
b9f2f8c2a7 Show retry button on submitted transactions greater than 30 seconds, add hover styling 2017-12-07 00:01:11 -05:00
Dan Finlay
b26c975294 Bump changelog 2017-12-06 23:43:50 -05:00
Dan Finlay
73da8a5a4f Merge branch 'RetryTransaction' of github.com:MetaMask/metamask-plugin into RetryTransaction 2017-12-06 23:43:11 -05:00
Dan Finlay
0e25129028 Enforce retry tx at minimum gas of previous tx 2017-12-06 23:42:47 -05:00
Alexander Tseung
6b3909547f Fix styling of Retry buton 2017-12-06 23:27:43 -05:00
Dan Finlay
31564e0a86 Fix retry action 2017-12-06 23:20:15 -05:00
Dan Finlay
81fb9db1bc View tx after editing state to unconfirmed 2017-12-06 23:09:32 -05:00
Dan Finlay
97abbc5cbe Fix action 2017-12-06 22:55:47 -05:00
Dan Finlay
1bd5fc1ba4 Add development state 2017-12-06 22:55:04 -05:00
Alexander Tseung
02736d2d36 Connect to redux for retryTransaction 2017-12-06 22:48:26 -05:00