pass the address to "newSourceLocation" listenners

fixCompilationTargets
yann300 4 years ago
parent e160cdd9a6
commit 0bfcb2b817
  1. 2
      libs/remix-debug/src/debugger/debugger.ts
  2. 9
      libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx

@ -82,7 +82,7 @@ export class Debugger {
} }
} }
var lineColumnPos = this.offsetToLineColumnConverter.offsetToLineColumn(rawLocation, rawLocation.file, sources, astSources) var lineColumnPos = this.offsetToLineColumnConverter.offsetToLineColumn(rawLocation, rawLocation.file, sources, astSources)
this.event.trigger('newSourceLocation', [lineColumnPos, rawLocation, generatedSources]) this.event.trigger('newSourceLocation', [lineColumnPos, rawLocation, generatedSources, address])
} else { } else {
this.event.trigger('newSourceLocation', [null]) this.event.trigger('newSourceLocation', [null])
} }

@ -72,12 +72,11 @@ export const DebuggerUI = (props: DebuggerUIProps) => {
}) })
}) })
debuggerInstance.event.register('newSourceLocation', async (lineColumnPos, rawLocation, generatedSources) => { debuggerInstance.event.register('newSourceLocation', async (lineColumnPos, rawLocation, generatedSources, address) => {
if (!lineColumnPos) return if (!lineColumnPos) return
const contracts = await debuggerModule.fetchContractAndCompile( const contracts = await debuggerModule.fetchContractAndCompile(
currentReceipt.contractAddress || currentReceipt.to, address || currentReceipt.contractAddress || currentReceipt.to,
currentReceipt) currentReceipt)
if (contracts) { if (contracts) {
let path = contracts.getSourceName(rawLocation.file) let path = contracts.getSourceName(rawLocation.file)
if (!path) { if (!path) {
@ -152,7 +151,9 @@ export const DebuggerUI = (props: DebuggerUIProps) => {
offsetToLineColumnConverter: debuggerModule.offsetToLineColumnConverter, offsetToLineColumnConverter: debuggerModule.offsetToLineColumnConverter,
compilationResult: async (address) => { compilationResult: async (address) => {
try { try {
return await debuggerModule.fetchContractAndCompile(address, currentReceipt) const ret = await debuggerModule.fetchContractAndCompile(address, currentReceipt)
console.log('ok', ret)
return ret
} catch (e) { } catch (e) {
console.error(e) console.error(e)
} }

Loading…
Cancel
Save