30e8d25013
Merge branch 'master' into i1210-txdisappearance
2017-03-24 17:13:57 -04:00
3a888ede2a
Merge branch 'master' into notice-modification
2017-03-24 13:56:30 -07:00
8e30acb41a
Merge branch 'master' into mascara
2017-03-23 15:44:29 -07:00
2cab2f767c
Remove gas limit param
...
Fixes #1256 by removing redundant param.
2017-03-23 13:56:32 -07:00
197e6e0b77
WIP: indexdb is at an err state "provider is undefined"
2017-03-23 11:41:32 -07:00
45ab81fb45
WIP: streams->indexdb
2017-03-23 11:06:38 -07:00
fa0bbd66b6
Fix persistence of transactions between networks.
2017-03-23 11:28:06 -04:00
16c76d5229
Create migration to erase body in read notices.
2017-03-23 10:15:59 -04:00
bcaf0864c1
Remove notice body after reading.
2017-03-23 09:58:57 -04:00
af9d782363
Merge branch 'master' into i238-kovan
2017-03-22 15:55:01 -07:00
16bdfd3d6e
Merge branch 'master' into i238-kovan
2017-03-22 15:41:38 -07:00
2687b8604b
Merge branch 'master' into i1237-xmlfix2
2017-03-22 15:39:30 -07:00
1b7326048d
Add current block number and hash to the state.
2017-03-22 16:41:19 -04:00
33dd7954a7
Add kovan config settings to config manager.
2017-03-22 16:00:50 -04:00
c5f96be98d
Add kovan to config file.
2017-03-22 15:59:46 -04:00
b5b88392b9
Merge branch 'master' into i1237-xmlfix2
2017-03-22 11:33:56 -07:00
9906da86a4
Modify logic for injection conditions.
2017-03-22 14:25:56 -04:00
8c7be43403
Have better error messages
2017-03-22 09:48:41 -07:00
b6e2eaf7b1
Remove eth-lightwallet
2017-03-16 11:16:03 -07:00
57d1a1f186
Merge branch 'master' into i#1203MainNetSwitch
2017-03-16 11:00:12 -07:00
a186e40d17
Merge branch 'master' into i1165-predictive
2017-03-14 17:52:03 -07:00
53efc53a40
Merge branch 'master' into i#1203MainNetSwitch
2017-03-14 17:26:06 -07:00
37ffcfcf0e
Rename variables to proper currency state variables.
2017-03-14 17:06:16 -07:00
177f2dc948
Fix description of some migrations.
2017-03-14 17:05:47 -07:00
f6e551ef5f
Swithch the default network to mainnet
2017-03-13 21:14:19 -07:00
4933e2e2ee
Limit the number of addresses stored in our book.
2017-03-13 16:37:53 -07:00
7dcab52a9e
Connect keyring controller to address book to prevent additional duplicates.
2017-03-10 10:34:46 -08:00
7182a2be43
Improve duplicate checking in address book.
2017-03-10 10:05:10 -08:00
2ab86b001d
Add comments.
2017-03-10 09:34:13 -08:00
b34ee4daa1
Allow for adding recently used addresses to address book.
2017-03-09 15:10:27 -08:00
b296640f1b
Rename functions for consistency.
2017-03-09 15:09:50 -08:00
9f6c040554
Create persistence address book.
2017-03-09 13:58:42 -08:00
d270cbc9d2
Create distinct labels and names for addresses.
2017-03-09 13:07:38 -08:00
05346ec3c3
Version 3.4.0
2017-03-08 13:38:55 -08:00
acc9a2a9d0
Modify message.
2017-03-08 10:53:11 -08:00
6f980cfe10
Add more informative message
2017-03-08 10:46:17 -08:00
b0280dc162
Merge branch 'master' into i1065-removealert
2017-03-08 10:22:08 -08:00
67c3126e63
Merge branch 'master' into kumavis-patch-1
2017-03-08 10:16:50 -08:00
529eb25ced
Convert alert to a log.error
2017-03-08 10:13:45 -08:00
86f71d504c
Merge branch 'master' into i1144-moarrpc
2017-03-08 09:28:36 -08:00
cf2268c3d2
Nodeify and promisify calls to background.
2017-03-08 09:06:41 -08:00
92b8443824
tx-utils - add encoding utils
2017-03-07 22:51:39 -08:00
c063fab993
tx-utils - stricter naming type-based convention
2017-03-07 22:47:35 -08:00
17b805c76e
tx-utils - clean and comment
2017-03-07 22:18:14 -08:00
0889309bf3
Merge branch 'master' into i1118-IncreaseGasBuffer
2017-03-07 21:30:43 -08:00
52ee007fcb
Merge branch 'master' into i1118-IncreaseGasBuffer
2017-03-07 22:55:56 -05:00
4916331c53
change BN.mul to BN.muln
2017-03-07 22:42:16 -05:00
2f7a95c257
Fix grammar in erro message
2017-03-07 18:56:38 -08:00
af5ad218e2
Merge branch 'master' into i#1032
2017-03-07 17:59:21 -08:00
3e8b584c98
fix issue where account import allows for duplicates
2017-03-07 17:59:03 -08:00
4256e631a6
remove constant buffer and add multiplier
2017-03-07 19:57:57 -05: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
51aa95a65c
Merge branch 'master' into i1173-ShowPersonalMessage
2017-03-06 16:34:24 -08:00
e66e755766
Fix normalizeMsgData function to always return hex prefixed
2017-03-06 16:33:33 -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
9bd8c5f723
Render personal_sign messages as utf-8 text
...
Calls to `personal_sign` are now:
- When hex encoded, preserved as hex encoded, but displayed as utf-8 text.
- When not hex encoded, decoded as utf-8 text as hex for signing.
- The messages proposed for signing are displayed as UTF-8 text.
- When the message cannot be rendered as UTF-8 text, it is displayed as hexadecimal.
Fixes #1173
2017-03-06 15:04: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
e07e4b7bc7
Linted
2017-02-28 14:13:58 -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
2e16e1eb94
Fixed bug that made send screen sometimes transition to account detail
2017-02-28 12:00:07 -08:00
1eb4a5d62c
Add background method for updating and approving a tx in one call
2017-02-27 18:25:46 -08:00
462c7ae213
Merge branch 'master' into i765-gaslimits
2017-02-27 12:59:19 -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
dfc89d6c6d
Make gasPrice accessible to the UI.
2017-02-24 15:06:55 -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
7ec25526b7
Add alternate UI for pending personal_sign messages
2017-02-23 11:18:49 -08:00
564f920ae0
Add personal sign actions and template
2017-02-22 16:30:09 -08:00
7a0ce31bd3
Implemented functionality for displaying recent custom RPCs
2017-02-22 15:12:56 -08:00
8684fc40c7
Allow provider to init before keyringController
2017-02-21 14:41:55 -08:00
6c0916c28d
Fix reference
2017-02-21 14:37:01 -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
04e80d36be
Version 3.3.0
2017-02-20 14:46:55 -08:00
48ab446436
Add memstore update after adding new keyring
2017-02-15 16:25:47 -08:00
943bcec0d7
keyring controller - update memStore after restoreKeyring
2017-02-15 16:04:40 -08:00
352bb5cb39
Merge branch 'master' into dev
2017-02-15 15:49:04 -08:00
75f7c1244a
Made migrations non-destructive; fixed currency migration.
2017-02-15 11:14:53 -08:00
cd75d86187
Add migrations for removing terms of use data.
2017-02-14 13:21:00 -08:00
f2486fbdd3
got hash test passing
2017-02-13 21:25:02 -08:00
f9601ac2dd
Merge branch 'dev' into disclaimer-notify
2017-02-09 19:04:17 -08:00
d1a6b8c8ed
Merge branch 'dev' into i1085-synchronousnet
2017-02-09 18:41:01 -08:00
26ae3d206f
Version 3.2.2
2017-02-09 18:21:11 -08:00
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
5d827bece3
Version 3.2.1
2017-02-08 13:12:40 -08:00
480c7c5d24
Version 3.2.0
2017-02-07 16:11:30 -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
bef4b78196
merge master hotfix into dev
2017-01-24 14:23:54 -08:00
e2b2e6d5e1
3.1.2
2017-01-24 14:04:29 -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
c587d0f7db
Merge branch 'master' into upToDate
2017-01-20 14:40:22 -08:00
389a104f0d
3.1.1
2017-01-20 14:29:07 -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
99ce68b4f6
Version 3.1.0
2017-01-18 12:23:48 -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
a208ed1d83
Version 3.0.1
2017-01-17 00:14:25 -08:00
Kevin Serrano
Dan Finlay
frankiebee
Dan Finlay
Kevin Serrano
kumavis
kumavis
jaredpereira
Jared Pereira