Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into obs-store2 | kumavis | 2017-01-22 | 3 | -2/+62 |
|\ | |||||
| * | Merge branch 'dev' into conversion-api-err | Dan Finlay | 2017-01-18 | 3 | -3/+63 |
| |\ | |||||
| | * | eth-store - emit update on new account add | kumavis | 2017-01-15 | 1 | -1/+3 |
| | | | |||||
| | * | Satisfy review needs: | Frankie | 2017-01-14 | 1 | -2/+12 |
| | | | | | | | | | | | | | | | | | | | | | removed unnecessary this.query = opts.query from constructor Created a tx error state for errors in approveTransaction validateTxParams has been moved to tx-utils removed "value" arg from _setTxStatus | ||||
| | * | background - handle tx finalization in controllers instead of provider-engine | kumavis | 2017-01-13 | 1 | -0/+48 |
| | | | |||||
| * | | currency conversion - less noisy error | kumavis | 2017-01-12 | 1 | -1/+1 |
| | | | |||||
* | | | migrations - wip - 005 multivault migration | kumavis | 2017-01-12 | 2 | -23/+14 |
| | | | |||||
* | | | migrations - introduce promise-based migrator | kumavis | 2017-01-12 | 1 | -0/+31 |
| | | | |||||
* | | | background - move pojo migrator to outside of metamask controller | kumavis | 2017-01-12 | 8 | -53/+99 |
| | | | |||||
* | | | background - introduce ObservableStore | kumavis | 2017-01-12 | 7 | -109/+163 |
| |/ |/| | |||||
* | | bugfix - portstream - dont wrap cb in try catch | kumavis | 2017-01-12 | 1 | -2/+2 |
|/ | |||||
* | Remove erroneous OOG estimation logic. | Dan Finlay | 2017-01-11 | 1 | -15/+2 |
| | |||||
* | deps - replace promise-request with fetch | kumavis | 2017-01-11 | 1 | -4/+3 |
| | |||||
* | Fixed bugs with sanity-checking | Dan Finlay | 2017-01-05 | 1 | -12/+10 |
| | | | | | | - Was incorrectly calling some eth-query methods (left over from old local eth-query) - Was still passing block to getAccount in addAccount - Now emitting update only after all account balances are loaded, reducing UI update traffic. | ||||
* | Caught typo | Dan Finlay | 2017-01-05 | 1 | -2/+3 |
| | |||||
* | Add descriptive comment | Dan Finlay | 2017-01-05 | 1 | -0/+9 |
| | |||||
* | Linted | Dan Finlay | 2017-01-05 | 1 | -22/+17 |
| | |||||
* | Removed reliance on eth-store internal custom eth-query | Dan Finlay | 2017-01-05 | 1 | -6/+15 |
| | |||||
* | Move eth-store@1.1.0 into local repo. | Dan Finlay | 2017-01-05 | 1 | -0/+132 |
| | |||||
* | inpage-provider - add isMetaMask | kumavis | 2017-01-03 | 1 | -0/+2 |
| | | | | adds `metamaskInpageProvider.isMetaMask === true` Fixes #727 | ||||
* | Merge branch 'dev' into TxManager | Frankie | 2016-12-24 | 4 | -5/+11 |
|\ | |||||
| * | Remove log | Dan Finlay | 2016-12-23 | 1 | -1/+0 |
| | | |||||
| * | Merge pull request #948 from MetaMask/RecoverLostAccounts | Dan Finlay | 2016-12-23 | 3 | -3/+9 |
| |\ | | | | | | | Auto-Recover accounts lost to BIP44 derivation fix | ||||
| | * | Restructured migration | Dan Finlay | 2016-12-22 | 2 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 uninitialized | Dan Finlay | 2016-12-22 | 1 | -1/+1 |
| | | | |||||
| * | | Fix account injection bug | Dan Finlay | 2016-12-23 | 1 | -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 | ||||
* | | Merge branch 'dev' into TxManager | Frankie | 2016-12-22 | 3 | -166/+44 |
|\| | |||||
| * | Merge pull request #916 from MetaMask/i894-DetectBadAccounts | Dan Finlay | 2016-12-21 | 2 | -10/+44 |
| |\ | | | | | | | I894 detect bad accounts | ||||
| | * | Made changes according to feedback. | Dan Finlay | 2016-12-20 | 2 | -11/+10 |
| | | | |||||
| | * | Got bad account detection working and added to state | Dan Finlay | 2016-12-10 | 1 | -21/+1 |
| | | | |||||
| | * | Mostly added bad account detection | Dan Finlay | 2016-12-09 | 2 | -6/+61 |
| | | | | | | | | | | | | 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-passworder | Dan Finlay | 2016-12-20 | 1 | -156/+0 |
| | | | | | | | | | | | | I broke out the encryptor lib into its own module on npm called browser-passworder. | ||||
| * | | Lint. | Kevin Serrano | 2016-12-20 | 1 | -2/+2 |
| |/ | |||||
* | | First pass at revision requests | Frances Pangilinan | 2016-12-22 | 3 | -289/+6 |
| | | |||||
* | | Create a TxManager | Frances Pangilinan | 2016-12-15 | 3 | -52/+118 |
|/ | |||||
* | Fix vault encrypting & unlocking bug | Dan Finlay | 2016-12-01 | 1 | -2/+3 |
| | | | | | | | | 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 message | Dan Finlay | 2016-11-30 | 1 | -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. ``` | ||||
* | Fix nodeify | Dan Finlay | 2016-11-29 | 1 | -55/+13 |
| | |||||
* | Denodeify most of KeyringController | Dan Finlay | 2016-11-29 | 1 | -0/+59 |
| | | | | | | | | | | 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 dev | Dan Finlay | 2016-11-24 | 2 | -22/+55 |
|\ | |||||
| * | rpc - add sync uninstallFilter support | kumavis | 2016-11-24 | 1 | -0/+7 |
| | | |||||
| * | idStore - fix estimateGas calculation | kumavis | 2016-11-23 | 1 | -22/+48 |
| | | |||||
* | | Fix new encryptor migration logic | Dan Finlay | 2016-11-23 | 1 | -1/+0 |
| | | |||||
* | | Simplify Encryptor API Surface | Dan Finlay | 2016-11-23 | 1 | -8/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 pull request #857 from MetaMask/i841-RenameMethod | kumavis | 2016-11-23 | 1 | -1/+1 |
|\ \ | | | | | | | Rename idStoreMigrator method for clarity | ||||
| * | | Rename idStoreMigrator method for clarity | Dan Finlay | 2016-11-22 | 1 | -1/+1 |
| | | | | | | | | | | | | Fixes #841 | ||||
* | | | Merge pull request #869 from MetaMask/dev-cleanup | kumavis | 2016-11-23 | 2 | -9/+9 |
|\ \ \ | | | | | | | | | Dev Cleanup Package | ||||
| * | | | change all instances of selectedAddress to selectedAccount. | Kevin Serrano | 2016-11-22 | 1 | -5/+5 |
| | | | | |||||
| * | | | Remove entropy from encryption and project. | Kevin Serrano | 2016-11-22 | 1 | -4/+4 |
| |/ / | |||||
* / / | Phase out ethereumjs-util from encryptor module. | Kevin Serrano | 2016-11-23 | 1 | -6/+4 |
|/ / | |||||
* | | Merge branch 'dev' into i831-AddRopsten-Dev | Dan Finlay | 2016-11-22 | 11 | -50/+308 |
|\ \ | |/ |/| | |||||
| * | Maintain linting. | Kevin Serrano | 2016-11-19 | 2 | -3/+3 |
| | | |||||
| * | Update migration code for new hd wallet param name | Dan Finlay | 2016-11-19 | 1 | -2/+2 |
| | | |||||
| * | Resolve merge conflict. | Kevin Serrano | 2016-11-19 | 11 | -47/+305 |
| |\ | |||||
| | * | random-id - use Number.MAX_SAFE_INTEGER as max | kumavis | 2016-11-18 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵ | Dan Finlay | 2016-11-18 | 9 | -37/+52 |
| | |\ | | | | | | | | | | | | | i328-MultiVault | ||||
| | | * | Fix semantics in comments | Kevin Serrano | 2016-11-16 | 1 | -1/+1 |
| | | | | |||||
| | | * | Lints. | Kevin Serrano | 2016-11-16 | 1 | -1/+1 |
| | | | | |||||
| | | * | Resolve merge conflicts. | Kevin Serrano | 2016-11-16 | 1 | -4/+4 |
| | | |\ | |||||
| | | * | | Re-enable disclaimer screen. Rename variables to reflect role more clearly. | Kevin Serrano | 2016-11-15 | 2 | -5/+5 |
| | | | | | |||||
| | | * | | Package normalize inside sig util file. | Kevin Serrano | 2016-11-12 | 1 | -0/+5 |
| | | | | | |||||
| | | * | | Linting to the max. | Kevin Serrano | 2016-11-12 | 8 | -30/+24 |
| | | | | | |||||
| | | * | | Merge branch 'master' into i328-MultiVault | kumavis | 2016-11-11 | 1 | -2/+16 |
| | | |\ \ | |||||
| | | * \ \ | Merge branch 'master' into i328-MultiVault | Frankie | 2016-11-11 | 1 | -1/+3 |
| | | |\ \ \ | |||||
| | * | | | | | Replace old random-id code with incrementing id generator | Dan Finlay | 2016-11-18 | 2 | -10/+10 |
| | |/ / / / | |||||
| | * | | | | Merge branch 'master' into i328-MultiVault | Dan Finlay | 2016-11-08 | 1 | -5/+5 |
| | |\ \ \ \ | |||||
| | * | | | | | Fix password validation and persistence issue | Dan Finlay | 2016-11-04 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was wiping the vault on each successful password attempt... :P | ||||
| | * | | | | | Fix account nicknaming bug | Dan Finlay | 2016-11-04 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | When nicknaming, we weren't normalizing the input, and so we were retrieving with differently formatted addresses than we were persisting. | ||||
| | * | | | | | Don't faucet during tests | Dan Finlay | 2016-11-04 | 1 | -1/+2 |
| | | | | | | | |||||
| | * | | | | | Don't faucet in development | Dan Finlay | 2016-11-04 | 1 | -1/+3 |
| | | | | | | | |||||
| | * | | | | | Fix handling of migrating old vault style | Dan Finlay | 2016-11-03 | 1 | -3/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | | | | | Implement seed word confirmation page. | Kevin Serrano | 2016-11-01 | 2 | -6/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove logs. Move HD render files to ui/app. | ||||
| | * | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2016-10-31 | 2 | -1/+51 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | i328-MultiVault | ||||
| | | * | | | | | Now migrating old vaults to new DEN format | Dan Finlay | 2016-10-29 | 2 | -1/+51 |
| | | | | | | | | |||||
| | | * | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵ | Dan Finlay | 2016-10-26 | 2 | -16/+0 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | i328-MultiVault | ||||
| | | * \ \ \ \ \ | Merge branch 'master' into i328-MultiVault | Dan Finlay | 2016-10-26 | 1 | -9/+14 |
| | | |\ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ | Merge branch 'master' into i328-MultiVault | Kevin Serrano | 2016-10-29 | 1 | -11/+16 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Phase out extra warning screen. | Kevin Serrano | 2016-10-26 | 2 | -16/+0 |
| | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Create basic keyring-controller unit test file | Dan Finlay | 2016-10-22 | 1 | -0/+9 |
| | | | | | | | | | |||||
| | * | | | | | | | Added SimpleKeyring tests | Dan Finlay | 2016-10-22 | 1 | -0/+23 |
| | | | | | | | | | |||||
| | * | | | | | | | Began adding first basic keyring | Dan Finlay | 2016-10-21 | 1 | -1/+0 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'master' into i328-MultiVault | Dan Finlay | 2016-10-21 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix tests | Dan Finlay | 2016-10-21 | 1 | -6/+8 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Linted & added salting to vault | Dan Finlay | 2016-10-21 | 2 | -1/+17 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Git merge resolution. | Kevin Serrano | 2016-10-20 | 3 | -1/+32 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Intermediary commit. | Kevin Serrano | 2016-10-20 | 1 | -0/+11 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge in crypto. | Kevin Serrano | 2016-10-20 | 1 | -0/+119 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Initial work on UI side | Kevin Serrano | 2016-10-16 | 1 | -0/+21 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Begin adding Ropsten support | Dan Finlay | 2016-11-22 | 1 | -0/+4 |
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 collisions | Dan Finlay | 2016-11-18 | 3 | -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 Serrano | 2016-11-15 | 1 | -3/+3 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | detect tx error - show warning and fix gasLimit | kumavis | 2016-11-11 | 1 | -2/+16 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | remove gas field, due to alias redundancy. | Kevin Serrano | 2016-11-10 | 1 | -1/+0 |
| | | | | | | | |||||
* | | | | | | | Fix bug for increasing gas by 20 percent. | Kevin Serrano | 2016-11-10 | 1 | -0/+2 |
| | | | | | | | |||||
* | | | | | | | Adjust gas buffer to be 20% over estimate | Dan Finlay | 2016-11-09 | 1 | -1/+2 |
| | | | | | | | |||||
* | | | | | | | Increase gas buffer | Dan Finlay | 2016-11-09 | 1 | -1/+1 |
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | Fixes #795 | ||||
* | | | | | | Fix gas price buffering | Dan Finlay | 2016-11-08 | 1 | -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-RenameWalletToAccount | Dan Finlay | 2016-10-27 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Fix delegate call function reference 2 | Dan Finlay | 2016-10-26 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fix delegate call analysis | Dan Finlay | 2016-10-26 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | | | | | | | | | | | Fixed reference allowing transactions to be analyzed for delegate call again. | ||||
* / | | | | Rename wallet to account | Dan Finlay | 2016-10-26 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | Fixes #762 | ||||
* | | | | Merge branch 'master' into i743-FixDelegateCallFlag | kumavis | 2016-10-25 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Add note about callback param to sync method warning | Dan Finlay | 2016-10-20 | 1 | -1/+1 |
| | |/ | |/| | |||||
* / | | Reproduced issue 743 in test case | Dan Finlay | 2016-10-18 | 1 | -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 price | Dan Finlay | 2016-10-18 | 1 | -1/+1 |
| | | |||||
* | | Increase gas estimate by 100000 wei | Dan Finlay | 2016-10-18 | 1 | -1/+9 |
| | | | | | | | | | | | | To prevent minor gas estimation errors, probably usually related to operating on dynamic state. Fixes #738. | ||||
* | | Specify base 10 in bignumber | Frankie | 2016-10-14 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into i#495CustomGasField | Frankie | 2016-10-14 | 4 | -22/+28 |
|\| | |||||
| * | Merge branch 'master' into i695-dapp-reload | kumavis | 2016-10-13 | 2 | -0/+13 |
| |\ | |||||
| * | | dapp reload - fixed disconnect detection via polling | kumavis | 2016-10-13 | 4 | -22/+28 |
| | | | |||||
* | | | Fix gasPrice range | Frankie | 2016-10-14 | 3 | -4/+20 |
| | | | |||||
* | | | Merge branch 'master' into i#495CustomGasField | Frankie | 2016-10-12 | 2 | -0/+13 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fix bug where new vaults had no nicknames | Dan Finlay | 2016-10-12 | 1 | -0/+2 |
| | | | |||||
| * | | Renamed variables to make more sense. | Kevin Serrano | 2016-10-07 | 1 | -2/+2 |
| | | | |||||
| * | | Add new functions for storing TOS hashes in config manager. | Kevin Serrano | 2016-10-06 | 1 | -0/+11 |
| |/ | |||||
* | | Merge branch 'master' into i#495CustomGasField | Frankie | 2016-10-11 | 3 | -7/+7 |
|\| | |||||
| * | Add tolerance for sending from mixed-case addresses. | Dan Finlay | 2016-10-06 | 1 | -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 link | Dan Finlay | 2016-10-06 | 1 | -4/+4 |
| | | |||||
| * | Make popup a little taller | Dan Finlay | 2016-10-05 | 1 | -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. | ||||
* | | Add custom gas field to send page | Frankie | 2016-10-11 | 1 | -0/+7 |
|/ | |||||
* | Merge pull request #655 from MetaMask/FixPortStreamEnd | kumavis | 2016-09-14 | 2 | -5/+10 |
|\ | | | | | | | Fix port stream end bug | ||||
| * | Fix port stream end bug | Dan Finlay | 2016-09-14 | 1 | -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 | ||||
* | Fix cache clearing reference for Opera | Dan Finlay | 2016-09-13 | 1 | -1/+1 |
| | | | | For some reason Chrome didn't mind this awful bug, but Opera caught it. | ||||
* | Make cache clearning error tolerant | Dan Finlay | 2016-09-13 | 1 | -1/+6 |
| | |||||
* | Fix clearing of account cache on vault restore | Dan Finlay | 2016-09-13 | 1 | -3/+7 |
| | |||||
* | Linted | Dan Finlay | 2016-09-13 | 1 | -2/+2 |
| | |||||
* | Load accounts into ethStore on unlock | Dan Finlay | 2016-09-13 | 1 | -0/+1 |
| | |||||
* | Add accounts back to metamask state | Dan Finlay | 2016-09-13 | 1 | -1/+5 |
| | |||||
* | Fix keystore reference | Dan Finlay | 2016-09-13 | 1 | -0/+1 |
| | |||||
* | Fix some references | Dan Finlay | 2016-09-13 | 1 | -2/+2 |
| | |||||
* | Fix account unlocking | Dan Finlay | 2016-09-13 | 2 | -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. | ||||
* | Select first address when restoring vault | Dan Finlay | 2016-09-12 | 1 | -2/+10 |
| | | | | Fixes #642 | ||||
* | Fix ethStore pushed addresses | Dan Finlay | 2016-09-12 | 1 | -1/+1 |
| | | | | Needed to add hex prefix always. | ||||
* | Fixed caching bug | Dan Finlay | 2016-09-11 | 1 | -6/+1 |
| | | | | | | Fixed bug where the second new vault created in an IdStore would initially return the accounts from the original store. Also fixed some tests that were incorrect. | ||||
* | Correctly clear ethStore cache on new vault restore | Dan Finlay | 2016-09-11 | 1 | -7/+16 |
| | |||||
* | Captured #640 in failing test | Dan Finlay | 2016-09-11 | 1 | -0/+5 |
| | |||||
* | Add new eth-lightwallet salting to vault. | Dan Finlay | 2016-09-10 | 1 | -57/+43 |
| | | | | | | | | | | eth-lightwallet was previously not salting vault passwords, potentially making it easier to crack them once obtained. This branch incorporates the API changes to allow us to take advantage of the new salting logic. This is still throwing deprecation warnings, but that's actually a bug in eth-lightwallet I wrote, [I've submitted a PR for that here](https://github.com/ConsenSys/eth-lightwallet/pull/116). Fixes #555 | ||||
* | Only init one wallet on restore | Dan Finlay | 2016-09-09 | 1 | -1/+1 |
| | | | | Fixes #610 | ||||
* | linting | Vincent Serpoul | 2016-09-06 | 1 | -1/+1 |
| | |||||
* | Error message more helpful | Vincent Serpoul | 2016-09-06 | 1 | -2/+3 |
| | |||||
* | notif - use standard err-first callback style | kumavis | 2016-09-03 | 1 | -18/+24 |
| | |||||
* | Merge branch 'master' into i566-NoPopupWhenOpen | Dan Finlay | 2016-09-02 | 1 | -4/+18 |
|\ | |||||
| * | inpage - remap ids on response | kumavis | 2016-09-01 | 1 | -4/+18 |
| | | |||||
* | | Linted | Dan Finlay | 2016-09-02 | 1 | -1/+1 |
| | | |||||
* | | Do not open popup for internally produced txs | Dan Finlay | 2016-09-02 | 1 | -11/+19 |
|/ | |||||
* | Make popup a type Edge supports | Dan Finlay | 2016-08-30 | 1 | -1/+2 |
| | |||||
* | Add extra edge compatibility | Dan Finlay | 2016-08-30 | 1 | -2/+13 |
| | |||||
* | Merge branch 'master' into i#563forgotPassword | Frankie | 2016-08-26 | 3 | -139/+42 |
|\ | |||||
| * | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-25 | 1 | -2/+2 |
| |\ | |||||
| * | | Close notification on opening main UI | Dan Finlay | 2016-08-24 | 1 | -2/+9 |
| | | | |||||
| * | | Skip popup dismissal in tests | Dan Finlay | 2016-08-24 | 1 | -0/+6 |
| | | | |||||
| * | | Close popup even if last tx is dismissed from main UI | Dan Finlay | 2016-08-24 | 1 | -8/+14 |
| | | | |||||
| * | | Emit updates to all listeners on pending tx updates | Dan Finlay | 2016-08-24 | 1 | -15/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-23 | 2 | -2/+34 |
| |\ \ | |||||
| * | | | Limit to one popup, re-focus on additional notifications. | Dan Finlay | 2016-08-23 | 1 | -6/+17 |
| | | | | |||||
| * | | | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-23 | 2 | -0/+36 |
| |\ \ \ | |||||
| * | | | | Linted | Dan Finlay | 2016-08-17 | 1 | -15/+5 |
| | | | | | |||||
| * | | | | MVP Popup Notifications Working | Dan Finlay | 2016-08-17 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm unsure which will be more performant: A notification using a trimmed down version of the UI, or using them both, letting the browser cache them both. In any case, here I've modified the normal UI to recognize when it's a popup, and change the UX accordingly in a few ways: - Hide the menu bar - Hide the back button from the notifications view. - When confirming the last tx, close the window. | ||||
| * | | | | Unify notification and popup ui files | Dan Finlay | 2016-08-17 | 3 | -1/+15 |
| | | | | | |||||
| * | | | | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-17 | 2 | -0/+51 |
| |\ \ \ \ | |||||
| * | | | | | Set up MVP for popup-based notifications. | Dan Finlay | 2016-08-17 | 1 | -127/+9 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into i#563forgotPassword | Frankie | 2016-08-26 | 2 | -4/+36 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Implement usage of nock. | Kevin Serrano | 2016-08-25 | 1 | -22/+12 |
| | | | | | | |||||
| * | | | | | Added mock option to function. | Kevin Serrano | 2016-08-25 | 1 | -13/+23 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'master' into i390-TransactionLimit | kumavis | 2016-08-23 | 1 | -2/+28 |
| |\ \ \ \ | |||||
| | * | | | | inpage provider - reassign incomming ids | kumavis | 2016-08-23 | 1 | -2/+28 |
| | | |_|/ | | |/| | | |||||
| * | | | | Merge branch 'master' into i390-TransactionLimit | Dan Finlay | 2016-08-23 | 2 | -0/+36 |
| |\| | | | |||||
| * | | | | Enforce tx history limit | Dan Finlay | 2016-08-19 | 1 | -0/+6 |
| | |_|/ | |/| | | |||||
* | | | | Add a back button on lock screen to go back to init menu | Frankie | 2016-08-26 | 1 | -0/+5 |
| |/ / |/| | | |||||
* | | | Create a ShapeShift tx in tx History | Frankie | 2016-08-19 | 1 | -4/+6 |
| | | | |||||
* | | | Merge branch 'master' into shapeshiftTx | Frankie | 2016-08-19 | 2 | -0/+51 |
|\| | | |||||
| * | | Added compliance for tests and properly accounts for N/A conversions. | Kevin Serrano | 2016-08-17 | 1 | -3/+3 |
| | | | |||||
| * | | Add fallback to API failure. | Kevin Serrano | 2016-08-17 | 1 | -0/+2 |
| | | | |||||
| * | | Merge master. | Kevin Serrano | 2016-08-16 | 6 | -132/+18 |
| |\| | |||||
| * | | Get fiat numbers rendering on tooltip. Need to find way to create line breaks. | Kevin Serrano | 2016-08-06 | 1 | -6/+0 |
| | | | |||||
| * | | Merge branch 'master' into usd-conversion | Kevin Serrano | 2016-08-05 | 2 | -6/+23 |
| |\ \ | |||||
| * \ \ | Fix merge conflicts. Fix typos. Ensure currency immediately updated on load. | Kevin Serrano | 2016-07-23 | 2 | -0/+18 |
| |\ \ \ | |||||
| * | | | | Linting! | Kevin Serrano | 2016-07-23 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Change function names. Add interval polling for api. Refactor functions. | Kevin Serrano | 2016-07-22 | 1 | -7/+18 |
| | | | | | |||||
| * | | | | Add date access throughout the data flow. | Kevin Serrano | 2016-07-22 | 2 | -4/+5 |
| | | | | | |||||
| * | | | | Provide date access. | Kevin Serrano | 2016-07-22 | 1 | -1/+8 |
| | | | | | |||||
| * | | | | Merge branch 'master' into usd-conversion | Kevin Serrano | 2016-07-22 | 4 | -16/+77 |
| |\ \ \ \ | |||||
| * | | | | | Add data field to pass up parameters up to reducer. | Kevin Serrano | 2016-07-22 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | Progress on config manager. Plus tests. | Kevin Serrano | 2016-07-21 | 1 | -0/+27 |
| | | | | | | |||||
* | | | | | | WIP: ShapeShift tx | Frankie | 2016-08-19 | 2 | -0/+34 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Remove ethereum classic provider | Dan Finlay | 2016-08-15 | 1 | -5/+1 |
| | | | | | | | | | | | | | | | | | | | | Fixes #542 | ||||
* | | | | | deps - extracted ensnare to module | kumavis | 2016-08-13 | 2 | -25/+1 |
| | | | | | |||||
* | | | | | Add global var for background. | Kevin Serrano | 2016-08-12 | 1 | -3/+6 |
| | | | | | |||||
* | | | | | inpage-prov - sync error - fix link | kumavis | 2016-08-12 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | deps - local-message-stream extracted as module post-message-stream | kumavis | 2016-08-12 | 1 | -56/+0 |
| | | | | | |||||
* | | | | | clean -formatting | kumavis | 2016-08-12 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | inpage-provider - remove createSyncProvider, just fail | kumavis | 2016-08-12 | 1 | -40/+3 |
| | | | | | |||||
* | | | | | Fix ether warning checkbox. | Kevin Serrano | 2016-08-11 | 1 | -2/+6 |
| |_|_|/ |/| | | | |||||
* | | | | Merge branch 'master' into AddEthClassic | Dan Finlay | 2016-07-29 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fix broken reference to host store.didUpdate | Dan Finlay | 2016-07-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | I'd returned this line because it seemed to fix Firefox compatibility, now it seems like that wasn't the case. Removing it again. | ||||
* | | | | | Add eth classic to provider menu | Dan Finlay | 2016-07-29 | 1 | -0/+4 |
|/ / / / | |||||
* | | | | Add platform specific builds and zip tasks (#486) | Dan Finlay | 2016-07-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add platform specific folders to dist folder * Remove gulp hacks * Add platform specific bundling dev and dist tasks now build into platform-specific folders within the `dist` folder. Added tasks `gulp zip` and `gulp dist`. `zip` builds the platform-specific folders into platform-specific bundles within the `dist` folder. `dist` builds and then zips all at once. * Fix chrome bundle zipping * Fix broken reference in eth warning * Fix but where web3.eth.accounts are not available in firefox. * Bump changelog | ||||
* | | | | Fix integration tests | Dan Finlay | 2016-07-26 | 1 | -4/+19 |
| | | | | |||||
* | | | | Fix extension tests | Dan Finlay | 2016-07-26 | 1 | -1/+4 |
| | | | | |||||
* | | | | Clean up extension polyfill abstraction | Dan Finlay | 2016-07-26 | 1 | -6/+1 |
| |_|/ |/| | | |||||
* | | | Buy button (#474) | Frankie | 2016-07-22 | 2 | -1/+12 |
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 Finlay | 2016-07-22 | 3 | -15/+68 |
| | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | Make injected web3 fail hard on sync methods (#471) | Dan Finlay | 2016-07-21 | 1 | -1/+9 |
|/ | | | Make injected web3 fail hard on sync methods | ||||
* | new tx - calculate estimatedGas and show thing in tx-details (#441) | kumavis | 2016-07-14 | 1 | -17/+37 |
| | | | | | | * new tx - calculate estimatedGas and show thing in tx-details * Bump changelog | ||||
* | Add one wallet to new accounts instead of three. | Kevin Serrano | 2016-07-13 | 1 | -1/+1 |
| | |||||
* | Linted | Dan Finlay | 2016-07-12 | 1 | -12/+9 |
| | |||||
* | Add notification global for development | Dan Finlay | 2016-07-12 | 1 | -1/+3 |
| | | | | The background process now has a global `METAMASK_NOTIFIER` object that allows easy mocking of notification data. | ||||
* | Remove useless and buggy clearWallet function | Dan Finlay | 2016-07-01 | 2 | -5/+0 |
| | |||||
* | Emphasizing how weird this bug is by removing all behavior from the method. | Dan Finlay | 2016-07-01 | 1 | -5/+1 |
| | |||||
* | Replicated really strange bug with test | Dan Finlay | 2016-07-01 | 1 | -1/+1 |
| | |||||
* | Unify wording for transaction options (#369) | Kevin Serrano | 2016-06-30 | 1 | -2/+2 |
| | | | | | | | | * Unify wording for transaction options. * Modify changelog. * Fix wording and spacing. | ||||
* | fix bad merge | kumavis | 2016-06-29 | 1 | -6/+1 |
| | |||||
* | Merge branch 'master' into notif2 | kumavis | 2016-06-29 | 1 | -1/+6 |
|\ | |||||
| * | Merge branch 'master' into FixSomeFormatting | kumavis | 2016-06-29 | 1 | -1/+6 |
| |\ | | | | | | | | | | | | | | | | # Conflicts: # CHANGELOG.md # app/scripts/lib/notifications.js | ||||
| | * | fix #341 close notifications when oppening pop up | Frankie | 2016-06-29 | 1 | -2/+2 |
| | | | |||||
* | | | background - prepare state for notifcations | kumavis | 2016-06-29 | 1 | -36/+4 |
|/ / | |||||
* / | notif - change size for better readability | kumavis | 2016-06-28 | 1 | -3/+3 |
|/ | |||||
* | Merge pull request #326 from MetaMask/conf-tx-refactor | kumavis | 2016-06-25 | 1 | -49/+77 |
|\ | | | | | Tx/Msg Conf page + notifcation refactor | ||||
| * | clean - appease the linting machine | kumavis | 2016-06-25 | 1 | -1/+0 |
| | | |||||
| * | svg notif now work for msg signatures | kumavis | 2016-06-25 | 1 | -47/+77 |
| | | |||||
| * | breakout pending-tx-details | kumavis | 2016-06-25 | 1 | -4/+3 |
| | | |||||
* | | Fixed tests | Dan Finlay | 2016-06-25 | 2 | -3/+5 |
| | | |||||
* | | Improve refactor | Dan Finlay | 2016-06-25 | 4 | -62/+27 |
|/ | | | | | | Replace config-manager-singleton with one that is instantiated within the `background-controller`, and takes its persistence callbacks from its instantiated options. Replaced class getters with more familiar get___() functions. | ||||
* | some legit linting fixes | kumavis | 2016-06-24 | 1 | -0/+1 |
| | |||||
* | svg notif - use actual txParams | kumavis | 2016-06-24 | 1 | -15/+5 |
| | |||||
* | tx-conf add non-interactive mode for notification | kumavis | 2016-06-24 | 1 | -0/+1 |
| | |||||
* | svg notifications - remove unneeded deps and clean code | kumavis | 2016-06-24 | 1 | -50/+31 |
| | |||||
* | initial svg notifications | kumavis | 2016-06-23 | 1 | -16/+101 |
| | |||||
* | Fix eth sign with dennis' test input | Dan Finlay | 2016-06-22 | 1 | -6/+8 |
| | |||||
* | Manually linted | Dan Finlay | 2016-06-22 | 3 | -21/+12 |
| | |||||
* | Merge branch 'master' of github.com:MetaMask/metamask-plugin into AutoLint | Dan Finlay | 2016-06-22 | 1 | -0/+2 |
|\ | |||||
| * | id-mgmt - add missing deps | kumavis | 2016-06-21 | 1 | -0/+3 |
| | | |||||
* | | Auto linted | Dan Finlay | 2016-06-22 | 14 | -238/+217 |
|/ | |||||
* | Merge pull request #294 from MetaMask/SignFullDataNotHash | Dan Finlay | 2016-06-21 | 2 | -76/+77 |
|\ | | | | | Sign full data not hash | ||||
| * | Merge branch 'master' into SignFullDataNotHash | Dan Finlay | 2016-06-17 | 2 | -0/+12 |
| |\ | |||||
| * | | Fixed signing of hashes | Dan Finlay | 2016-06-17 | 1 | -13/+10 |
| | | | | | | | | | | | | | | | | | | Signing now always takes a 64 digit hex string, and returns a message signature which appropriately pads r, s, and v with zeroes. Need to verify with Denis that this is the behavior he requires. | ||||
| * | | Factor idManagement into its own module | Dan Finlay | 2016-06-16 | 2 | -76/+80 |
| | | | |||||
| * | | Sign binary data not hash on eth_sign | Dan Finlay | 2016-06-16 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #296 from MetaMask/i252 | Dan Finlay | 2016-06-18 | 1 | -9/+35 |
|\ \ \ | |_|/ |/| | | idStore - add DELEGATE_CALL detection | ||||
| * | | idStore - add DELEGATE_CALL detection | kumavis | 2016-06-17 | 1 | -9/+35 |
| |/ | |||||
* | | Add confirmation status to metamask state branch | Dan Finlay | 2016-06-17 | 1 | -0/+1 |
| | | |||||
* | | Add confirmation persisting to localStorage | Dan Finlay | 2016-06-17 | 1 | -0/+11 |
|/ | |||||
* | Fix pad with zeroes usage | Dan Finlay | 2016-06-15 | 1 | -2/+2 |
| | |||||
* | Fix signature concatenation | Dan Finlay | 2016-06-15 | 1 | -2/+9 |
| | | | | | | Fixes #280 Or at least, it should. Is this what you were requesting, @denisgranha? | ||||
* | Merge branch 'master' into display_network | Dan Finlay | 2016-06-04 | 2 | -16/+38 |
|\ | |||||
| * | Merge pull request #241 from MetaMask/i236 | kumavis | 2016-06-03 | 1 | -16/+22 |
| |\ | | | | | | | fix illegal return statement :( | ||||
| | * | fix illegal return statement :( | kumavis | 2016-06-03 | 1 | -16/+22 |
| | | | |||||
| * | | Merge pull request #240 from MetaMask/RecoverSeed | kumavis | 2016-06-03 | 1 | -2/+9 |
| |\ \ | | |/ | |/| | reveal Vault Recovery Seed | ||||
| | * | Add login check | Dan Finlay | 2016-06-03 | 1 | -1/+1 |
| | | | |||||
| | * | Added seed word recovery to config screen | Dan Finlay | 2016-06-03 | 1 | -2/+9 |
| | | |