0b59dafc34
Merge branch 'dev' into integrateTxManagerUI
2017-01-11 12:17:17 -08:00
0fae263a9a
Take some of the tx Logic out of the UI and create a visble state for pending and unaproved transactions
2017-01-11 12:16:37 -08:00
26e4ff40e1
rpc - fix sync account cache setting
2017-01-11 02:33:57 -08:00
61637c738b
web3 provider - override eth_syncing and web3_clientVersion
2017-01-11 00:46:44 -08:00
21e2e4efd8
Remove erroneous OOG estimation logic.
2017-01-10 14:20:46 -08:00
b301c0fb48
deps - replace promise-request with fetch
2017-01-10 12:04:26 -08:00
4c1b7700ad
Merge branch 'dev' into TearDownOnDisconnect
2017-01-05 14:25:31 -05:00
00ac5ca058
Merge branch 'dev' into TearDownOnDisconnect
2017-01-05 14:18:34 -05:00
73ee0ae766
Merge branch 'dev' into fixTxManager
2017-01-05 11:18:13 -08:00
e62f70660d
MetaMask Controller - Convert to EventEmitter
2017-01-05 11:06:18 -08:00
7659f5894a
Combine two identical then blocks
2017-01-05 11:03:30 -08:00
cf6817092b
remove unnecessary try statments
2017-01-04 15:03:45 -08:00
6c99d09404
Fixed bugs with sanity-checking
...
- Was incorrectly calling some eth-query methods (left over from old local eth-query)
- Was still passing block to getAccount in addAccount
- Now emitting update only after all account balances are loaded, reducing UI update traffic.
2017-01-04 14:54:40 -08:00
ead8a05034
Fix dependency reference
2017-01-04 14:21:36 -08:00
a107b66854
Caught typo
2017-01-04 14:15:53 -08:00
18e6d266c1
Add descriptive comment
2017-01-04 14:07:08 -08:00
381a60695d
Linted
2017-01-04 14:05:00 -08:00
3588aabdf2
Removed reliance on eth-store internal custom eth-query
2017-01-04 14:01:32 -08:00
08351f801a
Move eth-store@1.1.0 into local repo.
2017-01-04 13:56:21 -08:00
32e8063a77
clean up
2017-01-04 13:13:34 -08:00
354fa763d4
Merge branch 'dev' into fixtTxManager
2017-01-04 13:05:29 -08:00
e6da8e2762
Fix signing of transactions
2017-01-04 13:04:33 -08:00
b571913daf
Merge branch 'dev' of github.com:MetaMask/metamask-plugin into dev
2017-01-03 12:19:33 -08:00
68be524019
Take out unneeded permissions from the app.
2017-01-03 11:23:27 -08:00
33b4d213f1
Fix sendUpdate for new promisified getState method
2017-01-03 11:15:38 -08:00
1b9906372b
Update UI state on ethStore updates
...
UI was remarkably not relying on ethStore for updates, so things like account balances were frozen until user activity.
Fixes #963
2017-01-03 11:10:20 -08:00
af2c7004b0
Make single letter variables more verbose
2017-01-02 15:08:18 -08:00
25d0ac1476
Merge branch 'dev' into ShowDifferentAccounts
2017-01-02 14:04:27 -08:00
edc5f9e821
Add tolerance for hex prefixed private keys to simple keychain
2017-01-02 13:55:43 -08:00
616721f47d
inpage-provider - add isMetaMask
...
adds `metamaskInpageProvider.isMetaMask === true`
Fixes #727
2017-01-02 12:20:09 -08:00
21af3de43d
Merge branch 'FixMigrationPasswordBug' into ShowDifferentAccounts
2016-12-23 17:10:56 -08:00
e95c937569
Add additional migration test
2016-12-23 17:09:24 -08:00
fa3e708f34
Merge branch 'dev' into TxManager
2016-12-23 12:48:36 -08:00
fde69ea0ba
fix some minor spelling mistakes and clean up code
2016-12-23 12:43:42 -08:00
a10fe6b6f4
Return keyring metadata on metamask state object
...
Required making the getState methods for both keyringController and metamaskController async.
They both now return promises, and the main metamask-controller.getState method is now nodeified.
Will allow the UI to render loose keys differently than persisted keys.
2016-12-22 17:17:07 -08:00
1861bf8e2b
Remove log
2016-12-22 14:46:14 -08:00
898e96fd6a
Merge pull request #948 from MetaMask/RecoverLostAccounts
...
Auto-Recover accounts lost to BIP44 derivation fix
2016-12-22 14:43:43 -08:00
98527c1c25
Fix account injection bug
...
It seems `selectedAddress` was removed from the keyring-controller’s state, and is used to populate the injected current account.
I couldn't help myself, I dug around, I found a PR named [changed all instances of selectedAddress to selectedAccount](f5b0795ac5Fixes #908
2016-12-22 14:43:00 -08:00
9e54e3baa0
Break up migration function
2016-12-22 13:56:45 -08:00
291403c13f
Don't bother changing selected accounts since accounts are recovered
2016-12-22 13:45:45 -08:00
cf3951c9df
Remove logs
2016-12-22 13:40:12 -08:00
0df656850d
Linted
2016-12-21 17:30:10 -08:00
ebeaf3b3d6
Restructured migration
...
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.
2016-12-21 17:21:10 -08:00
a3a64afdd5
Return undefined when vault is uninitialized
2016-12-21 17:20:14 -08:00
05ce7086f7
Added error when trying to unlock uninitialized vault
2016-12-21 17:19:53 -08:00
9e1c90eafc
fix merge
2016-12-21 14:46:10 -08:00
6f7c23fd28
Merge branch 'dev' into TxManager
2016-12-21 14:31:07 -08:00
a85c691b71
Remove txManager in keyring controller
2016-12-21 14:06:15 -08:00
1ebcbe296b
Migrate all tx mutation code out of keyring controller and
...
Fix up txManager to reflect code review requests
2016-12-21 13:41:49 -08:00
6e78494846
First pass at revision requests
2016-12-21 13:41:32 -08:00
48f2ae2154
Move old keystore migration code to metamask controller
...
Allows keyring controller to be more generic, less opinionated, and who knows, maybe sooner publishable as its own thing.
2016-12-21 11:02:04 -08:00
aea263a80d
Lint.
2016-12-20 16:45:22 -08:00
931ae5f64a
Make notices confirmation configurable
...
- Confirm button will now dismiss the lost accounts array.
2016-12-20 15:24:08 -08:00
674b268982
Merge pull request #916 from MetaMask/i894-DetectBadAccounts
...
I894 detect bad accounts
2016-12-20 11:50:26 -08:00
4fbea1c7b4
Merge pull request #939 from MetaMask/BrowserPassworder
...
Remove encryptor in favor of external browser-passworder
2016-12-20 11:49:40 -08:00
35d8f69e80
Merge pull request #942 from MetaMask/Version-2.14.1
...
Version 2.14.1
2016-12-20 11:48:15 -08:00
3f2945dce0
Version 2.14.1
2016-12-20 08:58:18 -08:00
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
20d2204ce6
Made changes according to feedback.
2016-12-19 19:32:59 -08:00
ead8329877
Merge pull request #937 from MetaMask/i900-forgot-password-flow
...
I900 forgot password flow
2016-12-19 16:01:01 -08:00
e9bea92ac3
Lint.
2016-12-19 14:55:52 -08:00
77d2deb176
Merged master into dev
2016-12-19 13:37:27 -08:00
5ea7d738d2
changelog - inf reload detection hotfix
2016-12-19 13:23:32 -08:00
b4a298e1a3
inpage - temporarily disable ping stream
2016-12-19 12:25:35 -08:00
73998feeb2
move notice code from metamask-controller + config-manager, in to notice-controller
2016-12-16 12:44:47 -08:00
1458b8c68e
Deactivate polling for now.
2016-12-16 11:39:41 -08:00
2b1d821da3
Cleanup
2016-12-16 11:26:39 -08:00
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
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
83880a5c92
Remove morden testnet provider
...
Instances configured to point at Morden will now point at Ropsten.
2016-12-15 16:12:03 -08:00
da9349fe63
Clean up and comment functions
2016-12-14 15:04:33 -08:00
090935f90a
Create a TxManager
2016-12-14 12:55:41 -08:00
7b9749e30c
Got bad account detection working and added to state
2016-12-09 12:24:25 -08:00
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
26b60f1b5a
inpage - correctly listen for incomming messages
2016-12-07 14:42:38 -08:00
c431783602
Remove redundant logging block
2016-12-01 10:21:56 -08:00
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
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
df0b89074b
Return promise correctly from setSelectedAddress
2016-11-29 15:50:26 -08:00
5bf1018d75
Flattened addTx async methods
2016-11-29 14:56:58 -08:00
ff3f6cc36a
Bind ethQuery to estimateGas to allow it to be moved around.
2016-11-29 14:13:12 -08:00
85d5b12f8d
Fix tx adding code
...
Broken in this commit:
bc39cd7b89
2016-11-29 12:46:08 -08:00
4b6b1db4f0
Ordered keyringController methods the same in metamask-controller
2016-11-29 12:05:23 -08:00
b81f00849d
Annotated KeyringController
2016-11-29 11:40:49 -08:00
9d401f9137
Fix nodeify usage
2016-11-28 17:27:28 -08:00
9e764b1935
Fix nodeify
2016-11-28 17:27:20 -08:00
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
44a2f2ad9d
Version 2.13.11
2016-11-23 16:59:48 -08:00
b899119582
Merge branch 'master' into dev
2016-11-23 16:54:27 -08:00
d9dc2eac63
Fix more async usage of KeyringController
2016-11-23 14:35:29 -08:00
230a0ab876
Fix more keyring asyncifying tests
2016-11-23 11:58:34 -08:00
c0a2eb146a
rpc - add sync uninstallFilter support
2016-11-23 10:48:20 -08:00
600f5c31db
Mostly got async keyringController tests passing
2016-11-23 00:23:41 -08:00
c77d355e98
Complete first pass at asyncrhonizing keyring controller
2016-11-22 23:36:11 -08:00
2efab79f5b
Asynced keyrings and started on controller
2016-11-22 23:16:36 -08:00
05c8658ff3
Fix new encryptor migration logic
2016-11-22 17:41:54 -08:00
822face7a3
Fix password reference
2016-11-22 16:29:46 -08:00
6ebdebc0a5
Remove line of cruft
2016-11-22 16:18:18 -08:00
4b7b0a86d8
Refine isInitialized derivation method
2016-11-22 15:57:48 -08:00
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
2966d46fa2
Merge branch 'dev' into i843-MoveSaltIntoEncryptor
2016-11-22 15:36:50 -08:00
d9f8a8f9b2
Version 2.13.10
2016-11-22 14:51:33 -08:00
c8176c9439
Merge pull request #875 from MetaMask/i868-estimateGasTooHigh-dev
...
I868 estimate gas too high dev
2016-11-22 14:42:46 -08:00
bc39cd7b89
KeyringController - estimateGas->analyzeGasUsage fix gasLimit + detect OOG
2016-11-22 14:28:31 -08:00
e14efa8f17
Merge pull request #858 from MetaMask/i842-WaitForSeedWord
...
I842 wait for seed word
2016-11-22 16:18:43 -05:00
c4056a861a
Move state update outside of conditional callback block
2016-11-22 13:13:10 -08:00
606c0b7618
Remove callback type check
2016-11-22 12:57:15 -08:00
4669f262e2
Merge pull request #857 from MetaMask/i841-RenameMethod
...
Rename idStoreMigrator method for clarity
2016-11-22 15:55:48 -05:00
e61d792832
Merge pull request #869 from MetaMask/dev-cleanup
...
Dev Cleanup Package
2016-11-22 15:23:55 -05:00
49a1f43736
Merge branch 'master' into i868-estimateGasTooHigh
2016-11-22 15:14:25 -05:00
fa2f0dee28
idStore - fix estimateGas calculation
2016-11-22 12:10:49 -08:00
6dad4f1f20
Phase out ethereumjs-util from encryptor module.
2016-11-22 11:17:05 -08:00
0289444fcb
Merge branch 'dev' into i842-WaitForSeedWord
2016-11-22 10:51:48 -08:00
8261cf232d
Merge branch 'dev' into dev-cleanup
2016-11-22 10:50:15 -08:00
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
17669e4af8
Make ropsten faucet button point at the correct url.
2016-11-22 10:20:59 -08:00
8d2afccdc0
Ropsten has sole access to the faucet.
2016-11-22 10:13:57 -08:00
136296aad6
Began moving salt into encryptor
2016-11-22 09:52:43 -08:00
88ed1f191f
Add to changelog.
2016-11-22 09:45:28 -08:00
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
9fb96128e6
Rename idStoreMigrator method for clarity
...
Fixes #841
2016-11-21 19:52:56 -08:00
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
1cbab788ec
Change fauceting to become a response of an emit.
2016-11-21 16:46:26 -08:00
f5b0795ac5
change all instances of selectedAddress to selectedAccount.
2016-11-21 16:21:16 -08:00
9123e70434
Remove entropy from encryption and project.
2016-11-21 15:49:03 -08:00
1ddc7625e0
Version 2.13.9
2016-11-21 12:24:27 -08:00
7ab9d40820
Merge branch 'dev' into i831-AddRopsten-Dev
2016-11-21 11:03:32 -08:00
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
d6286cd13a
Maintain linting.
2016-11-18 16:27:26 -08:00
bc6312e9e3
Promisify persistence of keyrings before returning key
...
Change single letter variables (shame)
2016-11-18 15:58:49 -08:00
ce1c5eb75a
Update migration code for new hd wallet param name
2016-11-18 11:37:07 -08:00
cd2442e3e7
Persist keyrings from migration to storage.
2016-11-18 10:48:00 -08:00
bef023fb4a
Resolve merge conflict.
2016-11-18 09:23:20 -08:00
39e0a33bba
random-id - use Number.MAX_SAFE_INTEGER as max
2016-11-17 14:29:35 -08:00
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
4352c7031a
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault
2016-11-17 13:51:32 -08:00
f229d32442
Replace old random-id code with incrementing id generator
2016-11-17 13:49:46 -08:00
a4eadddd6b
Version 2.13.8
2016-11-16 16:00:32 -08:00
592b64a19f
Revert one cb to previous state.
2016-11-15 17:13:33 -08:00
5bfb700fa8
Minimize dispatches by using emitters and relying on state updates.
2016-11-15 17:12:13 -08:00
e18109f1ea
Fix semantics in comments
2016-11-15 13:45:21 -08:00
585284cb88
Lints.
2016-11-15 13:44:22 -08:00
64296df309
Resolve merge conflicts.
2016-11-15 13:43:15 -08:00
1db0bc4b2a
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault
2016-11-15 13:31:58 -08:00
a4666de0ce
Minimize repeated code.
2016-11-15 13:31:22 -08:00
b1fee2a1d3
Minimize repeated code.
2016-11-15 11:19:21 -08:00
7de6b12aad
Re-enable disclaimer screen. Rename variables to reflect role more clearly.
2016-11-14 16:49:16 -08:00
d891869eff
First attempt at fixing errors in confirmation screen.
2016-11-14 11:19:01 -08:00
4826f7c0a0
Revert to previous anonymous function for promise.
2016-11-11 17:06:07 -08:00
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
bfeaae69f2
Clarify functions names. Package normalize inside util file. Fix require headers.
2016-11-11 15:40:12 -08:00
7012747fb5
Package normalize inside sig util file.
2016-11-11 15:37:54 -08:00
23263bec7d
Linting to the max.
2016-11-11 10:26:12 -08:00
e123e3095b
Merge branch 'master' into i328-MultiVault
2016-11-11 01:01:06 -05:00
536cab0687
detect tx error - show warning and fix gasLimit
2016-11-10 21:19:34 -08:00
17aac2dbc5
fix tx data so it has the network id
2016-11-10 19:07:12 -08:00
f665b779cb
Merge branch 'master' into i328-MultiVault
2016-11-10 16:53:47 -08:00
e2b2083df0
remove gas field, due to alias redundancy.
2016-11-09 16:38:28 -08:00
b6b4be61d9
Fix bug for increasing gas by 20 percent.
2016-11-09 16:29:24 -08:00
4a0197012e
Version 2.13.7
2016-11-08 08:51:14 -08:00
7068d2e71c
Adjust gas buffer to be 20% over estimate
2016-11-08 08:39:41 -08:00
6f39924e60
Increase gas buffer
...
Fixes #795
2016-11-08 08:32:34 -08:00
161ff62fdc
Merge branch 'master' into i328-MultiVault
2016-11-07 15:38:25 -08:00
553a6da011
Fix 787 gas buffer bug
2016-11-07 12:00:14 -08:00
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
fc26a0a899
Fix network checking
2016-11-04 12:11:00 -07:00
abebe51f69
Add tolerance to normalize method
2016-11-03 16:34:55 -07:00
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
2afc06287d
Implement private key exporting.
2016-11-03 15:40:23 -07:00
e0246975a7
Finish fixing nicknaming bug
2016-11-03 13:44:29 -07:00
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
9ca3c57339
Fix vault creation bug
2016-11-03 11:34:57 -07:00
4db976ae46
Don't faucet during tests
2016-11-03 11:22:10 -07:00
756f56cfee
Don't faucet in development
2016-11-03 10:42:34 -07:00
185396ff08
Fix dual vault creation bug
2016-11-02 16:35:46 -07:00
ed1917d71a
Fix initial vault creation
2016-11-02 16:18:47 -07:00
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
8f3db0dbc0
Add reveal of seed words.
2016-11-01 22:19:04 -07:00
b5f6ef8c01
Fixed bugs related to clearing caches when restoring to a new vault
2016-11-01 17:00:17 -07:00
498b30bddc
Fix seed phrase restore
2016-11-01 11:51:51 -07:00
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
e2f67a2cb8
Do not open MM page in dev mode.
2016-11-01 11:21:46 -07:00
96643c222a
Implement seed word confirmation page.
...
Remove logs.
Move HD render files to ui/app.
2016-10-31 11:35:09 -07:00
6fc498f8a0
Implement auto-fauceting
2016-10-31 09:47:20 -07:00
f9409793d8
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault
2016-10-30 16:02:11 -07:00
18e5173f06
Now migrating old vaults to new DEN format
2016-10-29 02:29:25 -07:00
9b4f3825e7
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault
2016-10-28 16:19:14 -07:00
6eb6968037
Merge branch 'master' into i328-MultiVault
2016-10-28 16:19:03 -07:00
6ec471c6dc
Configure BIP44 Keychain as default one
2016-10-28 12:10:35 -07:00
2690d1acfd
Added hd wallet tests
2016-10-27 17:23:26 -07:00
f02e02bef8
Add hd wallet keyring
2016-10-27 16:59:46 -07:00
b8acdfcab5
Version 2.13.6
2016-10-26 11:48:42 -07:00
c834b4f637
Merge branch 'master' into i762-RenameWalletToAccount
2016-10-26 11:31:08 -07:00
21e7331111
Fix delegate call function reference 2
2016-10-25 17:41:50 -07:00
6c469a1826
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault
2016-10-25 17:00:19 -07:00
f9ff6cb55e
Merge branch 'master' into i328-MultiVault
2016-10-25 16:59:58 -07:00
b3613232a2
Rename wallet to account
...
Fixes #762
2016-10-25 16:54:43 -07:00
bda64ab132
Fix delegate call analysis
...
Fixed reference allowing transactions to be analyzed for delegate call again.
2016-10-25 14:58:04 -07:00
678301a20e
Phase out extra warning screen.
2016-10-25 13:24:03 -07:00
85d03cc8fb
Merge branch 'master' into i743-FixDelegateCallFlag
2016-10-24 12:24:19 -07:00
518ff399fb
Fix loading indication
2016-10-21 14:11:04 -07:00
1ddb8b9aec
Added tx & msg managing functionality to new KeyringController
2016-10-21 13:41:33 -07:00
626b52d24a
Fix bug in new KeyringController vault restoring logic.
2016-10-21 13:11:30 -07:00
44aa1be277
Create basic keyring-controller unit test file
2016-10-21 12:11:54 -07:00
c3e1c5c57f
Added SimpleKeyring tests
2016-10-21 11:10:36 -07:00
9560ae93ee
Added tx and msg signing to keychain & controller
2016-10-20 19:06:17 -07:00
957b7a72b5
Improved simple account generation
2016-10-20 17:29:25 -07:00
55d56f77cf
Began adding first basic keyring
2016-10-20 16:45:58 -07:00
351c8e2086
Merge branch 'master' into i328-MultiVault
2016-10-20 14:02:24 -07:00
0deed17752
Fix tests
2016-10-20 12:07:53 -07:00
383f8ea7dc
Linted & added salting to vault
2016-10-20 11:33:18 -07:00
e5c95d68f8
Fix state updating after vault creation and unlocking
2016-10-20 11:00:38 -07:00
2132477797
Fix unlock logic
2016-10-20 10:28:45 -07:00
090959470b
Add note about callback param to sync method warning
2016-10-19 15:16:27 -07:00
afbc4c832b
Git merge resolution.
2016-10-19 14:57:30 -07:00
ad3fa24a28
Intermediary commit.
2016-10-19 14:55:08 -07:00
725d503f68
Remove unused crypto dependencies.
2016-10-19 14:06:48 -07:00
17506fe14f
Merge in crypto.
2016-10-19 11:17:29 -07:00
82489129d5
Merge branch 'master' into i743-FixDelegateCallFlag
2016-10-18 14:20:16 -07:00
70f3d24e90
Version 2.13.5
2016-10-18 14:00:33 -07:00
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
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
827d7553fc
Restore hex prefix to gas price
2016-10-17 13:05:45 -07:00
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
5864044538
Version 2.13.4
2016-10-17 10:37:23 -07:00
bc6092e111
Merge branch 'master' into i735-xmlfix
2016-10-17 10:25:00 -07:00
0d495372da
Lint.
2016-10-15 15:41:24 -07:00
8a5eacd35f
Prevent XML from web3 injections.
2016-10-15 15:33:49 -07:00
1481a3ef8e
Initial work on UI side
2016-10-15 10:48:12 -07:00
35232c5e29
Fix for linting
2016-10-13 18:08:15 -07:00
aace26c4bd
Create callback and Clean-up details
2016-10-13 16:53:32 -07:00
67eba9f542
Specify base 10 in bignumber
2016-10-13 16:04:23 -07:00
b200f74d5f
Merge branch 'master' into i#495CustomGasField
2016-10-13 15:17:30 -07:00
c400f7c0f6
Fix gasPrice range
2016-10-13 15:10:29 -07:00
7cba71fc55
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into origin/i328-MultiVault
2016-10-12 17:12:52 -07:00
cd2c00a318
Add minimal method signatures to new keyring controller
2016-10-12 17:05:39 -07:00
465cff78c3
Merge branch 'master' into i695-dapp-reload
2016-10-12 13:49:18 -07:00
d750daed5c
Remove logs.
2016-10-12 13:05:15 -07:00
3954ed2a7e
Fix misnamed variable.
2016-10-12 13:04:21 -07:00
88a68f732e
Merge branch 'master' into i695-dapp-reload
2016-10-12 13:03:15 -07:00
a1c3c944cf
dapp reload - fixed disconnect detection via polling
2016-10-12 12:35:55 -07:00
535d832a64
Merge branch 'master' into i328-MultiVault
2016-10-12 10:58:58 -07:00
229d95956b
Merge branch 'master' into i#495CustomGasField
2016-10-11 16:19:13 -07:00
9d267907ee
Merge branch 'tos' of github.com:MetaMask/metamask-plugin into tos
2016-10-11 15:51:26 -07:00
5e9bc31c58
Cleanup.
2016-10-11 15:50:02 -07:00
5c9476e57d
Fix bug where new vaults had no nicknames
2016-10-11 15:29:12 -07:00
ea1a934c7d
Add initial KeyringController files
2016-10-11 15:12:23 -07:00
f7361d9654
lint
2016-10-11 14:49:24 -07:00
79a99ac93b
Move tos hash comparison logic from background to mm controller.
2016-10-11 14:33:30 -07:00
ed03b89e26
Move tos hash logic to build phase. Create dynamic global variables based on build.
2016-10-11 14:32:03 -07:00
Frankie
kumavis
Dan Finlay
kumavis
Dan Finlay
Kevin Serrano
Dan Finlay
Frankie