65c84ac4b2
Delete all code related to disclaimers.
2017-02-09 18:17:50 -08:00
1d0fcf129c
Fix bugs with notice. Add disclaimer notice.
2017-02-09 17:47:51 -08:00
de6455151e
Revert old style message sighing
2017-02-09 17:32:49 -08:00
4033b620bd
Allowed net_version to be called synchronously
2017-02-08 15:51:22 -08:00
c0637f8d6a
Fix typo
2017-02-04 16:32:09 -08:00
0c0c0051e4
Remove shapeshift tx list from idStore
2017-02-04 15:20:31 -08:00
89bbccb09c
Stop removing old shapeshift txs
2017-02-04 15:15:50 -08:00
af439cc6cf
Do not remove completed shapeshift deposits
2017-02-03 21:40:27 -08:00
901eeb5c10
Fix bug when clearing old shapeshift txs
2017-02-03 21:39:22 -08:00
5d37f90787
Automatically remove shapeshift txs over 11 minutes old with no payment
2017-02-03 21:36:04 -08:00
c9024655d3
Add migration to index
2017-02-03 21:35:54 -08:00
4dc71ed57b
Got ShapeShiftController back to working
2017-02-03 21:12:18 -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
bc4efa1807
eth-store - update store state after manipulating
2017-02-03 16:07:58 -08:00
ff87b9dc7a
id mgmt - update to latest eth_sign spec
2017-02-03 14:59:07 -08:00
77f8995568
migrations - fix migration #9 and add safety checks to migrator
2017-02-03 14:00:30 -08:00
99d6a329a2
eths-store - eagerly set current block
2017-02-03 12:35:01 -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
b233e7e37c
eth-store - cbs default to noop
2017-02-02 22:32:00 -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
134a4c7bc3
keyring - manage isUnlocked in memStore
2017-02-02 16:59:15 -08:00
5c5aa6ea01
keyring - rm config dep
2017-02-02 16:54:16 -08:00
9b6a06e679
Merge branch 'dev' into notice-management
2017-02-02 16:22:44 -08:00
88882f547e
Change filepath for new location of notices.
2017-02-02 15:59:39 -08:00
4c0cb9d92e
metamask - memState - adopt configManager.isDisclaimerConfirmed from keyring controller
2017-02-01 16:38:09 -08:00
10ce2a781f
emit a update badge
2017-02-01 15:12:15 -08:00
d93708b553
put updateBadge back in
2017-02-01 15:08:06 -08:00
c7b9adbfcb
swap out set state for updateState
2017-02-01 15:00:41 -08:00
a96f892788
Fix messy merge
2017-02-01 13:25:36 -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
cd5d952600
keyring - move identities into memStore
2017-02-01 00:17:48 -08:00
41c93ceb7e
keyring - add keyringtypes to memStore
2017-02-01 00:02:10 -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
0b9d37c6c8
migration #6 - fix selectedAddress data source
2017-01-30 15:53:21 -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
7a0acb2333
migration #6 - move selectedAccount from keyringController to preferencesController
2017-01-30 13:01:54 -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
4dd6ba9c1b
migration 5 - move keyring controller state to substate
2017-01-28 19:19:03 -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
3afd0ef27d
tests - remove persistence and start with initial state
2017-01-27 23:04:34 -08:00
ad9531d521
metamask - organize methods
2017-01-27 19:35:03 -08:00
a8ed780d9b
Merge branch 'dev' into messageManagerCleanUp
2017-01-27 14:17:12 -08:00
451845142e
Rewrite message controller to fit controller pattern
2017-01-27 14:16:35 -08:00
efcd22905a
metamask - fix setupProviderConnection
2017-01-26 23:03:11 -08:00
95b846ba07
keymanager - small clean
2017-01-26 22:31:06 -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
fc3a53ec7b
background - stream disconnection fix
2017-01-26 20:18:28 -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
a06ee45404
migrations - rename 005 to stubbed _multi-keyring
2017-01-24 16:30:42 -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
5811f2ab14
Merge pull request #1051 from MetaMask/hotfix1048
...
hotfix - addNewAccount - dont assume hd keyring position
2017-01-24 13:38:24 -08:00
745fff0c80
hotfix - dont assume hd keyring position
2017-01-24 13:29:48 -08:00
01c88bb0bd
keyring-controller - cleanup
2017-01-24 13:22:26 -08:00
8049c1fc07
keyring-controller - cleanup
2017-01-24 13:21:55 -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
56d400b0f8
Merge branch 'master' into upToDate
2017-01-20 14:01:58 -08:00
9c6cf90538
keyring controller - placeSeedWords should use first hdKeyring
2017-01-20 13:52:21 -08:00
9f1884145a
Merge branch 'dev' into i715-AddJsonImport
2017-01-18 17:24:12 -08:00
5d8a3dd99b
Add ability to import v3 JSON wallets
...
There is now a menu item labeled "JSON File" for importing, and it can digest either:
- v1 MyEtherWallet JSON files
- v3 Account files (used by Geth, Mist, and MyEtherWallet).
Fixes #715
2017-01-18 16:45:39 -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
0e01abdf71
Merge branch 'master' into Version-3.1.0
2017-01-18 12:25:35 -08:00
b2c52f6b83
Merge branch 'dev' into i715-AddImportMenu
2017-01-18 11:49:15 -08:00
3b7301488f
tx-manager - use rpc-specified txHash
2017-01-18 11:33:37 -08:00
e3650b336a
Merge branch 'master' into fixSignedVsSubmitted
2017-01-18 11:30:41 -08:00
460cbb985f
Fix the dissplay for submitted transactions and the listner wating to hear when tx's were included in a block
2017-01-18 11:24:53 -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
c53932a19a
Merge branch 'dev' into conversion-api-err
2017-01-17 12:08:47 -08:00
8fcade92d3
Fix bug where signed messages were not dismissed
2017-01-17 00:13:38 -08:00
7ae2e005ed
Fix removeHexPrefix to stripHexPrefix
2017-01-17 00:03:56 -08:00
d5ad84aa12
Wrote fix for eth.sign
2017-01-16 23:26:48 -08:00
82012cbbce
keyring - simple - throw error if wallet not found for address
2017-01-16 11:54:59 -08:00
e7cf0f4bdd
keyring - simple - fix address generation
2017-01-16 11:49:31 -08:00
ef81bde98b
eth-store - emit update on new account add
2017-01-14 21:46:40 -08:00
f49fb149cc
background - txManager - filter txs by network
2017-01-14 21:29:46 -08:00
c3d491a37c
background - return txHash to provider-engine on done
2017-01-14 20:51:29 -08:00
fdcf03f57d
Fix the inclusion of the txFee in the meta tx object
2017-01-14 13:32:35 -08:00
87505e1742
fix for linting
2017-01-13 18:01:50 -08:00
580d93188c
Satisfy review needs:
...
removed unnecessary this.query = opts.query from constructor
Created a tx error state for errors in approveTransaction
validateTxParams has been moved to tx-utils
removed "value" arg from _setTxStatus
2017-01-13 17:47:20 -08:00
212ef0b850
fix the maxcost not being included in txMeta
2017-01-13 16:53:10 -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
1ffaab1d9b
Merge branch 'dev' into integrateTxManagerUI
2017-01-13 11:31:51 -08:00
5ed52eed68
Clean up code
2017-01-13 10:44:22 -08:00
29e83d71a8
background - handle tx finalization in controllers instead of provider-engine
2017-01-13 02:00:11 -08:00
bc1615f032
background - fix metamaskController store -> diskStore persistence
2017-01-12 14:40:04 -08:00
80514d73b5
migrations - wip - 005 multivault migration
2017-01-12 02:24:33 -08:00
b33c51c0a6
migrations - introduce promise-based migrator
2017-01-12 01:17:05 -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
65ba9fc39e
bugfix - portstream - dont wrap cb in try catch
2017-01-11 19:09:49 -08:00
f9efb0817d
Merge branch 'dev' into integrateTxManagerUI
2017-01-11 16:07:03 -08:00
576e2ad64d
Fix wording and icon of failed txs
2017-01-11 15:44:21 -08:00
d87a7b2a76
Send update to UI when changing selected account
...
Fixes #981
2017-01-11 15:15:37 -08:00
89a5eff270
currency conversion - less noisy error
2017-01-11 14:40:35 -08:00
bbd2f2738b
Add to CHANGELOG
2017-01-11 12:23:00 -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
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
Kevin Serrano
Frankie
Dan Finlay
kumavis
kumavis
Dan Finlay