Merge pull request #1205 from ethereum/addEtherscanLink

log transaction broadcasted
pull/3094/head
yann300 7 years ago committed by GitHub
commit 82b7526076
  1. 8
      .circleci/config.yml
  2. 3
      src/app.js
  3. 6
      src/app/panels/terminal.js
  4. 8
      src/universal-dapp.js

@ -26,10 +26,10 @@ jobs:
- checkout - checkout
- restore_cache: - restore_cache:
keys: keys:
- dep-bundle-4-{{ checksum "package.json" }} - dep-bundle-5-{{ checksum "package.json" }}
- run: npm install - run: npm install
- save_cache: - save_cache:
key: dep-bundle-4-{{ checksum "package.json" }} key: dep-bundle-5-{{ checksum "package.json" }}
paths: paths:
- ~/repo/node_modules - ~/repo/node_modules
- run: npm run lint && npm run test && npm run downloadsolc && npm run make-mock-compiler && npm run build - run: npm run lint && npm run test && npm run downloadsolc && npm run make-mock-compiler && npm run build
@ -46,10 +46,10 @@ jobs:
- checkout - checkout
- restore_cache: - restore_cache:
keys: keys:
- dep-bundle-4-{{ checksum "package.json" }} - dep-bundle-5-{{ checksum "package.json" }}
- run: npm install - run: npm install
- save_cache: - save_cache:
key: dep-bundle-4-{{ checksum "package.json" }} key: dep-bundle-5-{{ checksum "package.json" }}
paths: paths:
- ~/repo/node_modules - ~/repo/node_modules
- run: npm run build_debugger - run: npm run build_debugger

@ -302,6 +302,9 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
logMessage: (msg) => { logMessage: (msg) => {
self._components.editorpanel.log({ type: 'log', value: msg }) self._components.editorpanel.log({ type: 'log', value: msg })
}, },
logHtmlMessage: (msg) => {
self._components.editorpanel.log({ type: 'html', value: msg })
},
config: self._api.config, config: self._api.config,
detectNetwork: (cb) => { detectNetwork: (cb) => {
executionContext.detectNetwork(cb) executionContext.detectNetwork(cb)

@ -66,6 +66,7 @@ class Terminal {
self._INDEX.allMain = [] self._INDEX.allMain = []
self._INDEX.commands = {} self._INDEX.commands = {}
self._INDEX.commandsMain = {} self._INDEX.commandsMain = {}
self.registerCommand('html', self._blocksRenderer('html'), { activate: true })
self.registerCommand('log', self._blocksRenderer('log'), { activate: true }) self.registerCommand('log', self._blocksRenderer('log'), { activate: true })
self.registerCommand('info', self._blocksRenderer('info'), { activate: true }) self.registerCommand('info', self._blocksRenderer('info'), { activate: true })
self.registerCommand('error', self._blocksRenderer('error'), { activate: true }) self.registerCommand('error', self._blocksRenderer('error'), { activate: true })
@ -448,6 +449,11 @@ class Terminal {
}, 0) }, 0)
} }
_blocksRenderer (mode) { _blocksRenderer (mode) {
if (mode === 'html') {
return function logger (args, scopedCommands, append) {
if (args.length) append(args[0])
}
}
mode = { log: styles.terminal.text_RegularLog, info: styles.terminal.text_InfoLog, error: styles.terminal.text_ErrorLog }[mode] // defaults mode = { log: styles.terminal.text_RegularLog, info: styles.terminal.text_InfoLog, error: styles.terminal.text_ErrorLog }[mode] // defaults
if (mode) { if (mode) {
return function logger (args, scopedCommands, append) { return function logger (args, scopedCommands, append) {

@ -51,6 +51,14 @@ UniversalDApp.prototype.reset = function (contracts, transactionContextAPI) {
executionContext.vm().stateManager.cache.flush(function () {}) executionContext.vm().stateManager.cache.flush(function () {})
} }
this.txRunner = new TxRunner(this.accounts, this._api) this.txRunner = new TxRunner(this.accounts, this._api)
this.txRunner.event.register('transactionBroadcasted', (txhash) => {
this._api.detectNetwork((error, network) => {
if (!error && network) {
var txLink = executionContext.txDetailsLink(network.name, txhash)
if (txLink) this._api.logHtmlMessage(yo`<a href="${txLink}" target="_blank">${txLink}</a>`)
}
})
})
} }
UniversalDApp.prototype.newAccount = function (password, cb) { UniversalDApp.prototype.newAccount = function (password, cb) {

Loading…
Cancel
Save