fix: use signature in traces to handle overloaded function names (#336)

* fix: use signature in traces to handle overloaded function names * fix test --------- Co-authored-by: anishnaik <[email protected]>
crytic · Mar 25, 2024 · 382f7f2 · 382f7f2
1 parent da11676
commit 382f7f2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/fuzzing/calls/call_sequence.go b/fuzzing/calls/call_sequence.go
@@ -3,6 +3,8 @@ package calls
 import (
 	"encoding/binary"
 	"fmt"
+	"strconv"
+
 	"github.com/crytic/medusa/chain"
 	chainTypes "github.com/crytic/medusa/chain/types"
 	fuzzingTypes "github.com/crytic/medusa/fuzzing/contracts"
@@ -13,7 +15,6 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
-	"strconv"
 )
 
 // CallSequence describes a sequence of calls sent to a chain.
@@ -230,7 +231,7 @@ func (cse *CallSequenceElement) String() string {
 	method, err := cse.Method()
 	methodName := "<unresolved method>"
 	if err == nil && method != nil {
-		methodName = method.Name
+		methodName = method.Sig
 	}
 
 	// Next decode our arguments (we jump four bytes to skip the function selector)

diff --git a/fuzzing/executiontracer/execution_trace.go b/fuzzing/executiontracer/execution_trace.go
@@ -3,6 +3,9 @@ package executiontracer
 import (
 	"encoding/hex"
 	"fmt"
+	"regexp"
+	"strings"
+
 	"github.com/crytic/medusa/chain"
 	"github.com/crytic/medusa/compilation/abiutils"
 	"github.com/crytic/medusa/fuzzing/contracts"
@@ -12,8 +15,6 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	coreTypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/core/vm"
-	"regexp"
-	"strings"
 )
 
 // ExecutionTrace contains information recorded by an ExecutionTracer. It contains information about each call
@@ -77,7 +78,7 @@ func (t *ExecutionTrace) generateCallFrameEnterElements(callFrame *CallFrame) ([
 		} else {
 			method, err = callFrame.CodeContractAbi.MethodById(callFrame.InputData)
 			if err == nil {
-				methodName = method.Name
+				methodName = method.Sig
 			}
 		}
 	}

diff --git a/fuzzing/fuzzer_test.go b/fuzzing/fuzzer_test.go
@@ -2,15 +2,16 @@ package fuzzing
 
 import (
 	"encoding/hex"
+	"math/big"
+	"math/rand"
+	"testing"
+
 	"github.com/crytic/medusa/chain"
 	"github.com/crytic/medusa/events"
 	"github.com/crytic/medusa/fuzzing/calls"
 	"github.com/crytic/medusa/fuzzing/valuegeneration"
 	"github.com/crytic/medusa/utils"
 	"github.com/ethereum/go-ethereum/common"
-	"math/big"
-	"math/rand"
-	"testing"
 
 	"github.com/crytic/medusa/fuzzing/config"
 	"github.com/stretchr/testify/assert"
@@ -461,7 +462,7 @@ func TestDeploymentsSelfDestruct(t *testing.T) {
 func TestExecutionTraces(t *testing.T) {
 	expectedMessagesPerTest := map[string][]string{
 		"testdata/contracts/execution_tracing/call_and_deployment_args.sol": {"Hello from deployment args!", "Hello from call args!"},
-		"testdata/contracts/execution_tracing/cheatcodes.sol":               {"StdCheats.toString(true)"},
+		"testdata/contracts/execution_tracing/cheatcodes.sol":               {"StdCheats.toString(bool)(true)"},
 		"testdata/contracts/execution_tracing/event_emission.sol":           {"TestEvent", "TestIndexedEvent", "TestMixedEvent", "Hello from event args!", "Hello from library event args!"},
 		"testdata/contracts/execution_tracing/proxy_call.sol":               {"TestContract -> InnerDeploymentContract.setXY", "Hello from proxy call args!"},
 		"testdata/contracts/execution_tracing/revert_custom_error.sol":      {"CustomError", "Hello from a custom error!"},