Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into Version-3.1.0 | Dan Finlay | 2017-01-19 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'master' into fixSignedVsSubmitted | Frankie | 2017-01-19 | 2 | -4/+7 |
| |\ | |||||
| * | | Fix the dissplay for submitted transactions and the listner wating to hear ↵ | Frankie | 2017-01-19 | 1 | -1/+1 |
| | | | | | | | | | | | | when tx's were included in a block | ||||
* | | | Version 3.1.0 | Dan Finlay | 2017-01-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'dev' into i715-AddImportMenu | kumavis | 2017-01-19 | 1 | -6/+5 |
|\ \ \ | |||||
| * | | | tx-manager - use rpc-specified txHash | kumavis | 2017-01-19 | 1 | -6/+5 |
| | | | | |||||
* | | | | Allow importing of private key strings | Dan Finlay | 2017-01-18 | 3 | -8/+22 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | Fixes #1021 A top-right menu item now allows `Account Import`. It has a menu (with one item for now) that allows importing a private key string. Errors are displayed, and a success navigates the user to their account list, where the imported account is labeled `LOOSE`. | ||||
* | | | Merge branch 'dev' into conversion-api-err | Dan Finlay | 2017-01-18 | 10 | -131/+250 |
|\ \ \ | |||||
| * | | | Version 3.0.1 | Dan Finlay | 2017-01-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix bug where signed messages were not dismissed | Dan Finlay | 2017-01-17 | 1 | -0/+1 |
| | | | | |||||
| * | | | Fix removeHexPrefix to stripHexPrefix | Dan Finlay | 2017-01-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | Wrote fix for eth.sign | Dan Finlay | 2017-01-17 | 1 | -2/+1 |
| | |/ | |/| | |||||
| * | | Fix manifest version | Dan Finlay | 2017-01-17 | 1 | -1/+1 |
| | | | |||||
| * | | Version 3.0.0 | Dan Finlay | 2017-01-17 | 1 | -1/+1 |
| | | | |||||
| * | | keyring - simple - throw error if wallet not found for address | kumavis | 2017-01-17 | 1 | -1/+4 |
| | | | |||||
| * | | keyring - simple - fix address generation | kumavis | 2017-01-17 | 1 | -3/+3 |
| |/ | |||||
| * | eth-store - emit update on new account add | kumavis | 2017-01-15 | 1 | -1/+3 |
| | | |||||
| * | background - txManager - filter txs by network | kumavis | 2017-01-15 | 2 | -4/+6 |
| | | |||||
| * | background - return txHash to provider-engine on done | kumavis | 2017-01-15 | 2 | -14/+13 |
| | | |||||
| * | Fix the inclusion of the txFee in the meta tx object | Frankie | 2017-01-15 | 1 | -3/+5 |
| | | |||||
| * | fix for linting | Frankie | 2017-01-14 | 1 | -0/+1 |
| | | |||||
| * | Satisfy review needs: | Frankie | 2017-01-14 | 2 | -21/+23 |
| | | | | | | | | | | | | | | 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 | ||||
| * | fix the maxcost not being included in txMeta | Frankie | 2017-01-14 | 1 | -3/+7 |
| | | |||||
| * | Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin into ↵ | kumavis | 2017-01-14 | 4 | -13/+38 |
| |\ | | | | | | | | | | bug-submitTx | ||||
| | * | Merge branch 'dev' into bug-submitTx | kumavis | 2017-01-14 | 4 | -13/+38 |
| | |\ | |||||
| | | * | Merge branch 'dev' into integrateTxManagerUI | Frankie | 2017-01-14 | 1 | -2/+2 |
| | | |\ | |||||
| | | * | | Clean up code | Frankie | 2017-01-14 | 1 | -1/+2 |
| | | | | | |||||
| | | * | | Merge branch 'dev' into integrateTxManagerUI | Frankie | 2017-01-12 | 1 | -1/+1 |
| | | |\ \ | |||||
| | | * | | | Fix wording and icon of failed txs | Frankie | 2017-01-12 | 2 | -15/+16 |
| | | | | | | |||||
| | | * | | | Add to CHANGELOG | Frankie | 2017-01-12 | 1 | -2/+8 |
| | | | | | | |||||
| | | * | | | Merge branch 'dev' into integrateTxManagerUI | Frankie | 2017-01-12 | 3 | -36/+11 |
| | | |\ \ \ | |||||
| | | * | | | | Take some of the tx Logic out of the UI and create a visble state for ↵ | Frankie | 2017-01-12 | 4 | -9/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | pending and unaproved transactions | ||||
| * | | | | | | background - metamask controller - fix 'this' ref | kumavis | 2017-01-14 | 1 | -7/+8 |
| |/ / / / / | |||||
| * | | | / | background - handle tx finalization in controllers instead of provider-engine | kumavis | 2017-01-13 | 4 | -108/+186 |
| | |_|_|/ | |/| | | | |||||
| * | | | | bugfix - portstream - dont wrap cb in try catch | kumavis | 2017-01-12 | 1 | -2/+2 |
| | |_|/ | |/| | | |||||
| * | | | Send update to UI when changing selected account | Dan Finlay | 2017-01-12 | 1 | -1/+1 |
| | |/ | |/| | | | | | | | Fixes #981 | ||||
* / | | currency conversion - less noisy error | kumavis | 2017-01-12 | 1 | -1/+1 |
|/ / | |||||
* | | rpc - fix sync account cache setting | kumavis | 2017-01-11 | 1 | -17/+1 |
| | | |||||
* | | web3 provider - override eth_syncing and web3_clientVersion | kumavis | 2017-01-11 | 1 | -0/+5 |
| | | |||||
* | | 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 |
|/ | |||||
* | Merge branch 'dev' into TearDownOnDisconnect | kumavis | 2017-01-06 | 3 | -31/+33 |
|\ | |||||
| * | Merge branch 'dev' into fixTxManager | Dan Finlay | 2017-01-06 | 2 | -1/+145 |
| |\ | |||||
| * | | Combine two identical then blocks | Dan Finlay | 2017-01-06 | 1 | -4/+2 |
| | | | |||||
| * | | remove unnecessary try statments | Frankie | 2017-01-05 | 3 | -37/+24 |
| | | | |||||
| * | | clean up | Frankie | 2017-01-05 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'dev' into fixtTxManager | Frankie | 2017-01-05 | 4 | -37/+68 |
| |\ \ | |||||
| * | | | Fix signing of transactions | Frankie | 2017-01-05 | 3 | -46/+62 |
| | | | | |||||
* | | | | Merge branch 'dev' into TearDownOnDisconnect | kumavis | 2017-01-06 | 2 | -1/+145 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | 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. | ||||
| * | | | Fix dependency reference | Dan Finlay | 2017-01-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | 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 |
| | |/ | |/| | |||||
* / | | MetaMask Controller - Convert to EventEmitter | Frankie | 2017-01-06 | 2 | -12/+8 |
|/ / | |||||
* | | Merge branch 'dev' of github.com:MetaMask/metamask-plugin into dev | Kevin Serrano | 2017-01-04 | 1 | -2/+8 |
|\ \ | |||||
| * | | Fix sendUpdate for new promisified getState method | Dan Finlay | 2017-01-04 | 1 | -2/+6 |
| | | | |||||
| * | | Update UI state on ethStore updates | Dan Finlay | 2017-01-04 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | UI was remarkably not relying on ethStore for updates, so things like account balances were frozen until user activity. Fixes #963 | ||||
* | | | Take out unneeded permissions from the app. | Kevin Serrano | 2017-01-04 | 1 | -2/+0 |
|/ / | |||||
* | | Make single letter variables more verbose | Dan Finlay | 2017-01-03 | 2 | -5/+5 |
| | | |||||
* | | Merge branch 'dev' into ShowDifferentAccounts | Dan Finlay | 2017-01-03 | 8 | -519/+421 |
|\| | |||||
| * | 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 | 6 | -53/+94 |
| |\ | |||||
| * | | fix some minor spelling mistakes and clean up code | Frankie | 2016-12-24 | 3 | -28/+26 |
| | | | |||||
| * | | fix merge | Frances Pangilinan | 2016-12-22 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'dev' into TxManager | Frankie | 2016-12-22 | 10 | -192/+191 |
| |\ \ | |||||
| * | | | Remove txManager in keyring controller | Frances Pangilinan | 2016-12-22 | 1 | -2/+0 |
| | | | | |||||
| * | | | Migrate all tx mutation code out of keyring controller and | Frances Pangilinan | 2016-12-22 | 4 | -54/+71 |
| | | | | | | | | | | | | | | | | Fix up txManager to reflect code review requests | ||||
| * | | | First pass at revision requests | Frances Pangilinan | 2016-12-22 | 7 | -511/+184 |
| | | | | |||||
| * | | | Clean up and comment functions | Frances Pangilinan | 2016-12-15 | 2 | -10/+31 |
| | | | | |||||
| * | | | Create a TxManager | Frances Pangilinan | 2016-12-15 | 7 | -159/+350 |
| | | | | |||||
* | | | | Add tolerance for hex prefixed private keys to simple keychain | Dan Finlay | 2017-01-03 | 1 | -3/+4 |
| | | | | |||||
* | | | | Merge branch 'FixMigrationPasswordBug' into ShowDifferentAccounts | Dan Finlay | 2016-12-24 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Add additional migration test | Dan Finlay | 2016-12-24 | 1 | -2/+2 |
| | |_|/ | |/| | | |||||
* / | | | Return keyring metadata on metamask state object | Dan Finlay | 2016-12-23 | 2 | -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 log | Dan Finlay | 2016-12-23 | 1 | -1/+0 |
| | | | |||||
* | | | Merge pull request #948 from MetaMask/RecoverLostAccounts | Dan Finlay | 2016-12-23 | 5 | -51/+92 |
|\ \ \ | | | | | | | | | Auto-Recover accounts lost to BIP44 derivation fix | ||||
| * | | | Break up migration function | Dan Finlay | 2016-12-23 | 1 | -24/+24 |
| | | | | |||||
| * | | | Don't bother changing selected accounts since accounts are recovered | Dan Finlay | 2016-12-23 | 1 | -13/+3 |
| | | | | |||||
| * | | | Remove logs | Dan Finlay | 2016-12-23 | 1 | -2/+2 |
| | | | | |||||
| * | | | Linted | Dan Finlay | 2016-12-22 | 1 | -4/+3 |
| | | | | |||||
| * | | | Restructured migration | Dan Finlay | 2016-12-22 | 3 | -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 uninitialized | Dan Finlay | 2016-12-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Added error when trying to unlock uninitialized vault | Dan Finlay | 2016-12-22 | 1 | -0/+4 |
| | | | | |||||
| * | | | Move old keystore migration code to metamask controller | Dan Finlay | 2016-12-22 | 2 | -46/+50 |
| | | | | | | | | | | | | | | | | Allows keyring controller to be more generic, less opinionated, and who knows, maybe sooner publishable as its own thing. | ||||
| * | | | Make notices confirmation configurable | Dan Finlay | 2016-12-21 | 2 | -2/+16 |
| | | | | | | | | | | | | | | | | - Confirm button will now dismiss the lost accounts array. | ||||
* | | | | 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 | ||||
* | | | Lint. | Kevin Serrano | 2016-12-21 | 1 | -11/+11 |
|/ / | |||||
* | | Merge pull request #916 from MetaMask/i894-DetectBadAccounts | Dan Finlay | 2016-12-21 | 4 | -16/+57 |
|\ \ | | | | | | | I894 detect bad accounts | ||||
| * | | Made changes according to feedback. | Dan Finlay | 2016-12-20 | 3 | -13/+12 |
| | | | |||||
| * | | Got bad account detection working and added to state | Dan Finlay | 2016-12-10 | 3 | -31/+8 |
| | | | |||||
| * | | Mostly added bad account detection | Dan Finlay | 2016-12-09 | 4 | -9/+74 |
| |/ | | | | | | | Currently riddled with logs, because the migrator is inexplicably returning before generating the new style accounts for comparison. | ||||
* | | Merge pull request #939 from MetaMask/BrowserPassworder | Dan Finlay | 2016-12-21 | 2 | -157/+2 |
|\ \ | | | | | | | Remove encryptor in favor of external browser-passworder | ||||
| * | | Remove encryptor in favor of external browser-passworder | Dan Finlay | 2016-12-20 | 2 | -157/+2 |
| | | | | | | | | | | | | I broke out the encryptor lib into its own module on npm called browser-passworder. | ||||
* | | | Merge pull request #942 from MetaMask/Version-2.14.1 | Dan Finlay | 2016-12-21 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Version 2.14.1 | ||||
| * | | Version 2.14.12.14.1 | Dan Finlay | 2016-12-21 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #937 from MetaMask/i900-forgot-password-flow | Dan Finlay | 2016-12-20 | 2 | -4/+3 |
|\ \ \ | | | | | | | | | I900 forgot password flow | ||||
| * | | | Lint. | Kevin Serrano | 2016-12-20 | 2 | -4/+3 |
| | |/ | |/| | |||||
* | | | Merged master into dev | Dan Finlay | 2016-12-20 | 5 | -20/+132 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | changelog - inf reload detection hotfix | kumavis | 2016-12-20 | 1 | -1/+1 |
| | | |||||
| * | inpage - temporarily disable ping stream | kumavis | 2016-12-20 | 1 | -8/+9 |
| | | |||||
| * | move notice code from metamask-controller + config-manager, in to ↵ | kumavis | 2016-12-17 | 3 | -111/+98 |
| | | | | | | | | notice-controller | ||||
| * | Deactivate polling for now. | Kevin Serrano | 2016-12-17 | 1 | -1/+3 |
| | | |||||
| * | Cleanup | Dan Finlay | 2016-12-17 | 1 | -3/+0 |
| | | |||||
| * | Add ability to show notices to user & get confirmation. | Kevin Serrano | 2016-12-17 | 1 | -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 Serrano | 2016-12-17 | 3 | -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 provider | Dan Finlay | 2016-12-16 | 1 | -2/+1 |
| | | | | | | | | Instances configured to point at Morden will now point at Ropsten. | ||||
| * | inpage - correctly listen for incomming messages | kumavis | 2016-12-08 | 1 | -1/+1 |
| | | |||||
| * | Version 2.13.112.13.11 | Dan Finlay | 2016-11-24 | 1 | -1/+1 |
| | | |||||
* | | Remove redundant logging block | Dan Finlay | 2016-12-02 | 1 | -3/+0 |
| | | |||||
* | | Fix vault encrypting & unlocking bug | Dan Finlay | 2016-12-01 | 2 | -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 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. ``` | ||||
* | | Return promise correctly from setSelectedAddress | Dan Finlay | 2016-11-30 | 1 | -1/+1 |
| | | |||||
* | | Flattened addTx async methods | Dan Finlay | 2016-11-30 | 1 | -89/+82 |
| | | |||||
* | | Bind ethQuery to estimateGas to allow it to be moved around. | Dan Finlay | 2016-11-30 | 1 | -2/+2 |
| | | |||||
* | | Fix tx adding code | Dan Finlay | 2016-11-30 | 1 | -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-controller | Dan Finlay | 2016-11-30 | 2 | -5/+9 |
| | | |||||
* | | Annotated KeyringController | Dan Finlay | 2016-11-30 | 1 | -219/+496 |
| | | |||||
* | | Fix nodeify usage | Dan Finlay | 2016-11-29 | 1 | -11/+11 |
| | | |||||
* | | Fix nodeify | Dan Finlay | 2016-11-29 | 1 | -55/+13 |
| | | |||||
* | | Denodeify most of KeyringController | Dan Finlay | 2016-11-29 | 3 | -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 dev | Dan Finlay | 2016-11-24 | 3 | -23/+56 |
|\| | |||||
| * | rpc - add sync uninstallFilter support | kumavis | 2016-11-24 | 1 | -0/+7 |
| | | |||||
| * | Version 2.13.102.13.10 | Dan Finlay | 2016-11-23 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' into i868-estimateGasTooHigh | kumavis | 2016-11-23 | 1 | -1/+1 |
| |\ | |||||
| | * | Ropsten has sole access to the faucet. | Kevin Serrano | 2016-11-23 | 1 | -1/+1 |
| | | | |||||
| | * | Add to changelog. | Kevin Serrano | 2016-11-23 | 1 | -1/+1 |
| | | | |||||
| * | | idStore - fix estimateGas calculation | kumavis | 2016-11-23 | 1 | -22/+48 |
| |/ | |||||
| * | Version 2.13.92.13.9 | Dan Finlay | 2016-11-22 | 1 | -1/+1 |
| | | |||||
* | | Fix more async usage of KeyringController | Dan Finlay | 2016-11-24 | 1 | -25/+32 |
| | | |||||
* | | Fix more keyring asyncifying tests | Dan Finlay | 2016-11-24 | 1 | -2/+3 |
| | | |||||
* | | Mostly got async keyringController tests passing | Dan Finlay | 2016-11-23 | 1 | -7/+9 |
| | | |||||
* | | Complete first pass at asyncrhonizing keyring controller | Dan Finlay | 2016-11-23 | 1 | -31/+53 |
| | | |||||
* | | Asynced keyrings and started on controller | Dan Finlay | 2016-11-23 | 3 | -32/+47 |
| | | |||||
* | | Fix new encryptor migration logic | Dan Finlay | 2016-11-23 | 2 | -3/+2 |
| | | |||||
* | | Fix password reference | Dan Finlay | 2016-11-23 | 1 | -1/+2 |
| | | |||||
* | | Remove line of cruft | Dan Finlay | 2016-11-23 | 1 | -1/+0 |
| | | |||||
* | | Refine isInitialized derivation method | Dan Finlay | 2016-11-23 | 1 | -1/+1 |
| | | |||||
* | | Simplify Encryptor API Surface | Dan Finlay | 2016-11-23 | 2 | -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-MoveSaltIntoEncryptor | Dan Finlay | 2016-11-23 | 9 | -74/+157 |
|\ \ | |||||
| * \ | Merge pull request #875 from MetaMask/i868-estimateGasTooHigh-dev | Dan Finlay | 2016-11-23 | 1 | -5/+61 |
| |\ \ | | | | | | | | | I868 estimate gas too high dev | ||||
| | * | | KeyringController - estimateGas->analyzeGasUsage fix gasLimit + detect OOG | kumavis | 2016-11-23 | 1 | -5/+61 |
| | | | | |||||
| * | | | Merge pull request #858 from MetaMask/i842-WaitForSeedWord | kumavis | 2016-11-23 | 1 | -1/+6 |
| |\ \ \ | | |/ / | |/| | | I842 wait for seed word | ||||
| | * | | Move state update outside of conditional callback block | Dan Finlay | 2016-11-23 | 1 | -1/+1 |
| | | | | |||||
| | * | | Remove callback type check | Dan Finlay | 2016-11-23 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'dev' into i842-WaitForSeedWord | Dan Finlay | 2016-11-23 | 4 | -37/+57 |
| | |\ \ | |||||
| | * | | | Use callback in placeSeedWord method. | Dan Finlay | 2016-11-22 | 1 | -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-RenameMethod | kumavis | 2016-11-23 | 2 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | | | Rename idStoreMigrator method for clarity | ||||
| | * | | | | Rename idStoreMigrator method for clarity | Dan Finlay | 2016-11-22 | 2 | -2/+2 |
| | |/ / / | | | | | | | | | | | | | | | | Fixes #841 | ||||
| * | | | | Merge pull request #869 from MetaMask/dev-cleanup | kumavis | 2016-11-23 | 5 | -23/+27 |
| |\ \ \ \ | | | | | | | | | | | | | Dev Cleanup Package | ||||
| | * \ \ \ | Merge branch 'dev' into dev-cleanup | Kevin Serrano | 2016-11-23 | 4 | -37/+57 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | * | | | | Change fauceting to become a response of an emit. | Kevin Serrano | 2016-11-22 | 2 | -2/+7 |
| | | | | | | |||||
| | * | | | | change all instances of selectedAddress to selectedAccount. | Kevin Serrano | 2016-11-22 | 4 | -13/+12 |
| | | | | | | |||||
| | * | | | | Remove entropy from encryption and project. | Kevin Serrano | 2016-11-22 | 2 | -8/+8 |
| | | |/ / | | |/| | | |||||
| * | | | | Phase out ethereumjs-util from encryptor module. | Kevin Serrano | 2016-11-23 | 1 | -6/+4 |
| | |/ / | |/| | | |||||
| * | | | Merge pull request #866 from MetaMask/new-faucet-dev | Dan Finlay | 2016-11-23 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | Make ropsten faucet button point at the correct url. | ||||
| | * | | | Make ropsten faucet button point at the correct url. | Kevin Serrano | 2016-11-23 | 1 | -1/+1 |
| | |/ / | |||||
| * / / | Improve Keyring organization | Dan Finlay | 2016-11-22 | 3 | -36/+56 |
| |/ / | | | | | | | | | | | | | Separated public & private methods. (Fixes #845) Made class method `type()` into a simple property. (Fixes #846) | ||||
* / / | Began moving salt into encryptor | Dan Finlay | 2016-11-23 | 1 | -5/+10 |
|/ / | |||||
* | | Merge branch 'dev' into i831-AddRopsten-Dev | Dan Finlay | 2016-11-22 | 20 | -145/+1135 |
|\ \ | |/ |/| | |||||
| * | Maintain linting. | Kevin Serrano | 2016-11-19 | 2 | -3/+3 |
| | | |||||
| * | Promisify persistence of keyrings before returning key | Kevin Serrano | 2016-11-19 | 1 | -5/+5 |
| | | | | | | | | Change single letter variables (shame) | ||||
| * | Update migration code for new hd wallet param name | Dan Finlay | 2016-11-19 | 1 | -2/+2 |
| | | |||||
| * | Persist keyrings from migration to storage. | Kevin Serrano | 2016-11-19 | 1 | -1/+1 |
| | | |||||
| * | Resolve merge conflict. | Kevin Serrano | 2016-11-19 | 20 | -142/+1132 |
| |\ | |||||
| | * | 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 | 18 | -174/+158 |
| | |\ | | | | | | | | | | | | | i328-MultiVault | ||||
| | | * | Revert one cb to previous state. | Kevin Serrano | 2016-11-16 | 1 | -1/+1 |
| | | | | |||||
| | | * | Minimize dispatches by using emitters and relying on state updates. | Kevin Serrano | 2016-11-16 | 1 | -7/+6 |
| | | | | |||||
| | | * | 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 | 2 | -5/+4 |
| | | |\ | |||||
| | | * \ | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2016-11-16 | 1 | -0/+2 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | i328-MultiVault | ||||
| | | | * | | Minimize repeated code. | Kevin Serrano | 2016-11-16 | 1 | -5/+6 |
| | | | | | | |||||
| | | * | | | Minimize repeated code. | Kevin Serrano | 2016-11-16 | 1 | -7/+6 |
| | | |/ / | |||||
| | | * | | Re-enable disclaimer screen. Rename variables to reflect role more clearly. | Kevin Serrano | 2016-11-15 | 4 | -8/+8 |
| | | | | | |||||
| | | * | | Revert to previous anonymous function for promise. | Kevin Serrano | 2016-11-12 | 1 | -1/+3 |
| | | | | | |||||
| | | * | | Various keyring changes | Kevin Serrano | 2016-11-12 | 1 | -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 Serrano | 2016-11-12 | 1 | -11/+8 |
| | | | | | | | | | | | | | | | | | | | | headers. | ||||
| | | * | | Package normalize inside sig util file. | Kevin Serrano | 2016-11-12 | 1 | -0/+5 |
| | | | | | |||||
| | | * | | Linting to the max. | Kevin Serrano | 2016-11-12 | 16 | -126/+93 |
| | | | | | |||||
| | | * | | Merge branch 'master' into i328-MultiVault | kumavis | 2016-11-11 | 1 | -2/+16 |
| | | |\ \ | |||||
| | | * | | | fix tx data so it has the network id | Frankie | 2016-11-11 | 2 | -2/+9 |
| | | | | | | |||||
| | | * | | | Merge branch 'master' into i328-MultiVault | Frankie | 2016-11-11 | 3 | -3/+4 |
| | | |\ \ \ | |||||
| | * | | | | | Replace old random-id code with incrementing id generator | Dan Finlay | 2016-11-18 | 3 | -11/+12 |
| | |/ / / / | |||||
| | * | | | | Merge branch 'master' into i328-MultiVault | Dan Finlay | 2016-11-08 | 1 | -5/+5 |
| | |\ \ \ \ | |||||
| | * | | | | | Fix 787 gas buffer bug | Dan Finlay | 2016-11-08 | 1 | -5/+5 |
| | | | | | | | |||||
| | * | | | | | Fix network checking | Dan Finlay | 2016-11-05 | 1 | -21/+1 |
| | | | | | | | |||||
| | * | | | | | Add tolerance to normalize method | Dan Finlay | 2016-11-04 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | Fix password validation and persistence issue | Dan Finlay | 2016-11-04 | 2 | -4/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was wiping the vault on each successful password attempt... :P | ||||
| | * | | | | | Implement private key exporting. | Kevin Serrano | 2016-11-04 | 2 | -3/+22 |
| | | | | | | | |||||
| | * | | | | | Finish fixing nicknaming bug | Dan Finlay | 2016-11-04 | 1 | -28/+39 |
| | | | | | | | |||||
| | * | | | | | Fix account nicknaming bug | Dan Finlay | 2016-11-04 | 2 | -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 bug | Dan Finlay | 2016-11-04 | 1 | -17/+13 |
| | | | | | | | |||||
| | * | | | | | 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 dual vault creation bug | Dan Finlay | 2016-11-03 | 1 | -11/+4 |
| | | | | | | | |||||
| | * | | | | | Fix initial vault creation | Dan Finlay | 2016-11-03 | 1 | -4/+8 |
| | | | | | | | |||||
| | * | | | | | Fix handling of migrating old vault style | Dan Finlay | 2016-11-03 | 3 | -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 Serrano | 2016-11-02 | 2 | -2/+9 |
| | | | | | | | |||||
| | * | | | | | Fixed bugs related to clearing caches when restoring to a new vault | Dan Finlay | 2016-11-02 | 3 | -10/+48 |
| | | | | | | | |||||
| | * | | | | | Fix seed phrase restore | Dan Finlay | 2016-11-02 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Made progress on parity for MultiVault | Kevin Serrano | 2016-11-02 | 4 | -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 Serrano | 2016-11-02 | 1 | -1/+2 |
| | | | | | | | |||||
| | * | | | | | Implement seed word confirmation page. | Kevin Serrano | 2016-11-01 | 4 | -10/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove logs. Move HD render files to ui/app. | ||||
| | * | | | | | Implement auto-fauceting | Kevin Serrano | 2016-11-01 | 1 | -1/+6 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2016-10-31 | 3 | -6/+79 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | i328-MultiVault | ||||
| | | * | | | | | Now migrating old vaults to new DEN format | Dan Finlay | 2016-10-29 | 3 | -6/+79 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2016-10-29 | 3 | -7/+111 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i328-MultiVault | ||||
| | | * | | | | | Configure BIP44 Keychain as default one | Dan Finlay | 2016-10-29 | 2 | -7/+25 |
| | | | | | | | | |||||
| | | * | | | | | Added hd wallet tests | Dan Finlay | 2016-10-28 | 1 | -4/+12 |
| | | | | | | | | |||||
| | | * | | | | | Add hd wallet keyring | Dan Finlay | 2016-10-28 | 1 | -0/+78 |
| | | | | | | | | |||||
| | | * | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵ | Dan Finlay | 2016-10-26 | 4 | -27/+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 | 2 | -12/+17 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Phase out extra warning screen. | Kevin Serrano | 2016-10-26 | 4 | -27/+0 |
| | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Fix loading indication | Dan Finlay | 2016-10-22 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Added tx & msg managing functionality to new KeyringController | Dan Finlay | 2016-10-22 | 2 | -1/+150 |
| | | | | | | | | | |||||
| | * | | | | | | | Fix bug in new KeyringController vault restoring logic. | Dan Finlay | 2016-10-22 | 1 | -3/+5 |
| | | | | | | | | | |||||
| | * | | | | | | | Create basic keyring-controller unit test file | Dan Finlay | 2016-10-22 | 2 | -12/+16 |
| | | | | | | | | | |||||
| | * | | | | | | | Added SimpleKeyring tests | Dan Finlay | 2016-10-22 | 3 | -18/+27 |
| | | | | | | | | | |||||
| | * | | | | | | | Added tx and msg signing to keychain & controller | Dan Finlay | 2016-10-21 | 4 | -39/+134 |
| | | | | | | | | | |||||
| | * | | | | | | | Improved simple account generation | Dan Finlay | 2016-10-21 | 2 | -34/+51 |
| | | | | | | | | | |||||
| | * | | | | | | | Began adding first basic keyring | Dan Finlay | 2016-10-21 | 4 | -9/+146 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'master' into i328-MultiVault | Dan Finlay | 2016-10-21 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix tests | Dan Finlay | 2016-10-21 | 2 | -7/+9 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Linted & added salting to vault | Dan Finlay | 2016-10-21 | 3 | -35/+26 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fix state updating after vault creation and unlocking | Dan Finlay | 2016-10-21 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fix unlock logic | Dan Finlay | 2016-10-21 | 1 | -6/+17 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Git merge resolution. | Kevin Serrano | 2016-10-20 | 7 | -5/+57 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Intermediary commit. | Kevin Serrano | 2016-10-20 | 2 | -4/+44 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Remove unused crypto dependencies. | Kevin Serrano | 2016-10-20 | 1 | -2/+0 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge in crypto. | Kevin Serrano | 2016-10-20 | 1 | -0/+119 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Initial work on UI side | Kevin Serrano | 2016-10-16 | 2 | -0/+26 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2016-10-13 | 2 | -13/+133 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | origin/i328-MultiVault | ||||
| | | * | | | | | | | | | Add minimal method signatures to new keyring controller | Dan Finlay | 2016-10-13 | 2 | -14/+92 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Merge branch 'master' into i328-MultiVault | Dan Finlay | 2016-10-13 | 4 | -2/+52 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Add initial KeyringController files | Dan Finlay | 2016-10-12 | 1 | -0/+42 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Begin adding Ropsten support | Dan Finlay | 2016-11-22 | 2 | -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 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. | ||||
* | | | | | | | | | | | | Version 2.13.82.13.8 | Dan Finlay | 2016-11-17 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
* | | | | | | | | | | | First attempt at fixing errors in confirmation screen. | Kevin Serrano | 2016-11-15 | 2 | -4/+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 | 2 | -1/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | Version 2.13.7 | Dan Finlay | 2016-11-09 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | 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 |