Commit Graph

334 Commits

Author SHA1 Message Date
Dan Finlay 9e3648c668 Pass blocktracker to balances controller 2017-09-26 11:33:36 -07:00
Dan Finlay dfbdb99858 Merge branch 'master' into AddBalanceController 2017-09-25 11:49:38 -07:00
Dan Finlay 443b1a8eb7 Remove keyring controller from project 2017-09-22 14:38:40 -07:00
Dan Finlay aa2abc00eb Merge branch 'AddBalanceController' into BreakOutKeyringController 2017-09-22 14:30:31 -07:00
kumavis dd45592641 metamask - use provider-engines block tracker 2017-09-22 14:22:07 -07:00
Dan Finlay 128cf40f91 Fix accont-tracker merge bug 2017-09-22 14:16:19 -07:00
Dan Finlay f9d2f523c6 Merge branch 'master' into AddBalanceController 2017-09-22 14:12:41 -07:00
Dan Finlay d2a747e57e Fix computed-balances controller reference 2017-09-22 14:06:54 -07:00
Dan Finlay 11c8c07bfc Refactor eth-store into account-tracker
EthStore was only being used for tracking account balances and nonces now, so I removed its block-tracking duties, renamed it account-tracker, and removed it as a dependency from `KeyringController`, so that KRC can go live on without a hard dep on it.
2017-09-22 13:59:25 -07:00
Dan Finlay 4c971ebfd1 Define encryptor in constructor params instead of platform object 2017-09-22 13:25:08 -07:00
Dan Finlay bd117d6b71 Merge branch 'master' into ConfigurableEncryption 2017-09-21 15:56:24 -07:00
Dan Finlay e9043f22df Allow custom encryptor to be passed to MetaMaskController and KeyringControllers. 2017-09-21 15:47:25 -07:00
kumavis 765ef64061 metamask controller - destroy filter polyfill on disconnect 2017-09-13 15:19:44 -07:00
kumavis 245c0f0c27 metamask controller - move middleware into seperate files 2017-09-13 15:17:26 -07:00
Dan Finlay a01921758b Add computed balance to account detail view 2017-09-13 15:06:04 -07:00
Dan Finlay 86cd4e4fed Got pending balance updating correctly 2017-09-13 14:28:51 -07:00
kumavis 96d1175834 debug - prefer logger over console 2017-09-13 10:28:29 -07:00
kumavis a265144176 metamask cont - standardize multiplex stream naming 2017-09-13 10:21:00 -07:00
Dan Finlay 53a467cd1e Some progress 2017-09-12 15:06:19 -07:00
kumavis 9d4c02e57f metamask - add jsonrpc filter middleware on per-connection engine 2017-09-07 21:26:25 -07:00
kumavis 57e4805c62 streams - use pump and published obj-multiplex 2017-09-07 21:17:49 -07:00
kumavis cc56d0d2f6 inpage - use json-rpc-engine for inpage-provider 2017-08-24 15:44:40 -07:00
kumavis 8a9d0073b1 Merge pull request #1848 from MetaMask/transactionControllerRefractor
Transaction controller refractor part 1: promises for everyone and more tests!
2017-08-02 19:57:16 -07:00
frankiebee b80c7e417b move newUnapprovedTransaction to transactions.js 2017-08-02 18:59:34 -04:00
kumavis 8c6f01b910 blacklist controller - breakout from metamask and infura controllers 2017-08-02 15:54:59 -07:00
kumavis ecaa235b5e phishing detection - move phishing detection into contentscript and metamask controller 2017-08-02 14:26:10 -07:00
frankiebee 25bc15ba17 lint fixes 2017-08-02 11:47:13 -04:00
frankiebee ece9200c72 fix spelling mistake 2017-08-02 11:36:07 -04:00
frankiebee 432f516ab0 make addUnapprovedTransaction async function and use promise based ethQuery 2017-08-02 10:26:25 -04:00
frankiebee 948f3880a3 turn off auto faucet and remove file 2017-07-17 17:37:01 -04:00
frankiebee 751103d948 Merge branch 'master' into nonce-tracker 2017-07-12 15:10:58 -07:00
frankiebee da35f6744e use new nodeify 2017-07-12 15:06:49 -07:00
kumavis 9f46984fee metamask - on rpc err show whole error body 2017-07-11 14:17:47 -07:00
kumavis d228f46254 Merge branch 'master' into nonce-tracker 2017-07-07 14:21:43 -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
frankiebee 847a4282a2 Merge branch 'master' into nonce-tracker 2017-06-27 13:10:56 -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
Kevin Serrano b7f8657ab5
Add infura network status to our UI state. 2017-06-22 12:32:08 -07:00
Dan Finlay 41d992cca9 Merge branch 'AddTokenList' into i1616-AddTokenAdding 2017-06-19 19:03:49 -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
frankiebee 3e359d6a6a Merge branch 'master' into i1567-FixInaccurateError 2017-06-16 16:39:52 -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 2e5deef2b0 check nonce and balance when resubmiting tx 2017-06-15 13:48:48 -07:00
kumavis b3492d9c17 transaction controller - use nonce-tracker 2017-06-14 23:44:02 -07:00
Dan Finlay b7b9e0c1ac Persist selected account tab
Also improve error handling with token balances.
2017-06-14 14:21:50 -07: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
frankiebee 529304c005 Wrap the provider in a proxy 2017-05-23 01:56:10 -04:00
frankiebee 13a41f3129 Merge branch 'master' into networkController 2017-05-22 19:48:10 -04: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 2df9344be5 Rename tx manager to tx controller 2017-05-16 10:35:28 -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
Dan Finlay a3149c1752 Use loglevel for more logs 2017-04-30 12:38:38 -07:00
Thomas Huang 6bdb4c8728 Fix linting warnings 2017-04-26 21:05:45 -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
frankiebee 0a7b388b39 Fix faucet to only autoFaucet first account 2017-04-04 18:38:56 +02:00
frankiebee f81fdbc34f Merge branch 'master' into mascara 2017-04-02 23:04:55 -07:00
kumavis 5036263f88 introduce platform api and rename notifications to notification-manager 2017-03-30 18:33:19 -07:00
frankiebee 84b3415b44 WIP: lost enital call from dapp to getAccounts 2017-03-29 10:53:43 -07: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
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
frankiebee 8e30acb41a Merge branch 'master' into mascara 2017-03-23 15:44:29 -07:00
frankiebee 45ab81fb45 WIP: streams->indexdb 2017-03-23 11:06:38 -07:00
Dan Finlay b6e2eaf7b1 Remove eth-lightwallet 2017-03-16 11:16:03 -07:00
Kevin Serrano a186e40d17 Merge branch 'master' into i1165-predictive 2017-03-14 17:52:03 -07:00
Kevin Serrano 37ffcfcf0e Rename variables to proper currency state variables. 2017-03-14 17:06:16 -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 b34ee4daa1 Allow for adding recently used addresses to address book. 2017-03-09 15:10:27 -08:00
Kevin Serrano 9f6c040554
Create persistence address book. 2017-03-09 13:58:42 -08:00
Kevin Serrano cf2268c3d2
Nodeify and promisify calls to background. 2017-03-08 09:06:41 -08: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
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
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 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 1eb4a5d62c Add background method for updating and approving a tx in one call 2017-02-27 18:25:46 -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
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 564f920ae0 Add personal sign actions and template 2017-02-22 16:30:09 -08:00
Dan Finlay 8684fc40c7 Allow provider to init before keyringController 2017-02-21 14:41:55 -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