m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-22 09:23:21 +01:00
Code
6,273 Commits 2 Branches 0 Tags 265 MiB
6ecf2c8092
Commit Graph

6273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Finlay
1b6ee56cac Merge pull request #926 from MetaMask/revert-920-dev 
Revert "Interface enhancements"
 2016-12-16 10:08:47 -08:00
Dan Finlay
6d13ef691f Revert "Interface enhancements" 2016-12-16 10:04:57 -08:00
Frankie
d5569781ba Merge pull request #923 from MetaMask/RemoveMorden 
Remove morden
 2016-12-16 09:48:03 -08:00
Dan Finlay
4f3ba6e0b8 Bump changelog for removing morden 2016-12-15 16:12:03 -08:00
Dan Finlay
83880a5c92 Remove morden testnet provider 
Instances configured to point at Morden will now point at Ropsten.
 2016-12-15 16:12:03 -08:00
Dan Finlay
e6c01abba4 Merge pull request #920 from luisivan/dev 
Interface enhancements
 2016-12-14 16:46:36 -08:00
Frances Pangilinan
da9349fe63 Clean up and comment functions 2016-12-14 15:04:33 -08:00
Luis Iván Cuende
3969526403
Fixed header h1 alignment and network name 2016-12-14 14:35:36 -08:00
Frances Pangilinan
5a292cc397 add to CHANGELOG.md 2016-12-14 13:03:40 -08:00
Frances Pangilinan
5aba096bd1 add Test for txManager. As well as fix tests to account for txManager. 2016-12-14 12:56:53 -08:00
Frances Pangilinan
090935f90a Create a TxManager 2016-12-14 12:55:41 -08:00
Luis Iván Cuende
4a8bc63c8d
Better account details view 2016-12-14 10:03:56 -08:00
Luis Iván Cuende
c65db9290d
Better editable label 2016-12-14 09:38:20 -08:00
Luis Iván Cuende
b8ee336f0d
Better buttons 2016-12-13 23:46:50 -08:00
Luis Iván Cuende
233094e19d
Beautified disclaimer 2016-12-13 23:38:55 -08:00
kumavis
ff94cf6d10 Merge pull request #918 from MetaMask/i915-txPermaCache 
deps - bump provider-engine for bug fix
 2016-12-12 19:23:13 -05:00
kumavis
84ff919f73 deps - bump provider-engine for bug fix 2016-12-12 16:09:52 -08:00
Dan Finlay
7b9749e30c Got bad account detection working and added to state 2016-12-09 12:24:25 -08:00
Dan Finlay
ab9e15b782 Mostly added bad account detection 
Currently riddled with logs, because the migrator is inexplicably returning before generating the new style accounts for comparison.
 2016-12-08 14:22:02 -08:00
Dan Finlay
9e3fa3cfba Merge pull request #914 from MetaMask/FixUnitTestSuite 
Remove .only from unit test suite
 2016-12-08 10:01:59 -08:00
Dan Finlay
c93227ea72 Cranked up CI test suite wait duration to alleviate their nondeterminism for now 2016-12-07 16:55:15 -08:00
Dan Finlay
fe01ceb857 Remove .only from unit test suite 2016-12-07 16:32:49 -08:00
Dan Finlay
3d0129b753 Merge pull request #912 from MetaMask/kumavis-patch-1 
changelog - "fix reload  detection"
 2016-12-07 15:06:00 -08:00
kumavis
3632173afa changelog - "fix reload detection" 2016-12-07 14:59:20 -08:00
Dan Finlay
0e83b26710 Merge pull request #911 from MetaMask/i873-reloadBroken 
Fix broken disconnect detector
 2016-12-07 14:56:09 -08:00
kumavis
26b60f1b5a inpage - correctly listen for incomming messages 2016-12-07 14:42:38 -08:00
kumavis
eb7cf2bf31 Merge pull request #904 from MetaMask/BetterIntegrationTest 
Made integration test suite better, added a step to story
 2016-12-01 13:30:31 -05:00
Dan Finlay
c431783602 Remove redundant logging block 2016-12-01 10:21:56 -08:00
Dan Finlay
1880cda9b9 Fix vault encrypting & unlocking bug 
This is only a bug in dev, but was committed yesterday.

Sometimes the `encrypt` method was being passed values other than the password as the encryption key, leading to un-unlockable vaults.

To find this, and avoid it for all time hereafter, I added several more steps to our oft-neglected integration test suite, which now fully initializes a vault, locks it, and unlocks it again, to make sure all of those steps definitely work always.
 2016-11-30 19:36:24 -08:00
Dan Finlay
049e351c9d Add integration tests for logging out and back in 2016-11-30 16:01:51 -08:00
Dan Finlay
fe533bbef2 Add more integration tests 
Integration tests now:
- Scroll through terms
- Accept terms
- Confirm seed phrase
- Verify account detail screen
 2016-11-30 15:18:26 -08:00
Dan Finlay
549bbfd05f Made integration test create a first vault 2016-11-30 14:58:40 -08:00
Kevin Serrano
5af4157363 Merge pull request #899 from MetaMask/i893-DenodeifyKeyringController 
Fix incorrect nodeification and add descriptive error to help find in future
 2016-11-29 15:59:18 -08:00
Dan Finlay
95bcc21a06 Add useful nodeify error message 
If a nodified method does not return a Promise, it will throw an error, like this:
```
Error in event handler for (unknown): Error: The function setSelectedAccount did not return a Promise, but was nodeified.
```
 2016-11-29 15:54:10 -08:00
Dan Finlay
df0b89074b Return promise correctly from setSelectedAddress 2016-11-29 15:50:26 -08:00
Kevin Serrano
f8fbeb88ff Merge pull request #896 from MetaMask/i893-DenodeifyKeyringController 
Denodeify most of KeyringController
 2016-11-29 15:16:24 -08:00
Dan Finlay
5bf1018d75 Flattened addTx async methods 2016-11-29 14:56:58 -08:00
Dan Finlay
ff3f6cc36a Bind ethQuery to estimateGas to allow it to be moved around. 2016-11-29 14:13:12 -08:00
Dan Finlay
85d5b12f8d Fix tx adding code 
Broken in this commit:
bc39cd7b89

Synchronous methods were added to an `async.waterfall` array.

This commit also removes the delegate call checking, since we concluded it was misinformed.
 2016-11-29 12:46:08 -08:00
Dan Finlay
4b6b1db4f0 Ordered keyringController methods the same in metamask-controller 2016-11-29 12:05:23 -08:00
Dan Finlay
b81f00849d Annotated KeyringController 2016-11-29 11:40:49 -08:00
Dan Finlay
12906df601 Remove unused dep 2016-11-28 17:27:44 -08:00
Dan Finlay
9d401f9137 Fix nodeify usage 2016-11-28 17:27:28 -08:00
Dan Finlay
9e764b1935 Fix nodeify 2016-11-28 17:27:20 -08:00
Dan Finlay
80e76b45ee Denodeify most of KeyringController 
Mostly Fixes #893

A couple methods cache callbacks, and will require a larger refactor to fully denodeify.

Specifically, our methods involving web3 requests to sign a tx, sign a message, and approve or cancel either of those.

I think we should postpone those until the TxManager refactor, since it will likely handle this response caching itself.
 2016-11-28 16:13:03 -08:00
Kevin Serrano
da5be09a94 Merge pull request #890 from MetaMask/MergeMasterIntoDev 
Merge master into dev
 2016-11-28 13:22:27 -08:00
Dan Finlay
46bb9558d5 Merge pull request #891 from MetaMask/Version-2.13.11 
Version 2.13.11
 2016-11-28 11:41:07 -08:00
Dan Finlay
44a2f2ad9d Version 2.13.11 2016-11-23 16:59:48 -08:00
Dan Finlay
b899119582 Merge branch 'master' into dev 2016-11-23 16:54:27 -08:00
Kevin Serrano
b9b3ef8fed Merge pull request #887 from MetaMask/i865-erabe 
Modify forgot password flow to go back to init screen.
 2016-11-23 15:48:13 -08:00