Skip to content
This repository has been archived by the owner on Oct 22, 2024. It is now read-only.

Fix bridge hub router #140

Closed
wants to merge 2 commits into from
Closed

Fix bridge hub router #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7973ce3
Fix validate in xcm-bridge-hub-router
yrong Apr 15, 2024
67b7d64
Fix compile error
yrong Apr 15, 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
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions bridges/modules/xcm-bridge-hub-router/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,8 +341,8 @@ impl<T: Config<I>, I: 'static> SendXcm for Pallet<T, I> {
// versioned message to the sibling bridge hub. However, the local bridge hub may have a
// higher XCM version than the remote `dest`. Once again, it is better to discard such
// messages here than at the bridge hub (e.g., to avoid losing funds).
let destination_version = T::DestinationVersion::get_version_for(dest_ref)
.ok_or(SendError::DestinationUnsupported)?;
let destination_version =
T::DestinationVersion::get_version_for(dest_ref).ok_or(SendError::NotApplicable)?;
Comment on lines +344 to +345
Copy link
Author

@yrong yrong Apr 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

It should not throw the DestinationUnsupported error here, instead as required by Tuple::validate logic

polkadot-sdk/polkadot/xcm/src/v4/traits.rs

Lines 264 to 270 in 67b7d64

match Tuple::validate(destination, message) {
Err(SendError::NotApplicable) => None,
Err(e) => { return Err(e) },
Ok((v, c)) => {
maybe_cost = Some(c);
Some(v)
},
, the implementation of SendXcm should only throw the error NotApplicable to give chance to the next impl of the SendXcm Tuple to process.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Good catch!

let _ = VersionedXcm::from(xcm_ref.clone())
.into_version(destination_version)
.map_err(|()| SendError::DestinationUnsupported)?;
Expand Down
Loading
Loading