Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New exploration stopping condition #1799

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion manticore/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from .utils import config, log
from .utils.log import set_verbosity
from .core.smtlib import issymbolic, istainted
from .ethereum.manticore import ManticoreEVM
from .ethereum.manticore import ManticoreEVM, TermCondCovType
from .core.plugin import Plugin
from .exceptions import ManticoreError

Expand All @@ -17,4 +17,5 @@
ManticoreEVM.__name__,
set_verbosity.__name__,
ManticoreError.__name__,
TermCondCovType.__name__
]
8 changes: 3 additions & 5 deletions manticore/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,6 @@ def positive(value):
help="Maximum number of symbolic transactions to run (positive integer)",
)

eth_flags.add_argument(
"--txnocoverage", action="store_true", help="Do not use coverage as stopping criteria"
)

eth_flags.add_argument(
"--txnoether", action="store_true", help="Do not attempt to send ether to contract"
)
Expand Down Expand Up @@ -209,7 +205,9 @@ def positive(value):
)

eth_flags.add_argument(
"--limit-loops", action="store_true", help="Limit loops depth",
"--limit-loops",
action="store_true",
help="Limit loops depth",
)

eth_flags.add_argument(
Expand Down
2 changes: 1 addition & 1 deletion manticore/ethereum/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Exports (for `from manticore.ethereum import ...`)
from .abi import ABI
from .manticore import ManticoreEVM, config
from .manticore import ManticoreEVM, config, TermCondCovType
from .state import State
from .detectors import (
Detector,
Expand Down
3 changes: 2 additions & 1 deletion manticore/ethereum/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
description="Simply avoid exploring basic blocks that end in a REVERT",
)

from enum import Enum

def get_detectors_classes():
return [
Expand Down Expand Up @@ -134,7 +135,7 @@ def ethereum_main(args, logger):
args.argv[0],
contract_name=args.contract,
tx_limit=args.txlimit,
tx_use_coverage=not args.txnocoverage,
tx_use_coverage=consts.txcoverage,
tx_send_ether=not args.txnoether,
tx_account=args.txaccount,
tx_preconstrain=args.txpreconstrain,
Expand Down
Loading