From cd31da3b226cb9e17bb2a3f1ecfa1bc8b7639f52 Mon Sep 17 00:00:00 2001 From: "github-merge-queue[bot]" Date: Tue, 30 Jul 2024 20:06:24 +0000 Subject: [PATCH] Changes from astriaorg/astria@4286bba0c10e18c1815203fb32bebef5ab08c411 --- charts/deploy.just | 6 ++++-- charts/evm-bridge-withdrawer/Chart.yaml | 4 ++-- charts/evm-stack/Chart.lock | 10 +++++----- charts/evm-stack/Chart.yaml | 10 +++++----- charts/evm-stack/values.yaml | 2 +- dev/values/rollup/dev.yaml | 2 +- 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/charts/deploy.just b/charts/deploy.just index ade1183..6ce3cb5 100644 --- a/charts/deploy.just +++ b/charts/deploy.just @@ -187,11 +187,13 @@ deploy-smoke-cli tag=defaultTag: --create-namespace > /dev/null @just wait-for-sequencer > /dev/null @echo "Starting EVM rollup..." && helm install -n astria-dev-cluster astria-chain-chart ./charts/evm-stack -f dev/values/rollup/dev.yaml \ - {{ if tag != '' { replace('--set evm-rollup.images.conductor.devTag=# --set composer.images.composer.devTag=# --set evm-bridge-withdrawer.images.evmBridgeWithdrawer.devTag=#', '#', tag) } else { '' } }} \ + {{ if tag != '' { replace('--set evm-rollup.images.conductor.devTag=# --set composer.images.composer.devTag=#', '#', tag) } else { '' } }} \ --set blockscout-stack.enabled=false \ --set postgresql.enabled=false \ + --set evm-bridge-withdrawer.enabled=false \ --set evm-faucet.enabled=false > /dev/null - @just wait-for-rollup > /dev/null + @just wait-for-dev-rollup > /dev/null + @sleep 10 evm_destination_address := "0xaC21B97d35Bf75A7dAb16f35b111a50e78A72F30" diff --git a/charts/evm-bridge-withdrawer/Chart.yaml b/charts/evm-bridge-withdrawer/Chart.yaml index 9d0191a..d303835 100644 --- a/charts/evm-bridge-withdrawer/Chart.yaml +++ b/charts/evm-bridge-withdrawer/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: bridge-withdrawer +name: evm-bridge-withdrawer description: A Helm chart for deploying the evm bridge withdrawer for Astria native bridge # A chart can be either an 'application' or a 'library' chart. @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 0.1.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/evm-stack/Chart.lock b/charts/evm-stack/Chart.lock index 1c799c7..c23c206 100644 --- a/charts/evm-stack/Chart.lock +++ b/charts/evm-stack/Chart.lock @@ -1,21 +1,21 @@ dependencies: - name: evm-rollup repository: file://../evm-rollup - version: 0.25.0 + version: 0.25.1 - name: composer repository: file://../composer version: 0.1.0 - name: evm-faucet repository: file://../evm-faucet version: 0.1.0 -- name: bridge-withdrawer +- name: evm-bridge-withdrawer repository: file://../evm-bridge-withdrawer - version: 0.1.0 + version: 0.1.1 - name: postgresql repository: https://charts.bitnami.com/bitnami version: 15.2.4 - name: blockscout-stack repository: https://blockscout.github.io/helm-charts version: 1.6.2 -digest: sha256:0ff9226aede13d1e76e583a32b2902483dc06b3df81ac7940d3c2e9ae360cdf0 -generated: "2024-07-23T19:34:13.143403-05:00" +digest: sha256:d337fa8fa4f7c8986527bf03bc7a1511bd1ac196214b35b8c2cf8d99d8e0358b +generated: "2024-07-30T09:09:11.244761-07:00" diff --git a/charts/evm-stack/Chart.yaml b/charts/evm-stack/Chart.yaml index e5619ef..219daad 100644 --- a/charts/evm-stack/Chart.yaml +++ b/charts/evm-stack/Chart.yaml @@ -15,11 +15,11 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.2.0 +version: 0.3.0 dependencies: - name: evm-rollup - version: 0.25.0 + version: 0.25.1 repository: "file://../evm-rollup" - name: composer version: 0.1.0 @@ -29,10 +29,10 @@ dependencies: version: 0.1.0 repository: "file://../evm-faucet" condition: evm-faucet.enabled - - name: bridge-withdrawer - version: 0.1.0 + - name: evm-bridge-withdrawer + version: 0.1.1 repository: "file://../evm-bridge-withdrawer" - condition: bridge-withdrawer.enabled + condition: evm-bridge-withdrawer.enabled - name: postgresql version: "15.2.4" repository: "https://charts.bitnami.com/bitnami" diff --git a/charts/evm-stack/values.yaml b/charts/evm-stack/values.yaml index 750fc38..0e576ca 100644 --- a/charts/evm-stack/values.yaml +++ b/charts/evm-stack/values.yaml @@ -62,7 +62,7 @@ evm-faucet: rollupName: "{{ .Values.global.rollupName }}" providerUrl: "http://{{ .Values.global.rollupName }}-evm-service.{{ default .Release.Namespace .Values.global.namespaceOverride }}.svc.cluster.local:8545" -bridge-withdrawer: +evm-bridge-withdrawer: enabled: false config: sequencerChainId: "{{ .Values.global.sequencerChainId }}" diff --git a/dev/values/rollup/dev.yaml b/dev/values/rollup/dev.yaml index 5e88a27..d45305a 100644 --- a/dev/values/rollup/dev.yaml +++ b/dev/values/rollup/dev.yaml @@ -138,7 +138,7 @@ composer: privateKey: devContent: "2bd806c97f0e00af1a1fc3328fa763a9269723c8db8fac4f93af71db186d6e90" -bridge-withdrawer: +evm-bridge-withdrawer: enabled: true config: minExpectedFeeAssetBalance: "0"