Merge pull request #819 from MetaMask/i791-FixLosingConnection

Increment tx ids to avoid collisions

Author: kumavis

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Current Master
 
+- Fix bug that would cause MetaMask to occasionally lose its StreamProvider connection and drop requests.
+
 ## 2.13.8 2016-11-16
 
 - Show a warning when a transaction fails during simulation.

app/scripts/lib/idStore.js

@@ -7,7 +7,7 @@ const EthQuery = require('eth-query')
 const KeyStore = require('eth-lightwallet').keystore
 const clone = require('clone')
 const extend = require('xtend')
-const createId = require('web3-provider-engine/util/random-id')
+const createId = require('./random-id')
 const ethBinToOps = require('eth-bin-to-ops')
 const autoFaucet = require('./auto-faucet')
 const messageManager = require('./message-manager')

app/scripts/lib/inpage-provider.js

@@ -2,6 +2,7 @@ const Streams = require('mississippi')
 const StreamProvider = require('web3-stream-provider')
 const ObjectMultiplex = require('./obj-multiplex')
 const RemoteStore = require('./remote-store.js').RemoteStore
+const createRandomId = require('./random-id')
 
 module.exports = MetamaskInpageProvider
 
@@ -119,16 +120,6 @@ function remoteStoreWithLocalStorageCache (storageKey) {
   return store
 }
 
-function createRandomId(){
-  const extraDigits = 3
-  // 13 time digits
-  const datePart = new Date().getTime() * Math.pow(10, extraDigits)
-  // 3 random digits
-  const extraPart = Math.floor(Math.random() * Math.pow(10, extraDigits))
-  // 16 digits
-  return datePart + extraPart
-}
-
 function eachJsonMessage(payload, transformFn){
   if (Array.isArray(payload)) {
     return payload.map(transformFn)

app/scripts/lib/random-id.js

@@ -0,0 +1,9 @@
+const MAX = 1000000000
+
+let idCounter = Math.round( Math.random() * MAX )
+function createRandomId() {
+  idCounter = idCounter % MAX
+  return idCounter++
+}
+
+module.exports = createRandomId