1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-04 23:14:56 +01:00
Commit Graph

824 Commits

Author SHA1 Message Date
Dan
ec6c3c33bd Merge branch 'master' into NewUI-flat-merge-with-master 2017-12-06 21:11:52 -08:00
Dan
3356c15d04 Add tests for exponential backoff code in _resubmitTx 2017-12-06 14:11:14 -03:30
Dan
af8fcb6777 Update resubmitPendingTxs tests. 2017-12-06 14:10:11 -03:30
Thomas Huang
cefe6cded6 Update to Enzyme 3.2.0 2017-11-25 18:37:12 -06:00
Dan Finlay
8dd0093184 Remove logs 2017-11-20 14:46:36 -08:00
Dan Finlay
764a5bac56 Get test passing 2017-11-20 14:44:12 -08:00
Dan Finlay
884f203564 Add failing test for #2577 Seed Phrase Bug 2017-11-20 14:15:00 -08:00
Chi Kei Chan
e61ba93194 Merge branch 'master' into merge-master 2017-11-15 12:03:13 -08:00
Dora E. Mondrian
41fea44af3 newUnaprovedTx => newUnapprovedTx
This typo tripped me up when I was reading through the code and trying to understand what's going on.
2017-11-06 04:35:51 -08:00
Dan
b7653e8207 Get current NewUI-flat tests working. 2017-11-02 15:16:43 -07:00
Chi Kei Chan
7c20011023 Merge branch 'master' into NewUI-flat 2017-10-24 16:50:25 -07:00
Chi Kei Chan
996523c790 Fix unit test 2017-10-20 21:51:37 -07:00
Chi Kei Chan
c8c773d641 Merge branch 'NewUI-flat' into merge 2017-10-18 22:58:46 -07:00
kumavis
8da0d0b28a Revert "NetworkController refactor for new EthClient interface" 2017-10-18 15:09:32 -07:00
Dan Finlay
06094c914b Move etherscan link logic into module 2017-10-14 11:23:44 -04:00
kumavis
dcf10f3d75 nonce-tracker - use blockTracker directly 2017-10-11 18:33:36 -07:00
kumavis
0f8d7dacb1 network-controller - use obj-proxy for providerProxy 2017-10-10 17:26:44 -07:00
Kevin Serrano
d82d9215fb
Make modification 2017-10-09 13:02:52 -07:00
Kevin Serrano
c12d56063d
Fix to actually fail in earlier versions. 2017-10-09 13:01:58 -07:00
Kevin Serrano
6f0c0e8374
Add test to look for wei precision. 2017-10-09 12:12:54 -07:00
Frankie
4a4338c1f4 Merge pull request #2305 from MetaMask/nodeify
nodeify - allow callback to be optional
2017-10-06 14:08:58 -07:00
kumavis
3b3120c5f8 nodeify - fix test 2017-10-06 13:16:44 -07:00
Dan Finlay
94513cae7b Provide method for tx tracker to refer to all txs 2017-10-06 12:50:33 -07:00
Dan Finlay
a32d71e8ed Add failing test for issue #2294 2017-10-06 12:29:27 -07:00
Chi Kei Chan
bd99bc2e88 Merge branch 'master' into NewUI-flat 2017-10-03 16:02:58 -07:00
kumavis
25a80932a6 pending tx tracker - test - expect warning event on resubmit failure 2017-10-02 15:20:18 -07:00
kumavis
a86f6d6d90 pending tx tracker - test - rename tests to match event name 2017-10-02 15:14:15 -07:00
kumavis
167ad729fd Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into history-notes 2017-10-02 13:45:47 -07:00
kumavis
c9c0e6f674 tx state history - test - fix format of history entries 2017-10-02 13:43:26 -07:00
kumavis
d29b5f10ef tx state history - fix bug where initial snapshot was mutated on updateTx 2017-10-02 13:14:42 -07:00
frankiebee
ac80eaca1f pending-tx - dont check the balance to rebrodcast 2017-09-29 12:54:05 -07:00
Chi Kei Chan
5a1d50cd43 Merge branch 'master' into mmn 2017-09-27 22:32:07 -07:00
kumavis
cdf41c2857 Merge pull request #2124 from MetaMask/breakout-mascara
require metamascara
2017-09-27 16:27:01 -07:00
kumavis
15b2823e54 Merge branch 'master' into new-currency-test 2017-09-27 16:04:51 -07:00
kumavis
ecf909e140 Merge pull request #2194 from MetaMask/network-controller-refactor
Network controller refactor
2017-09-27 15:56:23 -07:00
kumavis
f2d9b75e94 network controller - refactor to use _setProvider 2017-09-27 14:44:13 -07:00
kumavis
4404dfc5d3 Merge branch 'master' into direct-block-tracker 2017-09-27 13:58:54 -07:00
kumavis
5bbea78306 Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3
Transaction controller refractor pt3
2017-09-27 13:57:04 -07:00
kumavis
b41aad6d1a style - small whitespace nitpick 2017-09-27 12:33:46 -07:00
Dan Finlay
e72083f6e8 Merge branch 'master' into filter-fixes-moar 2017-09-27 10:57:02 -07:00
frankiebee
0a94ec41d3 pending-tx - move incrementing of the retryCount on the txMeta outside pending-tx-tracker 2017-09-26 22:42:59 -07:00
kumavis
1877c0766c Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOutKeyringController 2017-09-26 21:42:30 -07:00
frankiebee
b05a6f89cb fix tests 2017-09-26 18:19:44 -07:00
frankiebee
36ddaf220d Merge branch 'transactionControllerRefractorPt3' of https://github.com/MetaMask/metamask-extension into transactionControllerRefractorPt3 2017-09-26 18:16:00 -07:00
frankiebee
80c98b1653 transactions: make evnt names pretty and eaiser to read 2017-09-26 16:55:11 -07:00
frankiebee
9fd5458112 transactions: lint fixes and reveal status-update event for balance controller 2017-09-26 16:54:04 -07:00
frankiebee
8ab23c713d Merge branch 'master' into transactionControllerRefractorPt3 2017-09-26 16:24:43 -07:00
frankiebee
4f887c6a62 fix test 2017-09-26 13:44:45 -07:00
frankiebee
b654eb9b1f wrap block tracker in events proxy 2017-09-26 13:38:27 -07:00
Kevin Serrano
31e9dcf470
Modify tests for new API. 2017-09-26 10:02:49 -07:00
tmashuang
ff6f7b52e4 Clean up transactionController tests 2017-09-25 19:47:03 -07:00
Dan Finlay
d9c92cdbd1 Merge branch 'AddBalanceController' of github.com:MetaMask/metamask-plugin into AddBalanceController 2017-09-25 14:37:11 -07:00
Dan Finlay
8cd7329c91 Implemented feedback 2017-09-25 14:36:49 -07:00
Dan Finlay
dfbdb99858 Merge branch 'master' into AddBalanceController 2017-09-25 11:49:38 -07:00
tmashuang
20fea3f1de Remove pending updateAndApprovedTransaction test 2017-09-25 10:47:36 -07:00
tmashuang
d4578836c9 Most of transaction controller tests 2017-09-22 16:15:18 -07:00
Dan Finlay
443b1a8eb7 Remove keyring controller from project 2017-09-22 14:38:40 -07:00
Dan Finlay
aa2abc00eb Merge branch 'AddBalanceController' into BreakOutKeyringController 2017-09-22 14:30:31 -07:00
Dan Finlay
f128240e7f Fix test references 2017-09-22 14:19:14 -07:00
Dan Finlay
e9043f22df Allow custom encryptor to be passed to MetaMaskController and KeyringControllers. 2017-09-21 15:47:25 -07:00
frankiebee
4e57cdf8b3 stub platform 2017-09-19 11:34:19 -07:00
Chi Kei Chan
6c5865d564 Merge branch 'master' into nm 2017-09-18 11:28:10 -07:00
Dan Finlay
c9585f166f Fix test 2017-09-13 15:21:18 -07:00
frankiebee
59909601b8 add test for pendingTxCount 2017-09-13 14:07:22 -07:00
Dan Finlay
53a467cd1e Some progress 2017-09-12 15:06:19 -07:00
frankiebee
3ad67d1b14 match other controller patterns 2017-09-12 09:59:59 -07:00
Dan Finlay
4738746968 Merge branch 'i1746-BalanceBasedOnPending' into AddBalanceController 2017-09-11 15:19:17 -07:00
frankiebee
9b9df41724 more tests and craete a getPendingTransactions function 2017-09-08 14:24:40 -07:00
Dan Finlay
65c00e9fbb Improve test name 2017-09-07 12:53:30 -07:00
Dan Finlay
532a4040de Add test for computing gas price 2017-09-07 12:52:25 -07:00
Dan Finlay
c616581001 Remove logs 2017-09-07 12:47:52 -07:00
Dan Finlay
a95a3c7e4f Fix balance calc test 2017-09-07 12:47:27 -07:00
Dan Finlay
7b92268428 Fix valueFor test 2017-09-07 12:43:10 -07:00
Dan Finlay
4058574436 Add basic test for valueFor 2017-09-07 12:30:25 -07:00
Dan Finlay
b6e8791bc2 test not passing 2017-09-07 11:59:15 -07:00
Dan Finlay
f9a052deed Add first passing balance calc test 2017-09-06 14:36:15 -07:00
Dan Finlay
714df393b4 Add test template 2017-09-06 14:27:21 -07:00
frankiebee
6c83ba762e Merge branch 'master' into transactionControllerRefractorPt3 2017-09-06 13:45:03 -07:00
frankiebee
15c12ca4bb add better comments 2017-09-05 21:50:36 -07:00
frankiebee
00bd5b143f rename tx-utils.js -> tx-gas-utils.js 2017-09-05 20:33:50 -07:00
frankiebee
4c554f32ec remove #buildEthTxFromParams 2017-09-05 20:13:43 -07:00
Dan Finlay
2117490d41 Add test for trying to reproduce faq#67
Failed to reproduce this issue with the same inputs.
2017-08-29 11:36:53 -07:00
Dan Finlay
b97a65e1d1 Add some tests to tx-state-history-helper 2017-08-28 11:40:28 -07:00
Dan Finlay
e057c37b33 Corrected test constraints 2017-08-23 21:03:29 -07:00
Dan Finlay
dae7c632d6 Add mysterious failing test 2017-08-23 21:01:42 -07:00
Dan Finlay
855f4eeacb Pass nonce tests 2017-08-23 20:43:47 -07:00
Dan Finlay
221575a191 Fix new test, break an older maybe wrong one 2017-08-23 20:04:03 -07:00
Dan Finlay
5feda43360 Add failing test for newly identified error state
Reproduces #1966
2017-08-23 19:34:44 -07:00
Dan Finlay
b3b62d97a3 Merge branch 'master' into useLocalNonce 2017-08-23 11:12:46 -07:00
Dan Finlay
38ba31bbe0 Refer to pending nonces, not just their count 2017-08-21 17:29:31 -07:00
frankiebee
e43db262d8 fix test 2017-08-21 16:44:29 -07:00
Dan Finlay
bb24f07b17 When network nonce is highest, it should be used. 2017-08-21 11:59:51 -07:00
Dan Finlay
0f36e0e6da Fix test 2017-08-21 11:57:42 -07:00
Dan Finlay
440101f2b5 Add new assertions and de-duplicate nonce tracker generation 2017-08-21 11:52:41 -07:00
frankiebee
474a4e941f fix tests 2017-08-21 11:51:34 -07:00
Dan Finlay
306249e89e Add test for no previous txs 2017-08-21 11:39:22 -07:00
Dan Finlay
f13c637b23 Confine mock strategy to describe block 2017-08-21 11:37:39 -07:00
Dan Finlay
c76194d7c3 Move mock txs to tx mocking class 2017-08-21 11:35:51 -07:00
frankiebee
fbba3a1ac8 Merge branch 'master' into transactionControllerRefractorPt3 2017-08-21 11:35:22 -07:00
frankiebee
e9712a13ec Create tests for TxStateManager 2017-08-18 14:11:18 -07:00
frankiebee
bf8a62eb39 add test for using localNonce 2017-08-18 13:53:18 -07:00
Dan Finlay
e0c35179c2 Merge pull request #1914 from MetaMask/history-diff
Move Tx State History to diff-based format
2017-08-18 13:14:17 -07:00
Dan Finlay
f684b53b69 Remove dead tests 2017-08-16 17:17:05 -07:00
kumavis
a9e5564e8d tx controller - test - fix typo from moved test 2017-08-14 19:34:22 -07:00
kumavis
1af797b1b3 tx controller - tx state history various small fixes 2017-08-14 19:15:36 -07:00
kumavis
fec0f2ca5e tx controller - test - test tx state history in updateTx 2017-08-14 19:15:09 -07:00
kumavis
fdffb6fedc introduce tx-state-history-helper and diff-based history 2017-08-14 18:46:04 -07:00
kumavis
0188e7b94d Merge branch 'master' into NewUI-flat 2017-08-08 23:30:58 -07:00
kumavis
922ecb9149 Merge branch 'master' into greenkeeper/initial 2017-08-08 16:23:14 -07:00
frankiebee
e761fb0ef7 use provider stub 2017-08-08 18:30:22 -04:00
Simon Liang
0db627d979 refactored and added unit test 2017-08-08 20:15:30 +08:00
frankiebee
28fbdca830 remove .only 2017-08-07 16:41:54 -04:00
frankiebee
f3b42f1e33 Merge branch 'master' into transactionControllerRefractor 2017-08-07 16:24:58 -04:00
frankiebee
e7f838e626 fix test 2017-08-07 14:56:17 -04:00
kumavis
78aa957e5a Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial 2017-08-07 10:52:08 -07:00
sdtsui
02c2106c3b Merge branch 'master' into feat/mm-ui-5 2017-08-06 19:55:34 -07:00
frankiebee
89a4fef1e4 Merge branch 'master' into transactionControllerRefractor 2017-08-04 14:45:22 -04:00
frankiebee
54739cb798 test for pending tx watcher 2017-08-04 14:40:22 -04:00
frankiebee
4ac0b97202 test for SufficientBalance 2017-08-04 14:36:27 -04:00
frankiebee
3dcc199845 rename the test description Transaction Manger -> Message Manger 2017-08-04 13:27:08 -04:00
kumavis
5a9257208c Merge branch 'master' into NewUI 2017-08-03 21:02:01 -07:00
kumavis
d526f68c8e test - actions - tx - fix async test 2017-08-03 20:56:53 -07:00
kumavis
efb7543c6d test - actions - remove commented code 2017-08-03 20:53:47 -07:00
kumavis
500e7d1f04 nodeify - test - syntax nitpick 2017-08-03 20:52:09 -07:00
frankiebee
b955b5a89a add test for no callback error 2017-08-03 22:10:33 -04:00
frankiebee
a8966c4a4f fix test 2017-08-03 22:02:31 -04:00
kumavis
e223b0c789 test - dont mix callback and promise 2017-08-03 16:34:38 -07:00
kumavis
da16f39626 Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial 2017-08-03 15:05:32 -07:00
Kevin Serrano
81982d01c0
Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUI 2017-08-03 13:10:46 -07:00
kumavis
8a9d0073b1 Merge pull request #1848 from MetaMask/transactionControllerRefractor
Transaction controller refractor part 1: promises for everyone and more tests!
2017-08-02 19:57:16 -07:00
frankiebee
5ac4c2de6f remove unused sinon 2017-08-02 19:11:51 -04:00
frankiebee
0808eb2256 fix test 2017-08-02 19:07:18 -04:00
frankiebee
b80c7e417b move newUnapprovedTransaction to transactions.js 2017-08-02 18:59:34 -04:00
kumavis
8c6f01b910 blacklist controller - breakout from metamask and infura controllers 2017-08-02 15:54:59 -07:00
kumavis
ecaa235b5e phishing detection - move phishing detection into contentscript and metamask controller 2017-08-02 14:26:10 -07:00
frankiebee
25cffd21f8 Merge branch 'master' into transactionControllerRefractor 2017-08-02 11:41:29 -04:00
frankiebee
21e76484d6 add test for addTxDefaults 2017-08-02 11:34:45 -04:00
frankiebee
432f516ab0 make addUnapprovedTransaction async function and use promise based ethQuery 2017-08-02 10:26:25 -04:00
kumavis
9eb13aee00 blacklist - add tests for metamask subdomains 2017-08-01 17:05:36 -07:00
kumavis
9d345e744d blacklist - clearer test format 2017-08-01 16:58:40 -07:00
Dan Finlay
d932524eaf Merge branch 'master' into NewUI 2017-07-27 15:24:10 -07:00
Dan Finlay
f8cadbcb32 Merge branch 'master' into NewUI 2017-07-27 15:10:02 -07:00
Dan Finlay
6675241fa9 Merge branch 'master' into i1805-LiveBlacklistUpdating 2017-07-26 16:46:59 -07:00
Kevin Serrano
6a9d40c558
Add test for blacklister. 2017-07-26 15:24:57 -07:00
kumavis
55a55141d0 nonce-tracker - fix test 2017-07-26 11:43:37 -07:00
kumavis
5ec73c0e65 tx cont - fix test to use async api 2017-07-25 14:39:17 -07:00
kumavis
4445ba1569 tx cont - add argument for provider constructor 2017-07-25 14:36:19 -07:00
Dan Finlay
a22adec66f Replace ui with responsive-ui 2017-07-24 17:05:07 -07:00
Dan Finlay
a41e5788cf Merge branch 'master' into NewUI 2017-07-20 12:39:06 -07:00
Dan Finlay
86d367957f Move responsive ui into its own folder for easier merges 2017-07-20 12:38:38 -07:00
sdtsui
2adfce772c Add new tests for dropdown component 2017-07-18 05:31:52 -07:00
Dan Finlay
614501e743 Fix transaction confirmation ordering
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
2017-07-17 14:18:00 -07:00
tmashuang
a4c7d95d0d Sinon stub infura network status 2017-07-14 13:06:42 -07:00
tmashuang
02cf65d513 Use Let instead of var 2017-07-14 11:50:41 -07:00
tmashuang
bda52f7cba Infura Network response tests 2017-07-14 10:34:03 -07:00
frankiebee
7eccf5905a make publishTransaction and signTransaction async methods 2017-07-13 15:25:43 -04:00
sdtsui
1507da139d Add tests for new dropdown component 2017-07-13 00:40:22 -07:00
frankiebee
751103d948 Merge branch 'master' into nonce-tracker 2017-07-12 15:10:58 -07:00
frankiebee
aeefcbd75b Fix test to match behavior 2017-07-12 15:10:52 -07:00
kumavis
23d44e5399 tests - disable infura test 2017-07-11 15:30:36 -07:00
frankiebee
971d25a8ab Merge branch 'master' into nonce-tracker 2017-07-11 12:41:03 -07:00
Dan Finlay
c7b9e3fb18 Improve insufficient balance checking in retry loop 2017-07-11 12:19:01 -07:00
kumavis
f5de16c911 test - tx controller - fix promise handling 2017-07-07 14:32:03 -07:00
kumavis
ab8bae421e test - tx-controller - stub block-tracker method 2017-07-07 14:26:52 -07:00
kumavis
d228f46254 Merge branch 'master' into nonce-tracker 2017-07-07 14:21:43 -07:00
Dan Finlay
07d4e4fe6f Fix failing test 2017-07-05 23:24:33 -07:00
Dan Finlay
96df7ad8d3 Add missing done 2017-07-05 23:04:51 -07:00
Dan Finlay
ef1282b556 Typo fix 2017-07-05 22:48:11 -07:00
Dan Finlay
a915dfdeaa Add failing test for retrying an over-spending tx 2017-07-05 22:36:52 -07:00
frankiebee
847a4282a2 Merge branch 'master' into nonce-tracker 2017-06-27 13:10:56 -07:00
frankiebee
42a2bcb132 remove option fetch 2017-06-22 14:06:20 -07:00
frankiebee
1ddcbaad5b add done and stub fetch 2017-06-22 13:47:20 -07:00
Kevin Serrano
199663c0a4
Add test for infura controller. 2017-06-22 12:51:53 -07:00
frankiebee
abbbe1156c Merge branch 'master' into nonce-tracker 2017-06-21 19:52:28 -07:00
frankiebee
92df9965eb fix nonceTracker 2017-06-21 19:51:00 -07:00
frankiebee
fa8c74fe9b add a test for #getNonceLock 2017-06-21 17:28:19 -07:00
Thomas Huang
88844946fe Remove second linting script for tests 2017-06-17 12:14:35 -07:00
frankiebee
e672f2da0d remove irrelevant test 2017-06-16 17:04:56 -07:00
frankiebee
b67bc7043e Fix test to call done 2017-06-15 15:25:22 -07:00
kumavis
b3492d9c17 transaction controller - use nonce-tracker 2017-06-14 23:44:02 -07:00
frankiebee
a10740af7e add a check for weather a tx is included in a block when jumping blocks 2017-06-14 20:17:59 -07:00
Thomas Huang
c0f07844af Finish async when failing async test 2017-06-12 17:52:37 -07:00
Thomas Huang
dbc48c3992 Make test Async 2017-06-12 17:42:54 -07:00
Thomas Huang
13e6672028 Linting 2017-06-12 11:08:32 -07:00
Kevin Serrano
f7773538eb
Modify tests for new api mock.' 2017-06-05 16:24:32 -07:00
Kevin Serrano
5e19a4a833
Modfiy test to ether standards. 2017-05-24 10:51:44 -07:00
Kevin Serrano
45285a5a2f
Merge branch 'master' into i1412-decimalizethegas 2017-05-24 09:55:32 -07:00
frankiebee
e23c0f98fa clean up test 2017-05-24 11:57:31 -04:00
frankiebee
db982cf795 stop polling when switching networks 2017-05-24 11:52:18 -04:00
frankiebee
243eeff7cb Fix for tests 2017-05-23 19:49:57 -04:00
Kevin Serrano
31d17c9e25
Fix test, create new value for precision/scale 2017-05-23 14:26:37 -07:00
Kevin Serrano
717db41d0b
Modify test, replace clone package. 2017-05-17 14:18:01 -07:00
Dan Finlay
bfb1c92ded Linted test 2017-05-17 00:35:26 -07:00
Dan Finlay
6f02f5bc5d Clean up test 2017-05-17 00:33:19 -07:00
Dan Finlay
e26501aa01 Simplify test to represent realistic use case 2017-05-17 00:19:31 -07:00
Dan Finlay
c2b012ccc5 Merge branch 'master' into i1412-BrutalTests 2017-05-17 00:16:26 -07:00
Dan Finlay
c0516ddf33 Add test requiring high precision 2017-05-17 00:10:18 -07:00
Dan Finlay
6491b42266 Add test around txManager#approveTransaction 2017-05-16 18:16:18 -07:00
Dan Finlay
c6fd509051 Improve test 2017-05-16 17:06:19 -07:00
Dan Finlay
c1bef31d9d Linted 2017-05-16 16:50:03 -07:00
Dan Finlay
cfb7bfed18 Fix quotation mark 2017-05-16 16:44:17 -07:00
Dan Finlay
caeadc2407 Linted and removed unused deps 2017-05-16 16:19:10 -07:00
Dan Finlay
a15e753c80 Add gas updating test to tx controller tests 2017-05-16 13:22:03 -07:00
Dan Finlay
a00941c889 Remove only line from test 2017-05-16 13:21:31 -07:00
Dan Finlay
2df9344be5 Rename tx manager to tx controller 2017-05-16 10:35:28 -07:00
Dan Finlay
d165f3a2b6 Merge pull request #1436 from MetaMask/mig13
migration 13 - change provider from testnet to ropsten
2017-05-16 09:09:28 -07:00
kumavis
28aba6e9de migration 13 - change provider from testnet to ropsten 2017-05-15 23:56:13 -07:00
Dan Finlay
6abdec608e Merge branch 'master' into i1407-FixNonEditingTxForm 2017-05-15 15:36:03 -07:00
Dan Finlay
f9c0fc0e8c Clean up test 2017-05-15 15:23:38 -07:00
Dan Finlay
75d9b5619c Verify updating gas value updates 2017-05-15 15:21:28 -07:00
Dan Finlay
4b341e6a95 Got test failing nearly correctly 2017-05-15 15:07:38 -07:00
Dan Finlay
f0eeb1e162 Got a useful error message for next step 2017-05-11 17:43:40 -07:00
Dan Finlay
de5cf2526c Fix test up a bit 2017-05-11 17:15:45 -07:00
Dan Finlay
60746a9859 Use react test utils to start composing test 2017-05-11 17:09:23 -07:00
Dan Finlay
16005ebd3a Got test failing 2017-05-11 15:28:33 -07:00
Dan Finlay
113f7d67f1 Fix tests add logs 2017-05-11 14:29:44 -07:00
frankiebee
8421cf9cce Create test for Migrator 2017-05-11 23:25:34 +02:00
Dan Finlay
e9b11a430b Add an attempt at a unit test for reproducing #1407 2017-05-10 17:26:51 -07:00
Thomas Huang
1e4855fc0e Whoops missed some modules 2017-05-04 15:21:51 -07:00
Thomas Huang
9bd7d06c4f Remove unused modules and STORAGE_KEY 2017-05-04 15:06:27 -07:00
Thomas Huang
0b13429daf Lint tests 2017-05-04 14:35:10 -07:00
kumavis
810f5881f6 Merge branch 'master' of github.com:MetaMask/metamask-plugin into platform 2017-03-31 17:57:47 -07:00
Dan Finlay
0a5c634081 Merge pull request #1297 from MetaMask/eip155
tx-manager - add eip155 support
2017-03-31 10:33:04 -07:00
kumavis
965c806a45 test - fix notice-controller test 2017-03-30 19:26:01 -07:00
kumavis
bd704b1d7e etc - fix notification-manager ref, remove duplicated test file 2017-03-30 19:05:11 -07:00
kumavis
12918e1894 tests - tx-manager - fix assert and clean formatting 2017-03-30 16:06:27 -07:00
kumavis
47ea545241 tests - add missing done 2017-03-30 15:43:01 -07:00
kumavis
1dce352523 tx-manager - add eip155 support 2017-03-30 14:23:23 -07:00
kumavis
16b5f4a210 tests - tx-utils gasBuffer calc - fix bug and user easier numbers 2017-03-29 23:59:42 -07:00
kumavis
918f388463 explorer - fix ropsten explorer link tests 2017-03-27 11:32:00 -07:00
kumavis
4b9f1c0e0c tests - fix ropsten link check 2017-03-27 11:01:10 -07:00
Kevin Serrano
f8b404a478
correct bug in test. 2017-03-24 17:23:56 -04:00
Kevin Serrano
360afacd70
Add tests. 2017-03-24 17:21:58 -04:00
Kevin Serrano
d99b5a9e5a
Add migration tests to ensure that bodies are erased properly in notices. 2017-03-23 10:15:42 -04:00
Dan Finlay
b6e2eaf7b1 Remove eth-lightwallet 2017-03-16 11:16:03 -07:00
Kevin Serrano
d85cc7ec4e Add test to account for prevention of identities duplication. 2017-03-10 10:48:07 -08:00
Kevin Serrano
c47f7f6a76 Add another test for duplicates. 2017-03-10 10:34:18 -08:00
Kevin Serrano
dc2d614da6 Add basic tests. 2017-03-10 09:52:05 -08:00
Dan Finlay
67c3126e63 Merge branch 'master' into kumavis-patch-1 2017-03-08 10:16:50 -08:00
Kevin Serrano
86f71d504c Merge branch 'master' into i1144-moarrpc 2017-03-08 09:28:36 -08:00
kumavis
92b8443824 tx-utils - add encoding utils 2017-03-07 22:51:39 -08:00
kumavis
c063fab993 tx-utils - stricter naming type-based convention 2017-03-07 22:47:35 -08:00
kumavis
68b99dfb08 test - tx-utils
add tests for `addGasBuffer`
2017-03-07 22:28:02 -08:00
jaredpereira
52ee007fcb Merge branch 'master' into i1118-IncreaseGasBuffer 2017-03-07 22:55:56 -05:00
Jared Pereira
4916331c53 change BN.mul to BN.muln 2017-03-07 22:42:16 -05:00
Jared Pereira
de44cd9ba4 add gas buffer multiply test 2017-03-07 20:49:40 -05:00
Kevin Serrano
4562e41d33
Fix tests until new ones to-be-written. 2017-03-07 16:10:06 -08:00
Kevin Serrano
970324b699
Merge github.com:MetaMask/metamask-plugin into i1144-moarrpc 2017-03-07 16:02:42 -08:00
Kevin Serrano
e7e024bcdd
Refactor of code into separate reducers and actions. 2017-03-07 16:01:51 -08:00
Dan Finlay
fba7a50e1b Fixed encoding 2017-03-07 11:43:59 -08:00
Dan Finlay
6253885e28 Remove unrelated test file 2017-03-07 11:36:13 -08:00
Dan Finlay
e78e642eef Add gas buffer test 2017-03-07 11:34:11 -08:00
Kevin Serrano
08ca7dac5a
Merge branch 'master' into i1144-moarrpc 2017-03-07 10:37:31 -08:00
Kevin Serrano
01f2ec4823
Modify tests.' 2017-03-07 10:37:01 -08:00
Dan Finlay
99b49b11f6 Fix test name 2017-03-06 17:36:37 -08:00
Dan Finlay
70e14b8a6f Fixed internal encoding test case 2017-03-06 17:36:08 -08:00
Dan Finlay
e66e755766 Fix normalizeMsgData function to always return hex prefixed 2017-03-06 16:33:33 -08:00
Dan Finlay
af337dfae5 Fix function names 2017-03-06 15:17:45 -08:00
Dan Finlay
9bd8c5f723 Render personal_sign messages as utf-8 text
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
2017-03-06 15:04:11 -08:00
Kevin Serrano
e66035254f
More conflict resolution. 2017-03-01 10:04:25 -08:00
Kevin Serrano
0a3849ec84
Fix merge conflicts. 2017-03-01 10:01:21 -08:00
Dan Finlay
6fb33853f2 Fix test reference 2017-02-27 10:53:36 -08:00
Dan Finlay
5edb3db969 Merge branch 'master' into i1144-moarrpc 2017-02-27 10:36:48 -08:00
Kevin Serrano
930dafc4b0
Fix spelling error. 2017-02-24 15:30:18 -08:00
Dan Finlay
d1bce61996 Remove irrelevant tests 2017-02-23 17:45:23 -08:00
Kevin Serrano
62854398f1
Tested against code to play nice with unit tests. 2017-02-23 13:56:58 -08:00
Dan Finlay
0584988688 Move sigUtil and keyrings to external modules
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.
2017-02-21 14:25:47 -08:00
Dan Finlay
352bb5cb39 Merge branch 'master' into dev 2017-02-15 15:49:04 -08:00
Kevin Serrano
d0e2846eca
Complete migration tests. 2017-02-15 11:15:47 -08:00
Kevin Serrano
cd75d86187
Add migrations for removing terms of use data. 2017-02-14 13:21:00 -08:00
Dan Finlay
97b8410b30 Verify messages in a loop 2017-02-13 21:29:22 -08:00
Dan Finlay
f2486fbdd3 got hash test passing 2017-02-13 21:25:02 -08:00
Dan Finlay
b862d94209 Add failing test for signature recovery 2017-02-13 20:13:11 -08:00
Kevin Serrano
65c84ac4b2
Delete all code related to disclaimers. 2017-02-09 18:17:50 -08:00
Frankie
de6455151e Revert old style message sighing 2017-02-09 17:32:49 -08:00
kumavis
e1719191f4 test - skip eth_sign tests until we have test data 2017-02-03 15:16:21 -08:00
kumavis
9e4ef45b6a migration #9 - break out CurrencyController substate 2017-02-02 23:32:24 -08:00
kumavis
f08f40aee2 txManager - depend on preferencesStore 2017-02-02 21:09:17 -08:00
kumavis
0c6df24ecf metamask - introduce networkStore 2017-02-02 20:59:47 -08:00
kumavis
99fa9ab13a migration 7 - break off TransactionManager substate 2017-02-02 20:20:13 -08:00
kumavis
bcb86f38cb messageManager - move view state to obs-store 2017-02-02 18:21:22 -08:00
Frankie
54b1339f6a Merge branch 'dev' into messageManagerCleanUp 2017-02-01 13:05:58 -08:00
Frankie
ce0c3ed03c Merge branch 'dev' into messageManagerCleanUp 2017-02-01 12:03:42 -08:00
Frankie
1b16b46241 code clan up and tests 2017-02-01 11:54:01 -08:00
kumavis
1cb730144d metamask - adopt isInitialized from keyring controller 2017-02-01 00:31:26 -08:00
kumavis
cd5d952600 keyring - move identities into memStore 2017-02-01 00:17:48 -08:00
kumavis
c0d3db6a8c keyring - synchronous getState 2017-01-31 20:02:38 -08:00
kumavis
2fa60cfcbf continue rename selectedAccount to selectedAddress 2017-01-30 15:25:12 -08:00
Frankie
fdee1e3701 Merge branch 'dev' into messageManagerCleanUp 2017-01-28 22:59:28 -08:00
Frankie
8be68575bb Clean up message manger includes:
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
2017-01-28 20:28:20 -08:00
kumavis
4dd6ba9c1b migration 5 - move keyring controller state to substate 2017-01-28 19:19:03 -08:00
kumavis
3afd0ef27d tests - remove persistence and start with initial state 2017-01-27 23:04:34 -08:00
kumavis
a14a25c423 config-manager - default to USD for currentFiat 2017-01-26 15:22:13 -08:00
kumavis
76ce348a04 obs-store - use published module 2017-01-24 19:47:00 -08:00
kumavis
bb1ee8e649 Merge branch 'dev' of github.com:MetaMask/metamask-plugin into obs-store2 2017-01-24 16:09:57 -08:00
kumavis
463a56ff54 background controller - extract KeyringC.placeSeedWords to MetamaskC 2017-01-24 15:33:33 -08:00
kumavis
74dc20bdf1 Merge branch 'dev' into obs-store2 2017-01-21 10:06:50 -08:00
Dan Finlay
7e886dff77 Wrote failing test for eth.sign 2017-01-16 23:26:37 -08:00
kumavis
053066b57f Merge branch 'dev' into simple-keystore-fix 2017-01-16 12:10:04 -08:00
kumavis
4a09f856d1 test - keyring - simple - fix fixture data 2017-01-16 12:08:20 -08:00
Dan Finlay
5dd5619e5d Merge branch 'master' into dev 2017-01-16 10:55:32 -08:00
kumavis
85634326e8 test - clear localStorage on test start 2017-01-14 22:35:26 -08:00
kumavis
91e5cc0f29 test - clear localStorage in case CI caches it (?) 2017-01-14 22:30:12 -08:00
kumavis
993daebc4e test - txManager - add network to all txs 2017-01-14 22:09:19 -08:00
kumavis
3df9ce9809 tests - txManager - add getNetwork fn to fixture txManager 2017-01-14 21:52:09 -08:00
Frankie
87505e1742 fix for linting 2017-01-13 18:01:50 -08:00
kumavis
29e83d71a8 background - handle tx finalization in controllers instead of provider-engine 2017-01-13 02:00:11 -08:00
kumavis
b33c51c0a6 migrations - introduce promise-based migrator 2017-01-12 01:17:05 -08:00
kumavis
3bc996878b background - move pojo migrator to outside of metamask controller 2017-01-11 22:47:56 -08:00
kumavis
2019c02fc0 test - fix tests from obs-store 2017-01-11 19:31:42 -08:00
kumavis
bd382f4705 tests - add fetch polyfill 2017-01-10 12:39:01 -08:00
Dan Finlay
2dbbc0dce7 Merge remote-tracking branch 'origin/kumavis-readme-gource' into RevertTxManager 2017-01-02 17:32:51 -08:00
Dan Finlay
5e8a344f97 Correct getState test to be async 2016-12-23 18:40:36 -08:00
Frankie
fa3e708f34 Merge branch 'dev' into TxManager 2016-12-23 12:48:36 -08:00
Frankie
fde69ea0ba fix some minor spelling mistakes and clean up code 2016-12-23 12:43:42 -08:00
Frankie
6f7c23fd28 Merge branch 'dev' into TxManager 2016-12-21 14:31:07 -08:00
Frances Pangilinan
6e78494846 First pass at revision requests 2016-12-21 13:41:32 -08:00
Dan Finlay
afcad53ef9 Refine a lostAccount test 2016-12-20 16:11:49 -08:00
Frances Pangilinan
4910e2f9bd remove network Id 2 from explorer link and Add network Id 3 2016-12-20 13:49:22 -08:00
Dan Finlay
674b268982 Merge pull request #916 from MetaMask/i894-DetectBadAccounts
I894 detect bad accounts
2016-12-20 11:50:26 -08:00
Dan Finlay
20d2204ce6
Made changes according to feedback. 2016-12-19 19:32:59 -08:00
Dan Finlay
77d2deb176 Merged master into dev 2016-12-19 13:37:27 -08:00
kumavis
73998feeb2 move notice code from metamask-controller + config-manager, in to notice-controller 2016-12-16 12:44:47 -08:00
kumavis
4c390a6221 clean - code style 2016-12-16 11:58:15 -08:00
Kevin Serrano
8819475a2e Add ability to show notices to user & get confirmation.
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.
2016-12-16 10:44:52 -08:00
Frances Pangilinan
5aba096bd1 add Test for txManager. As well as fix tests to account for txManager. 2016-12-14 12:56:53 -08:00
Dan Finlay
ab9e15b782 Mostly added bad account detection
Currently riddled with logs, because the migrator is inexplicably returning before generating the new style accounts for comparison.
2016-12-08 14:22:02 -08:00
Dan Finlay
fe01ceb857 Remove .only from unit test suite 2016-12-07 16:32:49 -08:00
Dan Finlay
9e764b1935 Fix nodeify 2016-11-28 17:27:20 -08:00
Dan Finlay
80e76b45ee Denodeify most of KeyringController
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.
2016-11-28 16:13:03 -08:00
Dan Finlay
b899119582 Merge branch 'master' into dev 2016-11-23 16:54:27 -08:00
Dan Finlay
9f67974133 Fix last async keyring test 2016-11-23 14:39:35 -08:00
Dan Finlay
230a0ab876 Fix more keyring asyncifying tests 2016-11-23 11:58:34 -08:00
Dan Finlay
600f5c31db Mostly got async keyringController tests passing 2016-11-23 00:23:41 -08:00
Dan Finlay
822face7a3 Fix password reference 2016-11-22 16:29:46 -08:00
Dan Finlay
358440384c Fix vault migration unit test 2016-11-22 16:07:35 -08:00
Dan Finlay
607a474c3f Improve vault migration unit test 2016-11-22 16:05:37 -08:00
Dan Finlay
de8da9ddf6 Simplify Encryptor API Surface
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
2016-11-22 15:54:51 -08:00
kumavis
e14efa8f17 Merge pull request #858 from MetaMask/i842-WaitForSeedWord
I842 wait for seed word
2016-11-22 16:18:43 -05:00
Dan Finlay
a67b4d7131 Fix etherscan link generation test 2016-11-22 12:54:27 -08:00
kumavis
49a1f43736 Merge branch 'master' into i868-estimateGasTooHigh 2016-11-22 15:14:25 -05:00
kumavis
fa2f0dee28 idStore - fix estimateGas calculation 2016-11-22 12:10:49 -08:00
Kevin Serrano
8261cf232d
Merge branch 'dev' into dev-cleanup 2016-11-22 10:50:15 -08:00
Dan Finlay
60afc41bb6 Fix keyring test 2016-11-21 19:47:45 -08:00
Dan Finlay
e2a9e1cd4a Unify test wording 2016-11-21 19:45:05 -08:00
Dan Finlay
694f34ae9a Add temporary morden explorer link support 2016-11-21 19:43:59 -08:00
Dan Finlay
ced36eb201 Improve Keyring organization
Separated public & private methods. (Fixes #845)
Made class method `type()` into a simple property. (Fixes #846)
2016-11-21 19:40:58 -08:00
Dan Finlay
ecfda5bcc5 Revert premature link test fix 2016-11-21 19:39:19 -08:00
Dan Finlay
daec4d5c36 Fix ropsten link test 2016-11-21 19:19:34 -08:00
Dan Finlay
be6b7b496a Fixed account link test for ropsten network 2016-11-21 19:18:46 -08:00
Kevin Serrano
f5b0795ac5
change all instances of selectedAddress to selectedAccount. 2016-11-21 16:21:16 -08:00
Kevin Serrano
9123e70434
Remove entropy from encryption and project. 2016-11-21 15:49:03 -08:00
Kevin Serrano
a4666de0ce
Minimize repeated code. 2016-11-15 13:31:22 -08:00
Kevin Serrano
7de6b12aad
Re-enable disclaimer screen. Rename variables to reflect role more clearly. 2016-11-14 16:49:16 -08:00
Kevin Serrano
92edc63d6e
Add idStore tests again. 2016-11-14 16:23:52 -08:00
Kevin Serrano
eea3bfb0b3
Rename n variables to numberOfAccounts inside of test suite. Remove idStore tests. 2016-11-11 17:06:37 -08:00
Frankie
f665b779cb Merge branch 'master' into i328-MultiVault 2016-11-10 16:53:47 -08:00
Dan Finlay
7068d2e71c Adjust gas buffer to be 20% over estimate 2016-11-08 08:39:41 -08:00
Dan Finlay
6f39924e60 Increase gas buffer
Fixes #795
2016-11-08 08:32:34 -08:00
Dan Finlay
161ff62fdc Merge branch 'master' into i328-MultiVault 2016-11-07 15:38:25 -08:00
Dan Finlay
798e057854 Fix nickname test 2016-11-07 12:19:56 -08:00
Dan Finlay
7b420c6e15 Fix BN reference 2016-11-07 12:18:02 -08:00
Dan Finlay
553a6da011 Fix 787 gas buffer bug 2016-11-07 12:00:14 -08:00
Dan Finlay
1896928562 Fix gas price buffering
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.
2016-11-07 11:56:20 -08:00
Dan Finlay
fff5a6765e Added failing test for #787 2016-11-07 11:25:23 -08:00
Dan Finlay
e0246975a7 Finish fixing nicknaming bug 2016-11-03 13:44:29 -07:00
Dan Finlay
bd2a429a85 Fix account nicknaming bug
When nicknaming, we weren't normalizing the input, and so we were retrieving with differently formatted addresses than we were persisting.
2016-11-03 11:59:20 -07:00
Dan Finlay
9ca3c57339 Fix vault creation bug 2016-11-03 11:34:57 -07:00
Dan Finlay
185396ff08 Fix dual vault creation bug 2016-11-02 16:35:46 -07:00
Dan Finlay
4cf1b606e4 Fix handling of migrating old vault style
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.
2016-11-02 15:04:50 -07:00
Dan Finlay
18e5173f06 Now migrating old vaults to new DEN format 2016-10-29 02:29:25 -07:00
Dan Finlay
331d9c91ee Add vault migration test 2016-10-28 13:26:14 -07:00
Dan Finlay
2690d1acfd Added hd wallet tests 2016-10-27 17:23:26 -07:00
Dan Finlay
f9ff6cb55e Merge branch 'master' into i328-MultiVault 2016-10-25 16:59:58 -07:00
kumavis
3af3565000 test - fix delegate-call test 2016-10-24 16:12:44 -07:00
kumavis
85d03cc8fb Merge branch 'master' into i743-FixDelegateCallFlag 2016-10-24 12:24:19 -07:00
Dan Finlay
152419a79b Merge branch 'master' into i328-MultiVault 2016-10-21 17:58:18 -07:00
Dan Finlay
626b52d24a Fix bug in new KeyringController vault restoring logic. 2016-10-21 13:11:30 -07:00
Dan Finlay
ee73e373a0 Create new vault before each keyringController unit test 2016-10-21 12:26:56 -07:00
Dan Finlay
44aa1be277 Create basic keyring-controller unit test file 2016-10-21 12:11:54 -07:00
Dan Finlay
c3e1c5c57f Added SimpleKeyring tests 2016-10-21 11:10:36 -07:00
Frankie
d4c0a4949b Clean up tests 2016-10-20 12:26:35 -07:00
Dan Finlay
0deed17752 Fix tests 2016-10-20 12:07:53 -07:00
Frankie
aa4746f4c7 Add test and ability for isHex to handle hex strings with hex-prefix 2016-10-19 19:35:44 -07:00
Frankie
4366f72fe1 Add unit test for isHex and add to CHANGELOG.md 2016-10-19 15:22:56 -07:00
Kevin Serrano
afbc4c832b
Git merge resolution. 2016-10-19 14:57:30 -07:00
Kevin Serrano
ad3fa24a28
Intermediary commit. 2016-10-19 14:55:08 -07:00
Dan Finlay
049705004f Reproduced issue 743 in test case
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
2016-10-17 14:48:25 -07:00
Dan Finlay
827d7553fc Restore hex prefix to gas price 2016-10-17 13:05:45 -07:00
Dan Finlay
91f43fa213 Increase gas estimate by 100000 wei
To prevent minor gas estimation errors, probably usually related to operating on dynamic state.

Fixes #738.
2016-10-17 12:47:37 -07:00
Dan Finlay
ea1a934c7d Add initial KeyringController files 2016-10-11 15:12:23 -07:00
Dan Finlay
cf31e19029 Remove logs 2016-09-14 18:24:52 -07:00
Dan Finlay
0626adc0b4 Merge pull request #669 from MetaMask/Version-2.12.1
Version 2.12.1
2016-09-14 18:23:12 -07:00
Dan Finlay
c3d1404e72 Fix clearing of account cache on vault restore 2016-09-12 15:18:32 -07:00
Dan Finlay
e0e38b879f Fix some references 2016-09-12 11:21:27 -07:00
Dan Finlay
363c2a0939 Fix account unlocking
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.
2016-09-12 11:13:26 -07:00
Dan Finlay
5c1d8e299e Select first address when restoring vault
Fixes #642
2016-09-12 08:50:42 -07:00
Dan Finlay
9b861b6687 Fixed caching bug
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.
2016-09-10 15:45:34 -07:00
Dan Finlay
5e60b2f0c4 Correct assertion for BIP32 compliance
According to [axic's work here](https://github.com/MetaMask/metamask-plugin/issues/640#issuecomment-246133672), MetaMask is generating the correct address, so I've corrected that assertion accordingly.
2016-09-10 12:57:11 -07:00
Dan Finlay
b1590f179e Remove log 2016-09-10 12:39:50 -07:00