Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | transactions: lint fixes and reveal status-update event for balance controller | frankiebee | 2017-09-27 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into transactionControllerRefractorPt3 | frankiebee | 2017-09-27 | 1 | -39/+88 |
|\ | |||||
| * | Remove duplicate instantiation of account-tracker | Dan Finlay | 2017-09-27 | 1 | -5/+1 |
| | | |||||
| * | Move obs store into account-tracker instead of inheriting | Dan Finlay | 2017-09-27 | 1 | -2/+2 |
| | | |||||
| * | Pass blocktracker to balances controller | Dan Finlay | 2017-09-27 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'master' into AddBalanceController | Dan Finlay | 2017-09-26 | 1 | -0/+1 |
| |\ | |||||
| | * | Define encryptor in constructor params instead of platform object | Dan Finlay | 2017-09-23 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'master' into ConfigurableEncryption | Dan Finlay | 2017-09-22 | 1 | -1/+1 |
| | |\ | |||||
| | * | | Allow custom encryptor to be passed to MetaMaskController and ↵ | Dan Finlay | 2017-09-22 | 1 | -1/+2 |
| | |/ | | | | | | | | | | KeyringControllers. | ||||
| * | | Fix accont-tracker merge bug | Dan Finlay | 2017-09-23 | 1 | -0/+4 |
| | | | |||||
| * | | Merge branch 'master' into AddBalanceController | Dan Finlay | 2017-09-23 | 1 | -31/+58 |
| |\| | |||||
| | * | metamask controller - destroy filter polyfill on disconnect | kumavis | 2017-09-14 | 1 | -4/+10 |
| | | | |||||
| | * | metamask controller - move middleware into seperate files | kumavis | 2017-09-14 | 1 | -34/+7 |
| | | | |||||
| | * | debug - prefer logger over console | kumavis | 2017-09-14 | 1 | -5/+5 |
| | | | |||||
| | * | metamask cont - standardize multiplex stream naming | kumavis | 2017-09-14 | 1 | -8/+8 |
| | | | |||||
| | * | metamask - add jsonrpc filter middleware on per-connection engine | kumavis | 2017-09-08 | 1 | -2/+8 |
| | | | |||||
| | * | streams - use pump and published obj-multiplex | kumavis | 2017-09-08 | 1 | -7/+27 |
| | | | |||||
| | * | inpage - use json-rpc-engine for inpage-provider | kumavis | 2017-08-25 | 1 | -10/+32 |
| | | | |||||
| * | | Fix computed-balances controller reference | Dan Finlay | 2017-09-23 | 1 | -1/+1 |
| | | | |||||
| * | | Refactor eth-store into account-tracker | Dan Finlay | 2017-09-23 | 1 | -10/+16 |
| | | | | | | | | | | | | EthStore was only being used for tracking account balances and nonces now, so I removed its block-tracking duties, renamed it account-tracker, and removed it as a dependency from `KeyringController`, so that KRC can go live on without a hard dep on it. | ||||
| * | | Add computed balance to account detail view | Dan Finlay | 2017-09-14 | 1 | -0/+4 |
| | | | |||||
| * | | Got pending balance updating correctly | Dan Finlay | 2017-09-14 | 1 | -0/+4 |
| | | | |||||
| * | | Some progress | Dan Finlay | 2017-09-13 | 1 | -1/+7 |
| |/ | |||||
* | | match other controller patterns | frankiebee | 2017-09-13 | 1 | -1/+1 |
| | | |||||
* | | Create TxStateManager | frankiebee | 2017-08-22 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1848 from MetaMask/transactionControllerRefractor | kumavis | 2017-08-03 | 1 | -26/+4 |
|\ | | | | | Transaction controller refractor part 1: promises for everyone and more tests! | ||||
| * | move newUnapprovedTransaction to transactions.js | frankiebee | 2017-08-03 | 1 | -21/+2 |
| | | |||||
| * | lint fixes | frankiebee | 2017-08-02 | 1 | -1/+1 |
| | | |||||
| * | fix spelling mistake | frankiebee | 2017-08-02 | 1 | -1/+1 |
| | | |||||
| * | make addUnapprovedTransaction async function and use promise based ethQuery | frankiebee | 2017-08-02 | 1 | -16/+13 |
| | | |||||
* | | blacklist controller - breakout from metamask and infura controllers | kumavis | 2017-08-03 | 1 | -10/+9 |
| | | |||||
* | | phishing detection - move phishing detection into contentscript and metamask ↵ | kumavis | 2017-08-03 | 1 | -2/+24 |
|/ | | | | controller | ||||
* | turn off auto faucet and remove file | frankiebee | 2017-07-18 | 1 | -4/+0 |
| | |||||
* | Merge branch 'master' into nonce-tracker | frankiebee | 2017-07-13 | 1 | -1/+1 |
|\ | |||||
| * | metamask - on rpc err show whole error body | kumavis | 2017-07-12 | 1 | -1/+1 |
| | | |||||
* | | use new nodeify | frankiebee | 2017-07-13 | 1 | -23/+15 |
| | | |||||
* | | Merge branch 'master' into nonce-tracker | kumavis | 2017-07-08 | 1 | -2/+10 |
|\| | |||||
| * | metamask - append dapp origin domain to rpc request | kumavis | 2017-07-05 | 1 | -2/+9 |
| | | |||||
| * | Merge pull request #1620 from MetaMask/i1616-AddTokenAdding | Thomas Huang | 2017-06-29 | 1 | -0/+1 |
| |\ | | | | | | | Add ability to add tokens to token list | ||||
| | * | Merge branch 'AddTokenList' into i1616-AddTokenAdding | Dan Finlay | 2017-06-20 | 1 | -1/+6 |
| | |\ | |||||
| | * | | Add ability to add tokens to token list | Dan Finlay | 2017-06-16 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Fiex #1616 | ||||
* | | | | Merge branch 'master' into nonce-tracker | frankiebee | 2017-06-28 | 1 | -1/+15 |
|\| | | | |||||
| * | | | Merge pull request #1663 from MetaMask/infura-status | Thomas Huang | 2017-06-27 | 1 | -1/+14 |
| |\ \ \ | | |_|/ | |/| | | Add Infura Status Information to UI State | ||||
| | * | | Add infura network status to our UI state. | Kevin Serrano | 2017-06-23 | 1 | -1/+14 |
| | | | | |||||
| * | | | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2017-06-20 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |/| / | | |/ | AddTokenList | ||||
| | * | Persist selected account tab | Dan Finlay | 2017-06-15 | 1 | -0/+1 |
| | | | | | | | | | | | | Also improve error handling with token balances. | ||||
* | | | Merge branch 'master' into nonce-tracker | frankiebee | 2017-06-17 | 1 | -1/+6 |
|\| | | |||||
| * | | Merge branch 'master' into i1567-FixInaccurateError | frankiebee | 2017-06-17 | 1 | -1/+5 |
| |\ \ | |||||
| | * | | Debounce background updates | Dan Finlay | 2017-06-16 | 1 | -1/+5 |
| | |/ | | | | | | | | | | | | | | | | | | | Our background sometimes emits absurd quantities of updates very quickly. This PR reduces the amount of inter-process traffic by ensuring the `sendUpdate` method does not fire more than every 200 ms. Fixes #1621 | ||||
| * / | check nonce and balance when resubmiting tx | frankiebee | 2017-06-16 | 1 | -0/+1 |
| |/ | |||||
* / | transaction controller - use nonce-tracker | kumavis | 2017-06-15 | 1 | -1/+1 |
|/ | |||||
* | include ethQuery in txController | frankiebee | 2017-05-24 | 1 | -0/+1 |
| | |||||
* | Fix for tests | frankiebee | 2017-05-24 | 1 | -2/+1 |
| | |||||
* | Wrap the provider in a proxy | frankiebee | 2017-05-23 | 1 | -37/+5 |
| | |||||
* | Merge branch 'master' into networkController | frankiebee | 2017-05-23 | 1 | -16/+16 |
|\ | |||||
| * | Rename tx manager to tx controller | Dan Finlay | 2017-05-17 | 1 | -16/+16 |
| | | |||||
* | | Create a network controller to manage switcing networks an updating the provider | frankiebee | 2017-05-19 | 1 | -72/+52 |
|/ | |||||
* | metamask - publicConfig - fix init state | kumavis | 2017-05-05 | 1 | -1/+1 |
| | |||||
* | metamask - selected accounts - dont reveal when locked | kumavis | 2017-05-05 | 1 | -15/+17 |
| | |||||
* | Use loglevel for more logs | Dan Finlay | 2017-05-01 | 1 | -9/+3 |
| | |||||
* | Fix linting warnings | Thomas Huang | 2017-04-27 | 1 | -39/+38 |
| | |||||
* | add platforms to mascara + move buyEther window open to ui | kumavis | 2017-04-05 | 1 | -17/+2 |
| | |||||
* | Merge pull request #1307 from MetaMask/mascara | kumavis | 2017-04-05 | 1 | -1/+0 |
|\ | | | | | Proof of Concept: Mascara | ||||
| * | clean - metamask controller - remove log | kumavis | 2017-04-05 | 1 | -1/+0 |
| | | |||||
| * | Merge branch 'master' into mascara | frankiebee | 2017-04-03 | 1 | -6/+8 |
| |\ | |||||
| * | | WIP: lost enital call from dapp to getAccounts | frankiebee | 2017-03-30 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'master' into mascara | frankiebee | 2017-03-29 | 1 | -1/+5 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into mascara | frankiebee | 2017-03-24 | 1 | -38/+17 |
| |\ \ \ | |||||
| * | | | | WIP: streams->indexdb | frankiebee | 2017-03-24 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Fix faucet to only autoFaucet first account | frankiebee | 2017-04-05 | 1 | -0/+2 |
| |_|_|/ |/| | | | |||||
* | | | | introduce platform api and rename notifications to notification-manager | kumavis | 2017-03-31 | 1 | -6/+8 |
| |_|/ |/| | | |||||
* | | | Merge pull request #1268 from MetaMask/kovan-faucet-instructions | Dan Finlay | 2017-03-29 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | Add Kovan faucet instructions | ||||
| * | | | Add link to kovan faucet instructions. | Kevin Serrano | 2017-03-28 | 1 | -0/+4 |
| | |/ | |/| | |||||
* / | | Assure that seed words are placed into state tree upon request. | Kevin Serrano | 2017-03-28 | 1 | -1/+1 |
|/ / | |||||
* | | Remove eth-lightwallet | Dan Finlay | 2017-03-17 | 1 | -37/+1 |
| | | |||||
* | | Merge branch 'master' into i1165-predictive | Kevin Serrano | 2017-03-15 | 1 | -1/+1 |
|\ \ | |||||
| * | | Rename variables to proper currency state variables. | Kevin Serrano | 2017-03-15 | 1 | -1/+1 |
| |/ | |||||
* | | Connect keyring controller to address book to prevent additional duplicates. | Kevin Serrano | 2017-03-11 | 1 | -5/+5 |
| | | |||||
* | | Allow for adding recently used addresses to address book. | Kevin Serrano | 2017-03-10 | 1 | -0/+4 |
| | | |||||
* | | Create persistence address book. | Kevin Serrano | 2017-03-10 | 1 | -0/+11 |
|/ | |||||
* | 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 | 1 | -4/+13 |
| | |||||
* | Merge branch 'master' into i1144-moarrpc | Kevin Serrano | 2017-03-08 | 1 | -4/+4 |
|\ | |||||
| * | Fix issue where old txMeta object was being used to pass the txHash to the cb | Frankie | 2017-03-07 | 1 | -4/+4 |
| | | |||||
* | | More conflict resolution. | Kevin Serrano | 2017-03-02 | 1 | -3/+3 |
|\ \ | |||||
| * | | add controllers to root scripts folder | Dan Finlay | 2017-02-28 | 1 | -3/+3 |
| | | | |||||
| * | | Merge branch 'master' into i1144-moarrpc | Dan Finlay | 2017-02-28 | 1 | -19/+101 |
| |\ \ | |||||
* | \ \ | Fix merge conflicts. | Kevin Serrano | 2017-03-02 | 1 | -31/+112 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | 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 |
| | | | |||||
| * | | Remove gasMultiplier txMeta param | Dan Finlay | 2017-03-01 | 1 | -10/+0 |
| | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | Add background method for updating and approving a tx in one call | Dan Finlay | 2017-02-28 | 1 | -2/+9 |
| |/ | |||||
| * | Removed redundant personal_recover logic | Dan Finlay | 2017-02-25 | 1 | -7/+0 |
| | | |||||
| * | Mostly fix personal_recover | Dan Finlay | 2017-02-25 | 1 | -0/+1 |
| | | |||||
| * | Fix cancel msg signing behavior. | Dan Finlay | 2017-02-24 | 1 | -6/+25 |
| | | |||||
| * | Got personal_sign working | Dan Finlay | 2017-02-24 | 1 | -19/+36 |
| | | | | | | | | Also fixed bug where signing would not close popup. | ||||
| * | 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 |
| | | |||||
| * | 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 | 1 | -1/+48 |
| | | | | | | | | 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. | ||||
* | | Tested against code to play nice with unit tests. | Kevin Serrano | 2017-02-24 | 1 | -1/+1 |
| | | |||||
* | | Fix naming | Kevin Serrano | 2017-02-22 | 1 | -1/+1 |
| | | |||||
* | | Basic infrasture for RPC list added. | Kevin Serrano | 2017-02-22 | 1 | -0/+1 |
|/ | |||||
* | Merge branch 'dev' into disclaimer-notify | Kevin Serrano | 2017-02-10 | 1 | -1/+2 |
|\ | |||||
| * | Allowed net_version to be called synchronously | Kevin Serrano | 2017-02-09 | 1 | -1/+2 |
| | | |||||
* | | Delete all code related to disclaimers. | Kevin Serrano | 2017-02-10 | 1 | -48/+0 |
|/ | |||||
* | Mostly got shapeshift tx management into its own controller | Dan Finlay | 2017-02-04 | 1 | -3/+12 |
| | | | | Rendering the list is still having issues, so this isn't done yet. | ||||
* | id mgmt - update to latest eth_sign spec | kumavis | 2017-02-04 | 1 | -16/+16 |
| | |||||
* | metamask - add missing diskState and memState subscriptions | kumavis | 2017-02-03 | 1 | -6/+11 |
| | |||||
* | migration #9 - break out CurrencyController substate | kumavis | 2017-02-03 | 1 | -25/+22 |
| | |||||
* | migration #8 - break out NoticeController substate | kumavis | 2017-02-03 | 1 | -2/+2 |
| | |||||
* | eth-store - convert to obs-store subclass | kumavis | 2017-02-03 | 1 | -2/+5 |
| | |||||
* | txManager - depend on preferencesStore | kumavis | 2017-02-03 | 1 | -1/+1 |
| | |||||
* | metamask - introduce networkStore | kumavis | 2017-02-03 | 1 | -28/+40 |
| | |||||
* | migration 7 - break off TransactionManager substate | kumavis | 2017-02-03 | 1 | -9/+12 |
| | |||||
* | messageManager - move view state to obs-store | kumavis | 2017-02-03 | 1 | -6/+8 |
| | |||||
* | keyring - replace getState with memStore | kumavis | 2017-02-03 | 1 | -1/+1 |
| | |||||
* | keyring - rm config dep | kumavis | 2017-02-03 | 1 | -2/+2 |
| | |||||
* | metamask - memState - adopt configManager.isDisclaimerConfirmed from keyring ↵ | kumavis | 2017-02-02 | 1 | -0/+1 |
| | | | | controller | ||||
* | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-02-02 | 1 | -23/+28 |
|\ | |||||
| * | metamask - adopt isInitialized from keyring controller | kumavis | 2017-02-01 | 1 | -1/+8 |
| | | |||||
| * | metamask - inherit some configManager state from keyring controller | kumavis | 2017-02-01 | 1 | -0/+3 |
| | | |||||
| * | keyring - synchronous getState | kumavis | 2017-02-01 | 1 | -22/+16 |
| | | |||||
* | | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-02-02 | 1 | -10/+24 |
|\| | |||||
| * | inpage - set web3.eth.defaultAccount correctly | kumavis | 2017-01-31 | 1 | -1/+1 |
| | | |||||
| * | continue rename selectedAccount to selectedAddress | kumavis | 2017-01-31 | 1 | -4/+4 |
| | | |||||
| * | rename selectedAccount to selectedAddress | kumavis | 2017-01-31 | 1 | -4/+6 |
| | | |||||
| * | metamask - rename getSelectedAccount to getSelectedAddress | kumavis | 2017-01-31 | 1 | -3/+3 |
| | | |||||
| * | metamask - move selectedAccount set/get to preferencesController | kumavis | 2017-01-31 | 1 | -9/+12 |
| | | |||||
| * | preferences - introduce preferences controller | kumavis | 2017-01-31 | 1 | -0/+9 |
| | | |||||
* | | code clan up and tests | Frankie | 2017-02-02 | 1 | -16/+18 |
| | | |||||
* | | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-01-30 | 1 | -4/+4 |
|\| | |||||
| * | metamask - lookup selectedAccount via keyringController | kumavis | 2017-01-30 | 1 | -3/+3 |
| | | |||||
| * | public config - get selectedAccount from keyring controller substate | kumavis | 2017-01-30 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-01-29 | 1 | -122/+135 |
|\| | |||||
| * | metamask - subscribe metamask store to keyringController substate | kumavis | 2017-01-29 | 1 | -0/+3 |
| | | |||||
| * | keyring - add and initialize obs-store | kumavis | 2017-01-29 | 1 | -1/+3 |
| | | |||||
| * | metamask - adopt shapeshift txs from keyringController | kumavis | 2017-01-28 | 1 | -1/+3 |
| | | |||||
| * | metamask - organize methods | kumavis | 2017-01-28 | 1 | -120/+126 |
| | | |||||
* | | Clean up message manger includes: | Frankie | 2017-01-29 | 1 | -24/+38 |
|/ | | | | | | | | | 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 | ||||
* | metamask - fix setupProviderConnection | kumavis | 2017-01-27 | 1 | -1/+1 |
| | |||||
* | 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 | 1 | -2/+31 |
| | |||||
* | metamask controller - adopt clearSeedWords from keyring controller | kumavis | 2017-01-27 | 1 | -4/+9 |
| | |||||
* | background - graceful publicConfigStore connection teardown | kumavis | 2017-01-27 | 1 | -1/+3 |
| | |||||
* | background - organize metamask instantiation | kumavis | 2017-01-27 | 1 | -34/+35 |
| | |||||
* | obs-store - use published module | kumavis | 2017-01-25 | 1 | -12/+17 |
| | |||||
* | Merge branch 'dev' of github.com:MetaMask/metamask-plugin into obs-store2 | kumavis | 2017-01-25 | 1 | -2/+20 |
|\ | |||||
| * | Merge branch 'dev' into i#1048 | kumavis | 2017-01-25 | 1 | -0/+11 |
| |\ | |||||
| * | | background controller - extract KeyringC.placeSeedWords to MetamaskC | kumavis | 2017-01-25 | 1 | -1/+10 |
| | | | |||||
| * | | Move the assumption of their only being one hd keyring when requesting seed ↵ | Frankie | 2017-01-25 | 1 | -1/+5 |
| | | | | | | | | | | | | words to metamaskController | ||||
| * | | Fix issue where generating a new account would put it in loose keys | Frankie | 2017-01-25 | 1 | -1/+6 |
| | | | |||||
* | | | Merge branch 'dev' into obs-store2 | kumavis | 2017-01-22 | 1 | -36/+38 |
|\ \ \ | | |/ | |/| | |||||
| * | | Added new modular private key import system | Dan Finlay | 2017-01-19 | 1 | -0/+11 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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! | ||||
| * | Allow importing of private key strings | Dan Finlay | 2017-01-18 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | 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`. | ||||
| * | background - return txHash to provider-engine on done | kumavis | 2017-01-15 | 1 | -14/+10 |
| | | |||||
| * | Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin into ↵ | kumavis | 2017-01-14 | 1 | -0/+1 |
| |\ | | | | | | | | | | bug-submitTx | ||||
| | * | Merge branch 'dev' into bug-submitTx | kumavis | 2017-01-14 | 1 | -0/+1 |
| | |\ | |||||
| | | * | Merge branch 'dev' into integrateTxManagerUI | Frankie | 2017-01-12 | 1 | -17/+6 |
| | | |\ | |||||
| | | * | | Take some of the tx Logic out of the UI and create a visble state for ↵ | Frankie | 2017-01-12 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | 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 | 1 | -34/+21 |
| | |/ | |/| | |||||
* | | | background - move pojo migrator to outside of metamask controller | kumavis | 2017-01-12 | 1 | -3/+3 |
| | | | |||||
* | | | background - introduce ObservableStore | kumavis | 2017-01-12 | 1 | -25/+28 |
|/ / | |||||
* | | 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 |
|/ | |||||
* | Merge branch 'dev' into TearDownOnDisconnect | kumavis | 2017-01-06 | 1 | -12/+18 |
|\ | |||||
| * | Merge branch 'dev' into fixTxManager | Dan Finlay | 2017-01-06 | 1 | -1/+1 |
| |\ | |||||
| * | | Combine two identical then blocks | Dan Finlay | 2017-01-06 | 1 | -4/+2 |
| | | | |||||
| * | | remove unnecessary try statments | Frankie | 2017-01-05 | 1 | -2/+1 |
| | | | |||||
| * | | Merge branch 'dev' into fixtTxManager | Frankie | 2017-01-05 | 1 | -15/+24 |
| |\ \ | |||||
| * | | | Fix signing of transactions | Frankie | 2017-01-05 | 1 | -11/+19 |
| | | | | |||||
* | | | | Merge branch 'dev' into TearDownOnDisconnect | kumavis | 2017-01-06 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Fix dependency reference | Dan Finlay | 2017-01-05 | 1 | -1/+1 |
| | |/ | |/| | |||||
* / | | MetaMask Controller - Convert to EventEmitter | Frankie | 2017-01-06 | 1 | -6/+5 |
|/ / | |||||
* | | 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 | ||||
* | | Merge branch 'dev' into ShowDifferentAccounts | Dan Finlay | 2017-01-03 | 1 | -8/+27 |
|\| | |||||
| * | Merge branch 'dev' into TxManager | Frankie | 2016-12-24 | 1 | -2/+78 |
| |\ | |||||
| * | | fix some minor spelling mistakes and clean up code | Frankie | 2016-12-24 | 1 | -8/+2 |
| | | | |||||
| * | | fix merge | Frances Pangilinan | 2016-12-22 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'dev' into TxManager | Frankie | 2016-12-22 | 1 | -8/+24 |
| |\ \ | |||||
| * | | | Migrate all tx mutation code out of keyring controller and | Frances Pangilinan | 2016-12-22 | 1 | -2/+12 |
| | | | | | | | | | | | | | | | | Fix up txManager to reflect code review requests | ||||
| * | | | First pass at revision requests | Frances Pangilinan | 2016-12-22 | 1 | -18/+20 |
| | | | | |||||
| * | | | Create a TxManager | Frances Pangilinan | 2016-12-15 | 1 | -2/+14 |
| | | | | |||||
* | | | | 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 | 1 | -10/+13 |
|/ / / | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | 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 | 1 | -19/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | Move old keystore migration code to metamask controller | Dan Finlay | 2016-12-22 | 1 | -1/+49 |
| | | | | | | | | | | | | 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 | 1 | -1/+16 |
| |/ |/| | | | | | - Confirm button will now dismiss the lost accounts array. | ||||
* | | Merged master into dev | Dan Finlay | 2016-12-20 | 1 | -9/+24 |
|\ \ | |/ |/| | |||||
| * | move notice code from metamask-controller + config-manager, in to ↵ | kumavis | 2016-12-17 | 1 | -46/+19 |
| | | | | | | | | 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 | 1 | -2/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | 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 |
| | | |||||
* | | Ordered keyringController methods the same in metamask-controller | Dan Finlay | 2016-11-30 | 1 | -4/+4 |
| | | |||||
* | | Fix nodeify usage | Dan Finlay | 2016-11-29 | 1 | -11/+11 |
| | | |||||
* | | Denodeify most of KeyringController | Dan Finlay | 2016-11-29 | 1 | -11/+15 |
| | | | | | | | | | | | | | | | | | | | | 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 'dev' into dev-cleanup | Kevin Serrano | 2016-11-23 | 1 | -1/+1 |
|\ \ | |||||
| * | | Make ropsten faucet button point at the correct url. | Kevin Serrano | 2016-11-23 | 1 | -1/+1 |
| | | | |||||
* | | | Change fauceting to become a response of an emit. | Kevin Serrano | 2016-11-22 | 1 | -0/+6 |
| | | | |||||
* | | | change all instances of selectedAddress to selectedAccount. | Kevin Serrano | 2016-11-22 | 1 | -5/+5 |
|/ / | |||||
* | | Resolve merge conflicts. | Kevin Serrano | 2016-11-16 | 1 | -1/+0 |
|\| | |||||
| * | First attempt at fixing errors in confirmation screen. | Kevin Serrano | 2016-11-15 | 1 | -1/+0 |
| | | |||||
* | | Re-enable disclaimer screen. Rename variables to reflect role more clearly. | Kevin Serrano | 2016-11-15 | 1 | -2/+2 |
| | | |||||
* | | Linting to the max. | Kevin Serrano | 2016-11-12 | 1 | -21/+2 |
| | | |||||
* | | fix tx data so it has the network id | Frankie | 2016-11-11 | 1 | -0/+6 |
| | | |||||
* | | Merge branch 'master' into i328-MultiVault | Frankie | 2016-11-11 | 1 | -1/+0 |
|\| | |||||
| * | Fix bug for increasing gas by 20 percent. | Kevin Serrano | 2016-11-10 | 1 | -1/+0 |
| | | |||||
* | | Add reveal of seed words. | Kevin Serrano | 2016-11-02 | 1 | -0/+1 |
| | | |||||
* | | Fixed bugs related to clearing caches when restoring to a new vault | Dan Finlay | 2016-11-02 | 1 | -3/+2 |
| | | |||||
* | | Made progress on parity for MultiVault | Kevin Serrano | 2016-11-02 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | - 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. | ||||
* | | Implement seed word confirmation page. | Kevin Serrano | 2016-11-01 | 1 | -0/+1 |
| | | | | | | | | | | Remove logs. Move HD render files to ui/app. | ||||
* | | Configure BIP44 Keychain as default one | Dan Finlay | 2016-10-29 | 1 | -0/+1 |
| | | |||||
* | | Phase out extra warning screen. | Kevin Serrano | 2016-10-26 | 1 | -10/+0 |
| | | |||||
* | | Added tx & msg managing functionality to new KeyringController | Dan Finlay | 2016-10-22 | 1 | -1/+2 |
| | | |||||
* | | Added tx and msg signing to keychain & controller | Dan Finlay | 2016-10-21 | 1 | -34/+34 |
| | | |||||
* | | Began adding first basic keyring | Dan Finlay | 2016-10-21 | 1 | -0/+2 |
| | | |||||
* | | Git merge resolution. | Kevin Serrano | 2016-10-20 | 1 | -0/+9 |
|\| | |||||
| * | Fix for linting | Frankie | 2016-10-14 | 1 | -1/+1 |
| | | |||||
| * | Create callback and Clean-up details | Frankie | 2016-10-14 | 1 | -2/+7 |
| | | |||||
| * | Merge branch 'master' into i#495CustomGasField | Frankie | 2016-10-14 | 1 | -2/+2 |
| |\ | |||||
| * | | Fix gasPrice range | Frankie | 2016-10-14 | 1 | -0/+5 |
| | | | |||||
* | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2016-10-13 | 1 | -13/+31 |
|\ \ \ | |_|/ |/| | | | | | origin/i328-MultiVault | ||||
| * | | Add minimal method signatures to new keyring controller | Dan Finlay | 2016-10-13 | 1 | -13/+31 |
| |/ | |||||
* | | Remove logs. | Kevin Serrano | 2016-10-13 | 1 | -2/+0 |
| | | |||||
* | | Fix misnamed variable. | Kevin Serrano | 2016-10-13 | 1 | -2/+4 |
|/ | |||||
* | Cleanup. | Kevin Serrano | 2016-10-12 | 1 | -2/+0 |
| | |||||
* | lint | Kevin Serrano | 2016-10-12 | 1 | -2/+1 |
| | |||||
* | Move tos hash comparison logic from background to mm controller. | Kevin Serrano | 2016-10-12 | 1 | -10/+15 |
| | |||||
* | Fix linting and guarantees set TOS hash. | Kevin Serrano | 2016-10-07 | 1 | -0/+1 |
| | |||||
* | Fix retention of terms of service hash across reloads of plugin. | Kevin Serrano | 2016-10-07 | 1 | -1/+1 |
| | |||||
* | Add controller functions for storing and checking TOS hashes. | Kevin Serrano | 2016-10-06 | 1 | -1/+34 |
| | |||||
* | Improve popup behavior for parity errors | Dan Finlay | 2016-10-04 | 1 | -17/+5 |
| | | | | When we receive an invalid params error, instead of opening the popup and showing no tx, we now just forward that tx back to the UI code. | ||||
* | Fix for readability | Frankie | 2016-10-02 | 1 | -1/+1 |
| | |||||
* | Fix issue #688 where fiat conversion does not persist when switching networks | Frankie | 2016-10-01 | 1 | -1/+2 |
| | |||||
* | Drop origin key from requests for Parity compatibility | Dan Finlay | 2016-09-19 | 1 | -0/+5 |
| | |||||
* | Change Testfaucet url | Frankie | 2016-09-16 | 1 | -1/+1 |
| | |||||
* | Ensure listener is cleaned up | Dan Finlay | 2016-09-07 | 1 | -1/+1 |
| | | | | Also fixed bug when validating a tx with no value. | ||||
* | Add negative value validation to tx approval | Dan Finlay | 2016-09-07 | 1 | -0/+10 |
| |