Review bulletin westend's xcm config

examples/README.md

@@ -187,13 +187,6 @@ docker exec -it ipfs-node ipfs swarm connect /ip4/172.17.0.1/tcp/12347/ws/p2p/12
 
 #### Example for Simple Authorizing and Store
 
-##### Using Legacy @polkadot/api (PJS)
-```
-cd examples
-npm install
-
-node authorize_and_store.js
-```
 
 ##### Using Modern PAPI (Polkadot API)
 ```bash

examples/authorize_and_store_papi.js

@@ -2,7 +2,7 @@ import assert from "assert";
 import { createClient } from 'polkadot-api';
 import { getWsProvider } from 'polkadot-api/ws-provider';
 import { cryptoWaitReady } from '@polkadot/util-crypto';
-import { authorizeAccount, fetchCid, store} from './api.js';
+import { authorizeAccount, fetchCid, store, TX_MODE_FINALIZED_BLOCK } from './api.js';
 import { setupKeyringAndSigners } from './common.js';
 import { cidFromBytes } from "./cid_dag_metadata.js";
 import { bulletin } from './.papi/descriptors/dist/index.mjs';
@@ -39,6 +39,7 @@ async function main() {
             whoAddress,
             100,
             BigInt(100 * 1024 * 1024), // 100 MiB
+            TX_MODE_FINALIZED_BLOCK,
         );
 
         // Store data.

examples/store_big_data.js

@@ -4,7 +4,7 @@ import fs from 'fs'
 import os from "os";
 import path from "path";
 import assert from "assert";
-import {authorizeAccount, store, } from "./api.js";
+import { authorizeAccount, store, TX_MODE_FINALIZED_BLOCK } from "./api.js";
 import {cidFromBytes} from "./cid_dag_metadata.js";
 import {
     setupKeyringAndSigners,
@@ -166,6 +166,7 @@ async function main() {
             signers.map(a => a.address),
             100,
             BigInt(100 * 1024 * 1024), // 100 MiB
+            TX_MODE_FINALIZED_BLOCK,
         );
 
         // Start 8 workers

runtimes/bulletin-westend/src/lib.rs

@@ -81,6 +81,8 @@ use sp_version::RuntimeVersion;
 use testnet_parachains_constants::westend::{consensus::*, currency::*, fee::WeightToFee, time::*};
 use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
 use xcm::{prelude::*, Version as XcmVersion};
+#[cfg(feature = "runtime-benchmarks")]
+use xcm_config::AssetHubLocation;
 use xcm_config::{
 	FellowshipLocation, GovernanceLocation, TokenRelayLocation, XcmOriginToTransactDispatchOrigin,
 };
@@ -964,7 +966,12 @@ impl_runtime_apis! {
 				}
 
 				fn teleportable_asset_and_dest() -> Option<(Asset, Location)> {
-					// Relay/native token can be teleported between AH and Relay.
+					// Non-system parachains do not support teleports.
+					None
+				}
+
+				fn reserve_transferable_asset_and_dest() -> Option<(Asset, Location)> {
+					// Non-system parachains use reserve transfers for DOT from Asset Hub.
 					Some((
 						Asset {
 							fun: Fungible(ExistentialDeposit::get()),
@@ -974,18 +981,32 @@ impl_runtime_apis! {
 					))
 				}
 
-				fn reserve_transferable_asset_and_dest() -> Option<(Asset, Location)> {
-					None
-				}
-
 				fn set_up_complex_asset_transfer() -> Option<(Assets, u32, Location, alloc::boxed::Box<dyn FnOnce()>)> {
-					let native_location = Parent.into();
-					let dest = Parent.into();
-
-					pallet_xcm::benchmarking::helpers::native_teleport_as_asset_transfer::<Runtime>(
-						native_location,
-						dest,
-					)
+					// Bulletin-westend is a non-system parachain that uses reserve transfers for the relay token.
+					// We set up a reserve transfer of the native token (relay token) to AssetHub.
+					use frame_support::traits::fungible::{Inspect, Mutate};
+
+					let dest = AssetHubLocation::get();
+					let fee_amount: Balance = ExistentialDeposit::get();
+					let fee_asset: Asset = (Location::parent(), fee_amount).into();
+
+					let who = frame_benchmarking::whitelisted_caller();
+					// Give some multiple of the existential deposit
+					let balance: Balance = fee_amount + ExistentialDeposit::get() * 1000;
+					let _ = <Balances as Mutate<_>>::mint_into(&who, balance);
+					// verify initial balance
+					assert_eq!(<Balances as Inspect<_>>::balance(&who), balance);
+
+					let assets: Assets = vec![fee_asset.clone()].into();
+					let fee_index = 0u32;
+
+					// verify transferred successfully
+					let verify = alloc::boxed::Box::new(move || {
+						// verify balance after transfer, decreased by transferred amount
+						// (plus transport/remote fees)
+						assert!(<Balances as Inspect<_>>::balance(&who) <= balance - fee_amount);
+					});
+					Some((assets, fee_index, dest, verify))
 				}
 
 				fn get_asset() -> Asset {
@@ -1038,12 +1059,12 @@ impl_runtime_apis! {
 			}
 
 			parameter_types! {
-				pub const TrustedTeleporter: Option<(Location, Asset)> = Some((
+				pub const TrustedTeleporter: Option<(Location, Asset)> = None;
+				pub const CheckedAccount: Option<(AccountId, xcm_builder::MintLocation)> = None;
+				pub const TrustedReserve: Option<(Location, Asset)> = Some((
 					TokenRelayLocation::get(),
 					Asset { fun: Fungible(UNITS), id: AssetId(TokenRelayLocation::get()) },
 				));
-				pub const CheckedAccount: Option<(AccountId, xcm_builder::MintLocation)> = None;
-				pub const TrustedReserve: Option<(Location, Asset)> = None;
 			}
 
 			impl pallet_xcm_benchmarks::fungible::Config for Runtime {

runtimes/bulletin-westend/src/xcm_config.rs

@@ -32,7 +32,7 @@ use pallet_xcm::{AuthorizedAliasers, XcmPassthrough};
 use parachains_common::{
 	xcm_config::{
 		AliasAccountId32FromSiblingSystemChain, AllSiblingSystemParachains,
-		ConcreteAssetFromSystem, ParentRelayOrSiblingParachains, RelayOrOtherSystemParachains,
+		ParentRelayOrSiblingParachains, RelayOrOtherSystemParachains,
 	},
 	TREASURY_PALLET_ID,
 };
@@ -47,8 +47,8 @@ use xcm_builder::{
 	AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom,
 	DenyRecursively, DenyReserveTransferToRelayChain, DenyThenTry, DescribeAllTerminal,
 	DescribeFamily, EnsureXcmOrigin, FrameTransactionalProcessor, FungibleAdapter,
-	HashedDescription, IsConcrete, LocationAsSuperuser, ParentAsSuperuser, ParentIsPreset,
-	RelayChainAsNative, SendXcmFeeToAccount, SiblingParachainAsNative, SiblingParachainConvertsVia,
+	HashedDescription, IsConcrete, LocationAsSuperuser, ParentIsPreset, RelayChainAsNative,
+	SendXcmFeeToAccount, SiblingParachainAsNative, SiblingParachainConvertsVia,
 	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
 	TrailingSetTopicAsId, UsingComponents, WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
 	XcmFeeManagerFromComponents,
@@ -119,9 +119,6 @@ pub type XcmOriginToTransactDispatchOrigin = (
 	// Native converter for sibling Parachains; will convert to a `SiblingPara` origin when
 	// recognized.
 	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, RuntimeOrigin>,
-	// Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a
-	// transaction from the Root origin.
-	ParentAsSuperuser<RuntimeOrigin>,
 	// Native signed account converter; this just converts an `AccountId32` origin into a normal
 	// `RuntimeOrigin::Signed` origin of the same 32-byte value.
 	SignedAccountId32AsNative<RelayNetwork, RuntimeOrigin>,
@@ -159,14 +156,15 @@ pub type Barrier = TrailingSetTopicAsId<
 					// If the message is one that immediately attempts to pay for execution, then
 					// allow it.
 					AllowTopLevelPaidExecutionFrom<Everything>,
-					// Parent, its pluralities (i.e. governance bodies), and the Fellows plurality
-					// get free execution.
+					// Parent, its pluralities (i.e. governance bodies), Fellows plurality,
+					// and AssetHub get free execution.
 					AllowExplicitUnpaidExecutionFrom<(
 						ParentOrParentsPlurality,
 						FellowsPlurality,
 						Equals<GovernanceLocation>,
 						// Let's allow a People chain for PoP authorizations.
 						Equals<PeopleLocation>,
+						Equals<AssetHubLocation>,
 					)>,
 					// Subscriptions for version tracking are OK.
 					AllowSubscriptionsFrom<ParentRelayOrSiblingParachains>,
@@ -191,11 +189,36 @@ pub type WaivedLocations = (
 	Equals<RootLocation>,
 	RelayOrOtherSystemParachains<AllSiblingSystemParachains, Runtime>,
 	Equals<RelayTreasuryLocation>,
+	Equals<AssetHubLocation>,
 );
 
-/// Cases where a remote origin is accepted as trusted Teleporter for a given asset:
-/// - WND with the parent Relay Chain and sibling parachains.
-pub type TrustedTeleporters = ConcreteAssetFromSystem<TokenRelayLocation>;
+/// Helper type to match DOT (relay native token) from Asset Hub.
+/// Non-system parachains should trust Asset Hub as the reserve location for DOT.
+pub struct IsDotFrom<Origin>(core::marker::PhantomData<Origin>);
+impl<Origin> frame_support::traits::ContainsPair<Asset, Location> for IsDotFrom<Origin>
+where
+	Origin: frame_support::traits::Get<Location>,
+{
+	fn contains(asset: &Asset, origin: &Location) -> bool {
+		let loc = Origin::get();
+		&loc == origin &&
+			matches!(
+				asset,
+				Asset {
+					id: AssetId(asset_id_location),
+					fun: Fungible(_),
+				} if *asset_id_location == TokenRelayLocation::get()
+			)
+	}
+}
+
+/// Reserve locations for assets.
+/// Non-system parachains should trust Asset Hub as the reserve for relay chain native token (DOT).
+pub type Reserves = IsDotFrom<AssetHubLocation>;
+
+/// Cases where a remote origin is accepted as trusted Teleporter for a given asset.
+/// Non-system parachains should not accept teleports, use reserve transfers instead.
+pub type TrustedTeleporters = ();
 
 /// Defines origin aliasing rules for this chain.
 ///
@@ -217,10 +240,10 @@ impl xcm_executor::Config for XcmConfig {
 	type XcmEventEmitter = PolkadotXcm;
 	type AssetTransactor = AssetTransactors;
 	type OriginConverter = XcmOriginToTransactDispatchOrigin;
-	// Bulletin chain does not recognize a reserve location for any asset. Users must teleport ROC
-	// where allowed (e.g. with the Relay Chain).
-	type IsReserve = ();
-	type IsTeleporter = TrustedTeleporters;
+	// As a non-system parachain, Bulletin accepts DOT reserve transfers from Asset Hub.
+	// Teleports are not supported.
+	type IsReserve = Reserves;
+	type IsTeleporter = ();
 	type UniversalLocation = UniversalLocation;
 	type Barrier = Barrier;
 	type Weigher = WeightInfoBounds<
@@ -290,7 +313,7 @@ impl pallet_xcm::Config for Runtime {
 	type ExecuteXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
 	type XcmExecuteFilter = Everything;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type XcmTeleportFilter = Everything;
+	type XcmTeleportFilter = Nothing;
 	type XcmReserveTransferFilter = Everything;
 	type Weigher = WeightInfoBounds<
 		crate::weights::xcm::BulletinWestendXcmWeight<RuntimeCall>,

runtimes/bulletin-westend/tests/tests.rs

@@ -454,13 +454,16 @@ fn governance_authorize_upgrade_works() {
 		Either::Right(InstructionError { index: 2, error: XcmError::BadOrigin })
 	);
 
-	// ok - relaychain
-	assert_ok!(parachains_runtimes_test_utils::test_cases::can_governance_authorize_upgrade::<
-		Runtime,
-		RuntimeOrigin,
-	>(GovernanceOrigin::Location(Location::parent())));
+	// no - relaychain (relay chain does not have superuser access, only AssetHub does)
+	assert_err!(
+		parachains_runtimes_test_utils::test_cases::can_governance_authorize_upgrade::<
+			Runtime,
+			RuntimeOrigin,
+		>(GovernanceOrigin::Location(Location::parent())),
+		Either::Right(InstructionError { index: 1, error: XcmError::BadOrigin })
+	);
 
-	// ok - governance location
+	// ok - governance location (which is AssetHub)
 	assert_ok!(parachains_runtimes_test_utils::test_cases::can_governance_authorize_upgrade::<
 		Runtime,
 		RuntimeOrigin,