Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Linting | Thomas Huang | 2017-06-13 | 1 | -2/+2 |
| | |||||
* | Update gasblocklimit params with every block. | Kevin Serrano | 2017-06-03 | 2 | -9/+2 |
| | |||||
* | Convert gasLimit to not use muln in BN | Kevin Serrano | 2017-06-02 | 1 | -2/+8 |
| | |||||
* | Merge pull request #1500 from MetaMask/RemoveStreamingSubprovider | Thomas Huang | 2017-05-26 | 1 | -17/+5 |
|\ | | | | | Remove streaming subprovider | ||||
| * | Remove stream subprovider | Dan Finlay | 2017-05-26 | 1 | -17/+5 |
| | | | | | | | | Since the polling leak seems to be coming from elsewhere, and new bugs came from this, I'm rolling back this change so that we can push the other improvements sooner and fix the bug at its true root. | ||||
* | | fix spelling | frankiebee | 2017-05-25 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into reloadDapp | frankiebee | 2017-05-25 | 2 | -2/+14 |
|\| | |||||
| * | Merge pull request #1494 from MetaMask/1472-gasceiling | Dan Finlay | 2017-05-25 | 1 | -1/+12 |
| |\ | | | | | | | Add Max GasLimit Ceiling | ||||
| | * | Add new blockGasLimit property to txMeta object. | Kevin Serrano | 2017-05-25 | 1 | -1/+12 |
| | | | |||||
| * | | inpage-provider - disable polling after first block | kumavis | 2017-05-25 | 1 | -1/+2 |
| |/ | |||||
* / | Reload the page when switching networks for sites that use web3 | frankiebee | 2017-05-25 | 1 | -22/+25 |
|/ | |||||
* | Merge branch 'master' into networkController | Frankie | 2017-05-24 | 1 | -5/+17 |
|\ | |||||
| * | clean - remove console logs | kumavis | 2017-05-23 | 1 | -2/+0 |
| | | |||||
| * | deps - use stream-subprovider from provider-engine | kumavis | 2017-05-23 | 1 | -1/+1 |
| | | |||||
| * | Rename stream to streamSubprovider | Dan Finlay | 2017-05-23 | 1 | -4/+4 |
| | | |||||
| * | Use filter subprovider in-page to avoid filter leaks | Dan Finlay | 2017-05-23 | 1 | -2/+6 |
| | | |||||
| * | Add new streaming subprovider but getting a loop | Dan Finlay | 2017-05-21 | 1 | -5/+15 |
| | | | | | | | | | | | | | | Regarding #1458 Uses a new streaming subprovider architecture on an experimental branch of StreamProvider: https://github.com/flyswatter/web3-stream-provider/tree/StreamSubprovider | ||||
* | | Fix for tests | frankiebee | 2017-05-24 | 1 | -0/+29 |
| | | |||||
* | | Wrap the provider in a proxy | frankiebee | 2017-05-23 | 1 | -3/+2 |
| | | |||||
* | | Merge branch 'master' into networkController | frankiebee | 2017-05-23 | 2 | -20/+47 |
|\| | |||||
| * | Remove all traces of testnet | Thomas Huang | 2017-05-16 | 1 | -10/+5 |
| | | |||||
| * | Change default network to rinkeby | Thomas Huang | 2017-05-16 | 1 | -5/+5 |
| | | |||||
| * | migrator - fix typo | kumavis | 2017-05-13 | 1 | -1/+1 |
| | | |||||
| * | migrator - cleaner migration runner with es7 | kumavis | 2017-05-12 | 1 | -25/+13 |
| | | |||||
| * | use asyncQ.waterfall instead of asyncQ.eachSeries | frankiebee | 2017-05-12 | 1 | -4/+10 |
| | | |||||
| * | fix migrator | frankiebee | 2017-05-11 | 1 | -9/+8 |
| | | |||||
* | | Create a network controller to manage switcing networks an updating the provider | frankiebee | 2017-05-19 | 2 | -72/+3 |
|/ | |||||
* | Minor lint | Kevin Serrano | 2017-05-03 | 1 | -1/+1 |
| | |||||
* | notification-manager - remove promise listener | kumavis | 2017-04-29 | 1 | -3/+0 |
| | | | | | | | | seems chrome changed their API? MDN suggests that a Promise should be returned but getting `undefined` https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/windows/create Chrome docs suggest its a callback API lolwut https://developer.chrome.com/extensions/windows#method-create | ||||
* | Merge branch 'master' into rinkeby | Dan Finlay | 2017-04-28 | 8 | -21/+21 |
|\ | |||||
| * | Fix linting warnings | Thomas Huang | 2017-04-27 | 8 | -22/+22 |
| | | |||||
* | | Add missing changes. Create unique style for rinkeby icon. | Kevin Serrano | 2017-04-26 | 1 | -1/+5 |
| | | |||||
* | | add rinkeby network | Nickyg | 2017-04-26 | 1 | -0/+5 |
|/ | |||||
* | auto-faucet - only skip faucet on explicit test environment | kumavis | 2017-04-05 | 1 | -1/+1 |
| | |||||
* | add platforms to mascara + move buyEther window open to ui | kumavis | 2017-04-05 | 2 | -3/+24 |
| | |||||
* | Switch auto-faucet from XMLHttpRequest to fetch | frankiebee | 2017-04-04 | 1 | -5/+11 |
| | |||||
* | notification-manager - rename show -> showPoup + make getPopup private | kumavis | 2017-04-01 | 1 | -10/+10 |
| | |||||
* | extension - remove local extension files, we use extensionizer | kumavis | 2017-03-31 | 2 | -85/+0 |
| | |||||
* | introduce platform api and rename notifications to notification-manager | kumavis | 2017-03-31 | 2 | -67/+74 |
| | |||||
* | Merge pull request #1293 from MetaMask/ImproveGasEstimates | Kevin Serrano | 2017-03-30 | 1 | -3/+4 |
|\ | | | | | tx-utils - gas buffer ceiling at 90% of block gas limit | ||||
| * | tx-utils - gas buffer ceiling at 90% of block gas limit | kumavis | 2017-03-30 | 1 | -3/+4 |
| | | |||||
* | | Linted | Dan Finlay | 2017-03-30 | 1 | -1/+1 |
| | | |||||
* | | Fix popup behavior for Firefox | Dan Finlay | 2017-03-30 | 2 | -2/+7 |
|/ | | | | Firefox does not support the `focused` parameter when opening a new window, and we don't actually require it for Chrome either, new popups are at the foreground by default already. | ||||
* | tx manager - adjust new tx flow and txMeta decorations | kumavis | 2017-03-29 | 1 | -17/+15 |
| | |||||
* | Improve UI gas calculation logic | Dan Finlay | 2017-03-29 | 1 | -0/+7 |
| | | | | | | | | - Now striping hex prefixed gas values, which may have been causing mis-estimation. - Unified calculation logic to be entirely functional. - Greatly simplified how the pending-tx form keeps updated form state. Still needs a commit from @kumavis to ensure the background passes in a txMeta.txParams.gasPrice value. | ||||
* | Remove gas limit param | Dan Finlay | 2017-03-24 | 1 | -3/+3 |
| | | | | Fixes #1256 by removing redundant param. | ||||
* | Merge branch 'master' into i238-kovan | Kevin Serrano | 2017-03-23 | 1 | -1/+5 |
|\ | |||||
| * | Add current block number and hash to the state. | Kevin Serrano | 2017-03-23 | 1 | -1/+5 |
| | | |||||
* | | Add kovan config settings to config manager. | Kevin Serrano | 2017-03-23 | 1 | -0/+4 |
|/ | |||||
* | Remove eth-lightwallet | Dan Finlay | 2017-03-17 | 3 | -513/+0 |
| | |||||
* | Merge branch 'master' into kumavis-patch-1 | Dan Finlay | 2017-03-09 | 3 | -207/+0 |
|\ | |||||
| * | Merge branch 'master' into i1144-moarrpc | Kevin Serrano | 2017-03-09 | 1 | -5/+8 |
| |\ | |||||
| * \ | Merge branch 'master' into i1144-moarrpc | Kevin Serrano | 2017-03-08 | 1 | -8/+14 |
| |\ \ | |||||
| * \ \ | More conflict resolution. | Kevin Serrano | 2017-03-02 | 3 | -237/+0 |
| |\ \ \ | |||||
| | * | | | add controllers to root scripts folder | Dan Finlay | 2017-02-28 | 3 | -238/+0 |
| | | | | | |||||
| | * | | | Merge branch 'master' into i1144-moarrpc | Dan Finlay | 2017-02-28 | 7 | -34/+127 |
| | |\ \ \ | |||||
| * | \ \ \ | Fix merge conflicts. | Kevin Serrano | 2017-03-02 | 8 | -55/+129 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Tested against code to play nice with unit tests. | Kevin Serrano | 2017-02-24 | 1 | -2/+11 |
| | | | | | | |||||
| * | | | | | Implemented functionality for displaying recent custom RPCs | Kevin Serrano | 2017-02-23 | 1 | -14/+15 |
| | | | | | | |||||
| * | | | | | Fix naming | Kevin Serrano | 2017-02-22 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Basic infrasture for RPC list added. | Kevin Serrano | 2017-02-22 | 1 | -3/+23 |
| | | | | | | |||||
* | | | | | | tx-utils - add encoding utils | kumavis | 2017-03-08 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | tx-utils - stricter naming type-based convention | kumavis | 2017-03-08 | 1 | -9/+15 |
| | | | | | | |||||
* | | | | | | tx-utils - clean and comment | kumavis | 2017-03-08 | 1 | -15/+11 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | change BN.mul to BN.muln | Jared Pereira | 2017-03-08 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | remove constant buffer and add multiplier | Jared Pereira | 2017-03-08 | 1 | -5/+8 |
| |_|_|/ |/| | | | |||||
* | | | | Fix normalizeMsgData function to always return hex prefixed | Dan Finlay | 2017-03-07 | 1 | -1/+1 |
| | | | | |||||
* | | | | Render personal_sign messages as utf-8 text | Dan Finlay | 2017-03-07 | 1 | -8/+14 |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calls to `personal_sign` are now: - When hex encoded, preserved as hex encoded, but displayed as utf-8 text. - When not hex encoded, decoded as utf-8 text as hex for signing. - The messages proposed for signing are displayed as UTF-8 text. - When the message cannot be rendered as UTF-8 text, it is displayed as hexadecimal. Fixes #1173 | ||||
* | | | Linted | Dan Finlay | 2017-03-01 | 1 | -1/+0 |
| | | | |||||
* | | | Remove gasMultiplier txMeta param | Dan Finlay | 2017-03-01 | 4 | -21/+3 |
| | | | | | | | | | | | | | | | | | | This was used by the custom gas slider on the `send` screen, and it was used to modify the gas value before sending it out, breaking our new custom gas field logic. Removed it and the logic that referred to this now-outdated parameter. | ||||
* | | | Fixed bug that made send screen sometimes transition to account detail | Dan Finlay | 2017-03-01 | 1 | -0/+1 |
| |/ |/| | |||||
* | | Got personal_sign working | Dan Finlay | 2017-02-24 | 1 | -2/+2 |
| | | | | | | | | Also fixed bug where signing would not close popup. | ||||
* | | Add alternate UI for pending personal_sign messages | Dan Finlay | 2017-02-24 | 2 | -1/+3 |
| | | |||||
* | | Fix reference | Dan Finlay | 2017-02-22 | 1 | -1/+1 |
| | | |||||
* | | Move sigUtil and keyrings to external modules | Dan Finlay | 2017-02-22 | 6 | -32/+122 |
|/ | | | | These external modules now have their own test coverage and build enforcement. This allowed me to somewhat more easily add good tests around our personalSign strategy (held now in [eth-sig-util](https://github.com/flyswatter/eth-sig-util), and allow each of the keyrings to import that, etc. | ||||
* | Merge branch 'dev' into disclaimer-notify | Kevin Serrano | 2017-02-10 | 1 | -0/+5 |
|\ | |||||
| * | Allowed net_version to be called synchronously | Kevin Serrano | 2017-02-09 | 1 | -0/+5 |
| | | |||||
* | | Delete all code related to disclaimers. | Kevin Serrano | 2017-02-10 | 2 | -24/+0 |
|/ | |||||
* | Fix typo | Dan Finlay | 2017-02-05 | 1 | -1/+1 |
| | |||||
* | Remove shapeshift tx list from idStore | Dan Finlay | 2017-02-05 | 1 | -2/+1 |
| | |||||
* | Stop removing old shapeshift txs | Dan Finlay | 2017-02-05 | 1 | -16/+0 |
| | |||||
* | Do not remove completed shapeshift deposits | Dan Finlay | 2017-02-04 | 1 | -1/+2 |
| | |||||
* | Fix bug when clearing old shapeshift txs | Dan Finlay | 2017-02-04 | 1 | -1/+3 |
| | |||||
* | Automatically remove shapeshift txs over 11 minutes old with no payment | Dan Finlay | 2017-02-04 | 1 | -0/+22 |
| | |||||
* | Got ShapeShiftController back to working | Dan Finlay | 2017-02-04 | 1 | -12/+7 |
| | |||||
* | Mostly got shapeshift tx management into its own controller | Dan Finlay | 2017-02-04 | 2 | -34/+100 |
| | | | | Rendering the list is still having issues, so this isn't done yet. | ||||
* | eth-store - update store state after manipulating | kumavis | 2017-02-04 | 1 | -0/+2 |
| | |||||
* | id mgmt - update to latest eth_sign spec | kumavis | 2017-02-04 | 1 | -8/+27 |
| | |||||
* | migrations - fix migration #9 and add safety checks to migrator | kumavis | 2017-02-04 | 1 | -1/+12 |
| | |||||
* | eths-store - eagerly set current block | kumavis | 2017-02-04 | 1 | -0/+2 |
| | |||||
* | migration #9 - break out CurrencyController substate | kumavis | 2017-02-03 | 3 | -50/+70 |
| | |||||
* | eth-store - cbs default to noop | kumavis | 2017-02-03 | 1 | -5/+5 |
| | |||||
* | eth-store - convert to obs-store subclass | kumavis | 2017-02-03 | 1 | -116/+98 |
| | |||||
* | messageManager - move view state to obs-store | kumavis | 2017-02-03 | 1 | -32/+20 |
| | |||||
* | emit a update badge | Frankie | 2017-02-02 | 1 | -1/+1 |
| | |||||
* | put updateBadge back in | Frankie | 2017-02-02 | 1 | -0/+1 |
| | |||||
* | swap out set state for updateState | Frankie | 2017-02-02 | 1 | -4/+1 |
| | |||||
* | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-02-02 | 2 | -5/+38 |
|\ | |||||
| * | continue rename selectedAccount to selectedAddress | kumavis | 2017-01-31 | 1 | -5/+5 |
| | | |||||
| * | rename selectedAccount to selectedAddress | kumavis | 2017-01-31 | 1 | -2/+5 |
| | | |||||
| * | preferences - introduce preferences controller | kumavis | 2017-01-31 | 1 | -0/+30 |
| | | |||||
* | | code clan up and tests | Frankie | 2017-02-02 | 1 | -22/+20 |
| | | |||||
* | | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-01-29 | 1 | -9/+1 |
|\| | |||||
| * | tests - remove persistence and start with initial state | kumavis | 2017-01-28 | 1 | -9/+1 |
| | | |||||
* | | Clean up message manger includes: | Frankie | 2017-01-29 | 1 | -10/+67 |
| | | | | | | | | | | | | | | | | | | Provider egine bump Remove presence of message manger in keyring controller Change the status wording fom conf to approved make Message manager a class fix messages not being apart of the badge re write message manger to better reflect controller pattern | ||||
* | | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-01-28 | 1 | -4/+5 |
|\| | |||||
| * | background - stream disconnection fix | kumavis | 2017-01-27 | 1 | -4/+5 |
| | | |||||
* | | Rewrite message controller to fit controller pattern | Frankie | 2017-01-28 | 1 | -48/+45 |
|/ | |||||
* | background - organize metamask instantiation | kumavis | 2017-01-27 | 1 | -1/+1 |
| | |||||
* | obs-store - use published module | kumavis | 2017-01-25 | 7 | -274/+52 |
| | |||||
* | 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 |
| |