Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
github-merge-queue[bot] committed Nov 7, 2024
1 parent f359899 commit 57015dc
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 12 deletions.
2 changes: 1 addition & 1 deletion charts/celestia-local/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions charts/celestia-local/files/scripts/init-celestia-appd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions charts/celestia-local/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions charts/celestia-local/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions charts/evm-stack/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions charts/evm-stack/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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


Expand Down
16 changes: 10 additions & 6 deletions charts/ibc-test.just
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -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.
Expand All @@ -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"
Expand Down

0 comments on commit 57015dc

Please sign in to comment.