aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\
| * | | 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 w...Frankie2017-01-252-7/+8
| * | | 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 wh...Frankie2017-01-191-1/+1
| | * | | Version 3.1.0Dan Finlay2017-01-191-1/+1
| * | | | Add ability to import v3 JSON walletsDan Finlay2017-01-191-5/+13
| * | | | Added new modular private key import systemDan Finlay2017-01-192-0/+48
| |/ / /
| * | | 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
| |/ / /
| * | | 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
| | * fix the maxcost not being included in txMetaFrankie2017-01-141-3/+7
| | * Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin into bug-s...kumavis2017-01-144-13/+38
| | |\
| | | * 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 pending...Frankie2017-01-124-9/+28
| | * | | | | | 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
|/ /
* | 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
| * | | 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
* | | 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
| * 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
| * | | 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
|/ / /
* | | Remove logDan Finlay2016-12-231-1/+0
* | | Merge pull request #948 from MetaMask/RecoverLostAccountsDan Finlay2016-12-235-51/+92
|\ \ \
| * | | 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
| * | | 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
| * | | Make notices confirmation configurableDan Finlay2016-12-212-2/+16
* | | | Fix account injection bugDan Finlay2016-12-231-2/+3
| |_|/ |/| |
* | | Lint.Kevin Serrano2016-12-211-11/+11
|/ /
* | Merge pull request #916 from MetaMask/i894-DetectBadAccountsDan Finlay2016-12-214-16/+57
|\ \
| * | 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
| |/
* | Merge pull request #939 from MetaMask/BrowserPassworderDan Finlay2016-12-212-157/+2
|\ \
| * | Remove encryptor in favor of external browser-passworderDan Finlay2016-12-202-157/+2
* | | Merge pull request #942 from MetaMask/Version-2.14.1Dan Finlay2016-12-211-1/+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
|\ \ \
| * | | 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 notice-cont...kumavis2016-12-173-111/+98
| * 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-173-2/+122
| * Remove morden testnet providerDan Finlay2016-12-161-2/+1
| * 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
* | Add useful nodeify error messageDan Finlay2016-11-301-2/+9
* | 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
* | 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
* | 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
* | 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
| |\ \
| | * | KeyringController - estimateGas->analyzeGasUsage fix gasLimit + detect OOGkumavis2016-11-231-5/+61
| * | | Merge pull request #858 from MetaMask/i842-WaitForSeedWordkumavis2016-11-231-1/+6
| |\ \ \ | | |/ / | |/| |
| | * | 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
| * | | | Merge pull request #857 from MetaMask/i841-RenameMethodkumavis2016-11-232-2/+2
| |\ \ \ \
| | * | | | Rename idStoreMigrator method for clarityDan Finlay2016-11-222-2/+2
| | |/ / /
| * | | | Merge pull request #869 from MetaMask/dev-cleanupkumavis2016-11-235-23/+27
| |\ \ \ \
| | * \ \ \ 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.Kevin Serrano2016-11-231-1/+1
| | |/ /
| * / / Improve Keyring organizationDan Finlay2016-11-223-36/+56
| |/ /
* / / 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
| * 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 i3...Dan Finlay2016-11-1818-174/+158
| | |\
| | | * 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 i3...Kevin Serrano2016-11-161-0/+2
| | | |\ \
| | | | * | 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
| | | * | Clarify functions names. Package normalize inside util file. Fix require head...Kevin Serrano2016-11-121-11/+8
| | | * | 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
| | * | | | | 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
| | * | | | | 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
| | * | | | | Fix handling of migrating old vault styleDan Finlay2016-11-033-46/+78
| | * | | | | Add reveal of seed words.Kevin Serrano2016-11-022-2/+9
| | * | | | | Fixed bugs related to clearing caches when restoring to a new vaultDan Finlay2016-11-023-10/+48
| | * | | | | Fix seed phrase restoreDan Finlay2016-11-021-1/+1
| | * | | | | Made progress on parity for MultiVaultKevin Serrano2016-11-024-28/+60
| | * | | | | Do not open MM page in dev mode.Kevin Serrano2016-11-021-1/+2
| | * | | | | Implement seed word confirmation page.Kevin Serrano2016-11-014-10/+29
| | * | | | | Implement auto-faucetingKevin Serrano2016-11-011-1/+6
| | * | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3...Kevin Serrano2016-10-313-6/+79
| | |\ \ \ \ \
| | | * | | | | Now migrating old vaults to new DEN formatDan Finlay2016-10-293-6/+79
| | * | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3...Kevin Serrano2016-10-293-7/+111
| | |\| | | | |
| | | * | | | | Configure BIP44 Keychain as default oneDan Finlay2016-10-292-7/+25
| | | * | | | | Added hd wallet testsDan Finlay2016-10-281-4/+12
| | | * | | | | Add hd wallet keyringDan Finlay2016-10-281-0/+78
| | | * | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3...Dan Finlay2016-10-264-27/+0
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-261-9/+14
| | | |\ \ \ \ \ \
| | * | \ \ \ \ \ \ Merge branch 'master' into i328-MultiVaultKevin Serrano2016-10-292-12/+17
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Phase out extra warning screen.Kevin Serrano2016-10-264-27/+0
| | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Fix loading indicationDan Finlay2016-10-221-1/+1
| | * | | | | | | Added tx & msg managing functionality to new KeyringControllerDan Finlay2016-10-222-1/+150
| | * | | | | | | Fix bug in new KeyringController vault restoring logic.Dan Finlay2016-10-221-3/+5
| | * | | | | | | Create basic keyring-controller unit test fileDan Finlay2016-10-222-12/+16
| | * | | | | | | Added SimpleKeyring testsDan Finlay2016-10-223-18/+27
| | * | | | | | | Added tx and msg signing to keychain & controllerDan Finlay2016-10-214-39/+134
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 10:29:16 +0800