diff --git a/manticore/wasm/structure.py b/manticore/wasm/structure.py index c0a882b88..675a8b0f1 100644 --- a/manticore/wasm/structure.py +++ b/manticore/wasm/structure.py @@ -49,8 +49,8 @@ from ..utils.event import Eventful from ..utils import config -from wasm import decode_module, Section -from wasm.wasmtypes import ( +from wasm_tob import decode_module, Section +from wasm_tob.wasmtypes import ( SEC_TYPE, SEC_IMPORT, SEC_FUNCTION, diff --git a/manticore/wasm/types.py b/manticore/wasm/types.py index d916c1700..ec4368628 100644 --- a/manticore/wasm/types.py +++ b/manticore/wasm/types.py @@ -2,7 +2,7 @@ from dataclasses import dataclass from ..core.smtlib import issymbolic, BitVec from ctypes import * -import wasm +import wasm_tob as wasm import struct from ..core.state import Concretize diff --git a/setup.py b/setup.py index 204a17647..3a6aecf5d 100644 --- a/setup.py +++ b/setup.py @@ -76,7 +76,8 @@ def rtd_dependent_deps(): "rlp", "intervaltree", "crytic-compile>=0.2.2", - "wasm", + # TODO: Change this when a release is published + "wasm-tob @ git+https://github.com/trail-of-forks/wasm-tob.git@ekilmer/init-fork#egg=wasm-tob", "dataclasses; python_version < '3.7'", "pyevmasm>=0.2.3", ]