From 1b72d6b90e02d2f8da15ffd0a5f74785c2c9c01f Mon Sep 17 00:00:00 2001
From: Jordan Oroshiba <jordan@astria.org>
Date: Wed, 3 Apr 2024 14:04:27 -0700
Subject: [PATCH] chore(charts): update rollup for new geth version (#912)

## Summary
Updates the rollup chart to support latest release of Geth.

## Background
Geth was updated to support bridge transactions & locking to specific
bridges on EVM.

## Changes
- Update geth genesis, and version.

## Testing
Running smoke test
---
 .github/workflows/docker-build.yml                | 7 +++++++
 charts/evm-rollup/Chart.yaml                      | 4 ++--
 charts/evm-rollup/files/genesis/geth-genesis.json | 4 +++-
 charts/evm-rollup/values.yaml                     | 6 +++++-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index e92fadc630..0cafc4d27d 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -94,11 +94,18 @@ jobs:
           install_only: true
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
+      - name: Log in to GHCR
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Setup Smoke Test Environment
         timeout-minutes: 5
         run: |
           TAG=sha-$(git rev-parse --short HEAD)
           just deploy cluster
+          kubectl create secret generic regcred --from-file=.dockerconfigjson=$HOME/.docker/config.json --type=kubernetes.io/dockerconfigjson
           echo "Deploying with astria images tagged $TAG"
           just deploy smoke-test $TAG
       - name: Run Smoke test
diff --git a/charts/evm-rollup/Chart.yaml b/charts/evm-rollup/Chart.yaml
index 3d9994bac8..ee87f843c7 100644
--- a/charts/evm-rollup/Chart.yaml
+++ b/charts/evm-rollup/Chart.yaml
@@ -16,13 +16,13 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: 0.10.4
+version: 0.11.0
 
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.7.0"
+appVersion: "0.9.0"
 
 dependencies:
   - name: celestia-node
diff --git a/charts/evm-rollup/files/genesis/geth-genesis.json b/charts/evm-rollup/files/genesis/geth-genesis.json
index 1c03f091c9..65143a5859 100644
--- a/charts/evm-rollup/files/genesis/geth-genesis.json
+++ b/charts/evm-rollup/files/genesis/geth-genesis.json
@@ -21,7 +21,9 @@
         "astriaSequencerInitialHeight": {{ toString .Values.config.sequencer.initialBlockHeight | replace "\"" "" }},
         "astriaRollupName": "{{ .Values.config.rollup.name }}",
         "astriaCelestiaInitialHeight": {{ toString .Values.config.celestia.initialBlockHeight | replace "\"" "" }},
-        "astriaCelestiaHeightVariance": {{ toString .Values.config.celestia.heightVariance | replace "\"" "" }}
+        "astriaCelestiaHeightVariance": {{ toString .Values.config.celestia.heightVariance | replace "\"" "" }},
+        "astriaBridgeAddresses": [{{ .Values.config.rollup.genesis.bridgeAddress | quote }}],
+        "astriaBridgeAllowedAssetDenom": {{ .Values.config.rollup.genesis.bridgeAllowedAssetDenom | quote }}
         {{- if not .Values.global.dev }}
         {{- else }}
         {{- end }}
diff --git a/charts/evm-rollup/values.yaml b/charts/evm-rollup/values.yaml
index 3b143a69da..814ea3b565 100644
--- a/charts/evm-rollup/values.yaml
+++ b/charts/evm-rollup/values.yaml
@@ -9,7 +9,7 @@ global:
 images:
   geth:
     repo: ghcr.io/astriaorg/go-ethereum
-    tag: "0.7.0"
+    tag: "0.9.0"
     devTag: latest
   conductor:
     repo: ghcr.io/astriaorg/conductor
@@ -59,6 +59,10 @@ config:
       extraDataOverride: ""
       # If set to true the genesis block will contain extra data
       overrideGenesisExtraData: true
+      # Configure the sequencer bridge address and allowed asset denom if using
+      # the astria canonical bridge. Recommend removing alloc values if so.
+      bridgeAddress: ""
+      bridgeAllowedAssetDenom: nria
       alloc:
         - address: "0xaC21B97d35Bf75A7dAb16f35b111a50e78A72F30"
           value: