Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(charts, bridge): fix ci test #1310

Merged
merged 10 commits into from
Jul 30, 2024
Merged

fix(charts, bridge): fix ci test #1310

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
61a5687
fix(charts, bridge): fix ci test
joroshiba Jul 29, 2024
3535a7c
lint
joroshiba Jul 29, 2024
6170173
some updates
joroshiba Jul 29, 2024
b207689
update
joroshiba Jul 30, 2024
118cac2
update name
joroshiba Jul 30, 2024
323370f
remove another format
joroshiba Jul 30, 2024
a502dbd
fix smoke-cli
joroshiba Jul 30, 2024
0c28d51
fix?
joroshiba Jul 30, 2024
be645d2
try building charts before lint
joroshiba Jul 30, 2024
734514d
add a sleep
joroshiba Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions charts/deploy.just
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,12 @@ deploy-smoke-cli tag=defaultTag:
--create-namespace > /dev/null
@just wait-for-sequencer > /dev/null
@echo "Starting EVM rollup..." && helm install -n astria-dev-cluster astria-chain-chart ./charts/evm-stack -f dev/values/rollup/dev.yaml \
{{ if tag != '' { replace('--set evm-rollup.images.conductor.devTag=# --set composer.images.composer.devTag=# --set evm-bridge-withdrawer.images.evmBridgeWithdrawer.devTag=#', '#', tag) } else { '' } }} \
{{ if tag != '' { replace('--set evm-rollup.images.conductor.devTag=# --set composer.images.composer.devTag=#', '#', tag) } else { '' } }} \
--set blockscout-stack.enabled=false \
--set postgresql.enabled=false \
--set evm-bridge-withdrawer.enabled=false \
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is in the cli test, it shouldn't be running the bridge withdrawer

--set evm-faucet.enabled=false > /dev/null
@just wait-for-rollup > /dev/null
@just wait-for-dev-rollup > /dev/null


evm_destination_address := "0xaC21B97d35Bf75A7dAb16f35b111a50e78A72F30"
Expand Down
4 changes: 2 additions & 2 deletions charts/evm-bridge-withdrawer/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
name: bridge-withdrawer
name: evm-bridge-withdrawer
description: A Helm chart for deploying the evm bridge withdrawer for Astria native bridge

# A chart can be either an 'application' or a 'library' chart.
Expand All @@ -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.0
version: 0.1.1

# 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
8 changes: 4 additions & 4 deletions charts/evm-stack/Chart.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ dependencies:
- name: evm-faucet
repository: file://../evm-faucet
version: 0.1.0
- name: bridge-withdrawer
- name: evm-bridge-withdrawer
repository: file://../evm-bridge-withdrawer
version: 0.1.0
version: 0.1.1
- 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:ff21c9da378275fdffee8af268a64a0b846893699c334082305e8487dde93ede
generated: "2024-07-25T16:40:06.411653-05:00"
digest: sha256:d337fa8fa4f7c8986527bf03bc7a1511bd1ac196214b35b8c2cf8d99d8e0358b
generated: "2024-07-30T09:09:11.244761-07:00"
8 changes: 4 additions & 4 deletions charts/evm-stack/Chart.yaml
View file
Open in desktop
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.2.1
version: 0.3.0

dependencies:
- name: evm-rollup
Expand All @@ -29,10 +29,10 @@ dependencies:
version: 0.1.0
repository: "file://../evm-faucet"
condition: evm-faucet.enabled
- name: bridge-withdrawer
version: 0.1.0
- name: evm-bridge-withdrawer
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our overrides were over the wrong chart sha in tests. The name here wasn't following norms, the name here should match the chart name, fixed the chart instead of just changing values overrides.

version: 0.1.1
repository: "file://../evm-bridge-withdrawer"
condition: bridge-withdrawer.enabled
condition: evm-bridge-withdrawer.enabled
- name: postgresql
version: "15.2.4"
repository: "https://charts.bitnami.com/bitnami"
Expand Down
2 changes: 1 addition & 1 deletion charts/evm-stack/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ evm-faucet:
rollupName: "{{ .Values.global.rollupName }}"
providerUrl: "http://{{ .Values.global.rollupName }}-evm-service.{{ default .Release.Namespace .Values.global.namespaceOverride }}.svc.cluster.local:8545"

bridge-withdrawer:
evm-bridge-withdrawer:
enabled: false
config:
sequencerChainId: "{{ .Values.global.sequencerChainId }}"
Expand Down
11 changes: 5 additions & 6 deletions crates/astria-bridge-withdrawer/src/bridge_withdrawer/startup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,12 +409,11 @@ async fn wait_for_empty_mempool(
futures::future::ready(())
},
);
let sequencer_client =
SequencerServiceClient::connect(format!("http://{}", sequencer_grpc_endpoint.clone()))
.await
.wrap_err_with(|| {
format!("failed to connect to sequencer at `{sequencer_grpc_endpoint}`")
})?;
let sequencer_client = SequencerServiceClient::connect(sequencer_grpc_endpoint.clone())
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We shouldn't be forcing http on the url path here, uri protocol specified in the env var.

.await
.wrap_err_with(|| {
format!("failed to connect to sequencer at `{sequencer_grpc_endpoint}`")
})?;

tryhard::retry_fn(|| {
let sequencer_client = sequencer_client.clone();
Expand Down
2 changes: 1 addition & 1 deletion crates/astria-bridge-withdrawer/src/bridge_withdrawer/submitter/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ impl Submitter {
let startup::Info { chain_id, .. } = startup_info.wrap_err("submitter failed to get startup info")?;

let sequencer_grpc_client = sequencer_service_client::SequencerServiceClient::connect(
format!("http://{}", self.sequencer_grpc_endpoint),
self.sequencer_grpc_endpoint.clone(),
).await.wrap_err("failed to connect to sequencer gRPC endpoint")?;

self.state.set_submitter_ready();
Expand Down
4 changes: 1 addition & 3 deletions crates/astria-bridge-withdrawer/tests/blackbox/helpers/test_bridge_withdrawer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,13 +262,11 @@ impl TestBridgeWithdrawerConfig {
let ethereum = ethereum_config.spawn().await;

let cometbft_mock = wiremock::MockServer::start().await;

let sequencer_mock = MockSequencerServer::spawn().await;
let sequencer_grpc_endpoint = sequencer_mock.local_addr.to_string();

let config = Config {
sequencer_cometbft_endpoint: cometbft_mock.uri(),
sequencer_grpc_endpoint,
sequencer_grpc_endpoint: format!("http://{}", sequencer_mock.local_addr),
sequencer_chain_id: SEQUENCER_CHAIN_ID.into(),
sequencer_key_path,
fee_asset_denomination: asset_denom.clone(),
Expand Down
2 changes: 1 addition & 1 deletion dev/values/rollup/dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ composer:
privateKey:
devContent: "2bd806c97f0e00af1a1fc3328fa763a9269723c8db8fac4f93af71db186d6e90"

bridge-withdrawer:
evm-bridge-withdrawer:
enabled: true
config:
minExpectedFeeAssetBalance: "0"
Expand Down
Loading