fix nested function

Author: ci-bot

libs/remix-debug/src/solidity-decoder/internalCallTree.ts

@@ -676,10 +676,12 @@ async function buildTree (tree: InternalCallTree, step, scopeId, isCreation, fun
   let previousValidSourceLocation = validSourceLocation || currentSourceLocation
   let compilationResult: CompilerAbstract
   let currentAddress = ''
+  let firstExecutionStep = true
   while (step < tree.traceManager.trace.length) {
     let sourceLocation
     let validSourceLocation
     let address
+    let isInvalidSource = false
 
     try {
       address = tree.traceManager.getCurrentCalledAddressAt(step)
@@ -696,7 +698,8 @@ async function buildTree (tree: InternalCallTree, step, scopeId, isCreation, fun
         }
       }
       const amountOfSources = tree.sourceLocationTracker.getTotalAmountOfSources(address, compilationResult.data.contracts)
-      if (tree.sourceLocationTracker.isInvalidSourceLocation(currentSourceLocation, amountOfSources)) { // file is -1 or greater than amount of sources
+      isInvalidSource = tree.sourceLocationTracker.isInvalidSourceLocation(currentSourceLocation, amountOfSources)
+      if (isInvalidSource) { // file is -1 or greater than amount of sources
         validSourceLocation = previousValidSourceLocation
       } else
         validSourceLocation = currentSourceLocation
@@ -763,16 +766,19 @@ async function buildTree (tree: InternalCallTree, step, scopeId, isCreation, fun
     // check if there is a function at destination - but only for AST node resolution
     const contractObj = await tree.solidityProxy.contractObjectAtAddress(address)
     const generatedSources = getGeneratedSources(tree, scopeId, contractObj)
-    const { nodes, blocksDefinition } = await resolveNodesAtSourceLocation(tree, sourceLocation, generatedSources, address)
-
-    functionDefinition = await resolveFunctionDefinition(tree, sourceLocation, generatedSources, address)
+    const { nodes, blocksDefinition, functionDefinition } = await resolveNodesAtSourceLocation(tree, sourceLocation, generatedSources, address)
 
     if (!tree.scopes[scopeId].functionDefinition && stepDetail.op === 'JUMPDEST' && functionDefinition && (tree.scopes[scopeId].firstStep === step - 1 || tree.scopes[scopeId].firstStep === step - 2)) {
       tree.scopes[scopeId].functionDefinition = functionDefinition
       tree.scopes[scopeId].lowLevelScope = false
       await registerFunctionParameters(tree, functionDefinition, step - 1, scopeId, contractObj, previousSourceLocation, address)
     }
 
+    // if the first step of the execution leads to invalid source (generated code), we consider it a low level scope.
+    if (firstExecutionStep && isInvalidSource) {
+      tree.scopes[scopeId].lowLevelScope = true
+    }
+
     // Update symbolic stack based on opcode execution
     const previousSymbolicStack = tree.symbolicStackManager.getStackAtStep(step)
     if (tree.debug && stepDetail.stack.length !== previousSymbolicStack.length) {
@@ -888,6 +894,7 @@ async function buildTree (tree: InternalCallTree, step, scopeId, isCreation, fun
       previousValidSourceLocation = validSourceLocation
       step++
     }
+    if (firstExecutionStep) firstExecutionStep = false
   }
   return { outStep: step }
 }

libs/remix-debug/test/decoder/localsTests/parameterTypes.ts

@@ -4,7 +4,6 @@ import * as helper from './helper'
 const { ethers } = require('ethers')
 
 module.exports = async function (st, privateKey, contractBytecode, compilationResult, contractCode) {
-  st.plan(26)
   const enableCtorTest = false
   // Test scenarios with expected parameter values
   const testCases = [
@@ -53,11 +52,13 @@ module.exports = async function (st, privateKey, contractBytecode, compilationRe
     {
       name: 'create2Test',
       signature: 'create2Test(uint256,string,bytes32)',
-      params: [555, 'Create2Test', '0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef'],
+      params: [555, 'Create2Test', '0x1234567890ABCDEF1234567890ABCDEF1234567890ABCDEF1234567890ABCDEF'],
       description: 'CREATE2 operation parameters'
     }
   ]
 
+  st.plan((testCases.length * 3) + 2 + 2 + 1) // 2 Additional tests for internalCallTest + 2 Additional tests for thisCallTest + 1 Additional test for create2Test (salt param)
+
   // Helper function to encode parameters
   function encodeParams(signature: string, params: any[]): string {
     // Use ethers interface to encode function call
@@ -68,7 +69,6 @@ module.exports = async function (st, privateKey, contractBytecode, compilationRe
 
   // Helper function to find scope by function name and get its firstStep
   function findFunctionScope(nestedScopes: NestedScope[], functionName: string): { scope: NestedScope, firstStep: number } | null {
-    let foundDuplicate = false // TODO this needs to be fixed, there are always 2 nodes for a single function call
     function traverse(scope: NestedScope, parentFirstStep?: number): { scope: NestedScope, firstStep: number } | null {
       // Check if this scope matches our function
       if (scope.functionDefinition?.name === functionName || scope.functionDefinition?.kind === functionName) {
@@ -80,8 +80,7 @@ module.exports = async function (st, privateKey, contractBytecode, compilationRe
       if (scope.children) {
         for (const child of scope.children) {
           const result = traverse(child, scope.firstStep || parentFirstStep)
-          if (result && foundDuplicate) return result
-          if (result) foundDuplicate = true
+          if (result) return result
         }
       }
 
@@ -108,7 +107,7 @@ module.exports = async function (st, privateKey, contractBytecode, compilationRe
         await helper.setupDebugger(privateKey, deployBytecode, compilationResult, contractCode)
 
       const { scopes: deployScopes, scopeStarts: deployScopeStarts } = await waitForDeployCallTree()
-      const deployNestedScopes: NestedScope[] = deployCallTree.getScopesAsNestedJSON()
+      const deployNestedScopes: NestedScope[] = deployCallTree.getScopesAsNestedJSON('nojump')
 
       console.log(deployNestedScopes)
 
@@ -165,7 +164,7 @@ module.exports = async function (st, privateKey, contractBytecode, compilationRe
       )
 
       const { scopes, scopeStarts } = await waitForCallTree()
-      const nestedScopes: NestedScope[] = callTree.getScopesAsNestedJSON()
+      const nestedScopes: NestedScope[] = callTree.getScopesAsNestedJSON('nojump')
 
       // Find the target function scope
       const functionScope = findFunctionScope(nestedScopes, testCase.name)
@@ -220,6 +219,16 @@ module.exports = async function (st, privateKey, contractBytecode, compilationRe
             }
           }
 
+          if (testCase.signature.includes('bytes32')) {
+            const stringParamNames = ['_salt']
+            const expectedBytes32Param = stringParamNames.find(name => locals[name])
+
+            if (expectedBytes32Param) {
+              st.equals(locals[expectedBytes32Param].value, testCase.params[2],
+                `${testCase.name}: bytes32 parameter should be decoded correctly`)
+            }
+          }
+
           st.ok(Object.keys(locals).length > 0, `${testCase.name}: Should have decoded local variables`)
         })