Merge pull request #203 from ethereum/fixInternalCallTree

Add external call ref to the call tree
pull/7/head
yann300 8 years ago committed by GitHub
commit 61b50aa747
  1. 25
      src/util/internalCallTree.js

@ -4,6 +4,7 @@ var AstWalker = require('./astWalker')
var EventManager = require('../lib/eventManager')
var decodeInfo = require('../solidity/decodeInfo')
var util = require('../helpers/util')
var traceHelper = require('../helpers/traceHelper')
/**
* Tree representing internal jump into function.
@ -107,6 +108,14 @@ async function buildTree (tree, step, scopeId) {
let subScope = 1
tree.scopeStarts[step] = scopeId
tree.scopes[scopeId] = { firstStep: step, locals: {} }
function callDepthChange (step, trace) {
if (step + 1 < trace.length) {
return trace[step].depth !== trace[step + 1].depth
}
return false
}
var currentSourceLocation = {}
while (step < tree.traceManager.trace.length) {
var sourceLocation
@ -124,19 +133,23 @@ async function buildTree (tree, step, scopeId) {
if (!sourceLocation) {
return { outStep: step, error: 'InternalCallTree - No source Location. ' + step }
}
if (sourceLocation.jump === 'i') {
if (traceHelper.isCallInstruction(tree.traceManager.trace[step]) ||
sourceLocation.jump === 'i') {
try {
var result = await buildTree(tree, step + 1, scopeId === '' ? subScope.toString() : scopeId + '.' + subScope)
if (result.error) {
return { outStep: step, error: 'InternalCallTree - ' + result.error }
if (sourceLocation.jump === 'i') {
step++
}
var externalCallResult = await buildTree(tree, step, scopeId === '' ? subScope.toString() : scopeId + '.' + subScope)
if (externalCallResult.error) {
return { outStep: step, error: 'InternalCallTree - ' + externalCallResult.error }
} else {
step = result.outStep
step = externalCallResult.outStep
subScope++
}
} catch (e) {
return { outStep: step, error: 'InternalCallTree - ' + e.message }
}
} else if (sourceLocation.jump === 'o') {
} else if (sourceLocation.jump === 'o' || callDepthChange(step, tree.traceManager.trace)) {
tree.scopes[scopeId].lastStep = step
return { outStep: step + 1 }
} else {

Loading…
Cancel
Save