aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #879 from MetaMask/i843-MoveSaltIntoEncryptorKevin Serrano2016-11-235-6/+21
|\ | | | | Fix new encryptor implementation
| * Fix new encryptor migration logicDan Finlay2016-11-233-3/+13
| |
| * Fix undefined provider menu itemDan Finlay2016-11-231-2/+5
| |
| * Fix password referenceDan Finlay2016-11-232-1/+3
| |
* | Merge pull request #878 from MetaMask/i843-MoveSaltIntoEncryptorDan Finlay2016-11-234-49/+42
|\| | | | | Simplify Encryptor API Surface
| * Remove line of cruftDan Finlay2016-11-231-1/+0
| |
| * Fix vault migration unit testDan Finlay2016-11-231-1/+1
| |
| * Improve vault migration unit testDan Finlay2016-11-231-1/+2
| |
| * Refine isInitialized derivation methodDan Finlay2016-11-231-1/+1
| |
| * LintedDan Finlay2016-11-231-1/+1
| |
| * Simplify Encryptor API SurfaceDan Finlay2016-11-233-49/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | At least, the portion of it that we use. Moved salting within the encryptor, so it does not need to be managed externally. KeyringController now caches the password instead of a passwordDerivedKey, since it is ignorant of the salt. Encryptor payload is now in a JSON format, so its portions are both base64 encoded *and* labeled appropriately. The format is `{ "data": "0x0", "iv": "0x0", "salt": "string" }`. Fixes #843 Fixes #859
| * Merge branch 'dev' into i843-MoveSaltIntoEncryptorDan Finlay2016-11-2348-138/+234
| |\ | |/ |/|
* | Merge pull request #875 from MetaMask/i868-estimateGasTooHigh-devDan Finlay2016-11-232-5/+62
|\ \ | | | | | | I868 estimate gas too high dev
| * | KeyringController - estimateGas->analyzeGasUsage fix gasLimit + detect OOGkumavis2016-11-232-5/+62
| | |
* | | Merge pull request #858 from MetaMask/i842-WaitForSeedWordkumavis2016-11-234-8/+21
|\ \ \ | |/ / |/| | I842 wait for seed word
| * | Move state update outside of conditional callback blockDan Finlay2016-11-231-1/+1
| | |
| * | Restore ropsten link supportDan Finlay2016-11-231-3/+3
| | |
| * | Remove callback type checkDan Finlay2016-11-231-1/+1
| | |
| * | Fix etherscan link generation testDan Finlay2016-11-231-2/+8
| | |
| * | Merge branch 'dev' into i842-WaitForSeedWordDan Finlay2016-11-238-46/+67
| |\ \
| * | | Use callback in placeSeedWord method.Dan Finlay2016-11-222-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | When displaying seed words, we were not using a callback, which had some race condition potential. This is simply a little cleaner and more correct. Fixes #842
* | | | Merge pull request #857 from MetaMask/i841-RenameMethodkumavis2016-11-232-2/+2
|\ \ \ \ | | | | | | | | | | Rename idStoreMigrator method for clarity
| * | | | Rename idStoreMigrator method for clarityDan Finlay2016-11-222-2/+2
| |/ / / | | | | | | | | | | | | Fixes #841
* | | | Merge pull request #869 from MetaMask/dev-cleanupkumavis2016-11-2337-71/+77
|\ \ \ \ | | | | | | | | | | Dev Cleanup Package
| * \ \ \ Merge branch 'dev' into dev-cleanupKevin Serrano2016-11-238-46/+67
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Fix camel casing on setSelectedAccount action.Dan Finlay2016-11-223-4/+4
| | | | |
| * | | | Added instructions for installing local buildDan Finlay2016-11-221-0/+6
| | | | |
| * | | | Change fauceting to become a response of an emit.Kevin Serrano2016-11-223-4/+9
| | | | |
| * | | | change all instances of selectedAddress to selectedAccount.Kevin Serrano2016-11-2231-52/+49
| | | | |
| * | | | Remove entropy from encryption and project.Kevin Serrano2016-11-227-17/+15
| | | | |
* | | | | Merge pull request #871 from MetaMask/i860-ethjsremovekumavis2016-11-232-6/+5
|\ \ \ \ \ | |_|/ / / |/| | | | Phase out ethereumjs-util from encryptor module.
| * | | | Phase out ethereumjs-util from encryptor module.Kevin Serrano2016-11-232-6/+5
|/ / / /
* | | | Merge pull request #866 from MetaMask/new-faucet-devDan Finlay2016-11-233-3/+4
|\ \ \ \ | | | | | | | | | | Make ropsten faucet button point at the correct url.
| * | | | Make ropsten faucet button point at the correct url.Kevin Serrano2016-11-233-3/+4
| |/ / /
* | | | Merge pull request #856 from MetaMask/i835-OrganizeKeyringsKevin Serrano2016-11-236-45/+65
|\ \ \ \ | | | | | | | | | | I835 organize keyrings
| * | | | Fix keyring testDan Finlay2016-11-221-1/+1
| | | | |
| * | | | Improve Keyring organizationDan Finlay2016-11-225-42/+62
| | |/ / | |/| | | | | | | | | | | | | | Separated public & private methods. (Fixes #845) Made class method `type()` into a simple property. (Fixes #846)
| | | * Began moving salt into encryptorDan Finlay2016-11-231-5/+10
| | |/ | |/|
| * | Revert premature link test fixDan Finlay2016-11-221-2/+2
|/ /
* / Fixed account link test for ropsten networkDan Finlay2016-11-221-2/+2
|/
* Merge pull request #837 from MetaMask/FixMenuItemKevin Serrano2016-11-224-8/+96
|\ | | | | Fix custom provider menu item
| * Add development states.js back into repoDan Finlay2016-11-222-1/+1
| |
| * Fix custom provider menu itemDan Finlay2016-11-225-8/+96
| | | | | | | | The Custom RPC menu item in the provider menu would not appear when Localhost:8545 was selected.
* | Merge pull request #833 from MetaMask/i831-AddRopsten-DevKevin Serrano2016-11-228-4/+41
|\ \ | | | | | | Begin adding Ropsten support to dev
| * | Merge branch 'dev' into i831-AddRopsten-DevDan Finlay2016-11-22100-814/+8243
| |\|
| * | Begin adding Ropsten supportDan Finlay2016-11-228-4/+42
| | | | | | | | | | | | | | | | | | | | | | | | Ropsten links will still not work until Etherscan publishes their ropsten link format. At that time we will need to update ui/lib/account-link.js Otherwise, fixes #831
* | | Merge pull request #830 from MetaMask/kumavis-patch-1Dan Finlay2016-11-221-1/+8
|\ \ \ | |_|/ |/| | meta - README - add npm start to instructions
| * | meta - README - add npm start to instructionskumavis2016-11-221-1/+8
|/ / | | | | thanks @karlfloersch
* | Merge pull request #827 from MetaMask/currency-cleanupDan Finlay2016-11-194-7/+5731
|\ \ | | | | | | Convert conversion-util to pure json.
| * | Convert conversion util to pure json.Kevin Serrano2016-11-194-7/+5731
| | |
* | | Merge pull request #826 from MetaMask/mini-lintDan Finlay2016-11-192-3/+3
|\ \ \ | |/ / |/| | Maintain linting.
| * | Maintain linting.Kevin Serrano2016-11-192-3/+3
|/ /
* | Merge pull request #824 from MetaMask/failing-testsDan Finlay2016-11-193-5/+72
|\ \ | | | | | | Promisify persistence of old vaults in migration code
| * | Promisify persistence of keyrings before returning keyKevin Serrano2016-11-191-5/+5
| | | | | | | | | | | | Change single letter variables (shame)
| * | Merge branch 'dev' into failing-testsKevin Serrano2016-11-192-3/+3
| |\ \ | |/ / |/| |
* | | Merge pull request #823 from MetaMask/FixBorkKevin Serrano2016-11-191-2/+2
|\ \ \ | | | | | | | | Update migration code for new hd wallet param name
| * | | Update migration code for new hd wallet param nameDan Finlay2016-11-191-2/+2
|/ / /
* | | Persist keyrings from migration to storage.Kevin Serrano2016-11-191-1/+1
| | |
| * | Create failing test to check submitPassword in keyringController.Kevin Serrano2016-11-192-0/+67
|/ /
* | Resolve merge conflict.Kevin Serrano2016-11-1994-805/+2444
|\ \ | |/ |/|
| * random-id - use Number.MAX_SAFE_INTEGER as maxkumavis2016-11-181-1/+1
| |
| * Merge pull request #816 from MetaMask/i328-MultiVaultkumavis2016-11-1895-818/+2457
| |\ | | | | | | Multi vault to Dev Branch
| | * Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵Dan Finlay2016-11-1866-306/+273
| | |\ | | | | | | | | | | | | i328-MultiVault
| | | * Revert one cb to previous state.Kevin Serrano2016-11-162-2/+2
| | | |
| | | * Minimize dispatches by using emitters and relying on state updates.Kevin Serrano2016-11-162-26/+12
| | | |
| | | * Fix semantics in commentsKevin Serrano2016-11-161-1/+1
| | | |
| | | * Lints.Kevin Serrano2016-11-161-1/+1
| | | |
| | | * Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2016-11-160-0/+0
| | | |\ | | | | | | | | | | | | | | | i328-MultiVault
| | | | * Resolve merge conflicts.Kevin Serrano2016-11-163-5/+5
| | | | |\
| | | * | \ Resolve merge conflicts.Kevin Serrano2016-11-163-5/+5
| | | |\ \ \ | | | | |/ / | | | |/| / | | | | |/
| | | * | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2016-11-161-0/+2
| | | |\ \ | | | | | | | | | | | | | | | | | | i328-MultiVault
| | | | * | Minimize repeated code.Kevin Serrano2016-11-161-5/+6
| | | | | |
| | | * | | Minimize repeated code.Kevin Serrano2016-11-162-8/+7
| | | |/ /
| | | * | Re-enable disclaimer screen. Rename variables to reflect role more clearly.Kevin Serrano2016-11-1530-49/+49
| | | | |
| | | * | Add idStore tests again.Kevin Serrano2016-11-151-0/+198
| | | | |
| | | * | Rename n variables to numberOfAccounts inside of test suite. Remove idStore ↵Kevin Serrano2016-11-123-203/+4
| | | | | | | | | | | | | | | | | | | | tests.
| | | * | Revert to previous anonymous function for promise.Kevin Serrano2016-11-121-1/+3
| | | | |
| | | * | Various keyring changesKevin Serrano2016-11-121-18/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Rearrange the require statements. - Remove unused web3. - Simplify some callbacks and promises. - Clarify certain parameters.
| | | * | Clarify functions names. Package normalize inside util file. Fix require ↵Kevin Serrano2016-11-121-11/+8
| | | | | | | | | | | | | | | | | | | | headers.
| | | * | Package normalize inside sig util file.Kevin Serrano2016-11-121-0/+5
| | | | |
| | | * | Fix lint rules for ternary operator placement.Kevin Serrano2016-11-122-19/+19
| | | | |
| | | * | Typo fix.Kevin Serrano2016-11-121-9/+9
| | | | |
| | | * | Linting to the max.Kevin Serrano2016-11-1232-177/+129
| | | | |
| | | * | Merge branch 'master' into i328-MultiVaultkumavis2016-11-112-2/+6
| | | |\ \ | | |_|/ / | |/| | |
| | | * | Merge branch 'master' into i328-MultiVaultkumavis2016-11-113-2/+26
| | | |\ \
| | | * \ \ Merge pull request #802 from MetaMask/confTxFixKevin Serrano2016-11-119-28/+33
| | | |\ \ \ | | | | | | | | | | | | | | Conf tx fix
| | | | * | | fix tx data so it has the network idFrankie2016-11-112-2/+9
| | | | | | |
| | | | * | | Merge branch 'master' into i328-MultiVaultFrankie2016-11-118-26/+24
| | | |/| | |
| | * | | | | Replace old random-id code with incrementing id generatorDan Finlay2016-11-183-11/+12
| | |/ / / /
| | * | | | Merge branch 'master' into i328-MultiVaultDan Finlay2016-11-084-17/+48
| | |\ \ \ \
| | * | | | | Fix integration test suiteDan Finlay2016-11-083-13/+5
| | | | | | |
| | * | | | | Fix nickname testDan Finlay2016-11-081-0/+1
| | | | | | |
| | * | | | | Fix BN referenceDan Finlay2016-11-081-0/+1
| | | | | | |
| | * | | | | Fix 787 gas buffer bugDan Finlay2016-11-082-9/+25
| | | | | | |
| | * | | | | Fix network checkingDan Finlay2016-11-051-21/+1
| | | | | | |
| | * | | | | Remove insane actions hashDan Finlay2016-11-051-6/+2
| | | | | | |
| | * | | | | Add tolerance to normalize methodDan Finlay2016-11-041-0/+1
| | | | | | |
| | * | | | | Fix password validation and persistence issueDan Finlay2016-11-043-4/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Was wiping the vault on each successful password attempt... :P
| | * | | | | Implement private key exporting.Kevin Serrano2016-11-042-3/+22
| | | | | | |
| | * | | | | Finish fixing nicknaming bugDan Finlay2016-11-042-28/+70
| | | | | | |
| | * | | | | Fix account nicknaming bugDan Finlay2016-11-043-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When nicknaming, we weren't normalizing the input, and so we were retrieving with differently formatted addresses than we were persisting.
| | * | | | | Fix vault creation bugDan Finlay2016-11-042-25/+41
| | | | | | |
| | * | | | | Set test env during testsDan Finlay2016-11-041-1/+1
| | | | | | |
| | * | | | | Don't faucet during testsDan Finlay2016-11-041-1/+2
| | | | | | |
| | * | | | | Don't faucet in developmentDan Finlay2016-11-041-1/+3
| | | | | | |
| | * | | | | Fix dual vault creation bugDan Finlay2016-11-032-12/+16
| | | | | | |
| | * | | | | Fix initial vault creationDan Finlay2016-11-031-4/+8
| | | | | | |
| | * | | | | Fix handling of migrating old vault styleDan Finlay2016-11-035-56/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now old vaults are recognized as an "Initialized" MetaMask instance. Upon logging in, when fetching the initial password-derived key, if there is no new-style vault, but there is an old style vault, it is migrated to the new format before proceeding through the usual unlocking steps.
| | * | | | | Add reveal of seed words.Kevin Serrano2016-11-025-2/+52
| | | | | | |
| | * | | | | Make identicon tolerant of changing stateDan Finlay2016-11-021-0/+17
| | | | | | |
| | * | | | | Fixed bugs related to clearing caches when restoring to a new vaultDan Finlay2016-11-026-13/+54
| | | | | | |
| | * | | | | Make forgot password button.Dan Finlay2016-11-023-32/+23
| | | | | | |
| | * | | | | Remove and untrack npm debug filesDan Finlay2016-11-022-46/+1
| | | | | | |
| | * | | | | Fix seed phrase restoreDan Finlay2016-11-023-5/+4
| | | | | | |
| | * | | | | Made progress on parity for MultiVaultKevin Serrano2016-11-0210-199/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Deleted some unused items - Renamed files and paths to match with new locations. - Modified keyring controller logic to separate concerns. - Fix account naming issues. - Enable creation of new vault with default HD keyring. - Formatting issues.
| | * | | | | Do not open MM page in dev mode.Kevin Serrano2016-11-021-1/+2
| | | | | | |
| | * | | | | LintedKevin Serrano2016-11-012-1/+46
| | | | | | |
| | * | | | | Implement seed word confirmation page.Kevin Serrano2016-11-019-12/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove logs. Move HD render files to ui/app.
| | * | | | | Implement auto-faucetingKevin Serrano2016-11-011-1/+6
| | | | | | |
| | * | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2016-10-315-16/+142
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | i328-MultiVault
| | | * | | | | Now migrating old vaults to new DEN formatDan Finlay2016-10-295-16/+142
| | | | | | | |
| | * | | | | | Make case condition more consistent. Remove extra action. Fix incorrect ↵Kevin Serrano2016-10-312-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | display of network.
| | * | | | | | Add focus to password field.Kevin Serrano2016-10-311-0/+4
| | | | | | | |
| | * | | | | | Add password warning div.Kevin Serrano2016-10-311-2/+7
| | | | | | | |
| | * | | | | | Modify first-screen design to match docs.Kevin Serrano2016-10-311-2/+3
| | | | | | | |
| | * | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2016-10-2913-30/+465
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | i328-MultiVault
| | | * | | | | Add vault migration testDan Finlay2016-10-291-0/+91
| | | | | | | |
| | | * | | | | Configure BIP44 Keychain as default oneDan Finlay2016-10-294-11/+44
| | | | | | | |
| | | * | | | | Added hd wallet testsDan Finlay2016-10-282-4/+109
| | | | | | | |
| | | * | | | | Add hd wallet keyringDan Finlay2016-10-282-0/+79
| | | | | | | |
| | | * | | | | Fix identicon renderingDan Finlay2016-10-281-7/+6
| | | | | | | |
| | | * | | | | Update first screen to match design.Dan Finlay2016-10-282-10/+99
| | | | | | | |
| | | * | | | | Add latest jazzicon versionDan Finlay2016-10-281-1/+1
| | | | | | | |
| | | * | | | | Add first-time stateDan Finlay2016-10-282-1/+40
| | | | | | | |
| | | * | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵Dan Finlay2016-10-2620-205/+7
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | i328-MultiVault
| | | * \ \ \ \ \ Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-264-14/+35
| | | |\ \ \ \ \ \
| | * | \ \ \ \ \ \ Merge branch 'master' into i328-MultiVaultKevin Serrano2016-10-2912-42/+76
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Remove debugger statement.Kevin Serrano2016-10-261-1/+0
| | | | | | | | | |
| | * | | | | | | | Phase out extra warning screen.Kevin Serrano2016-10-2620-205/+8
| | | | | | | | | |
| | * | | | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2016-10-2415-87/+712
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | i328-MultiVault
| | | * | | | | | | Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-224-1/+36
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Fix duplicate provider menu item bugDan Finlay2016-10-221-6/+1
| | | | | | | | | | |
| | | * | | | | | | | Fix loading indicationDan Finlay2016-10-221-1/+1
| | | | | | | | | | |
| | | * | | | | | | | Added tx & msg managing functionality to new KeyringControllerDan Finlay2016-10-222-1/+150
| | | | | | | | | | |
| | | * | | | | | | | Fix bug in new KeyringController vault restoring logic.Dan Finlay2016-10-223-3/+74
| | | | | | | | | | |
| | | * | | | | | | | Create new vault before each keyringController unit testDan Finlay2016-10-221-3/+5
| | | | | | | | | | |
| | | * | | | | | | | Create basic keyring-controller unit test fileDan Finlay2016-10-224-32/+83
| | | | | | | | | | |
| | | * | | | | | | | Added SimpleKeyring testsDan Finlay2016-10-224-18/+110
| | | | | | | | | | |
| | | * | | | | | | | Added tx and msg signing to keychain & controllerDan Finlay2016-10-214-39/+134
| | | | | | | | | | |
| | | * | | | | | | | Improved simple account generationDan Finlay2016-10-213-35/+52
| | | | | | | | | | |
| | | * | | | | | | | Began adding first basic keyringDan Finlay2016-10-218-13/+166
| | | | | | | | | | |
| | | * | | | | | | | Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-211-1/+1
| | | |\ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ Merge branch 'master' into i328-MultiVaultKevin Serrano2016-10-244-1/+36
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge branch 'master' into i328-MultiVaultKevin Serrano2016-10-211-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | / / / / / / / | | | | |/ / / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Fix background connection referencesDan Finlay2016-10-212-2/+2
| | | | | | | | | | |
| | * | | | | | | | | Fix testsDan Finlay2016-10-217-179/+16
| | | | | | | | | | |
| | * | | | | | | | | Linted & added salting to vaultDan Finlay2016-10-217-44/+31
| | | | | | | | | | |
| | * | | | | | | | | Fix state updating after vault creation and unlockingDan Finlay2016-10-213-4/+11
| | | | | | | | | | |
| | * | | | | | | | | Fix unlock logicDan Finlay2016-10-211-6/+17
| | | | | | | | | | |
| | * | | | | | | | | Commented out useless advanced not on init screenDan Finlay2016-10-211-0/+2
| | | | | | | | | | |
| | * | | | | | | | | Change actions reference to keyringController to backgroundDan Finlay2016-10-212-25/+25
| | | | | | | | | | |
| | * | | | | | | | | LintedDan Finlay2016-10-211-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵Dan Finlay2016-10-2127-120/+483
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i328-MultiVault
| | | * \ \ \ \ \ \ \ \ Resolve merge conflict.Kevin Serrano2016-10-200-0/+0
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Git merge resolution.Kevin Serrano2016-10-2014-45/+267
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Intermediary commit.Kevin Serrano2016-10-209-37/+77
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Remove unused crypto dependencies.Kevin Serrano2016-10-202-4/+0
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Add crypto packages to package.jsonKevin Serrano2016-10-201-0/+2
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Merge in crypto.Kevin Serrano2016-10-209-5/+195
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Initial work on UI sideKevin Serrano2016-10-166-1/+82
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2016-10-1311-144/+467
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | origin/i328-MultiVault
| | * | | | | | | | | | | | | Add debug flag to dev modeDan Finlay2016-10-201-2/+2
| | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | LintedDan Finlay2016-10-152-10/+5
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Fixed vector usage in encryptorDan Finlay2016-10-151-3/+17
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Got basic encryptor workingDan Finlay2016-10-152-14/+61
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Got encrypting working, not yet decryptingDan Finlay2016-10-155-115/+51
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Began adding browser-native encryptor moduleDan Finlay2016-10-138-3/+201
| | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new Qunit build process that will browserify the contents of `test/integration/lib` into the QUnit browser, allowing much more modular testing, including unit testing of our modules in our target browsers. Made a basic unit test file of this form for the new encryptor module, which fails miserably because I've only just begun to work with it. I've started with this blog post as a starting point, and will be adjusting it to our needs from there: http://qnimate.com/passphrase-based-encryption-using-web-cryptography-api/
| | * | | | | | | | | | | Add minimal method signatures to new keyring controllerDan Finlay2016-10-133-15/+94
| | | | | | | | | | | | |
| | * | | | | | | | | | | Remove additional deprecated actionDan Finlay2016-10-131-15/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | Remove opinionated seed word codeDan Finlay2016-10-137-116/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Completely breaking all account maangement, I have removed the opinionated seed-word code from the UI. Web3 injection still seems to work.
| | * | | | | | | | | | | Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-1316-83/+365
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Add initial KeyringController filesDan Finlay2016-10-122-0/+183
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Add to docDan Finlay2016-10-121-0/+13
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Add multi-vault planning docDan Finlay2016-10-081-0/+175
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #819 from MetaMask/i791-FixLosingConnectionkumavis2016-11-184-11/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increment tx ids to avoid collisions
| * | | | | | | | | | | | | | Increment tx ids to avoid collisionsDan Finlay2016-11-184-11/+13
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #791 It was possible for two requests to have the same ID, causing a crash and loss of StreamProvider connection. This new id generation strategy creates a random ID, and increments it for each request. In case the id generator is included from two different processes, I'm initializing the counter at a random number, and rolling it over a large number when it gets too big.
* | | | | | | | | | | | | | Merge pull request #814 from MetaMask/Version-2.13.8kumavis2016-11-172-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | Version 2.13.8: Faithful Serpent
| * | | | | | | | | | | | | Version 2.13.82.13.8Dan Finlay2016-11-172-2/+5
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #811 from MetaMask/deadly-fixkumavis2016-11-153-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | Fix error display in confirmation screen
| * | | | | | | | | | | | Merge branch 'deadly-fix' of github.com:MetaMask/metamask-plugin into deadly-fixKevin Serrano2016-11-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | First attempt at fixing errors in confirmation screen.Kevin Serrano2016-11-152-4/+3
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add to changelog.Kevin Serrano2016-11-151-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | First attempt at fixing errors in confirmation screen.Kevin Serrano2016-11-152-4/+3
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #807 from MetaMask/cssIsAwesomekumavis2016-11-112-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | Fix funny looking errors in conf-tx
| * | | | | | | | | | | lint fixFrankie2016-11-111-1/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Fix funny looking errors in conf-txFrankie2016-11-112-2/+5
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #805 from MetaMask/i804kumavis2016-11-113-2/+26
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | detect tx error - show warning and fix gasLimit
| * | | | | | | | | | changelog - updatekumavis2016-11-111-0/+1
| | | | | | | | | | |
| * | | | | | | | | | detect tx error - show warning and fix gasLimitkumavis2016-11-112-2/+25
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #801 from MetaMask/deadlyKevin Serrano2016-11-106-18/+14
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Properly implement 20% gas bump
| * | | | | | | | | | remove gas field, due to alias redundancy.Kevin Serrano2016-11-101-1/+0
| | | | | | | | | | |
| * | | | | | | | | | Fix bug for increasing gas by 20 percent.Kevin Serrano2016-11-103-1/+3
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'deadly' of github.com:MetaMask/metamask-plugin into deadlyKevin Serrano2016-11-103-17/+12
|/| | | | | | | | | |
| * | | | | | | | | | Unify warning functions.Kevin G. Serrano2016-11-083-17/+12
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #797 from MetaMask/Version-2.13.7Frankie2016-11-093-2/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Version 2.13.7
| * | | | | | | | | | | Hard coding jazzicon at working version2.13.7Dan Finlay2016-11-091-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Version 2.13.7Dan Finlay2016-11-092-1/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #796 from MetaMask/IncreaseGasBufferDan Finlay2016-11-093-8/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | Increase gas buffer
| * | | | | | | | | | Adjust gas buffer to be 20% over estimateDan Finlay2016-11-093-7/+7
| | | | | | | | | | |
| * | | | | | | | | | Increase gas bufferDan Finlay2016-11-093-4/+4
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #795
* | | | | | | | | | Merge pull request #793 from MetaMask/i787-HighGasBugKevin Serrano2016-11-083-16/+45
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | i787 High gas bug
| * | | | | | | | | Fix gas price bufferingDan Finlay2016-11-083-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our gas price buffering logic had a bug, because bn.js has inconsistent behavior when using hex-prefixed output. The issue has been opened with them here: https://github.com/indutny/bn.js/issues/151 We've corrected our usage in the mean time.
| * | | | | | | | | Added failing test for #787Dan Finlay2016-11-081-11/+41
|/ / / / / / / / /
* | | | | | | | | Merge pull request #786 from MetaMask/i763-GithubLinkkumavis2016-11-012-1/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | Fix github link on info page
| * | | | | | | | Fix github link on info pageDan Finlay2016-11-012-1/+3
|/ / / / / / / /
* | | | | | | | Merge pull request #778 from MetaMask/mascara-buildkumavis2016-10-273-11/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Mascara build
| * | | | | | | | mascara - remove global transpilekumavis2016-10-272-10/+0
| | | | | | | | |
| * | | | | | | | mascara - example dapp - log main accountkumavis2016-10-271-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #774 from MetaMask/walkThroughDan Finlay2016-10-272-4/+21
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add more info to mascara README
| * \ \ \ \ \ \ \ Merge branch 'master' into walkThroughFrankie2016-10-272-1/+2
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #767 from MetaMask/UpdateWeb3kumavis2016-10-272-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update web3.js version
| * \ \ \ \ \ \ \ \ Merge branch 'master' into UpdateWeb3Dan Finlay2016-10-272-1/+3
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'master' into UpdateWeb3Dan Finlay2016-10-274-12/+15
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | deps - web3 - set version to 0.17.0-betakumavis2016-10-271-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Update web3.js versionDan Finlay2016-10-262-1/+2
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | | * | | | | | | Fix typos and clean upFrankie2016-10-272-2/+1
| | | | | | | | | |
| | | * | | | | | | Merge branch 'master' into walkThroughFrankie2016-10-275-11/+15
| | | |\ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #773 from MetaMask/Version-2.13.62.13.6Dan Finlay2016-10-272-1/+3
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Version 2.13.6
| * | | | | | | | | Version 2.13.6Dan Finlay2016-10-272-1/+3
|/ / / / / / / / /
* | | | | | | | | Merge pull request #768 from MetaMask/i762-RenameWalletToAccountDan Finlay2016-10-272-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Rename wallet to account
| * \ \ \ \ \ \ \ \ Merge branch 'master' into i762-RenameWalletToAccountDan Finlay2016-10-273-9/+10
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #764 from MetaMask/761-FixCustomMordenIndicationKevin Serrano2016-10-273-9/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix provider menu selection indication
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into 761-FixCustomMordenIndicationDan Finlay2016-10-272-2/+3
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Bump changelogDan Finlay2016-10-261-0/+2
| | | | | | | | | | |
| * | | | | | | | | | Fix provider menu selection indicationDan Finlay2016-10-262-9/+8
| | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Merge branch 'master' into i762-RenameWalletToAccountDan Finlay2016-10-272-2/+3
| | |\ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| | * | | | | | | | Rename wallet to accountDan Finlay2016-10-262-1/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #762
| | * | | | | | | Fix the size of the pop-upFrankie2016-10-271-3/+3
| | | | | | | | |
| | * | | | | | | Add more info about first useFrankie2016-10-271-1/+19
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #769 from MetaMask/FixDelegateCallDan Finlay2016-10-261-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix delegate call function reference 2
| * | | | | | | | Fix delegate call function reference 2Dan Finlay2016-10-261-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #766 from MetaMask/FixDelegateCallCheckDan Finlay2016-10-262-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix delegate call analysis
| * | | | | | | Fix delegate call analysisDan Finlay2016-10-262-1/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Fixed reference allowing transactions to be analyzed for delegate call again.
* | | | | | | Merge pull request #745 from MetaMask/i743-FixDelegateCallFlagkumavis2016-10-254-14/+35
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Reproduced issue 743 in test case
| * | | | | | test - fix delegate-call testkumavis2016-10-254-12/+10
| | | | | | |
| * | | | | | Merge branch 'master' into i743-FixDelegateCallFlagkumavis2016-10-255-2/+37
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #752 from MetaMask/i#741Dan Finlay2016-10-224-1/+36
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Add validations to txData param in send form
| * | | | | | Change regex in isHex functionFrankie2016-10-221-4/+1
| | | | | | |
| * | | | | | Merge branch 'i#741' of https://github.com/MetaMask/metamask-plugin into i#741Frankie2016-10-221-1/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into i#741Frankie2016-10-211-1/+1
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 16:45:57 +0800