aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/lib
Commit message (Collapse)AuthorAgeFilesLines
* inpage - distinguish pump vs pipekumavis2017-09-081-4/+4
|
* streams - use pump and published obj-multiplexkumavis2017-09-083-73/+14
|
* inpage - add idRemapMiddlewarekumavis2017-09-081-1/+3
|
* inpage - use json-rpc-engine for inpage-providerkumavis2017-08-251-36/+10
|
* Merge pull request #1973 from MetaMask/hotfix-migration019kumavis2017-08-241-1/+1
|\ | | | | hotfix - fail submitted txs whos nonce is out of bound
| * fall back to `latest` if blockNumber is nullfrankiebee2017-08-241-1/+1
| |
* | Fail transactions after a day of retriesDan Finlay2017-08-241-1/+7
|/
* Enforce nonces as type stringDan Finlay2017-08-241-2/+10
|
* Use toNumber methodDan Finlay2017-08-241-2/+1
|
* Fix network nonce parsingDan Finlay2017-08-241-4/+11
|
* Pass nonce testsDan Finlay2017-08-241-8/+7
|
* Got all tests but one passingDan Finlay2017-08-241-0/+1
|
* Fix new test, break an older maybe wrong oneDan Finlay2017-08-241-26/+24
|
* LintedDan Finlay2017-08-241-1/+0
|
* Simplify nonce calculationDan Finlay2017-08-241-4/+5
|
* Merge branch 'master' into useLocalNonceDan Finlay2017-08-241-0/+37
|\
| * tx controller - tx state history various small fixeskumavis2017-08-151-1/+1
| |
| * introduce tx-state-history-helper and diff-based historykumavis2017-08-151-0/+37
| |
* | nonce-tracker - more debugging numbers for nonceDetailskumavis2017-08-231-10/+8
| |
* | remove unused codekumavis2017-08-231-15/+0
| |
* | nonce-tracker - use ethjs-querykumavis2017-08-231-11/+2
| |
* | nonce-tracker - fix var namekumavis2017-08-231-4/+4
| |
* | nonce-tracker - getlocalNextNonce - add entry to nonceDetailskumavis2017-08-231-1/+1
| |
* | nonce-tracker - simplify _getlocalNextNoncekumavis2017-08-231-20/+29
| |
* | nonce-tracker - simplify getHighestNoncekumavis2017-08-231-5/+3
| |
* | nonce-tracker - getHighestNonce doesnt need uniqued inputkumavis2017-08-231-4/+4
| |
* | nonce-tracker - make nonce strategy api and naming more symmeticalkumavis2017-08-231-19/+21
| |
* | nonce-tracker - pass testsfrankiebee2017-08-221-5/+4
| |
* | clean up codefrankiebee2017-08-221-39/+43
| |
* | nonce-tracker - pass testsfrankiebee2017-08-221-11/+38
| |
* | break out network nonce calc.frankiebee2017-08-191-17/+21
| |
* | fix 0x0 nonce calc.frankiebee2017-08-191-8/+18
| |
* | include pendingTxs in localNoncefrankiebee2017-08-191-10/+9
| |
* | use "localNonce" when the network returns a nonce that is lower then a known ↵frankiebee2017-08-191-3/+20
|/ | | | confirmed tx
* fix wordingfrankiebee2017-08-121-1/+1
|
* add deprecation warning for web3frankiebee2017-08-121-1/+4
|
* tx utils - detect estimateGas err and set simulationFailedkumavis2017-08-091-3/+11
|
* util - sufficientBalance - validate inputkumavis2017-08-091-1/+6
|
* fix getPendingTransactions function for pendingTxTrackerfrankiebee2017-08-091-1/+1
|
* fix class namesfrankiebee2017-08-092-2/+3
|
* remove logging of the message and log the errorfrankiebee2017-08-081-1/+1
|
* fix spellingfrankiebee2017-08-081-6/+3
|
* Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-054-45/+15
|\
| * Merge pull request #1857 from MetaMask/hotFixCancleTxkumavis2017-08-041-1/+2
| |\ | | | | | | fix cancelTransaction not receiving a callback
| | * fix cancelTransaction not reciving a callbackfrankiebee2017-08-041-1/+2
| | |
| * | blacklist - use module eth-phishing-detectkumavis2017-08-041-23/+0
| |/
| * Merge pull request #1848 from MetaMask/transactionControllerRefractorkumavis2017-08-031-48/+13
| |\ | | | | | | Transaction controller refractor part 1: promises for everyone and more tests!
| * | blacklist controller - breakout from metamask and infura controllerskumavis2017-08-031-22/+7
| | |
| * | phishing detection - move phishing detection into contentscript and metamask ↵kumavis2017-08-032-3/+6
| | | | | | | | | | | | controller
| * | obj-multiplex - missing name error + prefer const over varkumavis2017-08-031-6/+10
| | |
* | | break out tx status pendding watchersfrankiebee2017-08-051-0/+165
| | |
* | | move util functions to util.jsfrankiebee2017-08-052-32/+40
| |/ |/|
* | use async with #publishTransactionfrankiebee2017-08-031-2/+2
| |
* | move newUnapprovedTransaction to transactions.jsfrankiebee2017-08-031-8/+4
| |
* | lint fixesfrankiebee2017-08-021-6/+1
| |
* | Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-022-9/+57
|\|
| * Merge branch 'master' into i1805-LiveBlacklistUpdatingDan Finlay2017-07-271-0/+38
| |
| * nonce-tracker - hotfix for provider proxyingkumavis2017-07-271-4/+11
| |
| * nonce-tracker - add raw baseNonceHex to nonceDetailskumavis2017-07-271-1/+1
| |
| * tx controller + nonce tracker - record nonce components on txMetakumavis2017-07-271-2/+5
| |
| * nonce-tracker - validation - add validation failing value type to error messagekumavis2017-07-271-3/+3
| |
| * nonce-tracker - validation - add validation failing value to error messagekumavis2017-07-271-3/+3
| |
* | fix addTxDefaultsfrankiebee2017-08-021-1/+2
| |
* | make addUnapprovedTransaction async function and use promise based ethQueryfrankiebee2017-08-021-44/+17
|/
* Add stack traces both in errors and as a way to track txMetasfrankiebee2017-07-261-0/+8
|
* transactions - block nonce-tracker while updating pending transactionskumavis2017-07-191-14/+29
|
* nonce-tracker - fix lock mechanism to be a real mutexkumavis2017-07-191-11/+15
|
* nonce-tracker - return nonce as integerkumavis2017-07-191-1/+1
|
* nonce-tracker - validate nonce calc componentskumavis2017-07-191-3/+9
|
* turn off auto faucet and remove filefrankiebee2017-07-181-20/+0
|
* make publishTransaction and signTransaction async methodsfrankiebee2017-07-141-2/+7
|
* Fix test to match behaviorfrankiebee2017-07-131-1/+1
|
* use new nodeifyfrankiebee2017-07-131-21/+6
|
* Use txParamsfrankiebee2017-07-121-4/+4
|
* Merge branch 'master' into nonce-trackerfrankiebee2017-07-121-0/+9
|\
| * Improve insufficient balance checking in retry loopDan Finlay2017-07-121-0/+9
| |
* | fix nonce calculation orderfrankiebee2017-07-061-6/+7
| |
* | nonce-tracker: only check transactions that are not supposed to be ignoredfrankiebee2017-06-281-6/+7
| |
* | fix nonceTrackerfrankiebee2017-06-221-8/+6
| |
* | add a test for #getNonceLockfrankiebee2017-06-221-6/+16
| |
* | introduce nonce-trackerkumavis2017-06-151-0/+49
|/
* LintingThomas Huang2017-06-131-2/+2
|
* Update gasblocklimit params with every block.Kevin Serrano2017-06-032-9/+2
|
* Convert gasLimit to not use muln in BNKevin Serrano2017-06-021-2/+8
|
* Merge pull request #1500 from MetaMask/RemoveStreamingSubproviderThomas Huang2017-05-261-17/+5
|\ | | | | Remove streaming subprovider
| * Remove stream subproviderDan Finlay2017-05-261-17/+5
| | | | | | | | 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.
* | fix spellingfrankiebee2017-05-251-2/+2
| |
* | Merge branch 'master' into reloadDappfrankiebee2017-05-252-2/+14
|\|
| * Merge pull request #1494 from MetaMask/1472-gasceilingDan Finlay2017-05-251-1/+12
| |\ | | | | | | Add Max GasLimit Ceiling
| | * Add new blockGasLimit property to txMeta object.Kevin Serrano2017-05-251-1/+12
| | |
| * | inpage-provider - disable polling after first blockkumavis2017-05-251-1/+2
| |/
* / Reload the page when switching networks for sites that use web3frankiebee2017-05-251-22/+25
|/
* Merge branch 'master' into networkControllerFrankie2017-05-241-5/+17
|\
| * clean - remove console logskumavis2017-05-231-2/+0
| |
| * deps - use stream-subprovider from provider-enginekumavis2017-05-231-1/+1
| |
| * Rename stream to streamSubproviderDan Finlay2017-05-231-4/+4
| |
| * Use filter subprovider in-page to avoid filter leaksDan Finlay2017-05-231-2/+6
| |
| * Add new streaming subprovider but getting a loopDan Finlay2017-05-211-5/+15
| | | | | | | | | | | | | | Regarding #1458 Uses a new streaming subprovider architecture on an experimental branch of StreamProvider: https://github.com/flyswatter/web3-stream-provider/tree/StreamSubprovider
* | Fix for testsfrankiebee2017-05-241-0/+29
| |
* | Wrap the provider in a proxyfrankiebee2017-05-231-3/+2
| |
* | Merge branch 'master' into networkControllerfrankiebee2017-05-232-20/+47
|\|
| * Remove all traces of testnetThomas Huang2017-05-161-10/+5
| |
| * Change default network to rinkebyThomas Huang2017-05-161-5/+5
| |
| * migrator - fix typokumavis2017-05-131-1/+1
| |
| * migrator - cleaner migration runner with es7kumavis2017-05-121-25/+13
| |
| * use asyncQ.waterfall instead of asyncQ.eachSeriesfrankiebee2017-05-121-4/+10
| |
| * fix migratorfrankiebee2017-05-111-9/+8
| |
* | Create a network controller to manage switcing networks an updating the providerfrankiebee2017-05-192-72/+3
|/
* Minor lintKevin Serrano2017-05-031-1/+1
|
* notification-manager - remove promise listenerkumavis2017-04-291-3/+0
| | | | | | | | 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
* Merge branch 'master' into rinkebyDan Finlay2017-04-288-21/+21
|\
| * Fix linting warningsThomas Huang2017-04-278-22/+22
| |
* | Add missing changes. Create unique style for rinkeby icon.Kevin Serrano2017-04-261-1/+5
| |
* | add rinkeby networkNickyg2017-04-261-0/+5
|/
* auto-faucet - only skip faucet on explicit test environmentkumavis2017-04-051-1/+1
|
* add platforms to mascara + move buyEther window open to uikumavis2017-04-052-3/+24
|
* Switch auto-faucet from XMLHttpRequest to fetchfrankiebee2017-04-041-5/+11
|
* notification-manager - rename show -> showPoup + make getPopup privatekumavis2017-04-011-10/+10
|
* extension - remove local extension files, we use extensionizerkumavis2017-03-312-85/+0
|
* introduce platform api and rename notifications to notification-managerkumavis2017-03-312-67/+74
|
* Merge pull request #1293 from MetaMask/ImproveGasEstimatesKevin Serrano2017-03-301-3/+4
|\ | | | | tx-utils - gas buffer ceiling at 90% of block gas limit
| * tx-utils - gas buffer ceiling at 90% of block gas limitkumavis2017-03-301-3/+4
| |
* | LintedDan Finlay2017-03-301-1/+1
| |
* | Fix popup behavior for FirefoxDan Finlay2017-03-302-2/+7
|/ | | | 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.
* tx manager - adjust new tx flow and txMeta decorationskumavis2017-03-291-17/+15
|
* Improve UI gas calculation logicDan Finlay2017-03-291-0/+7
| | | | | | | | - 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.
* Remove gas limit paramDan Finlay2017-03-241-3/+3
| | | | Fixes #1256 by removing redundant param.
* Merge branch 'master' into i238-kovanKevin Serrano2017-03-231-1/+5
|\
| * Add current block number and hash to the state.Kevin Serrano2017-03-231-1/+5
| |
* | Add kovan config settings to config manager.Kevin Serrano2017-03-231-0/+4
|/
* Remove eth-lightwalletDan Finlay2017-03-173-513/+0
|
* Merge branch 'master' into kumavis-patch-1Dan Finlay2017-03-093-207/+0
|\
| * Merge branch 'master' into i1144-moarrpcKevin Serrano2017-03-091-5/+8
| |\
| * \ Merge branch 'master' into i1144-moarrpcKevin Serrano2017-03-081-8/+14
| |\ \
| * \ \ More conflict resolution.Kevin Serrano2017-03-023-237/+0
| |\ \ \
| | * | | add controllers to root scripts folderDan Finlay2017-02-283-238/+0
| | | | |
| | * | | Merge branch 'master' into i1144-moarrpcDan Finlay2017-02-287-34/+127
| | |\ \ \
| * | \ \ \ Fix merge conflicts.Kevin Serrano2017-03-028-55/+129
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Tested against code to play nice with unit tests.Kevin Serrano2017-02-241-2/+11
| | | | | |
| * | | | | Implemented functionality for displaying recent custom RPCsKevin Serrano2017-02-231-14/+15
| | | | | |
| * | | | | Fix namingKevin Serrano2017-02-221-2/+2
| | | | | |
| * | | | | Basic infrasture for RPC list added.Kevin Serrano2017-02-221-3/+23
| | | | | |
* | | | | | tx-utils - add encoding utilskumavis2017-03-081-1/+1
| | | | | |
* | | | | | tx-utils - stricter naming type-based conventionkumavis2017-03-081-9/+15
| | | | | |
* | | | | | tx-utils - clean and commentkumavis2017-03-081-15/+11
| |_|_|_|/ |/| | | |
* | | | | change BN.mul to BN.mulnJared Pereira2017-03-081-1/+1
| | | | |
* | | | | remove constant buffer and add multiplierJared Pereira2017-03-081-5/+8
| |_|_|/ |/| | |
* | | | Fix normalizeMsgData function to always return hex prefixedDan Finlay2017-03-071-1/+1
| | | |
* | | | Render personal_sign messages as utf-8 textDan Finlay2017-03-071-8/+14
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | LintedDan Finlay2017-03-011-1/+0
| | |
* | | Remove gasMultiplier txMeta paramDan Finlay2017-03-014-21/+3
| | | | | | | | | | | | | | | | | | 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.
* | | Fixed bug that made send screen sometimes transition to account detailDan Finlay2017-03-011-0/+1
| |/ |/|
* | Got personal_sign workingDan Finlay2017-02-241-2/+2
| | | | | | | | Also fixed bug where signing would not close popup.
* | Add alternate UI for pending personal_sign messagesDan Finlay2017-02-242-1/+3
| |
* | Fix referenceDan Finlay2017-02-221-1/+1
| |
* | Move sigUtil and keyrings to external modulesDan Finlay2017-02-226-32/+122
|/ | | | 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.
* Merge branch 'dev' into disclaimer-notifyKevin Serrano2017-02-101-0/+5
|\
| * Allowed net_version to be called synchronouslyKevin Serrano2017-02-091-0/+5
| |
* | Delete all code related to disclaimers.Kevin Serrano2017-02-102-24/+0
|/
* Fix typoDan Finlay2017-02-051-1/+1
|
* Remove shapeshift tx list from idStoreDan Finlay2017-02-051-2/+1
|
* Stop removing old shapeshift txsDan Finlay2017-02-051-16/+0
|
* Do not remove completed shapeshift depositsDan Finlay2017-02-041-1/+2
|
* Fix bug when clearing old shapeshift txsDan Finlay2017-02-041-1/+3
|
* Automatically remove shapeshift txs over 11 minutes old with no paymentDan Finlay2017-02-041-0/+22
|
* Got ShapeShiftController back to workingDan Finlay2017-02-041-12/+7
|
* Mostly got shapeshift tx management into its own controllerDan Finlay2017-02-042-34/+100
| | | | Rendering the list is still having issues, so this isn't done yet.
* eth-store - update store state after manipulatingkumavis2017-02-041-0/+2
|
* id mgmt - update to latest eth_sign speckumavis2017-02-041-8/+27
|
* migrations - fix migration #9 and add safety checks to migratorkumavis2017-02-041-1/+12
|
* eths-store - eagerly set current blockkumavis2017-02-041-0/+2
|
* migration #9 - break out CurrencyController substatekumavis2017-02-033-50/+70
|
* eth-store - cbs default to noopkumavis2017-02-031-5/+5
|
* eth-store - convert to obs-store subclasskumavis2017-02-031-116/+98
|
* messageManager - move view state to obs-storekumavis2017-02-031-32/+20
|
* emit a update badgeFrankie2017-02-021-1/+1
|
* put updateBadge back inFrankie2017-02-021-0/+1
|
* swap out set state for updateStateFrankie2017-02-021-4/+1
|
* Merge branch 'dev' into messageManagerCleanUpFrankie2017-02-022-5/+38
|\
| * continue rename selectedAccount to selectedAddresskumavis2017-01-311-5/+5
| |
| * rename selectedAccount to selectedAddresskumavis2017-01-311-2/+5
| |
| * preferences - introduce preferences controllerkumavis2017-01-311-0/+30
| |
* | code clan up and testsFrankie2017-02-021-22/+20
| |
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-291-9/+1
|\|
| * tests - remove persistence and start with initial statekumavis2017-01-281-9/+1
| |
* | Clean up message manger includes:Frankie2017-01-291-10/+67
| | | | | | | | | | | | | | | | | | 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
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-281-4/+5
|\|
| * background - stream disconnection fixkumavis2017-01-271-4/+5
| |
* | Rewrite message controller to fit controller patternFrankie2017-01-281-48/+45
|/
* background - organize metamask instantiationkumavis2017-01-271-1/+1
|
* obs-store - use published modulekumavis2017-01-257-274/+52
|
* Merge branch 'dev' into obs-store2kumavis2017-01-223-2/+62
|\
| * Merge branch 'dev' into conversion-api-errDan Finlay2017-01-183-3/+63
| |\
| | * eth-store - emit update on new account addkumavis2017-01-151-1/+3
| | |
| | * Satisfy review needs:Frankie2017-01-141-2/+12
| | | | | | | | | | | | | | | | | | | | | 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
| | * background - handle tx finalization in controllers instead of provider-enginekumavis2017-01-131-0/+48
| | |
| * | currency conversion - less noisy errorkumavis2017-01-121-1/+1
| | |
* | | migrations - wip - 005 multivault migrationkumavis2017-01-122-23/+14
| | |
* | | migrations - introduce promise-based migratorkumavis2017-01-121-0/+31
| | |
* | | background - move pojo migrator to outside of metamask controllerkumavis2017-01-128-53/+99
| | |
* | | background - introduce ObservableStorekumavis2017-01-127-109/+163
| |/ |/|
* | bugfix - portstream - dont wrap cb in try catchkumavis2017-01-121-2/+2
|/
* Remove erroneous OOG estimation logic.Dan Finlay2017-01-111-15/+2
|
* deps - replace promise-request with fetchkumavis2017-01-111-4/+3
|
* Fixed bugs with sanity-checkingDan Finlay2017-01-051-12/+10
| | | | | | - 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.
* Caught typoDan Finlay2017-01-051-2/+3
|
* Add descriptive commentDan Finlay2017-01-051-0/+9
|
* LintedDan Finlay2017-01-051-22/+17
|
* Removed reliance on eth-store internal custom eth-queryDan Finlay2017-01-051-6/+15
|
* Move eth-store@1.1.0 into local repo.Dan Finlay2017-01-051-0/+132
|
* inpage-provider - add isMetaMaskkumavis2017-01-031-0/+2
| | | | adds `metamaskInpageProvider.isMetaMask === true` Fixes #727
* Merge branch 'dev' into TxManagerFrankie2016-12-244-5/+11
|\
| * Remove logDan Finlay2016-12-231-1/+0
| |
| * Merge pull request #948 from MetaMask/RecoverLostAccountsDan Finlay2016-12-233-3/+9
| |\ | | | | | | Auto-Recover accounts lost to BIP44 derivation fix
| | * Restructured migrationDan Finlay2016-12-222-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Migrator now returns a lostAccount array that includes objects these objects include keys of address and privateKey, this allows the MetamaskController to restore the lost accounts even without customizing the idStore or the KeyringController. Also includes a patch that allows idStore to synchronously export private keys.
| | * Return undefined when vault is uninitializedDan Finlay2016-12-221-1/+1
| | |
| * | Fix account injection bugDan Finlay2016-12-231-2/+3
| |/ | | | | | | | | | | | | | | It seems `selectedAddress` was removed from the keyring-controller’s state, and is used to populate the injected current account. I couldn't help myself, I dug around, I found a PR named [changed all instances of selectedAddress to selectedAccount](https://github.com/MetaMask/metamask-plugin/commit/f5b0795ac5582dd53de728479cf47c43eabfe67c) by @Zanibas. Sorry, Kevin! Had you actually changed all instances, this bug would not have happened. Fixes #908
* | Merge branch 'dev' into TxManagerFrankie2016-12-223-166/+44
|\|
| * Merge pull request #916 from MetaMask/i894-DetectBadAccountsDan Finlay2016-12-212-10/+44
| |\ | | | | | | I894 detect bad accounts
| | * Made changes according to feedback.Dan Finlay2016-12-202-11/+10
| | |
| | * Got bad account detection working and added to stateDan Finlay2016-12-101-21/+1
| | |
| | * Mostly added bad account detectionDan Finlay2016-12-092-6/+61
| | | | | | | | | | | | Currently riddled with logs, because the migrator is inexplicably returning before generating the new style accounts for comparison.
| * | Remove encryptor in favor of external browser-passworderDan Finlay2016-12-201-156/+0
| | | | | | | | | | | | I broke out the encryptor lib into its own module on npm called browser-passworder.
| * | Lint.Kevin Serrano2016-12-201-2/+2
| |/
* | First pass at revision requestsFrances Pangilinan2016-12-223-289/+6
| |
* | Create a TxManagerFrances Pangilinan2016-12-153-52/+118
|/
* Fix vault encrypting & unlocking bugDan Finlay2016-12-011-2/+3
| | | | | | | | 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.
* Add useful nodeify error messageDan Finlay2016-11-301-2/+9
| | | | | | | 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. ```
* Fix nodeifyDan Finlay2016-11-291-55/+13
|
* Denodeify most of KeyringControllerDan Finlay2016-11-291-0/+59
| | | | | | | | | | 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.
* Merge branch 'master' into devDan Finlay2016-11-242-22/+55
|\
| * rpc - add sync uninstallFilter supportkumavis2016-11-241-0/+7
| |
| * idStore - fix estimateGas calculationkumavis2016-11-231-22/+48
| |
* | Fix new encryptor migration logicDan Finlay2016-11-231-1/+0
| |
* | Simplify Encryptor API SurfaceDan Finlay2016-11-231-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 pull request #857 from MetaMask/i841-RenameMethodkumavis2016-11-231-1/+1
|\ \ | | | | | | Rename idStoreMigrator method for clarity
| * | Rename idStoreMigrator method for clarityDan Finlay2016-11-221-1/+1
| | | | | | | | | | | | Fixes #841
* | | Merge pull request #869 from MetaMask/dev-cleanupkumavis2016-11-232-9/+9
|\ \ \ | | | | | | | | Dev Cleanup Package
| * | | change all instances of selectedAddress to selectedAccount.Kevin Serrano2016-11-221-5/+5
| | | |
| * | | Remove entropy from encryption and project.Kevin Serrano2016-11-221-4/+4
| |/ /
* / / Phase out ethereumjs-util from encryptor module.Kevin Serrano2016-11-231-6/+4
|/ /
* | Merge branch 'dev' into i831-AddRopsten-DevDan Finlay2016-11-2211-50/+308
|\ \ | |/ |/|
| * Maintain linting.Kevin Serrano2016-11-192-3/+3
| |
| * Update migration code for new hd wallet param nameDan Finlay2016-11-191-2/+2
| |
| * Resolve merge conflict.Kevin Serrano2016-11-1911-47/+305
| |\
| | * random-id - use Number.MAX_SAFE_INTEGER as maxkumavis2016-11-181-1/+1
| | |
| | * Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵Dan Finlay2016-11-189-37/+52
| | |\ | | | | | | | | | | | | i328-MultiVault
| | | * Fix semantics in commentsKevin Serrano2016-11-161-1/+1
| | | |
| | | * Lints.Kevin Serrano2016-11-161-1/+1
| | | |
| | | * Resolve merge conflicts.Kevin Serrano2016-11-161-4/+4
| | | |\
generated by cgit (git 2.34.1) at 2024-10-20 06:39:25 +0800