pull/379/head
yann300 4 years ago
parent bcc19e338e
commit 30062fb309
  1. 4
      apps/remix-ide/src/app.js
  2. 38
      apps/remix-ide/src/app/tabs/debugger-tab.js
  3. 2
      apps/remix-ide/src/app/tabs/test-tab.js
  4. 2
      apps/remix-ide/src/app/ui/landing-page/landing-page.js

@ -371,8 +371,8 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
) )
const analysis = new AnalysisTab(registry) const analysis = new AnalysisTab(registry)
const debug = new DebuggerTab( const debug = new DebuggerTab(
blockchain, blockchain,
registry.get('editor').api, registry.get('editor').api,
registry.get('offsettolinecolumnconverter').api) registry.get('offsettolinecolumnconverter').api)
const test = new TestTab( const test = new TestTab(
registry.get('filemanager').api, registry.get('filemanager').api,

@ -22,7 +22,6 @@ const profile = {
} }
class DebuggerTab extends ViewPlugin { class DebuggerTab extends ViewPlugin {
constructor (blockchain, editor, offsetToLineColumnConverter) { constructor (blockchain, editor, offsetToLineColumnConverter) {
super(profile) super(profile)
this.el = null this.el = null
@ -106,27 +105,22 @@ class DebuggerTab extends ViewPlugin {
async getTrace (hash) { async getTrace (hash) {
if (!hash) return if (!hash) return
try { const web3 = await this.getDebugWeb3()
const web3 = await this.getDebugWeb3() const currentReceipt = await web3.eth.getTransactionReceipt(hash)
const currentReceipt = await web3.eth.getTransactionReceipt(hash) const debug = new Debugger({
const debug = new Debugger({ web3,
web3, offsetToLineColumnConverter: this.offsetToLineColumnConverter,
offsetToLineColumnConverter: this.offsetToLineColumnConverter, compilationResult: async (address) => {
compilationResult: async (address) => { try {
try { return await this.fetchContractAndCompile(address, currentReceipt)
return await this.fetchContractAndCompile(address, currentReceipt) } catch (e) {
} catch (e) { console.error(e)
console.error(e) }
} return null
return null },
}, debugWithGeneratedSources: false
debugWithGeneratedSources: false })
}) return await debug.debugger.traceManager.getTrace(hash)
return await debug.debugger.traceManager.getTrace(hash)
} catch (e) {
throw e
}
} }
fetchContractAndCompile (address, receipt) { fetchContractAndCompile (address, receipt) {

@ -34,7 +34,7 @@ module.exports = class TestTab extends ViewPlugin {
this.readyTestsNumber = 0 this.readyTestsNumber = 0
this.areTestsRunning = false this.areTestsRunning = false
this.defaultPath = 'browser/tests' this.defaultPath = 'browser/tests'
this.offsetToLineColumnConverter = offsetToLineColumnConverter this.offsetToLineColumnConverter = offsetToLineColumnConverter
appManager.event.on('activate', (name) => { appManager.event.on('activate', (name) => {
if (name === 'solidity') this.updateRunAction() if (name === 'solidity') this.updateRunAction()

@ -339,7 +339,7 @@ export class LandingPage extends ViewPlugin {
document.location.reload() document.location.reload()
} }
const img = yo`<img class=${css.logoImg} src="assets/img/guitarRemiCroped.webp" onclick="${() => playRemi()}"></img>` const img = yo`<img class=${css.logoImg} src="assets/img/guitarRemiCroped.webp" onclick="${() => playRemi()}"></img>`
let playRemi = async () => { await document.getElementById('remiAudio').play() } const playRemi = async () => { await document.getElementById('remiAudio').play() }
// to retrieve medium posts // to retrieve medium posts
document.body.appendChild(yo`<script src="https://www.retainable.io/assets/retainable/rss-embed/retainable-rss-embed.js"></script>`) document.body.appendChild(yo`<script src="https://www.retainable.io/assets/retainable/rss-embed/retainable-rss-embed.js"></script>`)
const container = yo` const container = yo`

Loading…
Cancel
Save