aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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-229-191/+190
| |\ \
| * | | 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.
* | 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 #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-204-19/+131
|\ \ | |/ |/|
| * 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
| |
* | 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-242-22/+55
|\|
| * rpc - add sync uninstallFilter supportkumavis2016-11-241-0/+7
| |
| * 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
| |/
* | 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-1817-173/+157
| | |\ | | | | | | | | | | | | 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-112-2/+3
| | | |\ \ \
| | * | | | | 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
| | | | | | |
| | * | | | | Fix handling of migrating old vault styleDan Finlay2016-11-033-46/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now old vaults are recognized as an "Initialized" MetaMask instance. Upon logging in, when fetching the initial password-derived key, if there is no new-style vault, but there is an old style vault, it is migrated to the new format before proceeding through the usual unlocking steps.
| | * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
| | * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove logs. Move HD render files to ui/app.
| | * | | | | Implement auto-faucetingKevin Serrano2016-11-011-1/+6
| | | | | | |
| | * | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2016-10-313-6/+79
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | i328-MultiVault
| | | * | | | | Now migrating old vaults to new DEN formatDan Finlay2016-10-293-6/+79
| | | | | | | |
| | * | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2016-10-293-7/+111
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | i328-MultiVault
| | | * | | | | 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 ↵Dan Finlay2016-10-264-27/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | i328-MultiVault
| | | * \ \ \ \ \ Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-261-9/+14
| | | |\ \ \ \ \ \
| | * | \ \ \ \ \ \ Merge branch 'master' into i328-MultiVaultKevin Serrano2016-10-291-11/+16
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | 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
| | | | | | | | |
| | * | | | | | | Improved simple account generationDan Finlay2016-10-212-34/+51
| | | | | | | | |
| | * | | | | | | Began adding first basic keyringDan Finlay2016-10-214-9/+146
| | | | | | | | |
| | * | | | | | | Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-211-1/+1
| | |\ \ \ \ \ \ \
| | * | | | | | | | Fix testsDan Finlay2016-10-212-7/+9
| | | | | | | | | |
| | * | | | | | | | Linted & added salting to vaultDan Finlay2016-10-213-35/+26
| | | | | | | | | |
| | * | | | | | | | Fix state updating after vault creation and unlockingDan Finlay2016-10-211-2/+2
| | | | | | | | | |
| | * | | | | | | | Fix unlock logicDan Finlay2016-10-211-6/+17
| | | | | | | | | |
| | * | | | | | | | Git merge resolution.Kevin Serrano2016-10-206-4/+56
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Intermediary commit.Kevin Serrano2016-10-202-4/+44
| | | | | | | | | | |
| | * | | | | | | | | Remove unused crypto dependencies.Kevin Serrano2016-10-201-2/+0
| | | | | | | | | | |
| | * | | | | | | | | Merge in crypto.Kevin Serrano2016-10-201-0/+119
| | | | | | | | | | |
| | * | | | | | | | | Initial work on UI sideKevin Serrano2016-10-162-0/+26
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2016-10-132-13/+133
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | origin/i328-MultiVault
| | | * | | | | | | | | Add minimal method signatures to new keyring controllerDan Finlay2016-10-132-14/+92
| | | | | | | | | | | |
| | | * | | | | | | | | Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-134-2/+52
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Add initial KeyringController filesDan Finlay2016-10-121-0/+42
| | | | | | | | | | | | |
* | | | | | | | | | | | | Begin adding Ropsten supportDan Finlay2016-11-222-1/+7
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ropsten links will still not work until Etherscan publishes their ropsten link format. At that time we will need to update ui/lib/account-link.js Otherwise, fixes #831
* | | | | | | | | | | / Increment tx ids to avoid collisionsDan Finlay2016-11-183-11/+11
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #791 It was possible for two requests to have the same ID, causing a crash and loss of StreamProvider connection. This new id generation strategy creates a random ID, and increments it for each request. In case the id generator is included from two different processes, I'm initializing the counter at a random number, and rolling it over a large number when it gets too big.
* | | | | | | | | | | First attempt at fixing errors in confirmation screen.Kevin Serrano2016-11-152-4/+3
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | detect tx error - show warning and fix gasLimitkumavis2016-11-111-2/+16
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | remove gas field, due to alias redundancy.Kevin Serrano2016-11-101-1/+0
| | | | | | | | |
* | | | | | | | | Fix bug for increasing gas by 20 percent.Kevin Serrano2016-11-102-1/+2
| | | | | | | | |
* | | | | | | | | Adjust gas buffer to be 20% over estimateDan Finlay2016-11-091-1/+2
| | | | | | | | |
* | | | | | | | | Increase gas bufferDan Finlay2016-11-091-1/+1
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Fixes #795
* | | | | | | | Fix gas price bufferingDan Finlay2016-11-081-5/+5
| |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our gas price buffering logic had a bug, because bn.js has inconsistent behavior when using hex-prefixed output. The issue has been opened with them here: https://github.com/indutny/bn.js/issues/151 We've corrected our usage in the mean time.
* | | | | | | Merge branch 'master' into i762-RenameWalletToAccountDan Finlay2016-10-271-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix delegate call function reference 2Dan Finlay2016-10-261-1/+1
| | | | | | | |
| * | | | | | | Fix delegate call analysisDan Finlay2016-10-261-1/+1
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Fixed reference allowing transactions to be analyzed for delegate call again.
* / | | | | | Rename wallet to accountDan Finlay2016-10-261-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Fixes #762
* | | | | | Merge branch 'master' into i743-FixDelegateCallFlagkumavis2016-10-251-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Add note about callback param to sync method warningDan Finlay2016-10-201-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into i743-FixDelegateCallFlagKevin Serrano2016-10-191-1/+1
|\| | | |
| * | | | Wait for first metamask data to establish ping-pong stream.Dan Finlay2016-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents infinite reload loops when dapps take too long to load. Fixes #746.
* | | | | Reproduced issue 743 in test caseDan Finlay2016-10-181-9/+14
|/ / / / | | | | | | | | | | | | | | | | | | | | This contract hex does include the value `f4`, but it was compiled from a contract with no instance of `.delegatecall`. I believe `f4` in this case is part of some other value or contract address, and `ethBinToOps` has some error in how it skips pushed data. @kumavis
* | | | Restore hex prefix to gas priceDan Finlay2016-10-181-1/+1
| | | |
* | | | Increase gas estimate by 100000 weiDan Finlay2016-10-181-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | To prevent minor gas estimation errors, probably usually related to operating on dynamic state. Fixes #738.
* | | | Merge branch 'master' into i735-xmlfixKevin Serrano2016-10-184-0/+33
|\ \ \ \
| * | | | Fix for lintingFrankie2016-10-141-1/+1
| | | | |
| * | | | Create callback and Clean-up detailsFrankie2016-10-141-2/+7
| | | | |
| * | | | Specify base 10 in bignumberFrankie2016-10-141-1/+1
| | | | |
| * | | | Merge branch 'master' into i#495CustomGasFieldFrankie2016-10-147-37/+58
| |\| | |
| * | | | Fix gasPrice rangeFrankie2016-10-144-4/+25
| | | | |
| * | | | Merge branch 'master' into i#495CustomGasFieldFrankie2016-10-124-2/+52
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' into i#495CustomGasFieldFrankie2016-10-114-24/+12
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Add custom gas field to send pageFrankie2016-10-111-0/+7
| | | | |
* | | | | Lint.Kevin Serrano2016-10-161-1/+1
| | | | |
* | | | | Prevent XML from web3 injections.Kevin Serrano2016-10-161-2/+14
| |_|_|/ |/| | |
* | | | Merge branch 'master' into i695-dapp-reloadkumavis2016-10-131-2/+2
|\ \ \ \
| * | | | Remove logs.Kevin Serrano2016-10-131-2/+0
| | | | |
| * | | | Fix misnamed variable.Kevin Serrano2016-10-131-2/+4
| | |_|/ | |/| |
* | | | Merge branch 'master' into i695-dapp-reloadkumavis2016-10-134-2/+52
|\| | |
| * | | Merge branch 'tos' of github.com:MetaMask/metamask-plugin into tosKevin Serrano2016-10-121-0/+2
| |\ \ \
| | * | | Fix bug where new vaults had no nicknamesDan Finlay2016-10-121-0/+2
| | | | |
| * | | | 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-122-27/+16
| | | |
| * | | Move tos hash logic to build phase. Create dynamic global variables based on ↵Kevin Serrano2016-10-121-1/+2
| | | | | | | | | | | | | | | | build.
| * | | 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
| | | |
| * | | Renamed variables to make more sense.Kevin Serrano2016-10-071-2/+2
| | | |
| * | | Add missing path require statement.Kevin Serrano2016-10-071-0/+1
| | | |
| * | | On update, check whether the TOS has changed using hashes.Kevin Serrano2016-10-061-1/+16
| | | |
| * | | Add controller functions for storing and checking TOS hashes.Kevin Serrano2016-10-061-1/+34
| | | |
| * | | Add new functions for storing TOS hashes in config manager.Kevin Serrano2016-10-061-0/+11
| | |/ | |/|
* / | dapp reload - fixed disconnect detection via pollingkumavis2016-10-136-35/+56
|/ /
* | Add tolerance for sending from mixed-case addresses.Dan Finlay2016-10-061-2/+2
| | | | | | | | | | | | We had to convert to lower case, and also had to modify the new provider-engine sanitizer to tolerate mixed case addresses. Fixes #707
* | Correct async linkDan Finlay2016-10-061-4/+4
| |
* | Make popup a little tallerDan Finlay2016-10-051-1/+1
| | | | | | | | | | | | For some reason the popup was often cutting off the bottom buttons of the UI. We should look at that more carefully later perhaps, but especially since we're considering moving off the popup, I'm just fixing it by making it taller for now.
* | 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
|
* Merge branch 'master' into i#519buyButtonTxConfFrankie2016-09-161-16/+9
|\
| * Remove unused argumentFrankie2016-09-151-1/+1
| |
| * Fix popup flag assignmentDan Finlay2016-09-151-2/+1
| |
| * Dont generate a popup notification when submiting a transaction from with in ↵Frankie2016-09-151-17/+11
| | | | | | | | MetaMask
* | Change Testfaucet urlFrankie2016-09-161-1/+1
|/
* Merge pull request #655 from MetaMask/FixPortStreamEndkumavis2016-09-142-5/+10
|\ | | | | | | Fix port stream end bug
| * Fix port stream end bugDan Finlay2016-09-141-2/+1
|/ | | | | | | | Emitting `end` or `close` was not ending the stream. Pushing a null packet also closes a stream, so I did that instead. Fixes #616
* Merge branch 'library' of github.com:MetaMask/metamask-plugin into librarykumavis2016-09-132-61/+90
|\
| * Fix cache clearing reference for OperaDan Finlay2016-09-131-1/+1
| | | | | | | | For some reason Chrome didn't mind this awful bug, but Opera caught it.
| * Make cache clearning error tolerantDan Finlay2016-09-131-1/+6
| |
| * Fix clearing of account cache on vault restoreDan Finlay2016-09-131-3/+7
| |
| * LintedDan Finlay2016-09-131-2/+2
| |
| * Load accounts into ethStore on unlockDan Finlay2016-09-131-0/+1
| |
| * Add accounts back to metamask stateDan Finlay2016-09-131-1/+5
| |
| * Fix keystore referenceDan Finlay2016-09-131-0/+1
| |
| * Fix some referencesDan Finlay2016-09-131-2/+2
| |
| * Fix account unlockingDan Finlay2016-09-132-10/+21
| | | | | | | | | | | | | | | | SubmitPassword was not creating a new id-management This is because I broke up the old "createIdmgmt" method to not perform as much conditional logic. Now the pieces are reusable and do what they should do.
* | mascara - everything but the popup bundlekumavis2016-09-131-1/+1
| |
* | popup - breakout popup-corekumavis2016-09-132-61/+71
| |
* | popup - further clean and commentkumavis2016-09-131-17/+13
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-18 05:18:46 +0800