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

Jump to bottom

Contracts V3 #50

Merged
merged 1 commit into from
Jul 25, 2023
Merged

Contracts V3 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,6 @@ use bp_runtime::HeaderId;
#[cfg(any(feature = "std", test))]
pub use sp_runtime::BuildStorage;

pub use snowbridge_core::MessageId;

use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate};
use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};

Expand Down Expand Up @@ -593,9 +591,9 @@ impl<T: snowbridge_ethereum_beacon_client::Config> BenchmarkHelper<T> for Runtim

impl snowbridge_inbound_queue::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type Verifier = snowbridge_ethereum_beacon_client::Pallet<Runtime>;
type Token = Balances;
type Reward = Reward;
type Verifier = snowbridge_ethereum_beacon_client::Pallet<Runtime>;
type XcmSender = XcmRouter;
type WeightInfo = weights::snowbridge_inbound_queue::WeightInfo<Runtime>;
#[cfg(feature = "runtime-benchmarks")]
Expand Down
4 changes: 2 additions & 2 deletions parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ impl ExportXcm for BridgeHubRococoOrBridgeHubWococoSwitchExporter {
destination,
message,
)
.map(|result| ((EthereumNetwork::get(), result.0), result.1))
.map(|result| ((EthereumNetwork::get(), (result.0, XcmHash::default())), result.1))
Copy link
Author

Choose a reason for hiding this comment

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

Because SnowbridgeExporter::validate no longer returns the XcmHash. Not sure what the solution is here, I think @vgeddes mentioned in a newer version of Substrate the other validators also do not return the XcmHash?

Copy link

Choose a reason for hiding this comment

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

Yeah returning XcmHash::default is fine here.

When we upgrade to the latest cumulus it will all be fine.

},
_ => unimplemented!("Unsupported network: {:?}", network),
}
Expand All @@ -409,7 +409,7 @@ impl ExportXcm for BridgeHubRococoOrBridgeHubWococoSwitchExporter {
Rococo => ToBridgeHubRococoHaulBlobExporter::deliver(ticket),
Wococo => ToBridgeHubWococoHaulBlobExporter::deliver(ticket),
location if location == EthereumNetwork::get() && relay == NetworkId::Rococo => {
SnowbridgeExporter::deliver(ticket)
SnowbridgeExporter::deliver(ticket.0)
},
_ => unimplemented!("Unsupported network: {:?}", network),
}
Expand Down
Loading