From bc43059ec1da3404c5ab1b2e5493efce0a1263fb Mon Sep 17 00:00:00 2001
From: LeviBarnes <levi.barnes@gmail.com>
Date: Thu, 31 Jan 2019 01:01:08 -0800
Subject: [PATCH 1/3] Passing timestamp from recorder to rawRun

---
 package.json                          | 5 +++--
 src/app/tabs/runTab/model/recorder.js | 2 +-
 src/universal-dapp.js                 | 5 ++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 31624ddaa8..91dd93b6d7 100644
--- a/package.json
+++ b/package.json
@@ -60,8 +60,9 @@
     "yo-yoify": "^3.7.3"
   },
   "dependencies": {
-    "http-server": "0.9.0",
-    "remixd": "0.1.8-alpha.6"
+    "http-server": "^0.11.1",
+    "remixd": "0.1.8-alpha.6",
+    "scrypt": "^6.0.3"
   },
   "repository": {
     "type": "git",
diff --git a/src/app/tabs/runTab/model/recorder.js b/src/app/tabs/runTab/model/recorder.js
index 9875c4ad35..8f1e994438 100644
--- a/src/app/tabs/runTab/model/recorder.js
+++ b/src/app/tabs/runTab/model/recorder.js
@@ -251,7 +251,7 @@ class Recorder {
       } else {
         logCallBack(`(${index}) ${JSON.stringify(record, null, '\t')}`)
         logCallBack(`(${index}) data: ${data.data}`)
-        record.data = { dataHex: data.data, funArgs: tx.record.parameters, funAbi: fnABI, contractBytecode: tx.record.bytecode, contractName: tx.record.contractName }
+        record.data = { dataHex: data.data, funArgs: tx.record.parameters, funAbi: fnABI, contractBytecode: tx.record.bytecode, contractName: tx.record.contractName, timestamp: tx.timestamp }
       }
       self.udapp.runTx(record, confirmationCb, continueCb, promptCb,
         function (err, txResult) {
diff --git a/src/universal-dapp.js b/src/universal-dapp.js
index 3342478c60..fe6aa7d0f4 100644
--- a/src/universal-dapp.js
+++ b/src/universal-dapp.js
@@ -274,9 +274,12 @@ UniversalDApp.prototype.runTx = function (args, confirmationCb, continueCb, prom
       })
     },
     function runTransaction (fromAddress, value, gasLimit, next) {
-      var tx = { to: args.to, data: args.data.dataHex, useCall: args.useCall, from: fromAddress, value: value, gasLimit: gasLimit }
+      var tx = { to: args.to, data: args.data.dataHex, useCall: args.useCall, from: fromAddress, value: value, gasLimit: gasLimit, timestamp: args.data.timestamp }
       var payLoad = { funAbi: args.data.funAbi, funArgs: args.data.funArgs, contractBytecode: args.data.contractBytecode, contractName: args.data.contractName, contractABI: args.data.contractABI, linkReferences: args.data.linkReferences }
       var timestamp = Date.now()
+      if (tx.timestamp) {
+        timestamp = tx.timestamp
+      }
 
       self.event.trigger('initiatingTransaction', [timestamp, tx, payLoad])
       self.txRunner.rawRun(tx, confirmationCb, continueCb, promptCb,

From ade4d2b6fb5a181bb1e1187304e612218e2fd445 Mon Sep 17 00:00:00 2001
From: LeviBarnes <levi.barnes@gmail.com>
Date: Thu, 31 Jan 2019 01:05:34 -0800
Subject: [PATCH 2/3] Reverting package.json changes

---
 package.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 91dd93b6d7..410e782552 100644
--- a/package.json
+++ b/package.json
@@ -60,9 +60,8 @@
     "yo-yoify": "^3.7.3"
   },
   "dependencies": {
-    "http-server": "^0.11.1",
+    "http-server": "0.9.0",
     "remixd": "0.1.8-alpha.6",
-    "scrypt": "^6.0.3"
   },
   "repository": {
     "type": "git",

From a93d16c2ffba8da8c06900c5bd3d42c217cbf091 Mon Sep 17 00:00:00 2001
From: LeviBarnes <levi.barnes@gmail.com>
Date: Thu, 31 Jan 2019 01:07:26 -0800
Subject: [PATCH 3/3] Comma

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 410e782552..31624ddaa8 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
   },
   "dependencies": {
     "http-server": "0.9.0",
-    "remixd": "0.1.8-alpha.6",
+    "remixd": "0.1.8-alpha.6"
   },
   "repository": {
     "type": "git",