Commit Graph

587 Commits

Author SHA1 Message Date
Kevin Serrano aea263a80d
Lint. 2016-12-20 16:45:22 -08:00
Dan Finlay 931ae5f64a Make notices confirmation configurable
- Confirm button will now dismiss the lost accounts array.
2016-12-20 15:24:08 -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 26f1e6cbd2 Remove encryptor in favor of external browser-passworder
I broke out the encryptor lib into its own module on npm called browser-passworder.
2016-12-19 21:55:02 -08:00
Dan Finlay 20d2204ce6
Made changes according to feedback. 2016-12-19 19:32:59 -08:00
Dan Finlay ead8329877 Merge pull request #937 from MetaMask/i900-forgot-password-flow
I900 forgot password flow
2016-12-19 16:01:01 -08:00
Kevin Serrano e9bea92ac3
Lint. 2016-12-19 14:55:52 -08:00
Dan Finlay 77d2deb176 Merged master into dev 2016-12-19 13:37:27 -08:00
kumavis b4a298e1a3 inpage - temporarily disable ping stream 2016-12-19 12:25:35 -08:00
kumavis 73998feeb2 move notice code from metamask-controller + config-manager, in to notice-controller 2016-12-16 12:44:47 -08:00
Kevin Serrano 1458b8c68e
Deactivate polling for now. 2016-12-16 11:39:41 -08:00
Dan Finlay 2b1d821da3 Cleanup 2016-12-16 11:26:39 -08:00
Kevin Serrano 851ba66cdd 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:55:42 -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
Dan Finlay 83880a5c92 Remove morden testnet provider
Instances configured to point at Morden will now point at Ropsten.
2016-12-15 16:12:03 -08:00
Frances Pangilinan da9349fe63 Clean up and comment functions 2016-12-14 15:04:33 -08:00
Frances Pangilinan 090935f90a Create a TxManager 2016-12-14 12:55:41 -08:00
Dan Finlay 7b9749e30c Got bad account detection working and added to state 2016-12-09 12:24:25 -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
kumavis 26b60f1b5a inpage - correctly listen for incomming messages 2016-12-07 14:42:38 -08:00
Dan Finlay c431783602 Remove redundant logging block 2016-12-01 10:21:56 -08:00
Dan Finlay 1880cda9b9 Fix vault encrypting & unlocking bug
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.
2016-11-30 19:36:24 -08:00
Dan Finlay 95bcc21a06 Add useful nodeify error message
If a nodified method does not return a Promise, it will throw an error, like this:
```
Error in event handler for (unknown): Error: The function setSelectedAccount did not return a Promise, but was nodeified.
```
2016-11-29 15:54:10 -08:00
Dan Finlay df0b89074b Return promise correctly from setSelectedAddress 2016-11-29 15:50:26 -08:00
Dan Finlay 5bf1018d75 Flattened addTx async methods 2016-11-29 14:56:58 -08:00
Dan Finlay ff3f6cc36a Bind ethQuery to estimateGas to allow it to be moved around. 2016-11-29 14:13:12 -08:00
Dan Finlay 85d5b12f8d Fix tx adding code
Broken in this commit:
bc39cd7b89

Synchronous methods were added to an `async.waterfall` array.

This commit also removes the delegate call checking, since we concluded it was misinformed.
2016-11-29 12:46:08 -08:00
Dan Finlay 4b6b1db4f0 Ordered keyringController methods the same in metamask-controller 2016-11-29 12:05:23 -08:00
Dan Finlay b81f00849d Annotated KeyringController 2016-11-29 11:40:49 -08:00
Dan Finlay 9d401f9137 Fix nodeify usage 2016-11-28 17:27:28 -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 d9dc2eac63 Fix more async usage of KeyringController 2016-11-23 14:35:29 -08:00
Dan Finlay 230a0ab876 Fix more keyring asyncifying tests 2016-11-23 11:58:34 -08:00
kumavis c0a2eb146a rpc - add sync uninstallFilter support 2016-11-23 10:48:20 -08:00
Dan Finlay 600f5c31db Mostly got async keyringController tests passing 2016-11-23 00:23:41 -08:00
Dan Finlay c77d355e98 Complete first pass at asyncrhonizing keyring controller 2016-11-22 23:36:11 -08:00
Dan Finlay 2efab79f5b Asynced keyrings and started on controller 2016-11-22 23:16:36 -08:00
Dan Finlay 05c8658ff3 Fix new encryptor migration logic 2016-11-22 17:41:54 -08:00
Dan Finlay 822face7a3 Fix password reference 2016-11-22 16:29:46 -08:00
Dan Finlay 6ebdebc0a5 Remove line of cruft 2016-11-22 16:18:18 -08:00
Dan Finlay 4b7b0a86d8 Refine isInitialized derivation method 2016-11-22 15:57:48 -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
Dan Finlay 2966d46fa2 Merge branch 'dev' into i843-MoveSaltIntoEncryptor 2016-11-22 15:36:50 -08:00
Dan Finlay c8176c9439 Merge pull request #875 from MetaMask/i868-estimateGasTooHigh-dev
I868 estimate gas too high dev
2016-11-22 14:42:46 -08:00
kumavis bc39cd7b89 KeyringController - estimateGas->analyzeGasUsage fix gasLimit + detect OOG 2016-11-22 14:28:31 -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 c4056a861a Move state update outside of conditional callback block 2016-11-22 13:13:10 -08:00
Dan Finlay 606c0b7618 Remove callback type check 2016-11-22 12:57:15 -08:00
kumavis 4669f262e2 Merge pull request #857 from MetaMask/i841-RenameMethod
Rename idStoreMigrator method for clarity
2016-11-22 15:55:48 -05:00
kumavis e61d792832 Merge pull request #869 from MetaMask/dev-cleanup
Dev Cleanup Package
2016-11-22 15:23:55 -05: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 6dad4f1f20
Phase out ethereumjs-util from encryptor module. 2016-11-22 11:17:05 -08:00
Dan Finlay 0289444fcb Merge branch 'dev' into i842-WaitForSeedWord 2016-11-22 10:51:48 -08:00
Kevin Serrano 8261cf232d
Merge branch 'dev' into dev-cleanup 2016-11-22 10:50:15 -08:00
Dan Finlay ca819781cb Merge pull request #866 from MetaMask/new-faucet-dev
Make ropsten faucet button point at the correct url.
2016-11-22 10:30:50 -08:00
Kevin Serrano 17669e4af8
Make ropsten faucet button point at the correct url. 2016-11-22 10:20:59 -08:00
Kevin Serrano 8d2afccdc0
Ropsten has sole access to the faucet. 2016-11-22 10:13:57 -08:00
Dan Finlay 136296aad6 Began moving salt into encryptor 2016-11-22 09:52:43 -08:00
Kevin Serrano 88ed1f191f
Add to changelog. 2016-11-22 09:45:28 -08:00
Dan Finlay ea56426b23 Use callback in placeSeedWord method.
When displaying seed words, we were not using a callback, which had some race condition potential.  This is simply a little cleaner and more correct.

Fixes #842
2016-11-21 20:08:36 -08:00
Dan Finlay 9fb96128e6 Rename idStoreMigrator method for clarity
Fixes #841
2016-11-21 19:52:56 -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
Kevin Serrano 1cbab788ec
Change fauceting to become a response of an emit. 2016-11-21 16:46:26 -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
Dan Finlay 7ab9d40820 Merge branch 'dev' into i831-AddRopsten-Dev 2016-11-21 11:03:32 -08:00
Dan Finlay e8a8302624 Begin adding Ropsten support
Ropsten links will still not work until Etherscan publishes their ropsten link format.

At that time we will need to update ui/lib/account-link.js

Otherwise, fixes #831
2016-11-21 10:58:49 -08:00
Kevin Serrano d6286cd13a
Maintain linting. 2016-11-18 16:27:26 -08:00
Kevin Serrano bc6312e9e3
Promisify persistence of keyrings before returning key
Change single letter variables (shame)
2016-11-18 15:58:49 -08:00
Dan Finlay ce1c5eb75a Update migration code for new hd wallet param name 2016-11-18 11:37:07 -08:00
Kevin Serrano cd2442e3e7
Persist keyrings from migration to storage. 2016-11-18 10:48:00 -08:00
Kevin Serrano bef023fb4a
Resolve merge conflict. 2016-11-18 09:23:20 -08:00
kumavis 39e0a33bba random-id - use Number.MAX_SAFE_INTEGER as max 2016-11-17 14:29:35 -08:00
Dan Finlay 8eb91e89bf Increment tx ids to avoid collisions
Fixes #791

It was possible for two requests to have the same ID, causing a crash and loss of StreamProvider connection.

This new id generation strategy creates a random ID, and increments it for each request.

In case the id generator is included from two different processes, I'm initializing the counter at a random number, and rolling it over a large number when it gets too big.
2016-11-17 14:05:12 -08:00
Dan Finlay 4352c7031a Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault 2016-11-17 13:51:32 -08:00
Dan Finlay f229d32442 Replace old random-id code with incrementing id generator 2016-11-17 13:49:46 -08:00
Kevin Serrano 592b64a19f
Revert one cb to previous state. 2016-11-15 17:13:33 -08:00
Kevin Serrano 5bfb700fa8
Minimize dispatches by using emitters and relying on state updates. 2016-11-15 17:12:13 -08:00
Kevin Serrano e18109f1ea
Fix semantics in comments 2016-11-15 13:45:21 -08:00
Kevin Serrano 585284cb88
Lints. 2016-11-15 13:44:22 -08:00
Kevin Serrano 64296df309
Resolve merge conflicts. 2016-11-15 13:43:15 -08:00
Kevin Serrano 1db0bc4b2a
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault 2016-11-15 13:31:58 -08:00
Kevin Serrano a4666de0ce
Minimize repeated code. 2016-11-15 13:31:22 -08:00
Kevin Serrano b1fee2a1d3
Minimize repeated code. 2016-11-15 11:19:21 -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 d891869eff
First attempt at fixing errors in confirmation screen. 2016-11-14 11:19:01 -08:00
Kevin Serrano 4826f7c0a0
Revert to previous anonymous function for promise. 2016-11-11 17:06:07 -08:00
Kevin Serrano 20cea5b2f5
Various keyring changes
- Rearrange the require statements.
- Remove unused web3.
- Simplify some callbacks and promises.
- Clarify certain parameters.
2016-11-11 15:41:04 -08:00
Kevin Serrano bfeaae69f2
Clarify functions names. Package normalize inside util file. Fix require headers. 2016-11-11 15:40:12 -08:00
Kevin Serrano 7012747fb5
Package normalize inside sig util file. 2016-11-11 15:37:54 -08:00
Kevin Serrano 23263bec7d
Linting to the max. 2016-11-11 10:26:12 -08:00
kumavis e123e3095b Merge branch 'master' into i328-MultiVault 2016-11-11 01:01:06 -05:00
kumavis 536cab0687 detect tx error - show warning and fix gasLimit 2016-11-10 21:19:34 -08:00
Frankie 17aac2dbc5 fix tx data so it has the network id 2016-11-10 19:07:12 -08:00
Frankie f665b779cb Merge branch 'master' into i328-MultiVault 2016-11-10 16:53:47 -08:00
Kevin Serrano e2b2083df0
remove gas field, due to alias redundancy. 2016-11-09 16:38:28 -08:00
Kevin Serrano b6b4be61d9
Fix bug for increasing gas by 20 percent. 2016-11-09 16:29:24 -08:00