diff --git a/charts/composer/Chart.yaml b/charts/composer/Chart.yaml index 26b0666..dd68073 100644 --- a/charts/composer/Chart.yaml +++ b/charts/composer/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.1.5 +version: 0.1.6 # 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 59d9b0d..f9ed82c 100644 --- a/charts/evm-stack/Chart.lock +++ b/charts/evm-stack/Chart.lock @@ -7,7 +7,7 @@ dependencies: version: 0.27.6 - name: composer repository: file://../composer - version: 0.1.5 + version: 0.1.6 - name: evm-faucet repository: file://../evm-faucet version: 0.1.2 @@ -20,5 +20,5 @@ dependencies: - name: blockscout-stack repository: https://blockscout.github.io/helm-charts version: 1.6.2 -digest: sha256:0428a6d56fd86c170e322ad79c7b5f87628b6187a1df5ad47ae7c2281b7f12da -generated: "2024-10-14T15:11:45.153501+02:00" +digest: sha256:80a70740a70f834b6ff6cdcfbb5f4a3504d6963f784ff678d1d52a7284b1dc20 +generated: "2024-10-14T16:04:40.995885+02:00" diff --git a/charts/evm-stack/Chart.yaml b/charts/evm-stack/Chart.yaml index b208660..24ce1d3 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.6.3 +version: 0.6.4 dependencies: - name: celestia-node @@ -26,7 +26,7 @@ dependencies: version: 0.27.6 repository: "file://../evm-rollup" - name: composer - version: 0.1.5 + version: 0.1.6 repository: "file://../composer" condition: composer.enabled - name: evm-faucet diff --git a/charts/hermes/Chart.yaml b/charts/hermes/Chart.yaml index 016c9bd..df231f2 100644 --- a/charts/hermes/Chart.yaml +++ b/charts/hermes/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.4.2 +version: 0.4.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/hermes/values.yaml b/charts/hermes/values.yaml index cc878df..f17fdba 100644 --- a/charts/hermes/values.yaml +++ b/charts/hermes/values.yaml @@ -3,7 +3,7 @@ global: replicaCount: 1 logLevel: debug -image: ghcr.io/astriaorg/hermes:sha-450f848 +image: ghcr.io/astriaorg/hermes:sha-f6189cd imagePullPolicy: IfNotPresent fullnameOverride: "" diff --git a/charts/ibc-test.just b/charts/ibc-test.just index 9e273e6..6142228 100644 --- a/charts/ibc-test.just +++ b/charts/ibc-test.just @@ -70,6 +70,9 @@ run tag=defaultTag: exit 1 fi + # Execute the transfer from Celstia to sequencer with compat address + just ibc-test _do-compat-ibc-transfer + # check that celestia balance updated correctly for i in {1..50} do @@ -87,6 +90,25 @@ run tag=defaultTag: exit 1 fi + # check that sequencer balance updated correctly + ASTRIA_CLI_IMAGE="{{cli_image}}{{ if tag != '' { replace(':#', '#', tag) } else { '' } }}" + EXPECTED_BALANCE=$(echo "1 * {{transfer_amount}}" | bc) + for i in {1..50} + do + BALANCE=$(docker run --rm --network host $ASTRIA_CLI_IMAGE sequencer account balance {{sequencer_address}} --sequencer-url {{sequencer_rpc_url}} | awk '/transfer\/channel-0\/utia/{print $(NF-1)}') + echo "check $i, balance: $BALANCE, Expected: $EXPECTED_BALANCE" + if [ "$BALANCE" == "$EXPECTED_BALANCE" ]; then + expected_sequencer_balance_found="1" + break + else + sleep 1 + fi + done + if [[ -z $expected_sequencer_balance_found ]]; then + echo "expected sequencer balance was not found after IBC transfer; IBC transfer with compat address failed" + exit 1 + fi + # test IBC withdrawal from the EVM to Celestia initial_balance=$(just evm-get-balance {{evm_destination_address}}) let expected_evm_balance="$initial_balance - 1000000000000" @@ -143,12 +165,16 @@ run tag=defaultTag: fi bridge_address := "astria1d7zjjljc0dsmxa545xkpwxym86g8uvvwhtezcr" +sequencer_address := "astria1cewd7alwml4fhx3w3lxq3vgf20cqe0qm650fac" +compat_address := "astriacompat1cewd7alwml4fhx3w3lxq3vgf20cqe0qmdzxmvn" celestia_dev_account_address := "celestia1m0ksdjl2p5nzhqy3p47fksv52at3ln885xvl96" celestia_chain_id := "celestia-local-0" celestia_node_url := "http://rpc.app.celestia.localdev.me:80" sequencer_tia_bridge_pkey := "6015fbe1c365d3c5ef92dc891db8c5bb26ad454bec2db4762b96e9f8b2430285" keyring_backend := "test" celestia_desitnation_address := "0x4a58639fb5458e65e4fa917ff951c390292c24a1" +sequencer_rpc_url := "http://rpc.sequencer.localdev.me" +cli_image := "ghcr.io/astriaorg/astria-cli" # This is the same address as used in deploy.just evm_destination_address := "0xaC21B97d35Bf75A7dAb16f35b111a50e78A72F30" @@ -189,6 +215,22 @@ _do-ibc-transfer namespace=defaultNamespace: --home /home/celestia \ --keyring-backend="{{keyring_backend}}"' +_do-compat-ibc-transfer namespace=defaultNamespace: + echo "Performing IBC transfer with compat address..." + kubectl exec -n {{namespace}} pods/celestia-local-0 celestia-app -- /bin/bash -c \ + 'celestia-appd tx ibc-transfer transfer \ + transfer \ + channel-0 \ + {{compat_address}} \ + "{{transfer_amount}}utia" \ + --chain-id="{{celestia_chain_id}}" \ + --from="{{celestia_dev_account_address}}" \ + --fees="{{transfer_fees}}utia" \ + --yes \ + --log_level=debug \ + --home /home/celestia \ + --keyring-backend="{{keyring_backend}}"' + get-celestia-balance address=celestia_dev_account_address namespace=defaultNamespace: #!/usr/bin/env bash balance=$(kubectl exec -n {{namespace}} pods/celestia-local-0 celestia-app -- /bin/bash -c \ diff --git a/charts/sequencer/Chart.yaml b/charts/sequencer/Chart.yaml index a76eec5..d558deb 100644 --- a/charts/sequencer/Chart.yaml +++ b/charts/sequencer/Chart.yaml @@ -15,12 +15,12 @@ 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.23.2 +version: 0.24.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.17.0" +appVersion: "0.18.0" dependencies: - name: sequencer-relayer