From 6026d7e0218bbb27e8391065a6505b68398a4fab Mon Sep 17 00:00:00 2001 From: Viktor Baranov Date: Wed, 12 Apr 2023 13:26:34 +0300 Subject: [PATCH] Update Terrafrom script to use Blockscout release 5.1.3 --- README.md | 2 +- templates/docker_compose.tftpl | 22 +++++++--------------- variables.tf | 2 +- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 1668d5a..9332fa8 100644 --- a/README.md +++ b/README.md @@ -96,7 +96,7 @@ module "vpc" { | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| [blockscout\_settings](#input\_blockscout\_settings) | Settings of blockscout app | 
object({
    postgres_password             = optional(string, "postgres")
    postgres_user                 = optional(string, "postgres")
    postgres_host                 = optional(string, "postgres")
    blockscout_docker_image       = optional(string, "blockscout/blockscout-polygon-supernets:5.1.0-prerelease-26e4d6e4")
    rpc_address                   = optional(string, "https://rpc-supertestnet.polygon.technology")
    chain_id                      = optional(string, "93201")
    rust_verification_service_url = optional(string, "https://sc-verifier.aws-k8s.blockscout.com/")
    ws_address                    = optional(string, "")
    visualize_sol2uml_service_url = optional(string, "")
    sig_provider_service_url      = optional(string, "")
  })
| `{}` | no | +| [blockscout\_settings](#input\_blockscout\_settings) | Settings of blockscout app | 
object({
    postgres_password             = optional(string, "postgres")
    postgres_user                 = optional(string, "postgres")
    postgres_host                 = optional(string, "postgres")
    blockscout_docker_image       = optional(string, "blockscout/blockscout-polygon-supernets:5.1.3-prerelease-61c1238e")
    rpc_address                   = optional(string, "https://rpc-supertestnet.polygon.technology")
    chain_id                      = optional(string, "93201")
    rust_verification_service_url = optional(string, "https://sc-verifier.aws-k8s.blockscout.com/")
    ws_address                    = optional(string, "")
    visualize_sol2uml_service_url = optional(string, "")
    sig_provider_service_url      = optional(string, "")
  })
| `{}` | no | | [create\_iam\_instance\_profile\_ssm\_policy](#input\_create\_iam\_instance\_profile\_ssm\_policy) | Determines whether an IAM instance profile with SSM policy is created or to use an existing IAM instance profile | `string` | `false` | no | | [deploy\_ec2\_instance\_db](#input\_deploy\_ec2\_instance\_db) | Create ec2 instance with postgresql db in docker | `bool` | `true` | no | | [deploy\_rds\_db](#input\_deploy\_rds\_db) | Enabled deploy rds | `bool` | `false` | no | diff --git a/templates/docker_compose.tftpl b/templates/docker_compose.tftpl index 2bd27bd..8fa88bf 100644 --- a/templates/docker_compose.tftpl +++ b/templates/docker_compose.tftpl @@ -20,12 +20,12 @@ services: DISABLE_INDEXER: "true" SECRET_KEY_BASE: '${secret_key_base}' %{ if visualizer_enabled ~} - VISUALIZE_SOL2UML_ENABLED: "true" - VISUALIZE_SOL2UML_SERVICE_URL: '${visualize_sol2uml_service_url}' + MICROSERVICE_VISUALIZE_SOL2UML_ENABLED: "true" + MICROSERVICE_VISUALIZE_SOL2UML_URL: '${visualize_sol2uml_service_url}' %{ endif ~} %{ if sig_provider_enabled ~} - SIG_PROVIDER_ENABLED: "true" - SIG_PROVIDER_SERVICE_URL: '${sig_provider_service_url}' + MICROSERVICE_SIG_PROVIDER_ENABLED: "true" + MICROSERVICE_SIG_PROVIDER_URL: '${sig_provider_service_url}' %{ endif ~} %{ endif ~} %{ if indexer ~} @@ -33,8 +33,7 @@ services: DISABLE_READ_API: "true" DISABLE_WRITE_API: "true" %{ endif ~} - SHOW_PRICE_CHART: "false" - BLOCKSCOUT_VERSION: v5.1.0-beta + BLOCKSCOUT_VERSION: v5.1.3-beta ETHEREUM_JSONRPC_TRACE_URL: '${rpc_address}' ETHEREUM_JSONRPC_HTTP_URL: '${rpc_address}' ETHEREUM_JSONRPC_VARIANT: "nethermind" @@ -49,15 +48,8 @@ services: NETWORK_ICON: "_network_icon.html" COIN: "MATIC" COIN_NAME: "MATIC" - HISTORY_FETCH_INTERVAL: "60" - TXS_HISTORIAN_INIT_LAG: "0" TXS_STATS_DAYS_TO_COMPILE_AT_INIT: "1" COIN_BALANCE_HISTORY_DAYS: "90" - GAS_PRICE_ORACLE_NUM_OF_BLOCKS: "200" - GAS_PRICE_ORACLE_SAFELOW_PERCENTILE: "35" - GAS_PRICE_ORACLE_AVERAGE_PERCENTILE: "60" - GAS_PRICE_ORACLE_FAST_PERCENTILE: "90" - GAS_PRICE_ORACLE_CACHE_PERIOD: "300" POOL_SIZE: "20" DISPLAY_TOKEN_ICONS: "true" FETCH_REWARDS_WAY: "manual" @@ -65,8 +57,8 @@ services: INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER: "true" CHAIN_ID: '${chain_id}' GRAPHIQL_TRANSACTION: "0x728e0551d657e418762b14a264a4d120da3f5277a690db1e8b2a5781848b8589" - ENABLE_RUST_VERIFICATION_SERVICE: "true" - RUST_VERIFICATION_SERVICE_URL: '${rust_verification_service_url}' + MICROSERVICE_SC_VERIFIER_ENABLED: "true" + MICROSERVICE_SC_VERIFIER_URL: '${rust_verification_service_url}' INDEXER_MEMORY_LIMIT: "3" ports: - 4000:4000 diff --git a/variables.tf b/variables.tf index da119dd..819a55a 100644 --- a/variables.tf +++ b/variables.tf @@ -142,7 +142,7 @@ variable "blockscout_settings" { postgres_password = optional(string, "postgres") postgres_user = optional(string, "postgres") postgres_host = optional(string, "postgres") - blockscout_docker_image = optional(string, "blockscout/blockscout-polygon-supernets:5.1.0-prerelease-26e4d6e4") + blockscout_docker_image = optional(string, "blockscout/blockscout-polygon-supernets:5.1.3-prerelease-61c1238e") rpc_address = optional(string, "https://rpc-supertestnet.polygon.technology") chain_id = optional(string, "93201") rust_verification_service_url = optional(string, "https://sc-verifier.aws-k8s.blockscout.com/")