From f229d32442f34859be169e38a42ffecdfb8fc48a Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 17 Nov 2016 13:49:46 -0800
Subject: Replace old random-id code with incrementing id generator

---
 app/scripts/keyring-controller.js  |  3 ++-
 app/scripts/lib/inpage-provider.js | 11 +----------
 app/scripts/lib/random-id.js       |  9 +++++++++
 3 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 app/scripts/lib/random-id.js

(limited to 'app/scripts')

diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 3ebf02c44..5b06de690 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -7,7 +7,6 @@ const ethBinToOps = require('eth-bin-to-ops')
 const EthQuery = require('eth-query')
 const BN = ethUtil.BN
 const Transaction = require('ethereumjs-tx')
-const createId = require('web3-provider-engine/util/random-id')
 const autoFaucet = require('./lib/auto-faucet')
 const bip39 = require('bip39')
 
@@ -22,6 +21,8 @@ const keyringTypes = [
   HdKeyring,
 ]
 
+const createId = require('./lib/random-id')
+
 module.exports = class KeyringController extends EventEmitter {
 
   constructor (opts) {
diff --git a/app/scripts/lib/inpage-provider.js b/app/scripts/lib/inpage-provider.js
index 052a8f5fe..f1ba2e0ed 100644
--- a/app/scripts/lib/inpage-provider.js
+++ b/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)
diff --git a/app/scripts/lib/random-id.js b/app/scripts/lib/random-id.js
new file mode 100644
index 000000000..3c5ae5600
--- /dev/null
+++ b/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
-- 
cgit