|
|
|
@ -224,7 +224,7 @@ async function buildTree (tree, step, scopeId, isExternalCall, isCreation) { |
|
|
|
// if not, we are in the current scope.
|
|
|
|
// if not, we are in the current scope.
|
|
|
|
// We check in `includeVariableDeclaration` if there is a new local variable in scope for this specific `step`
|
|
|
|
// We check in `includeVariableDeclaration` if there is a new local variable in scope for this specific `step`
|
|
|
|
if (tree.includeLocalVariables) { |
|
|
|
if (tree.includeLocalVariables) { |
|
|
|
includeVariableDeclaration(tree, step, sourceLocation, scopeId, newLocation, previousSourceLocation) |
|
|
|
await includeVariableDeclaration(tree, step, sourceLocation, scopeId, newLocation, previousSourceLocation) |
|
|
|
} |
|
|
|
} |
|
|
|
previousSourceLocation = sourceLocation |
|
|
|
previousSourceLocation = sourceLocation |
|
|
|
step++ |
|
|
|
step++ |
|
|
|
@ -249,32 +249,36 @@ async function includeVariableDeclaration (tree, step, sourceLocation, scopeId, |
|
|
|
const contractObj = await tree.solidityProxy.contractObjectAt(step) |
|
|
|
const contractObj = await tree.solidityProxy.contractObjectAt(step) |
|
|
|
let states = null |
|
|
|
let states = null |
|
|
|
const generatedSources = getGeneratedSources(tree, scopeId, contractObj) |
|
|
|
const generatedSources = getGeneratedSources(tree, scopeId, contractObj) |
|
|
|
|
|
|
|
const variableDeclarations = resolveVariableDeclaration(tree, sourceLocation, generatedSources) |
|
|
|
const variableDeclaration = resolveVariableDeclaration(tree, sourceLocation, generatedSources) |
|
|
|
|
|
|
|
// using the vm trace step, the current source location and the ast,
|
|
|
|
// using the vm trace step, the current source location and the ast,
|
|
|
|
// we check if the current vm trace step target a new ast node of type VariableDeclaration
|
|
|
|
// we check if the current vm trace step target a new ast node of type VariableDeclaration
|
|
|
|
// that way we know that there is a new local variable from here.
|
|
|
|
// that way we know that there is a new local variable from here.
|
|
|
|
if (variableDeclaration && !tree.scopes[scopeId].locals[variableDeclaration.name]) { |
|
|
|
if (variableDeclarations && variableDeclarations.length) { |
|
|
|
try { |
|
|
|
for (const variableDeclaration of variableDeclarations) { |
|
|
|
const stack = tree.traceManager.getStackAt(step) |
|
|
|
if (variableDeclaration && !tree.scopes[scopeId].locals[variableDeclaration.name]) { |
|
|
|
// the stack length at this point is where the value of the new local variable will be stored.
|
|
|
|
try { |
|
|
|
// so, either this is the direct value, or the offset in memory. That depends on the type.
|
|
|
|
const stack = tree.traceManager.getStackAt(step) |
|
|
|
if (variableDeclaration.name !== '') { |
|
|
|
// the stack length at this point is where the value of the new local variable will be stored.
|
|
|
|
states = tree.solidityProxy.extractStatesDefinitions() |
|
|
|
// so, either this is the direct value, or the offset in memory. That depends on the type.
|
|
|
|
var location = extractLocationFromAstVariable(variableDeclaration) |
|
|
|
if (variableDeclaration.name !== '') { |
|
|
|
location = location === 'default' ? 'storage' : location |
|
|
|
states = tree.solidityProxy.extractStatesDefinitions() |
|
|
|
// we push the new local variable in our tree
|
|
|
|
var location = extractLocationFromAstVariable(variableDeclaration) |
|
|
|
tree.scopes[scopeId].locals[variableDeclaration.name] = { |
|
|
|
location = location === 'default' ? 'storage' : location |
|
|
|
name: variableDeclaration.name, |
|
|
|
// we push the new local variable in our tree
|
|
|
|
type: parseType(variableDeclaration.typeDescriptions.typeString, states, contractObj.name, location), |
|
|
|
tree.scopes[scopeId].locals[variableDeclaration.name] = { |
|
|
|
stackDepth: stack.length, |
|
|
|
name: variableDeclaration.name, |
|
|
|
sourceLocation: sourceLocation |
|
|
|
type: parseType(variableDeclaration.typeDescriptions.typeString, states, contractObj.name, location), |
|
|
|
|
|
|
|
stackDepth: stack.length, |
|
|
|
|
|
|
|
sourceLocation: sourceLocation |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} catch (error) { |
|
|
|
|
|
|
|
console.log(error) |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} catch (error) { |
|
|
|
|
|
|
|
console.log(error) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// we check here if we are at the beginning inside a new function.
|
|
|
|
// we check here if we are at the beginning inside a new function.
|
|
|
|
// if that is the case, we have to add to locals tree the inputs and output params
|
|
|
|
// if that is the case, we have to add to locals tree the inputs and output params
|
|
|
|
const functionDefinition = resolveFunctionDefinition(tree, previousSourceLocation, generatedSources) |
|
|
|
const functionDefinition = resolveFunctionDefinition(tree, previousSourceLocation, generatedSources) |
|
|
|
@ -351,8 +355,10 @@ function extractVariableDeclarations (ast, astWalker) { |
|
|
|
const ret = {} |
|
|
|
const ret = {} |
|
|
|
astWalker.walkFull(ast, (node) => { |
|
|
|
astWalker.walkFull(ast, (node) => { |
|
|
|
if (node.nodeType === 'VariableDeclaration' || node.nodeType === 'YulVariableDeclaration') { |
|
|
|
if (node.nodeType === 'VariableDeclaration' || node.nodeType === 'YulVariableDeclaration') { |
|
|
|
ret[node.src] = node |
|
|
|
ret[node.src] = [node] |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
const hasChild = node.initialValue && (node.nodeType === 'VariableDeclarationStatement' || node.nodeType === 'YulVariableDeclarationStatement') |
|
|
|
|
|
|
|
if (hasChild) ret[node.initialValue.src] = node.declarations |
|
|
|
}) |
|
|
|
}) |
|
|
|
return ret |
|
|
|
return ret |
|
|
|
} |
|
|
|
} |
|
|
|
|
yann300
4 years ago
committed by
GitHub