Merge pull request #1289 from ethereum/fixGettingCompilationResult-Debugger

Fix getting compilation result
pull/1301/head
yann300 3 years ago committed by GitHub
commit a7780b8e47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      apps/debugger/src/app/debugger-api.ts
  2. 12
      libs/remix-debug/src/debugger/VmDebugger.ts
  3. 6
      libs/remix-debug/src/trace/traceHelper.ts

@ -74,8 +74,11 @@ export const DebuggerApiMixin = (Base) => class extends Base {
const targetAddress = target || receipt.contractAddress || receipt.to const targetAddress = target || receipt.contractAddress || receipt.to
const codeAtAddress = await this._web3.eth.getCode(targetAddress) const codeAtAddress = await this._web3.eth.getCode(targetAddress)
const output = await this.call('fetchAndCompile', 'resolve', targetAddress, codeAtAddress, 'browser/.debug') const output = await this.call('fetchAndCompile', 'resolve', targetAddress, codeAtAddress, 'browser/.debug')
if (output) {
return new CompilerAbstract(output.languageversion, output.data, output.source) return new CompilerAbstract(output.languageversion, output.data, output.source)
} }
return null
}
async getDebugWeb3 () { async getDebugWeb3 () {
let web3 let web3

@ -189,7 +189,7 @@ export class VmDebuggerLogic {
}) })
}) })
this.debugger.event.register('indexChanged', this, (index) => { this.debugger.event.register('indexChanged', this, async (index) => {
if (index < 0) return if (index < 0) return
if (this.stepManager.currentStepIndex !== index) return if (this.stepManager.currentStepIndex !== index) return
if (!this.storageResolver) return if (!this.storageResolver) return
@ -201,11 +201,13 @@ export class VmDebuggerLogic {
for (var k in this.addresses) { for (var k in this.addresses) {
var address = this.addresses[k] var address = this.addresses[k]
var storageViewer = new StorageViewer({ stepIndex: this.stepManager.currentStepIndex, tx: this.tx, address: address }, this.storageResolver, this._traceManager) var storageViewer = new StorageViewer({ stepIndex: this.stepManager.currentStepIndex, tx: this.tx, address: address }, this.storageResolver, this._traceManager)
storageViewer.storageRange().then((result) => { try {
storageJSON[address] = result storageJSON[address] = await storageViewer.storageRange()
this.event.trigger('traceStorageUpdate', [storageJSON]) } catch (e) {
}) console.error(e)
} }
}
this.event.trigger('traceStorageUpdate', [storageJSON])
}) })
} }

@ -15,11 +15,11 @@ export function resolveCalledAddress (vmTraceIndex, trace) {
} }
export function isCallInstruction (step) { export function isCallInstruction (step) {
return ['CALL', 'STATICCALL', 'CALLCODE', 'CREATE', 'DELEGATECALL'].includes(step.op) return ['CALL', 'STATICCALL', 'CALLCODE', 'CREATE', 'DELEGATECALL', 'CREATE2'].includes(step.op)
} }
export function isCreateInstruction (step) { export function isCreateInstruction (step) {
return step.op === 'CREATE' return step.op === 'CREATE' || step.op === 'CREATE2'
} }
export function isReturnInstruction (step) { export function isReturnInstruction (step) {
@ -47,7 +47,7 @@ export function isSHA3Instruction (step) {
} }
export function newContextStorage (step) { export function newContextStorage (step) {
return step.op === 'CREATE' || step.op === 'CALL' return step.op === 'CREATE' || step.op === 'CALL' || step.op === 'CREATE2'
} }
export function isCallToPrecompiledContract (index, trace) { export function isCallToPrecompiledContract (index, trace) {

Loading…
Cancel
Save