Fix cumulus bridgehub runtime for proxy contracts. (#50)

Co-authored-by: claravanstaden <Cats 4 life!>
Snowfork · Jul 25, 2023 · dc8f425 · dc8f425
1 parent f59e134
commit dc8f425
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs b/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
@@ -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};
 
@@ -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")]

diff --git a/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs b/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs
@@ -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))
 			},
 			_ => unimplemented!("Unsupported network: {:?}", network),
 		}
@@ -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),
 		}