6400eb8453
Merge pull request #816 from MetaMask/i328-MultiVault
...
Multi vault to Dev Branch
2016-11-17 17:27:34 -05:00
37d836fa72
Merge pull request #819 from MetaMask/i791-FixLosingConnection
...
Increment tx ids to avoid collisions
2016-11-17 17:27:18 -05:00
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
4352c7031a
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault
2016-11-17 13:51:32 -08:00
f229d32442
Replace old random-id code with incrementing id generator
2016-11-17 13:49:46 -08:00
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
a4eadddd6b
Version 2.13.8
2016-11-16 16:00:32 -08:00
592b64a19f
Revert one cb to previous state.
2016-11-15 17:13:33 -08:00
5bfb700fa8
Minimize dispatches by using emitters and relying on state updates.
2016-11-15 17:12:13 -08:00
e18109f1ea
Fix semantics in comments
2016-11-15 13:45:21 -08:00
585284cb88
Lints.
2016-11-15 13:44:22 -08:00
2ae62a4573
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault
2016-11-15 13:43:42 -08:00
64296df309
Resolve merge conflicts.
2016-11-15 13:43:15 -08:00
14e6b92e29
Resolve merge conflicts.
2016-11-15 13:41:09 -08:00
1db0bc4b2a
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault
2016-11-15 13:31:58 -08:00
a4666de0ce
Minimize repeated code.
2016-11-15 13:31:22 -08:00
b1fee2a1d3
Minimize repeated code.
2016-11-15 11:19:21 -08:00
68d5b459ed
Merge pull request #811 from MetaMask/deadly-fix
...
Fix error display in confirmation screen
2016-11-14 22:39:17 -05:00
7de6b12aad
Re-enable disclaimer screen. Rename variables to reflect role more clearly.
2016-11-14 16:49:16 -08:00
92edc63d6e
Add idStore tests again.
2016-11-14 16:23:52 -08:00
acf02c9290
Merge branch 'deadly-fix' of github.com:MetaMask/metamask-plugin into deadly-fix
2016-11-14 11:21:51 -08:00
205205f7cd
Add to changelog.
2016-11-14 11:19:58 -08:00
d891869eff
First attempt at fixing errors in confirmation screen.
2016-11-14 11:19:01 -08:00
26a548a7a3
First attempt at fixing errors in confirmation screen.
2016-11-14 11:17:53 -08:00
eea3bfb0b3
Rename n variables to numberOfAccounts inside of test suite. Remove idStore tests.
2016-11-11 17:06:37 -08:00
4826f7c0a0
Revert to previous anonymous function for promise.
2016-11-11 17:06:07 -08:00
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
bfeaae69f2
Clarify functions names. Package normalize inside util file. Fix require headers.
2016-11-11 15:40:12 -08:00
7012747fb5
Package normalize inside sig util file.
2016-11-11 15:37:54 -08:00
0c23925c23
Fix lint rules for ternary operator placement.
2016-11-11 15:37:22 -08:00
3828edf6a4
Typo fix.
2016-11-11 10:54:15 -08:00
23263bec7d
Linting to the max.
2016-11-11 10:26:12 -08:00
c664b8f11e
Merge branch 'master' into i328-MultiVault
2016-11-11 03:18:33 -05:00
115fdc36fe
Merge pull request #807 from MetaMask/cssIsAwesome
...
Fix funny looking errors in conf-tx
2016-11-11 01:31:23 -05:00
b60f51dfc2
lint fix
2016-11-10 22:20:58 -08:00
b60992b446
Fix funny looking errors in conf-tx
2016-11-10 22:13:30 -08:00
e123e3095b
Merge branch 'master' into i328-MultiVault
2016-11-11 01:01:06 -05:00
f88079c6b9
Merge pull request #805 from MetaMask/i804
...
detect tx error - show warning and fix gasLimit
2016-11-11 00:37:09 -05:00
1d0abc4771
changelog - update
2016-11-10 21:26:10 -08:00
536cab0687
detect tx error - show warning and fix gasLimit
2016-11-10 21:19:34 -08:00
ad290d3edc
Merge pull request #802 from MetaMask/confTxFix
...
Conf tx fix
2016-11-10 20:36:50 -08:00
17aac2dbc5
fix tx data so it has the network id
2016-11-10 19:07:12 -08:00
f665b779cb
Merge branch 'master' into i328-MultiVault
2016-11-10 16:53:47 -08:00
3775a4bf79
Merge pull request #801 from MetaMask/deadly
...
Properly implement 20% gas bump
2016-11-09 16:42:10 -08:00
e2b2083df0
remove gas field, due to alias redundancy.
2016-11-09 16:38:28 -08:00
b6b4be61d9
Fix bug for increasing gas by 20 percent.
2016-11-09 16:29:24 -08:00
14a833f5c0
Merge branch 'deadly' of github.com:MetaMask/metamask-plugin into deadly
2016-11-09 14:28:23 -08:00
ebcdb7a491
Merge pull request #797 from MetaMask/Version-2.13.7
...
Version 2.13.7
2016-11-08 09:22:10 -08:00
b57009493b
Hard coding jazzicon at working version
2016-11-08 08:54:30 -08:00
4a0197012e
Version 2.13.7
2016-11-08 08:51:14 -08:00
kumavis
Dan Finlay
Kevin Serrano
Frankie
kumavis
Frankie