poanetwork
/
nifty-wallet
mirror of https://github.com/poanetwork/nifty-wallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,784 Commits 329 Branches 164 Tags 80 MiB
Commit Graph

1784 Commits

Author SHA1 Message Date
Dan Finlay bb06f5803d Add development states.js back into repo 2016-11-21 11:54:16 -08:00
Dan Finlay 6ae2400ef2 Fix custom provider menu item 
The Custom RPC menu item in the provider menu would not appear when Localhost:8545 was selected.
 2016-11-21 11:45:31 -08:00
Dan Finlay 7021c7708c Merge pull request #827 from MetaMask/currency-cleanup 
Convert conversion-util to pure json.
 2016-11-18 17:52:32 -08:00
Dan Finlay cb0a9c7079 Merge pull request #826 from MetaMask/mini-lint 
Maintain linting.
 2016-11-18 17:51:32 -08:00
Kevin Serrano a07e5826ad
Convert conversion util to pure json. 2016-11-18 16:49:39 -08:00
Kevin Serrano d6286cd13a
Maintain linting. 2016-11-18 16:27:26 -08:00
Dan Finlay df5f99fa3b Merge pull request #824 from MetaMask/failing-tests 
Promisify persistence of old vaults in migration code
 2016-11-18 16:04:19 -08:00
Kevin Serrano bc6312e9e3
Promisify persistence of keyrings before returning key 
Change single letter variables (shame)
 2016-11-18 15:58:49 -08:00
Kevin Serrano c695d54b01
Merge branch 'dev' into failing-tests 2016-11-18 15:40:25 -08:00
Kevin Serrano 3cd839d27f
Create failing test to check submitPassword in keyringController. 2016-11-18 15:40:12 -08:00
Kevin Serrano 626903e9f2 Merge pull request #823 from MetaMask/FixBork 
Update migration code for new hd wallet param name
 2016-11-18 11:53:53 -08:00
Dan Finlay ce1c5eb75a Update migration code for new hd wallet param name 2016-11-18 11:37:07 -08:00
Kevin Serrano cd2442e3e7
Persist keyrings from migration to storage. 2016-11-18 10:48:00 -08:00
Kevin Serrano bef023fb4a
Resolve merge conflict. 2016-11-18 09:23:20 -08:00
kumavis 39e0a33bba random-id - use Number.MAX_SAFE_INTEGER as max 2016-11-17 14:29:35 -08:00
kumavis 6400eb8453 Merge pull request #816 from MetaMask/i328-MultiVault 
Multi vault to Dev Branch
 2016-11-17 17:27:34 -05:00
kumavis 37d836fa72 Merge pull request #819 from MetaMask/i791-FixLosingConnection 
Increment tx ids to avoid collisions
 2016-11-17 17:27:18 -05:00
Dan Finlay 8eb91e89bf Increment tx ids to avoid collisions 
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.
 2016-11-17 14:05:12 -08:00
Dan Finlay 4352c7031a Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault 2016-11-17 13:51:32 -08:00
Dan Finlay f229d32442 Replace old random-id code with incrementing id generator 2016-11-17 13:49:46 -08:00
kumavis b0ccde66f6 Merge pull request #814 from MetaMask/Version-2.13.8 
Version 2.13.8: Faithful Serpent
 2016-11-16 19:09:29 -05:00
Dan Finlay a4eadddd6b Version 2.13.8 2016-11-16 16:00:32 -08:00
Kevin Serrano 592b64a19f
Revert one cb to previous state. 2016-11-15 17:13:33 -08:00
Kevin Serrano 5bfb700fa8
Minimize dispatches by using emitters and relying on state updates. 2016-11-15 17:12:13 -08:00
Kevin Serrano e18109f1ea
Fix semantics in comments 2016-11-15 13:45:21 -08:00
Kevin Serrano 585284cb88
Lints. 2016-11-15 13:44:22 -08:00
Kevin Serrano 2ae62a4573
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault 2016-11-15 13:43:42 -08:00
Kevin Serrano 64296df309
Resolve merge conflicts. 2016-11-15 13:43:15 -08:00
Kevin Serrano 14e6b92e29
Resolve merge conflicts. 2016-11-15 13:41:09 -08:00
Kevin Serrano 1db0bc4b2a
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault 2016-11-15 13:31:58 -08:00
Kevin Serrano a4666de0ce
Minimize repeated code. 2016-11-15 13:31:22 -08:00
Kevin Serrano b1fee2a1d3
Minimize repeated code. 2016-11-15 11:19:21 -08:00
kumavis 68d5b459ed Merge pull request #811 from MetaMask/deadly-fix 
Fix error display in confirmation screen
 2016-11-14 22:39:17 -05:00
Kevin Serrano 7de6b12aad
Re-enable disclaimer screen. Rename variables to reflect role more clearly. 2016-11-14 16:49:16 -08:00
Kevin Serrano 92edc63d6e
Add idStore tests again. 2016-11-14 16:23:52 -08:00
Kevin Serrano acf02c9290
Merge branch 'deadly-fix' of github.com:MetaMask/metamask-plugin into deadly-fix 2016-11-14 11:21:51 -08:00
Kevin Serrano 205205f7cd
Add to changelog. 2016-11-14 11:19:58 -08:00
Kevin Serrano d891869eff
First attempt at fixing errors in confirmation screen. 2016-11-14 11:19:01 -08:00
Kevin Serrano 26a548a7a3
First attempt at fixing errors in confirmation screen. 2016-11-14 11:17:53 -08:00
Kevin Serrano eea3bfb0b3
Rename n variables to numberOfAccounts inside of test suite. Remove idStore tests. 2016-11-11 17:06:37 -08:00
Kevin Serrano 4826f7c0a0
Revert to previous anonymous function for promise. 2016-11-11 17:06:07 -08:00
Kevin Serrano 20cea5b2f5
Various keyring changes 
- Rearrange the require statements.
- Remove unused web3.
- Simplify some callbacks and promises.
- Clarify certain parameters.
 2016-11-11 15:41:04 -08:00
Kevin Serrano bfeaae69f2
Clarify functions names. Package normalize inside util file. Fix require headers. 2016-11-11 15:40:12 -08:00
Kevin Serrano 7012747fb5
Package normalize inside sig util file. 2016-11-11 15:37:54 -08:00
Kevin Serrano 0c23925c23
Fix lint rules for ternary operator placement. 2016-11-11 15:37:22 -08:00
Kevin Serrano 3828edf6a4
Typo fix. 2016-11-11 10:54:15 -08:00
Kevin Serrano 23263bec7d
Linting to the max. 2016-11-11 10:26:12 -08:00
kumavis c664b8f11e Merge branch 'master' into i328-MultiVault 2016-11-11 03:18:33 -05:00
kumavis 115fdc36fe Merge pull request #807 from MetaMask/cssIsAwesome 
Fix funny looking errors in conf-tx
 2016-11-11 01:31:23 -05:00
Frankie b60f51dfc2 lint fix 2016-11-10 22:20:58 -08:00