From 57328fdd21fd5ec7c6aeed9c3cf16e40891d4d14 Mon Sep 17 00:00:00 2001 From: "github-merge-queue[bot]" Date: Thu, 24 Oct 2024 17:48:48 +0000 Subject: [PATCH] Changes from astriaorg/astria@545ef444796840f4f9cd270424ab43d3558a1759 --- charts/evm-bridge-withdrawer/Chart.yaml | 2 +- charts/evm-stack/Chart.lock | 6 ++-- charts/evm-stack/Chart.yaml | 4 +-- charts/sequencer/Chart.yaml | 2 +- .../files/cometbft/config/genesis.json | 36 ++++++++++++++++--- charts/sequencer/values.yaml | 6 ++-- 6 files changed, 42 insertions(+), 14 deletions(-) diff --git a/charts/evm-bridge-withdrawer/Chart.yaml b/charts/evm-bridge-withdrawer/Chart.yaml index c4ed506..488b7d8 100644 --- a/charts/evm-bridge-withdrawer/Chart.yaml +++ b/charts/evm-bridge-withdrawer/Chart.yaml @@ -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: 1.0.0-rc.2 +version: 1.0.0-rc.3 # 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 7a23d63..40d50e9 100644 --- a/charts/evm-stack/Chart.lock +++ b/charts/evm-stack/Chart.lock @@ -13,12 +13,12 @@ dependencies: version: 0.1.2 - name: evm-bridge-withdrawer repository: file://../evm-bridge-withdrawer - version: 1.0.0-rc.2 + version: 1.0.0-rc.3 - 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:cbef2e78861e88ca4396d44dc1d96a7b27c32c691896ed16097a1081d63c6d91 -generated: "2024-10-24T14:29:08.887894+03:00" +digest: sha256:117d452966a5efe4e5809c8f21b4966a29a616b333cef566b20ec259c0268a0d +generated: "2024-10-24T20:13:17.502491+03:00" diff --git a/charts/evm-stack/Chart.yaml b/charts/evm-stack/Chart.yaml index a8bead4..5055c02 100644 --- a/charts/evm-stack/Chart.yaml +++ b/charts/evm-stack/Chart.yaml @@ -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.7.3 +version: 0.7.4 dependencies: - name: celestia-node @@ -34,7 +34,7 @@ dependencies: repository: "file://../evm-faucet" condition: evm-faucet.enabled - name: evm-bridge-withdrawer - version: 1.0.0-rc.2 + version: 1.0.0-rc.3 repository: "file://../evm-bridge-withdrawer" condition: evm-bridge-withdrawer.enabled - name: postgresql diff --git a/charts/sequencer/Chart.yaml b/charts/sequencer/Chart.yaml index 1cf3209..23b9269 100644 --- a/charts/sequencer/Chart.yaml +++ b/charts/sequencer/Chart.yaml @@ -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: 1.0.0-rc.3 +version: 1.0.0-rc.4 # 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. diff --git a/charts/sequencer/files/cometbft/config/genesis.json b/charts/sequencer/files/cometbft/config/genesis.json index 0992b8b..9320326 100644 --- a/charts/sequencer/files/cometbft/config/genesis.json +++ b/charts/sequencer/files/cometbft/config/genesis.json @@ -1,64 +1,92 @@ { "app_hash": "", "app_state": { + {{- if .Values.genesis.nativeAssetBaseDenomination }} "native_asset_base_denomination": "{{ .Values.genesis.nativeAssetBaseDenomination }}", + {{- end }} "fees": { + "fee_change": { + "base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.feeChange.base }}, + "multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.feeChange.multiplier }} + }, + {{- if .Values.genesis.fees.bridgeLock }} "bridge_lock": { "base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.bridgeLock.base }}, "multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.bridgeLock.multiplier }} }, + {{- end }} + {{- if .Values.genesis.fees.bridgeSudoChange }} "bridge_sudo_change": { "base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.bridgeSudoChange.base }}, "multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.bridgeSudoChange.multiplier }} }, + {{- end }} + {{- if .Values.genesis.fees.bridgeUnlock }} "bridge_unlock": { "base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.bridgeUnlock.base }}, "multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.bridgeUnlock.multiplier }} }, + {{- end }} + {{- if .Values.genesis.fees.feeAssetChange }} "fee_asset_change": { "base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.feeAssetChange.base }}, "multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.feeAssetChange.multiplier }} }, - "fee_change": { - "base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.feeChange.base }}, - "multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.feeChange.multiplier }} - }, + {{- end }} + {{- if .Values.genesis.fees.ibcRelay }} "ibc_relay": { "base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.ibcRelay.base }}, "multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.ibcRelay.multiplier }} }, + {{- end }} + {{- if .Values.genesis.fees.ibcRelayerChange }} "ibc_relayer_change": { "base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.ibcRelayerChange.base }}, "multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.ibcRelayerChange.multiplier }} }, + {{- end }} + {{- if .Values.genesis.fees.ibcSudoChange }} "ibc_sudo_change": { "base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.ibcSudoChange.base }}, "multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.ibcSudoChange.multiplier }} }, + {{- end }} + {{- if .Values.genesis.fees.ics20Withdrawal }} "ics20_withdrawal": { "base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.ics20Withdrawal.base }}, "multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.ics20Withdrawal.multiplier }} }, + {{- end }} + {{- if .Values.genesis.fees.initBridgeAccount }} "init_bridge_account": { "base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.initBridgeAccount.base }}, "multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.initBridgeAccount.multiplier }} }, + {{- end }} + {{- if .Values.genesis.fees.rollupDataSubmission }} "rollup_data_submission": { "base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.rollupDataSubmission.base }}, "multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.rollupDataSubmission.multiplier }} }, + {{- end }} + {{- if .Values.genesis.fees.sudoAddressChange }} "sudo_address_change": { "base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.sudoAddressChange.base }}, "multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.sudoAddressChange.multiplier }} }, + {{- end }} + {{- if .Values.genesis.fees.transfer }} "transfer": { "base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.transfer.base }}, "multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.transfer.multiplier }} }, + {{- end }} + {{- if .Values.genesis.fees.validatorUpdate }} "validator_update": { "base": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.validatorUpdate.base }}, "multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.validatorUpdate.multiplier }} } + {{- end }} }, "allowed_fee_assets": [ {{- range $index, $value := .Values.genesis.allowedFeeAssets }} diff --git a/charts/sequencer/values.yaml b/charts/sequencer/values.yaml index 312fa56..c7eeda6 100644 --- a/charts/sequencer/values.yaml +++ b/charts/sequencer/values.yaml @@ -55,6 +55,9 @@ genesis: maxBytes: "1048576" fees: + feeChange: + base: "0" + multiplier: "0" bridgeLock: base: "0" multiplier: "1" @@ -67,9 +70,6 @@ genesis: feeAssetChange: base: "0" multiplier: "0" - feeChange: - base: "0" - multiplier: "0" ibcRelay: base: "0" multiplier: "0"