m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-24 02:58:09 +01:00
Code
1,815 Commits 2 Branches 0 Tags 265 MiB
e14efa8f17
Commit Graph

1815 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Finlay
9560ae93ee Added tx and msg signing to keychain & controller 2016-10-20 19:06:17 -07:00
Dan Finlay
957b7a72b5 Improved simple account generation 2016-10-20 17:29:25 -07:00
Dan Finlay
55d56f77cf Began adding first basic keyring 2016-10-20 16:45:58 -07:00
Dan Finlay
351c8e2086 Merge branch 'master' into i328-MultiVault 2016-10-20 14:02:24 -07:00
Kevin Serrano
231dc61e3f
Merge branch 'master' into i328-MultiVault 2016-10-20 13:45:45 -07:00
Frankie
eedca82167 Merge branch 'master' into i#741 2016-10-20 12:37:08 -07:00
Frankie
8d2ec8b820 Merge pull request #751 from MetaMask/ClarifyCallbackRole 
Add note about callback param to sync method warning
 2016-10-20 12:36:41 -07:00
Frankie
d4c0a4949b Clean up tests 2016-10-20 12:26:35 -07:00
Dan Finlay
7d7cb9af9d Fix background connection references 2016-10-20 12:13:12 -07:00
Dan Finlay
0deed17752 Fix tests 2016-10-20 12:07:53 -07:00
Dan Finlay
383f8ea7dc Linted & added salting to vault 2016-10-20 11:33:18 -07:00
Dan Finlay
e5c95d68f8 Fix state updating after vault creation and unlocking 2016-10-20 11:00:38 -07:00
Dan Finlay
2132477797 Fix unlock logic 2016-10-20 10:28:45 -07:00
Dan Finlay
f090828f99 Commented out useless advanced not on init screen 2016-10-20 09:58:44 -07:00
Dan Finlay
f14fdf7a25 Change actions reference to keyringController to background 2016-10-20 09:58:33 -07:00
Dan Finlay
40f175c06f Linted 2016-10-20 09:50:29 -07:00
Dan Finlay
331bb735c7 Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault 2016-10-20 09:49:49 -07:00
Frankie
aa4746f4c7 Add test and ability for isHex to handle hex strings with hex-prefix 2016-10-19 19:35:44 -07:00
Kevin Serrano
12698b9462
Resolve merge conflict. 2016-10-19 17:49:13 -07:00
Frankie
ac7dca22c3 Fix up wording 2016-10-19 17:39:41 -07:00
Frankie
7140c04ef9 Fix CHANGELOG 2016-10-19 15:26:19 -07:00
Frankie
2f7ce1ca4c Merge branch 'master' into i#741 2016-10-19 15:25:27 -07:00
Frankie
4366f72fe1 Add unit test for isHex and add to CHANGELOG.md 2016-10-19 15:22:56 -07:00
Dan Finlay
090959470b Add note about callback param to sync method warning 2016-10-19 15:16:27 -07:00
Dan Finlay
94f2554369 Add debug flag to dev mode 2016-10-19 15:15:27 -07:00
Kevin Serrano
afbc4c832b
Git merge resolution. 2016-10-19 14:57:30 -07:00
Kevin Serrano
ad3fa24a28
Intermediary commit. 2016-10-19 14:55:08 -07:00
Frankie
5fb1e492fb Add valdations to txData param 2016-10-19 14:33:30 -07:00
Kevin Serrano
725d503f68
Remove unused crypto dependencies. 2016-10-19 14:06:48 -07:00
Kevin Serrano
153bb25947
Add crypto packages to package.json 2016-10-19 13:56:21 -07:00
Kevin Serrano
17506fe14f
Merge in crypto. 2016-10-19 11:17:29 -07:00
Kevin Serrano
82489129d5 Merge branch 'master' into i743-FixDelegateCallFlag 2016-10-18 14:20:16 -07:00
Kevin Serrano
a88a48ba14 Merge pull request #749 from MetaMask/Version-2.13.5 
Version 2.13.5
 2016-10-18 14:20:09 -07:00
Dan Finlay
f31fef034f Fix changelog date 2016-10-18 14:07:47 -07:00
Dan Finlay
182fd30db5 Fix cli flag capitalization 2016-10-18 14:02:06 -07:00
Dan Finlay
70f3d24e90 Version 2.13.5 2016-10-18 14:00:33 -07:00
Dan Finlay
60097d8fba Remove livereload from prod builds 2016-10-18 14:00:20 -07:00
kumavis
a542118a55 Merge pull request #748 from MetaMask/i746-ReloadBug 
Wait for first metamask data to establish ping-pong stream.
 2016-10-18 13:58:14 -07:00
Dan Finlay
cc23158bfe Wait for first metamask data to establish ping-pong stream. 
Prevents infinite reload loops when dapps take too long to load.

Fixes #746.
 2016-10-18 13:51:50 -07:00
Dan Finlay
049705004f Reproduced issue 743 in test case 
This contract hex does include the value `f4`, but it was compiled from a contract with no instance of `.delegatecall`. I believe `f4` in this case is part of some other value or contract address, and `ethBinToOps` has some error in how it skips pushed data.

@kumavis
 2016-10-17 14:48:25 -07:00
kumavis
0f0951ba54 Merge pull request #744 from MetaMask/i738-IncreaseGas 
Increase gas estimate by 100000 wei
 2016-10-17 13:33:02 -07:00
Dan Finlay
827d7553fc Restore hex prefix to gas price 2016-10-17 13:05:45 -07:00
Dan Finlay
91f43fa213 Increase gas estimate by 100000 wei 
To prevent minor gas estimation errors, probably usually related to operating on dynamic state.

Fixes #738.
 2016-10-17 12:47:37 -07:00
Kevin Serrano
101e839f9a Merge pull request #737 from MetaMask/Version-2.13.4 
Version 2.13.4
 2016-10-17 10:52:04 -07:00
Dan Finlay
5864044538 Version 2.13.4 2016-10-17 10:37:23 -07:00
Dan Finlay
6d4c685636 Merge pull request #736 from MetaMask/i735-xmlfix 
Prevent injections on XML
 2016-10-17 10:31:15 -07:00
Kevin Serrano
bc6092e111
Merge branch 'master' into i735-xmlfix 2016-10-17 10:25:00 -07:00
kumavis
11c114599c Merge pull request #720 from MetaMask/i#495CustomGasField 
add a gasPrice field
 2016-10-16 12:54:23 -07:00
Kevin Serrano
0d495372da
Lint. 2016-10-15 15:41:24 -07:00
Kevin Serrano
91a8977d27
Bump changelog. 2016-10-15 15:33:55 -07:00