1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-22 01:13:22 +01:00
Commit Graph

6273 Commits

Author SHA1 Message Date
Kevin Serrano
8d2afccdc0
Ropsten has sole access to the faucet. 2016-11-22 10:13:57 -08:00
Dan Finlay
136296aad6 Began moving salt into encryptor 2016-11-22 09:52:43 -08:00
Kevin Serrano
88ed1f191f
Add to changelog. 2016-11-22 09:45:28 -08:00
Dan Finlay
ea56426b23 Use callback in placeSeedWord method.
When displaying seed words, we were not using a callback, which had some race condition potential.  This is simply a little cleaner and more correct.

Fixes #842
2016-11-21 20:08:36 -08:00
Dan Finlay
9fb96128e6 Rename idStoreMigrator method for clarity
Fixes #841
2016-11-21 19:52:56 -08:00
Dan Finlay
60afc41bb6 Fix keyring test 2016-11-21 19:47:45 -08:00
Dan Finlay
e2a9e1cd4a Unify test wording 2016-11-21 19:45:05 -08:00
Dan Finlay
694f34ae9a Add temporary morden explorer link support 2016-11-21 19:43:59 -08:00
Dan Finlay
ced36eb201 Improve Keyring organization
Separated public & private methods. (Fixes #845)
Made class method `type()` into a simple property. (Fixes #846)
2016-11-21 19:40:58 -08:00
Dan Finlay
ecfda5bcc5 Revert premature link test fix 2016-11-21 19:39:19 -08:00
Dan Finlay
daec4d5c36 Fix ropsten link test 2016-11-21 19:19:34 -08:00
Dan Finlay
be6b7b496a Fixed account link test for ropsten network 2016-11-21 19:18:46 -08:00
Dan Finlay
aefc346a65 Bump changelog 2016-11-21 19:14:22 -08:00
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
Dan Finlay
17d63acaed Fix camel casing on setSelectedAccount action. 2016-11-21 18:16:59 -08:00
Dan Finlay
3577aa4649 Added instructions for installing local build 2016-11-21 18:16:45 -08:00
Kevin Serrano
1cbab788ec
Change fauceting to become a response of an emit. 2016-11-21 16:46:26 -08:00
Kevin Serrano
f5b0795ac5
change all instances of selectedAddress to selectedAccount. 2016-11-21 16:21:16 -08:00
Kevin Serrano
9123e70434
Remove entropy from encryption and project. 2016-11-21 15:49:03 -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
7cf6e372eb Merge pull request #837 from MetaMask/FixMenuItem
Fix custom provider menu item
2016-11-21 12:19:54 -08:00
Kevin Serrano
db5a4eab71 Merge pull request #833 from MetaMask/i831-AddRopsten-Dev
Begin adding Ropsten support to dev
2016-11-21 12:18:31 -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
bb06f5803d Add development states.js back into repo 2016-11-21 11:54:16 -08:00
Dan Finlay
6ae2400ef2 Fix custom provider menu item
The Custom RPC menu item in the provider menu would not appear when Localhost:8545 was selected.
2016-11-21 11:45:31 -08:00
Dan Finlay
7ab9d40820 Merge branch 'dev' into i831-AddRopsten-Dev 2016-11-21 11:03:32 -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
Dan Finlay
268f6e10f3 Merge pull request #830 from MetaMask/kumavis-patch-1
meta - README - add npm start to instructions
2016-11-21 10:12:16 -08:00
kumavis
277bffc9b0 meta - README - add npm start to instructions
thanks @karlfloersch
2016-11-21 09:34:31 -08:00
Dan Finlay
7021c7708c Merge pull request #827 from MetaMask/currency-cleanup
Convert conversion-util to pure json.
2016-11-18 17:52:32 -08:00
Dan Finlay
cb0a9c7079 Merge pull request #826 from MetaMask/mini-lint
Maintain linting.
2016-11-18 17:51:32 -08:00
Kevin Serrano
a07e5826ad
Convert conversion util to pure json. 2016-11-18 16:49:39 -08:00
Kevin Serrano
d6286cd13a
Maintain linting. 2016-11-18 16:27:26 -08:00
Dan Finlay
df5f99fa3b Merge pull request #824 from MetaMask/failing-tests
Promisify persistence of old vaults in migration code
2016-11-18 16:04:19 -08:00
Kevin Serrano
bc6312e9e3
Promisify persistence of keyrings before returning key
Change single letter variables (shame)
2016-11-18 15:58:49 -08:00
Kevin Serrano
c695d54b01
Merge branch 'dev' into failing-tests 2016-11-18 15:40:25 -08:00
Kevin Serrano
3cd839d27f
Create failing test to check submitPassword in keyringController. 2016-11-18 15:40:12 -08:00
Kevin Serrano
626903e9f2 Merge pull request #823 from MetaMask/FixBork
Update migration code for new hd wallet param name
2016-11-18 11:53:53 -08:00
Dan Finlay
ce1c5eb75a Update migration code for new hd wallet param name 2016-11-18 11:37:07 -08:00
Kevin Serrano
cd2442e3e7
Persist keyrings from migration to storage. 2016-11-18 10:48:00 -08:00
Kevin Serrano
bef023fb4a
Resolve merge conflict. 2016-11-18 09:23:20 -08:00
kumavis
39e0a33bba random-id - use Number.MAX_SAFE_INTEGER as max 2016-11-17 14:29:35 -08:00
kumavis
6400eb8453 Merge pull request #816 from MetaMask/i328-MultiVault
Multi vault to Dev Branch
2016-11-17 17:27:34 -05: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
Dan Finlay
4352c7031a Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault 2016-11-17 13:51:32 -08:00
Dan Finlay
f229d32442 Replace old random-id code with incrementing id generator 2016-11-17 13:49:46 -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