Other fixes

Author: serban300

Cargo.lock

@@ -74,6 +74,8 @@ pallet-bridge-parachains = { git = "https://github.com/paritytech/polkadot-sdk.g
 pallet-bridge-messages = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "0e09ad448bce27fcd255370cc2827ea5d2cf3892", default-features = false }
 pallet-bridge-relayers = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "0e09ad448bce27fcd255370cc2827ea5d2cf3892", default-features = false }
 pallet-xcm-bridge-hub = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "0e09ad448bce27fcd255370cc2827ea5d2cf3892", default-features = false }
+pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "0e09ad448bce27fcd255370cc2827ea5d2cf3892", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "0e09ad448bce27fcd255370cc2827ea5d2cf3892", default-features = false }
 
 # XCM dependencies
 xcm = { default-features = false, git = "https://github.com/paritytech/polkadot-sdk.git", rev = "0e09ad448bce27fcd255370cc2827ea5d2cf3892", package = "staging-xcm" }
@@ -133,6 +135,8 @@ std = [
 	"frame-system-benchmarking?/std",
 
 	"pallet-relayer-set/std",
+	"pallet-transaction-payment/std",
+	"pallet-transaction-payment-rpc-runtime-api/std",
 	"pallet-transaction-storage/std",
 	"pallet-validator-set/std",
 
@@ -179,6 +183,7 @@ runtime-benchmarks = [
 	"pallet-xcm-bridge-hub/runtime-benchmarks",
 
 	"pallet-relayer-set/runtime-benchmarks",
+	"pallet-transaction-payment/runtime-benchmarks",
 	"pallet-transaction-storage/runtime-benchmarks",
 	"pallet-validator-set/runtime-benchmarks",
 
@@ -205,6 +210,7 @@ try-runtime = [
 	"pallet-xcm-bridge-hub/try-runtime",
 
 	"pallet-relayer-set/try-runtime",
+	"pallet-transaction-payment/try-runtime",
 	"pallet-transaction-storage/try-runtime",
 	"pallet-validator-set/try-runtime",
 ]

runtime/Cargo.toml

@@ -1,8 +1,8 @@
 use crate::{
-	opaque::SessionKeys, AccountId, BabeConfig, BridgePolkadotGrandpaConfig,
-	BridgePolkadotMessagesConfig, BridgePolkadotParachainsConfig, RelayerSetConfig,
-	RuntimeGenesisConfig, SessionConfig, Signature, SudoConfig, ValidatorSetConfig,
-	BABE_GENESIS_EPOCH_CONFIG,
+	bridge_config::XCM_LANE, opaque::SessionKeys, AccountId, BabeConfig,
+	BridgePolkadotGrandpaConfig, BridgePolkadotMessagesConfig, BridgePolkadotParachainsConfig,
+	RelayerSetConfig, RuntimeGenesisConfig, SessionConfig, Signature, SudoConfig,
+	ValidatorSetConfig, BABE_GENESIS_EPOCH_CONFIG,
 };
 use scale_info::prelude::format;
 use sp_consensus_babe::AuthorityId as BabeId;
@@ -84,6 +84,7 @@ fn testnet_genesis(
 		},
 		bridge_polkadot_messages: BridgePolkadotMessagesConfig {
 			owner: Some(root_key),
+			opened_lanes: vec![XCM_LANE],
 			..Default::default()
 		},
 		..Default::default()

runtime/src/genesis_config_presets.rs

@@ -36,7 +36,6 @@ use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
 
 // A few exports that help ease life for downstream crates.
-use frame_support::genesis_builder_helper::{build_state, get_preset};
 pub use frame_support::{
 	construct_runtime, parameter_types,
 	traits::{
@@ -51,8 +50,13 @@ pub use frame_support::{
 	},
 	StorageValue,
 };
+use frame_support::{
+	dispatch::{DispatchInfo, GetDispatchInfo},
+	genesis_builder_helper::{build_state, get_preset},
+};
 pub use frame_system::Call as SystemCall;
 pub use pallet_timestamp::Call as TimestampCall;
+use pallet_transaction_payment::RuntimeDispatchInfo;
 use sp_runtime::traits::transaction_extension::AsTransactionExtension;
 #[cfg(any(feature = "std", test))]
 pub use sp_runtime::BuildStorage;
@@ -406,6 +410,7 @@ pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
 pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 
 fn validate_sudo(_who: &AccountId) -> TransactionValidity {
+	// TODO: make Sudo::key() accessible and uncomment this.
 	// // Only allow sudo transactions signed by the sudo account. The sudo pallet obviously checks
 	// // this, but not until transaction execution.
 	// if Sudo::key().map_or(false, |k| who == &k) {
@@ -784,7 +789,7 @@ impl_runtime_apis! {
 	impl bp_bridge_hub_polkadot::BridgeHubPolkadotFinalityApi<Block> for Runtime {
 		fn best_finalized() -> Option<bp_runtime::HeaderId<bp_bridge_hub_polkadot::Hash, bp_bridge_hub_polkadot::BlockNumber>> {
 			BridgePolkadotParachains::best_parachain_head_id::<
-				bp_bridge_hub_polkadot::BridgeHubPolkadot
+				bp_bridge_hub_rococo::BridgeHubRococo
 			>().unwrap_or(None)
 		}
 
@@ -901,4 +906,30 @@ impl_runtime_apis! {
 			Executive::try_execute_block(block, state_root_check, signature_check, select).expect("execute-block failed")
 		}
 	}
+
+	impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, u128> for Runtime {
+		fn query_info(
+			uxt: <Block as BlockT>::Extrinsic,
+			_len: u32,
+		) -> RuntimeDispatchInfo<u128> {
+			let dispatch_info = <<Block as BlockT>::Extrinsic as GetDispatchInfo>::get_dispatch_info(&uxt);
+			RuntimeDispatchInfo {
+				weight: dispatch_info.total_weight(),
+				class: dispatch_info.class,
+				partial_fee: 0
+			}
+		}
+		fn query_fee_details(
+			_uxt: <Block as BlockT>::Extrinsic,
+			_len: u32,
+		) -> pallet_transaction_payment::FeeDetails<u128> {
+			todo!()
+		}
+		fn query_weight_to_fee(_weight: Weight) -> u128 {
+			todo!()
+		}
+		fn query_length_to_fee(_len: u32) -> u128 {
+			todo!()
+		}
+	}
 }

runtime/src/lib.rs

@@ -48,7 +48,7 @@ parameter_types! {
 	// TODO [bridge]: how we are supposed to set it? Named? ByGenesis - if so, when?
 	// After generating chain spec?
 	/// The Polkadot Bulletin Chain network ID.
-	pub const ThisNetwork: NetworkId = NetworkId::ByGenesis([42u8; 32]);
+	pub const ThisNetwork: NetworkId = NetworkId::PolkadotBulletin;
 	/// Our location in the universe of consensus systems.
 	pub UniversalLocation: InteriorLocation = ThisNetwork::get().into();
 

runtime/src/xcm_config.rs

@@ -4,13 +4,13 @@
 
 [relaychain]
 chain = "local"
-default_command = "/home/serban/workplace/sources/polkadot-bulletin-chain/target/release/polkadot-bulletin-chain"
+default_command = "{{POLKADOT_BULLETIN_BINARY_PATH}}"
 
 	[[relaychain.nodes]]
 	name = "alice"
 	ws_port = 10000
 	validator = true
-	args = [ "--ipfs-server", "-lbitswap=trace", "-lruntime=trace", "-lxcm=trace" ]
+	args = [ "--ipfs-server", "-lruntime=trace", "-lxcm=trace" ]
 
 	[[relaychain.nodes]]
 	name = "bob"