Merge branch 'master' of github.com:paritytech/polkadot-sdk into pall…

…et-xcm-fully-support-reserve-transfers
paritytech · Oct 27, 2023 · 2e71447 · 2e71447
2 parents bd60203 + 3069b0a
commit 2e71447
Show file tree

Hide file tree

Showing 73 changed files with 2,268 additions and 323 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -179,6 +179,8 @@ members = [
 	"polkadot/xcm/xcm-simulator",
 	"polkadot/xcm/xcm-simulator/example",
 	"polkadot/xcm/xcm-simulator/fuzzer",
+	"substrate/bin/minimal/node",
+	"substrate/bin/minimal/runtime",
 	"substrate",
 	"substrate/bin/node-template/node",
 	"substrate/bin/node-template/pallets/template",
@@ -251,6 +253,7 @@ members = [
 	"substrate/client/transaction-pool",
 	"substrate/client/transaction-pool/api",
 	"substrate/client/utils",
+	"substrate/frame",
 	"substrate/frame/alliance",
 	"substrate/frame/asset-conversion",
 	"substrate/frame/asset-rate",
@@ -350,7 +353,6 @@ members = [
 	"substrate/frame/support/test",
 	"substrate/frame/support/test/compile_pass",
 	"substrate/frame/support/test/pallet",
-	"substrate/frame/support/test/stg_frame_crate/frame",
 	"substrate/frame/support/test/stg_frame_crate",
 	"substrate/frame/system",
 	"substrate/frame/system/benchmarking",

diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/tests/tests.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/tests/tests.rs
@@ -677,6 +677,7 @@ mod asset_hub_rococo_tests {
 			bridging_to_asset_hub_wococo,
 			WeightLimit::Unlimited,
 			Some(xcm_config::bridging::XcmBridgeHubRouterFeeAssetId::get()),
+			Some(xcm_config::TreasuryAccount::get().unwrap()),
 		)
 	}
 
@@ -711,29 +712,11 @@ mod asset_hub_rococo_tests {
 			Runtime,
 			AllPalletsWithoutSystem,
 			XcmConfig,
-			ParachainSystem,
-			XcmpQueue,
 			LocationToAccountId,
 			ToWococoXcmRouterInstance,
 		>(
 			collator_session_keys(),
-			ExistentialDeposit::get(),
-			AccountId::from(ALICE),
-			Box::new(|runtime_event_encoded: Vec<u8>| {
-				match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-					Ok(RuntimeEvent::PolkadotXcm(event)) => Some(event),
-					_ => None,
-				}
-			}),
-			Box::new(|runtime_event_encoded: Vec<u8>| {
-				match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-					Ok(RuntimeEvent::XcmpQueue(event)) => Some(event),
-					_ => None,
-				}
-			}),
 			bridging_to_asset_hub_wococo,
-			WeightLimit::Unlimited,
-			Some(xcm_config::bridging::XcmBridgeHubRouterFeeAssetId::get()),
 			|| {
 				sp_std::vec![
 					UnpaidExecution { weight_limit: Unlimited, check_origin: None },
@@ -911,6 +894,7 @@ mod asset_hub_wococo_tests {
 			with_wococo_flavor_bridging_to_asset_hub_rococo,
 			WeightLimit::Unlimited,
 			Some(xcm_config::bridging::XcmBridgeHubRouterFeeAssetId::get()),
+			Some(xcm_config::TreasuryAccount::get().unwrap()),
 		)
 	}
 
@@ -945,29 +929,11 @@ mod asset_hub_wococo_tests {
 			Runtime,
 			AllPalletsWithoutSystem,
 			XcmConfig,
-			ParachainSystem,
-			XcmpQueue,
 			LocationToAccountId,
 			ToRococoXcmRouterInstance,
 		>(
 			collator_session_keys(),
-			ExistentialDeposit::get(),
-			AccountId::from(ALICE),
-			Box::new(|runtime_event_encoded: Vec<u8>| {
-				match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-					Ok(RuntimeEvent::PolkadotXcm(event)) => Some(event),
-					_ => None,
-				}
-			}),
-			Box::new(|runtime_event_encoded: Vec<u8>| {
-				match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
-					Ok(RuntimeEvent::XcmpQueue(event)) => Some(event),
-					_ => None,
-				}
-			}),
 			with_wococo_flavor_bridging_to_asset_hub_rococo,
-			WeightLimit::Unlimited,
-			Some(xcm_config::bridging::XcmBridgeHubRouterFeeAssetId::get()),
 			|| {
 				sp_std::vec![
 					UnpaidExecution { weight_limit: Unlimited, check_origin: None },

diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
@@ -1081,10 +1081,10 @@ impl_runtime_apis! {
 
 		fn system_attribute(
 			collection: u32,
-			item: u32,
+			item: Option<u32>,
 			key: Vec<u8>,
 		) -> Option<Vec<u8>> {
-			<Nfts as Inspect<AccountId>>::system_attribute(&collection, &item, &key)
+			<Nfts as Inspect<AccountId>>::system_attribute(&collection, item.as_ref(), &key)
 		}
 
 		fn collection_attribute(collection: u32, key: Vec<u8>) -> Option<Vec<u8>> {