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
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
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
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
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
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
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
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
136296aad6
Began moving salt into encryptor
2016-11-22 09:52:43 -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
Kevin Serrano
bc6312e9e3
Promisify persistence of keyrings before returning key
...
Change single letter variables (shame)
2016-11-18 15:58:49 -08:00
Kevin Serrano
cd2442e3e7
Persist keyrings from migration to storage.
2016-11-18 10:48:00 -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
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
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
23263bec7d
Linting to the max.
2016-11-11 10:26:12 -08:00
Frankie
17aac2dbc5
fix tx data so it has the network id
2016-11-10 19:07:12 -08:00
