Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | test for pending tx watcher | frankiebee | 2017-08-05 | 4 | -100/+280 |
| | |||||
* | test for SufficientBalance | frankiebee | 2017-08-05 | 1 | -0/+41 |
| | |||||
* | rename the test description Transaction Manger -> Message Manger | frankiebee | 2017-08-05 | 1 | -1/+1 |
| | |||||
* | remove unused sinon | frankiebee | 2017-08-03 | 1 | -1/+0 |
| | |||||
* | fix test | frankiebee | 2017-08-03 | 1 | -1/+1 |
| | |||||
* | move newUnapprovedTransaction to transactions.js | frankiebee | 2017-08-03 | 1 | -3/+66 |
| | |||||
* | Merge branch 'master' into transactionControllerRefractor | frankiebee | 2017-08-02 | 2 | -3/+29 |
|\ | |||||
| * | Merge branch 'master' into i1805-LiveBlacklistUpdating | Dan Finlay | 2017-07-27 | 1 | -0/+24 |
| |\ | |||||
| | * | Add test for blacklister. | Kevin Serrano | 2017-07-27 | 1 | -0/+24 |
| |/ | |||||
| * | nonce-tracker - fix test | kumavis | 2017-07-27 | 1 | -3/+5 |
| | | |||||
* | | add test for addTxDefaults | frankiebee | 2017-08-02 | 1 | -5/+30 |
| | | |||||
* | | make addUnapprovedTransaction async function and use promise based ethQuery | frankiebee | 2017-08-02 | 2 | -23/+50 |
|/ | |||||
* | tx cont - fix test to use async api | kumavis | 2017-07-26 | 1 | -2/+6 |
| | |||||
* | tx cont - add argument for provider constructor | kumavis | 2017-07-26 | 1 | -15/+21 |
| | |||||
* | Fix transaction confirmation ordering | Dan Finlay | 2017-07-18 | 1 | -0/+17 |
| | | | | | | Newest tx or message will now always appear last, and a new tx proposed after the user has a confirmation box open will never change the confirmation to a different tx proposed. Fixes #1637 | ||||
* | Sinon stub infura network status | tmashuang | 2017-07-15 | 1 | -14/+18 |
| | |||||
* | Use Let instead of var | tmashuang | 2017-07-15 | 1 | -1/+1 |
| | |||||
* | Infura Network response tests | tmashuang | 2017-07-15 | 1 | -34/+58 |
| | |||||
* | make publishTransaction and signTransaction async methods | frankiebee | 2017-07-14 | 1 | -11/+9 |
| | |||||
* | Merge branch 'master' into nonce-tracker | frankiebee | 2017-07-13 | 1 | -33/+33 |
|\ | |||||
| * | tests - disable infura test | kumavis | 2017-07-12 | 1 | -33/+33 |
| | | |||||
* | | Fix test to match behavior | frankiebee | 2017-07-13 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into nonce-tracker | frankiebee | 2017-07-12 | 1 | -0/+38 |
|\| | |||||
| * | Improve insufficient balance checking in retry loop | Dan Finlay | 2017-07-12 | 1 | -0/+38 |
| | | |||||
* | | test - tx controller - fix promise handling | kumavis | 2017-07-08 | 1 | -5/+2 |
| | | |||||
* | | test - tx-controller - stub block-tracker method | kumavis | 2017-07-08 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into nonce-tracker | kumavis | 2017-07-08 | 1 | -0/+40 |
|\| | |||||
| * | Fix failing test | Dan Finlay | 2017-07-06 | 1 | -27/+29 |
| | | |||||
| * | Add missing done | Dan Finlay | 2017-07-06 | 1 | -1/+2 |
| | | |||||
| * | Typo fix | Dan Finlay | 2017-07-06 | 1 | -1/+1 |
| | | |||||
| * | Add failing test for retrying an over-spending tx | Dan Finlay | 2017-07-06 | 1 | -0/+37 |
| | | |||||
* | | Merge branch 'master' into nonce-tracker | frankiebee | 2017-06-28 | 2 | -6/+42 |
|\| | |||||
| * | Merge pull request #1663 from MetaMask/infura-status | Thomas Huang | 2017-06-27 | 1 | -0/+34 |
| |\ | | | | | | | Add Infura Status Information to UI State | ||||
| | * | remove option fetch | frankiebee | 2017-06-23 | 1 | -2/+1 |
| | | | |||||
| | * | add `done` and stub fetch | frankiebee | 2017-06-23 | 1 | -8/+9 |
| | | | |||||
| | * | Add test for infura controller. | Kevin Serrano | 2017-06-23 | 1 | -0/+34 |
| | | | |||||
| * | | Print integration build errors | Dan Finlay | 2017-06-22 | 1 | -6/+8 |
| |/ | |||||
* | | Merge branch 'master' into nonce-tracker | frankiebee | 2017-06-22 | 1 | -9/+0 |
|\| | |||||
| * | Remove second linting script for tests | Thomas Huang | 2017-06-18 | 1 | -9/+0 |
| | | |||||
| * | add a check for weather a tx is included in a block when jumping blocks | frankiebee | 2017-06-15 | 1 | -0/+1 |
| | | |||||
* | | fix nonceTracker | frankiebee | 2017-06-22 | 1 | -12/+6 |
| | | |||||
* | | add a test for #getNonceLock | frankiebee | 2017-06-22 | 1 | -0/+46 |
| | | |||||
* | | remove irrelevant test | frankiebee | 2017-06-17 | 1 | -5/+0 |
| | | |||||
* | | Fix test to call done | frankiebee | 2017-06-16 | 1 | -7/+8 |
| | | |||||
* | | transaction controller - use nonce-tracker | kumavis | 2017-06-15 | 1 | -3/+4 |
|/ | |||||
* | Finish async when failing async test | Thomas Huang | 2017-06-13 | 1 | -1/+1 |
| | |||||
* | Make test Async | Thomas Huang | 2017-06-13 | 1 | -1/+2 |
| | |||||
* | Linting | Thomas Huang | 2017-06-13 | 7 | -28/+23 |
| | |||||
* | Merge pull request #1574 from MetaMask/internfix | Dan Finlay | 2017-06-13 | 1 | -1/+1 |
|\ | | | | | Wording fix for notice button | ||||
| * | Modify wording to new accept. | Kevin Serrano | 2017-06-10 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of github.com:nihar97/metamask-plugin into internfix | Kevin Serrano | 2017-06-09 | 1 | -1/+1 |
| |\ | |||||
| | * | continue button changed to agree | Nihar | 2017-05-17 | 1 | -1/+1 |
| | | | |||||
* | | | Modify tests for new api mock.' | Kevin Serrano | 2017-06-06 | 1 | -2/+2 |
|/ / | |||||
* | | Modfiy test to ether standards. | Kevin Serrano | 2017-05-25 | 1 | -4/+4 |
| | | |||||
* | | Merge branch 'master' into i1412-decimalizethegas | Kevin Serrano | 2017-05-25 | 3 | -2/+85 |
|\ \ | |||||
| * | | clean up test | frankiebee | 2017-05-24 | 1 | -2/+1 |
| | | | |||||
| * | | stop polling when switching networks | frankiebee | 2017-05-24 | 1 | -1/+5 |
| | | | |||||
| * | | Fix for tests | frankiebee | 2017-05-24 | 3 | -2/+82 |
| | | | |||||
* | | | Fix test, create new value for precision/scale | Kevin Serrano | 2017-05-24 | 1 | -2/+3 |
| | | | |||||
* | | | Modify test, replace clone package. | Kevin Serrano | 2017-05-18 | 1 | -2/+2 |
| | | | |||||
* | | | Linted test | Dan Finlay | 2017-05-17 | 1 | -6/+4 |
| | | | |||||
* | | | Clean up test | Dan Finlay | 2017-05-17 | 1 | -4/+1 |
| | | | |||||
* | | | Simplify test to represent realistic use case | Dan Finlay | 2017-05-17 | 1 | -10/+6 |
| | | | |||||
* | | | Merge branch 'master' into i1412-BrutalTests | Dan Finlay | 2017-05-17 | 2 | -19/+95 |
|\| | | |||||
| * | | Add test around txManager#approveTransaction | Dan Finlay | 2017-05-17 | 1 | -3/+64 |
| | | | |||||
| * | | Improve test | Dan Finlay | 2017-05-17 | 1 | -1/+5 |
| | | | |||||
| * | | Linted | Dan Finlay | 2017-05-17 | 1 | -3/+2 |
| | | | |||||
| * | | Fix quotation mark | Dan Finlay | 2017-05-17 | 1 | -1/+1 |
| | | | |||||
| * | | Linted and removed unused deps | Dan Finlay | 2017-05-17 | 1 | -15/+8 |
| | | | |||||
| * | | Add gas updating test to tx controller tests | Dan Finlay | 2017-05-17 | 1 | -1/+21 |
| | | | |||||
| * | | Remove only line from test | Dan Finlay | 2017-05-17 | 1 | -1/+1 |
| |/ | |||||
* / | Add test requiring high precision | Dan Finlay | 2017-05-17 | 2 | -1/+60 |
|/ | |||||
* | Rename tx manager to tx controller | Dan Finlay | 2017-05-17 | 1 | -54/+54 |
| | |||||
* | Merge pull request #1436 from MetaMask/mig13 | Dan Finlay | 2017-05-17 | 2 | -1/+20 |
|\ | | | | | migration 13 - change provider from testnet to ropsten | ||||
| * | migration 13 - change provider from testnet to ropsten | kumavis | 2017-05-16 | 1 | -0/+6 |
| | | |||||
| * | test - format test data 001 | kumavis | 2017-05-16 | 1 | -1/+14 |
| | | |||||
* | | Merge branch 'master' into i1407-FixNonEditingTxForm | Dan Finlay | 2017-05-16 | 1 | -0/+41 |
|\| | |||||
| * | Create test for Migrator | frankiebee | 2017-05-12 | 1 | -0/+41 |
| | | |||||
* | | Clean up test | Dan Finlay | 2017-05-16 | 1 | -14/+2 |
| | | |||||
* | | Verify updating gas value updates | Dan Finlay | 2017-05-16 | 1 | -3/+5 |
| | | |||||
* | | Got test failing nearly correctly | Dan Finlay | 2017-05-16 | 2 | -14/+33 |
| | | |||||
* | | Got a useful error message for next step | Dan Finlay | 2017-05-12 | 1 | -2/+22 |
| | | |||||
* | | Fix test up a bit | Dan Finlay | 2017-05-12 | 1 | -6/+4 |
| | | |||||
* | | Use react test utils to start composing test | Dan Finlay | 2017-05-12 | 1 | -6/+19 |
| | | |||||
* | | Got test failing | Dan Finlay | 2017-05-12 | 1 | -1/+3 |
| | | |||||
* | | Fix tests add logs | Dan Finlay | 2017-05-12 | 1 | -3/+7 |
| | | |||||
* | | Add an attempt at a unit test for reproducing #1407 | Dan Finlay | 2017-05-11 | 1 | -0/+61 |
|/ | |||||
* | Whoops missed some modules | Thomas Huang | 2017-05-05 | 4 | -8/+0 |
| | |||||
* | Remove unused modules and STORAGE_KEY | Thomas Huang | 2017-05-05 | 6 | -14/+0 |
| | |||||
* | Lint tests | Thomas Huang | 2017-05-05 | 31 | -481/+438 |
| | |||||
* | Merge branch 'master' of github.com:MetaMask/metamask-plugin into platform | kumavis | 2017-04-01 | 3 | -45/+84 |
|\ | |||||
| * | Merge pull request #1297 from MetaMask/eip155 | Dan Finlay | 2017-04-01 | 2 | -30/+66 |
| |\ | | | | | | | tx-manager - add eip155 support | ||||
| | * | tests - tx-manager - fix assert and clean formatting | kumavis | 2017-03-31 | 1 | -9/+1 |
| | | | |||||
| | * | tx-manager - add eip155 support | kumavis | 2017-03-31 | 2 | -31/+75 |
| | | | |||||
| * | | test - fix notice-controller test | kumavis | 2017-03-31 | 1 | -15/+18 |
| | | | |||||
* | | | etc - fix notification-manager ref, remove duplicated test file | kumavis | 2017-03-31 | 1 | -77/+0 |
|/ / | |||||
* | | tests - add missing done | kumavis | 2017-03-31 | 1 | -1/+1 |
| | | |||||
* | | tests - helper - add note | kumavis | 2017-03-31 | 1 | -9/+11 |
| | | |||||
* | | tests - unit - fail on unhandled promise rejection | kumavis | 2017-03-31 | 1 | -4/+45 |
|/ | |||||
* | tests - tx-utils gasBuffer calc - fix bug and user easier numbers | kumavis | 2017-03-30 | 1 | -11/+17 |
| | |||||
* | explorer - fix ropsten explorer link tests | kumavis | 2017-03-28 | 2 | -8/+13 |
| | |||||
* | tests - fix ropsten link check | kumavis | 2017-03-28 | 1 | -2/+2 |
| | |||||
* | correct bug in test. | Kevin Serrano | 2017-03-25 | 1 | -1/+1 |
| | |||||
* | Add tests. | Kevin Serrano | 2017-03-25 | 1 | -0/+11 |
| | |||||
* | Add migration tests to ensure that bodies are erased properly in notices. | Kevin Serrano | 2017-03-23 | 2 | -0/+14 |
| | |||||
* | Remove eth-lightwallet | Dan Finlay | 2017-03-17 | 4 | -352/+0 |
| | |||||
* | Add test to account for prevention of identities duplication. | Kevin Serrano | 2017-03-11 | 1 | -1/+22 |
| | |||||
* | Add another test for duplicates. | Kevin Serrano | 2017-03-11 | 1 | -0/+7 |
| | |||||
* | Add basic tests. | Kevin Serrano | 2017-03-11 | 2 | -1/+29 |
| | |||||
* | Merge branch 'master' into kumavis-patch-1 | Dan Finlay | 2017-03-09 | 3 | -5/+6 |
|\ | |||||
| * | Merge branch 'master' into i1144-moarrpc | Kevin Serrano | 2017-03-09 | 1 | -0/+26 |
| |\ | |||||
| * | | Fix tests until new ones to-be-written. | Kevin Serrano | 2017-03-08 | 1 | -17/+0 |
| | | | |||||
| * | | Merge github.com:MetaMask/metamask-plugin into i1144-moarrpc | Kevin Serrano | 2017-03-08 | 1 | -1/+1 |
| |\ \ | |||||
| * | | | Refactor of code into separate reducers and actions. | Kevin Serrano | 2017-03-08 | 1 | -10/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into i1144-moarrpc | Kevin Serrano | 2017-03-08 | 2 | -1/+47 |
| |\ \ \ | |||||
| * | | | | Modify tests.' | Kevin Serrano | 2017-03-08 | 1 | -15/+19 |
| | | | | | |||||
| * | | | | More conflict resolution. | Kevin Serrano | 2017-03-02 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Fix test reference | Dan Finlay | 2017-02-28 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into i1144-moarrpc | Dan Finlay | 2017-02-28 | 5 | -289/+98 |
| | |\ \ \ \ | |||||
| * | \ \ \ \ | Fix merge conflicts. | Kevin Serrano | 2017-03-02 | 5 | -289/+98 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Fix spelling error. | Kevin Serrano | 2017-02-25 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Tested against code to play nice with unit tests. | Kevin Serrano | 2017-02-24 | 1 | -3/+25 |
| | | | | | | |||||
* | | | | | | tx-utils - add encoding utils | kumavis | 2017-03-08 | 1 | -8/+14 |
| | | | | | | |||||
* | | | | | | tx-utils - stricter naming type-based convention | kumavis | 2017-03-08 | 1 | -14/+14 |
| | | | | | | |||||
* | | | | | | test - tx-utils | kumavis | 2017-03-08 | 1 | -3/+29 |
| |_|_|_|/ |/| | | | | | | | | | add tests for `addGasBuffer` | ||||
* | | | | | Merge branch 'master' into i1118-IncreaseGasBuffer | jaredpereira | 2017-03-08 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Fixed encoding | Dan Finlay | 2017-03-08 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Remove unrelated test file | Dan Finlay | 2017-03-08 | 1 | -38/+0 |
| | | | | | |||||
| * | | | | Fix test name | Dan Finlay | 2017-03-07 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixed internal encoding test case | Dan Finlay | 2017-03-07 | 2 | -1/+39 |
| | |_|/ | |/| | | |||||
* | | | | change BN.mul to BN.muln | Jared Pereira | 2017-03-08 | 1 | -9/+7 |
| | | | | |||||
* | | | | add gas buffer multiply test | Jared Pereira | 2017-03-08 | 1 | -16/+6 |
| | | | | |||||
* | | | | Add gas buffer test | Dan Finlay | 2017-03-08 | 1 | -0/+38 |
|/ / / | |||||
* | | | Fix normalizeMsgData function to always return hex prefixed | Dan Finlay | 2017-03-07 | 1 | -2/+2 |
| | | | |||||
* | | | Fix function names | Dan Finlay | 2017-03-07 | 1 | -6/+6 |
| | | | |||||
* | | | Render personal_sign messages as utf-8 text | Dan Finlay | 2017-03-07 | 2 | -1/+47 |
| |/ |/| | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | Fixed reference | Dan Finlay | 2017-02-24 | 1 | -1/+1 |
| | | |||||
* | | Fix references in tests | Dan Finlay | 2017-02-24 | 1 | -5/+5 |
| | | |||||
* | | Remove irrelevant tests | Dan Finlay | 2017-02-24 | 1 | -8/+4 |
| | | |||||
* | | Move sigUtil and keyrings to external modules | Dan Finlay | 2017-02-22 | 3 | -276/+89 |
|/ | | | | 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. | ||||
* | Add log global to test suite | Dan Finlay | 2017-02-21 | 1 | -0/+6 |
| | |||||
* | Integration tests play nice with new disabled buttons. | Kevin Serrano | 2017-02-21 | 1 | -2/+6 |
| | |||||
* | add waits between notices. | Kevin Serrano | 2017-02-21 | 1 | -0/+13 |
| | |||||
* | Merge branch 'master' into dev | Dan Finlay | 2017-02-16 | 2 | -2/+42 |
|\ | |||||
| * | Verify messages in a loop | Dan Finlay | 2017-02-14 | 1 | -27/+25 |
| | | |||||
| * | got hash test passing | Dan Finlay | 2017-02-14 | 1 | -14/+23 |
| | | |||||
| * | Add failing test for signature recovery | Dan Finlay | 2017-02-14 | 1 | -0/+33 |
| | | |||||
| * | Revert old style message sighing | Frankie | 2017-02-10 | 2 | -2/+2 |
| | | |||||
* | | Complete migration tests. | Kevin Serrano | 2017-02-16 | 1 | -15/+74 |
| | | |||||
* | | Adding additional migration state to account for moving data. | Kevin Serrano | 2017-02-16 | 1 | -0/+138 |
| | | |||||
* | | Add migrations for removing terms of use data. | Kevin Serrano | 2017-02-15 | 1 | -2/+6 |
| | | |||||
* | | Merge branch 'mapachurro-patch-1' of github.com:mapachurro/metamask-plugin ↵ | Kevin Serrano | 2017-02-11 | 1 | -0/+28 |
|\ \ | | | | | | | | | | into mapachurro-patch-1 | ||||
| * | | Update first-time.js | mapachurro | 2017-02-10 | 1 | -0/+28 |
| |/ | |||||
* | | Fix integration tests. | Kevin Serrano | 2017-02-10 | 1 | -18/+2 |
| | | |||||
* | | Delete all code related to disclaimers. | Kevin Serrano | 2017-02-10 | 4 | -38/+2 |
|/ | |||||
* | test - skip eth_sign tests until we have test data | kumavis | 2017-02-04 | 2 | -2/+2 |
| | |||||
* | migration #9 - break out CurrencyController substate | kumavis | 2017-02-03 | 2 | -75/+87 |
| | |||||
* | txManager - depend on preferencesStore | kumavis | 2017-02-03 | 1 | -1/+0 |
| | |||||
* | metamask - introduce networkStore | kumavis | 2017-02-03 | 1 | -12/+3 |
| | |||||
* | migration 7 - break off TransactionManager substate | kumavis | 2017-02-03 | 2 | -54/+60 |
| | |||||
* | messageManager - move view state to obs-store | kumavis | 2017-02-03 | 1 | -13/+4 |
| | |||||
* | test - first-time - re-add terms header check | kumavis | 2017-02-02 | 1 | -0/+2 |
| | |||||
* | tests - mockDev - fix first-time flow | kumavis | 2017-02-02 | 1 | -20/+18 |
| | |||||
* | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-02-02 | 2 | -16/+4 |
|\ | |||||
| * | metamask - adopt isInitialized from keyring controller | kumavis | 2017-02-01 | 1 | -9/+0 |
| | | |||||
| * | keyring - move identities into memStore | kumavis | 2017-02-01 | 1 | -2/+4 |
| | | |||||
| * | keyring - synchronous getState | kumavis | 2017-02-01 | 1 | -9/+4 |
| | | |||||
* | | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-02-02 | 2 | -3/+3 |
|\| | |||||
| * | continue rename selectedAccount to selectedAddress | kumavis | 2017-01-31 | 2 | -3/+3 |
| | | |||||
* | | code clan up and tests | Frankie | 2017-02-02 | 1 | -0/+98 |
| | | |||||
* | | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-01-29 | 3 | -154/+31 |
|\| | |||||
| * | migration 5 - move keyring controller state to substate | kumavis | 2017-01-29 | 2 | -39/+20 |
| | | |||||
| * | tests - remove persistence and start with initial state | kumavis | 2017-01-28 | 2 | -115/+11 |
| | | |||||
* | | Clean up message manger includes: | Frankie | 2017-01-29 | 1 | -3/+3 |
|/ | | | | | | | | | 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 | ||||
* | config-manager - default to USD for currentFiat | kumavis | 2017-01-27 | 1 | -14/+4 |
| | |||||
* | obs-store - use published module | kumavis | 2017-01-25 | 4 | -26/+17 |
| | |||||
* | Merge branch 'dev' of github.com:MetaMask/metamask-plugin into obs-store2 | kumavis | 2017-01-25 | 1 | -0/+3 |
|\ | |||||
| * | background controller - extract KeyringC.placeSeedWords to MetamaskC | kumavis | 2017-01-25 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'dev' into obs-store2 | kumavis | 2017-01-22 | 6 | -50/+74 |
|\| | |||||
| * | Fix test to log out despite number of menu items | Dan Finlay | 2017-01-18 | 1 | -1/+2 |
| | | |||||
| * | Wrote failing test for eth.sign | Dan Finlay | 2017-01-17 | 1 | -0/+18 |
| | | |||||
| * | Merge branch 'dev' into simple-keystore-fix | kumavis | 2017-01-17 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch 'master' into dev | Dan Finlay | 2017-01-17 | 1 | -1/+1 |
| | |\ | |||||
| | | * | remove network Id 2 from explorer link and Add network Id 3 | Frances Pangilinan | 2016-12-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | test - keyring - simple - fix fixture data | kumavis | 2017-01-17 | 1 | -6/+3 |
| |/ / | |||||
| * | | test - clear localStorage on test start | kumavis | 2017-01-15 | 1 | -3/+3 |
| | | | |||||
| * | | test - clear localStorage in case CI caches it (?) | kumavis | 2017-01-15 | 1 | -0/+1 |
| | | | |||||
| * | | test - txManager - add network to all txs | kumavis | 2017-01-15 | 1 | -18/+19 |
| | | | |||||
| * | | tests - txManager - add getNetwork fn to fixture txManager | kumavis | 2017-01-15 | 1 | -0/+1 |
| | | | |||||
| * | | fix for linting | Frankie | 2017-01-14 | 1 | -2/+2 |
| | | | |||||
| * | | background - handle tx finalization in controllers instead of provider-engine | kumavis | 2017-01-13 | 2 | -22/+27 |
| | | | |||||
* | | | migrations - introduce promise-based migrator | kumavis | 2017-01-12 | 1 | -24/+24 |
| | | | |||||
* | | | background - move pojo migrator to outside of metamask controller | kumavis | 2017-01-12 | 3 | -79/+39 |
| | | | |||||
* | | | test - fix tests from obs-store | kumavis | 2017-01-12 | 3 | -8/+13 |
| | | | |||||
* | | | background - introduce ObservableStore | kumavis | 2017-01-12 | 1 | -18/+15 |
|/ / | |||||
* | | tests - add fetch polyfill | kumavis | 2017-01-11 | 1 | -1/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/kumavis-readme-gource' into RevertTxManager | Dan Finlay | 2017-01-03 | 7 | -131/+203 |
|\ \ | |||||
| * \ | Merge branch 'dev' into TxManager | Frankie | 2016-12-24 | 4 | -128/+76 |
| |\ \ | |||||
| * | | | fix some minor spelling mistakes and clean up code | Frankie | 2016-12-24 | 1 | -6/+6 |
| | | | | |||||
| * | | | Merge branch 'dev' into TxManager | Frankie | 2016-12-22 | 7 | -115/+184 |
| |\ \ \ | |||||
| * | | | | First pass at revision requests | Frances Pangilinan | 2016-12-22 | 3 | -77/+48 |
| | | | | | |||||
| * | | | | add Test for txManager. As well as fix tests to account for txManager. | Frances Pangilinan | 2016-12-15 | 6 | -80/+185 |
| | | | | | |||||
* | | | | | Correct getState test to be async | Dan Finlay | 2016-12-24 | 1 | -4/+7 |
| | | | | | |||||
* | | | | | Add additional migration test | Dan Finlay | 2016-12-24 | 2 | -2/+20 |
| |_|/ / |/| | | | |||||
* | | | | Restructured migration | Dan Finlay | 2016-12-22 | 3 | -123/+75 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | Fixed another lostAccount test | Dan Finlay | 2016-12-22 | 1 | -1/+1 |
| | | | | |||||
* | | | | Refine a lostAccount test | Dan Finlay | 2016-12-21 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Merge pull request #916 from MetaMask/i894-DetectBadAccounts | Dan Finlay | 2016-12-21 | 4 | -41/+66 |
|\ \ \ | | | | | | | | | I894 detect bad accounts | ||||
| * | | | Made changes according to feedback. | Dan Finlay | 2016-12-20 | 1 | -1/+0 |
| | | | | |||||
| * | | | Got bad account detection working and added to state | Dan Finlay | 2016-12-10 | 1 | -3/+5 |
| | | | | |||||
| * | | | Mostly added bad account detection | Dan Finlay | 2016-12-09 | 4 | -41/+65 |
| |/ / | | | | | | | | | | 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 | -71/+0 |
| | | | | | | | | | | | | I broke out the encryptor lib into its own module on npm called browser-passworder. | ||||
* | | | Merged master into dev | Dan Finlay | 2016-12-20 | 2 | -3/+118 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | move notice code from metamask-controller + config-manager, in to ↵ | kumavis | 2016-12-17 | 2 | -94/+115 |
| | | | | | | | | notice-controller | ||||
| * | clean - code style | kumavis | 2016-12-17 | 1 | -4/+3 |
| | | |||||
| * | Add ability to show notices to user & get confirmation. | Kevin Serrano | 2016-12-17 | 1 | -0/+95 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | Cranked up CI test suite wait duration to alleviate their nondeterminism for now | Dan Finlay | 2016-12-08 | 1 | -1/+1 |
| | | |||||
* | | Remove .only from unit test suite | Dan Finlay | 2016-12-08 | 1 | -1/+1 |
| | | |||||
* | | Fix vault encrypting & unlocking bug | Dan Finlay | 2016-12-01 | 2 | -0/+6 |
| | | | | | | | | | | | | | | | | 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 integration tests for logging out and back in | Dan Finlay | 2016-12-01 | 1 | -1/+27 |
| | | |||||
* | | Add more integration tests | Dan Finlay | 2016-12-01 | 1 | -0/+25 |
| | | | | | | | | | | | | | | | | Integration tests now: - Scroll through terms - Accept terms - Confirm seed phrase - Verify account detail screen | ||||
* | | Made integration test create a first vault | Dan Finlay | 2016-12-01 | 3 | -3/+25 |
| | | |||||
* | | Fix nodeify | Dan Finlay | 2016-11-29 | 1 | -0/+22 |
| | | |||||
* | | Denodeify most of KeyringController | Dan Finlay | 2016-11-29 | 3 | -13/+28 |
| | | | | | | | | | | | | | | | | | | | | 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 | 1 | -7/+2 |
|\| | |||||
| * | Merge branch 'master' into i868-estimateGasTooHigh | kumavis | 2016-11-23 | 1 | -2/+8 |
| |\ | |||||
| | * | Unify test wording | Dan Finlay | 2016-11-22 | 1 | -2/+2 |
| | | | |||||
| | * | Add temporary morden explorer link support | Dan Finlay | 2016-11-22 | 1 | -0/+6 |
| | | | |||||
| | * | Fix ropsten link test | Dan Finlay | 2016-11-22 | 1 | -2/+2 |
| | | | |||||
| * | | idStore - fix estimateGas calculation | kumavis | 2016-11-23 | 1 | -7/+2 |
| |/ | |||||
* | | Fix last async keyring test | Dan Finlay | 2016-11-24 | 1 | -8/+10 |
| | | |||||
* | | Fix more keyring asyncifying tests | Dan Finlay | 2016-11-24 | 1 | -1/+8 |
| | | |||||
* | | Mostly got async keyringController tests passing | Dan Finlay | 2016-11-23 | 3 | -55/+91 |
| | | |||||
* | | Fix new encryptor migration logic | Dan Finlay | 2016-11-23 | 1 | -0/+11 |
| | | |||||
* | | Fix password reference | Dan Finlay | 2016-11-23 | 1 | -0/+1 |
| | | |||||
* | | Fix vault migration unit test | Dan Finlay | 2016-11-23 | 1 | -1/+1 |
| | | |||||
* | | Improve vault migration unit test | Dan Finlay | 2016-11-23 | 1 | -1/+2 |
| | | |||||
* | | Simplify Encryptor API Surface | Dan Finlay | 2016-11-23 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #858 from MetaMask/i842-WaitForSeedWord | kumavis | 2016-11-23 | 1 | -2/+8 |
|\ \ | | | | | | | I842 wait for seed word | ||||
| * | | Fix etherscan link generation test | Dan Finlay | 2016-11-23 | 1 | -2/+8 |
| | | | |||||
* | | | Merge branch 'dev' into dev-cleanup | Kevin Serrano | 2016-11-23 | 2 | -7/+7 |
|\| | | |||||
| * | | Fix keyring test | Dan Finlay | 2016-11-22 | 1 | -1/+1 |
| | | | |||||
| * | | Improve Keyring organization | Dan Finlay | 2016-11-22 | 2 | -6/+6 |
| | | | | | | | | | | | | | | | Separated public & private methods. (Fixes #845) Made class method `type()` into a simple property. (Fixes #846) | ||||
| * | | Revert premature link test fix | Dan Finlay | 2016-11-22 | 1 | -2/+2 |
| | | | |||||
| * | | Fixed account link test for ropsten network | Dan Finlay | 2016-11-22 | 1 | -2/+2 |
| | | | |||||
* | | | change all instances of selectedAddress to selectedAccount. | Kevin Serrano | 2016-11-22 | 1 | -1/+0 |
| | | | |||||
* | | | Remove entropy from encryption and project. | Kevin Serrano | 2016-11-22 | 3 | -6/+4 |
|/ / | |||||
* | | Create failing test to check submitPassword in keyringController. | Kevin Serrano | 2016-11-19 | 2 | -0/+67 |
| | | |||||
* | | Minimize repeated code. | Kevin Serrano | 2016-11-16 | 1 | -1/+1 |
| | | |||||
* | | Re-enable disclaimer screen. Rename variables to reflect role more clearly. | Kevin Serrano | 2016-11-15 | 1 | -14/+14 |
| | |