From 62d81a3178996dbceba9f761556ad913c245441c Mon Sep 17 00:00:00 2001 From: tintinweb Date: Mon, 20 Aug 2018 20:38:58 +0200 Subject: [PATCH] fix import error prepare 0.1.2 --- ethereum_dasm/evmdasm.py | 7 +++---- setup.py | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ethereum_dasm/evmdasm.py b/ethereum_dasm/evmdasm.py index 5a940ba..931344e 100644 --- a/ethereum_dasm/evmdasm.py +++ b/ethereum_dasm/evmdasm.py @@ -14,11 +14,10 @@ import os import time from ethereum_dasm import utils +from ethereum_dasm.utils import colors from ethereum_dasm.asm import BasicBlock from ethereum_dasm.asm.registry import INSTRUCTION_MARKS_BASICBLOCK_END from ethereum_dasm.asm.disassembler import EVMDisAssembler -import ethereum_input_decoder -from ethereum_input_decoder.decoder import FourByteDirectory try: import ethereum_dasm.symbolic.simplify as evmsimplify @@ -135,7 +134,7 @@ def guess_abi(self, txs=30): online_sighash_to_pseudo_abi = {} for tx_input in tx_inputs: - pseudo_abi = FourByteDirectory.get_pseudo_abi_for_input(utils.str_to_bytes(tx_input)) + pseudo_abi = utils.signatures.ethereum_input_decoder.decoder.FourByteDirectory.get_pseudo_abi_for_input(utils.str_to_bytes(tx_input)) lst_pa = list(pseudo_abi) # todo: hacky if lst_pa: @@ -409,7 +408,7 @@ def _reconstruct_function_signatures(self): self.functions[sighash] = {"address":loc, "signature_ascii": ascii, "signatures_ascii": pot_funcsigs, - "signatures": [ethereum_input_decoder.decoder.FourByteDirectory.parse_text_signature(s) for s in pot_funcsigs], + "signatures": [utils.signatures.ethereum_input_decoder.decoder.FourByteDirectory.parse_text_signature(s) for s in pot_funcsigs], "payable": True,#functions are payable by default "constant": None, # no write storage (replaced by view/pure) todo "view": None, #no write storage todo diff --git a/setup.py b/setup.py index b8ff8ea..a2f3636 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ def read(fname): return open(os.path.join(os.path.dirname(__file__), fname)).read() -version="0.1.1" +version="0.1.2" setup( name="ethereum-dasm",