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
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
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
fc26a0a899
Fix network checking
2016-11-04 12:11:00 -07:00
Dan Finlay
abebe51f69
Add tolerance to normalize method
2016-11-03 16:34:55 -07:00
Dan Finlay
ba7d6b437f
Fix password validation and persistence issue
...
Was wiping the vault on each successful password attempt... :P
2016-11-03 16:14:37 -07:00
Kevin Serrano
2afc06287d
Implement private key exporting.
2016-11-03 15:40:23 -07: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
4db976ae46
Don't faucet during tests
2016-11-03 11:22:10 -07:00
Dan Finlay
756f56cfee
Don't faucet in development
2016-11-03 10:42:34 -07:00
Dan Finlay
185396ff08
Fix dual vault creation bug
2016-11-02 16:35:46 -07:00
Dan Finlay
ed1917d71a
Fix initial vault creation
2016-11-02 16:18:47 -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
Kevin Serrano
8f3db0dbc0
Add reveal of seed words.
2016-11-01 22:19:04 -07:00
Dan Finlay
b5f6ef8c01
Fixed bugs related to clearing caches when restoring to a new vault
2016-11-01 17:00:17 -07:00
Dan Finlay
498b30bddc
Fix seed phrase restore
2016-11-01 11:51:51 -07:00
Kevin Serrano
db356a181a
Made progress on parity for MultiVault
...
- 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.
2016-11-01 11:30:10 -07:00
Kevin Serrano
e2f67a2cb8
Do not open MM page in dev mode.
2016-11-01 11:21:46 -07:00
Kevin Serrano
96643c222a
Implement seed word confirmation page.
...
Remove logs.
Move HD render files to ui/app.
2016-10-31 11:35:09 -07:00
Kevin Serrano
6fc498f8a0
Implement auto-fauceting
2016-10-31 09:47:20 -07:00
Kevin Serrano
f9409793d8
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault
2016-10-30 16:02:11 -07:00
Dan Finlay
18e5173f06
Now migrating old vaults to new DEN format
2016-10-29 02:29:25 -07:00
Kevin Serrano
9b4f3825e7
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault
2016-10-28 16:19:14 -07:00
Kevin Serrano
6eb6968037
Merge branch 'master' into i328-MultiVault
2016-10-28 16:19:03 -07:00
Dan Finlay
6ec471c6dc
Configure BIP44 Keychain as default one
2016-10-28 12:10:35 -07:00
Dan Finlay
2690d1acfd
Added hd wallet tests
2016-10-27 17:23:26 -07:00
Dan Finlay
f02e02bef8
Add hd wallet keyring
2016-10-27 16:59:46 -07:00
Dan Finlay
c834b4f637
Merge branch 'master' into i762-RenameWalletToAccount
2016-10-26 11:31:08 -07:00
Dan Finlay
21e7331111
Fix delegate call function reference 2
2016-10-25 17:41:50 -07:00
Dan Finlay
6c469a1826
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault
2016-10-25 17:00:19 -07:00
Dan Finlay
f9ff6cb55e
Merge branch 'master' into i328-MultiVault
2016-10-25 16:59:58 -07:00
Dan Finlay
b3613232a2
Rename wallet to account
...
Fixes #762
2016-10-25 16:54:43 -07:00
Dan Finlay
bda64ab132
Fix delegate call analysis
...
Fixed reference allowing transactions to be analyzed for delegate call again.
2016-10-25 14:58:04 -07:00
Kevin Serrano
678301a20e
Phase out extra warning screen.
2016-10-25 13:24:03 -07:00
kumavis
85d03cc8fb
Merge branch 'master' into i743-FixDelegateCallFlag
2016-10-24 12:24:19 -07:00
Dan Finlay
518ff399fb
Fix loading indication
2016-10-21 14:11:04 -07:00
Dan Finlay
1ddb8b9aec
Added tx & msg managing functionality to new KeyringController
2016-10-21 13:41:33 -07:00
Dan Finlay
626b52d24a
Fix bug in new KeyringController vault restoring logic.
2016-10-21 13:11:30 -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
Dan Finlay
9560ae93ee
Added tx and msg signing to keychain & controller
2016-10-20 19:06:17 -07:00
Dan Finlay
957b7a72b5
Improved simple account generation
2016-10-20 17:29:25 -07:00
Dan Finlay
55d56f77cf
Began adding first basic keyring
2016-10-20 16:45:58 -07:00
Dan Finlay
351c8e2086
Merge branch 'master' into i328-MultiVault
2016-10-20 14:02:24 -07:00
Dan Finlay
0deed17752
Fix tests
2016-10-20 12:07:53 -07:00
Dan Finlay
383f8ea7dc
Linted & added salting to vault
2016-10-20 11:33:18 -07:00
Dan Finlay
e5c95d68f8
Fix state updating after vault creation and unlocking
2016-10-20 11:00:38 -07:00
Dan Finlay
2132477797
Fix unlock logic
2016-10-20 10:28:45 -07:00
Dan Finlay
090959470b
Add note about callback param to sync method warning
2016-10-19 15:16:27 -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
Kevin Serrano
725d503f68
Remove unused crypto dependencies.
2016-10-19 14:06:48 -07:00
Kevin Serrano
17506fe14f
Merge in crypto.
2016-10-19 11:17:29 -07:00
Kevin Serrano
82489129d5
Merge branch 'master' into i743-FixDelegateCallFlag
2016-10-18 14:20:16 -07:00
Dan Finlay
cc23158bfe
Wait for first metamask data to establish ping-pong stream.
...
Prevents infinite reload loops when dapps take too long to load.
Fixes #746 .
2016-10-18 13:51:50 -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
Kevin Serrano
bc6092e111
Merge branch 'master' into i735-xmlfix
2016-10-17 10:25:00 -07:00
Kevin Serrano
0d495372da
Lint.
2016-10-15 15:41:24 -07:00
Kevin Serrano
8a5eacd35f
Prevent XML from web3 injections.
2016-10-15 15:33:49 -07:00
Kevin Serrano
1481a3ef8e
Initial work on UI side
2016-10-15 10:48:12 -07:00
Frankie
35232c5e29
Fix for linting
2016-10-13 18:08:15 -07:00
Frankie
aace26c4bd
Create callback and Clean-up details
2016-10-13 16:53:32 -07:00
Frankie
67eba9f542
Specify base 10 in bignumber
2016-10-13 16:04:23 -07:00
Frankie
b200f74d5f
Merge branch 'master' into i#495CustomGasField
2016-10-13 15:17:30 -07:00
Frankie
c400f7c0f6
Fix gasPrice range
2016-10-13 15:10:29 -07:00
Kevin Serrano
7cba71fc55
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into origin/i328-MultiVault
2016-10-12 17:12:52 -07:00
Dan Finlay
cd2c00a318
Add minimal method signatures to new keyring controller
2016-10-12 17:05:39 -07:00
kumavis
465cff78c3
Merge branch 'master' into i695-dapp-reload
2016-10-12 13:49:18 -07:00
Kevin Serrano
d750daed5c
Remove logs.
2016-10-12 13:05:15 -07:00
Kevin Serrano
3954ed2a7e
Fix misnamed variable.
2016-10-12 13:04:21 -07:00
kumavis
88a68f732e
Merge branch 'master' into i695-dapp-reload
2016-10-12 13:03:15 -07:00
kumavis
a1c3c944cf
dapp reload - fixed disconnect detection via polling
2016-10-12 12:35:55 -07:00
Dan Finlay
535d832a64
Merge branch 'master' into i328-MultiVault
2016-10-12 10:58:58 -07:00
Frankie
229d95956b
Merge branch 'master' into i#495CustomGasField
2016-10-11 16:19:13 -07:00
Kevin Serrano
9d267907ee
Merge branch 'tos' of github.com:MetaMask/metamask-plugin into tos
2016-10-11 15:51:26 -07:00
Kevin Serrano
5e9bc31c58
Cleanup.
2016-10-11 15:50:02 -07:00
Dan Finlay
5c9476e57d
Fix bug where new vaults had no nicknames
2016-10-11 15:29:12 -07:00
Dan Finlay
ea1a934c7d
Add initial KeyringController files
2016-10-11 15:12:23 -07:00
Kevin Serrano
f7361d9654
lint
2016-10-11 14:49:24 -07:00
Kevin Serrano
79a99ac93b
Move tos hash comparison logic from background to mm controller.
2016-10-11 14:33:30 -07:00
Kevin Serrano
ed03b89e26
Move tos hash logic to build phase. Create dynamic global variables based on build.
2016-10-11 14:32:03 -07:00
Frankie
3a610f2c06
Merge branch 'master' into i#495CustomGasField
2016-10-10 18:18:07 -07:00
Frankie
e1b78da3e6
Add custom gas field to send page
2016-10-10 18:17:56 -07:00
Kevin Serrano
21d1959435
Fix linting and guarantees set TOS hash.
2016-10-07 01:54:12 -07:00
Kevin Serrano
e4f2cd2e09
Fix retention of terms of service hash across reloads of plugin.
2016-10-07 01:42:13 -07:00
Kevin Serrano
7c5ebb6a53
Renamed variables to make more sense.
2016-10-07 01:41:27 -07:00
Kevin Serrano
d200ef4a10
Add missing path require statement.
2016-10-07 01:14:25 -07:00
Kevin Serrano
0a9b814f11
On update, check whether the TOS has changed using hashes.
2016-10-06 03:25:03 -07:00
Kevin Serrano
4ea3246912
Add controller functions for storing and checking TOS hashes.
2016-10-06 03:24:28 -07:00
Kevin Serrano
db06813404
Add new functions for storing TOS hashes in config manager.
2016-10-06 03:23:47 -07:00
Dan Finlay
f21170c7c3
Add tolerance for sending from mixed-case addresses.
...
We had to convert to lower case, and also had to modify the new provider-engine sanitizer to tolerate mixed case addresses.
Fixes #707
2016-10-05 15:26:56 -07:00
Dan Finlay
d02b2c4b4a
Correct async link
2016-10-05 11:10:39 -07:00
Dan Finlay
f9eba9d7e5
Make popup a little taller
...
For some reason the popup was often cutting off the bottom buttons of the UI.
We should look at that more carefully later perhaps, but especially since we're considering moving off the popup, I'm just fixing it by making it taller for now.
2016-10-04 13:10:28 -07:00
Dan Finlay
da611eb3a1
Improve popup behavior for parity errors
...
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.
2016-10-03 20:04:44 -07:00
Frankie
ebf864ae6e
Fix for readability
2016-10-02 04:53:43 +08:00
