m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge branch 'master' into nonce-tracker

Browse Source
This commit is contained in:
frankiebee 2017-07-12 15:10:58 -07:00
commit 751103d948
5 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -5,6 +5,10 @@
- No longer validate nonce client-side in retry loop.
- Fix bug where insufficient balance error was sometimes shown on successful transactions.
## 3.8.5 2017-7-7
- Fix transaction resubmit logic to fail slightly less eagerly.
## 3.8.4 2017-7-7
- Improve transaction resubmit logic to fail more eagerly when a user would expect it to.

2
app/manifest.json
View File

@ -1,7 +1,7 @@
{
"name": "MetaMask",
"short_name": "Metamask",
"version": "3.8.4",
"version": "3.8.5",
"manifest_version": 2,
"author": "https://metamask.io",
"description": "Ethereum Browser Extension",

2
app/scripts/metamask-controller.js
View File

@ -366,7 +366,7 @@ module.exports = class MetamaskController extends EventEmitter {
function onResponse (err, request, response) {
if (err) return console.error(err)
if (response.error) {
console.error('Error in RPC response:\n', response.error)
console.error('Error in RPC response:\n', response)
}
if (request.isMetamaskInternal) return
log.info(`RPC (${originDomain}):`, request, '->', response)

2
package.json
View File

@ -125,7 +125,7 @@
"valid-url": "^1.0.9",
"vreme": "^3.0.2",
"web3": "0.19.1",
"web3-provider-engine": "^13.1.1",
"web3-provider-engine": "^13.2.8",
"web3-stream-provider": "^3.0.1",
"xtend": "^4.0.1"
},

66
test/unit/infura-controller-test.js
View File

@ -1,34 +1,34 @@
// polyfill fetch
global.fetch = function () {return Promise.resolve({
json: () => { return Promise.resolve({"mainnet": "ok", "ropsten": "degraded", "kovan": "down", "rinkeby": "ok"}) },
})
}
const assert = require('assert')
const InfuraController = require('../../app/scripts/controllers/infura')
describe('infura-controller', function () {
var infuraController
beforeEach(function () {
infuraController = new InfuraController()
})
describe('network status queries', function () {
describe('#checkInfuraNetworkStatus', function () {
it('should return an object reflecting the network statuses', function (done) {
this.timeout(15000)
infuraController.checkInfuraNetworkStatus()
.then(() => {
const networkStatus = infuraController.store.getState().infuraNetworkStatus
assert.equal(Object.keys(networkStatus).length, 4)
assert.equal(networkStatus.mainnet, 'ok')
assert.equal(networkStatus.ropsten, 'degraded')
assert.equal(networkStatus.kovan, 'down')
})
.then(() => done())
.catch(done)
})
})
})
})
// global.fetch = function () {return Promise.resolve({
// json: () => { return Promise.resolve({"mainnet": "ok", "ropsten": "degraded", "kovan": "down", "rinkeby": "ok"}) },
// })
// }
// const assert = require('assert')
// const InfuraController = require('../../app/scripts/controllers/infura')
//
// describe('infura-controller', function () {
// var infuraController
//
// beforeEach(function () {
// infuraController = new InfuraController()
// })
//
// describe('network status queries', function () {
// describe('#checkInfuraNetworkStatus', function () {
// it('should return an object reflecting the network statuses', function (done) {
// this.timeout(15000)
// infuraController.checkInfuraNetworkStatus()
// .then(() => {
// const networkStatus = infuraController.store.getState().infuraNetworkStatus
// assert.equal(Object.keys(networkStatus).length, 4)
// assert.equal(networkStatus.mainnet, 'ok')
// assert.equal(networkStatus.ropsten, 'degraded')
// assert.equal(networkStatus.kovan, 'down')
// })
// .then(() => done())
// .catch(done)
//
// })
// })
// })
// })