Skip to content

chore(conductor, composer)!: update chain_id strings to rollup_name#633

Closed
joroshiba wants to merge 6 commits into
mainfrom
joroshiba/chain-id-to-rollup-name
Closed

chore(conductor, composer)!: update chain_id strings to rollup_name#633
joroshiba wants to merge 6 commits into
mainfrom
joroshiba/chain-id-to-rollup-name

Conversation

@joroshiba

@joroshiba joroshiba commented Dec 4, 2023

Copy link
Copy Markdown
Member

Summary

changed references to chain_id that were strings to rollup_name or rollup_id from the sequencer viewpoint.

Background

Chain ID is hugely overloaded, we previously updated our protos, but we haven't updated some configuration to remove the overloading.

Changes

  • updated conductor config
  • updated composer + comments in composer

Breaking Changes

  • changes to conductor configuration

@joroshiba joroshiba added the docker-build used to trigger docker builds on PRs label Dec 4, 2023
@github-actions github-actions Bot added conductor pertaining to the astria-conductor crate composer pertaining to composer labels Dec 4, 2023
@joroshiba joroshiba changed the title chore(conductor, composer): update chain_id strings to rollup_name chore(conductor, composer)!: update chain_id strings to rollup_name Dec 4, 2023

@SuperFluffy SuperFluffy left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Good follow-up to tie up loose ends after #436 got merged.

Comment thread crates/astria-composer/local.env.example Outdated
Comment thread crates/astria-composer/src/searcher/rollup.rs Outdated
Comment thread crates/astria-composer/src/searcher/rollup.rs Outdated
@github-actions github-actions Bot added sequencer pertaining to the astria-sequencer crate sequencer-relayer pertaining to the astria-sequencer-relayer crate labels Dec 6, 2023
@joroshiba joroshiba requested a review from SuperFluffy December 6, 2023 19:45

@SuperFluffy SuperFluffy left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Minor suggestion. In general I think there are likely other places where our variable naming is not perfect with respect to chain Id, rollup ID, and name. But I think that's ok.

return Err(e).wrap_err_with(|| {
format!(
"collector for chain ID {chain_id} failed while waiting for it to become \
"collector for rollup {rollup_name} failed while waiting for it to become \

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
"collector for rollup {rollup_name} failed while waiting for it to become \
"collector for rollup `{rollup_name}` failed while waiting for it to become \

I like doing this to have the name stand out a bit more.

@joroshiba

Copy link
Copy Markdown
Member Author

Closing in favor of #791 due to staleness and many changes since put together.

@joroshiba joroshiba closed this Mar 6, 2024
joroshiba added a commit that referenced this pull request Mar 13, 2024
## Summary
Disambiguate uses of chain-id in core services, making sure it's clear
when we mean `rollup-id`, `rollup-name`, or `chain-id`

## Background
We previously used to have a lot of chain id overlap. Now chain id
(outside of the cli crate), should refer to only the cometbft chain id
of either the sequencer or another IBC compatible chain id. Instances
referring to rollups are now referenced wholly by `rollup-name` when it
is a string or `rollup-id` when it is a 32 bit byte array.

There is a previous stale PR
(#633) that accomplished this,
but many change since then opted to go from scratch.

## Changes
- update references mostly in composer to `chain-id`
@joroshiba joroshiba deleted the joroshiba/chain-id-to-rollup-name branch March 21, 2024 13:50
sgranfield4403-3 added a commit to sgranfield4403-3/astria that referenced this pull request Oct 2, 2025
## Summary
Disambiguate uses of chain-id in core services, making sure it's clear
when we mean `rollup-id`, `rollup-name`, or `chain-id`

## Background
We previously used to have a lot of chain id overlap. Now chain id
(outside of the cli crate), should refer to only the cometbft chain id
of either the sequencer or another IBC compatible chain id. Instances
referring to rollups are now referenced wholly by `rollup-name` when it
is a string or `rollup-id` when it is a 32 bit byte array.

There is a previous stale PR
(astriaorg/astria#633) that accomplished this,
but many change since then opted to go from scratch.

## Changes
- update references mostly in composer to `chain-id`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

composer pertaining to composer conductor pertaining to the astria-conductor crate docker-build used to trigger docker builds on PRs sequencer pertaining to the astria-sequencer crate sequencer-relayer pertaining to the astria-sequencer-relayer crate

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants