chore: rebase develop

UniqueNetwork · Nov 22, 2023 · 6295668 · 6295668
1 parent 9b5f43f
commit 6295668
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pallets/foreign-assets/src/lib.rs b/pallets/foreign-assets/src/lib.rs
@@ -442,7 +442,11 @@ impl<T: Config> TransactAsset for Pallet<T> {
 
 	fn check_out(_dest: &MultiLocation, _what: &MultiAsset, _context: &XcmContext) {}
 
-	fn deposit_asset(what: &MultiAsset, to: &MultiLocation, _context: &XcmContext) -> XcmResult {
+	fn deposit_asset(
+		what: &MultiAsset,
+		to: &MultiLocation,
+		_context: Option<&XcmContext>,
+	) -> XcmResult {
 		let to = T::LocationToAccountId::convert_location(to)
 			.ok_or(XcmExecutorError::AccountIdConversionFailed)?;