Merge pull request #1743 from ethereum/swap_it_sync_master

Swap it [sync to head]

bin/remix-ide

@@ -1,19 +1,20 @@
 #!/usr/bin/env node
+var path = require('path')
 var httpServer = require('http-server')
 var remixd = require('remixd')
 
 var server = httpServer.createServer({
-    root: __dirname + '/../'
+  root: path.join(__dirname, '/../')
 })
 
 var folder = process.argv.length > 2 ? process.argv[2] : process.cwd()
 
 server.listen(8080, '127.0.0.1', function () {})
 var router = new remixd.Router(65520, remixd.services.sharedFolder, { remixIdeUrl: 'http://localhost:8080' }, (webSocket) => {
-    remixd.services.sharedFolder.setWebSocket(webSocket)
-    remixd.services.sharedFolder.setupNotifications(folder)
-    remixd.services.sharedFolder.sharedFolder(folder, false)
-  })
+  remixd.services.sharedFolder.setWebSocket(webSocket)
+  remixd.services.sharedFolder.setupNotifications(folder)
+  remixd.services.sharedFolder.sharedFolder(folder, false)
+})
 
 router.start()
 

package.json

@@ -17,8 +17,8 @@
     "babelify": "^7.3.0",
     "brace": "^0.8.0",
     "browserify-reload": "^1.0.3",
-    "clipboard-copy": "^1.2.0",
     "component-type": "^1.2.1",
+    "copy-text-to-clipboard": "^1.0.4",
     "csjs-inject": "^1.0.1",
     "csslint": "^1.0.2",
     "deep-equal": "^1.0.1",

src/app/debugger/debuggerUI/vmDebugger/DropdownPanel.js

@@ -1,6 +1,6 @@
 'use strict'
 var yo = require('yo-yo')
-const copy = require('clipboard-copy')
+const copy = require('copy-text-to-clipboard')
 var EventManager = require('../../../../lib/events')
 var TreeView = require('../../../ui/TreeView') // TODO setup a direct reference to the UI components
 

src/app/tabs/compile-tab.js

@@ -2,7 +2,7 @@
 const EventEmitter = require('events')
 const $ = require('jquery')
 const yo = require('yo-yo')
-const copy = require('clipboard-copy')
+const copy = require('copy-text-to-clipboard')
 var QueryParams = require('../../lib/query-params')
 const TreeView = require('../ui/TreeView')
 const modalDialog = require('../ui/modaldialog')

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/app/ui/copy-to-clipboard.js

@@ -1,6 +1,6 @@
 var yo = require('yo-yo')
 // -------------- copyToClipboard ----------------------
-const copy = require('clipboard-copy')
+const copy = require('copy-text-to-clipboard')
 var addTooltip = require('./tooltip')
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')

src/universal-dapp.js

@@ -326,9 +326,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,