Commit bc43059e authored by LeviBarnes's avatar LeviBarnes

Passing timestamp from recorder to rawRun

parent e5469454
...@@ -60,8 +60,9 @@ ...@@ -60,8 +60,9 @@
"yo-yoify": "^3.7.3" "yo-yoify": "^3.7.3"
}, },
"dependencies": { "dependencies": {
"http-server": "0.9.0", "http-server": "^0.11.1",
"remixd": "0.1.8-alpha.6" "remixd": "0.1.8-alpha.6",
"scrypt": "^6.0.3"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
......
...@@ -251,7 +251,7 @@ class Recorder { ...@@ -251,7 +251,7 @@ class Recorder {
} else { } else {
logCallBack(`(${index}) ${JSON.stringify(record, null, '\t')}`) logCallBack(`(${index}) ${JSON.stringify(record, null, '\t')}`)
logCallBack(`(${index}) data: ${data.data}`) 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, self.udapp.runTx(record, confirmationCb, continueCb, promptCb,
function (err, txResult) { function (err, txResult) {
......
...@@ -274,9 +274,12 @@ UniversalDApp.prototype.runTx = function (args, confirmationCb, continueCb, prom ...@@ -274,9 +274,12 @@ UniversalDApp.prototype.runTx = function (args, confirmationCb, continueCb, prom
}) })
}, },
function runTransaction (fromAddress, value, gasLimit, next) { 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 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() var timestamp = Date.now()
if (tx.timestamp) {
timestamp = tx.timestamp
}
self.event.trigger('initiatingTransaction', [timestamp, tx, payLoad]) self.event.trigger('initiatingTransaction', [timestamp, tx, payLoad])
self.txRunner.rawRun(tx, confirmationCb, continueCb, promptCb, self.txRunner.rawRun(tx, confirmationCb, continueCb, promptCb,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment