From 57015dc52ff1af98a9a78e9eed457e75b1e580c2 Mon Sep 17 00:00:00 2001 From: "github-merge-queue[bot]" Date: Thu, 7 Nov 2024 10:28:12 +0000 Subject: [PATCH] Changes from astriaorg/astria@e5577e17fbeb55b65c4f476ed11d8c2859ed21a6 --- charts/celestia-local/Chart.yaml | 2 +- .../files/scripts/init-celestia-appd.sh | 3 +++ charts/celestia-local/templates/configmap.yaml | 1 + charts/celestia-local/values.yaml | 1 + charts/evm-stack/Chart.lock | 6 +++--- charts/evm-stack/Chart.yaml | 4 ++-- charts/ibc-test.just | 16 ++++++++++------ 7 files changed, 21 insertions(+), 12 deletions(-) diff --git a/charts/celestia-local/Chart.yaml b/charts/celestia-local/Chart.yaml index 7cf84fe..f30edc2 100644 --- a/charts/celestia-local/Chart.yaml +++ b/charts/celestia-local/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.6.3 +version: 0.6.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 diff --git a/charts/celestia-local/files/scripts/init-celestia-appd.sh b/charts/celestia-local/files/scripts/init-celestia-appd.sh index ecac012..80ac2bd 100755 --- a/charts/celestia-local/files/scripts/init-celestia-appd.sh +++ b/charts/celestia-local/files/scripts/init-celestia-appd.sh @@ -62,3 +62,6 @@ sed -i'.bak' 's#"null"#"kv"#g' "${home_dir}"/config/config.toml sed -i'.bak' 's#discard_abci_responses = true#discard_abci_responses = false#g' "${home_dir}"/config/config.toml # Override the VotingPeriod from 1 week to 1 minute sed -i'.bak' 's#"604800s"#"60s"#g' "${home_dir}"/config/genesis.json +if $fast; then + sed -i'.bak' 's#timeout_commit = "11s"#timeout_commit = "1s"#g' "${home_dir}"/config/config.toml +fi diff --git a/charts/celestia-local/templates/configmap.yaml b/charts/celestia-local/templates/configmap.yaml index dd77935..d978a86 100644 --- a/charts/celestia-local/templates/configmap.yaml +++ b/charts/celestia-local/templates/configmap.yaml @@ -21,6 +21,7 @@ data: ibc_account_key_name: "{{ .Values.ibcAccountKeyName }}" dev_account_mnemonic: "{{ .Values.devAccountMnemonic }}" dev_account_key_name: "{{ .Values.devAccountName }}" + fast: "{{ .Values.fast }}" --- apiVersion: v1 kind: ConfigMap diff --git a/charts/celestia-local/values.yaml b/charts/celestia-local/values.yaml index 9ffa178..e0751f9 100644 --- a/charts/celestia-local/values.yaml +++ b/charts/celestia-local/values.yaml @@ -47,6 +47,7 @@ ibcAccountMnemonic: globe elegant people render embark whisper pumpkin local thi # address celestia1m0ksdjl2p5nzhqy3p47fksv52at3ln885xvl96 devAccountName: "dev-account" devAccountMnemonic: enrich avocado local net will avoid dizzy truth column excuse ready lesson +fast: false # Default service ports ports: diff --git a/charts/evm-stack/Chart.lock b/charts/evm-stack/Chart.lock index 6e644fa..2336371 100644 --- a/charts/evm-stack/Chart.lock +++ b/charts/evm-stack/Chart.lock @@ -19,6 +19,6 @@ dependencies: version: 15.2.4 - name: blockscout-stack repository: https://blockscout.github.io/helm-charts - version: 1.6.2 -digest: sha256:b0f9adad7d8a55f86ebd7b2e7aeb4f5b479b5b38a6c423ff013b9a5a57446f4d -generated: "2024-11-01T11:28:14.128143-07:00" + version: 1.6.8 +digest: sha256:d7d13d546b7c02594756cc24511f95316bd9e8664a5d336b551e22e70332a0d8 +generated: "2024-11-07T11:31:10.563322+02:00" diff --git a/charts/evm-stack/Chart.yaml b/charts/evm-stack/Chart.yaml index 93f1279..46a07f8 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: 1.0.1 +version: 1.0.2 dependencies: - name: celestia-node @@ -43,7 +43,7 @@ dependencies: condition: postgresql.enabled - name: blockscout-stack repository: "https://blockscout.github.io/helm-charts" - version: "1.6.2" + version: "1.6.8" condition: blockscout-stack.enabled diff --git a/charts/ibc-test.just b/charts/ibc-test.just index 6d42efe..0e330f8 100644 --- a/charts/ibc-test.just +++ b/charts/ibc-test.just @@ -12,7 +12,8 @@ delete: @deploy tag=defaultTag: echo "Deploying ingress controller..." && just deploy-ingress-controller > /dev/null just wait-for-ingress-controller > /dev/null - echo "Deploying local celestia instance..." && just deploy celestia-local > /dev/null + echo "Deploying local celestia instance..." + helm install celestia-local-chart ./celestia-local --namespace {{defaultNamespace}} --set fast=true --create-namespace > /dev/null helm dependency update ./sequencer > /dev/null helm dependency update ./evm-stack > /dev/null echo "Setting up single astria sequencer..." && helm install \ @@ -37,7 +38,8 @@ delete: @deploy-without-native tag=defaultTag: echo "Deploying ingress controller..." && just deploy-ingress-controller > /dev/null just wait-for-ingress-controller > /dev/null - echo "Deploying local celestia instance..." && just deploy celestia-local > /dev/null + echo "Deploying local celestia instance..." + helm install celestia-local-chart ./celestia-local --namespace {{defaultNamespace}} --set fast=true --create-namespace > /dev/null helm dependency update ./sequencer > /dev/null echo "Setting up single astria sequencer..." && helm install \ -n astria-validator-single single-sequencer-chart ./sequencer \ @@ -53,7 +55,8 @@ delete: @deploy-timeout tag=defaultTag: echo "Deploying ingress controller..." && just deploy-ingress-controller > /dev/null just wait-for-ingress-controller > /dev/null - echo "Deploying local celestia instance..." && just deploy celestia-local > /dev/null + echo "Deploying local celestia instance..." > /dev/null + helm install celestia-local-chart ./celestia-local --namespace {{defaultNamespace}} --set fast=true --create-namespace > /dev/null helm dependency update ./sequencer > /dev/null helm dependency update ./evm-stack > /dev/null echo "Setting up single astria sequencer..." && helm install \ @@ -373,8 +376,8 @@ run-timeout tag=defaultTag: # There are some acknowledgements flying back and forth which make creating a height # that is a timeout without being stale with a client update a challenge without # waiting for acknowledgements to settle. This is a hack. - echo "Waiting for 30 seconds to allow for acknowledgements to settle..." - sleep 30 + echo "Waiting for 5 seconds to allow for acknowledgements to settle..." + sleep 5 # Grabbing the current celestia block height and resetting the timeout height of the withdrawal # to one lower to force an immediate timeout which should create a refund event. @@ -391,7 +394,8 @@ run-timeout tag=defaultTag: docker volume remove cli-test-withdrawals # Validate that the Celestia balance timed out - for i in {1..30} + echo "Checking for 10 seconds to ensure that Celestia balance does not update" + for i in {1..10} do current_celestia_balance=$(just ibc-test get-celestia-balance) echo "check $i, balance: $current_celestia_balance, if failure balance: $expected_celestia_balance"