529304c005
Wrap the provider in a proxy
2017-05-23 01:56:10 -04:00
13a41f3129
Merge branch 'master' into networkController
2017-05-22 19:48:10 -04:00
f87ea49b5a
Create a network controller to manage switcing networks an updating the provider
2017-05-19 00:14:10 +02:00
2df9344be5
Rename tx manager to tx controller
2017-05-16 10:35:28 -07:00
fb08c4a131
metamask - publicConfig - fix init state
2017-05-04 17:56:30 -07:00
10ba760ed3
metamask - selected accounts - dont reveal when locked
2017-05-04 17:50:59 -07:00
a3149c1752
Use loglevel for more logs
2017-04-30 12:38:38 -07:00
6bdb4c8728
Fix linting warnings
2017-04-26 21:05:45 -07:00
5a91adf7d8
add platforms to mascara + move buyEther window open to ui
2017-04-04 18:23:46 -07:00
5d967eeebb
Merge pull request #1307 from MetaMask/mascara
...
Proof of Concept: Mascara
2017-04-04 11:27:45 -07:00
4779999bfc
clean - metamask controller - remove log
2017-04-04 11:13:07 -07:00
0a7b388b39
Fix faucet to only autoFaucet first account
2017-04-04 18:38:56 +02:00
f81fdbc34f
Merge branch 'master' into mascara
2017-04-02 23:04:55 -07:00
5036263f88
introduce platform api and rename notifications to notification-manager
2017-03-30 18:33:19 -07:00
84b3415b44
WIP: lost enital call from dapp to getAccounts
2017-03-29 10:53:43 -07:00
a20a237282
Merge branch 'master' into mascara
2017-03-28 18:02:39 -07:00
7b9ac18557
Merge pull request #1268 from MetaMask/kovan-faucet-instructions
...
Add Kovan faucet instructions
2017-03-28 14:56:02 -07:00
a95d96d507
Assure that seed words are placed into state tree upon request.
2017-03-28 11:23:25 -04:00
c1136a6317
Add link to kovan faucet instructions.
2017-03-27 16:05:21 -04:00
8e30acb41a
Merge branch 'master' into mascara
2017-03-23 15:44:29 -07:00
45ab81fb45
WIP: streams->indexdb
2017-03-23 11:06:38 -07:00
b6e2eaf7b1
Remove eth-lightwallet
2017-03-16 11:16:03 -07:00
a186e40d17
Merge branch 'master' into i1165-predictive
2017-03-14 17:52:03 -07:00
37ffcfcf0e
Rename variables to proper currency state variables.
2017-03-14 17:06:16 -07:00
7dcab52a9e
Connect keyring controller to address book to prevent additional duplicates.
2017-03-10 10:34:46 -08:00
b34ee4daa1
Allow for adding recently used addresses to address book.
2017-03-09 15:10:27 -08:00
9f6c040554
Create persistence address book.
2017-03-09 13:58:42 -08:00
cf2268c3d2
Nodeify and promisify calls to background.
2017-03-08 09:06:41 -08:00
e7e024bcdd
Refactor of code into separate reducers and actions.
2017-03-07 16:01:51 -08:00
08ca7dac5a
Merge branch 'master' into i1144-moarrpc
2017-03-07 10:37:31 -08:00
b84f1b0532
Fix issue where old txMeta object was being used to pass the txHash to the cb
2017-03-06 15:41:11 -08:00
e66035254f
More conflict resolution.
2017-03-01 10:04:25 -08:00
0a3849ec84
Fix merge conflicts.
2017-03-01 10:01:21 -08:00
ddc136a7c2
Add a couple more debug logs
2017-02-28 15:41:20 -08:00
f908aaafbc
Use correct action to update and submit tx
2017-02-28 14:45:21 -08:00
da88481560
Remove gasMultiplier txMeta param
...
This was used by the custom gas slider on the `send` screen, and it was used to modify the gas value before sending it out, breaking our new custom gas field logic.
Removed it and the logic that referred to this now-outdated parameter.
2017-02-28 14:08:00 -08:00
1eb4a5d62c
Add background method for updating and approving a tx in one call
2017-02-27 18:25:46 -08:00
b5d03cd524
add controllers to root scripts folder
2017-02-27 10:40:37 -08:00
5edb3db969
Merge branch 'master' into i1144-moarrpc
2017-02-27 10:36:48 -08:00
8c66260bdb
Removed redundant personal_recover logic
2017-02-24 17:07:54 -08:00
f2851402f3
Mostly fix personal_recover
2017-02-24 16:36:29 -08:00
961a83769b
Fix cancel msg signing behavior.
2017-02-23 16:02:58 -08:00
4697aca02c
Got personal_sign working
...
Also fixed bug where signing would not close popup.
2017-02-23 14:23:45 -08:00
62854398f1
Tested against code to play nice with unit tests.
2017-02-23 13:56:58 -08:00
564f920ae0
Add personal sign actions and template
2017-02-22 16:30:09 -08:00
8684fc40c7
Allow provider to init before keyringController
2017-02-21 14:41:55 -08:00
92fb07999a
Point metamask-controller personalSignRecover method to keyring-controller
2017-02-21 14:32:35 -08:00
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
026e0e3383
Fix naming
2017-02-21 12:51:46 -08:00
db48f8984f
Basic infrasture for RPC list added.
2017-02-21 12:32:13 -08:00
f9601ac2dd
Merge branch 'dev' into disclaimer-notify
2017-02-09 19:04:17 -08:00
65c84ac4b2
Delete all code related to disclaimers.
2017-02-09 18:17:50 -08:00
4033b620bd
Allowed net_version to be called synchronously
2017-02-08 15:51:22 -08:00
13ee92909c
Mostly got shapeshift tx management into its own controller
...
Rendering the list is still having issues, so this isn't done yet.
2017-02-03 20:45:20 -08:00
ff87b9dc7a
id mgmt - update to latest eth_sign spec
2017-02-03 14:59:07 -08:00
970d4fd695
metamask - add missing diskState and memState subscriptions
2017-02-02 23:47:00 -08:00
9e4ef45b6a
migration #9 - break out CurrencyController substate
2017-02-02 23:32:24 -08:00
8b5e3aa287
migration #8 - break out NoticeController substate
2017-02-02 22:23:45 -08:00
73edfc9f31
eth-store - convert to obs-store subclass
2017-02-02 22:05:06 -08:00
f08f40aee2
txManager - depend on preferencesStore
2017-02-02 21:09:17 -08:00
0c6df24ecf
metamask - introduce networkStore
2017-02-02 20:59:47 -08:00
99fa9ab13a
migration 7 - break off TransactionManager substate
2017-02-02 20:20:13 -08:00
bcb86f38cb
messageManager - move view state to obs-store
2017-02-02 18:21:22 -08:00
79ed2e902f
keyring - replace getState with memStore
2017-02-02 17:07:52 -08:00
5c5aa6ea01
keyring - rm config dep
2017-02-02 16:54:16 -08:00
4c0cb9d92e
metamask - memState - adopt configManager.isDisclaimerConfirmed from keyring controller
2017-02-01 16:38:09 -08:00
54b1339f6a
Merge branch 'dev' into messageManagerCleanUp
2017-02-01 13:05:58 -08:00
ce0c3ed03c
Merge branch 'dev' into messageManagerCleanUp
2017-02-01 12:03:42 -08:00
1b16b46241
code clan up and tests
2017-02-01 11:54:01 -08:00
1cb730144d
metamask - adopt isInitialized from keyring controller
2017-02-01 00:31:26 -08:00
ad060e2678
metamask - inherit some configManager state from keyring controller
2017-01-31 22:35:11 -08:00
c0d3db6a8c
keyring - synchronous getState
2017-01-31 20:02:38 -08:00
7ccaa263d2
inpage - set web3.eth.defaultAccount correctly
2017-01-30 15:38:32 -08:00
2fa60cfcbf
continue rename selectedAccount to selectedAddress
2017-01-30 15:25:12 -08:00
f9b31fe2c3
rename selectedAccount to selectedAddress
2017-01-30 15:08:31 -08:00
b1de2cdefa
metamask - rename getSelectedAccount to getSelectedAddress
2017-01-30 13:09:46 -08:00
4dafb09db2
metamask - move selectedAccount set/get to preferencesController
2017-01-30 13:01:07 -08:00
0a1918f71a
preferences - introduce preferences controller
2017-01-30 12:42:24 -08:00
f40629e5ae
Merge branch 'dev' into messageManagerCleanUp
2017-01-30 00:50:02 -08:00
dd528d886f
metamask - lookup selectedAccount via keyringController
2017-01-30 00:32:04 -08:00
6480c2d8a6
public config - get selectedAccount from keyring controller substate
2017-01-29 23:59:17 -08:00
fdee1e3701
Merge branch 'dev' into messageManagerCleanUp
2017-01-28 22:59:28 -08:00
13e2003469
metamask - subscribe metamask store to keyringController substate
2017-01-28 22:12:15 -08:00
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
e9cdbf4f89
keyring - add and initialize obs-store
2017-01-28 13:12:12 -08:00
1fd1746744
metamask - adopt shapeshift txs from keyringController
2017-01-27 23:05:29 -08:00
ad9531d521
metamask - organize methods
2017-01-27 19:35:03 -08:00
efcd22905a
metamask - fix setupProviderConnection
2017-01-26 23:03:11 -08:00
9ab8362843
metamask controller - cleanup remote api
2017-01-26 22:30:12 -08:00
fc1b11e373
metamask - organize into sections
2017-01-26 21:19:09 -08:00
832772414e
metamask - use web3-stream-provider/handler instead of manual wiring
2017-01-26 21:18:17 -08:00
2113979be7
metamask controller - adopt setup*Communication from background
2017-01-26 20:52:46 -08:00
2f79781ab9
metamask controller - adopt clearSeedWords from keyring controller
2017-01-26 20:17:36 -08:00
dc86ddebb7
background - graceful publicConfigStore connection teardown
2017-01-26 16:07:35 -08:00
af115aa4c1
background - organize metamask instantiation
2017-01-26 15:09:31 -08:00
76ce348a04
obs-store - use published module
2017-01-24 19:47:00 -08:00
bb1ee8e649
Merge branch 'dev' of github.com:MetaMask/metamask-plugin into obs-store2
2017-01-24 16:09:57 -08:00
70b8e640f0
Merge branch 'dev' into i#1048
2017-01-24 15:39:33 -08:00
463a56ff54
background controller - extract KeyringC.placeSeedWords to MetamaskC
2017-01-24 15:33:33 -08:00
48ffea0142
Move the assumption of their only being one hd keyring when requesting seed words to metamaskController
2017-01-24 12:28:05 -08:00
8642ced310
Fix issue where generating a new account would put it in loose keys
2017-01-24 12:06:59 -08:00
74dc20bdf1
Merge branch 'dev' into obs-store2
2017-01-21 10:06:50 -08:00
b52346388b
Added new modular private key import system
...
Now any strategy for importing a private key that can be described as a pure function can be very easily turned into a MetaMask import strategy.
I've created a generic and reusable UI action called `importNewAccount(strategy, args)`.
The `strategy` is a unique identifier defined in `app/scripts/account-import-strategies`, and the `args` will be passed to the member of the `strategies` array whose key matches the strategy string.
Strategies return private key hex strings, and are used by the metamask-controller to create a new keyring, and select that new account, before calling back.
This also implements @frankiebee's idea of showing the imported account when it's been imported (my oversight!).
This commit only moves us to this architecture, keeping feature parity for private key import, but has some untested code for importing geth-style JSON files as well!
2017-01-18 15:20:48 -08:00
1ff4894b67
Allow importing of private key strings
...
Fixes #1021
A top-right menu item now allows `Account Import`. It has a menu (with one item for now) that allows importing a private key string.
Errors are displayed, and a success navigates the user to their account list, where the imported account is labeled `LOOSE`.
2017-01-17 16:24:45 -08:00
c3d491a37c
background - return txHash to provider-engine on done
2017-01-14 20:51:29 -08:00
d06c54e0b7
Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin into bug-submitTx
2017-01-13 15:51:36 -08:00
d755b66e20
background - metamask controller - fix 'this' ref
2017-01-13 15:51:08 -08:00
9f162e72b4
Merge branch 'dev' into bug-submitTx
2017-01-13 13:26:57 -08:00
29e83d71a8
background - handle tx finalization in controllers instead of provider-engine
2017-01-13 02:00:11 -08:00
3bc996878b
background - move pojo migrator to outside of metamask controller
2017-01-11 22:47:56 -08:00
8012ede126
background - introduce ObservableStore
2017-01-11 19:31:21 -08:00
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
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
ead8a05034
Fix dependency reference
2017-01-04 14:21:36 -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
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
25d0ac1476
Merge branch 'dev' into ShowDifferentAccounts
2017-01-02 14:04:27 -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
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
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
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
931ae5f64a
Make notices confirmation configurable
...
- Confirm button will now dismiss the lost accounts array.
2016-12-20 15:24:08 -08:00
77d2deb176
Merged master into dev
2016-12-19 13:37:27 -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
090935f90a
Create a TxManager
2016-12-14 12:55:41 -08:00
frankiebee
Dan Finlay
kumavis
Thomas Huang
kumavis
Dan Finlay
Kevin Serrano
Kevin Serrano