Merge pull request #1682 from LeviBarnes/master

Pass timestamp to txRunner.rawRun

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) {

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,