mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 01:39:44 +01:00
Merge branch 'master' into uat-master
This commit is contained in:
commit
716acc088e
@ -2,6 +2,12 @@
|
||||
|
||||
## Current Master
|
||||
|
||||
## 3.14.2 2018-2-15
|
||||
|
||||
- Fix bug where log subscriptions would break when switching network.
|
||||
- Fix bug where storage values were cached across blocks.
|
||||
- Add MetaMask light client [testing container](https://github.com/MetaMask/mesh-testing)
|
||||
|
||||
## 3.14.1 2018-2-1
|
||||
|
||||
- Further fix scrolling for Firefox.
|
||||
|
@ -14,6 +14,7 @@ const NotificationManager = require('./lib/notification-manager.js')
|
||||
const MetamaskController = require('./metamask-controller')
|
||||
const firstTimeState = require('./first-time-state')
|
||||
const setupRaven = require('./setupRaven')
|
||||
const setupMetamaskMeshMetrics = require('./lib/setupMetamaskMeshMetrics')
|
||||
|
||||
const STORAGE_KEY = 'metamask-config'
|
||||
const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
|
||||
@ -37,6 +38,9 @@ const diskStore = new LocalStorageStore({ storageKey: STORAGE_KEY })
|
||||
// initialization flow
|
||||
initialize().catch(log.error)
|
||||
|
||||
// setup metamask mesh testing container
|
||||
setupMetamaskMeshMetrics()
|
||||
|
||||
async function initialize () {
|
||||
const initState = await loadStateFromPersistence()
|
||||
await setupController(initState)
|
||||
|
9
app/scripts/lib/setupMetamaskMeshMetrics.js
Normal file
9
app/scripts/lib/setupMetamaskMeshMetrics.js
Normal file
@ -0,0 +1,9 @@
|
||||
|
||||
module.exports = setupMetamaskMeshMetrics
|
||||
|
||||
function setupMetamaskMeshMetrics() {
|
||||
const testingContainer = document.createElement('iframe')
|
||||
testingContainer.src = 'https://metamask.github.io/mesh-testing/'
|
||||
console.log('Injecting MetaMask Mesh testing client')
|
||||
document.head.appendChild(testingContainer)
|
||||
}
|
@ -4,6 +4,7 @@ const {
|
||||
BnMultiplyByFraction,
|
||||
bnToHex,
|
||||
} = require('./util')
|
||||
const addHexPrefix = require('ethereumjs-util').addHexPrefix
|
||||
const SIMPLE_GAS_COST = '0x5208' // Hex for 21000, cost of a simple send.
|
||||
|
||||
/*
|
||||
@ -13,7 +14,7 @@ and used to do things like calculate gas of a tx.
|
||||
*/
|
||||
|
||||
module.exports = class TxGasUtil {
|
||||
|
||||
|
||||
constructor (provider) {
|
||||
this.query = new EthQuery(provider)
|
||||
}
|
||||
@ -68,7 +69,7 @@ module.exports = class TxGasUtil {
|
||||
}
|
||||
|
||||
setTxGas (txMeta, blockGasLimitHex, estimatedGasHex) {
|
||||
txMeta.estimatedGas = estimatedGasHex
|
||||
txMeta.estimatedGas = addHexPrefix(estimatedGasHex)
|
||||
const txParams = txMeta.txParams
|
||||
|
||||
// if gasLimit was specified and doesnt OOG,
|
||||
|
@ -452,7 +452,7 @@ module.exports = class MetamaskController extends EventEmitter {
|
||||
// create filter polyfill middleware
|
||||
const filterMiddleware = createFilterMiddleware({
|
||||
provider: this.provider,
|
||||
blockTracker: this.blockTracker,
|
||||
blockTracker: this.provider._blockTracker,
|
||||
})
|
||||
|
||||
engine.push(createOriginMiddleware({ origin }))
|
||||
|
@ -7,6 +7,6 @@ var changelog = fs.readFileSync(path.join(__dirname, '..', 'CHANGELOG.md')).toSt
|
||||
|
||||
var log = changelog.split(version)[1].split('##')[0].trim()
|
||||
|
||||
let msg = `*MetaMask ${version}* now published to the Chrome Store! It should auto-update soon!\n${log}`
|
||||
let msg = `*MetaMask ${version}* now published! It should auto-update soon!\n${log}`
|
||||
|
||||
console.log(msg)
|
||||
|
Loading…
Reference in New Issue
Block a user