From 939d4aac360a753a4b20688604db40bcf966f19c Mon Sep 17 00:00:00 2001 From: Sebastien Baizet Date: Fri, 25 Oct 2024 18:01:14 +0200 Subject: [PATCH 01/19] feat: use blockscout chart --- charts/blockscout/Chart.yaml | 7 +- charts/blockscout/README.md | 158 ++++++------------ charts/blockscout/templates/common.yaml | 14 -- charts/blockscout/values.yaml | 197 ++++++++--------------- charts/blockscout/values/production.yaml | 71 ++++---- charts/scroll-sdk/Chart.yaml | 4 +- charts/scroll-sdk/README.md | 4 +- devnet/create-env-files.sh | 2 +- 8 files changed, 169 insertions(+), 288 deletions(-) diff --git a/charts/blockscout/Chart.yaml b/charts/blockscout/Chart.yaml index d52cbc26..9ab24730 100644 --- a/charts/blockscout/Chart.yaml +++ b/charts/blockscout/Chart.yaml @@ -1,17 +1,14 @@ --- apiVersion: v2 -description: blockscout helm charts +description: blockscout scroll helm charts name: blockscout -version: 0.0.3 +version: 0.0.4 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: - name: scroll-tech email: sebastien@scroll.io dependencies: - - name: common - repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" - version: 1.5.1 - name: external-secrets-lib repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" version: 0.0.3 diff --git a/charts/blockscout/README.md b/charts/blockscout/README.md index 3df6c830..a075be3c 100644 --- a/charts/blockscout/README.md +++ b/charts/blockscout/README.md @@ -1,8 +1,8 @@ # blockscout -![Version: 0.0.3](https://img.shields.io/badge/Version-0.0.3-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.0.4](https://img.shields.io/badge/Version-0.0.4-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) -blockscout helm charts +blockscout scroll helm charts ## Maintainers @@ -16,119 +16,59 @@ Kubernetes: `>=1.22.0-0` | Repository | Name | Version | |------------|------|---------| -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | common | 1.5.1 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | external-secrets-lib | 0.0.3 | ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| -| command[0] | string | `"/bin/sh"` | | -| command[1] | string | `"-c"` | | -| command[2] | string | `"/app/bin/blockscout start"` | | -| controller.replicas | int | `1` | | -| controller.strategy | string | `"Recreate"` | | -| controller.type | string | `"deployment"` | | -| defaultProbes.custom | bool | `true` | | -| defaultProbes.enabled | bool | `true` | | -| defaultProbes.spec.httpGet.path | string | `"/"` | | -| defaultProbes.spec.httpGet.port | int | `3000` | | -| envFrom[0].configMapRef.name | string | `"blockscout-env"` | | -| env[0].name | string | `"ECTO_USE_SSL"` | | -| env[0].value | bool | `false` | | -| env[10].name | string | `"LOGO"` | | -| env[10].value | string | `"/images/logo.svg"` | | -| env[11].name | string | `"WEBAPP_URL"` | | -| env[11].value | string | `"https://blockscout.scroll.tech"` | | -| env[12].name | string | `"BLOCKSCOUT_HOST"` | | -| env[12].value | string | `"test-blockscout.scroll.io"` | | -| env[13].name | string | `"JSON_RPC"` | | -| env[13].value | string | `"http://l2-sequencer:8545"` | | -| env[14].name | string | `"SUBNETWORK"` | | -| env[14].value | string | `"Scroll Sepolia Testnet"` | | -| env[15].name | string | `"SUPPORTED_CHAINS"` | | -| env[15].value | string | `"[{ \"title\": \"Etherscan (Sepolia)\", \"url\": \"https://sepolia.etherscan.io\", \"test_net?\": true }, { \"title\": \"Scroll Sepolia Testnet\", \"url\": \"http://test-blockscout.scroll.io\", \"test_net?\": true }]"` | | -| env[16].name | string | `"DISABLE_EXCHANGE_RATES"` | | -| env[16].value | bool | `true` | | -| env[17].name | string | `"BLOCKSCOUT_VERSION"` | | -| env[17].value | string | `"5.2.1"` | | -| env[18].name | string | `"FOOTER_GITHUB_LINK"` | | -| env[18].value | string | `"https://github.com/scroll-tech/blockscout"` | | -| env[19].name | string | `"RELEASE_LINK"` | | -| env[19].value | string | `"https://github.com/scroll-tech"` | | -| env[1].name | string | `"ETHEREUM_JSONRPC_HTTP_URL"` | | -| env[1].value | string | `"http://l2-sequencer:8545"` | | -| env[20].name | string | `"RELEASE_NODE"` | | -| env[20].value | string | `"l2_blockscout"` | | -| env[21].name | string | `"ETHEREUM_JSONRPC_DEBUG_TRACE_TRANSACTION_TIMEOUT"` | | -| env[21].value | string | `"10s"` | | -| env[22].name | string | `"INDEXER_MEMORY_LIMIT"` | | -| env[22].value | string | `"10gb"` | | -| env[23].name | string | `"BLOCK_TRANSFORMER"` | | -| env[23].value | string | `"clique"` | | -| env[24].name | string | `"MICROSERVICE_SC_VERIFIER_ENABLED"` | | -| env[24].value | bool | `true` | | -| env[25].name | string | `"MICROSERVICE_SC_VERIFIER_URL"` | | -| env[25].value | string | `"http://blockscout-sc-verifier:8080"` | | -| env[26].name | string | `"CHAIN_SPEC_PATH"` | | -| env[26].value | string | `"/app/genesis/genesis.json"` | | -| env[2].name | string | `"ETHEREUM_JSONRPC_TRACE_URL"` | | -| env[2].value | string | `"http://l2-sequencer:8545"` | | -| env[3].name | string | `"ETHEREUM_JSONRPC_VARIANT"` | | -| env[3].value | string | `"geth"` | | -| env[4].name | string | `"ETHEREUM_JSONRPC_WS_URL"` | | -| env[4].value | string | `"ws://l2-sequencer:8546"` | | -| env[5].name | string | `"INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER"` | | -| env[5].value | bool | `true` | | -| env[6].name | string | `"PORT"` | | -| env[6].value | int | `3000` | | -| env[7].name | string | `"NETWORK"` | | -| env[7].value[0] | string | `""` | | -| env[8].name | string | `"COIN"` | | -| env[8].value | string | `"ETH"` | | -| env[9].name | string | `"COIN_NAME"` | | -| env[9].value | string | `"ETH"` | | -| global.fullnameOverride | string | `"blockscout"` | | -| global.nameOverride | string | `"blockscout"` | | -| image.pullPolicy | string | `"Always"` | | -| image.repository | string | `"blockscout/blockscout"` | | -| image.tag | string | `"6.6.0"` | | -| ingress.main.annotations | object | `{}` | | -| ingress.main.enabled | bool | `true` | | -| ingress.main.hosts[0].host | string | `"blockscout.scrollsdk"` | | -| ingress.main.hosts[0].paths[0].path | string | `"/"` | | -| ingress.main.hosts[0].paths[0].pathType | string | `"Prefix"` | | -| ingress.main.ingressClassName | string | `"nginx"` | | -| ingress.main.labels | object | `{}` | | -| ingress.main.primary | bool | `true` | | -| initContainers.1-migrate-db.command[0] | string | `"/bin/sh"` | | -| initContainers.1-migrate-db.command[1] | string | `"-c"` | | -| initContainers.1-migrate-db.command[2] | string | `"/app/bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\""` | | -| initContainers.1-migrate-db.envFrom[0].configMapRef.name | string | `"blockscout-env"` | | -| initContainers.1-migrate-db.image | string | `"blockscout/blockscout:6.6.0"` | | -| persistence.env.enabled | bool | `true` | | -| persistence.env.mountPath | string | `"/config/"` | | -| persistence.env.name | string | `"blockscout-env"` | | -| persistence.env.type | string | `"configMap"` | | -| persistence.genesis.enabled | bool | `true` | | -| persistence.genesis.mountPath | string | `"/app/genesis/"` | | -| persistence.genesis.name | string | `"genesis-config"` | | -| persistence.genesis.type | string | `"configMap"` | | -| probes.liveness.<<.custom | bool | `true` | | -| probes.liveness.<<.enabled | bool | `true` | | -| probes.liveness.<<.spec.httpGet.path | string | `"/"` | | -| probes.liveness.<<.spec.httpGet.port | int | `3000` | | -| probes.readiness.<<.custom | bool | `true` | | -| probes.readiness.<<.enabled | bool | `true` | | -| probes.readiness.<<.spec.httpGet.path | string | `"/"` | | -| probes.readiness.<<.spec.httpGet.port | int | `3000` | | -| probes.startup.<<.custom | bool | `true` | | -| probes.startup.<<.enabled | bool | `true` | | -| probes.startup.<<.spec.httpGet.path | string | `"/"` | | -| probes.startup.<<.spec.httpGet.port | int | `3000` | | -| service.main.enabled | bool | `true` | | -| service.main.ports.http.enabled | bool | `true` | | -| service.main.ports.http.port | int | `3000` | | +| blockscout-stack.blockscout.env.BLOCK_TRANSFORMER | string | `"clique"` | | +| blockscout-stack.blockscout.env.CHAIN_TYPE | string | `"scroll"` | | +| blockscout-stack.blockscout.env.ETHEREUM_JSONRPC_HTTP_URL | string | `"http://l2-rpc:8545"` | | +| blockscout-stack.blockscout.env.ETHEREUM_JSONRPC_TRACE_URL | string | `"http://l2-rpc:8545"` | | +| blockscout-stack.blockscout.env.ETHEREUM_JSONRPC_VARIANT | string | `"geth"` | | +| blockscout-stack.blockscout.env.ETHEREUM_JSONRPC_WS_URL | string | `"ws://l2-rpc:8546"` | | +| blockscout-stack.blockscout.env.INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER | bool | `true` | | +| blockscout-stack.blockscout.env.INDEXER_SCROLL_L1_ETH_GET_LOGS_RANGE_SIZE | int | `500` | | +| blockscout-stack.blockscout.env.INDEXER_SCROLL_L2_ETH_GET_LOGS_RANGE_SIZE | int | `500` | | +| blockscout-stack.blockscout.env.INDEXER_SCROLL_L2_MESSENGER_START_BLOCK | int | `0` | | +| blockscout-stack.blockscout.env.SCROLL_L2_CURIE_UPGRADE_BLOCK | int | `0` | | +| blockscout-stack.blockscout.envFrom[0].configMapRef.name | string | `"blockscout-env"` | | +| blockscout-stack.blockscout.image.pullPolicy | string | `"IfNotPresent"` | | +| blockscout-stack.blockscout.image.repository | string | `"blockscout/blockscout-scroll"` | | +| blockscout-stack.blockscout.image.tag | string | `"6.9.0-alpha.1"` | | +| blockscout-stack.blockscout.ingress.annotations."cert-manager.io/cluster-issuer" | string | `"letsencrypt-prod"` | | +| blockscout-stack.blockscout.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-headers" | string | `"updated-gas-oracle, Content-Type, Authorization"` | | +| blockscout-stack.blockscout.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-methods" | string | `"GET, POST, OPTIONS"` | | +| blockscout-stack.blockscout.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-origin" | string | `"https://blockscout.scrollsdk"` | | +| blockscout-stack.blockscout.ingress.annotations."nginx.ingress.kubernetes.io/cors-max-age" | string | `"86400"` | | +| blockscout-stack.blockscout.ingress.annotations."nginx.ingress.kubernetes.io/enable-cors" | string | `"true"` | | +| blockscout-stack.blockscout.ingress.className | string | `"nginx"` | | +| blockscout-stack.blockscout.ingress.enabled | bool | `true` | | +| blockscout-stack.blockscout.ingress.hostname | string | `"blockscout-backend.scrollsdk"` | | +| blockscout-stack.frontend.env.FAVICON_MASTER_URL | string | `"https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/favicons/scroll_180x180.png"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_HOMEPAGE_CHARTS | string | `"[\"daily_txs\"]"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_HOMEPAGE_HERO_BANNER_CONFIG | string | `"{'background':['rgba(255, 238, 218, 1)'],'text_color':['rgba(25, 6, 2, 1)']}"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_HOMEPAGE_STATS | string | `"[\"total_blocks\", \"average_block_time\", \"total_txs\", \"wallet_addresses\", \"gas_tracker\"]"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_NETWORK_ICON | string | `"https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-icons/scroll.svg"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_NETWORK_ICON_DARK | string | `"https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-icons/scroll-dark.svg"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_NETWORK_LOGO | string | `"https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-logos/scroll.svg"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_NETWORK_LOGO_DARK | string | `"https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-logos/scroll-dark.svg"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_OG_IMAGE_URL | string | `"https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/og-images/scroll-sepolia.png"` | | +| blockscout-stack.frontend.envFrom[0].configMapRef.name | string | `"blockscout-frontend-env"` | | +| blockscout-stack.frontend.image.tag | string | `"v1.35.2"` | | +| blockscout-stack.frontend.ingress.annotations."cert-manager.io/cluster-issuer" | string | `"letsencrypt-prod"` | | +| blockscout-stack.frontend.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-headers" | string | `"updated-gas-oracle, Content-Type, Authorization"` | | +| blockscout-stack.frontend.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-methods" | string | `"GET, POST, OPTIONS"` | | +| blockscout-stack.frontend.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-origin" | string | `"https://blockscout.scrollsdk"` | | +| blockscout-stack.frontend.ingress.annotations."nginx.ingress.kubernetes.io/cors-max-age" | string | `"86400"` | | +| blockscout-stack.frontend.ingress.annotations."nginx.ingress.kubernetes.io/enable-cors" | string | `"true"` | | +| blockscout-stack.frontend.ingress.className | string | `"nginx"` | | +| blockscout-stack.frontend.ingress.enabled | bool | `true` | | +| blockscout-stack.frontend.ingress.hostname | string | `"blockscout.scrollsdk"` | | +| blockscout-stack.fullnameOverride | string | `"blockscout"` | | +| blockscout-stack.imagePullSecrets[0].name | string | `"docker-secret"` | | +| blockscout-stack.nameOverride | string | `"blockscout"` | | ---------------------------------------------- Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/blockscout/templates/common.yaml b/charts/blockscout/templates/common.yaml index 0ec7409b..844240ad 100644 --- a/charts/blockscout/templates/common.yaml +++ b/charts/blockscout/templates/common.yaml @@ -1,16 +1,2 @@ --- -{{- include "scroll.common.loader.init" . }} - -{{- define "app-template.hardcodedValues" -}} -# Set the nameOverride based on the release name if no override has been set -{{ if not .Values.global.nameOverride }} -global: - nameOverride: "{{ .Release.Name }}" -{{ end }} -{{- end -}} -{{- $_ := mergeOverwrite .Values (include "app-template.hardcodedValues" . | fromYaml) -}} - -{{/* Render the templates */}} -{{ include "scroll.common.loader.generate" . }} ---- {{- include "scrolllib.externalsecrets.tpl" . }} diff --git a/charts/blockscout/values.yaml b/charts/blockscout/values.yaml index 611b7c7b..d7a7f76d 100644 --- a/charts/blockscout/values.yaml +++ b/charts/blockscout/values.yaml @@ -1,138 +1,79 @@ ---- -global: - nameOverride: &app_name blockscout - fullnameOverride: *app_name +blockscout-stack: + nameOverride: "blockscout" + fullnameOverride: "blockscout" -controller: - replicas: 1 - strategy: Recreate - type: deployment + imagePullSecrets: + - name: docker-secret -image: - repository: blockscout/blockscout - pullPolicy: Always - tag: 6.6.0 + blockscout: + image: + repository: blockscout/blockscout-scroll + pullPolicy: IfNotPresent + tag: 6.9.0-alpha.1 -env: - - name: ECTO_USE_SSL - value: false - - name: ETHEREUM_JSONRPC_HTTP_URL - value: http://l2-sequencer:8545 - - name: ETHEREUM_JSONRPC_TRACE_URL - value: http://l2-sequencer:8545 - - name: ETHEREUM_JSONRPC_VARIANT - value: geth - - name: ETHEREUM_JSONRPC_WS_URL - value: ws://l2-sequencer:8546 - - name: INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER - value: true - - name: PORT - value: 3000 - - name: NETWORK - value: [""] - - name: COIN - value: ETH - - name: COIN_NAME - value: ETH - - name: LOGO - value: /images/logo.svg - - name: WEBAPP_URL - value: https://blockscout.scroll.tech - - name: BLOCKSCOUT_HOST - value: test-blockscout.scroll.io - - name: JSON_RPC - value: http://l2-sequencer:8545 - - name: SUBNETWORK - value: "Scroll Sepolia Testnet" - - name: SUPPORTED_CHAINS - value: '[{ "title": "Etherscan (Sepolia)", "url": "https://sepolia.etherscan.io", "test_net?": true }, { "title": "Scroll Sepolia Testnet", "url": "http://test-blockscout.scroll.io", "test_net?": true }]' - - name: DISABLE_EXCHANGE_RATES - value: true - - name: BLOCKSCOUT_VERSION - value: 5.2.1 - - name: FOOTER_GITHUB_LINK - value: https://github.com/scroll-tech/blockscout - - name: RELEASE_LINK - value: https://github.com/scroll-tech - - name: RELEASE_NODE - value: l2_blockscout - - name: ETHEREUM_JSONRPC_DEBUG_TRACE_TRANSACTION_TIMEOUT - value: 10s - - name: INDEXER_MEMORY_LIMIT - value: 10gb - - name: BLOCK_TRANSFORMER - value: clique - - name: MICROSERVICE_SC_VERIFIER_ENABLED - value: true - - name: MICROSERVICE_SC_VERIFIER_URL - value: http://blockscout-sc-verifier:8080 - - name: CHAIN_SPEC_PATH - value: /app/genesis/genesis.json + env: + ETHEREUM_JSONRPC_HTTP_URL: http://l2-rpc:8545 + ETHEREUM_JSONRPC_TRACE_URL: http://l2-rpc:8545 + ETHEREUM_JSONRPC_VARIANT: geth + ETHEREUM_JSONRPC_WS_URL: ws://l2-rpc:8546 + BLOCK_TRANSFORMER: clique + INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: true + CHAIN_TYPE: scroll + INDEXER_SCROLL_L2_MESSENGER_START_BLOCK: 0 + INDEXER_SCROLL_L1_ETH_GET_LOGS_RANGE_SIZE: 500 + INDEXER_SCROLL_L2_ETH_GET_LOGS_RANGE_SIZE: 500 + SCROLL_L2_CURIE_UPGRADE_BLOCK: 0 + # Not sure what these values are for + # SCROLL_L1_SCALAR_INIT: + # SCROLL_L1_OVERHEAD_INIT: + # SCROLL_L1_COMMIT_SCALAR_INIT: + # SCROLL_L1_BLOB_SCALAR_INIT: + # SCROLL_L1_BASE_FEE_INIT: + # SCROLL_L1_BLOB_BASE_FEE_INIT: -envFrom: - - configMapRef: - name: blockscout-env - -command: [ - "/bin/sh", - "-c", - "/app/bin/blockscout start" -] - -service: - main: - enabled: true - ports: - http: - enabled: true - port: 3000 - -defaultProbes: &default_probes - enabled: true - custom: true - spec: - httpGet: - path: "/" - port: 3000 - -probes: - liveness: - <<: *default_probes - readiness: - <<: *default_probes - startup: - <<: *default_probes + envFrom: + - configMapRef: + name: blockscout-env + ingress: + enabled: true + className: "nginx" + annotations: + cert-manager.io/cluster-issuer: letsencrypt-prod + nginx.ingress.kubernetes.io/enable-cors: "true" + nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk" + nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" + nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" + nginx.ingress.kubernetes.io/cors-max-age: "86400" + hostname: blockscout-backend.scrollsdk -persistence: - genesis: - enabled: true - type: configMap - mountPath: /app/genesis/ - name: genesis-config - env: - enabled: true - type: configMap - mountPath: /config/ - name: blockscout-env + frontend: + image: + tag: v1.35.2 -initContainers: - 1-migrate-db: - image: blockscout/blockscout:6.6.0 - command: ["/bin/sh", "-c", "/app/bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\""] envFrom: - configMapRef: - name: blockscout-env + name: blockscout-frontend-env + + env: + NEXT_PUBLIC_NETWORK_LOGO: "https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-logos/scroll.svg" + NEXT_PUBLIC_NETWORK_LOGO_DARK: "https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-logos/scroll-dark.svg" + NEXT_PUBLIC_NETWORK_ICON: "https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-icons/scroll.svg" + NEXT_PUBLIC_NETWORK_ICON_DARK: "https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-icons/scroll-dark.svg" + NEXT_PUBLIC_HOMEPAGE_HERO_BANNER_CONFIG: "{'background':['rgba(255, 238, 218, 1)'],'text_color':['rgba(25, 6, 2, 1)']}" + NEXT_PUBLIC_OG_IMAGE_URL: 'https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/og-images/scroll-sepolia.png' + FAVICON_MASTER_URL: "https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/favicons/scroll_180x180.png" + NEXT_PUBLIC_HOMEPAGE_CHARTS: '["daily_txs"]' + NEXT_PUBLIC_HOMEPAGE_STATS: '["total_blocks", "average_block_time", "total_txs", "wallet_addresses", "gas_tracker"]' -ingress: - main: - enabled: true - primary: true - annotations: {} - labels: {} - ingressClassName: "nginx" - hosts: - - host: blockscout.scrollsdk - paths: - - path: / - pathType: Prefix + ingress: + enabled: true + annotations: + cert-manager.io/cluster-issuer: letsencrypt-prod + nginx.ingress.kubernetes.io/enable-cors: "true" + nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk" + nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" + nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" + nginx.ingress.kubernetes.io/cors-max-age: "86400" + className: "nginx" + hostname: blockscout.scrollsdk diff --git a/charts/blockscout/values/production.yaml b/charts/blockscout/values/production.yaml index aa2e019e..ca0ab47e 100644 --- a/charts/blockscout/values/production.yaml +++ b/charts/blockscout/values/production.yaml @@ -1,37 +1,54 @@ -envFrom: - - secretRef: - name: blockscout-secret-env +blockscout-stack: + blockscout: -persistence: - env: - enabled: true - type: secret - mountPath: /config/ - name: blockscout-secret-env + env: + ETHEREUM_JSONRPC_HTTP_URL: http://l2-rpc:8545 + ETHEREUM_JSONRPC_TRACE_URL: http://l2-rpc:8545 + ETHEREUM_JSONRPC_VARIANT: geth + ETHEREUM_JSONRPC_WS_URL: ws://l2-rpc:8546 + BLOCK_TRANSFORMER: clique + INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: true + CHAIN_TYPE: scroll + INDEXER_SCROLL_L1_RPC: "" + INDEXER_SCROLL_L1_CHAIN_CONTRACT: "" # value of L1_SCROLL_CHAIN_PROXY_ADDR on config-contracts.toml + INDEXER_SCROLL_L1_BATCH_START_BLOCK: "" # value of L1_CONTRACT_DEPLOYMENT_BLOCK on config.toml + INDEXER_SCROLL_L1_MESSENGER_CONTRACT: "" # value of L1_SCROLL_MESSENGER_PROXY_ADDR on config-contracts.toml + INDEXER_SCROLL_L1_MESSENGER_START_BLOCK: "" # value of L1_CONTRACT_DEPLOYMENT_BLOCK on config.toml + INDEXER_SCROLL_L2_MESSENGER_CONTRACT: "" # value of L2_SCROLL_MESSENGER_PROXY_ADDR on config-contracts.toml + INDEXER_SCROLL_L2_GAS_ORACLE_CONTRACT: "" # value of L1_GAS_PRICE_ORACLE_PROXY_ADDR on config-contracts.toml + INDEXER_SCROLL_L2_MESSENGER_START_BLOCK: 0 + INDEXER_SCROLL_L1_ETH_GET_LOGS_RANGE_SIZE: 500 + INDEXER_SCROLL_L2_ETH_GET_LOGS_RANGE_SIZE: 500 + SCROLL_L2_CURIE_UPGRADE_BLOCK: 0 -initContainers: - 1-migrate-db: - image: blockscout/blockscout:6.6.0 - command: ["/bin/sh", "-c", "/app/bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\""] envFrom: - secretRef: name: blockscout-secret-env -configMaps: - env: - enabled: true - data: - PG_HOST: "postgresql-blockscout" - PG_PORT: "5432" + ingress: + enabled: true + className: "nginx" + annotations: {} # Add annotations here. Might be necessary to allow CORS from updated-gas-oracle. Example below + # cert-manager.io/cluster-issuer: letsencrypt-prod + # nginx.ingress.kubernetes.io/enable-cors: "true" + # nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk" + # nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" + # nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" + # nginx.ingress.kubernetes.io/cors-max-age: "86400" + hostname: "" # Set here the hostname for the ingress. Example : blockscout-backend.scrollsdk -ingress: - main: - ingressClassName: "nginx" - hosts: - - host: "" - paths: - - path: / - pathType: Prefix + frontend: + ingress: + enabled: true + ingressClassName: "" # Set here your ingressClassName + annotations: {} # Add annotations here. Might be necessary to allow CORS from updated-gas-oracle. Example below + # cert-manager.io/cluster-issuer: letsencrypt-prod + # nginx.ingress.kubernetes.io/enable-cors: "true" + # nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk" + # nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" + # nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" + # nginx.ingress.kubernetes.io/cors-max-age: "86400" + hostname: "" # Set here the hostname for the ingress. Example : blockscout-backend.scrollsdk externalSecrets: blockscout-secret-env: diff --git a/charts/scroll-sdk/Chart.yaml b/charts/scroll-sdk/Chart.yaml index 06ca4761..a95e4fe5 100644 --- a/charts/scroll-sdk/Chart.yaml +++ b/charts/scroll-sdk/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: scroll helm charts to deploy scroll sdk name: scroll-sdk -version: 0.0.53 +version: 0.0.54 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: @@ -22,7 +22,7 @@ dependencies: repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: balance-checker.enabled - name: blockscout - version: 0.0.3 + version: 0.0.4 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: blockscout.enabled - name: bridge-history-api diff --git a/charts/scroll-sdk/README.md b/charts/scroll-sdk/README.md index 99f7a65b..41f4311d 100644 --- a/charts/scroll-sdk/README.md +++ b/charts/scroll-sdk/README.md @@ -1,6 +1,6 @@ # scroll-sdk -![Version: 0.0.53](https://img.shields.io/badge/Version-0.0.53-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.0.54](https://img.shields.io/badge/Version-0.0.54-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) scroll helm charts to deploy scroll sdk @@ -25,7 +25,7 @@ Kubernetes: `>=1.22.0-0` | oci://ghcr.io/scroll-tech/scroll-sdk/helm | admin-system-cron | 0.0.2 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | admin-system-dashboard | 0.0.2 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | balance-checker | 0.0.4 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | blockscout | 0.0.3 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | blockscout | 0.0.4 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | blockscout-sc-verifier | 0.0.2 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | bridge-history-api | 0.0.7 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | bridge-history-fetcher | 0.0.11 | diff --git a/devnet/create-env-files.sh b/devnet/create-env-files.sh index 4ac9dbb5..7bdd10ee 100755 --- a/devnet/create-env-files.sh +++ b/devnet/create-env-files.sh @@ -31,7 +31,7 @@ get_service_configmap_variables() { echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC L2_RPC_ENDPOINT:SCROLL_L2_RPC" ;; blockscout) - echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC BLOCKSCOUT_DB_CONNECTION_STRING:DATABASE_URL" + echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC BLOCKSCOUT_DB_CONNECTION_STRING:DATABASE_URL L1_SCROLL_CHAIN_PROXY_ADDR:INDEXER_SCROLL_L1_CHAIN_CONTRACT L1_CONTRACT_DEPLOYMENT_BLOCK:INDEXER_SCROLL_L1_BATCH_START_BLOCK L1_SCROLL_MESSENGER_PROXY_ADDR:INDEXER_SCROLL_L1_MESSENGER_CONTRACT L1_CONTRACT_DEPLOYMENT_BLOCK:INDEXER_SCROLL_L1_MESSENGER_START_BLOCK L2_SCROLL_MESSENGER_PROXY_ADDR:INDEXER_SCROLL_L2_MESSENGER_CONTRACT L1_GAS_PRICE_ORACLE_ADDR:INDEXER_SCROLL_L2_GAS_ORACLE_CONTRACT" ;; bridge-history-api) echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC L2_RPC_ENDPOINT:SCROLL_L2_RPC BRIDGE_HISTORY_DB_CONNECTION_STRING:SCROLL_BRIDGE_HISTORY_DB_DSN" From 6135bf6afe1d2d654b5afffdb3a1c6b298f9bec9 Mon Sep 17 00:00:00 2001 From: Sebastien Baizet Date: Fri, 25 Oct 2024 19:02:02 +0200 Subject: [PATCH 02/19] add blockscout dependency --- charts/blockscout/Chart.yaml | 3 +++ charts/blockscout/README.md | 1 + devnet/Makefile | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/blockscout/Chart.yaml b/charts/blockscout/Chart.yaml index 9ab24730..a12ed553 100644 --- a/charts/blockscout/Chart.yaml +++ b/charts/blockscout/Chart.yaml @@ -12,3 +12,6 @@ dependencies: - name: external-secrets-lib repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" version: 0.0.3 + - name: blockscout-stack + repository: https://blockscout.github.io/helm-charts + version: 1.6.8 diff --git a/charts/blockscout/README.md b/charts/blockscout/README.md index a075be3c..a0245180 100644 --- a/charts/blockscout/README.md +++ b/charts/blockscout/README.md @@ -16,6 +16,7 @@ Kubernetes: `>=1.22.0-0` | Repository | Name | Version | |------------|------|---------| +| https://blockscout.github.io/helm-charts | blockscout-stack | 1.6.8 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | external-secrets-lib | 0.0.3 | ## Values diff --git a/devnet/Makefile b/devnet/Makefile index 2f536424..e76cfd2c 100644 --- a/devnet/Makefile +++ b/devnet/Makefile @@ -7,7 +7,7 @@ L1_RPC_HOST := l1-devnet.scrollsdk bootstrap: echo "Pulling helm chart..." - helm pull oci://ghcr.io/scroll-tech/scroll-sdk/helm/scroll-sdk --version 0.0.52 + helm pull oci://ghcr.io/scroll-tech/scroll-sdk/helm/dev/scroll-sdk --version 0.0.54 echo "Extracting helm chart..." tar -xvf *.tgz $(MAKE) config From d2a9d2a2a31dad60f327358a5b741ef5303e9aef Mon Sep 17 00:00:00 2001 From: Sebastien Baizet Date: Fri, 25 Oct 2024 19:59:08 +0200 Subject: [PATCH 03/19] fix production file for blockscout --- charts/blockscout/README.md | 3 -- charts/blockscout/values.yaml | 6 --- charts/blockscout/values/production.yaml | 49 +++++++++++++++--------- 3 files changed, 31 insertions(+), 27 deletions(-) diff --git a/charts/blockscout/README.md b/charts/blockscout/README.md index a0245180..c82d0a5d 100644 --- a/charts/blockscout/README.md +++ b/charts/blockscout/README.md @@ -38,7 +38,6 @@ Kubernetes: `>=1.22.0-0` | blockscout-stack.blockscout.image.pullPolicy | string | `"IfNotPresent"` | | | blockscout-stack.blockscout.image.repository | string | `"blockscout/blockscout-scroll"` | | | blockscout-stack.blockscout.image.tag | string | `"6.9.0-alpha.1"` | | -| blockscout-stack.blockscout.ingress.annotations."cert-manager.io/cluster-issuer" | string | `"letsencrypt-prod"` | | | blockscout-stack.blockscout.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-headers" | string | `"updated-gas-oracle, Content-Type, Authorization"` | | | blockscout-stack.blockscout.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-methods" | string | `"GET, POST, OPTIONS"` | | | blockscout-stack.blockscout.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-origin" | string | `"https://blockscout.scrollsdk"` | | @@ -56,9 +55,7 @@ Kubernetes: `>=1.22.0-0` | blockscout-stack.frontend.env.NEXT_PUBLIC_NETWORK_LOGO | string | `"https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-logos/scroll.svg"` | | | blockscout-stack.frontend.env.NEXT_PUBLIC_NETWORK_LOGO_DARK | string | `"https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-logos/scroll-dark.svg"` | | | blockscout-stack.frontend.env.NEXT_PUBLIC_OG_IMAGE_URL | string | `"https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/og-images/scroll-sepolia.png"` | | -| blockscout-stack.frontend.envFrom[0].configMapRef.name | string | `"blockscout-frontend-env"` | | | blockscout-stack.frontend.image.tag | string | `"v1.35.2"` | | -| blockscout-stack.frontend.ingress.annotations."cert-manager.io/cluster-issuer" | string | `"letsencrypt-prod"` | | | blockscout-stack.frontend.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-headers" | string | `"updated-gas-oracle, Content-Type, Authorization"` | | | blockscout-stack.frontend.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-methods" | string | `"GET, POST, OPTIONS"` | | | blockscout-stack.frontend.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-origin" | string | `"https://blockscout.scrollsdk"` | | diff --git a/charts/blockscout/values.yaml b/charts/blockscout/values.yaml index d7a7f76d..1fce09fd 100644 --- a/charts/blockscout/values.yaml +++ b/charts/blockscout/values.yaml @@ -39,7 +39,6 @@ blockscout-stack: enabled: true className: "nginx" annotations: - cert-manager.io/cluster-issuer: letsencrypt-prod nginx.ingress.kubernetes.io/enable-cors: "true" nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk" nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" @@ -51,10 +50,6 @@ blockscout-stack: image: tag: v1.35.2 - envFrom: - - configMapRef: - name: blockscout-frontend-env - env: NEXT_PUBLIC_NETWORK_LOGO: "https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-logos/scroll.svg" NEXT_PUBLIC_NETWORK_LOGO_DARK: "https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-logos/scroll-dark.svg" @@ -69,7 +64,6 @@ blockscout-stack: ingress: enabled: true annotations: - cert-manager.io/cluster-issuer: letsencrypt-prod nginx.ingress.kubernetes.io/enable-cors: "true" nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk" nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" diff --git a/charts/blockscout/values/production.yaml b/charts/blockscout/values/production.yaml index ca0ab47e..d05f5e4d 100644 --- a/charts/blockscout/values/production.yaml +++ b/charts/blockscout/values/production.yaml @@ -9,13 +9,13 @@ blockscout-stack: BLOCK_TRANSFORMER: clique INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: true CHAIN_TYPE: scroll - INDEXER_SCROLL_L1_RPC: "" INDEXER_SCROLL_L1_CHAIN_CONTRACT: "" # value of L1_SCROLL_CHAIN_PROXY_ADDR on config-contracts.toml INDEXER_SCROLL_L1_BATCH_START_BLOCK: "" # value of L1_CONTRACT_DEPLOYMENT_BLOCK on config.toml INDEXER_SCROLL_L1_MESSENGER_CONTRACT: "" # value of L1_SCROLL_MESSENGER_PROXY_ADDR on config-contracts.toml INDEXER_SCROLL_L1_MESSENGER_START_BLOCK: "" # value of L1_CONTRACT_DEPLOYMENT_BLOCK on config.toml INDEXER_SCROLL_L2_MESSENGER_CONTRACT: "" # value of L2_SCROLL_MESSENGER_PROXY_ADDR on config-contracts.toml INDEXER_SCROLL_L2_GAS_ORACLE_CONTRACT: "" # value of L1_GAS_PRICE_ORACLE_PROXY_ADDR on config-contracts.toml + INDEXER_SCROLL_L1_RPC: "" INDEXER_SCROLL_L2_MESSENGER_START_BLOCK: 0 INDEXER_SCROLL_L1_ETH_GET_LOGS_RANGE_SIZE: 500 INDEXER_SCROLL_L2_ETH_GET_LOGS_RANGE_SIZE: 500 @@ -25,30 +25,43 @@ blockscout-stack: - secretRef: name: blockscout-secret-env + extraEnv: + - name: DATABASE_URL + valueFrom: + secretKeyRef: + name: blockscout-secret-env + key: DATABASE_URL + ingress: enabled: true - className: "nginx" - annotations: {} # Add annotations here. Might be necessary to allow CORS from updated-gas-oracle. Example below - # cert-manager.io/cluster-issuer: letsencrypt-prod - # nginx.ingress.kubernetes.io/enable-cors: "true" - # nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk" - # nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" - # nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" - # nginx.ingress.kubernetes.io/cors-max-age: "86400" - hostname: "" # Set here the hostname for the ingress. Example : blockscout-backend.scrollsdk + className: "" + annotations: # Add annotations here. Might be necessary to allow CORS from updated-gas-oracle. Example below +# cert-manager.io/cluster-issuer: letsencrypt-prod +# nginx.ingress.kubernetes.io/enable-cors: "true" +# nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk" +# nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" +# nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" +# nginx.ingress.kubernetes.io/cors-max-age: "86400" + hostname: "blockscout-backend.hsk.scroll.systems" + tls: + enabled: true + secretName: blockscout-tls # Set here the hostname for the ingress. Example : blockscout-backend.scrollsdk frontend: ingress: enabled: true ingressClassName: "" # Set here your ingressClassName - annotations: {} # Add annotations here. Might be necessary to allow CORS from updated-gas-oracle. Example below - # cert-manager.io/cluster-issuer: letsencrypt-prod - # nginx.ingress.kubernetes.io/enable-cors: "true" - # nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk" - # nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" - # nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" - # nginx.ingress.kubernetes.io/cors-max-age: "86400" - hostname: "" # Set here the hostname for the ingress. Example : blockscout-backend.scrollsdk + annotations: # Add annotations here. Might be necessary to allow CORS from updated-gas-oracle. Example below +# cert-manager.io/cluster-issuer: letsencrypt-prod +# nginx.ingress.kubernetes.io/enable-cors: "true" +# nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk" +# nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" +# nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" +# nginx.ingress.kubernetes.io/cors-max-age: "86400" + hostname: "" # Set the hostname for the frontend. Example : blockscout.scrollsdk + tls: + enabled: true + secretName: blockscout-front-tls # Set here the hostname for the ingress. Example : blockscout.scrollsdk externalSecrets: blockscout-secret-env: From 4d6d36eb5a04e10112bfcb71aab78c2636c51a82 Mon Sep 17 00:00:00 2001 From: Sebastien Baizet Date: Fri, 25 Oct 2024 20:00:45 +0200 Subject: [PATCH 04/19] lint --- charts/blockscout/values/production.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/charts/blockscout/values/production.yaml b/charts/blockscout/values/production.yaml index d05f5e4d..6bea7dc9 100644 --- a/charts/blockscout/values/production.yaml +++ b/charts/blockscout/values/production.yaml @@ -36,12 +36,12 @@ blockscout-stack: enabled: true className: "" annotations: # Add annotations here. Might be necessary to allow CORS from updated-gas-oracle. Example below -# cert-manager.io/cluster-issuer: letsencrypt-prod -# nginx.ingress.kubernetes.io/enable-cors: "true" -# nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk" -# nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" -# nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" -# nginx.ingress.kubernetes.io/cors-max-age: "86400" + # cert-manager.io/cluster-issuer: letsencrypt-prod + # nginx.ingress.kubernetes.io/enable-cors: "true" + # nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk" + # nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" + # nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" + # nginx.ingress.kubernetes.io/cors-max-age: "86400" hostname: "blockscout-backend.hsk.scroll.systems" tls: enabled: true @@ -52,12 +52,12 @@ blockscout-stack: enabled: true ingressClassName: "" # Set here your ingressClassName annotations: # Add annotations here. Might be necessary to allow CORS from updated-gas-oracle. Example below -# cert-manager.io/cluster-issuer: letsencrypt-prod -# nginx.ingress.kubernetes.io/enable-cors: "true" -# nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk" -# nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" -# nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" -# nginx.ingress.kubernetes.io/cors-max-age: "86400" + # cert-manager.io/cluster-issuer: letsencrypt-prod + # nginx.ingress.kubernetes.io/enable-cors: "true" + # nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk" + # nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" + # nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" + # nginx.ingress.kubernetes.io/cors-max-age: "86400" hostname: "" # Set the hostname for the frontend. Example : blockscout.scrollsdk tls: enabled: true From 597614baabe54f0131bb89fd5858b064c9348c34 Mon Sep 17 00:00:00 2001 From: Daniel Helm Date: Sat, 26 Oct 2024 16:45:57 -0500 Subject: [PATCH 05/19] adds ingress.BLOCKSCOUT_BACKEND_HOST to config.toml files --- charts/scroll-sdk/config.toml | 7 ++++--- examples/config.toml.example | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/charts/scroll-sdk/config.toml b/charts/scroll-sdk/config.toml index 2ef72d85..9ab8111b 100644 --- a/charts/scroll-sdk/config.toml +++ b/charts/scroll-sdk/config.toml @@ -4,8 +4,8 @@ L1_RPC_ENDPOINT = "http://l1-devnet:8545" L1_RPC_ENDPOINT_WEBSOCKET = "ws://l1-devnet:8546" L2_RPC_ENDPOINT = "http://l2-sequencer:8545" -CHAIN_NAME_L1="Ethereum" -CHAIN_NAME_L2="Scroll SDK" +CHAIN_NAME_L1 = "Ethereum" +CHAIN_NAME_L2 = "Scroll SDK" CHAIN_ID_L1 = 111111 CHAIN_ID_L2 = 221122 @@ -120,5 +120,6 @@ ROLLUP_EXPLORER_API_HOST = "rollup-explorer-backend.scrollsdk" COORDINATOR_API_HOST = "coordinator-api.scrollsdk" RPC_GATEWAY_HOST = "l2-rpc.scrollsdk" BLOCKSCOUT_HOST = "blockscout.scrollsdk" -ADMIN_SYSTEM_DASHBOARD_HOST= "admin-system-dashboard.scrollsdk" +BLOCKSCOUT_BACKEND_HOST = "blockscout-backend.scrollsdk" +ADMIN_SYSTEM_DASHBOARD_HOST = "admin-system-dashboard.scrollsdk" GRAFANA_HOST = "http://grafana.scrollsdk" diff --git a/examples/config.toml.example b/examples/config.toml.example index 75383920..e4413848 100644 --- a/examples/config.toml.example +++ b/examples/config.toml.example @@ -122,6 +122,7 @@ ROLLUP_EXPLORER_API_HOST = "rollup-explorer-backend.scrollsdk" COORDINATOR_API_HOST = "coordinator-api.scrollsdk" RPC_GATEWAY_HOST = "l2-rpc.scrollsdk" BLOCKSCOUT_HOST = "blockscout.scrollsdk" +BLOCKSCOUT_BACKEND_HOST = "blockscout-backend.scrollsdk" ADMIN_SYSTEM_DASHBOARD_HOST = "admin-system-dashboard.scrollsdk" L1_DEVNET_HOST = "l1-devnet.scrollsdk" L1_EXPLORER_HOST = "l1-explorer.scrollsdk" From e2895205c394be20d3e351ae59f6134cc6ccf94e Mon Sep 17 00:00:00 2001 From: Sebastien Baizet Date: Tue, 29 Oct 2024 08:46:08 +0100 Subject: [PATCH 06/19] disable SSL for blockscout devnet --- charts/blockscout/README.md | 2 ++ charts/blockscout/values.yaml | 2 ++ charts/blockscout/values/production.yaml | 1 + 3 files changed, 5 insertions(+) diff --git a/charts/blockscout/README.md b/charts/blockscout/README.md index c82d0a5d..e9b0cbce 100644 --- a/charts/blockscout/README.md +++ b/charts/blockscout/README.md @@ -46,6 +46,8 @@ Kubernetes: `>=1.22.0-0` | blockscout-stack.blockscout.ingress.className | string | `"nginx"` | | | blockscout-stack.blockscout.ingress.enabled | bool | `true` | | | blockscout-stack.blockscout.ingress.hostname | string | `"blockscout-backend.scrollsdk"` | | +| blockscout-stack.frontend.env.ECTO_USE_SSL | bool | `false` | | +| blockscout-stack.frontend.env.ETHEREUM_JSONRPC_HTTP_INSECURE | bool | `true` | | | blockscout-stack.frontend.env.FAVICON_MASTER_URL | string | `"https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/favicons/scroll_180x180.png"` | | | blockscout-stack.frontend.env.NEXT_PUBLIC_HOMEPAGE_CHARTS | string | `"[\"daily_txs\"]"` | | | blockscout-stack.frontend.env.NEXT_PUBLIC_HOMEPAGE_HERO_BANNER_CONFIG | string | `"{'background':['rgba(255, 238, 218, 1)'],'text_color':['rgba(25, 6, 2, 1)']}"` | | diff --git a/charts/blockscout/values.yaml b/charts/blockscout/values.yaml index 1fce09fd..c1e1afeb 100644 --- a/charts/blockscout/values.yaml +++ b/charts/blockscout/values.yaml @@ -60,6 +60,8 @@ blockscout-stack: FAVICON_MASTER_URL: "https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/favicons/scroll_180x180.png" NEXT_PUBLIC_HOMEPAGE_CHARTS: '["daily_txs"]' NEXT_PUBLIC_HOMEPAGE_STATS: '["total_blocks", "average_block_time", "total_txs", "wallet_addresses", "gas_tracker"]' + ECTO_USE_SSL: false + ETHEREUM_JSONRPC_HTTP_INSECURE: true ingress: enabled: true diff --git a/charts/blockscout/values/production.yaml b/charts/blockscout/values/production.yaml index 6bea7dc9..d9c91aae 100644 --- a/charts/blockscout/values/production.yaml +++ b/charts/blockscout/values/production.yaml @@ -20,6 +20,7 @@ blockscout-stack: INDEXER_SCROLL_L1_ETH_GET_LOGS_RANGE_SIZE: 500 INDEXER_SCROLL_L2_ETH_GET_LOGS_RANGE_SIZE: 500 SCROLL_L2_CURIE_UPGRADE_BLOCK: 0 + ECTO_USE_SSL: true envFrom: - secretRef: From 498b9cb405be375915e10406f1c90a6a83937f21 Mon Sep 17 00:00:00 2001 From: Sebastien Baizet Date: Tue, 29 Oct 2024 08:56:15 +0100 Subject: [PATCH 07/19] set the env in backend instead of front --- charts/blockscout/README.md | 4 ++-- charts/blockscout/values.yaml | 4 ++-- charts/blockscout/values/production.yaml | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/charts/blockscout/README.md b/charts/blockscout/README.md index e9b0cbce..423cfc38 100644 --- a/charts/blockscout/README.md +++ b/charts/blockscout/README.md @@ -25,6 +25,8 @@ Kubernetes: `>=1.22.0-0` |-----|------|---------|-------------| | blockscout-stack.blockscout.env.BLOCK_TRANSFORMER | string | `"clique"` | | | blockscout-stack.blockscout.env.CHAIN_TYPE | string | `"scroll"` | | +| blockscout-stack.blockscout.env.ECTO_USE_SSL | bool | `false` | | +| blockscout-stack.blockscout.env.ETHEREUM_JSONRPC_HTTP_INSECURE | bool | `true` | | | blockscout-stack.blockscout.env.ETHEREUM_JSONRPC_HTTP_URL | string | `"http://l2-rpc:8545"` | | | blockscout-stack.blockscout.env.ETHEREUM_JSONRPC_TRACE_URL | string | `"http://l2-rpc:8545"` | | | blockscout-stack.blockscout.env.ETHEREUM_JSONRPC_VARIANT | string | `"geth"` | | @@ -46,8 +48,6 @@ Kubernetes: `>=1.22.0-0` | blockscout-stack.blockscout.ingress.className | string | `"nginx"` | | | blockscout-stack.blockscout.ingress.enabled | bool | `true` | | | blockscout-stack.blockscout.ingress.hostname | string | `"blockscout-backend.scrollsdk"` | | -| blockscout-stack.frontend.env.ECTO_USE_SSL | bool | `false` | | -| blockscout-stack.frontend.env.ETHEREUM_JSONRPC_HTTP_INSECURE | bool | `true` | | | blockscout-stack.frontend.env.FAVICON_MASTER_URL | string | `"https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/favicons/scroll_180x180.png"` | | | blockscout-stack.frontend.env.NEXT_PUBLIC_HOMEPAGE_CHARTS | string | `"[\"daily_txs\"]"` | | | blockscout-stack.frontend.env.NEXT_PUBLIC_HOMEPAGE_HERO_BANNER_CONFIG | string | `"{'background':['rgba(255, 238, 218, 1)'],'text_color':['rgba(25, 6, 2, 1)']}"` | | diff --git a/charts/blockscout/values.yaml b/charts/blockscout/values.yaml index c1e1afeb..a9d15836 100644 --- a/charts/blockscout/values.yaml +++ b/charts/blockscout/values.yaml @@ -23,6 +23,8 @@ blockscout-stack: INDEXER_SCROLL_L1_ETH_GET_LOGS_RANGE_SIZE: 500 INDEXER_SCROLL_L2_ETH_GET_LOGS_RANGE_SIZE: 500 SCROLL_L2_CURIE_UPGRADE_BLOCK: 0 + ECTO_USE_SSL: false + ETHEREUM_JSONRPC_HTTP_INSECURE: true # Not sure what these values are for # SCROLL_L1_SCALAR_INIT: # SCROLL_L1_OVERHEAD_INIT: @@ -60,8 +62,6 @@ blockscout-stack: FAVICON_MASTER_URL: "https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/favicons/scroll_180x180.png" NEXT_PUBLIC_HOMEPAGE_CHARTS: '["daily_txs"]' NEXT_PUBLIC_HOMEPAGE_STATS: '["total_blocks", "average_block_time", "total_txs", "wallet_addresses", "gas_tracker"]' - ECTO_USE_SSL: false - ETHEREUM_JSONRPC_HTTP_INSECURE: true ingress: enabled: true diff --git a/charts/blockscout/values/production.yaml b/charts/blockscout/values/production.yaml index d9c91aae..c5cbfb72 100644 --- a/charts/blockscout/values/production.yaml +++ b/charts/blockscout/values/production.yaml @@ -21,6 +21,7 @@ blockscout-stack: INDEXER_SCROLL_L2_ETH_GET_LOGS_RANGE_SIZE: 500 SCROLL_L2_CURIE_UPGRADE_BLOCK: 0 ECTO_USE_SSL: true + ETHEREUM_JSONRPC_HTTP_INSECURE: false envFrom: - secretRef: From 46178e3f4dd63b663f01b729271ff6b87888b7fc Mon Sep 17 00:00:00 2001 From: Sebastien Baizet Date: Wed, 30 Oct 2024 12:09:00 +0100 Subject: [PATCH 08/19] update blockscout chart --- charts/blockscout/README.md | 12 ++++++------ charts/blockscout/values.yaml | 13 ++++++------- charts/blockscout/values/production.yaml | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/charts/blockscout/README.md b/charts/blockscout/README.md index 423cfc38..c0cf63d4 100644 --- a/charts/blockscout/README.md +++ b/charts/blockscout/README.md @@ -40,15 +40,15 @@ Kubernetes: `>=1.22.0-0` | blockscout-stack.blockscout.image.pullPolicy | string | `"IfNotPresent"` | | | blockscout-stack.blockscout.image.repository | string | `"blockscout/blockscout-scroll"` | | | blockscout-stack.blockscout.image.tag | string | `"6.9.0-alpha.1"` | | -| blockscout-stack.blockscout.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-headers" | string | `"updated-gas-oracle, Content-Type, Authorization"` | | -| blockscout-stack.blockscout.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-methods" | string | `"GET, POST, OPTIONS"` | | -| blockscout-stack.blockscout.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-origin" | string | `"https://blockscout.scrollsdk"` | | -| blockscout-stack.blockscout.ingress.annotations."nginx.ingress.kubernetes.io/cors-max-age" | string | `"86400"` | | -| blockscout-stack.blockscout.ingress.annotations."nginx.ingress.kubernetes.io/enable-cors" | string | `"true"` | | +| blockscout-stack.blockscout.ingress.annotations | object | `{}` | | | blockscout-stack.blockscout.ingress.className | string | `"nginx"` | | | blockscout-stack.blockscout.ingress.enabled | bool | `true` | | | blockscout-stack.blockscout.ingress.hostname | string | `"blockscout-backend.scrollsdk"` | | | blockscout-stack.frontend.env.FAVICON_MASTER_URL | string | `"https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/favicons/scroll_180x180.png"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_API_HOST | string | `"blockscout-backend.scrollsdk"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_API_PROTOCOL | string | `"http"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_API_WEBSOCKET_PROTOCOL | string | `"ws"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_APP_PROTOCOL | string | `"http"` | | | blockscout-stack.frontend.env.NEXT_PUBLIC_HOMEPAGE_CHARTS | string | `"[\"daily_txs\"]"` | | | blockscout-stack.frontend.env.NEXT_PUBLIC_HOMEPAGE_HERO_BANNER_CONFIG | string | `"{'background':['rgba(255, 238, 218, 1)'],'text_color':['rgba(25, 6, 2, 1)']}"` | | | blockscout-stack.frontend.env.NEXT_PUBLIC_HOMEPAGE_STATS | string | `"[\"total_blocks\", \"average_block_time\", \"total_txs\", \"wallet_addresses\", \"gas_tracker\"]"` | | @@ -60,7 +60,7 @@ Kubernetes: `>=1.22.0-0` | blockscout-stack.frontend.image.tag | string | `"v1.35.2"` | | | blockscout-stack.frontend.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-headers" | string | `"updated-gas-oracle, Content-Type, Authorization"` | | | blockscout-stack.frontend.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-methods" | string | `"GET, POST, OPTIONS"` | | -| blockscout-stack.frontend.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-origin" | string | `"https://blockscout.scrollsdk"` | | +| blockscout-stack.frontend.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-origin" | string | `"http://blockscout.scrollsdk"` | | | blockscout-stack.frontend.ingress.annotations."nginx.ingress.kubernetes.io/cors-max-age" | string | `"86400"` | | | blockscout-stack.frontend.ingress.annotations."nginx.ingress.kubernetes.io/enable-cors" | string | `"true"` | | | blockscout-stack.frontend.ingress.className | string | `"nginx"` | | diff --git a/charts/blockscout/values.yaml b/charts/blockscout/values.yaml index a9d15836..b4c2d558 100644 --- a/charts/blockscout/values.yaml +++ b/charts/blockscout/values.yaml @@ -40,12 +40,7 @@ blockscout-stack: ingress: enabled: true className: "nginx" - annotations: - nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk" - nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" - nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" - nginx.ingress.kubernetes.io/cors-max-age: "86400" + annotations: {} hostname: blockscout-backend.scrollsdk frontend: @@ -62,12 +57,16 @@ blockscout-stack: FAVICON_MASTER_URL: "https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/favicons/scroll_180x180.png" NEXT_PUBLIC_HOMEPAGE_CHARTS: '["daily_txs"]' NEXT_PUBLIC_HOMEPAGE_STATS: '["total_blocks", "average_block_time", "total_txs", "wallet_addresses", "gas_tracker"]' + NEXT_PUBLIC_API_PROTOCOL: http + NEXT_PUBLIC_API_WEBSOCKET_PROTOCOL: ws + NEXT_PUBLIC_API_HOST: "blockscout-backend.scrollsdk" + NEXT_PUBLIC_APP_PROTOCOL: http ingress: enabled: true annotations: nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk" + nginx.ingress.kubernetes.io/cors-allow-origin: "http://blockscout.scrollsdk" nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" nginx.ingress.kubernetes.io/cors-max-age: "86400" diff --git a/charts/blockscout/values/production.yaml b/charts/blockscout/values/production.yaml index c5cbfb72..8898bdb5 100644 --- a/charts/blockscout/values/production.yaml +++ b/charts/blockscout/values/production.yaml @@ -47,7 +47,7 @@ blockscout-stack: hostname: "blockscout-backend.hsk.scroll.systems" tls: enabled: true - secretName: blockscout-tls # Set here the hostname for the ingress. Example : blockscout-backend.scrollsdk + secretName: blockscout-tls # Set here the name of the secret. Example : blockscout-backend.scrollsdk frontend: ingress: From 80846f44fa3c9ad574cea3c00840b11a6408a0b1 Mon Sep 17 00:00:00 2001 From: Sebastien Baizet Date: Wed, 30 Oct 2024 12:27:27 +0100 Subject: [PATCH 09/19] update script create-env-files.sh with new blockscout values --- devnet/create-env-files.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devnet/create-env-files.sh b/devnet/create-env-files.sh index 7bdd10ee..9c1ea00f 100755 --- a/devnet/create-env-files.sh +++ b/devnet/create-env-files.sh @@ -31,7 +31,7 @@ get_service_configmap_variables() { echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC L2_RPC_ENDPOINT:SCROLL_L2_RPC" ;; blockscout) - echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC BLOCKSCOUT_DB_CONNECTION_STRING:DATABASE_URL L1_SCROLL_CHAIN_PROXY_ADDR:INDEXER_SCROLL_L1_CHAIN_CONTRACT L1_CONTRACT_DEPLOYMENT_BLOCK:INDEXER_SCROLL_L1_BATCH_START_BLOCK L1_SCROLL_MESSENGER_PROXY_ADDR:INDEXER_SCROLL_L1_MESSENGER_CONTRACT L1_CONTRACT_DEPLOYMENT_BLOCK:INDEXER_SCROLL_L1_MESSENGER_START_BLOCK L2_SCROLL_MESSENGER_PROXY_ADDR:INDEXER_SCROLL_L2_MESSENGER_CONTRACT L1_GAS_PRICE_ORACLE_ADDR:INDEXER_SCROLL_L2_GAS_ORACLE_CONTRACT" + echo "L1_RPC_ENDPOINT:INDEXER_SCROLL_L1_RPC BLOCKSCOUT_DB_CONNECTION_STRING:DATABASE_URL L1_SCROLL_CHAIN_PROXY_ADDR:INDEXER_SCROLL_L1_CHAIN_CONTRACT L1_CONTRACT_DEPLOYMENT_BLOCK:INDEXER_SCROLL_L1_BATCH_START_BLOCK L1_SCROLL_MESSENGER_PROXY_ADDR:INDEXER_SCROLL_L1_MESSENGER_CONTRACT L1_CONTRACT_DEPLOYMENT_BLOCK:INDEXER_SCROLL_L1_MESSENGER_START_BLOCK L2_SCROLL_MESSENGER_PROXY_ADDR:INDEXER_SCROLL_L2_MESSENGER_CONTRACT L1_GAS_PRICE_ORACLE_ADDR:INDEXER_SCROLL_L2_GAS_ORACLE_CONTRACT" ;; bridge-history-api) echo "L1_RPC_ENDPOINT:SCROLL_L1_RPC L2_RPC_ENDPOINT:SCROLL_L2_RPC BRIDGE_HISTORY_DB_CONNECTION_STRING:SCROLL_BRIDGE_HISTORY_DB_DSN" From 16328edb677008ddc9dc8b55789af4a5658904cd Mon Sep 17 00:00:00 2001 From: Sebastien Baizet Date: Wed, 30 Oct 2024 13:59:40 +0100 Subject: [PATCH 10/19] add env var for production.yaml file on blosckout chart --- charts/blockscout/values/production.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/charts/blockscout/values/production.yaml b/charts/blockscout/values/production.yaml index 8898bdb5..dd3dda85 100644 --- a/charts/blockscout/values/production.yaml +++ b/charts/blockscout/values/production.yaml @@ -50,6 +50,13 @@ blockscout-stack: secretName: blockscout-tls # Set here the name of the secret. Example : blockscout-backend.scrollsdk frontend: + env: + NEXT_PUBLIC_API_PROTOCOL: https + NEXT_PUBLIC_API_WEBSOCKET_PROTOCOL: wss + NEXT_PUBLIC_API_HOST: "" # Backend host, example "blockscout-backend.scrollsdk" + NEXT_PUBLIC_APP_HOST: "" # Backend host, example "blockscout-backend.scrollsdk" + NEXT_PUBLIC_APP_PROTOCOL: https + ingress: enabled: true ingressClassName: "" # Set here your ingressClassName From 08739d41e13f6256339afe843db8d9c6d02aa07a Mon Sep 17 00:00:00 2001 From: Sebastien Baizet Date: Wed, 30 Oct 2024 14:05:37 +0100 Subject: [PATCH 11/19] add blockscout.yaml file on example folder --- examples/values/blockscout-production.yaml | 93 +++++++++++++++------- 1 file changed, 66 insertions(+), 27 deletions(-) diff --git a/examples/values/blockscout-production.yaml b/examples/values/blockscout-production.yaml index aa2e019e..dd3dda85 100644 --- a/examples/values/blockscout-production.yaml +++ b/examples/values/blockscout-production.yaml @@ -1,37 +1,76 @@ -envFrom: - - secretRef: - name: blockscout-secret-env +blockscout-stack: + blockscout: -persistence: - env: - enabled: true - type: secret - mountPath: /config/ - name: blockscout-secret-env + env: + ETHEREUM_JSONRPC_HTTP_URL: http://l2-rpc:8545 + ETHEREUM_JSONRPC_TRACE_URL: http://l2-rpc:8545 + ETHEREUM_JSONRPC_VARIANT: geth + ETHEREUM_JSONRPC_WS_URL: ws://l2-rpc:8546 + BLOCK_TRANSFORMER: clique + INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: true + CHAIN_TYPE: scroll + INDEXER_SCROLL_L1_CHAIN_CONTRACT: "" # value of L1_SCROLL_CHAIN_PROXY_ADDR on config-contracts.toml + INDEXER_SCROLL_L1_BATCH_START_BLOCK: "" # value of L1_CONTRACT_DEPLOYMENT_BLOCK on config.toml + INDEXER_SCROLL_L1_MESSENGER_CONTRACT: "" # value of L1_SCROLL_MESSENGER_PROXY_ADDR on config-contracts.toml + INDEXER_SCROLL_L1_MESSENGER_START_BLOCK: "" # value of L1_CONTRACT_DEPLOYMENT_BLOCK on config.toml + INDEXER_SCROLL_L2_MESSENGER_CONTRACT: "" # value of L2_SCROLL_MESSENGER_PROXY_ADDR on config-contracts.toml + INDEXER_SCROLL_L2_GAS_ORACLE_CONTRACT: "" # value of L1_GAS_PRICE_ORACLE_PROXY_ADDR on config-contracts.toml + INDEXER_SCROLL_L1_RPC: "" + INDEXER_SCROLL_L2_MESSENGER_START_BLOCK: 0 + INDEXER_SCROLL_L1_ETH_GET_LOGS_RANGE_SIZE: 500 + INDEXER_SCROLL_L2_ETH_GET_LOGS_RANGE_SIZE: 500 + SCROLL_L2_CURIE_UPGRADE_BLOCK: 0 + ECTO_USE_SSL: true + ETHEREUM_JSONRPC_HTTP_INSECURE: false -initContainers: - 1-migrate-db: - image: blockscout/blockscout:6.6.0 - command: ["/bin/sh", "-c", "/app/bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\""] envFrom: - secretRef: name: blockscout-secret-env -configMaps: - env: - enabled: true - data: - PG_HOST: "postgresql-blockscout" - PG_PORT: "5432" + extraEnv: + - name: DATABASE_URL + valueFrom: + secretKeyRef: + name: blockscout-secret-env + key: DATABASE_URL + + ingress: + enabled: true + className: "" + annotations: # Add annotations here. Might be necessary to allow CORS from updated-gas-oracle. Example below + # cert-manager.io/cluster-issuer: letsencrypt-prod + # nginx.ingress.kubernetes.io/enable-cors: "true" + # nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk" + # nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" + # nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" + # nginx.ingress.kubernetes.io/cors-max-age: "86400" + hostname: "blockscout-backend.hsk.scroll.systems" + tls: + enabled: true + secretName: blockscout-tls # Set here the name of the secret. Example : blockscout-backend.scrollsdk + + frontend: + env: + NEXT_PUBLIC_API_PROTOCOL: https + NEXT_PUBLIC_API_WEBSOCKET_PROTOCOL: wss + NEXT_PUBLIC_API_HOST: "" # Backend host, example "blockscout-backend.scrollsdk" + NEXT_PUBLIC_APP_HOST: "" # Backend host, example "blockscout-backend.scrollsdk" + NEXT_PUBLIC_APP_PROTOCOL: https -ingress: - main: - ingressClassName: "nginx" - hosts: - - host: "" - paths: - - path: / - pathType: Prefix + ingress: + enabled: true + ingressClassName: "" # Set here your ingressClassName + annotations: # Add annotations here. Might be necessary to allow CORS from updated-gas-oracle. Example below + # cert-manager.io/cluster-issuer: letsencrypt-prod + # nginx.ingress.kubernetes.io/enable-cors: "true" + # nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk" + # nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" + # nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" + # nginx.ingress.kubernetes.io/cors-max-age: "86400" + hostname: "" # Set the hostname for the frontend. Example : blockscout.scrollsdk + tls: + enabled: true + secretName: blockscout-front-tls # Set here the hostname for the ingress. Example : blockscout.scrollsdk externalSecrets: blockscout-secret-env: From d84cd7cb70f6503db276e66b14e61ad618141734 Mon Sep 17 00:00:00 2001 From: Sebastien Baizet Date: Wed, 30 Oct 2024 14:13:49 +0100 Subject: [PATCH 12/19] update l1-explorer --- charts/l1-explorer/Chart.yaml | 8 +- charts/l1-explorer/README.md | 130 ++++++------------ charts/l1-explorer/templates/common.yaml | 14 -- charts/l1-explorer/values.yaml | 162 ++++++++--------------- 4 files changed, 98 insertions(+), 216 deletions(-) diff --git a/charts/l1-explorer/Chart.yaml b/charts/l1-explorer/Chart.yaml index 36876af7..8ef15231 100644 --- a/charts/l1-explorer/Chart.yaml +++ b/charts/l1-explorer/Chart.yaml @@ -2,16 +2,16 @@ apiVersion: v2 description: l1-explorer helm charts name: l1-explorer -version: 0.0.2 +version: 0.0.3 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: - name: scroll-tech email: sebastien@scroll.io dependencies: - - name: common - repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" - version: 1.5.1 - name: external-secrets-lib repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" version: 0.0.3 + - name: blockscout-stack + repository: https://blockscout.github.io/helm-charts + version: 1.6.8 diff --git a/charts/l1-explorer/README.md b/charts/l1-explorer/README.md index 3f28f368..7a594092 100644 --- a/charts/l1-explorer/README.md +++ b/charts/l1-explorer/README.md @@ -1,6 +1,6 @@ # l1-explorer -![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.2-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.0.3](https://img.shields.io/badge/Version-0.0.3-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) l1-explorer helm charts @@ -16,99 +16,53 @@ Kubernetes: `>=1.22.0-0` | Repository | Name | Version | |------------|------|---------| -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | common | 1.5.1 | +| https://blockscout.github.io/helm-charts | blockscout-stack | 1.6.8 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | external-secrets-lib | 0.0.3 | ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| -| command[0] | string | `"/bin/sh"` | | -| command[1] | string | `"-c"` | | -| command[2] | string | `"/app/bin/blockscout start"` | | -| controller.replicas | int | `1` | | -| controller.strategy | string | `"Recreate"` | | -| controller.type | string | `"deployment"` | | -| defaultProbes.custom | bool | `true` | | -| defaultProbes.enabled | bool | `true` | | -| defaultProbes.spec.httpGet.path | string | `"/"` | | -| defaultProbes.spec.httpGet.port | int | `3000` | | -| envFrom[0].configMapRef.name | string | `"l1-explorer-env"` | | -| env[0].name | string | `"ECTO_USE_SSL"` | | -| env[0].value | bool | `false` | | -| env[10].name | string | `"SUBNETWORK"` | | -| env[10].value | string | `"Scroll Sepolia Testnet"` | | -| env[11].name | string | `"SUPPORTED_CHAINS"` | | -| env[11].value | string | `"[{ \"title\": \"Scroll SDK (L1)\", \"url\": \"https://localhost:3000\", \"test_net?\": true }, { \"title\": \"Scroll SDK (L2) Testnet\", \"url\": \"http://blockscout:3000\", \"test_net?\": true }]"` | | -| env[12].name | string | `"DISABLE_EXCHANGE_RATES"` | | -| env[12].value | bool | `true` | | -| env[13].name | string | `"BLOCKSCOUT_VERSION"` | | -| env[13].value | string | `"5.2.1"` | | -| env[14].name | string | `"FOOTER_GITHUB_LINK"` | | -| env[14].value | string | `"https://github.com/blockscout/blockscout"` | | -| env[15].name | string | `"ETHEREUM_JSONRPC_DEBUG_TRACE_TRANSACTION_TIMEOUT"` | | -| env[15].value | string | `"10s"` | | -| env[16].name | string | `"INDEXER_MEMORY_LIMIT"` | | -| env[16].value | string | `"10gb"` | | -| env[17].name | string | `"BLOCK_TRANSFORMER"` | | -| env[17].value | string | `"clique"` | | -| env[18].name | string | `"MICROSERVICE_SC_VERIFIER_ENABLED"` | | -| env[18].value | bool | `true` | | -| env[1].name | string | `"ETHEREUM_JSONRPC_VARIANT"` | | -| env[1].value | string | `"geth"` | | -| env[2].name | string | `"INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER"` | | -| env[2].value | bool | `true` | | -| env[3].name | string | `"PORT"` | | -| env[3].value | int | `3000` | | -| env[4].name | string | `"NETWORK"` | | -| env[4].value[0] | string | `""` | | -| env[5].name | string | `"COIN"` | | -| env[5].value | string | `"ETH"` | | -| env[6].name | string | `"COIN_NAME"` | | -| env[6].value | string | `"ETH"` | | -| env[7].name | string | `"LOGO"` | | -| env[7].value | string | `"/images/logo.svg"` | | -| env[8].name | string | `"WEBAPP_URL"` | | -| env[8].value | string | `"https://l1-explorer.scroll.tech"` | | -| env[9].name | string | `"BLOCKSCOUT_HOST"` | | -| env[9].value | string | `"test-l1-explorer.scroll.io"` | | -| global.fullnameOverride | string | `"l1-explorer"` | | -| global.nameOverride | string | `"l1-explorer"` | | -| image.pullPolicy | string | `"Always"` | | -| image.repository | string | `"blockscout/blockscout"` | | -| image.tag | string | `"6.6.0"` | | -| ingress.main.annotations | object | `{}` | | -| ingress.main.enabled | bool | `true` | | -| ingress.main.hosts[0].host | string | `"l1-explorer.scrollsdk"` | | -| ingress.main.hosts[0].paths[0].path | string | `"/"` | | -| ingress.main.hosts[0].paths[0].pathType | string | `"Prefix"` | | -| ingress.main.ingressClassName | string | `"nginx"` | | -| ingress.main.labels | object | `{}` | | -| ingress.main.primary | bool | `true` | | -| initContainers.1-migrate-db.command[0] | string | `"/bin/sh"` | | -| initContainers.1-migrate-db.command[1] | string | `"-c"` | | -| initContainers.1-migrate-db.command[2] | string | `"/app/bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\""` | | -| initContainers.1-migrate-db.envFrom[0].configMapRef.name | string | `"l1-explorer-env"` | | -| initContainers.1-migrate-db.image | string | `"blockscout/blockscout:6.6.0"` | | -| persistence.env.enabled | bool | `true` | | -| persistence.env.mountPath | string | `"/config/"` | | -| persistence.env.name | string | `"l1-explorer-env"` | | -| persistence.env.type | string | `"configMap"` | | -| probes.liveness.<<.custom | bool | `true` | | -| probes.liveness.<<.enabled | bool | `true` | | -| probes.liveness.<<.spec.httpGet.path | string | `"/"` | | -| probes.liveness.<<.spec.httpGet.port | int | `3000` | | -| probes.readiness.<<.custom | bool | `true` | | -| probes.readiness.<<.enabled | bool | `true` | | -| probes.readiness.<<.spec.httpGet.path | string | `"/"` | | -| probes.readiness.<<.spec.httpGet.port | int | `3000` | | -| probes.startup.<<.custom | bool | `true` | | -| probes.startup.<<.enabled | bool | `true` | | -| probes.startup.<<.spec.httpGet.path | string | `"/"` | | -| probes.startup.<<.spec.httpGet.port | int | `3000` | | -| service.main.enabled | bool | `true` | | -| service.main.ports.http.enabled | bool | `true` | | -| service.main.ports.http.port | int | `3000` | | +| blockscout-stack.blockscout.env.BLOCK_TRANSFORMER | string | `"clique"` | | +| blockscout-stack.blockscout.env.ECTO_USE_SSL | bool | `false` | | +| blockscout-stack.blockscout.env.ETHEREUM_JSONRPC_HTTP_INSECURE | bool | `true` | | +| blockscout-stack.blockscout.env.ETHEREUM_JSONRPC_HTTP_URL | string | `"http://l2-rpc:8545"` | | +| blockscout-stack.blockscout.env.ETHEREUM_JSONRPC_TRACE_URL | string | `"http://l2-rpc:8545"` | | +| blockscout-stack.blockscout.env.ETHEREUM_JSONRPC_VARIANT | string | `"geth"` | | +| blockscout-stack.blockscout.env.ETHEREUM_JSONRPC_WS_URL | string | `"ws://l2-rpc:8546"` | | +| blockscout-stack.blockscout.env.INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER | bool | `true` | | +| blockscout-stack.blockscout.envFrom[0].configMapRef.name | string | `"l1-explorer-env"` | | +| blockscout-stack.blockscout.image.pullPolicy | string | `"IfNotPresent"` | | +| blockscout-stack.blockscout.image.repository | string | `"blockscout/blockscout-scroll"` | | +| blockscout-stack.blockscout.image.tag | string | `"6.9.0-alpha.1"` | | +| blockscout-stack.blockscout.ingress.annotations | object | `{}` | | +| blockscout-stack.blockscout.ingress.className | string | `"nginx"` | | +| blockscout-stack.blockscout.ingress.enabled | bool | `true` | | +| blockscout-stack.blockscout.ingress.hostname | string | `"l1-explorer.scrollsdk"` | | +| blockscout-stack.frontend.env.FAVICON_MASTER_URL | string | `"https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/favicons/scroll_180x180.png"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_API_HOST | string | `"l1-explorer.scrollsdk"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_API_PROTOCOL | string | `"http"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_API_WEBSOCKET_PROTOCOL | string | `"ws"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_APP_PROTOCOL | string | `"http"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_HOMEPAGE_CHARTS | string | `"[\"daily_txs\"]"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_HOMEPAGE_HERO_BANNER_CONFIG | string | `"{'background':['rgba(255, 238, 218, 1)'],'text_color':['rgba(25, 6, 2, 1)']}"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_HOMEPAGE_STATS | string | `"[\"total_blocks\", \"average_block_time\", \"total_txs\", \"wallet_addresses\", \"gas_tracker\"]"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_NETWORK_ICON | string | `"https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-icons/scroll.svg"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_NETWORK_ICON_DARK | string | `"https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-icons/scroll-dark.svg"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_NETWORK_LOGO | string | `"https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-logos/scroll.svg"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_NETWORK_LOGO_DARK | string | `"https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-logos/scroll-dark.svg"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_OG_IMAGE_URL | string | `"https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/og-images/scroll-sepolia.png"` | | +| blockscout-stack.frontend.image.tag | string | `"v1.35.2"` | | +| blockscout-stack.frontend.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-headers" | string | `"updated-gas-oracle, Content-Type, Authorization"` | | +| blockscout-stack.frontend.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-methods" | string | `"GET, POST, OPTIONS"` | | +| blockscout-stack.frontend.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-origin" | string | `"http://l1-explorer.scrollsdk"` | | +| blockscout-stack.frontend.ingress.annotations."nginx.ingress.kubernetes.io/cors-max-age" | string | `"86400"` | | +| blockscout-stack.frontend.ingress.annotations."nginx.ingress.kubernetes.io/enable-cors" | string | `"true"` | | +| blockscout-stack.frontend.ingress.className | string | `"nginx"` | | +| blockscout-stack.frontend.ingress.enabled | bool | `true` | | +| blockscout-stack.frontend.ingress.hostname | string | `"l1-explorer.scrollsdk"` | | +| blockscout-stack.fullnameOverride | string | `"l1-explorer"` | | +| blockscout-stack.nameOverride | string | `"l1-explorer"` | | ---------------------------------------------- Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/l1-explorer/templates/common.yaml b/charts/l1-explorer/templates/common.yaml index 0ec7409b..844240ad 100644 --- a/charts/l1-explorer/templates/common.yaml +++ b/charts/l1-explorer/templates/common.yaml @@ -1,16 +1,2 @@ --- -{{- include "scroll.common.loader.init" . }} - -{{- define "app-template.hardcodedValues" -}} -# Set the nameOverride based on the release name if no override has been set -{{ if not .Values.global.nameOverride }} -global: - nameOverride: "{{ .Release.Name }}" -{{ end }} -{{- end -}} -{{- $_ := mergeOverwrite .Values (include "app-template.hardcodedValues" . | fromYaml) -}} - -{{/* Render the templates */}} -{{ include "scroll.common.loader.generate" . }} ---- {{- include "scrolllib.externalsecrets.tpl" . }} diff --git a/charts/l1-explorer/values.yaml b/charts/l1-explorer/values.yaml index 5b1e476c..dc6c39c8 100644 --- a/charts/l1-explorer/values.yaml +++ b/charts/l1-explorer/values.yaml @@ -1,117 +1,59 @@ ---- -global: - nameOverride: &app_name l1-explorer +blockscout-stack: + nameOverride: &app_name "l1-explorer" fullnameOverride: *app_name -controller: - replicas: 1 - strategy: Recreate - type: deployment + blockscout: + image: + repository: blockscout/blockscout-scroll + pullPolicy: IfNotPresent + tag: 6.9.0-alpha.1 + + env: + ETHEREUM_JSONRPC_HTTP_URL: http://l2-rpc:8545 + ETHEREUM_JSONRPC_TRACE_URL: http://l2-rpc:8545 + ETHEREUM_JSONRPC_VARIANT: geth + ETHEREUM_JSONRPC_WS_URL: ws://l2-rpc:8546 + BLOCK_TRANSFORMER: clique + INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: true + ECTO_USE_SSL: false + ETHEREUM_JSONRPC_HTTP_INSECURE: true -image: - repository: blockscout/blockscout - pullPolicy: Always - tag: 6.6.0 - -env: - - name: ECTO_USE_SSL - value: false - - name: ETHEREUM_JSONRPC_VARIANT - value: geth - - name: INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER - value: true - - name: PORT - value: 3000 - - name: NETWORK - value: [""] - - name: COIN - value: ETH - - name: COIN_NAME - value: ETH - - name: LOGO - value: /images/logo.svg - - name: WEBAPP_URL - value: https://l1-explorer.scroll.tech - - name: BLOCKSCOUT_HOST - value: test-l1-explorer.scroll.io - - name: SUBNETWORK - value: "Scroll Sepolia Testnet" - - name: SUPPORTED_CHAINS - value: '[{ "title": "Scroll SDK (L1)", "url": "https://localhost:3000", "test_net?": true }, { "title": "Scroll SDK (L2) Testnet", "url": "http://blockscout:3000", "test_net?": true }]' - - name: DISABLE_EXCHANGE_RATES - value: true - - name: BLOCKSCOUT_VERSION - value: 5.2.1 - - name: FOOTER_GITHUB_LINK - value: https://github.com/blockscout/blockscout - - name: ETHEREUM_JSONRPC_DEBUG_TRACE_TRANSACTION_TIMEOUT - value: 10s - - name: INDEXER_MEMORY_LIMIT - value: 10gb - - name: BLOCK_TRANSFORMER - value: clique - - name: MICROSERVICE_SC_VERIFIER_ENABLED - value: true - -envFrom: - - configMapRef: - name: l1-explorer-env - -command: - [ - "/bin/sh", - "-c", - "/app/bin/blockscout start" - ] - -service: - main: - enabled: true - ports: - http: - enabled: true - port: 3000 - -defaultProbes: &default_probes - enabled: true - custom: true - spec: - httpGet: - path: "/" - port: 3000 - -probes: - liveness: - <<: *default_probes - readiness: - <<: *default_probes - startup: - <<: *default_probes - -persistence: - env: - enabled: true - type: configMap - mountPath: /config/ - name: l1-explorer-env - -initContainers: - 1-migrate-db: - image: blockscout/blockscout:6.6.0 - command: ["/bin/sh", "-c", "/app/bin/blockscout eval \"Elixir.Explorer.ReleaseTasks.create_and_migrate()\""] envFrom: - configMapRef: name: l1-explorer-env -ingress: - main: - enabled: true - primary: true - annotations: {} - labels: {} - ingressClassName: "nginx" - hosts: - - host: l1-explorer.scrollsdk - paths: - - path: / - pathType: Prefix + ingress: + enabled: true + className: "nginx" + annotations: {} + hostname: l1-explorer.scrollsdk + + frontend: + image: + tag: v1.35.2 + + env: + NEXT_PUBLIC_NETWORK_LOGO: "https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-logos/scroll.svg" + NEXT_PUBLIC_NETWORK_LOGO_DARK: "https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-logos/scroll-dark.svg" + NEXT_PUBLIC_NETWORK_ICON: "https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-icons/scroll.svg" + NEXT_PUBLIC_NETWORK_ICON_DARK: "https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/network-icons/scroll-dark.svg" + NEXT_PUBLIC_HOMEPAGE_HERO_BANNER_CONFIG: "{'background':['rgba(255, 238, 218, 1)'],'text_color':['rgba(25, 6, 2, 1)']}" + NEXT_PUBLIC_OG_IMAGE_URL: 'https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/og-images/scroll-sepolia.png' + FAVICON_MASTER_URL: "https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/favicons/scroll_180x180.png" + NEXT_PUBLIC_HOMEPAGE_CHARTS: '["daily_txs"]' + NEXT_PUBLIC_HOMEPAGE_STATS: '["total_blocks", "average_block_time", "total_txs", "wallet_addresses", "gas_tracker"]' + NEXT_PUBLIC_API_PROTOCOL: http + NEXT_PUBLIC_API_WEBSOCKET_PROTOCOL: ws + NEXT_PUBLIC_API_HOST: "l1-explorer.scrollsdk" + NEXT_PUBLIC_APP_PROTOCOL: http + + ingress: + enabled: true + annotations: + nginx.ingress.kubernetes.io/enable-cors: "true" + nginx.ingress.kubernetes.io/cors-allow-origin: "http://l1-explorer.scrollsdk" + nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" + nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" + nginx.ingress.kubernetes.io/cors-max-age: "86400" + className: "nginx" + hostname: l1-explorer.scrollsdk From 74ee1609ebb0606dc2d024eb743b67e9fa3f73de Mon Sep 17 00:00:00 2001 From: Sebastien Baizet Date: Wed, 30 Oct 2024 14:40:11 +0100 Subject: [PATCH 13/19] remove some env var from l1-explorer --- charts/l1-explorer/README.md | 3 --- charts/l1-explorer/values.yaml | 3 --- 2 files changed, 6 deletions(-) diff --git a/charts/l1-explorer/README.md b/charts/l1-explorer/README.md index 7a594092..4050cbb8 100644 --- a/charts/l1-explorer/README.md +++ b/charts/l1-explorer/README.md @@ -26,10 +26,7 @@ Kubernetes: `>=1.22.0-0` | blockscout-stack.blockscout.env.BLOCK_TRANSFORMER | string | `"clique"` | | | blockscout-stack.blockscout.env.ECTO_USE_SSL | bool | `false` | | | blockscout-stack.blockscout.env.ETHEREUM_JSONRPC_HTTP_INSECURE | bool | `true` | | -| blockscout-stack.blockscout.env.ETHEREUM_JSONRPC_HTTP_URL | string | `"http://l2-rpc:8545"` | | -| blockscout-stack.blockscout.env.ETHEREUM_JSONRPC_TRACE_URL | string | `"http://l2-rpc:8545"` | | | blockscout-stack.blockscout.env.ETHEREUM_JSONRPC_VARIANT | string | `"geth"` | | -| blockscout-stack.blockscout.env.ETHEREUM_JSONRPC_WS_URL | string | `"ws://l2-rpc:8546"` | | | blockscout-stack.blockscout.env.INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER | bool | `true` | | | blockscout-stack.blockscout.envFrom[0].configMapRef.name | string | `"l1-explorer-env"` | | | blockscout-stack.blockscout.image.pullPolicy | string | `"IfNotPresent"` | | diff --git a/charts/l1-explorer/values.yaml b/charts/l1-explorer/values.yaml index dc6c39c8..35c712e2 100644 --- a/charts/l1-explorer/values.yaml +++ b/charts/l1-explorer/values.yaml @@ -9,10 +9,7 @@ blockscout-stack: tag: 6.9.0-alpha.1 env: - ETHEREUM_JSONRPC_HTTP_URL: http://l2-rpc:8545 - ETHEREUM_JSONRPC_TRACE_URL: http://l2-rpc:8545 ETHEREUM_JSONRPC_VARIANT: geth - ETHEREUM_JSONRPC_WS_URL: ws://l2-rpc:8546 BLOCK_TRANSFORMER: clique INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: true ECTO_USE_SSL: false From 728be6e88c2871ea1a29539cd46169707e7a4ff2 Mon Sep 17 00:00:00 2001 From: Sebastien Baizet Date: Wed, 30 Oct 2024 14:43:00 +0100 Subject: [PATCH 14/19] update scroll-sdk --- charts/scroll-sdk/Chart.yaml | 2 +- charts/scroll-sdk/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/scroll-sdk/Chart.yaml b/charts/scroll-sdk/Chart.yaml index a95e4fe5..2d2c3354 100644 --- a/charts/scroll-sdk/Chart.yaml +++ b/charts/scroll-sdk/Chart.yaml @@ -62,7 +62,7 @@ dependencies: repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: gas-oracle.enabled - name: l1-explorer - version: 0.0.2 + version: 0.0.3 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: l1-explorer.enabled - name: l2-bootnode diff --git a/charts/scroll-sdk/README.md b/charts/scroll-sdk/README.md index 41f4311d..31741e33 100644 --- a/charts/scroll-sdk/README.md +++ b/charts/scroll-sdk/README.md @@ -36,7 +36,7 @@ Kubernetes: `>=1.22.0-0` | oci://ghcr.io/scroll-tech/scroll-sdk/helm | frontends | 0.0.9 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | gas-oracle | 0.0.10 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | l1-devnet | 0.0.3 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | l1-explorer | 0.0.2 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | l1-explorer | 0.0.3 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | l2-bootnode | 0.0.15 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | l2-rpc | 0.0.15 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | l2-sequencer | 0.0.13 | From 10d918d07b2095416cada9ca280aa26a5df0c0aa Mon Sep 17 00:00:00 2001 From: Sebastien Baizet Date: Wed, 30 Oct 2024 18:41:33 +0100 Subject: [PATCH 15/19] remove add banners on blockscout --- charts/blockscout/README.md | 2 ++ charts/blockscout/values.yaml | 2 ++ charts/l1-explorer/README.md | 2 ++ charts/l1-explorer/values.yaml | 2 ++ 4 files changed, 8 insertions(+) diff --git a/charts/blockscout/README.md b/charts/blockscout/README.md index c0cf63d4..6ef0c1d8 100644 --- a/charts/blockscout/README.md +++ b/charts/blockscout/README.md @@ -45,6 +45,8 @@ Kubernetes: `>=1.22.0-0` | blockscout-stack.blockscout.ingress.enabled | bool | `true` | | | blockscout-stack.blockscout.ingress.hostname | string | `"blockscout-backend.scrollsdk"` | | | blockscout-stack.frontend.env.FAVICON_MASTER_URL | string | `"https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/favicons/scroll_180x180.png"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_AD_BANNER_PROVIDER | string | `"none"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_AD_TEXT_PROVIDER | string | `"none"` | | | blockscout-stack.frontend.env.NEXT_PUBLIC_API_HOST | string | `"blockscout-backend.scrollsdk"` | | | blockscout-stack.frontend.env.NEXT_PUBLIC_API_PROTOCOL | string | `"http"` | | | blockscout-stack.frontend.env.NEXT_PUBLIC_API_WEBSOCKET_PROTOCOL | string | `"ws"` | | diff --git a/charts/blockscout/values.yaml b/charts/blockscout/values.yaml index b4c2d558..7075d928 100644 --- a/charts/blockscout/values.yaml +++ b/charts/blockscout/values.yaml @@ -61,6 +61,8 @@ blockscout-stack: NEXT_PUBLIC_API_WEBSOCKET_PROTOCOL: ws NEXT_PUBLIC_API_HOST: "blockscout-backend.scrollsdk" NEXT_PUBLIC_APP_PROTOCOL: http + NEXT_PUBLIC_AD_BANNER_PROVIDER: none + NEXT_PUBLIC_AD_TEXT_PROVIDER: none ingress: enabled: true diff --git a/charts/l1-explorer/README.md b/charts/l1-explorer/README.md index 4050cbb8..ed1177ff 100644 --- a/charts/l1-explorer/README.md +++ b/charts/l1-explorer/README.md @@ -37,6 +37,8 @@ Kubernetes: `>=1.22.0-0` | blockscout-stack.blockscout.ingress.enabled | bool | `true` | | | blockscout-stack.blockscout.ingress.hostname | string | `"l1-explorer.scrollsdk"` | | | blockscout-stack.frontend.env.FAVICON_MASTER_URL | string | `"https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/favicons/scroll_180x180.png"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_AD_BANNER_PROVIDER | string | `"none"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_AD_TEXT_PROVIDER | string | `"none"` | | | blockscout-stack.frontend.env.NEXT_PUBLIC_API_HOST | string | `"l1-explorer.scrollsdk"` | | | blockscout-stack.frontend.env.NEXT_PUBLIC_API_PROTOCOL | string | `"http"` | | | blockscout-stack.frontend.env.NEXT_PUBLIC_API_WEBSOCKET_PROTOCOL | string | `"ws"` | | diff --git a/charts/l1-explorer/values.yaml b/charts/l1-explorer/values.yaml index 35c712e2..d0599286 100644 --- a/charts/l1-explorer/values.yaml +++ b/charts/l1-explorer/values.yaml @@ -43,6 +43,8 @@ blockscout-stack: NEXT_PUBLIC_API_WEBSOCKET_PROTOCOL: ws NEXT_PUBLIC_API_HOST: "l1-explorer.scrollsdk" NEXT_PUBLIC_APP_PROTOCOL: http + NEXT_PUBLIC_AD_BANNER_PROVIDER: none + NEXT_PUBLIC_AD_TEXT_PROVIDER: none ingress: enabled: true From 87169c5337ada3c875364b7da4b3223aa89a8e87 Mon Sep 17 00:00:00 2001 From: Sebastien Baizet Date: Wed, 30 Oct 2024 18:42:04 +0100 Subject: [PATCH 16/19] change l1-explorer image and uncomment nginx config in production.yaml file --- charts/blockscout/values/production.yaml | 28 ++++++++++++------------ charts/l1-explorer/README.md | 4 ++-- charts/l1-explorer/values.yaml | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/charts/blockscout/values/production.yaml b/charts/blockscout/values/production.yaml index dd3dda85..02b0e110 100644 --- a/charts/blockscout/values/production.yaml +++ b/charts/blockscout/values/production.yaml @@ -38,13 +38,13 @@ blockscout-stack: enabled: true className: "" annotations: # Add annotations here. Might be necessary to allow CORS from updated-gas-oracle. Example below - # cert-manager.io/cluster-issuer: letsencrypt-prod - # nginx.ingress.kubernetes.io/enable-cors: "true" - # nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk" - # nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" - # nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" - # nginx.ingress.kubernetes.io/cors-max-age: "86400" - hostname: "blockscout-backend.hsk.scroll.systems" + cert-manager.io/cluster-issuer: letsencrypt-prod + nginx.ingress.kubernetes.io/enable-cors: "true" + nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk" + nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" + nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" + nginx.ingress.kubernetes.io/cors-max-age: "86400" + hostname: "" tls: enabled: true secretName: blockscout-tls # Set here the name of the secret. Example : blockscout-backend.scrollsdk @@ -59,14 +59,14 @@ blockscout-stack: ingress: enabled: true - ingressClassName: "" # Set here your ingressClassName + className: "" # Set here your ingress class name annotations: # Add annotations here. Might be necessary to allow CORS from updated-gas-oracle. Example below - # cert-manager.io/cluster-issuer: letsencrypt-prod - # nginx.ingress.kubernetes.io/enable-cors: "true" - # nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk" - # nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" - # nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" - # nginx.ingress.kubernetes.io/cors-max-age: "86400" + cert-manager.io/cluster-issuer: letsencrypt-prod + nginx.ingress.kubernetes.io/enable-cors: "true" + nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk" + nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" + nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" + nginx.ingress.kubernetes.io/cors-max-age: "86400" hostname: "" # Set the hostname for the frontend. Example : blockscout.scrollsdk tls: enabled: true diff --git a/charts/l1-explorer/README.md b/charts/l1-explorer/README.md index ed1177ff..71660034 100644 --- a/charts/l1-explorer/README.md +++ b/charts/l1-explorer/README.md @@ -30,8 +30,8 @@ Kubernetes: `>=1.22.0-0` | blockscout-stack.blockscout.env.INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER | bool | `true` | | | blockscout-stack.blockscout.envFrom[0].configMapRef.name | string | `"l1-explorer-env"` | | | blockscout-stack.blockscout.image.pullPolicy | string | `"IfNotPresent"` | | -| blockscout-stack.blockscout.image.repository | string | `"blockscout/blockscout-scroll"` | | -| blockscout-stack.blockscout.image.tag | string | `"6.9.0-alpha.1"` | | +| blockscout-stack.blockscout.image.repository | string | `"blockscout/blockscout"` | | +| blockscout-stack.blockscout.image.tag | string | `"6.8.0"` | | | blockscout-stack.blockscout.ingress.annotations | object | `{}` | | | blockscout-stack.blockscout.ingress.className | string | `"nginx"` | | | blockscout-stack.blockscout.ingress.enabled | bool | `true` | | diff --git a/charts/l1-explorer/values.yaml b/charts/l1-explorer/values.yaml index d0599286..6f4378d9 100644 --- a/charts/l1-explorer/values.yaml +++ b/charts/l1-explorer/values.yaml @@ -4,9 +4,9 @@ blockscout-stack: blockscout: image: - repository: blockscout/blockscout-scroll + repository: blockscout/blockscout pullPolicy: IfNotPresent - tag: 6.9.0-alpha.1 + tag: 6.8.0 env: ETHEREUM_JSONRPC_VARIANT: geth From 1849b54271d9b65deba0639f73cf00c9b74a4ebb Mon Sep 17 00:00:00 2001 From: Sebastien Baizet Date: Wed, 30 Oct 2024 22:58:40 +0100 Subject: [PATCH 17/19] fix --- charts/blockscout/README.md | 6 +++++- charts/blockscout/values.yaml | 7 ++++++- charts/l1-explorer/README.md | 10 +++++++--- charts/l1-explorer/values.yaml | 11 ++++++++--- 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/charts/blockscout/README.md b/charts/blockscout/README.md index 6ef0c1d8..467ac3dc 100644 --- a/charts/blockscout/README.md +++ b/charts/blockscout/README.md @@ -40,7 +40,11 @@ Kubernetes: `>=1.22.0-0` | blockscout-stack.blockscout.image.pullPolicy | string | `"IfNotPresent"` | | | blockscout-stack.blockscout.image.repository | string | `"blockscout/blockscout-scroll"` | | | blockscout-stack.blockscout.image.tag | string | `"6.9.0-alpha.1"` | | -| blockscout-stack.blockscout.ingress.annotations | object | `{}` | | +| blockscout-stack.blockscout.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-headers" | string | `"updated-gas-oracle, Content-Type, Authorization"` | | +| blockscout-stack.blockscout.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-methods" | string | `"GET, POST, OPTIONS"` | | +| blockscout-stack.blockscout.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-origin" | string | `"http://blockscout.scrollsdk"` | | +| blockscout-stack.blockscout.ingress.annotations."nginx.ingress.kubernetes.io/cors-max-age" | string | `"86400"` | | +| blockscout-stack.blockscout.ingress.annotations."nginx.ingress.kubernetes.io/enable-cors" | string | `"true"` | | | blockscout-stack.blockscout.ingress.className | string | `"nginx"` | | | blockscout-stack.blockscout.ingress.enabled | bool | `true` | | | blockscout-stack.blockscout.ingress.hostname | string | `"blockscout-backend.scrollsdk"` | | diff --git a/charts/blockscout/values.yaml b/charts/blockscout/values.yaml index 7075d928..900cabc2 100644 --- a/charts/blockscout/values.yaml +++ b/charts/blockscout/values.yaml @@ -40,7 +40,12 @@ blockscout-stack: ingress: enabled: true className: "nginx" - annotations: {} + annotations: + nginx.ingress.kubernetes.io/enable-cors: "true" + nginx.ingress.kubernetes.io/cors-allow-origin: "http://blockscout.scrollsdk" + nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" + nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" + nginx.ingress.kubernetes.io/cors-max-age: "86400" hostname: blockscout-backend.scrollsdk frontend: diff --git a/charts/l1-explorer/README.md b/charts/l1-explorer/README.md index 71660034..1ca36741 100644 --- a/charts/l1-explorer/README.md +++ b/charts/l1-explorer/README.md @@ -32,14 +32,18 @@ Kubernetes: `>=1.22.0-0` | blockscout-stack.blockscout.image.pullPolicy | string | `"IfNotPresent"` | | | blockscout-stack.blockscout.image.repository | string | `"blockscout/blockscout"` | | | blockscout-stack.blockscout.image.tag | string | `"6.8.0"` | | -| blockscout-stack.blockscout.ingress.annotations | object | `{}` | | +| blockscout-stack.blockscout.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-headers" | string | `"updated-gas-oracle, Content-Type, Authorization"` | | +| blockscout-stack.blockscout.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-methods" | string | `"GET, POST, OPTIONS"` | | +| blockscout-stack.blockscout.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-origin" | string | `"http://l1-explorer.scrollsdk"` | | +| blockscout-stack.blockscout.ingress.annotations."nginx.ingress.kubernetes.io/cors-max-age" | string | `"86400"` | | +| blockscout-stack.blockscout.ingress.annotations."nginx.ingress.kubernetes.io/enable-cors" | string | `"true"` | | | blockscout-stack.blockscout.ingress.className | string | `"nginx"` | | | blockscout-stack.blockscout.ingress.enabled | bool | `true` | | -| blockscout-stack.blockscout.ingress.hostname | string | `"l1-explorer.scrollsdk"` | | +| blockscout-stack.blockscout.ingress.hostname | string | `"l1-explorer-backend.scrollsdk"` | | | blockscout-stack.frontend.env.FAVICON_MASTER_URL | string | `"https://raw.githubusercontent.com/blockscout/frontend-configs/main/configs/favicons/scroll_180x180.png"` | | | blockscout-stack.frontend.env.NEXT_PUBLIC_AD_BANNER_PROVIDER | string | `"none"` | | | blockscout-stack.frontend.env.NEXT_PUBLIC_AD_TEXT_PROVIDER | string | `"none"` | | -| blockscout-stack.frontend.env.NEXT_PUBLIC_API_HOST | string | `"l1-explorer.scrollsdk"` | | +| blockscout-stack.frontend.env.NEXT_PUBLIC_API_HOST | string | `"l1-explorer-backend.scrollsdk"` | | | blockscout-stack.frontend.env.NEXT_PUBLIC_API_PROTOCOL | string | `"http"` | | | blockscout-stack.frontend.env.NEXT_PUBLIC_API_WEBSOCKET_PROTOCOL | string | `"ws"` | | | blockscout-stack.frontend.env.NEXT_PUBLIC_APP_PROTOCOL | string | `"http"` | | diff --git a/charts/l1-explorer/values.yaml b/charts/l1-explorer/values.yaml index 6f4378d9..510cffd7 100644 --- a/charts/l1-explorer/values.yaml +++ b/charts/l1-explorer/values.yaml @@ -22,8 +22,13 @@ blockscout-stack: ingress: enabled: true className: "nginx" - annotations: {} - hostname: l1-explorer.scrollsdk + annotations: + nginx.ingress.kubernetes.io/enable-cors: "true" + nginx.ingress.kubernetes.io/cors-allow-origin: "http://l1-explorer.scrollsdk" + nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" + nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" + nginx.ingress.kubernetes.io/cors-max-age: "86400" + hostname: l1-explorer-backend.scrollsdk frontend: image: @@ -41,7 +46,7 @@ blockscout-stack: NEXT_PUBLIC_HOMEPAGE_STATS: '["total_blocks", "average_block_time", "total_txs", "wallet_addresses", "gas_tracker"]' NEXT_PUBLIC_API_PROTOCOL: http NEXT_PUBLIC_API_WEBSOCKET_PROTOCOL: ws - NEXT_PUBLIC_API_HOST: "l1-explorer.scrollsdk" + NEXT_PUBLIC_API_HOST: "l1-explorer-backend.scrollsdk" NEXT_PUBLIC_APP_PROTOCOL: http NEXT_PUBLIC_AD_BANNER_PROVIDER: none NEXT_PUBLIC_AD_TEXT_PROVIDER: none From 7c032e44b93fa9ebb45a2950932d1e5b3ab2334b Mon Sep 17 00:00:00 2001 From: Sebastien Baizet Date: Wed, 30 Oct 2024 23:01:01 +0100 Subject: [PATCH 18/19] change the example --- examples/values/blockscout-production.yaml | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/examples/values/blockscout-production.yaml b/examples/values/blockscout-production.yaml index dd3dda85..4b69d218 100644 --- a/examples/values/blockscout-production.yaml +++ b/examples/values/blockscout-production.yaml @@ -38,13 +38,13 @@ blockscout-stack: enabled: true className: "" annotations: # Add annotations here. Might be necessary to allow CORS from updated-gas-oracle. Example below - # cert-manager.io/cluster-issuer: letsencrypt-prod - # nginx.ingress.kubernetes.io/enable-cors: "true" - # nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk" - # nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" - # nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" - # nginx.ingress.kubernetes.io/cors-max-age: "86400" - hostname: "blockscout-backend.hsk.scroll.systems" + cert-manager.io/cluster-issuer: letsencrypt-prod + nginx.ingress.kubernetes.io/enable-cors: "true" + nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk" + nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" + nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" + nginx.ingress.kubernetes.io/cors-max-age: "86400" + hostname: "" tls: enabled: true secretName: blockscout-tls # Set here the name of the secret. Example : blockscout-backend.scrollsdk @@ -59,14 +59,14 @@ blockscout-stack: ingress: enabled: true - ingressClassName: "" # Set here your ingressClassName + className: "" # Set here your ingress class name annotations: # Add annotations here. Might be necessary to allow CORS from updated-gas-oracle. Example below - # cert-manager.io/cluster-issuer: letsencrypt-prod - # nginx.ingress.kubernetes.io/enable-cors: "true" - # nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk" - # nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" - # nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" - # nginx.ingress.kubernetes.io/cors-max-age: "86400" + cert-manager.io/cluster-issuer: letsencrypt-prod + nginx.ingress.kubernetes.io/enable-cors: "true" + nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk" + nginx.ingress.kubernetes.io/cors-allow-headers: "updated-gas-oracle, Content-Type, Authorization" + nginx.ingress.kubernetes.io/cors-allow-methods: "GET, POST, OPTIONS" + nginx.ingress.kubernetes.io/cors-max-age: "86400" hostname: "" # Set the hostname for the frontend. Example : blockscout.scrollsdk tls: enabled: true From 5dad47add119bddbfeed6e27d74c947b7c70f7cb Mon Sep 17 00:00:00 2001 From: Sebastien Baizet Date: Thu, 31 Oct 2024 09:54:21 +0100 Subject: [PATCH 19/19] update scroll-sdk to 0.0.59 --- charts/scroll-sdk/Chart.yaml | 2 +- charts/scroll-sdk/README.md | 2 +- devnet/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/scroll-sdk/Chart.yaml b/charts/scroll-sdk/Chart.yaml index 2d2c3354..4c081da8 100644 --- a/charts/scroll-sdk/Chart.yaml +++ b/charts/scroll-sdk/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: scroll helm charts to deploy scroll sdk name: scroll-sdk -version: 0.0.54 +version: 0.0.59 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/scroll-sdk/README.md b/charts/scroll-sdk/README.md index 31741e33..11d6581d 100644 --- a/charts/scroll-sdk/README.md +++ b/charts/scroll-sdk/README.md @@ -1,6 +1,6 @@ # scroll-sdk -![Version: 0.0.54](https://img.shields.io/badge/Version-0.0.54-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.0.59](https://img.shields.io/badge/Version-0.0.59-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) scroll helm charts to deploy scroll sdk diff --git a/devnet/Makefile b/devnet/Makefile index e76cfd2c..48ab6f0a 100644 --- a/devnet/Makefile +++ b/devnet/Makefile @@ -7,7 +7,7 @@ L1_RPC_HOST := l1-devnet.scrollsdk bootstrap: echo "Pulling helm chart..." - helm pull oci://ghcr.io/scroll-tech/scroll-sdk/helm/dev/scroll-sdk --version 0.0.54 + helm pull oci://ghcr.io/scroll-tech/scroll-sdk/helm/dev/scroll-sdk --version 0.0.59 echo "Extracting helm chart..." tar -xvf *.tgz $(MAKE) config