aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2017-09-09 04:06:59 +0800
committerGitHub <noreply@github.com>2017-09-09 04:06:59 +0800
commit5fa0b992a754cb8ab467f3b29233692920d7e679 (patch)
tree43b7b1de67db464a4aeda6d57194cd0eea8dde83 /app
parenta704e1d14370056a9a1a8af43c702bb00142532d (diff)
parent585a32534d9415eec9f91b19732e121a4a4c3a79 (diff)
downloadtangerine-wallet-browser-5fa0b992a754cb8ab467f3b29233692920d7e679.tar
tangerine-wallet-browser-5fa0b992a754cb8ab467f3b29233692920d7e679.tar.gz
tangerine-wallet-browser-5fa0b992a754cb8ab467f3b29233692920d7e679.tar.bz2
tangerine-wallet-browser-5fa0b992a754cb8ab467f3b29233692920d7e679.tar.lz
tangerine-wallet-browser-5fa0b992a754cb8ab467f3b29233692920d7e679.tar.xz
tangerine-wallet-browser-5fa0b992a754cb8ab467f3b29233692920d7e679.tar.zst
tangerine-wallet-browser-5fa0b992a754cb8ab467f3b29233692920d7e679.zip
Merge pull request #2057 from MetaMask/Version-3.9.13
Version 3.9.13
Diffstat (limited to 'app')
-rw-r--r--app/manifest.json2
-rw-r--r--app/scripts/lib/inpage-provider.js52
2 files changed, 28 insertions, 26 deletions
diff --git a/app/manifest.json b/app/manifest.json
index 256737c89..51e82d6e3 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
{
"name": "MetaMask",
"short_name": "Metamask",
- "version": "3.9.12",
+ "version": "3.9.13",
"manifest_version": 2,
"author": "https://metamask.io",
"description": "Ethereum Browser Extension",
diff --git a/app/scripts/lib/inpage-provider.js b/app/scripts/lib/inpage-provider.js
index c63af06dc..13888dc67 100644
--- a/app/scripts/lib/inpage-provider.js
+++ b/app/scripts/lib/inpage-provider.js
@@ -40,31 +40,37 @@ function MetamaskInpageProvider (connectionStream) {
// start and stop polling to unblock first block lock
self.idMap = {}
- // handle sendAsync requests via asyncProvider
- self.sendAsync = function (payload, cb) {
- // rewrite request ids
- var request = eachJsonMessage(payload, (_message) => {
- const message = Object.assign({}, _message)
- const newId = createRandomId()
- self.idMap[newId] = message.id
- message.id = newId
+}
+
+// handle sendAsync requests via asyncProvider
+// also remap ids inbound and outbound
+MetamaskInpageProvider.prototype.sendAsync = function (payload, cb) {
+ const self = this
+
+ // rewrite request ids
+ const request = eachJsonMessage(payload, (_message) => {
+ const message = Object.assign({}, _message)
+ const newId = createRandomId()
+ self.idMap[newId] = message.id
+ message.id = newId
+ return message
+ })
+
+ // forward to asyncProvider
+ self.asyncProvider.sendAsync(request, (err, _res) => {
+ if (err) return cb(err)
+ // transform messages to original ids
+ const res = eachJsonMessage(_res, (message) => {
+ const oldId = self.idMap[message.id]
+ delete self.idMap[message.id]
+ message.id = oldId
return message
})
- // forward to asyncProvider
- asyncProvider.sendAsync(request, function (err, res) {
- if (err) return cb(err)
- // transform messages to original ids
- eachJsonMessage(res, (message) => {
- var oldId = self.idMap[message.id]
- delete self.idMap[message.id]
- message.id = oldId
- return message
- })
- cb(null, res)
- })
- }
+ cb(null, res)
+ })
}
+
MetamaskInpageProvider.prototype.send = function (payload) {
const self = this
@@ -110,10 +116,6 @@ MetamaskInpageProvider.prototype.send = function (payload) {
}
}
-MetamaskInpageProvider.prototype.sendAsync = function () {
- throw new Error('MetamaskInpageProvider - sendAsync not overwritten')
-}
-
MetamaskInpageProvider.prototype.isConnected = function () {
return true
}