Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow injection in IFrames + dynamic IFrames | Stefaan Ponnet | 2017-03-26 | 2 | -2/+2 |
| | |||||
* | Merge branch 'master' into i1210-txdisappearance | Kevin Serrano | 2017-03-25 | 3 | -3/+40 |
|\ | |||||
| * | Merge branch 'master' into notice-modification | Dan Finlay | 2017-03-25 | 1 | -3/+3 |
| |\ | |||||
| | * | Remove gas limit param | Dan Finlay | 2017-03-24 | 1 | -3/+3 |
| | | | | | | | | | | | | Fixes #1256 by removing redundant param. | ||||
| * | | Create migration to erase body in read notices. | Kevin Serrano | 2017-03-23 | 1 | -0/+36 |
| | | | |||||
| * | | Remove notice body after reading. | Kevin Serrano | 2017-03-23 | 1 | -0/+1 |
| |/ | |||||
* / | Fix persistence of transactions between networks. | Kevin Serrano | 2017-03-23 | 1 | -10/+22 |
|/ | |||||
* | Merge branch 'master' into i238-kovan | Dan Finlay | 2017-03-23 | 1 | -9/+5 |
|\ | |||||
| * | Merge branch 'master' into i1237-xmlfix2 | Kevin Serrano | 2017-03-23 | 1 | -1/+5 |
| |\ | |||||
| * \ | Merge branch 'master' into i1237-xmlfix2 | Kevin Serrano | 2017-03-23 | 1 | -5/+10 |
| |\ \ | |||||
| * | | | Modify logic for injection conditions. | Kevin Serrano | 2017-03-23 | 1 | -9/+5 |
| | | | | |||||
* | | | | 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 |
| | | | |||||
* | | | Add kovan to config file. | Kevin Serrano | 2017-03-23 | 1 | -0/+2 |
|/ / | |||||
* / | Have better error messages | frankiebee | 2017-03-23 | 1 | -5/+10 |
|/ | |||||
* | Remove eth-lightwallet | Dan Finlay | 2017-03-17 | 4 | -550/+1 |
| | |||||
* | Merge branch 'master' into i1165-predictive | Kevin Serrano | 2017-03-15 | 3 | -3/+3 |
|\ | |||||
| * | Rename variables to proper currency state variables. | Kevin Serrano | 2017-03-15 | 1 | -1/+1 |
| | | |||||
| * | Fix description of some migrations. | Kevin Serrano | 2017-03-15 | 2 | -2/+2 |
| | | |||||
* | | Limit the number of addresses stored in our book. | Kevin Serrano | 2017-03-14 | 1 | -0/+4 |
| | | |||||
* | | Connect keyring controller to address book to prevent additional duplicates. | Kevin Serrano | 2017-03-11 | 2 | -9/+23 |
| | | |||||
* | | Improve duplicate checking in address book. | Kevin Serrano | 2017-03-11 | 1 | -2/+2 |
| | | |||||
* | | Add comments. | Kevin Serrano | 2017-03-11 | 1 | -4/+19 |
| | | |||||
* | | Allow for adding recently used addresses to address book. | Kevin Serrano | 2017-03-10 | 1 | -0/+4 |
| | | |||||
* | | Rename functions for consistency. | Kevin Serrano | 2017-03-10 | 1 | -6/+6 |
| | | |||||
* | | Create persistence address book. | Kevin Serrano | 2017-03-10 | 2 | -0/+57 |
| | | |||||
* | | Create distinct labels and names for addresses. | Kevin Serrano | 2017-03-10 | 1 | -1/+3 |
|/ | |||||
* | Version 3.4.0v3.4.0 | Dan Finlay | 2017-03-09 | 1 | -1/+1 |
| | |||||
* | Modify message. | Kevin Serrano | 2017-03-09 | 1 | -1/+1 |
| | |||||
* | Add more informative message | Kevin Serrano | 2017-03-09 | 1 | -1/+3 |
| | |||||
* | Merge branch 'master' into i1065-removealert | Kevin Serrano | 2017-03-09 | 1 | -20/+22 |
|\ | |||||
| * | Merge branch 'master' into kumavis-patch-1 | Dan Finlay | 2017-03-09 | 5 | -39/+81 |
| |\ | |||||
| * | | 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 |
| | | | |||||
* | | | Convert alert to a log.error | Kevin Serrano | 2017-03-09 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge branch 'master' into i1144-moarrpc | Kevin Serrano | 2017-03-09 | 2 | -6/+30 |
|\| | |||||
| * | Merge branch 'master' into i1118-IncreaseGasBuffer | Dan Finlay | 2017-03-08 | 1 | -1/+1 |
| |\ | |||||
| | * | Fix grammar in erro message | frankiebee | 2017-03-08 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into i1118-IncreaseGasBuffer | jaredpereira | 2017-03-08 | 1 | -1/+22 |
| |\| | |||||
| | * | Merge branch 'master' into i#1032 | frankiebee | 2017-03-08 | 3 | -13/+19 |
| | |\ | |||||
| | * | | fix issue where account import allows for duplicates | frankiebee | 2017-03-08 | 1 | -1/+22 |
| | | | | |||||
| * | | | 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 |
| | |/ | |/| | |||||
* | | | Nodeify and promisify calls to background. | Kevin Serrano | 2017-03-09 | 1 | -2/+4 |
| | | | |||||
* | | | Refactor of code into separate reducers and actions. | Kevin Serrano | 2017-03-08 | 2 | -5/+14 |
| | | | |||||
* | | | Merge branch 'master' into i1144-moarrpc | Kevin Serrano | 2017-03-08 | 3 | -13/+19 |
|\| | | |||||
| * | | Merge branch 'master' into i1173-ShowPersonalMessage | Dan Finlay | 2017-03-07 | 2 | -5/+5 |
| |\ \ | |||||
| | * | | Fix issue where old txMeta object was being used to pass the txHash to the cb | Frankie | 2017-03-07 | 2 | -5/+5 |
| | |/ | |||||
| * | | 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 | ||||
* | | More conflict resolution. | Kevin Serrano | 2017-03-02 | 4 | -4/+4 |
|\ \ | |||||
| * | | add controllers to root scripts folder | Dan Finlay | 2017-02-28 | 4 | -3/+3 |
| | | | |||||
| * | | Merge branch 'master' into i1144-moarrpc | Dan Finlay | 2017-02-28 | 12 | -281/+252 |
| |\ \ | |||||
* | \ \ | Fix merge conflicts. | Kevin Serrano | 2017-03-02 | 14 | -327/+267 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | Add a couple more debug logs | Dan Finlay | 2017-03-01 | 1 | -0/+1 |
| | | | |||||
| * | | Use correct action to update and submit tx | Dan Finlay | 2017-03-01 | 1 | -0/+1 |
| | | | |||||
| * | | Linted | Dan Finlay | 2017-03-01 | 1 | -1/+0 |
| | | | |||||
| * | | Remove gasMultiplier txMeta param | Dan Finlay | 2017-03-01 | 6 | -44/+4 |
| | | | | | | | | | | | | | | | | | | 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 |
| | | | |||||
| * | | Add background method for updating and approving a tx in one call | Dan Finlay | 2017-02-28 | 1 | -2/+9 |
| | | | |||||
| * | | Merge branch 'master' into i765-gaslimits | Dan Finlay | 2017-02-28 | 12 | -281/+251 |
| |\| | |||||
| | * | Removed redundant personal_recover logic | Dan Finlay | 2017-02-25 | 2 | -18/+0 |
| | | | |||||
| | * | Mostly fix personal_recover | Dan Finlay | 2017-02-25 | 2 | -6/+6 |
| | | | |||||
| | * | Fix cancel msg signing behavior. | Dan Finlay | 2017-02-24 | 1 | -6/+25 |
| | | | |||||
| | * | Got personal_sign working | Dan Finlay | 2017-02-24 | 3 | -21/+42 |
| | | | | | | | | | | | | 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 |
| | | | |||||
| | * | Add personal sign actions and template | Dan Finlay | 2017-02-23 | 1 | -0/+5 |
| | | | |||||
| | * | Allow provider to init before keyringController | Dan Finlay | 2017-02-22 | 1 | -2/+6 |
| | | | |||||
| | * | Fix reference | Dan Finlay | 2017-02-22 | 1 | -1/+1 |
| | | | |||||
| | * | Point metamask-controller personalSignRecover method to keyring-controller | Dan Finlay | 2017-02-22 | 1 | -9/+5 |
| | | | |||||
| | * | Move sigUtil and keyrings to external modules | Dan Finlay | 2017-02-22 | 10 | -261/+202 |
| | | | | | | | | | | | | 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. | ||||
| * | | Make gasPrice accessible to the UI. | Kevin Serrano | 2017-02-25 | 1 | -0/+1 |
| |/ | |||||
* | | Tested against code to play nice with unit tests. | Kevin Serrano | 2017-02-24 | 2 | -3/+12 |
| | | |||||
* | | Implemented functionality for displaying recent custom RPCs | Kevin Serrano | 2017-02-23 | 1 | -14/+15 |
| | | |||||
* | | Fix naming | Kevin Serrano | 2017-02-22 | 2 | -3/+3 |
| | | |||||
* | | Basic infrasture for RPC list added. | Kevin Serrano | 2017-02-22 | 2 | -3/+24 |
|/ | |||||
* | Version 3.3.0v3.3.0 | Dan Finlay | 2017-02-21 | 1 | -1/+1 |
| | |||||
* | Add memstore update after adding new keyring | Dan Finlay | 2017-02-16 | 1 | -0/+1 |
| | |||||
* | keyring controller - update memStore after restoreKeyring | kumavis | 2017-02-16 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' into dev | Dan Finlay | 2017-02-16 | 3 | -5/+30 |
|\ | |||||
| * | got hash test passing | Dan Finlay | 2017-02-14 | 2 | -2/+5 |
| | | |||||
| * | Version 3.2.2v3.2.2 | Dan Finlay | 2017-02-10 | 1 | -1/+1 |
| | | |||||
| * | Revert old style message sighing | Frankie | 2017-02-10 | 2 | -2/+24 |
| | | |||||
* | | Made migrations non-destructive; fixed currency migration. | Kevin Serrano | 2017-02-16 | 10 | -22/+49 |
| | | |||||
* | | Add migrations for removing terms of use data. | Kevin Serrano | 2017-02-15 | 2 | -0/+31 |
| | | |||||
* | | Merge branch 'dev' into disclaimer-notify | Kevin Serrano | 2017-02-10 | 2 | -1/+7 |
|\ \ | |||||
| * | | Merge branch 'dev' into i1085-synchronousnet | kumavis | 2017-02-10 | 1 | -1/+1 |
| |\| | |||||
| * | | Allowed net_version to be called synchronously | Kevin Serrano | 2017-02-09 | 2 | -1/+7 |
| | | | |||||
* | | | Delete all code related to disclaimers. | Kevin Serrano | 2017-02-10 | 4 | -73/+0 |
| | | | |||||
* | | | Fix bugs with notice. Add disclaimer notice. | Kevin Serrano | 2017-02-10 | 1 | -3/+3 |
| |/ |/| | |||||
* | | Version 3.2.1v3.2.1 | Dan Finlay | 2017-02-09 | 1 | -1/+1 |
|/ | |||||
* | Version 3.2.0v3.2.0 | Dan Finlay | 2017-02-08 | 1 | -1/+1 |
| | |||||
* | 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 |
| | |||||
* | Add migration to index | Dan Finlay | 2017-02-04 | 1 | -1/+2 |
| | |||||
* | Got ShapeShiftController back to working | Dan Finlay | 2017-02-04 | 2 | -12/+43 |
| | |||||
* | Mostly got shapeshift tx management into its own controller | Dan Finlay | 2017-02-04 | 3 | -37/+112 |
| | | | | 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 | 4 | -34/+55 |
| | |||||
* | migrations - fix migration #9 and add safety checks to migrator | kumavis | 2017-02-04 | 2 | -3/+14 |
| | |||||
* | eths-store - eagerly set current block | kumavis | 2017-02-04 | 1 | -0/+2 |
| | |||||
* | metamask - add missing diskState and memState subscriptions | kumavis | 2017-02-03 | 1 | -6/+11 |
| | |||||
* | migration #9 - break out CurrencyController substate | kumavis | 2017-02-03 | 6 | -75/+133 |
| | |||||
* | eth-store - cbs default to noop | kumavis | 2017-02-03 | 1 | -5/+5 |
| | |||||
* | migration #8 - break out NoticeController substate | kumavis | 2017-02-03 | 4 | -28/+63 |
| | |||||
* | eth-store - convert to obs-store subclass | kumavis | 2017-02-03 | 2 | -118/+103 |
| | |||||
* | txManager - depend on preferencesStore | kumavis | 2017-02-03 | 2 | -4/+8 |
| | |||||
* | metamask - introduce networkStore | kumavis | 2017-02-03 | 2 | -35/+50 |
| | |||||
* | migration 7 - break off TransactionManager substate | kumavis | 2017-02-03 | 4 | -25/+89 |
| | |||||
* | messageManager - move view state to obs-store | kumavis | 2017-02-03 | 2 | -38/+28 |
| | |||||
* | keyring - replace getState with memStore | kumavis | 2017-02-03 | 2 | -30/+2 |
| | |||||
* | keyring - manage isUnlocked in memStore | kumavis | 2017-02-03 | 1 | -1/+7 |
| | |||||
* | keyring - rm config dep | kumavis | 2017-02-03 | 2 | -5/+2 |
| | |||||
* | Merge branch 'dev' into notice-management | Kevin Serrano | 2017-02-03 | 3 | -1/+2 |
|\ | |||||
| * | metamask - memState - adopt configManager.isDisclaimerConfirmed from keyring ↵ | kumavis | 2017-02-02 | 2 | -1/+1 |
| | | | | | | | | controller | ||||
| * | emit a update badge | Frankie | 2017-02-02 | 1 | -1/+1 |
| | | |||||
| * | put updateBadge back in | Frankie | 2017-02-02 | 1 | -0/+1 |
| | | |||||
* | | Change filepath for new location of notices. | Kevin Serrano | 2017-02-03 | 1 | -1/+1 |
|/ | |||||
* | swap out set state for updateState | Frankie | 2017-02-02 | 1 | -4/+1 |
| | |||||
* | Fix messy merge | Frankie | 2017-02-02 | 1 | -14/+2 |
| | |||||
* | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-02-02 | 2 | -50/+69 |
|\ | |||||
| * | metamask - adopt isInitialized from keyring controller | kumavis | 2017-02-01 | 2 | -4/+8 |
| | | |||||
| * | keyring - move identities into memStore | kumavis | 2017-02-01 | 1 | -7/+15 |
| | | |||||
| * | keyring - add keyringtypes to memStore | kumavis | 2017-02-01 | 1 | -3/+3 |
| | | |||||
| * | metamask - inherit some configManager state from keyring controller | kumavis | 2017-02-01 | 2 | -10/+13 |
| | | |||||
| * | keyring - synchronous getState | kumavis | 2017-02-01 | 2 | -46/+47 |
| | | |||||
* | | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-02-02 | 8 | -47/+110 |
|\| | |||||
| * | migration #6 - fix selectedAddress data source | kumavis | 2017-01-31 | 1 | -2/+2 |
| | | |||||
| * | inpage - set web3.eth.defaultAccount correctly | kumavis | 2017-01-31 | 2 | -2/+2 |
| | | |||||
| * | continue rename selectedAccount to selectedAddress | kumavis | 2017-01-31 | 4 | -13/+13 |
| | | |||||
| * | rename selectedAccount to selectedAddress | kumavis | 2017-01-31 | 4 | -10/+13 |
| | | |||||
| * | metamask - rename getSelectedAccount to getSelectedAddress | kumavis | 2017-01-31 | 2 | -5/+5 |
| | | |||||
| * | migration #6 - move selectedAccount from keyringController to ↵ | kumavis | 2017-01-31 | 2 | -0/+42 |
| | | | | | | | | preferencesController | ||||
| * | metamask - move selectedAccount set/get to preferencesController | kumavis | 2017-01-31 | 2 | -33/+12 |
| | | |||||
| * | preferences - introduce preferences controller | kumavis | 2017-01-31 | 2 | -0/+39 |
| | | |||||
* | | code clan up and tests | Frankie | 2017-02-02 | 3 | -41/+39 |
| | | |||||
* | | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-01-30 | 2 | -4/+13 |
|\| | |||||
| * | metamask - lookup selectedAccount via keyringController | kumavis | 2017-01-30 | 2 | -3/+12 |
| | | |||||
| * | public config - get selectedAccount from keyring controller substate | kumavis | 2017-01-30 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-01-29 | 5 | -174/+236 |
|\| | |||||
| * | metamask - subscribe metamask store to keyringController substate | kumavis | 2017-01-29 | 1 | -0/+3 |
| | | |||||
| * | migration 5 - move keyring controller state to substate | kumavis | 2017-01-29 | 3 | -67/+95 |
| | | |||||
| * | keyring - add and initialize obs-store | kumavis | 2017-01-29 | 2 | -6/+36 |
| | | |||||
| * | metamask - adopt shapeshift txs from keyringController | kumavis | 2017-01-28 | 2 | -2/+3 |
| | | |||||
| * | tests - remove persistence and start with initial state | kumavis | 2017-01-28 | 1 | -9/+1 |
| | | |||||
| * | metamask - organize methods | kumavis | 2017-01-28 | 1 | -120/+126 |
| | | |||||
* | | Clean up message manger includes: | Frankie | 2017-01-29 | 5 | -126/+129 |
| | | | | | | | | | | | | | | | | | | 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 | 4 | -194/+205 |
|\| | |||||
| * | metamask - fix setupProviderConnection | kumavis | 2017-01-27 | 1 | -1/+1 |
| | | |||||
| * | keymanager - small clean | kumavis | 2017-01-27 | 1 | -2/+2 |
| | | |||||
| * | metamask controller - cleanup remote api | kumavis | 2017-01-27 | 1 | -77/+100 |
| | | |||||
| * | metamask - organize into sections | kumavis | 2017-01-27 | 1 | -49/+61 |
| | | |||||
| * | metamask - use web3-stream-provider/handler instead of manual wiring | kumavis | 2017-01-27 | 1 | -23/+8 |
| | | |||||
| * | metamask controller - adopt setup*Communication from background | kumavis | 2017-01-27 | 2 | -44/+41 |
| | | |||||
| * | background - stream disconnection fix | kumavis | 2017-01-27 | 2 | -8/+8 |
| | | |||||
| * | metamask controller - adopt clearSeedWords from keyring controller | kumavis | 2017-01-27 | 2 | -15/+9 |
| | | |||||
* | | Rewrite message controller to fit controller pattern | Frankie | 2017-01-28 | 1 | -48/+45 |
|/ | |||||
* | background - graceful publicConfigStore connection teardown | kumavis | 2017-01-27 | 1 | -1/+3 |
| | |||||
* | background - organize metamask instantiation | kumavis | 2017-01-27 | 3 | -47/+37 |
| | |||||
* | obs-store - use published module | kumavis | 2017-01-25 | 10 | -295/+85 |
| | |||||
* | migrations - rename 005 to stubbed _multi-keyring | kumavis | 2017-01-25 | 1 | -0/+7 |
| | |||||
* | Merge branch 'dev' of github.com:MetaMask/metamask-plugin into obs-store2 | kumavis | 2017-01-25 | 3 | -32/+34 |
|\ | |||||
| * | Merge branch 'dev' into i#1048 | kumavis | 2017-01-25 | 2 | -0/+56 |
| |\ | |||||
| | * | Merge pull request #1051 from MetaMask/hotfix1048 | Frankie | 2017-01-25 | 1 | -3/+5 |
| | |\ | | | | | | | | | hotfix - addNewAccount - dont assume hd keyring position | ||||
| * | | | background controller - extract KeyringC.placeSeedWords to MetamaskC | kumavis | 2017-01-25 | 2 | -22/+16 |
| | | | | |||||
| * | | | merge master hotfix into dev | kumavis | 2017-01-25 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | 3.1.2 | kumavis | 2017-01-25 | 1 | -1/+1 |
| | | |/ | | |/| | |||||
| | * | | hotfix - dont assume hd keyring position | kumavis | 2017-01-25 | 1 | -3/+5 |
| | | | | |||||
| * | | | keyring-controller - cleanup | kumavis | 2017-01-25 | 1 | -2/+3 |
| | | | | |||||
| * | | | keyring-controller - cleanup | kumavis | 2017-01-25 | 1 | -5/+3 |
| | | | | |||||
| * | | | Move the assumption of their only being one hd keyring when requesting seed ↵ | Frankie | 2017-01-25 | 2 | -7/+8 |
| | | | | | | | | | | | | | | | | words to metamaskController | ||||
| * | | | Fix issue where generating a new account would put it in loose keys | Frankie | 2017-01-25 | 2 | -4/+12 |
| |/ / | |||||
* | | | Merge branch 'dev' into obs-store2 | kumavis | 2017-01-22 | 11 | -136/+329 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'master' into upToDate | Frankie | 2017-01-21 | 1 | -1/+1 |
| |\| | |||||
| | * | 3.1.1 | kumavis | 2017-01-21 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into upToDate | Frankie | 2017-01-21 | 1 | -1/+3 |
| |\| | |||||
| | * | keyring controller - placeSeedWords should use first hdKeyring | kumavis | 2017-01-21 | 1 | -1/+3 |
| | | | |||||
| * | | Merge branch 'dev' into i715-AddJsonImport | Dan Finlay | 2017-01-19 | 2 | -2/+2 |
| |\| | |||||
| | * | 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 |
| | | | | | |||||
| * | | | | Add ability to import v3 JSON wallets | Dan Finlay | 2017-01-19 | 1 | -5/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is now a menu item labeled "JSON File" for importing, and it can digest either: - v1 MyEtherWallet JSON files - v3 Account files (used by Geth, Mist, and MyEtherWallet). Fixes #715 | ||||
| * | | | | Added new modular private key import system | Dan Finlay | 2017-01-19 | 2 | -0/+48 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now any strategy for importing a private key that can be described as a pure function can be very easily turned into a MetaMask import strategy. I've created a generic and reusable UI action called `importNewAccount(strategy, args)`. The `strategy` is a unique identifier defined in `app/scripts/account-import-strategies`, and the `args` will be passed to the member of the `strategies` array whose key matches the strategy string. Strategies return private key hex strings, and are used by the metamask-controller to create a new keyring, and select that new account, before calling back. This also implements @frankiebee's idea of showing the imported account when it's been imported (my oversight!). This commit only moves us to this architecture, keeping feature parity for private key import, but has some untested code for importing geth-style JSON files as well! | ||||
| * | | | 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 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | currency conversion - less noisy error | kumavis | 2017-01-12 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | background - fix metamaskController store -> diskStore persistence | kumavis | 2017-01-13 | 1 | -1/+6 |
| | | | | | |||||
* | | | | | migrations - wip - 005 multivault migration | kumavis | 2017-01-12 | 7 | -31/+82 |
| | | | | | |||||
* | | | | | migrations - introduce promise-based migrator | kumavis | 2017-01-12 | 5 | -112/+179 |
| | | | | | |||||
* | | | | | background - move pojo migrator to outside of metamask controller | kumavis | 2017-01-12 | 11 | -104/+159 |
| | | | | | |||||
* | | | | | background - introduce ObservableStore | kumavis | 2017-01-12 | 9 | -166/+204 |
| |/ / / |/| | | | |||||
* | | | | 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 | ||||
* | | 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 |
| | | |