Commit Graph

1820 Commits (de8da9ddf67f36977e43d2168c4847fd9923c875)
 

Author SHA1 Message Date
Dan Finlay de8da9ddf6 Simplify Encryptor API Surface 8 years ago
Dan Finlay 2966d46fa2 Merge branch 'dev' into i843-MoveSaltIntoEncryptor 8 years ago
Dan Finlay c8176c9439 Merge pull request #875 from MetaMask/i868-estimateGasTooHigh-dev 8 years ago
kumavis bc39cd7b89 KeyringController - estimateGas->analyzeGasUsage fix gasLimit + detect OOG 8 years ago
kumavis e14efa8f17 Merge pull request #858 from MetaMask/i842-WaitForSeedWord 8 years ago
Dan Finlay c4056a861a Move state update outside of conditional callback block 8 years ago
Dan Finlay 869d731319 Restore ropsten link support 8 years ago
Dan Finlay 606c0b7618 Remove callback type check 8 years ago
kumavis 4669f262e2 Merge pull request #857 from MetaMask/i841-RenameMethod 8 years ago
Dan Finlay a67b4d7131 Fix etherscan link generation test 8 years ago
kumavis e61d792832 Merge pull request #869 from MetaMask/dev-cleanup 8 years ago
kumavis 1a8d95f562 Merge pull request #871 from MetaMask/i860-ethjsremove 8 years ago
Kevin Serrano 6dad4f1f20
Phase out ethereumjs-util from encryptor module. 8 years ago
Dan Finlay 0289444fcb Merge branch 'dev' into i842-WaitForSeedWord 8 years ago
Kevin Serrano 8261cf232d
Merge branch 'dev' into dev-cleanup 8 years ago
Dan Finlay ca819781cb Merge pull request #866 from MetaMask/new-faucet-dev 8 years ago
Kevin Serrano d92741c419 Merge pull request #856 from MetaMask/i835-OrganizeKeyrings 8 years ago
Kevin Serrano 17669e4af8
Make ropsten faucet button point at the correct url. 8 years ago
Dan Finlay 136296aad6 Began moving salt into encryptor 8 years ago
Dan Finlay ea56426b23 Use callback in placeSeedWord method. 8 years ago
Dan Finlay 9fb96128e6 Rename idStoreMigrator method for clarity 8 years ago
Dan Finlay 60afc41bb6 Fix keyring test 8 years ago
Dan Finlay ced36eb201 Improve Keyring organization 8 years ago
Dan Finlay ecfda5bcc5 Revert premature link test fix 8 years ago
Dan Finlay be6b7b496a Fixed account link test for ropsten network 8 years ago
Dan Finlay 17d63acaed Fix camel casing on setSelectedAccount action. 8 years ago
Dan Finlay 3577aa4649 Added instructions for installing local build 8 years ago
Kevin Serrano 1cbab788ec
Change fauceting to become a response of an emit. 8 years ago
Kevin Serrano f5b0795ac5
change all instances of selectedAddress to selectedAccount. 8 years ago
Kevin Serrano 9123e70434
Remove entropy from encryption and project. 8 years ago
Kevin Serrano 7cf6e372eb Merge pull request #837 from MetaMask/FixMenuItem 8 years ago
Kevin Serrano db5a4eab71 Merge pull request #833 from MetaMask/i831-AddRopsten-Dev 8 years ago
Dan Finlay bb06f5803d Add development states.js back into repo 8 years ago
Dan Finlay 6ae2400ef2 Fix custom provider menu item 8 years ago
Dan Finlay 7ab9d40820 Merge branch 'dev' into i831-AddRopsten-Dev 8 years ago
Dan Finlay e8a8302624 Begin adding Ropsten support 8 years ago
Dan Finlay 268f6e10f3 Merge pull request #830 from MetaMask/kumavis-patch-1 8 years ago
kumavis 277bffc9b0 meta - README - add npm start to instructions 8 years ago
Dan Finlay 7021c7708c Merge pull request #827 from MetaMask/currency-cleanup 8 years ago
Dan Finlay cb0a9c7079 Merge pull request #826 from MetaMask/mini-lint 8 years ago
Kevin Serrano a07e5826ad
Convert conversion util to pure json. 8 years ago
Kevin Serrano d6286cd13a
Maintain linting. 8 years ago
Dan Finlay df5f99fa3b Merge pull request #824 from MetaMask/failing-tests 8 years ago
Kevin Serrano bc6312e9e3
Promisify persistence of keyrings before returning key 8 years ago
Kevin Serrano c695d54b01
Merge branch 'dev' into failing-tests 8 years ago
Kevin Serrano 3cd839d27f
Create failing test to check submitPassword in keyringController. 8 years ago
Kevin Serrano 626903e9f2 Merge pull request #823 from MetaMask/FixBork 8 years ago
Dan Finlay ce1c5eb75a Update migration code for new hd wallet param name 8 years ago
Kevin Serrano cd2442e3e7
Persist keyrings from migration to storage. 8 years ago
Kevin Serrano bef023fb4a
Resolve merge conflict. 8 years ago