aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into filter-fixes-moarDan Finlay2017-09-281-8/+30
|\
| * Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOut...kumavis2017-09-271-7/+4
| |\
| | * Remove duplicate instantiation of account-trackerDan Finlay2017-09-271-5/+1
| | * Move obs store into account-tracker instead of inheritingDan Finlay2017-09-271-2/+2
| | * Pass blocktracker to balances controllerDan Finlay2017-09-271-0/+1
| | * Merge branch 'master' into AddBalanceControllerDan Finlay2017-09-261-0/+1
| | |\
| * | | Remove keyring controller from projectDan Finlay2017-09-231-1/+1
| * | | Merge branch 'AddBalanceController' into BreakOutKeyringControllerDan Finlay2017-09-231-6/+30
| |\| | | | |/ | |/|
| | * Fix accont-tracker merge bugDan Finlay2017-09-231-0/+4
| | * Merge branch 'master' into AddBalanceControllerDan Finlay2017-09-231-31/+58
| | |\
| | * | Fix computed-balances controller referenceDan Finlay2017-09-231-1/+1
| | * | Refactor eth-store into account-trackerDan Finlay2017-09-231-10/+16
| | * | Add computed balance to account detail viewDan Finlay2017-09-141-0/+4
| | * | Got pending balance updating correctlyDan Finlay2017-09-141-0/+4
| | * | Some progressDan Finlay2017-09-131-1/+7
| * | | Define encryptor in constructor params instead of platform objectDan Finlay2017-09-231-1/+1
| * | | Merge branch 'master' into ConfigurableEncryptionDan Finlay2017-09-221-1/+1
| |\ \ \ | | | |/ | | |/|
| * / | Allow custom encryptor to be passed to MetaMaskController and KeyringControll...Dan Finlay2017-09-221-1/+2
| |/ /
* / / metamask - use provider-engines block trackerkumavis2017-09-231-1/+1
|/ /
* | metamask controller - destroy filter polyfill on disconnectkumavis2017-09-141-4/+10
* | metamask controller - move middleware into seperate fileskumavis2017-09-141-34/+7
* | debug - prefer logger over consolekumavis2017-09-141-5/+5
* | metamask cont - standardize multiplex stream namingkumavis2017-09-141-8/+8
* | metamask - add jsonrpc filter middleware on per-connection enginekumavis2017-09-081-2/+8
* | streams - use pump and published obj-multiplexkumavis2017-09-081-7/+27
* | inpage - use json-rpc-engine for inpage-providerkumavis2017-08-251-10/+32
|/
* Merge pull request #1848 from MetaMask/transactionControllerRefractorkumavis2017-08-031-26/+4
|\
| * move newUnapprovedTransaction to transactions.jsfrankiebee2017-08-031-21/+2
| * lint fixesfrankiebee2017-08-021-1/+1
| * fix spelling mistakefrankiebee2017-08-021-1/+1
| * make addUnapprovedTransaction async function and use promise based ethQueryfrankiebee2017-08-021-16/+13
* | blacklist controller - breakout from metamask and infura controllerskumavis2017-08-031-10/+9
* | phishing detection - move phishing detection into contentscript and metamask ...kumavis2017-08-031-2/+24
|/
* turn off auto faucet and remove filefrankiebee2017-07-181-4/+0
* Merge branch 'master' into nonce-trackerfrankiebee2017-07-131-1/+1
|\
| * metamask - on rpc err show whole error bodykumavis2017-07-121-1/+1
* | use new nodeifyfrankiebee2017-07-131-23/+15
* | Merge branch 'master' into nonce-trackerkumavis2017-07-081-2/+10
|\|
| * metamask - append dapp origin domain to rpc requestkumavis2017-07-051-2/+9
| * Merge pull request #1620 from MetaMask/i1616-AddTokenAddingThomas Huang2017-06-291-0/+1
| |\
| | * Merge branch 'AddTokenList' into i1616-AddTokenAddingDan Finlay2017-06-201-1/+6
| | |\
| | * | Add ability to add tokens to token listDan Finlay2017-06-161-0/+1
* | | | Merge branch 'master' into nonce-trackerfrankiebee2017-06-281-1/+15
|\| | |
| * | | Merge pull request #1663 from MetaMask/infura-statusThomas Huang2017-06-271-1/+14
| |\ \ \ | | |_|/ | |/| |
| | * | Add infura network status to our UI state.Kevin Serrano2017-06-231-1/+14
| * | | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTo...Kevin Serrano2017-06-201-0/+1
| |\ \ \ | | |/ / | |/| / | | |/
| | * Persist selected account tabDan Finlay2017-06-151-0/+1
* | | Merge branch 'master' into nonce-trackerfrankiebee2017-06-171-1/+6
|\| |
| * | Merge branch 'master' into i1567-FixInaccurateErrorfrankiebee2017-06-171-1/+5
| |\ \
| | * | Debounce background updatesDan Finlay2017-06-161-1/+5
| | |/
| * / check nonce and balance when resubmiting txfrankiebee2017-06-161-0/+1
| |/
* / transaction controller - use nonce-trackerkumavis2017-06-151-1/+1
|/
* include ethQuery in txControllerfrankiebee2017-05-241-0/+1
* Fix for testsfrankiebee2017-05-241-2/+1
* Wrap the provider in a proxyfrankiebee2017-05-231-37/+5
* Merge branch 'master' into networkControllerfrankiebee2017-05-231-16/+16
|\
| * Rename tx manager to tx controllerDan Finlay2017-05-171-16/+16
* | Create a network controller to manage switcing networks an updating the providerfrankiebee2017-05-191-72/+52
|/
* metamask - publicConfig - fix init statekumavis2017-05-051-1/+1
* metamask - selected accounts - dont reveal when lockedkumavis2017-05-051-15/+17
* Use loglevel for more logsDan Finlay2017-05-011-9/+3
* Fix linting warningsThomas Huang2017-04-271-39/+38
* add platforms to mascara + move buyEther window open to uikumavis2017-04-051-17/+2
* Merge pull request #1307 from MetaMask/mascarakumavis2017-04-051-1/+0
|\
| * clean - metamask controller - remove logkumavis2017-04-051-1/+0
| * Merge branch 'master' into mascarafrankiebee2017-04-031-6/+8
| |\
| * | WIP: lost enital call from dapp to getAccountsfrankiebee2017-03-301-0/+1
| * | Merge branch 'master' into mascarafrankiebee2017-03-291-1/+5
| |\ \
| * \ \ Merge branch 'master' into mascarafrankiebee2017-03-241-38/+17
| |\ \ \
| * | | | WIP: streams->indexdbfrankiebee2017-03-241-1/+0
* | | | | Fix faucet to only autoFaucet first accountfrankiebee2017-04-051-0/+2
| |_|_|/ |/| | |
* | | | introduce platform api and rename notifications to notification-managerkumavis2017-03-311-6/+8
| |_|/ |/| |
* | | Merge pull request #1268 from MetaMask/kovan-faucet-instructionsDan Finlay2017-03-291-0/+4
|\ \ \
| * | | Add link to kovan faucet instructions.Kevin Serrano2017-03-281-0/+4
| | |/ | |/|
* / | Assure that seed words are placed into state tree upon request.Kevin Serrano2017-03-281-1/+1
|/ /
* | Remove eth-lightwalletDan Finlay2017-03-171-37/+1
* | Merge branch 'master' into i1165-predictiveKevin Serrano2017-03-151-1/+1
|\ \
| * | Rename variables to proper currency state variables.Kevin Serrano2017-03-151-1/+1
| |/
* | Connect keyring controller to address book to prevent additional duplicates.Kevin Serrano2017-03-111-5/+5
* | Allow for adding recently used addresses to address book.Kevin Serrano2017-03-101-0/+4
* | Create persistence address book.Kevin Serrano2017-03-101-0/+11
|/
* Nodeify and promisify calls to background.Kevin Serrano2017-03-091-2/+4
* Refactor of code into separate reducers and actions.Kevin Serrano2017-03-081-4/+13
* Merge branch 'master' into i1144-moarrpcKevin Serrano2017-03-081-4/+4
|\
| * Fix issue where old txMeta object was being used to pass the txHash to the cbFrankie2017-03-071-4/+4
* | More conflict resolution.Kevin Serrano2017-03-021-3/+3
|\ \
| * | add controllers to root scripts folderDan Finlay2017-02-281-3/+3
| * | Merge branch 'master' into i1144-moarrpcDan Finlay2017-02-281-19/+101
| |\ \
* | \ \ Fix merge conflicts.Kevin Serrano2017-03-021-31/+112
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Add a couple more debug logsDan Finlay2017-03-011-0/+1
| * | Use correct action to update and submit txDan Finlay2017-03-011-0/+1
| * | Remove gasMultiplier txMeta paramDan Finlay2017-03-011-10/+0
| * | Add background method for updating and approving a tx in one callDan Finlay2017-02-281-2/+9
| |/
| * Removed redundant personal_recover logicDan Finlay2017-02-251-7/+0
| * Mostly fix personal_recoverDan Finlay2017-02-251-0/+1
| * Fix cancel msg signing behavior.Dan Finlay2017-02-241-6/+25
| * Got personal_sign workingDan Finlay2017-02-241-19/+36
| * Add personal sign actions and templateDan Finlay2017-02-231-0/+5
| * Allow provider to init before keyringControllerDan Finlay2017-02-221-2/+6
| * Point metamask-controller personalSignRecover method to keyring-controllerDan Finlay2017-02-221-9/+5
| * Move sigUtil and keyrings to external modulesDan Finlay2017-02-221-1/+48
* | Tested against code to play nice with unit tests.Kevin Serrano2017-02-241-1/+1
* | Fix namingKevin Serrano2017-02-221-1/+1
* | Basic infrasture for RPC list added.Kevin Serrano2017-02-221-0/+1
|/
* Merge branch 'dev' into disclaimer-notifyKevin Serrano2017-02-101-1/+2
|\
| * Allowed net_version to be called synchronouslyKevin Serrano2017-02-091-1/+2
* | Delete all code related to disclaimers.Kevin Serrano2017-02-101-48/+0
|/
* Mostly got shapeshift tx management into its own controllerDan Finlay2017-02-041-3/+12
* 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
* 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
|/
* 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 w...Frankie2017-01-251-1/+5
| * | 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
| |/
| * Allow importing of private key stringsDan Finlay2017-01-181-1/+6
| * background - return txHash to provider-engine on donekumavis2017-01-151-14/+10
| * Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin into bug-s...kumavis2017-01-141-0/+1
| |\
| | * 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 pending...Frankie2017-01-121-0/+1
| * | | | 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
* | 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
| * | | 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
|/ / /
* | | 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
* | | Move old keystore migration code to metamask controllerDan Finlay2016-12-221-1/+49
* | | Make notices confirmation configurableDan Finlay2016-12-211-1/+16
| |/ |/|
* | Merged master into devDan Finlay2016-12-201-9/+24
|\ \ | |/ |/|
| * move notice code from metamask-controller + config-manager, in to notice-cont...kumavis2016-12-171-46/+19
| * 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
| * Add ability to show notices to user & get confirmation.Kevin Serrano2016-12-171-2/+40
| * 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
* | 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
* | Implement seed word confirmation page.Kevin Serrano2016-11-011-0/+1
* | 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 or...Kevin Serrano2016-10-131-13/+31
|\ \ \ | |_|/ |/| |
| * | 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
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 08:32:23 +0800