aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md6
-rw-r--r--app/manifest.json2
-rw-r--r--app/scripts/lib/migrations.js11
-rw-r--r--app/scripts/migrations/004.js22
-rw-r--r--package.json2
-rw-r--r--test/unit/migrations-test.js5
-rw-r--r--ui/app/send.js2
7 files changed, 39 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe37db1f5..e592e1faf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,12 @@
- Replaced identicons with jazzicons
- Fixed glitchy transitions
+## 1.8.2 2016-05-11
+
+- Fixed bug where send view would not load correctly the first time it was visited per account.
+- Migrated all users to new scalable backend.
+- Fixed `eth_syncing` method response.
+
## 1.8.1 2016-05-10
- Initial usage of scalable blockchain backend.
diff --git a/app/manifest.json b/app/manifest.json
index ea4535027..9288c3503 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
{
"name": "__MSG_appName__",
"short_name": "Metamask",
- "version": "1.8.1",
+ "version": "1.8.2",
"manifest_version": 2,
"description": "__MSG_appDescription__",
"icons": {
diff --git a/app/scripts/lib/migrations.js b/app/scripts/lib/migrations.js
index 0b8e6265c..f026cbe53 100644
--- a/app/scripts/lib/migrations.js
+++ b/app/scripts/lib/migrations.js
@@ -1,10 +1,5 @@
-var path = require('path')
-var fs = require('fs')
-
-var migration2 = require('../migrations/002')
-var migration3 = require('../migrations/003')
-
module.exports = [
- migration2,
- migration3,
+ require('../migrations/002'),
+ require('../migrations/003'),
+ require('../migrations/004'),
]
diff --git a/app/scripts/migrations/004.js b/app/scripts/migrations/004.js
new file mode 100644
index 000000000..2e3164baf
--- /dev/null
+++ b/app/scripts/migrations/004.js
@@ -0,0 +1,22 @@
+module.exports = {
+ version: 4,
+
+ migrate: function(data) {
+ try {
+ if (data.config.provider.type !== 'rpc') return data
+ switch (data.config.provider.rpcTarget) {
+ case 'https://testrpc.metamask.io/':
+ data.config.provider = {
+ type: 'testnet'
+ }
+ break
+ case 'https://rpc.metamask.io/':
+ data.config.provider = {
+ type: 'mainnet'
+ }
+ break
+ }
+ } catch (_) {}
+ return data
+ }
+}
diff --git a/package.json b/package.json
index 2e6468523..00f5e55ef 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
"three.js": "^0.73.2",
"through2": "^2.0.1",
"web3": "^0.15.1",
- "web3-provider-engine": "^7.6.2",
+ "web3-provider-engine": "^7.6.3",
"xtend": "^4.0.1"
},
"devDependencies": {
diff --git a/test/unit/migrations-test.js b/test/unit/migrations-test.js
index 3b347530a..9ea8d5c5a 100644
--- a/test/unit/migrations-test.js
+++ b/test/unit/migrations-test.js
@@ -5,6 +5,7 @@ var wallet1 = require(path.join('..', 'lib', 'migrations', '001.json'))
var migration2 = require(path.join('..', '..', 'app', 'scripts', 'migrations', '002'))
var migration3 = require(path.join('..', '..', 'app', 'scripts', 'migrations', '003'))
+var migration4 = require(path.join('..', '..', 'app', 'scripts', 'migrations', '004'))
describe('wallet1 is migrated successfully', function() {
@@ -23,6 +24,10 @@ describe('wallet1 is migrated successfully', function() {
var secondResult = migration3.migrate(firstResult)
assert.equal(secondResult.config.provider.rpcTarget, newTestRpc)
+ var thirdResult = migration4.migrate(secondResult)
+ assert.equal(secondResult.config.provider.rpcTarget, null)
+ assert.equal(secondResult.config.provider.type, 'testnet')
+
done()
})
})
diff --git a/ui/app/send.js b/ui/app/send.js
index d34accddc..ff8ef4d65 100644
--- a/ui/app/send.js
+++ b/ui/app/send.js
@@ -12,7 +12,7 @@ module.exports = connect(mapStateToProps)(SendTransactionScreen)
function mapStateToProps(state) {
var result = {
- address: state.appState.currentView.context,
+ address: state.metamask.selectedAccount,
accounts: state.metamask.accounts,
identities: state.metamask.identities,
warning: state.appState.warning,