Merge pull request #343 from raiden-network/fix-arb

Fix problems for Arbitrum deployments

Author: konradkonrad

backend/metrics_backend/metrics_cli.py

@@ -38,8 +38,6 @@
 TEMP_FILE = 'tmp.json'
 OUTPUT_PERIOD = 10  # seconds
 REQUIRED_CONFIRMATIONS = 5
-PRODUCTION_CONTRACTS_VERSION = '0.37.0'
-DEMOENV_CONTRACTS_VERSION = '0.37.0'
 
 
 @contextlib.contextmanager
@@ -85,21 +83,18 @@ def no_ssl_verification():
     help='Number of block confirmations to wait for'
 )
 @click.option(
-    '--environment',
-    default='production',
-    type=click.Choice(['production', 'development', 'demo'], case_sensitive=False),
-    help=(
-        'Change the version of the used contracts and transport server '
-        'by setting the environment to "production" (default), "development" or "demo"'
-    )
+    '--contracts-version',
+    default=None,
+    type=str,
+    help='Use addresses for contracts of this version. Default: latest'
 )
 def main(
     eth_rpc,
     registry_address,
     start_block,
     port,
     confirmations,
-    environment
+    contracts_version,
 ):
     # setup logging
     logging.basicConfig(
@@ -122,18 +117,17 @@ def main(
         )
         sys.exit()
 
-    if environment == 'production':
-        contracts_version = PRODUCTION_CONTRACTS_VERSION
-    elif environment == 'demo':
-        contracts_version = DEMOENV_CONTRACTS_VERSION
-    else:
+    if contracts_version is None:
         contracts_version = CONTRACTS_VERSION
     log.info(f'Using contracts version: {contracts_version}')
 
     with no_ssl_verification():
         valid_params_given = is_checksum_address(registry_address) and start_block >= 0
         try:
             contract_data = get_contracts_deployment_info(web3.eth.chainId, contracts_version)
+            if contract_data is None:
+                log.error(f'No deployment data for chain_id {web3.eth.chainId} and {contracts_version=}')
+                sys.exit(1)
             service_registry_address = contract_data['contracts'][CONTRACT_SERVICE_REGISTRY]['address']
             if not valid_params_given:
                 token_network_registry_info = contract_data['contracts'][CONTRACT_TOKEN_NETWORK_REGISTRY]  # noqa

backend/requirements.txt

@@ -1,4 +1,4 @@
-raiden-common == 0.1.3
+raiden-common == 0.1.4
 
 Click
 

docker-compose.yml

@@ -24,6 +24,7 @@ services:
     environment:
       - EXPLORER_ETH_RPC=http://1.geth.mainnet.ethnodes.brainbot.com:8545
       - EXPLORER_CONFIRMATIONS=5
+      - EXPLORER_CONTRACTS_VERSION=0.37.0
     labels:
       - "traefik.enable=true"
       - "traefik.frontend.rule=Host:explorer.raiden.network; Path: /json"
@@ -50,7 +51,6 @@ services:
     restart: always
     environment:
       - EXPLORER_ETH_RPC=https://arb1.arbitrum.io/rpc
-      - EXPLORER_ENVIRONMENT=development
     labels:
       - "traefik.enable=true"
       - "traefik.frontend.rule=Host:arbitrum-one.explorer.raiden.network; Path: /json"
@@ -103,7 +103,6 @@ services:
     restart: always
     environment:
       - EXPLORER_ETH_RPC=https://rinkeby.arbitrum.io/rpc
-      - EXPLORER_ENVIRONMENT=development
     labels:
       - "traefik.enable=true"
       - "traefik.frontend.rule=Host:rinkarby.explorer.raiden.network; Path: /json"