aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* code clan up and testsFrankie2017-02-023-41/+39
|
* Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-302-4/+13
|\
| * metamask - lookup selectedAccount via keyringControllerkumavis2017-01-302-3/+12
| |
| * public config - get selectedAccount from keyring controller substatekumavis2017-01-301-1/+1
| |
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-295-174/+236
|\|
| * metamask - subscribe metamask store to keyringController substatekumavis2017-01-291-0/+3
| |
| * migration 5 - move keyring controller state to substatekumavis2017-01-293-67/+95
| |
| * keyring - add and initialize obs-storekumavis2017-01-292-6/+36
| |
| * metamask - adopt shapeshift txs from keyringControllerkumavis2017-01-282-2/+3
| |
| * tests - remove persistence and start with initial statekumavis2017-01-281-9/+1
| |
| * metamask - organize methodskumavis2017-01-281-120/+126
| |
* | Clean up message manger includes:Frankie2017-01-295-126/+129
| | | | | | | | | | | | | | | | | | Provider egine bump Remove presence of message manger in keyring controller Change the status wording fom conf to approved make Message manager a class fix messages not being apart of the badge re write message manger to better reflect controller pattern
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-284-194/+205
|\|
| * metamask - fix setupProviderConnectionkumavis2017-01-271-1/+1
| |
| * keymanager - small cleankumavis2017-01-271-2/+2
| |
| * metamask controller - cleanup remote apikumavis2017-01-271-77/+100
| |
| * metamask - organize into sectionskumavis2017-01-271-49/+61
| |
| * metamask - use web3-stream-provider/handler instead of manual wiringkumavis2017-01-271-23/+8
| |
| * metamask controller - adopt setup*Communication from backgroundkumavis2017-01-272-44/+41
| |
| * background - stream disconnection fixkumavis2017-01-272-8/+8
| |
| * metamask controller - adopt clearSeedWords from keyring controllerkumavis2017-01-272-15/+9
| |
* | Rewrite message controller to fit controller patternFrankie2017-01-281-48/+45
|/
* background - graceful publicConfigStore connection teardownkumavis2017-01-271-1/+3
|
* background - organize metamask instantiationkumavis2017-01-273-47/+37
|
* obs-store - use published modulekumavis2017-01-2510-295/+85
|
* migrations - rename 005 to stubbed _multi-keyringkumavis2017-01-251-0/+7
|
* Merge branch 'dev' of github.com:MetaMask/metamask-plugin into obs-store2kumavis2017-01-253-32/+34
|\
| * Merge branch 'dev' into i#1048kumavis2017-01-252-0/+56
| |\
| | * Merge pull request #1051 from MetaMask/hotfix1048Frankie2017-01-251-3/+5
| | |\ | | | | | | | | hotfix - addNewAccount - dont assume hd keyring position
| * | | background controller - extract KeyringC.placeSeedWords to MetamaskCkumavis2017-01-252-22/+16
| | | |
| * | | merge master hotfix into devkumavis2017-01-251-1/+1
| |\ \ \
| | * | | 3.1.2kumavis2017-01-251-1/+1
| | | |/ | | |/|
| | * | hotfix - dont assume hd keyring positionkumavis2017-01-251-3/+5
| | | |
| * | | keyring-controller - cleanupkumavis2017-01-251-2/+3
| | | |
| * | | keyring-controller - cleanupkumavis2017-01-251-5/+3
| | | |
| * | | Move the assumption of their only being one hd keyring when requesting seed ↵Frankie2017-01-252-7/+8
| | | | | | | | | | | | | | | | words to metamaskController
| * | | Fix issue where generating a new account would put it in loose keysFrankie2017-01-252-4/+12
| |/ /
* | | Merge branch 'dev' into obs-store2kumavis2017-01-2211-136/+329
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into upToDateFrankie2017-01-211-1/+1
| |\|
| | * 3.1.1kumavis2017-01-211-1/+1
| | |
| * | Merge branch 'master' into upToDateFrankie2017-01-211-1/+3
| |\|
| | * keyring controller - placeSeedWords should use first hdKeyringkumavis2017-01-211-1/+3
| | |
| * | Merge branch 'dev' into i715-AddJsonImportDan Finlay2017-01-192-2/+2
| |\|
| | * Merge branch 'master' into Version-3.1.0Dan Finlay2017-01-191-1/+1
| | |\
| | | * Merge branch 'master' into fixSignedVsSubmittedFrankie2017-01-192-4/+7
| | | |\
| | | * | Fix the dissplay for submitted transactions and the listner wating to hear ↵Frankie2017-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | when tx's were included in a block
| | * | | Version 3.1.0Dan Finlay2017-01-191-1/+1
| | | | |
| * | | | Add ability to import v3 JSON walletsDan Finlay2017-01-191-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is now a menu item labeled "JSON File" for importing, and it can digest either: - v1 MyEtherWallet JSON files - v3 Account files (used by Geth, Mist, and MyEtherWallet). Fixes #715
| * | | | Added new modular private key import systemDan Finlay2017-01-192-0/+48
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now any strategy for importing a private key that can be described as a pure function can be very easily turned into a MetaMask import strategy. I've created a generic and reusable UI action called `importNewAccount(strategy, args)`. The `strategy` is a unique identifier defined in `app/scripts/account-import-strategies`, and the `args` will be passed to the member of the `strategies` array whose key matches the strategy string. Strategies return private key hex strings, and are used by the metamask-controller to create a new keyring, and select that new account, before calling back. This also implements @frankiebee's idea of showing the imported account when it's been imported (my oversight!). This commit only moves us to this architecture, keeping feature parity for private key import, but has some untested code for importing geth-style JSON files as well!
| * | | Merge branch 'dev' into i715-AddImportMenukumavis2017-01-191-6/+5
| |\ \ \
| | * | | tx-manager - use rpc-specified txHashkumavis2017-01-191-6/+5
| | | | |
| * | | | Allow importing of private key stringsDan Finlay2017-01-183-8/+22
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1021 A top-right menu item now allows `Account Import`. It has a menu (with one item for now) that allows importing a private key string. Errors are displayed, and a success navigates the user to their account list, where the imported account is labeled `LOOSE`.
| * | | Merge branch 'dev' into conversion-api-errDan Finlay2017-01-1810-131/+250
| |\ \ \
| | * | | Version 3.0.1Dan Finlay2017-01-171-1/+1
| | | | |
| | * | | Fix bug where signed messages were not dismissedDan Finlay2017-01-171-0/+1
| | | | |
| | * | | Fix removeHexPrefix to stripHexPrefixDan Finlay2017-01-171-1/+1
| | | | |
| | * | | Wrote fix for eth.signDan Finlay2017-01-171-2/+1
| | | |/ | | |/|
| | * | Fix manifest versionDan Finlay2017-01-171-1/+1
| | | |
| | * | Version 3.0.0Dan Finlay2017-01-171-1/+1
| | | |
| | * | keyring - simple - throw error if wallet not found for addresskumavis2017-01-171-1/+4
| | | |
| | * | keyring - simple - fix address generationkumavis2017-01-171-3/+3
| | |/
| | * eth-store - emit update on new account addkumavis2017-01-151-1/+3
| | |
| | * background - txManager - filter txs by networkkumavis2017-01-152-4/+6
| | |
| | * background - return txHash to provider-engine on donekumavis2017-01-152-14/+13
| | |
| | * Fix the inclusion of the txFee in the meta tx objectFrankie2017-01-151-3/+5
| | |
| | * fix for lintingFrankie2017-01-141-0/+1
| | |
| | * Satisfy review needs:Frankie2017-01-142-21/+23
| | | | | | | | | | | | | | | | | | | | | removed unnecessary this.query = opts.query from constructor Created a tx error state for errors in approveTransaction validateTxParams has been moved to tx-utils removed "value" arg from _setTxStatus
| | * fix the maxcost not being included in txMetaFrankie2017-01-141-3/+7
| | |
| | * Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin into ↵kumavis2017-01-144-13/+38
| | |\ | | | | | | | | | | | | bug-submitTx
| | | * Merge branch 'dev' into bug-submitTxkumavis2017-01-144-13/+38
| | | |\
| | | | * Merge branch 'dev' into integrateTxManagerUIFrankie2017-01-141-2/+2
| | | | |\
| | | | * | Clean up codeFrankie2017-01-141-1/+2
| | | | | |
| | | | * | Merge branch 'dev' into integrateTxManagerUIFrankie2017-01-121-1/+1
| | | | |\ \
| | | | * | | Fix wording and icon of failed txsFrankie2017-01-122-15/+16
| | | | | | |
| | | | * | | Add to CHANGELOGFrankie2017-01-121-2/+8
| | | | | | |
| | | | * | | Merge branch 'dev' into integrateTxManagerUIFrankie2017-01-123-36/+11
| | | | |\ \ \
| | | | * | | | Take some of the tx Logic out of the UI and create a visble state for ↵Frankie2017-01-124-9/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pending and unaproved transactions
| | * | | | | | background - metamask controller - fix 'this' refkumavis2017-01-141-7/+8
| | |/ / / / /
| | * | | | / background - handle tx finalization in controllers instead of provider-enginekumavis2017-01-134-108/+186
| | | |_|_|/ | | |/| | |
| * | | | | currency conversion - less noisy errorkumavis2017-01-121-1/+1
| | |_|/ / | |/| | |
* | | | | background - fix metamaskController store -> diskStore persistencekumavis2017-01-131-1/+6
| | | | |
* | | | | migrations - wip - 005 multivault migrationkumavis2017-01-127-31/+82
| | | | |
* | | | | migrations - introduce promise-based migratorkumavis2017-01-125-112/+179
| | | | |
* | | | | background - move pojo migrator to outside of metamask controllerkumavis2017-01-1211-104/+159
| | | | |
* | | | | background - introduce ObservableStorekumavis2017-01-129-166/+204
| |/ / / |/| | |
* | | | bugfix - portstream - dont wrap cb in try catchkumavis2017-01-121-2/+2
| |_|/ |/| |
* | | Send update to UI when changing selected accountDan Finlay2017-01-121-1/+1
|/ / | | | | | | Fixes #981
* | rpc - fix sync account cache settingkumavis2017-01-111-17/+1
| |
* | web3 provider - override eth_syncing and web3_clientVersionkumavis2017-01-111-0/+5
| |
* | Remove erroneous OOG estimation logic.Dan Finlay2017-01-111-15/+2
| |
* | deps - replace promise-request with fetchkumavis2017-01-111-4/+3
|/
* Merge branch 'dev' into TearDownOnDisconnectkumavis2017-01-063-31/+33
|\
| * Merge branch 'dev' into fixTxManagerDan Finlay2017-01-062-1/+145
| |\
| * | Combine two identical then blocksDan Finlay2017-01-061-4/+2
| | |
| * | remove unnecessary try statmentsFrankie2017-01-053-37/+24
| | |
| * | clean upFrankie2017-01-051-1/+1
| | |
| * | Merge branch 'dev' into fixtTxManagerFrankie2017-01-054-37/+68
| |\ \
| * | | Fix signing of transactionsFrankie2017-01-053-46/+62
| | | |
* | | | Merge branch 'dev' into TearDownOnDisconnectkumavis2017-01-062-1/+145
|\ \ \ \ | | |_|/ | |/| |
| * | | Fixed bugs with sanity-checkingDan Finlay2017-01-051-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | - Was incorrectly calling some eth-query methods (left over from old local eth-query) - Was still passing block to getAccount in addAccount - Now emitting update only after all account balances are loaded, reducing UI update traffic.
| * | | Fix dependency referenceDan Finlay2017-01-051-1/+1
| | | |
| * | | Caught typoDan Finlay2017-01-051-2/+3
| | | |
| * | | Add descriptive commentDan Finlay2017-01-051-0/+9
| | | |
| * | | LintedDan Finlay2017-01-051-22/+17
| | | |
| * | | Removed reliance on eth-store internal custom eth-queryDan Finlay2017-01-051-6/+15
| | | |
| * | | Move eth-store@1.1.0 into local repo.Dan Finlay2017-01-051-0/+132
| | |/ | |/|
* / | MetaMask Controller - Convert to EventEmitterFrankie2017-01-062-12/+8
|/ /
* | Merge branch 'dev' of github.com:MetaMask/metamask-plugin into devKevin Serrano2017-01-041-2/+8
|\ \
| * | Fix sendUpdate for new promisified getState methodDan Finlay2017-01-041-2/+6
| | |
| * | Update UI state on ethStore updatesDan Finlay2017-01-041-0/+2
| | | | | | | | | | | | | | | | | | UI was remarkably not relying on ethStore for updates, so things like account balances were frozen until user activity. Fixes #963
* | | Take out unneeded permissions from the app.Kevin Serrano2017-01-041-2/+0
|/ /
* | Make single letter variables more verboseDan Finlay2017-01-032-5/+5
| |
* | Merge branch 'dev' into ShowDifferentAccountsDan Finlay2017-01-038-519/+421
|\|
| * inpage-provider - add isMetaMaskkumavis2017-01-031-0/+2
| | | | | | | | adds `metamaskInpageProvider.isMetaMask === true` Fixes #727
| * Merge branch 'dev' into TxManagerFrankie2016-12-246-53/+94
| |\
| * | fix some minor spelling mistakes and clean up codeFrankie2016-12-243-28/+26
| | |
| * | fix mergeFrances Pangilinan2016-12-221-1/+1
| | |
| * | Merge branch 'dev' into TxManagerFrankie2016-12-2210-192/+191
| |\ \
| * | | Remove txManager in keyring controllerFrances Pangilinan2016-12-221-2/+0
| | | |
| * | | Migrate all tx mutation code out of keyring controller andFrances Pangilinan2016-12-224-54/+71
| | | | | | | | | | | | | | | | Fix up txManager to reflect code review requests
| * | | First pass at revision requestsFrances Pangilinan2016-12-227-511/+184
| | | |
| * | | Clean up and comment functionsFrances Pangilinan2016-12-152-10/+31
| | | |
| * | | Create a TxManagerFrances Pangilinan2016-12-157-159/+350
| | | |
* | | | Add tolerance for hex prefixed private keys to simple keychainDan Finlay2017-01-031-3/+4
| | | |
* | | | Merge branch 'FixMigrationPasswordBug' into ShowDifferentAccountsDan Finlay2016-12-241-2/+2
|\ \ \ \
| * | | | Add additional migration testDan Finlay2016-12-241-2/+2
| | |_|/ | |/| |
* / | | Return keyring metadata on metamask state objectDan Finlay2016-12-232-29/+55
|/ / / | | | | | | | | | | | | | | | | | | Required making the getState methods for both keyringController and metamaskController async. They both now return promises, and the main metamask-controller.getState method is now nodeified. Will allow the UI to render loose keys differently than persisted keys.
* | | Remove logDan Finlay2016-12-231-1/+0
| | |
* | | Merge pull request #948 from MetaMask/RecoverLostAccountsDan Finlay2016-12-235-51/+92
|\ \ \ | | | | | | | | Auto-Recover accounts lost to BIP44 derivation fix
| * | | Break up migration functionDan Finlay2016-12-231-24/+24
| | | |
| * | | Don't bother changing selected accounts since accounts are recoveredDan Finlay2016-12-231-13/+3
| | | |
| * | | Remove logsDan Finlay2016-12-231-2/+2
| | | |
| * | | LintedDan Finlay2016-12-221-4/+3
| | | |
| * | | Restructured migrationDan Finlay2016-12-223-21/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrator now returns a lostAccount array that includes objects these objects include keys of address and privateKey, this allows the MetamaskController to restore the lost accounts even without customizing the idStore or the KeyringController. Also includes a patch that allows idStore to synchronously export private keys.
| * | | Return undefined when vault is uninitializedDan Finlay2016-12-221-1/+1
| | | |
| * | | Added error when trying to unlock uninitialized vaultDan Finlay2016-12-221-0/+4
| | | |
| * | | Move old keystore migration code to metamask controllerDan Finlay2016-12-222-46/+50
| | | | | | | | | | | | | | | | Allows keyring controller to be more generic, less opinionated, and who knows, maybe sooner publishable as its own thing.
| * | | Make notices confirmation configurableDan Finlay2016-12-212-2/+16
| | | | | | | | | | | | | | | | - Confirm button will now dismiss the lost accounts array.
* | | | Fix account injection bugDan Finlay2016-12-231-2/+3
| |_|/ |/| | | | | | | | | | | | | | | | | | | | It seems `selectedAddress` was removed from the keyring-controller’s state, and is used to populate the injected current account. I couldn't help myself, I dug around, I found a PR named [changed all instances of selectedAddress to selectedAccount](https://github.com/MetaMask/metamask-plugin/commit/f5b0795ac5582dd53de728479cf47c43eabfe67c) by @Zanibas. Sorry, Kevin! Had you actually changed all instances, this bug would not have happened. Fixes #908
* | | Lint.Kevin Serrano2016-12-211-11/+11
|/ /
* | Merge pull request #916 from MetaMask/i894-DetectBadAccountsDan Finlay2016-12-214-16/+57
|\ \ | | | | | | I894 detect bad accounts
| * | Made changes according to feedback.Dan Finlay2016-12-203-13/+12
| | |
| * | Got bad account detection working and added to stateDan Finlay2016-12-103-31/+8
| | |
| * | Mostly added bad account detectionDan Finlay2016-12-094-9/+74
| |/ | | | | | | Currently riddled with logs, because the migrator is inexplicably returning before generating the new style accounts for comparison.
* | Merge pull request #939 from MetaMask/BrowserPassworderDan Finlay2016-12-212-157/+2
|\ \ | | | | | | Remove encryptor in favor of external browser-passworder
| * | Remove encryptor in favor of external browser-passworderDan Finlay2016-12-202-157/+2
| | | | | | | | | | | | I broke out the encryptor lib into its own module on npm called browser-passworder.
* | | Merge pull request #942 from MetaMask/Version-2.14.1Dan Finlay2016-12-211-1/+1
|\ \ \ | |/ / |/| | Version 2.14.1
| * | Version 2.14.12.14.1Dan Finlay2016-12-211-1/+1
| | |
* | | Merge pull request #937 from MetaMask/i900-forgot-password-flowDan Finlay2016-12-202-4/+3
|\ \ \ | | | | | | | | I900 forgot password flow
| * | | Lint.Kevin Serrano2016-12-202-4/+3
| | |/ | |/|
* | | Merged master into devDan Finlay2016-12-205-20/+132
|\ \ \ | |/ / |/| / | |/
| * changelog - inf reload detection hotfixkumavis2016-12-201-1/+1
| |
| * inpage - temporarily disable ping streamkumavis2016-12-201-8/+9
| |
| * move notice code from metamask-controller + config-manager, in to ↵kumavis2016-12-173-111/+98
| | | | | | | | notice-controller
| * Deactivate polling for now.Kevin Serrano2016-12-171-1/+3
| |
| * CleanupDan Finlay2016-12-171-3/+0
| |
| * Add ability to show notices to user & get confirmation.Kevin Serrano2016-12-171-18/+22
| | | | | | | | | | | | | | | | | | | | | | | | Implement generation of markdown for notice files. Create npm command. Enhance notice generation. Add test files to test multiple notices. Add basic markdown support to notices. Interval checks for updates. Add extensionizer and linker Add terms and conditions state file Add link support to disclaimer. Changelog addition.
| * Add ability to show notices to user & get confirmation.Kevin Serrano2016-12-173-2/+122
| | | | | | | | | | | | | | | | | | | | | | | | Implement generation of markdown for notice files. Create npm command. Enhance notice generation. Add test files to test multiple notices. Add basic markdown support to notices. Interval checks for updates. Add extensionizer and linker Add terms and conditions state file Add link support to disclaimer. Changelog addition.
| * Remove morden testnet providerDan Finlay2016-12-161-2/+1
| | | | | | | | Instances configured to point at Morden will now point at Ropsten.
| * inpage - correctly listen for incomming messageskumavis2016-12-081-1/+1
| |
| * Version 2.13.112.13.11Dan Finlay2016-11-241-1/+1
| |
* | Remove redundant logging blockDan Finlay2016-12-021-3/+0
| |
* | Fix vault encrypting & unlocking bugDan Finlay2016-12-012-6/+15
| | | | | | | | | | | | | | | | This is only a bug in dev, but was committed yesterday. Sometimes the `encrypt` method was being passed values other than the password as the encryption key, leading to un-unlockable vaults. To find this, and avoid it for all time hereafter, I added several more steps to our oft-neglected integration test suite, which now fully initializes a vault, locks it, and unlocks it again, to make sure all of those steps definitely work always.
* | Add useful nodeify error messageDan Finlay2016-11-301-2/+9
| | | | | | | | | | | | | | If a nodified method does not return a Promise, it will throw an error, like this: ``` Error in event handler for (unknown): Error: The function setSelectedAccount did not return a Promise, but was nodeified. ```
* | Return promise correctly from setSelectedAddressDan Finlay2016-11-301-1/+1
| |
* | Flattened addTx async methodsDan Finlay2016-11-301-89/+82
| |
* | Bind ethQuery to estimateGas to allow it to be moved around.Dan Finlay2016-11-301-2/+2
| |
* | Fix tx adding codeDan Finlay2016-11-301-25/+3
| | | | | | | | | | | | | | | | | | Broken in this commit: https://github.com/MetaMask/metamask-plugin/commit/bc39cd7b894ddf0f3724d4af3cfc30c2638e0939 Synchronous methods were added to an `async.waterfall` array. This commit also removes the delegate call checking, since we concluded it was misinformed.
* | Ordered keyringController methods the same in metamask-controllerDan Finlay2016-11-302-5/+9
| |
* | Annotated KeyringControllerDan Finlay2016-11-301-219/+496
| |
* | Fix nodeify usageDan Finlay2016-11-291-11/+11
| |
* | Fix nodeifyDan Finlay2016-11-291-55/+13
| |
* | Denodeify most of KeyringControllerDan Finlay2016-11-293-159/+201
| | | | | | | | | | | | | | | | | | | | Mostly Fixes #893 A couple methods cache callbacks, and will require a larger refactor to fully denodeify. Specifically, our methods involving web3 requests to sign a tx, sign a message, and approve or cancel either of those. I think we should postpone those until the TxManager refactor, since it will likely handle this response caching itself.
* | Merge branch 'master' into devDan Finlay2016-11-243-23/+56
|\|
| * rpc - add sync uninstallFilter supportkumavis2016-11-241-0/+7
| |
| * Version 2.13.102.13.10Dan Finlay2016-11-231-1/+1
| |
| * Merge branch 'master' into i868-estimateGasTooHighkumavis2016-11-231-1/+1
| |\
| | * Ropsten has sole access to the faucet.Kevin Serrano2016-11-231-1/+1
| | |
| | * Add to changelog.Kevin Serrano2016-11-231-1/+1
| | |
| * | idStore - fix estimateGas calculationkumavis2016-11-231-22/+48
| |/
| * Version 2.13.92.13.9Dan Finlay2016-11-221-1/+1
| |
* | Fix more async usage of KeyringControllerDan Finlay2016-11-241-25/+32
| |
* | Fix more keyring asyncifying testsDan Finlay2016-11-241-2/+3
| |
* | Mostly got async keyringController tests passingDan Finlay2016-11-231-7/+9
| |
* | Complete first pass at asyncrhonizing keyring controllerDan Finlay2016-11-231-31/+53
| |
* | Asynced keyrings and started on controllerDan Finlay2016-11-233-32/+47
| |
* | Fix new encryptor migration logicDan Finlay2016-11-232-3/+2
| |
* | Fix password referenceDan Finlay2016-11-231-1/+2
| |
* | Remove line of cruftDan Finlay2016-11-231-1/+0
| |
* | Refine isInitialized derivation methodDan Finlay2016-11-231-1/+1
| |
* | Simplify Encryptor API SurfaceDan Finlay2016-11-232-45/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | At least, the portion of it that we use. Moved salting within the encryptor, so it does not need to be managed externally. KeyringController now caches the password instead of a passwordDerivedKey, since it is ignorant of the salt. Encryptor payload is now in a JSON format, so its portions are both base64 encoded *and* labeled appropriately. The format is `{ "data": "0x0", "iv": "0x0", "salt": "string" }`. Fixes #843 Fixes #859
* | Merge branch 'dev' into i843-MoveSaltIntoEncryptorDan Finlay2016-11-239-74/+157
|\ \
| * \ Merge pull request #875 from MetaMask/i868-estimateGasTooHigh-devDan Finlay2016-11-231-5/+61
| |\ \ | | | | | | | | I868 estimate gas too high dev
| | * | KeyringController - estimateGas->analyzeGasUsage fix gasLimit + detect OOGkumavis2016-11-231-5/+61
| | | |
| * | | Merge pull request #858 from MetaMask/i842-WaitForSeedWordkumavis2016-11-231-1/+6
| |\ \ \ | | |/ / | |/| | I842 wait for seed word
| | * | Move state update outside of conditional callback blockDan Finlay2016-11-231-1/+1
| | | |
| | * | Remove callback type checkDan Finlay2016-11-231-1/+1
| | | |
| | * | Merge branch 'dev' into i842-WaitForSeedWordDan Finlay2016-11-234-37/+57
| | |\ \
| | * | | Use callback in placeSeedWord method.Dan Finlay2016-11-221-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge pull request #857 from MetaMask/i841-RenameMethodkumavis2016-11-232-2/+2
| |\ \ \ \ | | | | | | | | | | | | Rename idStoreMigrator method for clarity
| | * | | | Rename idStoreMigrator method for clarityDan Finlay2016-11-222-2/+2
| | |/ / / | | | | | | | | | | | | | | | Fixes #841
| * | | | Merge pull request #869 from MetaMask/dev-cleanupkumavis2016-11-235-23/+27
| |\ \ \ \ | | | | | | | | | | | | Dev Cleanup Package
| | * \ \ \ Merge branch 'dev' into dev-cleanupKevin Serrano2016-11-234-37/+57
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Change fauceting to become a response of an emit.Kevin Serrano2016-11-222-2/+7
| | | | | |
| | * | | | change all instances of selectedAddress to selectedAccount.Kevin Serrano2016-11-224-13/+12
| | | | | |
| | * | | | Remove entropy from encryption and project.Kevin Serrano2016-11-222-8/+8
| | | |/ / | | |/| |
| * | | | Phase out ethereumjs-util from encryptor module.Kevin Serrano2016-11-231-6/+4
| | |/ / | |/| |
| * | | Merge pull request #866 from MetaMask/new-faucet-devDan Finlay2016-11-231-1/+1
| |\ \ \ | | | | | | | | | | Make ropsten faucet button point at the correct url.
| | * | | Make ropsten faucet button point at the correct url.Kevin Serrano2016-11-231-1/+1
| | |/ /
| * / / Improve Keyring organizationDan Finlay2016-11-223-36/+56
| |/ / | | | | | | | | | | | | Separated public & private methods. (Fixes #845) Made class method `type()` into a simple property. (Fixes #846)
* / / Began moving salt into encryptorDan Finlay2016-11-231-5/+10
|/ /
* | Merge branch 'dev' into i831-AddRopsten-DevDan Finlay2016-11-2220-145/+1135
|\ \ | |/ |/|
| * Maintain linting.Kevin Serrano2016-11-192-3/+3
| |
| * Promisify persistence of keyrings before returning keyKevin Serrano2016-11-191-5/+5
| | | | | | | | Change single letter variables (shame)
| * Update migration code for new hd wallet param nameDan Finlay2016-11-191-2/+2
| |
| * Persist keyrings from migration to storage.Kevin Serrano2016-11-191-1/+1
| |
| * Resolve merge conflict.Kevin Serrano2016-11-1920-142/+1132
| |\
| | * random-id - use Number.MAX_SAFE_INTEGER as maxkumavis2016-11-181-1/+1
| | |
| | * Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵Dan Finlay2016-11-1818-174/+158
| | |\ | | | | | | | | | | | | i328-MultiVault
| | | * Revert one cb to previous state.Kevin Serrano2016-11-161-1/+1
| | | |
| | | * Minimize dispatches by using emitters and relying on state updates.Kevin Serrano2016-11-161-7/+6
| | | |
| | | * Fix semantics in commentsKevin Serrano2016-11-161-1/+1
| | | |
| | | * Lints.Kevin Serrano2016-11-161-1/+1
| | | |
| | | * Resolve merge conflicts.Kevin Serrano2016-11-162-5/+4
| | | |\
| | | * \ Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2016-11-161-0/+2
| | | |\ \ | | | | | | | | | | | | | | | | | | i328-MultiVault
| | | | * | Minimize repeated code.Kevin Serrano2016-11-161-5/+6
| | | | | |
| | | * | | Minimize repeated code.Kevin Serrano2016-11-161-7/+6
| | | |/ /
| | | * | Re-enable disclaimer screen. Rename variables to reflect role more clearly.Kevin Serrano2016-11-154-8/+8
| | | | |
| | | * | Revert to previous anonymous function for promise.Kevin Serrano2016-11-121-1/+3
| | | | |
| | | * | Various keyring changesKevin Serrano2016-11-121-18/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Rearrange the require statements. - Remove unused web3. - Simplify some callbacks and promises. - Clarify certain parameters.
| | | * | Clarify functions names. Package normalize inside util file. Fix require ↵Kevin Serrano2016-11-121-11/+8
| | | | | | | | | | | | | | | | | | | | headers.
| | | * | Package normalize inside sig util file.Kevin Serrano2016-11-121-0/+5
| | | | |
| | | * | Linting to the max.Kevin Serrano2016-11-1216-126/+93
| | | | |
| | | * | Merge branch 'master' into i328-MultiVaultkumavis2016-11-111-2/+16
| | | |\ \
| | | * | | fix tx data so it has the network idFrankie2016-11-112-2/+9
| | | | | |
| | | * | | Merge branch 'master' into i328-MultiVaultFrankie2016-11-113-3/+4
| | | |\ \ \
| | * | | | | Replace old random-id code with incrementing id generatorDan Finlay2016-11-183-11/+12
| | |/ / / /
| | * | | | Merge branch 'master' into i328-MultiVaultDan Finlay2016-11-081-5/+5
| | |\ \ \ \
| | * | | | | Fix 787 gas buffer bugDan Finlay2016-11-081-5/+5
| | | | | | |
| | * | | | | Fix network checkingDan Finlay2016-11-051-21/+1
| | | | | | |
| | * | | | | Add tolerance to normalize methodDan Finlay2016-11-041-0/+1
| | | | | | |
| | * | | | | Fix password validation and persistence issueDan Finlay2016-11-042-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Was wiping the vault on each successful password attempt... :P
| | * | | | | Implement private key exporting.Kevin Serrano2016-11-042-3/+22
| | | | | | |
| | * | | | | Finish fixing nicknaming bugDan Finlay2016-11-041-28/+39
| | | | | | |
| | * | | | | Fix account nicknaming bugDan Finlay2016-11-042-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When nicknaming, we weren't normalizing the input, and so we were retrieving with differently formatted addresses than we were persisting.
| | * | | | | Fix vault creation bugDan Finlay2016-11-041-17/+13
| | | | | | |
| | * | | | | Don't faucet during testsDan Finlay2016-11-041-1/+2
| | | | | | |
| | * | | | | Don't faucet in developmentDan Finlay2016-11-041-1/+3
| | | | | | |
| | * | | | | Fix dual vault creation bugDan Finlay2016-11-031-11/+4
| | | | | | |
| | * | | | | Fix initial vault creationDan Finlay2016-11-031-4/+8
| | | | | | |
generated by cgit (git 2.34.1) at 2024-10-15 00:19:00 +0800