move bridgSenderAdress

astriaorg · Oct 2, 2024 · 88051d3 · 88051d3
1 parent b6df7fd
commit 88051d3
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 15 deletions.
diff --git a/charts/evm-rollup/Chart.yaml b/charts/evm-rollup/Chart.yaml
@@ -15,13 +15,13 @@ 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.27.3
+version: 0.27.5
 
 # 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.14.1"
+appVersion: "0.14.3"
 
 maintainers:
   - name: wafflesvonmaple

diff --git a/charts/evm-rollup/files/genesis/geth-genesis.json b/charts/evm-rollup/files/genesis/geth-genesis.json
@@ -38,9 +38,9 @@
         "astriaBridgeAddresses": {{ toPrettyJson .Values.genesis.bridgeAddresses | indent 8 | trim }},
         "astriaFeeCollectors": {{ toPrettyJson .Values.genesis.feeCollectors | indent 8 | trim }},
         "astriaEIP1559Params": {{ toPrettyJson .Values.genesis.eip1559Params | indent 8 | trim }},
-        "astriaBridgeSenderAddress": "{{ .Values.genesis.bridgeSenderAddress }}",
         "astriaSequencerAddressPrefix": "{{ .Values.genesis.sequencerAddressPrefix }}"
         {{- if not .Values.global.dev }}
+        "astriaBridgeSenderAddress": "{{ .Values.genesis.bridgeSenderAddress }}",
         {{- else }}
         {{- end }}
     },

diff --git a/charts/evm-rollup/values.yaml b/charts/evm-rollup/values.yaml
@@ -10,7 +10,7 @@ images:
   geth:
     repo: ghcr.io/astriaorg/astria-geth
     pullPolicy: IfNotPresent
-    tag: 0.14.1
+    tag: 0.14.3
     devTag: latest
     overrideTag: ""
   conductor:
@@ -48,15 +48,13 @@ genesis:
   ## These values are used to configure astria native bridging
   ## Many of the fields have commented out example fields
 
-  # When using an erc20 canonical bridge, the address from which tokens will
-  # be sent via the bridge contract
-  bridgeSenderAddress: "0x0000000000000000000000000000000000000000"
   # Configure the sequencer bridge addresses and allowed assets if using
   # the astria canonical bridge. Recommend removing alloc values if so.
   bridgeAddresses: []
     # - address: "684ae50c49a434199199c9c698115391152d7b3f"
     #   startHeight: 1
     #   assetDenom: "nria"
+    #   senderAddress: "0x0000000000000000000000000000000000000000"
     #   assetPrecision: 9
 
 

diff --git a/charts/evm-stack/Chart.lock b/charts/evm-stack/Chart.lock
@@ -4,7 +4,7 @@ dependencies:
   version: 0.3.6
 - name: evm-rollup
   repository: file://../evm-rollup
-  version: 0.27.3
+  version: 0.27.4
 - name: composer
   repository: file://../composer
   version: 0.1.4
@@ -20,5 +20,5 @@ dependencies:
 - name: blockscout-stack
   repository: https://blockscout.github.io/helm-charts
   version: 1.6.2
-digest: sha256:6e62801b5f401ba653f88a5ed9d33a6de38b8bba5ba942d01a2af68371c8bfd8
-generated: "2024-09-19T12:52:41.503045-07:00"
+digest: sha256:b086adf099e986e3a5c1f7f25481aaf42ebf597029a70ee0bd3ff6711e6bdccf
+generated: "2024-09-30T10:35:05.189669-04:00"
diff --git a/charts/evm-stack/Chart.yaml b/charts/evm-stack/Chart.yaml
@@ -15,15 +15,15 @@ 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.6.0
+version: 0.6.2
 
 dependencies:
   - name: celestia-node
     version: 0.3.6
     repository: "file://../celestia-node"
     condition: celestia-node.enabled
   - name: evm-rollup
-    version: 0.27.3
+    version: 0.27.5
     repository: "file://../evm-rollup"
   - name: composer
     version: 0.1.4

diff --git a/dev/values/rollup/dev.yaml b/dev/values/rollup/dev.yaml
@@ -34,14 +34,12 @@ evm-rollup:
     ## These values are used to configure astria native bridging
     ## Many of the fields have commented out example fields
 
-    # When using an erc20 canonical bridge, the address from which tokens will
-    # be sent via the bridge contract
-    bridgeSenderAddress: "0x0000000000000000000000000000000000000000"
     # Configure the sequencer bridge addresses and allowed assets if using
     # the astria canonical bridge. Recommend removing alloc values if so.
     bridgeAddresses:
       - bridgeAddress: "astria13ahqz4pjqfmynk9ylrqv4fwe4957x2p0h5782u"
         startHeight: 1
+        senderAddress: "0x0000000000000000000000000000000000000000"
         assetDenom: "nria"
         assetPrecision: 9