Skip to content

Conversation

@doubledup
Copy link
Contributor

@doubledup doubledup commented Apr 14, 2023

This also makes the parachain relayer sync messages for a single configured parachain id instead of multiple.

Issue
Companion PR in Cumulus fork (will bump the submodule here once the companion's merged)

@doubledup doubledup requested a review from vgeddes April 14, 2023 11:20
@doubledup doubledup self-assigned this Apr 14, 2023
@doubledup doubledup marked this pull request as draft April 14, 2023 11:20
@vgeddes
Copy link
Collaborator

vgeddes commented Apr 14, 2023

The other is an unresolved import for snowbridge_router_primitives::ConvertTokenAddress, which doesn't sound related to this change.

This should be fixed in latest master.

@doubledup doubledup changed the title David/SNO-425: For parachain -> eth messages, sync by parachain id instead of account id SNO-425: For parachain -> eth messages, sync by parachain id instead of account id Apr 14, 2023
fn into(self) -> Token {
Token::Tuple(vec![
Token::Bytes(self.parachain_id.encode()),
Token::Uint(u32::from(self.origin).into()),
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Had to add an explicit conversion here because Uint has a From<u32> but no From<polkadot_parachain::primitives::Id>

@doubledup doubledup marked this pull request as ready for review April 17, 2023 13:25
Copy link
Contributor

@yrong yrong left a comment

Choose a reason for hiding this comment

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

LGTM!

Contracts SourceContractsConfig `mapstructure:"contracts"`
// Block number when Beefy was activated
BeefyActivationBlock uint64 `mapstructure:"beefy-activation-block"`
LaneID uint32 `mapstructure:"lane-id"`
Copy link
Contributor

Choose a reason for hiding this comment

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

A LaneId is a ParaId. I am not sure if we should use different terms for the same thing. In the outbound queue, we use ParaId and make no mention of Lanes. In the Rococo-Wococo bridge, they use a concept of a lane as well and it seems to be an arbitrary id that routes to but is not a ParaId.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Right, that could be confusing. This was based on the execution relayer config, so I'd rather do it in a follow-up PR so we don't change the execution relayer here. LaneIDs only exist in our relayers, in the queues & messages we call it origin but paraID sounds fine for the relayers.

@vgeddes Are you happy with ParaID in the relayers?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Semi-related: I noticed a bunch of sourceID references and changed them to laneID for consistency.

doubledup added a commit to Snowfork/cumulus that referenced this pull request Apr 18, 2023
@doubledup doubledup merged commit 36c3279 into main Apr 18, 2023
@doubledup doubledup deleted the david/sno-425 branch April 18, 2023 16:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants