aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
Commit message (Collapse)AuthorAgeFilesLines
* Mostly got shapeshift tx management into its own controllerDan Finlay2017-02-041-3/+12
| | | | Rendering the list is still having issues, so this isn't done yet.
* id mgmt - update to latest eth_sign speckumavis2017-02-041-16/+16
|
* metamask - add missing diskState and memState subscriptionskumavis2017-02-031-6/+11
|
* migration #9 - break out CurrencyController substatekumavis2017-02-031-25/+22
|
* migration #8 - break out NoticeController substatekumavis2017-02-031-2/+2
|
* eth-store - convert to obs-store subclasskumavis2017-02-031-2/+5
|
* txManager - depend on preferencesStorekumavis2017-02-031-1/+1
|
* metamask - introduce networkStorekumavis2017-02-031-28/+40
|
* migration 7 - break off TransactionManager substatekumavis2017-02-031-9/+12
|
* messageManager - move view state to obs-storekumavis2017-02-031-6/+8
|
* keyring - replace getState with memStorekumavis2017-02-031-1/+1
|
* keyring - rm config depkumavis2017-02-031-2/+2
|
* metamask - memState - adopt configManager.isDisclaimerConfirmed from keyring ↵kumavis2017-02-021-0/+1
| | | | controller
* Merge branch 'dev' into messageManagerCleanUpFrankie2017-02-021-23/+28
|\
| * metamask - adopt isInitialized from keyring controllerkumavis2017-02-011-1/+8
| |
| * metamask - inherit some configManager state from keyring controllerkumavis2017-02-011-0/+3
| |
| * keyring - synchronous getStatekumavis2017-02-011-22/+16
| |
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-02-021-10/+24
|\|
| * inpage - set web3.eth.defaultAccount correctlykumavis2017-01-311-1/+1
| |
| * continue rename selectedAccount to selectedAddresskumavis2017-01-311-4/+4
| |
| * rename selectedAccount to selectedAddresskumavis2017-01-311-4/+6
| |
| * metamask - rename getSelectedAccount to getSelectedAddresskumavis2017-01-311-3/+3
| |
| * metamask - move selectedAccount set/get to preferencesControllerkumavis2017-01-311-9/+12
| |
| * preferences - introduce preferences controllerkumavis2017-01-311-0/+9
| |
* | code clan up and testsFrankie2017-02-021-16/+18
| |
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-301-4/+4
|\|
| * metamask - lookup selectedAccount via keyringControllerkumavis2017-01-301-3/+3
| |
| * public config - get selectedAccount from keyring controller substatekumavis2017-01-301-1/+1
| |
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-291-122/+135
|\|
| * metamask - subscribe metamask store to keyringController substatekumavis2017-01-291-0/+3
| |
| * keyring - add and initialize obs-storekumavis2017-01-291-1/+3
| |
| * metamask - adopt shapeshift txs from keyringControllerkumavis2017-01-281-1/+3
| |
| * metamask - organize methodskumavis2017-01-281-120/+126
| |
* | Clean up message manger includes:Frankie2017-01-291-24/+38
|/ | | | | | | | | 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
* metamask - fix setupProviderConnectionkumavis2017-01-271-1/+1
|
* 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-271-2/+31
|
* metamask controller - adopt clearSeedWords from keyring controllerkumavis2017-01-271-4/+9
|
* background - graceful publicConfigStore connection teardownkumavis2017-01-271-1/+3
|
* background - organize metamask instantiationkumavis2017-01-271-34/+35
|
* obs-store - use published modulekumavis2017-01-251-12/+17
|
* Merge branch 'dev' of github.com:MetaMask/metamask-plugin into obs-store2kumavis2017-01-251-2/+20
|\
| * Merge branch 'dev' into i#1048kumavis2017-01-251-0/+11
| |\
| * | background controller - extract KeyringC.placeSeedWords to MetamaskCkumavis2017-01-251-1/+10
| | |
| * | Move the assumption of their only being one hd keyring when requesting seed ↵Frankie2017-01-251-1/+5
| | | | | | | | | | | | words to metamaskController
| * | Fix issue where generating a new account would put it in loose keysFrankie2017-01-251-1/+6
| | |
* | | Merge branch 'dev' into obs-store2kumavis2017-01-221-36/+38
|\ \ \ | | |/ | |/|
| * | Added new modular private key import systemDan Finlay2017-01-191-0/+11
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | 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!
| * Allow importing of private key stringsDan Finlay2017-01-181-1/+6
| | | | | | | | | | | | | | | | 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`.
| * background - return txHash to provider-engine on donekumavis2017-01-151-14/+10
| |
| * Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin into ↵kumavis2017-01-141-0/+1
| |\ | | | | | | | | | bug-submitTx
| | * Merge branch 'dev' into bug-submitTxkumavis2017-01-141-0/+1
| | |\
| | | * Merge branch 'dev' into integrateTxManagerUIFrankie2017-01-121-17/+6
| | | |\
| | | * | Take some of the tx Logic out of the UI and create a visble state for ↵Frankie2017-01-121-0/+1
| | | | | | | | | | | | | | | | | | | | 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-131-34/+21
| | |/ | |/|
* | | background - move pojo migrator to outside of metamask controllerkumavis2017-01-121-3/+3
| | |
* | | background - introduce ObservableStorekumavis2017-01-121-25/+28
|/ /
* | rpc - fix sync account cache settingkumavis2017-01-111-17/+1
| |
* | web3 provider - override eth_syncing and web3_clientVersionkumavis2017-01-111-0/+5
|/
* Merge branch 'dev' into TearDownOnDisconnectkumavis2017-01-061-12/+18
|\
| * Merge branch 'dev' into fixTxManagerDan Finlay2017-01-061-1/+1
| |\
| * | Combine two identical then blocksDan Finlay2017-01-061-4/+2
| | |
| * | remove unnecessary try statmentsFrankie2017-01-051-2/+1
| | |
| * | Merge branch 'dev' into fixtTxManagerFrankie2017-01-051-15/+24
| |\ \
| * | | Fix signing of transactionsFrankie2017-01-051-11/+19
| | | |
* | | | Merge branch 'dev' into TearDownOnDisconnectkumavis2017-01-061-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix dependency referenceDan Finlay2017-01-051-1/+1
| | |/ | |/|
* / | MetaMask Controller - Convert to EventEmitterFrankie2017-01-061-6/+5
|/ /
* | 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
* | Merge branch 'dev' into ShowDifferentAccountsDan Finlay2017-01-031-8/+27
|\|
| * Merge branch 'dev' into TxManagerFrankie2016-12-241-2/+78
| |\
| * | fix some minor spelling mistakes and clean up codeFrankie2016-12-241-8/+2
| | |
| * | fix mergeFrances Pangilinan2016-12-221-1/+1
| | |
| * | Merge branch 'dev' into TxManagerFrankie2016-12-221-8/+24
| |\ \
| * | | Migrate all tx mutation code out of keyring controller andFrances Pangilinan2016-12-221-2/+12
| | | | | | | | | | | | | | | | Fix up txManager to reflect code review requests
| * | | First pass at revision requestsFrances Pangilinan2016-12-221-18/+20
| | | |
| * | | Create a TxManagerFrances Pangilinan2016-12-151-2/+14
| | | |
* | | | 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-231-10/+13
|/ / / | | | | | | | | | | | | | | | | | | 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.
* | | 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-221-19/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Move old keystore migration code to metamask controllerDan Finlay2016-12-221-1/+49
| | | | | | | | | | | | 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-211-1/+16
| |/ |/| | | | | - Confirm button will now dismiss the lost accounts array.
* | Merged master into devDan Finlay2016-12-201-9/+24
|\ \ | |/ |/|
| * move notice code from metamask-controller + config-manager, in to ↵kumavis2016-12-171-46/+19
| | | | | | | | 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-171-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Ropsten has sole access to the faucet.Kevin Serrano2016-11-231-1/+1
| |
| * Add to changelog.Kevin Serrano2016-11-231-1/+1
| |
* | Ordered keyringController methods the same in metamask-controllerDan Finlay2016-11-301-4/+4
| |
* | Fix nodeify usageDan Finlay2016-11-291-11/+11
| |
* | Denodeify most of KeyringControllerDan Finlay2016-11-291-11/+15
| | | | | | | | | | | | | | | | | | | | 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 'dev' into dev-cleanupKevin Serrano2016-11-231-1/+1
|\ \
| * | Make ropsten faucet button point at the correct url.Kevin Serrano2016-11-231-1/+1
| | |
* | | Change fauceting to become a response of an emit.Kevin Serrano2016-11-221-0/+6
| | |
* | | change all instances of selectedAddress to selectedAccount.Kevin Serrano2016-11-221-5/+5
|/ /
* | Resolve merge conflicts.Kevin Serrano2016-11-161-1/+0
|\|
| * First attempt at fixing errors in confirmation screen.Kevin Serrano2016-11-151-1/+0
| |
* | Re-enable disclaimer screen. Rename variables to reflect role more clearly.Kevin Serrano2016-11-151-2/+2
| |
* | Linting to the max.Kevin Serrano2016-11-121-21/+2
| |
* | fix tx data so it has the network idFrankie2016-11-111-0/+6
| |
* | Merge branch 'master' into i328-MultiVaultFrankie2016-11-111-1/+0
|\|
| * Fix bug for increasing gas by 20 percent.Kevin Serrano2016-11-101-1/+0
| |
* | Add reveal of seed words.Kevin Serrano2016-11-021-0/+1
| |
* | Fixed bugs related to clearing caches when restoring to a new vaultDan Finlay2016-11-021-3/+2
| |
* | Made progress on parity for MultiVaultKevin Serrano2016-11-021-1/+2
| | | | | | | | | | | | | | | | | | - Deleted some unused items - Renamed files and paths to match with new locations. - Modified keyring controller logic to separate concerns. - Fix account naming issues. - Enable creation of new vault with default HD keyring. - Formatting issues.
* | Implement seed word confirmation page.Kevin Serrano2016-11-011-0/+1
| | | | | | | | | | Remove logs. Move HD render files to ui/app.
* | Configure BIP44 Keychain as default oneDan Finlay2016-10-291-0/+1
| |
* | Phase out extra warning screen.Kevin Serrano2016-10-261-10/+0
| |
* | Added tx & msg managing functionality to new KeyringControllerDan Finlay2016-10-221-1/+2
| |
* | Added tx and msg signing to keychain & controllerDan Finlay2016-10-211-34/+34
| |
* | Began adding first basic keyringDan Finlay2016-10-211-0/+2
| |
* | Git merge resolution.Kevin Serrano2016-10-201-0/+9
|\|
| * Fix for lintingFrankie2016-10-141-1/+1
| |
| * Create callback and Clean-up detailsFrankie2016-10-141-2/+7
| |
| * Merge branch 'master' into i#495CustomGasFieldFrankie2016-10-141-2/+2
| |\
| * | Fix gasPrice rangeFrankie2016-10-141-0/+5
| | |
* | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2016-10-131-13/+31
|\ \ \ | |_|/ |/| | | | | origin/i328-MultiVault
| * | Add minimal method signatures to new keyring controllerDan Finlay2016-10-131-13/+31
| |/
* | Remove logs.Kevin Serrano2016-10-131-2/+0
| |
* | Fix misnamed variable.Kevin Serrano2016-10-131-2/+4
|/
* Cleanup.Kevin Serrano2016-10-121-2/+0
|
* lintKevin Serrano2016-10-121-2/+1
|
* Move tos hash comparison logic from background to mm controller.Kevin Serrano2016-10-121-10/+15
|
* Fix linting and guarantees set TOS hash.Kevin Serrano2016-10-071-0/+1
|
* Fix retention of terms of service hash across reloads of plugin.Kevin Serrano2016-10-071-1/+1
|
* Add controller functions for storing and checking TOS hashes.Kevin Serrano2016-10-061-1/+34
|
* Improve popup behavior for parity errorsDan Finlay2016-10-041-17/+5
| | | | When we receive an invalid params error, instead of opening the popup and showing no tx, we now just forward that tx back to the UI code.
* Fix for readabilityFrankie2016-10-021-1/+1
|
* Fix issue #688 where fiat conversion does not persist when switching networksFrankie2016-10-011-1/+2
|
* Drop origin key from requests for Parity compatibilityDan Finlay2016-09-191-0/+5
|
* Change Testfaucet urlFrankie2016-09-161-1/+1
|
* Ensure listener is cleaned upDan Finlay2016-09-071-1/+1
| | | | Also fixed bug when validating a tx with no value.
* Add negative value validation to tx approvalDan Finlay2016-09-071-0/+10
|
* Merge branch 'master' into PopupNotificationsDan Finlay2016-08-251-0/+1
|\
| * LintedDan Finlay2016-08-251-1/+1
| |
| * Fix bug where unconfirmed message sig is lost when locked.Dan Finlay2016-08-251-0/+1
| | | | | | | | | | | | Fixes #484 Adds unsigned messages to the in-memory message list before showing the unlock message.
* | Emit updates to all listeners on pending tx updatesDan Finlay2016-08-241-5/+17
|/ | | | | | | | Previously the metamask controller only supported a single UI event listener, which wasn't useful for having a separate notification UI open at the same time. Also reduced the notification's complexity down to a single method, which is heavily re-used. Still has an outstanding bug where if the plugin ui dismisses the last tx, it does not close the notification popup.
* Create a ShapeShift tx in tx HistoryFrankie2016-08-191-3/+2
|
* Merge branch 'master' into shapeshiftTxFrankie2016-08-191-0/+30
|\
| * Fix uncalled fn.Kevin Serrano2016-08-171-1/+1
| |
| * Remove logging. Clean up duplicate entries in currency list.Kevin Serrano2016-08-171-1/+0
| |
| * Merge master.Kevin Serrano2016-08-161-3/+7
| |\
| * | Did not previously call functions before!Kevin Serrano2016-08-101-3/+3
| | |
| * | Fix default value. Add loading indication for async.Kevin Serrano2016-08-101-1/+1
| | |
| * | Merge branch 'master' into usd-conversionKevin Serrano2016-08-051-0/+1
| |\ \
| * \ \ Fix merge conflicts. Fix typos. Ensure currency immediately updated on load.Kevin Serrano2016-07-231-5/+34
| |\ \ \
| * | | | Linting!Kevin Serrano2016-07-231-2/+4
| | | | |
| * | | | Change function names. Add interval polling for api. Refactor functions.Kevin Serrano2016-07-221-1/+13
| | | | |
| * | | | Add date access throughout the data flow.Kevin Serrano2016-07-221-0/+1
| | | | |
| * | | | Merge branch 'master' into usd-conversionKevin Serrano2016-07-221-3/+4
| |\ \ \ \
| * | | | | Add data field to pass up parameters up to reducer.Kevin Serrano2016-07-221-1/+6
| | | | | |
| * | | | | Add fiat actions to metamask controllere and actions.Kevin Serrano2016-07-221-0/+10
| | | | | |
* | | | | | WIP: ShapeShift txFrankie2016-08-191-0/+6
| |_|_|_|/ |/| | | |
* | | | | Add global var for background.Kevin Serrano2016-08-121-2/+6
| | | | |
* | | | | Create global variable that changes ui logging.Kevin Serrano2016-08-121-7/+2
| | | | |
* | | | | Separate developmentMode conditional to only wrap log.Kevin Serrano2016-08-121-2/+4
| | | | |
* | | | | Merge branch 'master' into logging-fixKevin Serrano2016-08-121-1/+1
|\ \ \ \ \
| * | | | | Fix ether warning checkbox.Kevin Serrano2016-08-111-1/+1
| | |_|_|/ | |/| | |
* / | | | Add ability to hide logging messages in production.Kevin Serrano2016-08-121-2/+5
|/ / / /
* | | / Fix account selection updatingDan Finlay2016-07-301-0/+1
| |_|/ |/| |
* | | Buy button (#474)Frankie2016-07-221-0/+28
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * WIP: Buy button link * Add buy eth and the buy eth warning message * Add css * Move the opening of coinbase page to background and send to faucet if on test net * Create a Warning about storeing eth * Finish Buy button and Eth store warning screen * Add to CHANGELOG * fix frankies deletion and change chrome to extension
* | Implement some cross-browser practices (#473)Dan Finlay2016-07-221-3/+4
|/ | | | | | | | | | | | * Add mozilla plugin key to manifest * Move all chrome references into platform-checking module Addresses #453 * Add chrome global back to linter blacklist * Add tests
* Fix bug where rejected tx would not call backDan Finlay2016-07-081-8/+7
|
* Simplify error logDan Finlay2016-07-061-2/+1
|
* Improve metamask-controller error loggingDan Finlay2016-07-061-2/+5
| | | | Fixes #384
* fix typokumavis2016-07-011-1/+1
|
* Debugged by using a real dappDan Finlay2016-06-251-3/+4
|
* Manually debugged refactorDan Finlay2016-06-251-9/+9
|
* Fixed testsDan Finlay2016-06-251-11/+12
|
* Rename background-controller metamask-controllerDan Finlay2016-06-251-0/+255
generated by cgit (git 2.34.1) at 2024-10-15 22:29:21 +0800