1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-29 23:58:06 +01:00
Commit Graph

1652 Commits

Author SHA1 Message Date
Dan Finlay
3e4485d1cb Merge branch 'master' into i834-RopstenLinks 2016-11-21 19:13:45 -08:00
Dan Finlay
7d38c4ccb6 Add ropsten link support 2016-11-21 19:11:55 -08:00
kumavis
1142d71048 Merge pull request #838 from MetaMask/Version-2.13.9
Version 2.13.9
2016-11-21 16:29:33 -05:00
Dan Finlay
1ddc7625e0 Version 2.13.9 2016-11-21 12:24:27 -08:00
Kevin Serrano
b4bee4fb59 Merge pull request #832 from MetaMask/i831-AddRopsten
Begin adding Ropsten support
2016-11-21 12:17:46 -08:00
Dan Finlay
e8a8302624 Begin adding Ropsten support
Ropsten links will still not work until Etherscan publishes their ropsten link format.

At that time we will need to update ui/lib/account-link.js

Otherwise, fixes #831
2016-11-21 10:58:49 -08:00
kumavis
37d836fa72 Merge pull request #819 from MetaMask/i791-FixLosingConnection
Increment tx ids to avoid collisions
2016-11-17 17:27:18 -05:00
Dan Finlay
8eb91e89bf Increment tx ids to avoid collisions
Fixes #791

It was possible for two requests to have the same ID, causing a crash and loss of StreamProvider connection.

This new id generation strategy creates a random ID, and increments it for each request.

In case the id generator is included from two different processes, I'm initializing the counter at a random number, and rolling it over a large number when it gets too big.
2016-11-17 14:05:12 -08:00
kumavis
b0ccde66f6 Merge pull request #814 from MetaMask/Version-2.13.8
Version 2.13.8: Faithful Serpent
2016-11-16 19:09:29 -05:00
Dan Finlay
a4eadddd6b Version 2.13.8 2016-11-16 16:00:32 -08:00
kumavis
68d5b459ed Merge pull request #811 from MetaMask/deadly-fix
Fix error display in confirmation screen
2016-11-14 22:39:17 -05:00
Kevin Serrano
acf02c9290
Merge branch 'deadly-fix' of github.com:MetaMask/metamask-plugin into deadly-fix 2016-11-14 11:21:51 -08:00
Kevin Serrano
205205f7cd
Add to changelog. 2016-11-14 11:19:58 -08:00
Kevin Serrano
d891869eff
First attempt at fixing errors in confirmation screen. 2016-11-14 11:19:01 -08:00
Kevin Serrano
26a548a7a3
First attempt at fixing errors in confirmation screen. 2016-11-14 11:17:53 -08:00
kumavis
115fdc36fe Merge pull request #807 from MetaMask/cssIsAwesome
Fix funny looking errors in conf-tx
2016-11-11 01:31:23 -05:00
Frankie
b60f51dfc2 lint fix 2016-11-10 22:20:58 -08:00
Frankie
b60992b446 Fix funny looking errors in conf-tx 2016-11-10 22:13:30 -08:00
kumavis
f88079c6b9 Merge pull request #805 from MetaMask/i804
detect tx error - show warning and fix gasLimit
2016-11-11 00:37:09 -05:00
kumavis
1d0abc4771 changelog - update 2016-11-10 21:26:10 -08:00
kumavis
536cab0687 detect tx error - show warning and fix gasLimit 2016-11-10 21:19:34 -08:00
Kevin Serrano
3775a4bf79 Merge pull request #801 from MetaMask/deadly
Properly implement 20% gas bump
2016-11-09 16:42:10 -08:00
Kevin Serrano
e2b2083df0
remove gas field, due to alias redundancy. 2016-11-09 16:38:28 -08:00
Kevin Serrano
b6b4be61d9
Fix bug for increasing gas by 20 percent. 2016-11-09 16:29:24 -08:00
Kevin Serrano
14a833f5c0
Merge branch 'deadly' of github.com:MetaMask/metamask-plugin into deadly 2016-11-09 14:28:23 -08:00
Frankie
ebcdb7a491 Merge pull request #797 from MetaMask/Version-2.13.7
Version 2.13.7
2016-11-08 09:22:10 -08:00
Dan Finlay
b57009493b Hard coding jazzicon at working version 2016-11-08 08:54:30 -08:00
Dan Finlay
4a0197012e Version 2.13.7 2016-11-08 08:51:14 -08:00
Dan Finlay
2160eb35aa Merge pull request #796 from MetaMask/IncreaseGasBuffer
Increase gas buffer
2016-11-08 08:49:43 -08:00
Dan Finlay
7068d2e71c Adjust gas buffer to be 20% over estimate 2016-11-08 08:39:41 -08:00
Dan Finlay
6f39924e60 Increase gas buffer
Fixes #795
2016-11-08 08:32:34 -08:00
Kevin G. Serrano
7b3f1ecc41
Unify warning functions. 2016-11-07 16:02:02 -08:00
Kevin Serrano
62a15fc59e Merge pull request #793 from MetaMask/i787-HighGasBug
i787 High gas bug
2016-11-07 12:06:08 -08:00
Dan Finlay
1896928562 Fix gas price buffering
Our gas price buffering logic had a bug, because bn.js has inconsistent behavior when using hex-prefixed output.  The issue has been opened with them here:
https://github.com/indutny/bn.js/issues/151

We've corrected our usage in the mean time.
2016-11-07 11:56:20 -08:00
Dan Finlay
fff5a6765e Added failing test for #787 2016-11-07 11:25:23 -08:00
kumavis
30ff9b5e10 Merge pull request #786 from MetaMask/i763-GithubLink
Fix github link on info page
2016-10-31 12:56:12 -04:00
Dan Finlay
18cf635735 Fix github link on info page 2016-10-31 09:30:55 -07:00
kumavis
48220cff0e Merge pull request #778 from MetaMask/mascara-build
Mascara build
2016-10-26 15:34:23 -07:00
kumavis
b790b0c256 mascara - remove global transpile 2016-10-26 15:29:13 -07:00
kumavis
d047ba541f mascara - example dapp - log main account 2016-10-26 15:27:38 -07:00
Dan Finlay
014c971b89 Merge pull request #774 from MetaMask/walkThrough
Add more info to mascara README
2016-10-26 14:42:10 -07:00
Frankie
08c8dc823e Merge branch 'master' into walkThrough 2016-10-26 14:09:03 -07:00
Frankie
a75edcdc18 Fix typos and clean up 2016-10-26 13:57:15 -07:00
kumavis
5f98814877 Merge pull request #767 from MetaMask/UpdateWeb3
Update web3.js version
2016-10-26 13:55:17 -07:00
Frankie
55530b0138 Merge branch 'master' into walkThrough 2016-10-26 13:45:42 -07:00
Frankie
5ae45fe17f Fix the size of the pop-up 2016-10-26 13:43:26 -07:00
Frankie
bdaf940593 Add more info about first use 2016-10-26 13:42:56 -07:00
Dan Finlay
ab055e3f63 Merge branch 'master' into UpdateWeb3 2016-10-26 11:56:04 -07:00
Dan Finlay
9df20e6c55 Merge pull request #773 from MetaMask/Version-2.13.6
Version 2.13.6
2016-10-26 11:54:06 -07:00
Dan Finlay
b8acdfcab5 Version 2.13.6 2016-10-26 11:48:42 -07:00