diff --git a/charts/blockscout-sc-verifier/Chart.yaml b/charts/blockscout-sc-verifier/Chart.yaml index 5bbfdbc5..e83434d3 100644 --- a/charts/blockscout-sc-verifier/Chart.yaml +++ b/charts/blockscout-sc-verifier/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: blockscout-sc-verifier helm charts name: blockscout-sc-verifier -version: 0.0.2 +version: 0.1.0 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/blockscout-sc-verifier/README.md b/charts/blockscout-sc-verifier/README.md index 3f1694dd..ba0e3f62 100644 --- a/charts/blockscout-sc-verifier/README.md +++ b/charts/blockscout-sc-verifier/README.md @@ -1,6 +1,6 @@ # blockscout-sc-verifier -![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.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) blockscout-sc-verifier helm charts diff --git a/charts/blockscout/Chart.yaml b/charts/blockscout/Chart.yaml index b4ab203f..5b451073 100644 --- a/charts/blockscout/Chart.yaml +++ b/charts/blockscout/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: blockscout scroll helm charts name: blockscout -version: 0.1.0 +version: 0.1.1 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: @@ -14,4 +14,4 @@ dependencies: version: 0.0.3 - name: blockscout-stack repository: https://blockscout.github.io/helm-charts - version: 1.6.8 + version: 1.8.0 diff --git a/charts/blockscout/README.md b/charts/blockscout/README.md index 265aa041..f3c516dc 100644 --- a/charts/blockscout/README.md +++ b/charts/blockscout/README.md @@ -1,6 +1,6 @@ # blockscout -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) blockscout scroll helm charts @@ -16,7 +16,7 @@ Kubernetes: `>=1.22.0-0` | Repository | Name | Version | |------------|------|---------| -| https://blockscout.github.io/helm-charts | blockscout-stack | 1.6.8 | +| https://blockscout.github.io/helm-charts | blockscout-stack | 1.8.0 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | external-secrets-lib | 0.0.3 | ## Values @@ -24,6 +24,7 @@ Kubernetes: `>=1.22.0-0` | Key | Type | Default | Description | |-----|------|---------|-------------| | blockscout-stack.blockscout.env.BLOCK_TRANSFORMER | string | `"clique"` | | +| blockscout-stack.blockscout.env.CHAIN_SPEC_PATH | string | `"/app/genesis/genesis.json"` | | | 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` | | @@ -47,11 +48,16 @@ Kubernetes: `>=1.22.0-0` | 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.blockscout.ingress.hostname | string | `"blockscout.scrollsdk"` | | +| blockscout-stack.blockscout.volumeMounts[0].mountPath | string | `"/app/genesis"` | | +| blockscout-stack.blockscout.volumeMounts[0].name | string | `"genesis-config"` | | +| blockscout-stack.blockscout.volumeMounts[0].readOnly | bool | `true` | | +| blockscout-stack.blockscout.volumes[0].configMap.name | string | `"genesis-config"` | | +| blockscout-stack.blockscout.volumes[0].name | string | `"genesis-config"` | | | 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_HOST | string | `"blockscout.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/blockscout/values.yaml b/charts/blockscout/values.yaml index 900cabc2..aeabb79f 100644 --- a/charts/blockscout/values.yaml +++ b/charts/blockscout/values.yaml @@ -25,6 +25,7 @@ blockscout-stack: SCROLL_L2_CURIE_UPGRADE_BLOCK: 0 ECTO_USE_SSL: false ETHEREUM_JSONRPC_HTTP_INSECURE: true + CHAIN_SPEC_PATH: /app/genesis/genesis.json # Not sure what these values are for # SCROLL_L1_SCALAR_INIT: # SCROLL_L1_OVERHEAD_INIT: @@ -46,7 +47,17 @@ blockscout-stack: 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 + hostname: blockscout.scrollsdk + + volumes: + - name: genesis-config + configMap: + name: genesis-config + + volumeMounts: + - name: genesis-config + mountPath: "/app/genesis" + readOnly: true frontend: image: @@ -64,7 +75,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: "blockscout-backend.scrollsdk" + NEXT_PUBLIC_API_HOST: "blockscout.scrollsdk" NEXT_PUBLIC_APP_PROTOCOL: http NEXT_PUBLIC_AD_BANNER_PROVIDER: none NEXT_PUBLIC_AD_TEXT_PROVIDER: none diff --git a/charts/blockscout/values/production.yaml b/charts/blockscout/values/production.yaml index 02b0e110..5c7f481b 100644 --- a/charts/blockscout/values/production.yaml +++ b/charts/blockscout/values/production.yaml @@ -47,14 +47,13 @@ blockscout-stack: hostname: "" tls: enabled: true - secretName: blockscout-tls # Set here the name of the secret. Example : blockscout-backend.scrollsdk + secretName: blockscout-tls # Set here the name of the secret. Example : blockscout.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_API_HOST: "" # Backend host, example "blockscout.scrollsdk" NEXT_PUBLIC_APP_PROTOCOL: https ingress: diff --git a/charts/contracts/Chart.yaml b/charts/contracts/Chart.yaml index ff949aac..33035fe5 100644 --- a/charts/contracts/Chart.yaml +++ b/charts/contracts/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: contracts helm charts name: contracts -version: 0.1.0 +version: 0.1.1 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/contracts/README.md b/charts/contracts/README.md index 6726954c..8eb18936 100644 --- a/charts/contracts/README.md +++ b/charts/contracts/README.md @@ -1,6 +1,6 @@ # contracts -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) contracts helm charts @@ -25,7 +25,7 @@ Kubernetes: `>=1.22.0-0` | envFrom[0].configMapRef.name | string | `"contracts-deployment-env"` | | | global.isStandalone | bool | `false` | | | image.repository | string | `"scrolltech/scroll-stack-contracts"` | | -| image.tag | string | `"deploy-2eba3d2c418b16f4a66d9baadeb1c1bafdca81b1"` | | +| image.tag | string | `"deploy-64934888f4cd002e77414a8e62812f70c00c5937"` | | | scrollConfig | string | `"{}\n"` | | | scrollConfigContracts | string | `"{}\n"` | | diff --git a/charts/contracts/values.yaml b/charts/contracts/values.yaml index e06ba707..9cc3333d 100644 --- a/charts/contracts/values.yaml +++ b/charts/contracts/values.yaml @@ -4,7 +4,7 @@ global: image: repository: scrolltech/scroll-stack-contracts - tag: deploy-2eba3d2c418b16f4a66d9baadeb1c1bafdca81b1 + tag: deploy-64934888f4cd002e77414a8e62812f70c00c5937 envFrom: - configMapRef: diff --git a/charts/l1-devnet/Chart.yaml b/charts/l1-devnet/Chart.yaml index 2c625f34..71b0c34a 100644 --- a/charts/l1-devnet/Chart.yaml +++ b/charts/l1-devnet/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: l1-devnet helm charts name: l1-devnet -version: 0.1.0 +version: 0.1.1 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/l1-devnet/README.md b/charts/l1-devnet/README.md index d8fcaef1..4b671ccf 100644 --- a/charts/l1-devnet/README.md +++ b/charts/l1-devnet/README.md @@ -1,6 +1,6 @@ # l1-devnet -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) l1-devnet helm charts @@ -25,7 +25,7 @@ Kubernetes: `>=1.22.0-0` |-----|------|---------|-------------| | command[0] | string | `"/bin/bash"` | | | command[1] | string | `"-c"` | | -| command[2] | string | `"anvil --host 0.0.0.0 --port 8545 --chain-id ${CHAIN_ID} --state /data/state.json --state-interval 60 --slots-in-an-epoch 3"` | | +| command[2] | string | `"mkdir -p /data && echo \"{number: 0x0}\" > /data/genesis.json && anvil --host 0.0.0.0 --port 8545 --chain-id ${CHAIN_ID} --state /data/state.json --state-interval 60 --slots-in-an-epoch 3"` | | | controller.replicas | int | `1` | | | controller.strategy | string | `"RollingUpdate"` | | | controller.type | string | `"statefulset"` | | diff --git a/charts/l1-devnet/values.yaml b/charts/l1-devnet/values.yaml index ea089885..cb6b2e4a 100644 --- a/charts/l1-devnet/values.yaml +++ b/charts/l1-devnet/values.yaml @@ -14,7 +14,12 @@ image: tag: v0.0.4 command: - ["/bin/bash", "-c", "anvil --host 0.0.0.0 --port 8545 --chain-id ${CHAIN_ID} --state /data/state.json --state-interval 60 --slots-in-an-epoch 3"] + [ + "/bin/bash", + "-c", + "mkdir -p /data && echo \"{number: 0x0}\" > /data/genesis.json && \ + anvil --host 0.0.0.0 --port 8545 --chain-id ${CHAIN_ID} --state /data/state.json --state-interval 60 --slots-in-an-epoch 3" + ] envFrom: - configMapRef: diff --git a/charts/l1-explorer/Chart.yaml b/charts/l1-explorer/Chart.yaml index fd7344c0..6ed5520b 100644 --- a/charts/l1-explorer/Chart.yaml +++ b/charts/l1-explorer/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: l1-explorer helm charts name: l1-explorer -version: 0.1.0 +version: 0.1.1 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: @@ -14,4 +14,4 @@ dependencies: version: 0.0.3 - name: blockscout-stack repository: https://blockscout.github.io/helm-charts - version: 1.6.8 + version: 1.8.0 diff --git a/charts/l1-explorer/README.md b/charts/l1-explorer/README.md index 06b9fe09..22b3e61d 100644 --- a/charts/l1-explorer/README.md +++ b/charts/l1-explorer/README.md @@ -1,6 +1,6 @@ # l1-explorer -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-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,14 +16,13 @@ Kubernetes: `>=1.22.0-0` | Repository | Name | Version | |------------|------|---------| -| https://blockscout.github.io/helm-charts | blockscout-stack | 1.6.8 | +| https://blockscout.github.io/helm-charts | blockscout-stack | 1.8.0 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | external-secrets-lib | 0.0.3 | ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| -| 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_VARIANT | string | `"geth"` | | @@ -31,7 +30,7 @@ Kubernetes: `>=1.22.0-0` | 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"` | | -| blockscout-stack.blockscout.image.tag | string | `"6.8.0"` | | +| blockscout-stack.blockscout.image.tag | string | `"6.9.0"` | | | 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"` | | @@ -39,11 +38,11 @@ Kubernetes: `>=1.22.0-0` | 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-backend.scrollsdk"` | | +| 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-backend.scrollsdk"` | | +| 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"` | | diff --git a/charts/l1-explorer/values.yaml b/charts/l1-explorer/values.yaml index 510cffd7..8edf7fe0 100644 --- a/charts/l1-explorer/values.yaml +++ b/charts/l1-explorer/values.yaml @@ -6,11 +6,10 @@ blockscout-stack: image: repository: blockscout/blockscout pullPolicy: IfNotPresent - tag: 6.8.0 + tag: 6.9.0 env: ETHEREUM_JSONRPC_VARIANT: geth - BLOCK_TRANSFORMER: clique INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER: true ECTO_USE_SSL: false ETHEREUM_JSONRPC_HTTP_INSECURE: true @@ -28,7 +27,7 @@ blockscout-stack: 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 + hostname: l1-explorer.scrollsdk frontend: image: @@ -46,7 +45,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-backend.scrollsdk" + NEXT_PUBLIC_API_HOST: "l1-explorer.scrollsdk" NEXT_PUBLIC_APP_PROTOCOL: http NEXT_PUBLIC_AD_BANNER_PROVIDER: none NEXT_PUBLIC_AD_TEXT_PROVIDER: none diff --git a/charts/scroll-sdk/Chart.yaml b/charts/scroll-sdk/Chart.yaml index 1c1784fb..9aa7420a 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.1.0 +version: 0.1.1 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: @@ -14,7 +14,7 @@ keywords: home: https://github.com/scroll-tech/scroll-sdk dependencies: - name: l1-devnet - version: 0.1.0 + version: 0.1.1 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: l1-devnet.enabled - name: balance-checker @@ -22,7 +22,7 @@ dependencies: repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: balance-checker.enabled - name: blockscout - version: 0.1.0 + version: 0.1.1 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: blockscout.enabled - name: bridge-history-api @@ -34,7 +34,7 @@ dependencies: repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: bridge-history-fetcher.enabled - name: blockscout-sc-verifier - version: 0.0.2 + version: 0.1.0 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: blockscout-sc-verifier.enabled - name: chain-monitor @@ -42,7 +42,7 @@ dependencies: repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: chain-monitor.enabled - name: contracts - version: 0.1.0 + version: 0.1.1 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: contracts.enabled - name: coordinator-api @@ -62,7 +62,7 @@ dependencies: repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: gas-oracle.enabled - name: l1-explorer - version: 0.1.0 + version: 0.1.1 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 e09fc1a9..417ab873 100644 --- a/charts/scroll-sdk/README.md +++ b/charts/scroll-sdk/README.md @@ -1,6 +1,6 @@ # scroll-sdk -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-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 @@ -22,18 +22,18 @@ Kubernetes: `>=1.22.0-0` | oci://ghcr.io/scroll-tech/scroll-sdk/helm | admin-system-cron | 0.1.0 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | admin-system-dashboard | 0.1.0 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | balance-checker | 0.1.0 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | blockscout | 0.1.0 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | blockscout-sc-verifier | 0.0.2 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | blockscout | 0.1.1 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | blockscout-sc-verifier | 0.1.0 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | bridge-history-api | 0.1.0 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | bridge-history-fetcher | 0.1.0 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | chain-monitor | 0.1.0 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | contracts | 0.1.0 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | contracts | 0.1.1 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | coordinator-api | 0.1.0 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | coordinator-cron | 0.1.0 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | frontends | 0.1.0 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | gas-oracle | 0.1.0 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | l1-devnet | 0.1.0 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | l1-explorer | 0.1.0 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | l1-devnet | 0.1.1 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | l1-explorer | 0.1.1 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | l2-bootnode | 0.1.0 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | l2-rpc | 0.1.0 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | l2-sequencer | 0.1.0 | @@ -56,7 +56,7 @@ Kubernetes: `>=1.22.0-0` | admin-system-dashboard.ingress.main.hosts[0].paths[0].path | string | `"/"` | | | admin-system-dashboard.ingress.main.hosts[0].paths[0].pathType | string | `"Prefix"` | | | balance-checker.enabled | bool | `true` | | -| blockscout-sc-verifier.enabled | bool | `false` | | +| blockscout-sc-verifier.enabled | bool | `true` | | | blockscout.blockscout-stack.frontend.replicaCount | int | `1` | | | blockscout.enabled | bool | `true` | | | bridge-history-api.enabled | bool | `true` | | @@ -85,7 +85,8 @@ Kubernetes: `>=1.22.0-0` | l1-devnet.ingress.main.hosts[0].host | string | `"l1-devnet.scrollsdk"` | | | l1-devnet.ingress.main.hosts[0].paths[0].path | string | `"/"` | | | l1-devnet.ingress.main.hosts[0].paths[0].pathType | string | `"Prefix"` | | -| l1-explorer.enabled | bool | `false` | | +| l1-explorer.blockscout-stack.frontend.replicaCount | int | `1` | | +| l1-explorer.enabled | bool | `true` | | | l1-explorer.ingress.main.enabled | bool | `true` | | | l1-explorer.ingress.main.hosts[0].host | string | `"l1-explorer.scrollsdk"` | | | l1-explorer.ingress.main.hosts[0].paths[0].path | string | `"/"` | | diff --git a/charts/scroll-sdk/config.toml b/charts/scroll-sdk/config.toml index 6c45094b..019eff6a 100644 --- a/charts/scroll-sdk/config.toml +++ b/charts/scroll-sdk/config.toml @@ -104,6 +104,16 @@ L2_WHITELIST = "0x5300000000000000000000000000000000000003" L2_WETH = "0x5300000000000000000000000000000000000004" L2_TX_FEE_VAULT = "0x5300000000000000000000000000000000000005" +[contracts.verification] + +VERIFIER_TYPE_L1 = "blockscout" +VERIFIER_TYPE_L2 = "blockscout" +EXPLORER_URI_L1 = "http://l1-explorer.scrollsdk" +EXPLORER_URI_L2 = "http://blockscout.scrollsdk" +RPC_URI_L1 = "http://l1-devnet.scrollsdk" +RPC_URI_L2 = "http://l2-rpc.scrollsdk" +EXPLORER_API_KEY_L1 = "" +EXPLORER_API_KEY_L2 = "" [coordinator] @@ -120,6 +130,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" -BLOCKSCOUT_BACKEND_HOST = "blockscout-backend.scrollsdk" +BLOCKSCOUT_BACKEND_HOST = "blockscout.scrollsdk" ADMIN_SYSTEM_DASHBOARD_HOST = "admin-system-dashboard.scrollsdk" GRAFANA_HOST = "http://grafana.scrollsdk" diff --git a/charts/scroll-sdk/values.yaml b/charts/scroll-sdk/values.yaml index 42a3e859..2db12280 100644 --- a/charts/scroll-sdk/values.yaml +++ b/charts/scroll-sdk/values.yaml @@ -82,7 +82,10 @@ rollup-node: enabled: true l1-explorer: - enabled: false + enabled: true + blockscout-stack: + frontend: + replicaCount: 1 ingress: main: enabled: true @@ -112,7 +115,7 @@ l2-bootnode: enabled: true blockscout-sc-verifier: - enabled: false + enabled: true rpc-gateway: enabled: false diff --git a/devnet/Makefile b/devnet/Makefile index 578aaaf0..276cf317 100644 --- a/devnet/Makefile +++ b/devnet/Makefile @@ -4,17 +4,18 @@ ARCH_OTHER := $(shell if [ "$$(uname -m)" != "arm64" ] && [ "$$(uname -m)" != "a NAMESPACE ?= default L2_IMAGE_TAG := $(ARCH_OTHER)v5.7.25$(ARCH_ARM64) L1_RPC_HOST := l1-devnet.scrollsdk +SC_VERIFIER_TAG := $(if $(ARCH_ARM64),v1.7.0-arm,v1.7.0) bootstrap: echo "Pulling helm chart..." - helm pull oci://ghcr.io/scroll-tech/scroll-sdk/helm/scroll-sdk --version 0.1.0 + helm pull oci://ghcr.io/scroll-tech/scroll-sdk/helm/scroll-sdk --version 0.1.1 echo "Extracting helm chart..." tar -xvf *.tgz $(MAKE) config config: echo "Creating configuration files..." - cd scroll-sdk && time docker run --rm -it -v .:/contracts/volume scrolltech/scroll-stack-contracts:gen-configs-2eba3d2c418b16f4a66d9baadeb1c1bafdca81b1 + cd scroll-sdk && time docker run --rm -it -v .:/contracts/volume scrolltech/scroll-stack-contracts:gen-configs-64934888f4cd002e77414a8e62812f70c00c5937 echo "Creating env files..." ./create-env-files.sh scroll-sdk ./prepare-config-files.sh @@ -24,6 +25,7 @@ install: --set l2-rpc.image.tag=$(L2_IMAGE_TAG) \ --set l2-sequencer.image.tag=$(L2_IMAGE_TAG) \ --set l2-bootnode.image.tag=$(L2_IMAGE_TAG) \ + --set blockscout-sc-verifier.image.tag=$(SC_VERIFIER_TAG) \ --set l1-devnet.ingress.main.hosts[0].host=$(L1_RPC_HOST) \ --set l1-devnet.ingress.main.hosts[0].paths[0].path=/ \ --set l1-devnet.ingress.main.hosts[0].paths[0].pathType=Prefix \ @@ -51,3 +53,7 @@ delete: upgrade: $(MAKE) install + +verify: + echo "Verifing contracts..." + cd scroll-sdk && time docker run --rm -it --network="host" -v .:/contracts/volume scrolltech/scroll-stack-contracts:verify-64934888f4cd002e77414a8e62812f70c00c5937 \ No newline at end of file diff --git a/examples/Makefile.example b/examples/Makefile.example index bb23a5ab..eb8f2477 100644 --- a/examples/Makefile.example +++ b/examples/Makefile.example @@ -89,7 +89,7 @@ install: --values values/admin-system-dashboard-production.yaml helm upgrade -i contracts oci://ghcr.io/scroll-tech/scroll-sdk/helm/contracts -n $(NAMESPACE) \ - --version=0.1.0 \ + --version=0.1.1 \ --values values/contracts-production.yaml \ --values values/scroll-common-config-contracts.yaml \ --values values/scroll-common-config.yaml @@ -101,7 +101,7 @@ install: install-l1-devnet: helm upgrade -i l1-devnet oci://ghcr.io/scroll-tech/scroll-sdk/helm/l1-devnet -n $(NAMESPACE) \ - --version=0.1.0 \ + --version=0.1.1 \ --values values/l1-devnet-production.yaml delete: diff --git a/examples/config.toml.example b/examples/config.toml.example index 6f2caece..bd460141 100644 --- a/examples/config.toml.example +++ b/examples/config.toml.example @@ -105,6 +105,16 @@ L2_WHITELIST = "0x5300000000000000000000000000000000000003" L2_WETH = "0x5300000000000000000000000000000000000004" L2_TX_FEE_VAULT = "0x5300000000000000000000000000000000000005" +[contracts.verification] + +VERIFIER_TYPE_L1 = "blockscout" +VERIFIER_TYPE_L2 = "blockscout" +EXPLORER_URI_L1 = "http://l1-explorer.scrollsdk" +EXPLORER_URI_L2 = "http://blockscout.scrollsdk" +RPC_URI_L1 = "http://l1-devnet.scrollsdk" +RPC_URI_L2 = "http://l2-rpc.scrollsdk" +EXPLORER_API_KEY_L1 = "" +EXPLORER_API_KEY_L2 = "" [coordinator] @@ -121,7 +131,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" -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" diff --git a/examples/values/blockscout-production.yaml b/examples/values/blockscout-production.yaml index 4b69d218..e8c939e4 100644 --- a/examples/values/blockscout-production.yaml +++ b/examples/values/blockscout-production.yaml @@ -47,14 +47,13 @@ blockscout-stack: hostname: "" tls: enabled: true - secretName: blockscout-tls # Set here the name of the secret. Example : blockscout-backend.scrollsdk + secretName: blockscout-tls # Set here the name of the secret. Example : blockscout.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_API_HOST: "" # Backend host, example "blockscout.scrollsdk" NEXT_PUBLIC_APP_PROTOCOL: https ingress: diff --git a/scroll-contracts b/scroll-contracts index 8ff2948a..64934888 160000 --- a/scroll-contracts +++ b/scroll-contracts @@ -1 +1 @@ -Subproject commit 8ff2948aa2b9cbd24a7644b060097765a6faee10 +Subproject commit 64934888f4cd002e77414a8e62812f70c00c5937 diff --git a/scroll-sdk-cli b/scroll-sdk-cli new file mode 160000 index 00000000..70db0ee5 --- /dev/null +++ b/scroll-sdk-cli @@ -0,0 +1 @@ +Subproject commit 70db0ee53829934d43ed165e4a63cd1844b42aca