From afc8967a27645862a8f90a341d0c1c743f2b3fcd Mon Sep 17 00:00:00 2001 From: LeviBarnes Date: Thu, 31 Jan 2019 01:01:08 -0800 Subject: [PATCH 1/6] Passing timestamp from recorder to rawRun --- src/app/tabs/runTab/model/recorder.js | 2 +- src/universal-dapp.js | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) 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 391ce2cf21..930b22b3ef 100644 --- a/src/universal-dapp.js +++ b/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, From a7b4d327c8a5960ad5657d47bcd3b14c0bffa4d7 Mon Sep 17 00:00:00 2001 From: Marutian Date: Tue, 19 Feb 2019 13:16:24 +0900 Subject: [PATCH 3/6] Change copy to clipboard library --- package.json | 2 +- src/app/debugger/debuggerUI/vmDebugger/DropdownPanel.js | 2 +- src/app/tabs/compile-tab.js | 7 ++++++- src/app/ui/copy-to-clipboard.js | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 889dcebcdf..dee59f2d32 100644 --- a/package.json +++ b/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", diff --git a/src/app/debugger/debuggerUI/vmDebugger/DropdownPanel.js b/src/app/debugger/debuggerUI/vmDebugger/DropdownPanel.js index 3b1220a5ed..3517f9920b 100644 --- a/src/app/debugger/debuggerUI/vmDebugger/DropdownPanel.js +++ b/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 diff --git a/src/app/tabs/compile-tab.js b/src/app/tabs/compile-tab.js index 3c26ea539c..0a6a65b96e 100644 --- a/src/app/tabs/compile-tab.js +++ b/src/app/tabs/compile-tab.js @@ -2,7 +2,12 @@ const EventEmitter = require('events') const $ = require('jquery') const yo = require('yo-yo') -const copy = require('clipboard-copy') +const csjs = require('csjs-inject') +const copy = require('copy-text-to-clipboard') +var minixhr = require('minixhr') +var remixTests = require('remix-tests') +var Compiler = require('remix-solidity').Compiler +var CompilerImport = require('../compiler/compiler-imports') var QueryParams = require('../../lib/query-params') const TreeView = require('../ui/TreeView') const modalDialog = require('../ui/modaldialog') diff --git a/src/app/ui/copy-to-clipboard.js b/src/app/ui/copy-to-clipboard.js index bda6acf3a3..af41834bb5 100644 --- a/src/app/ui/copy-to-clipboard.js +++ b/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') @@ -34,4 +34,4 @@ module.exports = function copyToClipboard (getContent, tip = 'Copy value to clip } } return copyIcon -} +} \ No newline at end of file From 1cb9e005ed21f03444e8b3c762ceaeb5629106ab Mon Sep 17 00:00:00 2001 From: Marutian Date: Tue, 19 Feb 2019 16:28:23 +0900 Subject: [PATCH 4/6] Add new line at end of file --- src/app/ui/copy-to-clipboard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/ui/copy-to-clipboard.js b/src/app/ui/copy-to-clipboard.js index af41834bb5..bfcca749e8 100644 --- a/src/app/ui/copy-to-clipboard.js +++ b/src/app/ui/copy-to-clipboard.js @@ -34,4 +34,4 @@ module.exports = function copyToClipboard (getContent, tip = 'Copy value to clip } } return copyIcon -} \ No newline at end of file +} From f2e772f4b21a559901cb8aaec6bb0e852b56feec Mon Sep 17 00:00:00 2001 From: yann300 Date: Wed, 6 Mar 2019 12:03:57 +0100 Subject: [PATCH 5/6] standard --- bin/remix-ide | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bin/remix-ide b/bin/remix-ide index 5b5ed4c7a4..887bab51fa 100755 --- a/bin/remix-ide +++ b/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() From 117141e079fab767dac71e5422da24e6acc4846a Mon Sep 17 00:00:00 2001 From: yann300 Date: Wed, 6 Mar 2019 12:04:37 +0100 Subject: [PATCH 6/6] standard --- src/app/tabs/compile-tab.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/app/tabs/compile-tab.js b/src/app/tabs/compile-tab.js index 0a6a65b96e..1215727adf 100644 --- a/src/app/tabs/compile-tab.js +++ b/src/app/tabs/compile-tab.js @@ -2,12 +2,7 @@ const EventEmitter = require('events') const $ = require('jquery') const yo = require('yo-yo') -const csjs = require('csjs-inject') const copy = require('copy-text-to-clipboard') -var minixhr = require('minixhr') -var remixTests = require('remix-tests') -var Compiler = require('remix-solidity').Compiler -var CompilerImport = require('../compiler/compiler-imports') var QueryParams = require('../../lib/query-params') const TreeView = require('../ui/TreeView') const modalDialog = require('../ui/modaldialog')