diff --git a/docs/api.rst b/docs/api.rst index 659faf7..6b50e18 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -40,10 +40,11 @@ Models EVM --- .. automodule:: manticore.platforms.evm -.. automodule:: manticore.seth - :members: +.. automodule:: manticore.ethereum + :members: + EVM Assembler ---------- +------------- .. autoclass:: manticore.platforms.evm::EVMAsm.Instruction :members: .. autoclass:: manticore.platforms.evm.EVMAsm diff --git a/examples/evm/coverage.py b/examples/evm/coverage.py index dc2c122..a8fcb7d 100644 --- a/examples/evm/coverage.py +++ b/examples/evm/coverage.py @@ -1,4 +1,4 @@ -from manticore.seth import ManticoreEVM +from manticore.ethereum import ManticoreEVM m = ManticoreEVM() m.verbosity(3) diff --git a/examples/evm/minimal.py b/examples/evm/minimal.py index 1170339..2339e30 100644 --- a/examples/evm/minimal.py +++ b/examples/evm/minimal.py @@ -1,4 +1,4 @@ -from manticore.seth import ManticoreEVM +from manticore.ethereum import ManticoreEVM ################ Script ####################### m = ManticoreEVM() diff --git a/examples/evm/reentrancy_concrete.py b/examples/evm/reentrancy_concrete.py index c4a9b74..09b3793 100644 --- a/examples/evm/reentrancy_concrete.py +++ b/examples/evm/reentrancy_concrete.py @@ -1,4 +1,4 @@ -from manticore.seth import ManticoreEVM, ABI +from manticore.ethereum import ManticoreEVM, ABI ################ Script ####################### m = ManticoreEVM() diff --git a/examples/evm/reentrancy_symbolic.py b/examples/evm/reentrancy_symbolic.py index 6008bbe..0b3101e 100644 --- a/examples/evm/reentrancy_symbolic.py +++ b/examples/evm/reentrancy_symbolic.py @@ -1,4 +1,4 @@ -from manticore.seth import ManticoreEVM +from manticore.ethereum import ManticoreEVM ################ Script ####################### m = ManticoreEVM() diff --git a/examples/evm/simple_mapping.py b/examples/evm/simple_mapping.py index 41ba882..70d68c1 100644 --- a/examples/evm/simple_mapping.py +++ b/examples/evm/simple_mapping.py @@ -1,4 +1,4 @@ -from manticore.seth import ManticoreEVM +from manticore.ethereum import ManticoreEVM ################ Script ####################### m = ManticoreEVM() diff --git a/manticore/__main__.py b/manticore/__main__.py index cf4a320..f31a24a 100644 --- a/manticore/__main__.py +++ b/manticore/__main__.py @@ -72,7 +72,7 @@ def parse_arguments(): def ethereum_cli(args): - from seth import ManticoreEVM, IntegerOverflow, UnitializedStorage, UnitializedMemory + from ethereum import ManticoreEVM, IntegerOverflow, UnitializedStorage, UnitializedMemory log.init_logging() m = ManticoreEVM(procs=args.procs) diff --git a/manticore/seth.py b/manticore/ethereum.py similarity index 99% rename from manticore/seth.py rename to manticore/ethereum.py index 2e737ea..8d2c755 100644 --- a/manticore/seth.py +++ b/manticore/ethereum.py @@ -485,7 +485,7 @@ class ManticoreEVM(Manticore): Usage Ex:: - from manticore.seth import ManticoreEVM, ABI + from manticore.ethereum import ManticoreEVM, ABI seth = ManticoreEVM() #And now make the contract account to analyze source_code = """ diff --git a/manticore/utils/log.py b/manticore/utils/log.py index 0d40f1c..b257262 100644 --- a/manticore/utils/log.py +++ b/manticore/utils/log.py @@ -64,13 +64,13 @@ def set_verbosity(setting): [ ('manticore.manticore', logging.INFO), ('manticore.main', logging.INFO), - ('manticore.seth', logging.INFO), + ('manticore.ethereum', logging.INFO), ], # 2 (-v) [ ('manticore.core.executor', logging.INFO), ('manticore.platforms.*', logging.DEBUG), - ('manticore.seth', logging.DEBUG), + ('manticore.ethereum', logging.DEBUG), ('manticore.core.plugin', logging.DEBUG), ], # 3 (-vv) diff --git a/tests/test_eth.py b/tests/test_eth.py index c0f8828..1635a0e 100644 --- a/tests/test_eth.py +++ b/tests/test_eth.py @@ -1,7 +1,7 @@ import unittest import os -from manticore.seth import ManticoreEVM, IntegerOverflow +from manticore.ethereum import ManticoreEVM, IntegerOverflow THIS_DIR = os.path.dirname(os.path.abspath(__file__))