Bridge hub kusama/polkadot runtime upgrade with bridging

parachains/integration-tests/emulated/common/src/constants.rs

@@ -735,6 +735,14 @@ pub mod bridge_hub_kusama {
 			polkadot_xcm: bridge_hub_kusama_runtime::PolkadotXcmConfig {
 				safe_xcm_version: Some(SAFE_XCM_VERSION),
 			},
+			bridge_polkadot_grandpa: bridge_hub_kusama_runtime::BridgePolkadotGrandpaConfig {
+				owner: Some(get_account_id_from_seed::<sr25519::Public>(accounts::BOB)),
+				..Default::default()
+			},
+			bridge_polkadot_messages: bridge_hub_kusama_runtime::BridgePolkadotMessagesConfig {
+				owner: Some(get_account_id_from_seed::<sr25519::Public>(accounts::BOB)),
+				..Default::default()
+			},
 		};
 
 		genesis_config.build_storage().unwrap()
@@ -790,6 +798,14 @@ pub mod bridge_hub_polkadot {
 			polkadot_xcm: bridge_hub_polkadot_runtime::PolkadotXcmConfig {
 				safe_xcm_version: Some(SAFE_XCM_VERSION),
 			},
+			bridge_kusama_grandpa: bridge_hub_polkadot_runtime::BridgeKusamaGrandpaConfig {
+				owner: Some(get_account_id_from_seed::<sr25519::Public>(accounts::BOB)),
+				..Default::default()
+			},
+			bridge_kusama_messages: bridge_hub_polkadot_runtime::BridgeKusamaMessagesConfig {
+				owner: Some(get_account_id_from_seed::<sr25519::Public>(accounts::BOB)),
+				..Default::default()
+			},
 		};
 
 		genesis_config.build_storage().unwrap()

parachains/runtimes/assets/asset-hub-kusama/src/lib.rs

@@ -775,8 +775,7 @@ pub type SignedExtra = (
 /// Unchecked extrinsic type as expected by this runtime.
 pub type UncheckedExtrinsic =
 	generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
-/// Extrinsic type that has already been checked.
-pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, RuntimeCall, SignedExtra>;
+
 /// Migrations to apply on runtime upgrade.
 pub type Migrations = (pallet_collator_selection::migration::v1::MigrateToV1<Runtime>,);
 

parachains/runtimes/assets/asset-hub-polkadot/src/lib.rs

@@ -789,8 +789,7 @@ pub type SignedExtra = (
 /// Unchecked extrinsic type as expected by this runtime.
 pub type UncheckedExtrinsic =
 	generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
-/// Extrinsic type that has already been checked.
-pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, RuntimeCall, SignedExtra>;
+
 /// Migrations to apply on runtime upgrade.
 pub type Migrations = (pallet_collator_selection::migration::v1::MigrateToV1<Runtime>,);
 

parachains/runtimes/bridge-hubs/README.md

@@ -8,8 +8,10 @@
 		+ [Send messages](#send-messages)
 			- [Local zombienet run](#local-zombienet-run)
 			- [Live Rockmine2 to Wockmint](#live-rockmine2-to-wockmint)
-	* [How to test local BridgeHubKusama](#how-to-test-local-bridgehubkusama)
-	* [How to test local BridgeHubPolkadot](#how-to-test-local-bridgehubpolkadot)
+	* [How to test locally Kusama <-> Polkadot bridge](#how-to-test-locally-kusama-----polkadot-bridge)
+		+ [1. Run chains (Kusama + BridgeHub, Polkadot + BridgeHub) with zombienet](#1-run-chains--kusama---bridgehub--polkadot---bridgehub--with-zombienet)
+		+ [2. Init bridge and run relayer (BridgeHubKusama, BridgeHubPolkadot)](#2-init-bridge-and-run-relayer--bridgehubkusama--bridgehubpolkadot-)
+		+ [3. Test bridge transfer](#3-test-bridge-transfer)
 
 # Bridge-hub Parachains
 
@@ -234,22 +236,57 @@ RUST_LOG=runtime=trace,rpc=trace,bridge=trace \
 	- Wockmint (see `xcmpQueue.Success` for `transfer-asset` and `xcmpQueue.Fail` for `ping-via-bridge`) https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Fws-wococo-wockmint-collator-node-0.parity-testnet.parity.io#/explorer
 	- BridgeHubRococo (see `bridgeWococoMessages.MessagesDelivered`)
 
-## How to test local BridgeHubKusama
+## How to test locally Kusama <-> Polkadot bridge
+
+Check [requirements](#requirements-for-local-runtesting) for "sudo pallet + fast-runtime".
+
+### 1. Run chains (Kusama + BridgeHub, Polkadot + BridgeHub) with zombienet
+
+```
+# Kusama + BridgeHubKusama + Statemine
+POLKADOT_BINARY_PATH=~/local_bridge_testing/bin/polkadot \
+POLKADOT_PARACHAIN_BINARY_PATH=~/local_bridge_testing/bin/polkadot-parachain \
+POLKADOT_PARACHAIN_BINARY_PATH_FOR_STATEMINE=~/local_bridge_testing/bin/polkadot-parachain-mint \
+	~/local_bridge_testing/bin/zombienet-linux --provider native spawn ./zombienet/bridge-hubs/bridge_hub_kusama_local_network.toml
+```
+
+```
+# TODO:check-parameter - once Statemint is ready, switch it here instead of Westmint
+# Polkadot + BridgeHubPolkadot + Westmint
+POLKADOT_BINARY_PATH=~/local_bridge_testing/bin/polkadot \
+POLKADOT_PARACHAIN_BINARY_PATH=~/local_bridge_testing/bin/polkadot-parachain \
+POLKADOT_PARACHAIN_BINARY_PATH_FOR_STATEMINT=~/local_bridge_testing/bin/polkadot-parachain-mint \
+STATEMINT_CHAIN=westmint-local \
+	~/local_bridge_testing/bin/zombienet-linux --provider native spawn ./zombienet/bridge-hubs/bridge_hub_polkadot_local_network.toml
 ```
-cd <base-cumulus-repo-directory>
-cargo build --release -p polkadot-parachain-bin
 
-# script expect to have pre-built polkadot binary on the path: ../polkadot/target/release/polkadot
-# if using `kusama-local` / `polkadot-local`, build polkadot with `--features fast-runtime`
+### 2. Init bridge and run relayer (BridgeHubKusama, BridgeHubPolkadot)
 
-# BridgeHubKusama
-zombienet-linux --provider native spawn ./zombienet/examples/bridge_hub_kusama_local_network.toml
+```
+cd <cumulus-git-repo-dir>
+./scripts/bridges_kusama_polkadot.sh run-relay
+```
 
-or
+### 3. Test bridge transfer
 
-# BridgeHubPolkadot
-zombienet-linux --provider native spawn ./zombienet/examples/bridge_hub_polkadot_local_network.toml
+Allow bridge transfer on statemine/statemint (governance-like):
+```
+./scripts/bridges_kusama_polkadot.sh allow-transfers-local
 ```
 
-## How to test local BridgeHubPolkadot
-TODO: from master
+Do (asset) transfer from statemine to statemint
+```
+./scripts/bridges_kusama_polkadot.sh transfer-asset-from-statemine-local
+```
+
+Do (ping) transfer from statemine to statemint
+```
+./scripts/bridges_kusama_polkadot.sh ping-via-bridge-from-statemine-local
+```
+
+- open explorers: (see zombienets)
+	- Statemine (see events `xcmpQueue.XcmpMessageSent`, `bridgeTransfer.ReserveAssetsDeposited`, `bridgeTransfer.TransferInitiated`) https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:9910#/explorer
+	- BridgeHubKusama (see `bridgePolkadotMessages.MessageAccepted`) https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:8943#/explorer
+	- BridgeHubPolkadot (see `bridgeKusamaMessages.MessagesReceived`) https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:8945#/explorer
+	- Westmint (see `xcmpQueue.Success` for `transfer-asset` and `xcmpQueue.Fail` for `ping-via-bridge`) https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:9010#/explorer
+	- BridgeHubKusama (see `bridgePolkadotMessages.MessagesDelivered`) https://polkadot.js.org/apps/?rpc=ws://127.0.0.1:8943#/explorer

parachains/runtimes/bridge-hubs/bridge-hub-kusama/Cargo.toml

@@ -71,14 +71,42 @@ pallet-collator-selection = { path = "../../../../pallets/collator-selection", d
 parachain-info = { path = "../../../../parachains/pallets/parachain-info", default-features = false }
 parachains-common = { path = "../../../../parachains/common", default-features = false }
 
+# Bridges
+bp-bridge-hub-kusama = { path = "../../../../bridges/primitives/chain-bridge-hub-kusama", default-features = false }
+bp-bridge-hub-polkadot = { path = "../../../../bridges/primitives/chain-bridge-hub-polkadot", default-features = false }
+bp-messages = { path = "../../../../bridges/primitives/messages", default-features = false }
+bp-parachains = { path = "../../../../bridges/primitives/parachains", default-features = false }
+bp-polkadot-core = { path = "../../../../bridges/primitives/polkadot-core", default-features = false }
+bp-relayers = { path = "../../../../bridges/primitives/relayers", default-features = false }
+bp-runtime = { path = "../../../../bridges/primitives/runtime", default-features = false }
+bp-polkadot = { path = "../../../../bridges/primitives/chain-polkadot", default-features = false }
+bridge-runtime-common = { path = "../../../../bridges/bin/runtime-common", default-features = false }
+pallet-bridge-grandpa = { path = "../../../../bridges/modules/grandpa", default-features = false }
+pallet-bridge-messages = { path = "../../../../bridges/modules/messages", default-features = false }
+pallet-bridge-parachains = { path = "../../../../bridges/modules/parachains", default-features = false }
+pallet-bridge-relayers = { path = "../../../../bridges/modules/relayers", default-features = false }
+
 [dev-dependencies]
+static_assertions = "1.1"
 bridge-hub-test-utils = { path = "../test-utils"}
+bridge-runtime-common = { path = "../../../../bridges/bin/runtime-common", features = ["integrity-test"] }
+bp-kusama = { path = "../../../../bridges/primitives/chain-kusama" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 [features]
 default = [
 	"std",
 ]
 std = [
+	"bp-bridge-hub-kusama/std",
+	"bp-bridge-hub-polkadot/std",
+	"bp-messages/std",
+	"bp-parachains/std",
+	"bp-polkadot-core/std",
+	"bp-relayers/std",
+	"bp-runtime/std",
+	"bp-polkadot/std",
+	"bridge-runtime-common/std",
 	"codec/std",
 	"log/std",
 	"scale-info/std",
@@ -99,6 +127,10 @@ std = [
 	"pallet-aura/std",
 	"pallet-authorship/std",
 	"pallet-balances/std",
+	"pallet-bridge-grandpa/std",
+	"pallet-bridge-messages/std",
+	"pallet-bridge-parachains/std",
+	"pallet-bridge-relayers/std",
 	"pallet-collator-selection/std",
 	"pallet-multisig/std",
 	"pallet-session/std",
@@ -131,12 +163,18 @@ std = [
 ]
 
 runtime-benchmarks = [
+	"bridge-runtime-common/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
+	"pallet-bridge-grandpa/runtime-benchmarks",
+	"pallet-bridge-messages/runtime-benchmarks",
+	"pallet-bridge-parachains/runtime-benchmarks",
+	"pallet-bridge-relayers/runtime-benchmarks",
 	"pallet-multisig/runtime-benchmarks",
+	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
@@ -149,6 +187,10 @@ runtime-benchmarks = [
 ]
 
 try-runtime = [
+	"pallet-bridge-grandpa/try-runtime",
+	"pallet-bridge-messages/try-runtime",
+	"pallet-bridge-parachains/try-runtime",
+	"pallet-bridge-relayers/try-runtime",
 	"cumulus-pallet-aura-ext/try-runtime",
 	"cumulus-pallet-dmp-queue/try-runtime",
 	"cumulus-pallet-parachain-system/try-runtime",