Merge branch 'master' into feat/rework-mutators

crytic · Sep 5, 2024 · a77fc25 · a77fc25
2 parents 7260ca1 + 4e56d69
commit a77fc25
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 2 deletions.
diff --git a/chain/config/config.go b/chain/config/config.go
@@ -14,6 +14,9 @@ type TestChainConfig struct {
 	// CheatCodeConfig indicates the configuration for EVM cheat codes to use.
 	CheatCodeConfig CheatCodeConfig `json:"cheatCodes"`
 
+	// SkipAccountChecks skips account pre-checks like nonce validation and disallowing non-EOA tx senders (this is done in eth_call, for instance).
+	SkipAccountChecks bool `json:"skipAccountChecks"`
+
 	// ContractAddressOverrides describes contracts that are going to be deployed at deterministic addresses
 	ContractAddressOverrides map[common.Hash]common.Address `json:"contractAddressOverrides,omitempty"`
 }

diff --git a/chain/config/config_defaults.go b/chain/config/config_defaults.go
@@ -10,6 +10,7 @@ func DefaultTestChainConfig() (*TestChainConfig, error) {
 			CheatCodesEnabled: true,
 			EnableFFI:         false,
 		},
+		SkipAccountChecks: true,
 	}
 
 	// Return the generated configuration.

diff --git a/docs/src/project_configuration/chain_config.md b/docs/src/project_configuration/chain_config.md
@@ -9,6 +9,12 @@ The chain configuration defines the parameters for setting up `medusa`'s underly
 - > 🚩 Setting `codeSizeCheckDisabled` to `false` is not recommended since it complicates the fuzz testing process.
 - **Default**: `true`
 
+### `skipAccountChecks`
+
+- **Type**: Boolean
+- **Description**: If `true`, account-related checks (nonce validation, transaction origin must be an EOA) are disabled in `go-ethereum`.
+- **Default**: `true`
+
 ## Cheatcode Configuration
 
 ### `cheatCodesEnabled`

diff --git a/docs/src/static/medusa.json b/docs/src/static/medusa.json
@@ -4,10 +4,12 @@
     "workerResetLimit": 50,
     "timeout": 0,
     "testLimit": 0,
+    "shrinkLimit": 5000,
     "callSequenceLength": 100,
     "corpusDirectory": "",
     "coverageEnabled": true,
     "targetContracts": [],
+    "predeployedContracts": {},
     "targetContractsBalances": [],
     "constructorArgs": {},
     "deployerAddress": "0x30000",
@@ -45,14 +47,17 @@
       "optimizationTesting": {
         "enabled": true,
         "testPrefixes": ["optimize_"]
-      }
+      },
+      "targetFunctionSignatures": [],
+      "excludeFunctionSignatures": []
     },
     "chainConfig": {
       "codeSizeCheckDisabled": true,
       "cheatCodes": {
         "cheatCodesEnabled": true,
         "enableFFI": false
-      }
+      },
+      "skipAccountChecks": true
     }
   },
   "compilation": {

diff --git a/fuzzing/sequence_generator.go b/fuzzing/sequence_generator.go
@@ -341,6 +341,10 @@ func (g *CallSequenceGenerator) generateNewElement() (*calls.CallSequenceElement
 		InputValues: args,
 	})
 
+	if g.worker.fuzzer.config.Fuzzing.TestChainConfig.SkipAccountChecks {
+		msg.SkipAccountChecks = true
+	}
+
 	// Determine our delay values for this element
 	blockNumberDelay := uint64(0)
 	blockTimestampDelay := uint64(0)
@@ -467,6 +471,7 @@ func callSeqGenFuncSpliceAtRandom(provider *rand.Rand, sequenceGenerator func()
 	// Obtain two corpus call sequence entries
 	headSequence, err := sequenceGenerator()
 	if err != nil {
+		return fmt.Errorf("could not obtain tail corpus call sequence for splice-at-random corpus mutation: %v", err)
 	}
 	tailSequence, err := sequenceGenerator()
 	if err != nil {