frankiebee
c121ac21ec
remove irrelevan code
2017-07-11 12:16:08 -07:00
frankiebee
611338c4e0
use .includes
2017-07-11 12:01:59 -07:00
Dan Finlay
d97c6533b8
Remove local nonce error setting.
2017-07-11 12:00:17 -07:00
frankiebee
11d57adc5c
add "Gateway timeout" to ignored errors when resubmiting and use .includes over .startsWith
2017-07-11 11:57:42 -07:00
kumavis
512b6cae81
migration 16 - move resubmit warning back to submitted state
2017-07-07 19:31:27 -07:00
kumavis
c425ad4ec7
tx controller - resubmit - correctly set error on bad nonce/balance
2017-07-07 19:13:06 -07:00
kumavis
c53aac398a
tx controller - correctly set error message on resubmit error
2017-07-07 19:09:32 -07:00
kumavis
4fa999e4de
tx controller - resubmit - recognize parity known hash message
2017-07-07 19:02:34 -07:00
kumavis
d228f46254
Merge branch 'master' into nonce-tracker
2017-07-07 14:21:43 -07:00
frankiebee
092a9c9def
fail transactions that fail in resubmit
2017-07-07 03:05:39 -07:00
kumavis
34e2f6650d
tx controller - clean code
2017-07-07 01:50:48 -07:00
kumavis
8661989f51
tx controller - move comments
2017-07-07 01:37:45 -07:00
frankiebee
9955668409
add comment
2017-07-06 23:10:04 -07:00
frankiebee
11b744bb87
if an error happens during a tx publication set tx status to fail
2017-07-06 22:30:25 -07:00
Dan Finlay
07d4e4fe6f
Fix failing test
2017-07-05 23:24:33 -07:00
Dan Finlay
3abceac55d
Fail pending txs with low balance or invalid nonce
2017-07-05 22:43:31 -07:00
frankiebee
51ff6d74e8
clean up unused code from old noncelock
2017-07-05 12:07:34 -07:00
frankiebee
6d2cddaac9
fix nonce calculation order
2017-07-05 12:00:42 -07:00
kumavis
68fc3603df
metamask - append dapp origin domain to rpc request
2017-07-04 12:48:00 -07:00
Thomas Huang
ffd3773ef3
Merge pull request #1620 from MetaMask/i1616-AddTokenAdding
...
Add ability to add tokens to token list
2017-06-28 10:07:49 -07:00
Dan Finlay
ddba2af415
Merge pull request #1509 from MetaMask/i1473-dappDefaultGasPrice
...
I1473 dapp default gas price
2017-06-27 21:00:08 -07:00
frankiebee
690685d20d
nonce-tracker: only check transactions that are not supposed to be ignored
2017-06-27 16:46:33 -07:00
Dan Finlay
b9f220c90d
Merge pull request #1685 from MetaMask/setFailed
...
Migration #015 set txs Failed
2017-06-27 15:33:32 -07:00
frankiebee
0ee4502d71
calculate nonce based on local pending txs w/o error state.
2017-06-27 15:26:04 -07:00
frankiebee
4e0ec74bb7
Create a migration for setting tx's with the message 'Gave up submitting tx.' as failed
2017-06-27 15:09:07 -07:00
frankiebee
db2836a1ae
dont stop retrying brodcasting txs
2017-06-27 14:19:28 -07:00
frankiebee
847a4282a2
Merge branch 'master' into nonce-tracker
2017-06-27 13:10:56 -07:00
Thomas Huang
1977417017
Merge branch 'master' into i1473-dappDefaultGasPrice
2017-06-27 10:32:28 -07:00
Kevin Serrano
92da8bc578
Fix error message for invalid seed words.
2017-06-26 16:14:35 -07:00
Thomas Huang
8b5b2d8329
Merge pull request #1663 from MetaMask/infura-status
...
Add Infura Status Information to UI State
2017-06-26 12:06:23 -07:00
Dan Finlay
06706f6e1b
Merge branch 'master' into i1616-AddTokenAdding
2017-06-23 08:50:44 -04:00
Kevin Serrano
f022c7c714
Merge pull request #1603 from MetaMask/AddTokenList
...
Add popular token list
2017-06-22 17:28:10 -07:00
Kevin Serrano
f9f0f6f9ef
Add infura network status to our UI state.
2017-06-22 12:32:34 -07:00
Kevin Serrano
b7f8657ab5
Add infura network status to our UI state.
2017-06-22 12:32:08 -07:00
frankiebee
abbbe1156c
Merge branch 'master' into nonce-tracker
2017-06-21 19:52:28 -07:00
frankiebee
92df9965eb
fix nonceTracker
2017-06-21 19:51:00 -07:00
frankiebee
fa8c74fe9b
add a test for #getNonceLock
2017-06-21 17:28:19 -07:00
Kevin Serrano
044c16219b
Fix badge number to include personal_sign
2017-06-20 15:38:23 -07:00
Dan Finlay
41d992cca9
Merge branch 'AddTokenList' into i1616-AddTokenAdding
2017-06-19 19:03:49 -07:00
Thomas Huang
235cb1f2d7
Keeps dapp gas price if set
2017-06-19 17:50:06 -07:00
Kevin Serrano
9da243f42d
Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTokenList
2017-06-19 13:51:38 -07:00
frankiebee
0d8c02db35
Merge branch 'master' into nonce-tracker
2017-06-16 17:07:12 -07:00
Frankie
ac728189e1
Merge branch 'master' into i1567-FixInaccurateError
2017-06-16 16:46:13 -07:00
Frankie
42f3ccd9dc
Merge pull request #1623 from MetaMask/checkTxs
...
Check txs
2017-06-16 16:44:59 -07:00
frankiebee
9c2ead3d52
put event back on the "blockTracker:/provider"
2017-06-16 16:43:38 -07:00
frankiebee
3e359d6a6a
Merge branch 'master' into i1567-FixInaccurateError
2017-06-16 16:39:52 -07:00
frankiebee
5f8e74e0aa
put the block listeners back on the provider
2017-06-16 16:36:32 -07:00
Dan Finlay
06f6aa7a00
Debounce background updates
...
Our background sometimes emits absurd quantities of updates very quickly.
This PR reduces the amount of inter-process traffic by ensuring the `sendUpdate` method does not fire more than every 200 ms.
Fixes #1621
2017-06-15 18:01:10 -07:00
Dan Finlay
48789f2a3d
Add ability to add tokens to token list
...
Fiex #1616
2017-06-15 16:22:53 -07:00
frankiebee
f76a555c09
Merge branch 'master' into i1567-FixInaccurateError
2017-06-15 14:28:10 -07:00
kumavis
41a1ce037b
Merge pull request #1611 from MetaMask/checkTxsOnSync
...
add a check for weather a tx is included in a block when jumping blocks
2017-06-15 14:12:14 -07:00
kumavis
27b874f2c4
transactions controller - add comments
2017-06-15 14:08:07 -07:00
frankiebee
2e5deef2b0
check nonce and balance when resubmiting tx
2017-06-15 13:48:48 -07:00
Dan Finlay
39c7ed230d
Merge remote-tracking branch 'origin/master' into AddTokenList
2017-06-15 13:44:58 -07:00
kumavis
b3492d9c17
transaction controller - use nonce-tracker
2017-06-14 23:44:02 -07:00
kumavis
dab2fccc78
introduce nonce-tracker
2017-06-14 22:16:14 -07:00
frankiebee
07539a63e4
remove unnecessary log
2017-06-14 21:52:49 -07:00
frankiebee
a10740af7e
add a check for weather a tx is included in a block when jumping blocks
2017-06-14 20:17:59 -07:00
frankiebee
6ae97290f0
check for the tx in the block that provider engine gives us
2017-06-14 17:43:04 -07:00
Dan Finlay
6fda78cd2b
Refresh token balance on network change
2017-06-14 15:21:51 -07:00
Dan Finlay
b7b9e0c1ac
Persist selected account tab
...
Also improve error handling with token balances.
2017-06-14 14:21:50 -07:00
Dan Finlay
0fd32e67d4
Do not mark slowly mined txs as failed.
...
Fixes #1567
Also seems to fix #1556
Also improves resubmit performance by only resubmitting on `latest`.
2017-06-14 12:01:45 -07:00
Dan Finlay
dd7e11d196
Merge pull request #1598 from MetaMask/txRetry
...
put tx resubmission on the block event
2017-06-13 10:45:21 -07:00
frankiebee
ec3383c162
rename continuallyResubmitPendingTxs to resubmitPendingTxs
2017-06-13 09:50:01 -07:00
Thomas Huang
ae7c296669
Fix networkState in chain id
2017-06-12 17:44:11 -07:00
Dan Finlay
a741cc4fc4
Merge branch 'master' into AddTokenList
2017-06-12 17:17:16 -07:00
frankiebee
96fa29ffbc
put tx resubmission on the block event
2017-06-12 16:11:37 -07:00
kumavis
3b3c96ef34
Merge pull request #1208 from MetaMask/i#1203MainNetSwitch
...
Change default to mainnet
2017-06-12 14:22:07 -07:00
kumavis
c0a023ffdb
default testnet - fix typo
2017-06-12 13:46:56 -07:00
kumavis
27220b7bcd
Merge branch 'master' into i#1203MainNetSwitch
2017-06-12 13:27:04 -07:00
Thomas Huang
13e6672028
Linting
2017-06-12 11:08:32 -07:00
Dan Finlay
ba254d9041
Merge branch 'master' into currency-fix
2017-06-12 10:32:54 -07:00
Kevin Serrano
203a573f3f
Use new URL for currency API from cryptonator.
2017-06-05 16:23:56 -07:00
Kevin Serrano
2b7d842498
Update gasblocklimit params with every block.
2017-06-02 15:18:14 -07:00
Kevin Serrano
82cbfaa826
Convert gasLimit to not use muln in BN
2017-06-01 12:53:16 -07:00
Thomas Huang
8f9a230d8d
Merge pull request #1500 from MetaMask/RemoveStreamingSubprovider
...
Remove streaming subprovider
2017-05-25 15:04:50 -07:00
Dan Finlay
ad40e4d260
Remove stream subprovider
...
Since the polling leak seems to be coming from elsewhere, and new bugs came from this, I'm rolling back this change so that we can push the other improvements sooner and fix the bug at its true root.
2017-05-25 12:37:04 -07:00
frankiebee
717dceede8
fix spelling
2017-05-24 23:36:10 -04:00
frankiebee
3b06a29e1b
Merge branch 'master' into reloadDapp
2017-05-24 23:10:58 -04:00
frankiebee
473b88f399
Reload the page when switching networks for sites that use web3
2017-05-24 23:00:58 -04:00
Dan Finlay
764806d211
Merge pull request #1494 from MetaMask/1472-gasceiling
...
Add Max GasLimit Ceiling
2017-05-24 16:36:00 -07:00
Kevin Serrano
26fd016b63
Add new blockGasLimit property to txMeta object.
2017-05-24 16:17:03 -07:00
kumavis
e6b278569e
inpage-provider - disable polling after first block
2017-05-24 11:34:26 -07:00
frankiebee
db982cf795
stop polling when switching networks
2017-05-24 11:52:18 -04:00
Frankie
97ea7454b3
Merge branch 'master' into networkController
2017-05-23 20:36:11 -04:00
frankiebee
c5d74e6421
include ethQuery in txController
2017-05-23 20:06:19 -04:00
frankiebee
243eeff7cb
Fix for tests
2017-05-23 19:49:57 -04:00
Dan Finlay
e4d09aebf4
Cleanup
2017-05-23 14:49:10 -07:00
Dan Finlay
cd2ad1733d
Continually resubmit pending txs
2017-05-23 12:22:15 -07:00
frankiebee
529304c005
Wrap the provider in a proxy
2017-05-23 01:56:10 -04:00
frankiebee
e08c1541e5
Add a migration for the network controller
2017-05-23 01:55:20 -04:00
frankiebee
13a41f3129
Merge branch 'master' into networkController
2017-05-22 19:48:10 -04:00
kumavis
b217ad1ae8
clean - remove console logs
2017-05-22 16:06:22 -07:00
kumavis
1c1400b584
deps - use stream-subprovider from provider-engine
2017-05-22 15:59:07 -07:00
Dan Finlay
cbfaa6f56f
Rename stream to streamSubprovider
2017-05-22 15:41:13 -07:00
Dan Finlay
48d9a21071
Use filter subprovider in-page to avoid filter leaks
2017-05-22 15:23:29 -07:00
Dan Finlay
709c0eb307
Use stream-provider v3 api
2017-05-22 15:21:25 -07:00
Dan Finlay
c5432da567
Add new streaming subprovider but getting a loop
...
Regarding #1458
Uses a new streaming subprovider architecture on an experimental branch of StreamProvider:
https://github.com/flyswatter/web3-stream-provider/tree/StreamSubprovider
2017-05-20 20:38:38 -07:00
frankiebee
f87ea49b5a
Create a network controller to manage switcing networks an updating the provider
2017-05-19 00:14:10 +02:00
Dan Finlay
68d6ea44a0
Fix path references
2017-05-16 11:39:00 -07:00
Dan Finlay
2df9344be5
Rename tx manager to tx controller
2017-05-16 10:35:28 -07:00
kumavis
28aba6e9de
migration 13 - change provider from testnet to ropsten
2017-05-15 23:56:13 -07:00
Thomas Huang
3367363b12
Remove all traces of testnet
2017-05-15 19:11:16 -07:00
Thomas Huang
62ee038889
Merge branch 'master' into i1419-rinkebydefaultnetwork
2017-05-15 18:06:48 -07:00
Thomas Huang
4c10e2021a
Change default network to rinkeby
2017-05-15 18:05:11 -07:00
Dan Finlay
fe3e943169
Merge pull request #1422 from MetaMask/drop-asyncq
...
background - drop async-q in favor of async/await
2017-05-15 15:35:19 -07:00
kumavis
5c9449dec1
background - drop async-q in favor of async/await
2017-05-12 13:09:23 -07:00
kumavis
2c8bbe3b25
migrator - fix typo
2017-05-12 12:27:40 -07:00
kumavis
70a328e028
migrator - cleaner migration runner with es7
2017-05-11 18:15:59 -07:00
frankiebee
6c01b26845
use asyncQ.waterfall instead of asyncQ.eachSeries
2017-05-11 23:25:33 +02:00
frankiebee
1772d34e94
fix migrator
2017-05-11 10:10:50 +02:00
kumavis
68be86abe9
ui - remove web3, use eth-query
2017-05-08 12:29:08 -07:00
kumavis
fb08c4a131
metamask - publicConfig - fix init state
2017-05-04 17:56:30 -07:00
kumavis
10ba760ed3
metamask - selected accounts - dont reveal when locked
2017-05-04 17:50:59 -07:00
Kevin Serrano
833b9f183f
Minor lint
2017-05-03 07:22:36 -07:00
Dan Finlay
a3149c1752
Use loglevel for more logs
2017-04-30 12:38:38 -07:00
kumavis
6ace0c9afb
notification-manager - remove promise listener
...
seems chrome changed their API?
MDN suggests that a Promise should be returned but getting `undefined`
https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/windows/create
Chrome docs suggest its a callback API lolwut
https://developer.chrome.com/extensions/windows#method-create
2017-04-28 16:04:00 -07:00
Dan Finlay
d1a1069180
Merge branch 'master' into rinkeby
2017-04-27 14:50:19 -07:00
Thomas Huang
6bdb4c8728
Fix linting warnings
2017-04-26 21:05:45 -07:00
Kevin Serrano
242dc1e99f
Add missing changes. Create unique style for rinkeby icon.
2017-04-25 14:39:01 -07:00
Nickyg
e9aa37b699
add rinkeby network
2017-04-26 01:40:33 +05:30
Dan Finlay
d05d9a5f57
Add missing tx manager state
2017-04-24 13:55:33 -07:00
kumavis
9b9570fd2b
auto-faucet - only skip faucet on explicit test environment
2017-04-04 18:48:33 -07:00
kumavis
5a91adf7d8
add platforms to mascara + move buyEther window open to ui
2017-04-04 18:23:46 -07:00
kumavis
5d967eeebb
Merge pull request #1307 from MetaMask/mascara
...
Proof of Concept: Mascara
2017-04-04 11:27:45 -07:00
kumavis
4779999bfc
clean - metamask controller - remove log
2017-04-04 11:13:07 -07:00
Kevin Serrano
39181ed33f
Merge pull request #1308 from MetaMask/FixFaucet
...
Fix faucet to only autoFaucet first account
2017-04-04 09:43:25 -07:00
frankiebee
0a7b388b39
Fix faucet to only autoFaucet first account
2017-04-04 18:38:56 +02:00
frankiebee
f80d1ce3e6
Switch auto-faucet from XMLHttpRequest to fetch
2017-04-04 14:55:48 +02:00
frankiebee
f81fdbc34f
Merge branch 'master' into mascara
2017-04-02 23:04:55 -07:00
frankiebee
89c924101e
Merge branch 'master' into mascara
2017-04-02 22:26:25 -07:00
kumavis
86e882c51a
notification-manager - rename show -> showPoup + make getPopup private
2017-03-31 18:41:51 -07:00
kumavis
aa06183c64
ui - use global.platform for extension interaction
2017-03-31 18:04:13 -07:00
kumavis
810f5881f6
Merge branch 'master' of github.com:MetaMask/metamask-plugin into platform
2017-03-31 17:57:47 -07:00
kumavis
60a48e713f
ui - move popup auto-close after tx conf to ui entrypoint
2017-03-31 13:32:47 -07:00
kumavis
49d8877fd7
ui - startPopup returns store after boot
2017-03-31 13:20:16 -07:00
kumavis
6259ffaef4
extension - remove local extension files, we use extensionizer
2017-03-30 18:35:22 -07:00
kumavis
5036263f88
introduce platform api and rename notifications to notification-manager
2017-03-30 18:33:19 -07:00
kumavis
be88c87b25
extension - prefer extensionizer module
2017-03-30 18:30:24 -07:00
kumavis
1dce352523
tx-manager - add eip155 support
2017-03-30 14:23:23 -07:00
frankiebee
29a602a89b
Clean up
2017-03-30 11:28:22 -07:00
Kevin Serrano
9a6b84644a
Merge pull request #1293 from MetaMask/ImproveGasEstimates
...
tx-utils - gas buffer ceiling at 90% of block gas limit
2017-03-30 09:25:28 -04:00
kumavis
ff49e5e5cf
tx-utils - gas buffer ceiling at 90% of block gas limit
2017-03-29 23:21:31 -07:00
frankiebee
84b3415b44
WIP: lost enital call from dapp to getAccounts
2017-03-29 10:53:43 -07:00
Dan Finlay
98dd684524
Linted
2017-03-29 10:42:43 -07:00
Dan Finlay
610ec2bdf5
Fix popup behavior for Firefox
...
Firefox does not support the `focused` parameter when opening a new window, and we don't actually require it for Chrome either, new popups are at the foreground by default already.
2017-03-29 10:40:57 -07:00
Kevin Serrano
576fb26c15
Add missing migration.
2017-03-29 11:08:15 -04:00
frankiebee
a20a237282
Merge branch 'master' into mascara
2017-03-28 18:02:39 -07:00
Dan Finlay
7b9ac18557
Merge pull request #1268 from MetaMask/kovan-faucet-instructions
...
Add Kovan faucet instructions
2017-03-28 14:56:02 -07:00
Dan Finlay
f2587b7e80
Merge pull request #1273 from MetaMask/i1267-seedfix
...
Assure that seed words are placed into state tree upon request.
2017-03-28 14:54:04 -07:00
Dan Finlay
a3e08d779e
Merge branch 'master' into kovan-faucet-instructions
2017-03-28 14:50:55 -07:00
kumavis
0f1ea5861f
Merge pull request #1276 from MetaMask/ImproveGasEstimates
...
Improve UI gas calculation logic
2017-03-28 14:48:03 -07:00
kumavis
6310a05dae
tx manager - emit update on new unapproved tx
2017-03-28 14:39:29 -07:00
kumavis
e864623d3c
tx manager - add eth-query
2017-03-28 13:56:35 -07:00
kumavis
1495240969
tx manager - adjust new tx flow and txMeta decorations
2017-03-28 13:35:27 -07:00
Dan Finlay
81d3658343
Improve UI gas calculation logic
...
- Now striping hex prefixed gas values, which may have been causing mis-estimation.
- Unified calculation logic to be entirely functional.
- Greatly simplified how the pending-tx form keeps updated form state.
Still needs a commit from @kumavis to ensure the background passes in a txMeta.txParams.gasPrice value.
2017-03-28 11:52:15 -07:00
Kevin Serrano
0625b4a110
Fix injection logic.
2017-03-28 14:30:39 -04:00
Kevin Serrano
a95d96d507
Assure that seed words are placed into state tree upon request.
2017-03-28 11:23:25 -04:00
Kevin Serrano
c1136a6317
Add link to kovan faucet instructions.
2017-03-27 16:05:21 -04:00
Stefaan Ponnet
0faddb2ed2
Allow injection in IFrames + dynamic IFrames
2017-03-26 13:57:44 +02:00
Kevin Serrano
30e8d25013
Merge branch 'master' into i1210-txdisappearance
2017-03-24 17:13:57 -04:00
Dan Finlay
3a888ede2a
Merge branch 'master' into notice-modification
2017-03-24 13:56:30 -07:00
frankiebee
8e30acb41a
Merge branch 'master' into mascara
2017-03-23 15:44:29 -07:00
Dan Finlay
2cab2f767c
Remove gas limit param
...
Fixes #1256 by removing redundant param.
2017-03-23 13:56:32 -07:00
frankiebee
197e6e0b77
WIP: indexdb is at an err state "provider is undefined"
2017-03-23 11:41:32 -07:00
frankiebee
45ab81fb45
WIP: streams->indexdb
2017-03-23 11:06:38 -07:00
Kevin Serrano
fa0bbd66b6
Fix persistence of transactions between networks.
2017-03-23 11:28:06 -04:00
Kevin Serrano
16c76d5229
Create migration to erase body in read notices.
2017-03-23 10:15:59 -04:00
Kevin Serrano
bcaf0864c1
Remove notice body after reading.
2017-03-23 09:58:57 -04:00
Dan Finlay
af9d782363
Merge branch 'master' into i238-kovan
2017-03-22 15:55:01 -07:00
Kevin Serrano
16bdfd3d6e
Merge branch 'master' into i238-kovan
2017-03-22 15:41:38 -07:00
Kevin Serrano
2687b8604b
Merge branch 'master' into i1237-xmlfix2
2017-03-22 15:39:30 -07:00
Kevin Serrano
1b7326048d
Add current block number and hash to the state.
2017-03-22 16:41:19 -04:00
Kevin Serrano
33dd7954a7
Add kovan config settings to config manager.
2017-03-22 16:00:50 -04:00
Kevin Serrano
c5f96be98d
Add kovan to config file.
2017-03-22 15:59:46 -04:00
Kevin Serrano
b5b88392b9
Merge branch 'master' into i1237-xmlfix2
2017-03-22 11:33:56 -07:00
Kevin Serrano
9906da86a4
Modify logic for injection conditions.
2017-03-22 14:25:56 -04:00
frankiebee
8c7be43403
Have better error messages
2017-03-22 09:48:41 -07:00
Dan Finlay
b6e2eaf7b1
Remove eth-lightwallet
2017-03-16 11:16:03 -07:00
Frankie
57d1a1f186
Merge branch 'master' into i#1203MainNetSwitch
2017-03-16 11:00:12 -07:00
Kevin Serrano
a186e40d17
Merge branch 'master' into i1165-predictive
2017-03-14 17:52:03 -07:00
kumavis
53efc53a40
Merge branch 'master' into i#1203MainNetSwitch
2017-03-14 17:26:06 -07:00
Kevin Serrano
37ffcfcf0e
Rename variables to proper currency state variables.
2017-03-14 17:06:16 -07:00
Kevin Serrano
177f2dc948
Fix description of some migrations.
2017-03-14 17:05:47 -07:00
frankiebee
f6e551ef5f
Swithch the default network to mainnet
2017-03-13 21:14:19 -07:00
Kevin Serrano
4933e2e2ee
Limit the number of addresses stored in our book.
2017-03-13 16:37:53 -07:00
Kevin Serrano
7dcab52a9e
Connect keyring controller to address book to prevent additional duplicates.
2017-03-10 10:34:46 -08:00
Kevin Serrano
7182a2be43
Improve duplicate checking in address book.
2017-03-10 10:05:10 -08:00
Kevin Serrano
2ab86b001d
Add comments.
2017-03-10 09:34:13 -08:00
Kevin Serrano
b34ee4daa1
Allow for adding recently used addresses to address book.
2017-03-09 15:10:27 -08:00
Kevin Serrano
b296640f1b
Rename functions for consistency.
2017-03-09 15:09:50 -08:00
Kevin Serrano
9f6c040554
Create persistence address book.
2017-03-09 13:58:42 -08:00
Kevin Serrano
d270cbc9d2
Create distinct labels and names for addresses.
2017-03-09 13:07:38 -08:00
Kevin Serrano
acc9a2a9d0
Modify message.
2017-03-08 10:53:11 -08:00
Kevin Serrano
6f980cfe10
Add more informative message
2017-03-08 10:46:17 -08:00
Kevin Serrano
b0280dc162
Merge branch 'master' into i1065-removealert
2017-03-08 10:22:08 -08:00
Dan Finlay
67c3126e63
Merge branch 'master' into kumavis-patch-1
2017-03-08 10:16:50 -08:00
Kevin Serrano
529eb25ced
Convert alert to a log.error
2017-03-08 10:13:45 -08:00
Kevin Serrano
86f71d504c
Merge branch 'master' into i1144-moarrpc
2017-03-08 09:28:36 -08:00
Kevin Serrano
cf2268c3d2
Nodeify and promisify calls to background.
2017-03-08 09:06:41 -08:00
kumavis
92b8443824
tx-utils - add encoding utils
2017-03-07 22:51:39 -08:00
kumavis
c063fab993
tx-utils - stricter naming type-based convention
2017-03-07 22:47:35 -08:00
kumavis
17b805c76e
tx-utils - clean and comment
2017-03-07 22:18:14 -08:00
Dan Finlay
0889309bf3
Merge branch 'master' into i1118-IncreaseGasBuffer
2017-03-07 21:30:43 -08:00
jaredpereira
52ee007fcb
Merge branch 'master' into i1118-IncreaseGasBuffer
2017-03-07 22:55:56 -05:00
Jared Pereira
4916331c53
change BN.mul to BN.muln
2017-03-07 22:42:16 -05:00
frankiebee
2f7a95c257
Fix grammar in erro message
2017-03-07 18:56:38 -08:00
frankiebee
af5ad218e2
Merge branch 'master' into i#1032
2017-03-07 17:59:21 -08:00
frankiebee
3e8b584c98
fix issue where account import allows for duplicates
2017-03-07 17:59:03 -08:00
Jared Pereira
4256e631a6
remove constant buffer and add multiplier
2017-03-07 19:57:57 -05:00
Kevin Serrano
e7e024bcdd
Refactor of code into separate reducers and actions.
2017-03-07 16:01:51 -08:00
Kevin Serrano
08ca7dac5a
Merge branch 'master' into i1144-moarrpc
2017-03-07 10:37:31 -08:00
Dan Finlay
51aa95a65c
Merge branch 'master' into i1173-ShowPersonalMessage
2017-03-06 16:34:24 -08:00
Dan Finlay
e66e755766
Fix normalizeMsgData function to always return hex prefixed
2017-03-06 16:33:33 -08:00
Frankie
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
Dan Finlay
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
Kevin Serrano
e66035254f
More conflict resolution.
2017-03-01 10:04:25 -08:00
Kevin Serrano
0a3849ec84
Fix merge conflicts.
2017-03-01 10:01:21 -08:00
Dan Finlay
ddc136a7c2
Add a couple more debug logs
2017-02-28 15:41:20 -08:00
Dan Finlay
f908aaafbc
Use correct action to update and submit tx
2017-02-28 14:45:21 -08:00
Dan Finlay
e07e4b7bc7
Linted
2017-02-28 14:13:58 -08:00
Dan Finlay
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
Dan Finlay
2e16e1eb94
Fixed bug that made send screen sometimes transition to account detail
2017-02-28 12:00:07 -08:00
Dan Finlay
1eb4a5d62c
Add background method for updating and approving a tx in one call
2017-02-27 18:25:46 -08:00
Dan Finlay
462c7ae213
Merge branch 'master' into i765-gaslimits
2017-02-27 12:59:19 -08:00
Dan Finlay
b5d03cd524
add controllers to root scripts folder
2017-02-27 10:40:37 -08:00
Dan Finlay
5edb3db969
Merge branch 'master' into i1144-moarrpc
2017-02-27 10:36:48 -08:00
Dan Finlay
8c66260bdb
Removed redundant personal_recover logic
2017-02-24 17:07:54 -08:00
Dan Finlay
f2851402f3
Mostly fix personal_recover
2017-02-24 16:36:29 -08:00
Kevin Serrano
dfc89d6c6d
Make gasPrice accessible to the UI.
2017-02-24 15:06:55 -08:00
Dan Finlay
961a83769b
Fix cancel msg signing behavior.
2017-02-23 16:02:58 -08:00
Dan Finlay
4697aca02c
Got personal_sign working
...
Also fixed bug where signing would not close popup.
2017-02-23 14:23:45 -08:00
Kevin Serrano
62854398f1
Tested against code to play nice with unit tests.
2017-02-23 13:56:58 -08:00
Dan Finlay
7ec25526b7
Add alternate UI for pending personal_sign messages
2017-02-23 11:18:49 -08:00
Dan Finlay
564f920ae0
Add personal sign actions and template
2017-02-22 16:30:09 -08:00
Kevin Serrano
7a0ce31bd3
Implemented functionality for displaying recent custom RPCs
2017-02-22 15:12:56 -08:00
Dan Finlay
8684fc40c7
Allow provider to init before keyringController
2017-02-21 14:41:55 -08:00
Dan Finlay
6c0916c28d
Fix reference
2017-02-21 14:37:01 -08:00
Dan Finlay
92fb07999a
Point metamask-controller personalSignRecover method to keyring-controller
2017-02-21 14:32:35 -08:00
Dan Finlay
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
Kevin Serrano
026e0e3383
Fix naming
2017-02-21 12:51:46 -08:00
Kevin Serrano
db48f8984f
Basic infrasture for RPC list added.
2017-02-21 12:32:13 -08:00
Dan Finlay
48ab446436
Add memstore update after adding new keyring
2017-02-15 16:25:47 -08:00
kumavis
943bcec0d7
keyring controller - update memStore after restoreKeyring
2017-02-15 16:04:40 -08:00
Dan Finlay
352bb5cb39
Merge branch 'master' into dev
2017-02-15 15:49:04 -08:00
Kevin Serrano
75f7c1244a
Made migrations non-destructive; fixed currency migration.
2017-02-15 11:14:53 -08:00
Kevin Serrano
cd75d86187
Add migrations for removing terms of use data.
2017-02-14 13:21:00 -08:00
Dan Finlay
f2486fbdd3
got hash test passing
2017-02-13 21:25:02 -08:00
Kevin Serrano
f9601ac2dd
Merge branch 'dev' into disclaimer-notify
2017-02-09 19:04:17 -08:00
Kevin Serrano
65c84ac4b2
Delete all code related to disclaimers.
2017-02-09 18:17:50 -08:00
Kevin Serrano
1d0fcf129c
Fix bugs with notice. Add disclaimer notice.
2017-02-09 17:47:51 -08:00
Frankie
de6455151e
Revert old style message sighing
2017-02-09 17:32:49 -08:00
Kevin Serrano
4033b620bd
Allowed net_version to be called synchronously
2017-02-08 15:51:22 -08:00
Dan Finlay
c0637f8d6a
Fix typo
2017-02-04 16:32:09 -08:00
Dan Finlay
0c0c0051e4
Remove shapeshift tx list from idStore
2017-02-04 15:20:31 -08:00
Dan Finlay
89bbccb09c
Stop removing old shapeshift txs
2017-02-04 15:15:50 -08:00
Dan Finlay
af439cc6cf
Do not remove completed shapeshift deposits
2017-02-03 21:40:27 -08:00
Dan Finlay
901eeb5c10
Fix bug when clearing old shapeshift txs
2017-02-03 21:39:22 -08:00
Dan Finlay
5d37f90787
Automatically remove shapeshift txs over 11 minutes old with no payment
2017-02-03 21:36:04 -08:00
Dan Finlay
c9024655d3
Add migration to index
2017-02-03 21:35:54 -08:00
Dan Finlay
4dc71ed57b
Got ShapeShiftController back to working
2017-02-03 21:12:18 -08:00
Dan Finlay
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
kumavis
bc4efa1807
eth-store - update store state after manipulating
2017-02-03 16:07:58 -08:00
kumavis
ff87b9dc7a
id mgmt - update to latest eth_sign spec
2017-02-03 14:59:07 -08:00
kumavis
77f8995568
migrations - fix migration #9 and add safety checks to migrator
2017-02-03 14:00:30 -08:00
kumavis
99d6a329a2
eths-store - eagerly set current block
2017-02-03 12:35:01 -08:00
kumavis
970d4fd695
metamask - add missing diskState and memState subscriptions
2017-02-02 23:47:00 -08:00
kumavis
9e4ef45b6a
migration #9 - break out CurrencyController substate
2017-02-02 23:32:24 -08:00
kumavis
b233e7e37c
eth-store - cbs default to noop
2017-02-02 22:32:00 -08:00
kumavis
8b5e3aa287
migration #8 - break out NoticeController substate
2017-02-02 22:23:45 -08:00
kumavis
73edfc9f31
eth-store - convert to obs-store subclass
2017-02-02 22:05:06 -08:00
kumavis
f08f40aee2
txManager - depend on preferencesStore
2017-02-02 21:09:17 -08:00
kumavis
0c6df24ecf
metamask - introduce networkStore
2017-02-02 20:59:47 -08:00
kumavis
99fa9ab13a
migration 7 - break off TransactionManager substate
2017-02-02 20:20:13 -08:00
kumavis
bcb86f38cb
messageManager - move view state to obs-store
2017-02-02 18:21:22 -08:00
kumavis
79ed2e902f
keyring - replace getState with memStore
2017-02-02 17:07:52 -08:00
kumavis
134a4c7bc3
keyring - manage isUnlocked in memStore
2017-02-02 16:59:15 -08:00
kumavis
5c5aa6ea01
keyring - rm config dep
2017-02-02 16:54:16 -08:00
Kevin Serrano
9b6a06e679
Merge branch 'dev' into notice-management
2017-02-02 16:22:44 -08:00
Kevin Serrano
88882f547e
Change filepath for new location of notices.
2017-02-02 15:59:39 -08:00
kumavis
4c0cb9d92e
metamask - memState - adopt configManager.isDisclaimerConfirmed from keyring controller
2017-02-01 16:38:09 -08:00
Frankie
10ce2a781f
emit a update badge
2017-02-01 15:12:15 -08:00
Frankie
d93708b553
put updateBadge back in
2017-02-01 15:08:06 -08:00
Frankie
c7b9adbfcb
swap out set state for updateState
2017-02-01 15:00:41 -08:00
Frankie
a96f892788
Fix messy merge
2017-02-01 13:25:36 -08:00
Frankie
54b1339f6a
Merge branch 'dev' into messageManagerCleanUp
2017-02-01 13:05:58 -08:00
Frankie
ce0c3ed03c
Merge branch 'dev' into messageManagerCleanUp
2017-02-01 12:03:42 -08:00
Frankie
1b16b46241
code clan up and tests
2017-02-01 11:54:01 -08:00
kumavis
1cb730144d
metamask - adopt isInitialized from keyring controller
2017-02-01 00:31:26 -08:00
kumavis
cd5d952600
keyring - move identities into memStore
2017-02-01 00:17:48 -08:00
kumavis
41c93ceb7e
keyring - add keyringtypes to memStore
2017-02-01 00:02:10 -08:00
kumavis
ad060e2678
metamask - inherit some configManager state from keyring controller
2017-01-31 22:35:11 -08:00
kumavis
c0d3db6a8c
keyring - synchronous getState
2017-01-31 20:02:38 -08:00
kumavis
0b9d37c6c8
migration #6 - fix selectedAddress data source
2017-01-30 15:53:21 -08:00
kumavis
7ccaa263d2
inpage - set web3.eth.defaultAccount correctly
2017-01-30 15:38:32 -08:00
kumavis
2fa60cfcbf
continue rename selectedAccount to selectedAddress
2017-01-30 15:25:12 -08:00
kumavis
f9b31fe2c3
rename selectedAccount to selectedAddress
2017-01-30 15:08:31 -08:00
kumavis
b1de2cdefa
metamask - rename getSelectedAccount to getSelectedAddress
2017-01-30 13:09:46 -08:00
kumavis
7a0acb2333
migration #6 - move selectedAccount from keyringController to preferencesController
2017-01-30 13:01:54 -08:00
kumavis
4dafb09db2
metamask - move selectedAccount set/get to preferencesController
2017-01-30 13:01:07 -08:00
kumavis
0a1918f71a
preferences - introduce preferences controller
2017-01-30 12:42:24 -08:00
Frankie
f40629e5ae
Merge branch 'dev' into messageManagerCleanUp
2017-01-30 00:50:02 -08:00
kumavis
dd528d886f
metamask - lookup selectedAccount via keyringController
2017-01-30 00:32:04 -08:00
kumavis
6480c2d8a6
public config - get selectedAccount from keyring controller substate
2017-01-29 23:59:17 -08:00
Frankie
fdee1e3701
Merge branch 'dev' into messageManagerCleanUp
2017-01-28 22:59:28 -08:00
kumavis
13e2003469
metamask - subscribe metamask store to keyringController substate
2017-01-28 22:12:15 -08:00
Frankie
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
kumavis
4dd6ba9c1b
migration 5 - move keyring controller state to substate
2017-01-28 19:19:03 -08:00
kumavis
e9cdbf4f89
keyring - add and initialize obs-store
2017-01-28 13:12:12 -08:00
kumavis
1fd1746744
metamask - adopt shapeshift txs from keyringController
2017-01-27 23:05:29 -08:00
kumavis
3afd0ef27d
tests - remove persistence and start with initial state
2017-01-27 23:04:34 -08:00
kumavis
ad9531d521
metamask - organize methods
2017-01-27 19:35:03 -08:00
Frankie
a8ed780d9b
Merge branch 'dev' into messageManagerCleanUp
2017-01-27 14:17:12 -08:00
Frankie
451845142e
Rewrite message controller to fit controller pattern
2017-01-27 14:16:35 -08:00
kumavis
efcd22905a
metamask - fix setupProviderConnection
2017-01-26 23:03:11 -08:00
kumavis
95b846ba07
keymanager - small clean
2017-01-26 22:31:06 -08:00
kumavis
9ab8362843
metamask controller - cleanup remote api
2017-01-26 22:30:12 -08:00
kumavis
fc1b11e373
metamask - organize into sections
2017-01-26 21:19:09 -08:00
kumavis
832772414e
metamask - use web3-stream-provider/handler instead of manual wiring
2017-01-26 21:18:17 -08:00
kumavis
2113979be7
metamask controller - adopt setup*Communication from background
2017-01-26 20:52:46 -08:00
kumavis
fc3a53ec7b
background - stream disconnection fix
2017-01-26 20:18:28 -08:00
kumavis
2f79781ab9
metamask controller - adopt clearSeedWords from keyring controller
2017-01-26 20:17:36 -08:00
kumavis
dc86ddebb7
background - graceful publicConfigStore connection teardown
2017-01-26 16:07:35 -08:00
kumavis
af115aa4c1
background - organize metamask instantiation
2017-01-26 15:09:31 -08:00
kumavis
76ce348a04
obs-store - use published module
2017-01-24 19:47:00 -08:00
kumavis
a06ee45404
migrations - rename 005 to stubbed _multi-keyring
2017-01-24 16:30:42 -08:00
kumavis
bb1ee8e649
Merge branch 'dev' of github.com:MetaMask/metamask-plugin into obs-store2
2017-01-24 16:09:57 -08:00
kumavis
70b8e640f0
Merge branch 'dev' into i#1048
2017-01-24 15:39:33 -08:00
kumavis
463a56ff54
background controller - extract KeyringC.placeSeedWords to MetamaskC
2017-01-24 15:33:33 -08:00
Frankie
5811f2ab14
Merge pull request #1051 from MetaMask/hotfix1048
...
hotfix - addNewAccount - dont assume hd keyring position
2017-01-24 13:38:24 -08:00
kumavis
745fff0c80
hotfix - dont assume hd keyring position
2017-01-24 13:29:48 -08:00
kumavis
01c88bb0bd
keyring-controller - cleanup
2017-01-24 13:22:26 -08:00
kumavis
8049c1fc07
keyring-controller - cleanup
2017-01-24 13:21:55 -08:00
Frankie
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
Frankie
8642ced310
Fix issue where generating a new account would put it in loose keys
2017-01-24 12:06:59 -08:00
kumavis
74dc20bdf1
Merge branch 'dev' into obs-store2
2017-01-21 10:06:50 -08:00
Frankie
56d400b0f8
Merge branch 'master' into upToDate
2017-01-20 14:01:58 -08:00
kumavis
9c6cf90538
keyring controller - placeSeedWords should use first hdKeyring
2017-01-20 13:52:21 -08:00
Dan Finlay
9f1884145a
Merge branch 'dev' into i715-AddJsonImport
2017-01-18 17:24:12 -08:00
Dan Finlay
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
Dan Finlay
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
Dan Finlay
0e01abdf71
Merge branch 'master' into Version-3.1.0
2017-01-18 12:25:35 -08:00
kumavis
b2c52f6b83
Merge branch 'dev' into i715-AddImportMenu
2017-01-18 11:49:15 -08:00
kumavis
3b7301488f
tx-manager - use rpc-specified txHash
2017-01-18 11:33:37 -08:00
Frankie
e3650b336a
Merge branch 'master' into fixSignedVsSubmitted
2017-01-18 11:30:41 -08:00
Frankie
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
Dan Finlay
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
Dan Finlay
c53932a19a
Merge branch 'dev' into conversion-api-err
2017-01-17 12:08:47 -08:00
Dan Finlay
8fcade92d3
Fix bug where signed messages were not dismissed
2017-01-17 00:13:38 -08:00
Dan Finlay
7ae2e005ed
Fix removeHexPrefix to stripHexPrefix
2017-01-17 00:03:56 -08:00
Dan Finlay
d5ad84aa12
Wrote fix for eth.sign
2017-01-16 23:26:48 -08:00
kumavis
82012cbbce
keyring - simple - throw error if wallet not found for address
2017-01-16 11:54:59 -08:00
kumavis
e7cf0f4bdd
keyring - simple - fix address generation
2017-01-16 11:49:31 -08:00
kumavis
ef81bde98b
eth-store - emit update on new account add
2017-01-14 21:46:40 -08:00
kumavis
f49fb149cc
background - txManager - filter txs by network
2017-01-14 21:29:46 -08:00
kumavis
c3d491a37c
background - return txHash to provider-engine on done
2017-01-14 20:51:29 -08:00
Frankie
fdcf03f57d
Fix the inclusion of the txFee in the meta tx object
2017-01-14 13:32:35 -08:00
Frankie
87505e1742
fix for linting
2017-01-13 18:01:50 -08:00
Frankie
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
Frankie
212ef0b850
fix the maxcost not being included in txMeta
2017-01-13 16:53:10 -08:00
kumavis
d06c54e0b7
Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin into bug-submitTx
2017-01-13 15:51:36 -08:00
kumavis
d755b66e20
background - metamask controller - fix 'this' ref
2017-01-13 15:51:08 -08:00
kumavis
9f162e72b4
Merge branch 'dev' into bug-submitTx
2017-01-13 13:26:57 -08:00
Frankie
1ffaab1d9b
Merge branch 'dev' into integrateTxManagerUI
2017-01-13 11:31:51 -08:00
Frankie
5ed52eed68
Clean up code
2017-01-13 10:44:22 -08:00
kumavis
29e83d71a8
background - handle tx finalization in controllers instead of provider-engine
2017-01-13 02:00:11 -08:00
kumavis
bc1615f032
background - fix metamaskController store -> diskStore persistence
2017-01-12 14:40:04 -08:00
kumavis
80514d73b5
migrations - wip - 005 multivault migration
2017-01-12 02:24:33 -08:00
kumavis
b33c51c0a6
migrations - introduce promise-based migrator
2017-01-12 01:17:05 -08:00
kumavis
3bc996878b
background - move pojo migrator to outside of metamask controller
2017-01-11 22:47:56 -08:00
kumavis
8012ede126
background - introduce ObservableStore
2017-01-11 19:31:21 -08:00
kumavis
65ba9fc39e
bugfix - portstream - dont wrap cb in try catch
2017-01-11 19:09:49 -08:00
Frankie
f9efb0817d
Merge branch 'dev' into integrateTxManagerUI
2017-01-11 16:07:03 -08:00
Frankie
576e2ad64d
Fix wording and icon of failed txs
2017-01-11 15:44:21 -08:00
Dan Finlay
d87a7b2a76
Send update to UI when changing selected account
...
Fixes #981
2017-01-11 15:15:37 -08:00
kumavis
89a5eff270
currency conversion - less noisy error
2017-01-11 14:40:35 -08:00
Frankie
bbd2f2738b
Add to CHANGELOG
2017-01-11 12:23:00 -08:00
Frankie
0b59dafc34
Merge branch 'dev' into integrateTxManagerUI
2017-01-11 12:17:17 -08:00
Frankie
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
kumavis
26e4ff40e1
rpc - fix sync account cache setting
2017-01-11 02:33:57 -08:00
kumavis
61637c738b
web3 provider - override eth_syncing and web3_clientVersion
2017-01-11 00:46:44 -08:00
Dan Finlay
21e2e4efd8
Remove erroneous OOG estimation logic.
2017-01-10 14:20:46 -08:00
kumavis
b301c0fb48
deps - replace promise-request with fetch
2017-01-10 12:04:26 -08:00
kumavis
4c1b7700ad
Merge branch 'dev' into TearDownOnDisconnect
2017-01-05 14:25:31 -05:00
kumavis
00ac5ca058
Merge branch 'dev' into TearDownOnDisconnect
2017-01-05 14:18:34 -05:00
Dan Finlay
73ee0ae766
Merge branch 'dev' into fixTxManager
2017-01-05 11:18:13 -08:00
Frankie
e62f70660d
MetaMask Controller - Convert to EventEmitter
2017-01-05 11:06:18 -08:00
Dan Finlay
7659f5894a
Combine two identical then blocks
2017-01-05 11:03:30 -08:00
Frankie
cf6817092b
remove unnecessary try statments
2017-01-04 15:03:45 -08:00
Dan Finlay
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
Dan Finlay
ead8a05034
Fix dependency reference
2017-01-04 14:21:36 -08:00
Dan Finlay
a107b66854
Caught typo
2017-01-04 14:15:53 -08:00
Dan Finlay
18e6d266c1
Add descriptive comment
2017-01-04 14:07:08 -08:00
Dan Finlay
381a60695d
Linted
2017-01-04 14:05:00 -08:00
Dan Finlay
3588aabdf2
Removed reliance on eth-store internal custom eth-query
2017-01-04 14:01:32 -08:00
Dan Finlay
08351f801a
Move eth-store@1.1.0 into local repo.
2017-01-04 13:56:21 -08:00
Frankie
32e8063a77
clean up
2017-01-04 13:13:34 -08:00
Frankie
354fa763d4
Merge branch 'dev' into fixtTxManager
2017-01-04 13:05:29 -08:00
Frankie
e6da8e2762
Fix signing of transactions
2017-01-04 13:04:33 -08:00
Dan Finlay
33b4d213f1
Fix sendUpdate for new promisified getState method
2017-01-03 11:15:38 -08:00
