Merge branch 'master' into proxy-benchmarks-v2-refactor

.gitlab/pipeline/zombienet/bridges.yml

@@ -11,7 +11,7 @@
     - if: $CI_COMMIT_REF_NAME =~ /^gh-readonly-queue.*$/
       variables:
         DOCKER_IMAGES_VERSION: ${CI_COMMIT_SHORT_SHA}
-    - !reference [.build-refs, rules]
+    - !reference [ .build-refs, rules ]
   before_script:
     - echo "Zombienet Tests Config"
     - echo "${ZOMBIENET_IMAGE}"
@@ -47,8 +47,6 @@
     - cp -r /tmp/bridges-tests-run-*/bridge_hub_rococo_local_network/*.log ./zombienet-logs/
     # copy logs of westend nodes
     - cp -r /tmp/bridges-tests-run-*/bridge_hub_westend_local_network/*.log ./zombienet-logs/
-  tags:
-    - zombienet-polkadot-integration-test
 
 zombienet-bridges-0001-asset-transfer-works:
   extends:

.gitlab/pipeline/zombienet/polkadot.yml

@@ -158,7 +158,7 @@ zombienet-polkadot-functional-0010-validator-disabling:
       --local-dir="${LOCAL_DIR}/functional"
       --test="0010-validator-disabling.zndsl"
 
-zombienet-polkadot-functional-0011-async-backing-6-seconds-rate:
+.zombienet-polkadot-functional-0011-async-backing-6-seconds-rate:
   extends:
     - .zombienet-polkadot-common
   script:

Cargo.toml

@@ -757,6 +757,8 @@ femme = { version = "2.2.1" }
 filetime = { version = "0.2.16" }
 finality-grandpa = { version = "0.16.2", default-features = false }
 finality-relay = { path = "bridges/relays/finality" }
+first-pallet = { package = "polkadot-sdk-docs-first-pallet", path = "docs/sdk/packages/guides/first-pallet", default-features = false }
+first-runtime = { package = "polkadot-sdk-docs-first-runtime", path = "docs/sdk/packages/guides/first-runtime", default-features = false }
 flate2 = { version = "1.0" }
 fnv = { version = "1.0.6" }
 fork-tree = { path = "substrate/utils/fork-tree", default-features = false }
@@ -805,12 +807,8 @@ http = { version = "1.1" }
 http-body = { version = "1", default-features = false }
 http-body-util = { version = "0.1.2", default-features = false }
 hyper = { version = "1.3.1", default-features = false }
-hyper-rustls = { version = "0.24.2" }
+hyper-rustls = { version = "0.27.3", default-features = false, features = ["http1", "http2", "logging", "ring", "rustls-native-certs", "tls12"] }
 hyper-util = { version = "0.1.5", default-features = false }
-# TODO: remove hyper v0.14 https://github.com/paritytech/polkadot-sdk/issues/4896
-first-pallet = { package = "polkadot-sdk-docs-first-pallet", path = "docs/sdk/packages/guides/first-pallet", default-features = false }
-first-runtime = { package = "polkadot-sdk-docs-first-runtime", path = "docs/sdk/packages/guides/first-runtime", default-features = false }
-hyperv14 = { package = "hyper", version = "0.14.29", default-features = false }
 impl-serde = { version = "0.5.0", default-features = false }
 impl-trait-for-tuples = { version = "0.2.2" }
 indexmap = { version = "2.0.0" }
@@ -1127,6 +1125,7 @@ rstest = { version = "0.18.2" }
 rustc-hash = { version = "1.1.0" }
 rustc-hex = { version = "2.1.0", default-features = false }
 rustix = { version = "0.36.7", default-features = false }
+rustls = { version = "0.23.14", default-features = false, features = ["logging", "ring", "std", "tls12"] }
 rustversion = { version = "1.0.17" }
 rusty-fork = { version = "0.3.0", default-features = false }
 safe-mix = { version = "1.0", default-features = false }

bridges/snowbridge/primitives/router/src/inbound/mod.rs

@@ -416,6 +416,8 @@ where
 			// Final destination is a 32-byte account on AssetHub
 			Destination::AccountId32 { id } =>
 				Ok(Location::new(0, [AccountId32 { network: None, id }])),
+			// Forwarding to a destination parachain is not allowed for PNA and is validated on the
+			// Ethereum side. https://github.com/Snowfork/snowbridge/blob/e87ddb2215b513455c844463a25323bb9c01ff36/contracts/src/Assets.sol#L216-L224
 			_ => Err(ConvertMessageError::InvalidDestination),
 		}?;
 

bridges/snowbridge/primitives/router/src/outbound/mod.rs

@@ -207,9 +207,9 @@ where
 
 	fn convert(&mut self) -> Result<(Command, [u8; 32]), XcmConverterError> {
 		let result = match self.peek() {
-			Ok(ReserveAssetDeposited { .. }) => self.send_native_tokens_message(),
+			Ok(ReserveAssetDeposited { .. }) => self.make_mint_foreign_token_command(),
 			// Get withdraw/deposit and make native tokens create message.
-			Ok(WithdrawAsset { .. }) => self.send_tokens_message(),
+			Ok(WithdrawAsset { .. }) => self.make_unlock_native_token_command(),
 			Err(e) => Err(e),
 			_ => return Err(XcmConverterError::UnexpectedInstruction),
 		}?;
@@ -222,7 +222,9 @@ where
 		Ok(result)
 	}
 
-	fn send_tokens_message(&mut self) -> Result<(Command, [u8; 32]), XcmConverterError> {
+	fn make_unlock_native_token_command(
+		&mut self,
+	) -> Result<(Command, [u8; 32]), XcmConverterError> {
 		use XcmConverterError::*;
 
 		// Get the reserve assets from WithdrawAsset.
@@ -271,7 +273,12 @@ where
 		ensure!(reserve_assets.len() == 1, TooManyAssets);
 		let reserve_asset = reserve_assets.get(0).ok_or(AssetResolutionFailed)?;
 
-		// If there was a fee specified verify it.
+		// Fees are collected on AH, up front and directly from the user, to cover the
+		// complete cost of the transfer. Any additional fees provided in the XCM program are
+		// refunded to the beneficiary. We only validate the fee here if its provided to make sure
+		// the XCM program is well formed. Another way to think about this from an XCM perspective
+		// would be that the user offered to pay X amount in fees, but we charge 0 of that X amount
+		// (no fee) and refund X to the user.
 		if let Some(fee_asset) = fee_asset {
 			// The fee asset must be the same as the reserve asset.
 			if fee_asset.id != reserve_asset.id || fee_asset.fun > reserve_asset.fun {
@@ -328,7 +335,9 @@ where
 	/// # BuyExecution
 	/// # DepositAsset
 	/// # SetTopic
-	fn send_native_tokens_message(&mut self) -> Result<(Command, [u8; 32]), XcmConverterError> {
+	fn make_mint_foreign_token_command(
+		&mut self,
+	) -> Result<(Command, [u8; 32]), XcmConverterError> {
 		use XcmConverterError::*;
 
 		// Get the reserve assets.
@@ -377,7 +386,12 @@ where
 		ensure!(reserve_assets.len() == 1, TooManyAssets);
 		let reserve_asset = reserve_assets.get(0).ok_or(AssetResolutionFailed)?;
 
-		// If there was a fee specified verify it.
+		// Fees are collected on AH, up front and directly from the user, to cover the
+		// complete cost of the transfer. Any additional fees provided in the XCM program are
+		// refunded to the beneficiary. We only validate the fee here if its provided to make sure
+		// the XCM program is well formed. Another way to think about this from an XCM perspective
+		// would be that the user offered to pay X amount in fees, but we charge 0 of that X amount
+		// (no fee) and refund X to the user.
 		if let Some(fee_asset) = fee_asset {
 			// The fee asset must be the same as the reserve asset.
 			if fee_asset.id != reserve_asset.id || fee_asset.fun > reserve_asset.fun {

bridges/testing/environments/rococo-westend/rococo-start.zndsl

@@ -0,0 +1,8 @@
+Description: Check if the Rococo parachains started producing blocks reliably
+Network: ./bridge_hub_westend_local_network.toml
+Creds: config
+
+# ensure that initialization has completed
+asset-hub-rococo-collator1: reports block height is at least 10 within 180 seconds
+bridge-hub-rococo-collator1: reports block height is at least 10 within 180 seconds
+

bridges/testing/environments/rococo-westend/spawn.sh

@@ -35,9 +35,11 @@ start_zombienet $TEST_DIR $westend_def westend_dir westend_pid
 echo
 
 if [[ $init -eq 1 ]]; then
+  run_zndsl ${BASH_SOURCE%/*}/rococo-start.zndsl $rococo_dir
+  run_zndsl ${BASH_SOURCE%/*}/westend-start.zndsl $westend_dir
+
   rococo_init_log=$logs_dir/rococo-init.log
   echo -e "Setting up the rococo side of the bridge. Logs available at: $rococo_init_log\n"
-
   westend_init_log=$logs_dir/westend-init.log
   echo -e "Setting up the westend side of the bridge. Logs available at: $westend_init_log\n"
 
@@ -47,7 +49,6 @@ if [[ $init -eq 1 ]]; then
   westend_init_pid=$!
   wait -n $rococo_init_pid $westend_init_pid
 
-
   $helper_script init-bridge-hub-rococo-local >> $rococo_init_log 2>&1 &
   rococo_init_pid=$!
   $helper_script init-bridge-hub-westend-local >> $westend_init_log 2>&1 &

bridges/testing/environments/rococo-westend/start_relayer.sh

@@ -29,8 +29,8 @@ messages_relayer_log=$logs_dir/relayer_messages.log
 echo -e "Starting rococo-westend messages relayer. Logs available at: $messages_relayer_log\n"
 start_background_process "$helper_script run-messages-relay" $messages_relayer_log messages_relayer_pid
 
-run_zndsl ${BASH_SOURCE%/*}/rococo.zndsl $rococo_dir
-run_zndsl ${BASH_SOURCE%/*}/westend.zndsl $westend_dir
+run_zndsl ${BASH_SOURCE%/*}/rococo-bridge.zndsl $rococo_dir
+run_zndsl ${BASH_SOURCE%/*}/westend-bridge.zndsl $westend_dir
 
 eval $__finality_relayer_pid="'$finality_relayer_pid'"
 eval $__parachains_relayer_pid="'$parachains_relayer_pid'"