pull/340/head
kompotkot 2021-10-27 13:51:09 +00:00
rodzic 915c51d830
commit c0ca537a27
2 zmienionych plików z 14 dodań i 12 usunięć

Wyświetl plik

@ -48,19 +48,17 @@ if ETHERSCAN_SMARTCONTRACTS_BUCKET is None:
# Web3 provider # Web3 provider
MOONSTREAM_INTERNAL_HOSTED_ZONE_ID = os.environ.get( MOONSTREAM_INTERNAL_HOSTED_ZONE_ID = os.environ.get(
"MOONSTREAM_INTERNAL_HOSTED_ZONE_ID" "MOONSTREAM_INTERNAL_HOSTED_ZONE_ID", ""
) )
if MOONSTREAM_INTERNAL_HOSTED_ZONE_ID is None: if MOONSTREAM_INTERNAL_HOSTED_ZONE_ID == "":
raise ValueError( raise ValueError(
"MOONSTREAM_INTERNAL_HOSTED_ZONE_ID environment variable must be set" "MOONSTREAM_INTERNAL_HOSTED_ZONE_ID environment variable must be set"
) )
MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI = os.environ.get( MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI = os.environ.get(
"MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI" "MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI", ""
) )
if MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI is None: if MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI == "":
raise ValueError("MOONSTREAM_WEB3_PROVIDER_URI environment variable must be set") raise ValueError("MOONSTREAM_WEB3_PROVIDER_URI environment variable must be set")
MOONSTREAM_NODE_ETHEREUM_IPC_PORT = os.environ.get("MOONSTREAM_NODE_ETHEREUM_IPC_PORT") MOONSTREAM_NODE_ETHEREUM_IPC_PORT = os.environ.get(
if MOONSTREAM_NODE_ETHEREUM_IPC_PORT is None: "MOONSTREAM_NODE_ETHEREUM_IPC_PORT", 8545
raise ValueError( )
"MOONSTREAM_NODE_ETHEREUM_IPC_PORT environment variable must be set"
)

Wyświetl plik

@ -6,7 +6,7 @@ from web3 import Web3
from .settings import ( from .settings import (
MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI, MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI,
MOONSTREAM_INTERNAL_HOSTED_ZONE_ID, MOONSTREAM_INTERNAL_HOSTED_ZONE_ID,
MOONSTREAM_NODE_ETHEREUM_IPC_PORT MOONSTREAM_NODE_ETHEREUM_IPC_PORT,
) )
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -32,11 +32,15 @@ def fetch_web3_provider_ip():
return record_value return record_value
if not MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI.replace(".","").isnumeric(): if not MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI.replace(".", "").isnumeric():
web3_provider_ip = fetch_web3_provider_ip() web3_provider_ip = fetch_web3_provider_ip()
if web3_provider_ip is None: if web3_provider_ip is None:
raise ValueError("Unable to extract web3 provider IP") raise ValueError("Unable to extract web3 provider IP")
moonstream_web3_provider = Web3(Web3.HTTPProvider(f"http://{web3_provider_ip}:{MOONSTREAM_NODE_ETHEREUM_IPC_PORT}")) moonstream_web3_provider = Web3(
Web3.HTTPProvider(
f"http://{web3_provider_ip}:{MOONSTREAM_NODE_ETHEREUM_IPC_PORT}"
)
)
def yield_web3_provider() -> Web3: def yield_web3_provider() -> Web3: