diff --git a/moonworm/cli.py b/moonworm/cli.py index ff4246e..3b66fb4 100644 --- a/moonworm/cli.py +++ b/moonworm/cli.py @@ -6,16 +6,16 @@ from shutil import copyfile from web3.main import Web3 from web3.middleware import geth_poa_middleware -from moonworm.crawler.ethereum_state_provider import Web3StateProvider +from moonworm.crawler.ethereum_state_provider import Web3StateProvider from moonworm.watch import watch_contract from .contracts import CU, ERC20, ERC721 +from .crawler.networks import Network from .generator import ( generate_contract_cli_content, generate_contract_interface_content, ) -from .crawler.networks import Network def write_file(content: str, path: str): @@ -98,10 +98,11 @@ def handle_watch(args: argparse.Namespace) -> None: if args.network is None: raise ValueError("Please specify --network") network = Network.__members__[args.network] + from moonstreamdb.db import yield_db_session_ctx + from .crawler.moonstream_ethereum_state_provider import ( MoonstreamEthereumStateProvider, ) - from moonstreamdb.db import yield_db_session_ctx state_provider = MoonstreamEthereumStateProvider(web3, network) diff --git a/moonworm/crawler/ethereum_state_provider.py b/moonworm/crawler/ethereum_state_provider.py index 1ab9102..2e73bfe 100644 --- a/moonworm/crawler/ethereum_state_provider.py +++ b/moonworm/crawler/ethereum_state_provider.py @@ -1,12 +1,10 @@ +import logging from abc import ABC, abstractmethod from typing import Any, Dict, List, Optional, Union -import logging + from eth_typing.evm import ChecksumAddress - - from web3 import Web3 - logging.basicConfig(level=logging.INFO) logger = logging.getLogger(__name__) diff --git a/moonworm/crawler/log_scanner.py b/moonworm/crawler/log_scanner.py index fdd19e1..c07c69c 100644 --- a/moonworm/crawler/log_scanner.py +++ b/moonworm/crawler/log_scanner.py @@ -14,8 +14,8 @@ from web3.datastructures import AttributeDict from web3.exceptions import BlockNotFound from web3.types import ABIEvent, FilterParams -from .state import EventScannerState from .function_call_crawler import utfy_dict +from .state import EventScannerState logging.basicConfig(level=logging.INFO) logger = logging.getLogger(__name__) diff --git a/moonworm/crawler/moonstream_ethereum_state_provider.py b/moonworm/crawler/moonstream_ethereum_state_provider.py index 24b9319..06750f4 100644 --- a/moonworm/crawler/moonstream_ethereum_state_provider.py +++ b/moonworm/crawler/moonstream_ethereum_state_provider.py @@ -1,5 +1,6 @@ import logging from typing import Any, Dict, List, Optional, Union + from eth_typing.evm import ChecksumAddress from hexbytes.main import HexBytes from moonstreamdb.db import yield_db_session_ctx @@ -13,8 +14,8 @@ from sqlalchemy.orm import Session from sqlalchemy.sql.base import NO_ARG from web3 import Web3 -from .networks import Network, MODELS from .ethereum_state_provider import EthereumStateProvider +from .networks import MODELS, Network logging.basicConfig(level=logging.INFO) logger = logging.getLogger(__name__) diff --git a/moonworm/crawler/networks.py b/moonworm/crawler/networks.py index 7c81e04..2092d97 100644 --- a/moonworm/crawler/networks.py +++ b/moonworm/crawler/networks.py @@ -1,5 +1,6 @@ from enum import Enum from typing import Dict + from moonstreamdb.models import ( Base, EthereumBlock,